Skip to content

Commit 3b63e95

Browse files
authored
Qt compatibility (#85)
* Add user config of cmake to .gitignore * Rename from signals -> signals_ This avoid conflict with Qt keywork for signals/slots feature.
1 parent f6db52b commit 3b63e95

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ output
3232
/out/build/WSL-GCC-Debug/.cmake/api/v1/reply
3333
/out/build/WSL-GCC-Debug/.cmake/api/v1/query/client-MicrosoftVS/query.json
3434
/tests/Config.h
35+
CMakeLists.txt.user

include/dbcppp/Message.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace dbcppp
2929
, uint64_t message_size
3030
, std::string&& transmitter
3131
, std::vector<std::string>&& message_transmitters
32-
, std::vector<std::unique_ptr<ISignal>>&& signals
32+
, std::vector<std::unique_ptr<ISignal>>&& signals_
3333
, std::vector<std::unique_ptr<IAttribute>>&& attribute_values
3434
, std::string&& comment
3535
, std::vector<std::unique_ptr<ISignalGroup>>&& signal_groups);

src/libdbcppp/MessageImpl.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ std::unique_ptr<IMessage> IMessage::Create(
99
, uint64_t message_size
1010
, std::string&& transmitter
1111
, std::vector<std::string>&& message_transmitters
12-
, std::vector<std::unique_ptr<ISignal>>&& signals
12+
, std::vector<std::unique_ptr<ISignal>>&& signals_
1313
, std::vector<std::unique_ptr<IAttribute>>&& attribute_values
1414
, std::string&& comment
1515
, std::vector<std::unique_ptr<ISignalGroup>>&& signal_groups)
1616
{
1717
std::vector<SignalImpl> ss;
1818
std::vector<AttributeImpl> avs;
1919
std::vector<SignalGroupImpl> sgs;
20-
for (auto& s : signals)
20+
for (auto& s : signals_)
2121
{
2222
ss.push_back(std::move(static_cast<SignalImpl&>(*s)));
2323
s.reset(nullptr);
@@ -49,7 +49,7 @@ MessageImpl::MessageImpl(
4949
, uint64_t message_size
5050
, std::string&& transmitter
5151
, std::vector<std::string>&& message_transmitters
52-
, std::vector<SignalImpl>&& signals
52+
, std::vector<SignalImpl>&& signals_
5353
, std::vector<AttributeImpl>&& attribute_values
5454
, std::string&& comment
5555
, std::vector<SignalGroupImpl>&& signal_groups)
@@ -59,7 +59,7 @@ MessageImpl::MessageImpl(
5959
, _message_size(std::move(message_size))
6060
, _transmitter(std::move(transmitter))
6161
, _message_transmitters(std::move(message_transmitters))
62-
, _signals(std::move(signals))
62+
, _signals(std::move(signals_))
6363
, _attribute_values(std::move(attribute_values))
6464
, _comment(std::move(comment))
6565
, _signal_groups(std::move(signal_groups))

src/libdbcppp/MessageImpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace dbcppp
1818
, uint64_t message_size
1919
, std::string&& transmitter
2020
, std::vector<std::string>&& message_transmitters
21-
, std::vector<SignalImpl>&& signals
21+
, std::vector<SignalImpl>&& signals_
2222
, std::vector<AttributeImpl>&& attribute_values
2323
, std::string&& comment
2424
, std::vector<SignalGroupImpl>&& signal_groups);

0 commit comments

Comments
 (0)