Qt compatibility (#85)

* Add user config of cmake to .gitignore * Rename from signals -> signals_ This avoid conflict with Qt keywork for signals/slots feature.
xR3b0rn · Nov 27, 2021 · 3b63e95 · 3b63e95
1 parent f6db52b
commit 3b63e95
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,4 @@ output
 /out/build/WSL-GCC-Debug/.cmake/api/v1/reply
 /out/build/WSL-GCC-Debug/.cmake/api/v1/query/client-MicrosoftVS/query.json
 /tests/Config.h
+CMakeLists.txt.user
diff --git a/include/dbcppp/Message.h b/include/dbcppp/Message.h
@@ -29,7 +29,7 @@ namespace dbcppp
             , uint64_t message_size
             , std::string&& transmitter
             , std::vector<std::string>&& message_transmitters
-            , std::vector<std::unique_ptr<ISignal>>&& signals
+            , std::vector<std::unique_ptr<ISignal>>&& signals_
             , std::vector<std::unique_ptr<IAttribute>>&& attribute_values
             , std::string&& comment
             , std::vector<std::unique_ptr<ISignalGroup>>&& signal_groups);

diff --git a/src/libdbcppp/MessageImpl.cpp b/src/libdbcppp/MessageImpl.cpp
@@ -9,15 +9,15 @@ std::unique_ptr<IMessage> IMessage::Create(
     , uint64_t message_size
     , std::string&& transmitter
     , std::vector<std::string>&& message_transmitters
-    , std::vector<std::unique_ptr<ISignal>>&& signals
+    , std::vector<std::unique_ptr<ISignal>>&& signals_
     , std::vector<std::unique_ptr<IAttribute>>&& attribute_values
     , std::string&& comment
     , std::vector<std::unique_ptr<ISignalGroup>>&& signal_groups)
 {
     std::vector<SignalImpl> ss;
     std::vector<AttributeImpl> avs;
     std::vector<SignalGroupImpl> sgs;
-    for (auto& s : signals)
+    for (auto& s : signals_)
     {
         ss.push_back(std::move(static_cast<SignalImpl&>(*s)));
         s.reset(nullptr);
@@ -49,7 +49,7 @@ MessageImpl::MessageImpl(
     , uint64_t message_size
     , std::string&& transmitter
     , std::vector<std::string>&& message_transmitters
-    , std::vector<SignalImpl>&& signals
+    , std::vector<SignalImpl>&& signals_
     , std::vector<AttributeImpl>&& attribute_values
     , std::string&& comment
     , std::vector<SignalGroupImpl>&& signal_groups)
@@ -59,7 +59,7 @@ MessageImpl::MessageImpl(
     , _message_size(std::move(message_size))
     , _transmitter(std::move(transmitter))
     , _message_transmitters(std::move(message_transmitters))
-    , _signals(std::move(signals))
+    , _signals(std::move(signals_))
     , _attribute_values(std::move(attribute_values))
     , _comment(std::move(comment))
     , _signal_groups(std::move(signal_groups))

diff --git a/src/libdbcppp/MessageImpl.h b/src/libdbcppp/MessageImpl.h
@@ -18,7 +18,7 @@ namespace dbcppp
             , uint64_t message_size
             , std::string&& transmitter
             , std::vector<std::string>&& message_transmitters
-            , std::vector<SignalImpl>&& signals
+            , std::vector<SignalImpl>&& signals_
             , std::vector<AttributeImpl>&& attribute_values
             , std::string&& comment
             , std::vector<SignalGroupImpl>&& signal_groups);