From f74dc41c76b47a0c4401c26c2db8f6aa8068137f Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Thu, 27 Jun 2024 08:29:58 +1000 Subject: [PATCH] Using v2.8 of cc.demo1.commsdsl to generate current code. --- CMakeLists.txt | 17 ++++++++++++++++- cc_tools_qt_plugin/cc_demo1/Message.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/Message.h | 2 +- cc_tools_qt_plugin/cc_demo1/Version.h | 4 ++-- .../factory/AllMessagesDynMemMsgFactory.cpp | 2 +- .../factory/AllMessagesDynMemMsgFactory.h | 2 +- cc_tools_qt_plugin/cc_demo1/field/Lat.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/field/Lat.h | 2 +- cc_tools_qt_plugin/cc_demo1/field/Lon.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/field/Lon.h | 2 +- cc_tools_qt_plugin/cc_demo1/field/MsgId.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/field/MsgId.h | 2 +- .../cc_demo1/field/PropRemLen.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/field/PropRemLen.h | 2 +- cc_tools_qt_plugin/cc_demo1/frame/Frame.h | 2 +- .../cc_demo1/frame/FrameTransportMessage.cpp | 2 +- .../cc_demo1/frame/FrameTransportMessage.h | 2 +- cc_tools_qt_plugin/cc_demo1/input/AllMessages.h | 2 +- cc_tools_qt_plugin/cc_demo1/message/Ack.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/message/Ack.h | 4 +++- .../cc_demo1/message/Bitfields.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/message/Bitfields.h | 4 +++- cc_tools_qt_plugin/cc_demo1/message/Datas.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/message/Datas.h | 4 +++- cc_tools_qt_plugin/cc_demo1/message/Enums.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/message/Enums.h | 4 +++- cc_tools_qt_plugin/cc_demo1/message/Floats.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/message/Floats.h | 4 +++- cc_tools_qt_plugin/cc_demo1/message/Lists.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/message/Lists.h | 4 +++- .../cc_demo1/message/Optionals.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/message/Optionals.h | 4 +++- .../cc_demo1/message/ScaledInts.cpp | 2 +- .../cc_demo1/message/ScaledInts.h | 4 +++- cc_tools_qt_plugin/cc_demo1/message/Sets.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/message/Sets.h | 4 +++- .../cc_demo1/message/SimpleInts.cpp | 2 +- .../cc_demo1/message/SimpleInts.h | 4 +++- cc_tools_qt_plugin/cc_demo1/message/Strings.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/message/Strings.h | 4 +++- .../cc_demo1/message/Variants.cpp | 2 +- cc_tools_qt_plugin/cc_demo1/message/Variants.h | 4 +++- .../cc_demo1/options/DefaultOptions.h | 2 +- .../cc_demo1/options/MsgFactoryFrameOptions.h | 2 +- .../cc_demo1/plugin/Plugin_CC_Demo1.cpp | 2 +- .../cc_demo1/plugin/Plugin_CC_Demo1.h | 2 +- .../cc_demo1/plugin/Protocol_CC_Demo1.cpp | 2 +- .../cc_demo1/plugin/Protocol_CC_Demo1.h | 2 +- 48 files changed, 88 insertions(+), 49 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8bb844..0c0d33e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,10 +2,13 @@ cmake_minimum_required (VERSION 3.10) project ("cc_demo1_cc_tools_qt_plugin") # Build options: +option (OPT_WARN_AS_ERR "Treat warnings as errors" ON) +option (OPT_USE_CCACHE "Use ccache" OFF) option (OPT_INSTALL_DEFAULT_CONFIG "Install default plugin configuration" ON) # Configuration variables: # OPT_QT_MAJOR_VERSION - The major Qt version, defaults to 5 +# OPT_CCACHE_EXECUTABLE - Custom ccache executable ###################################################################### @@ -30,8 +33,20 @@ set (CMAKE_AUTOMOC ON) set (CMAKE_AUTOUIC ON) set (CMAKE_AUTORCC ON) +set (extra_opts) +if (OPT_WARN_AS_ERR) + list(APPEND extra_opts WARN_AS_ERR) +endif() + +if (OPT_USE_CCACHE) + list(APPEND extra_opts USE_CCACHE) + if (NOT "${OPT_CCACHE_EXECUTABLE}" STREQUAL "") + list(APPEND extra_opts CCACHE_EXECUTABLE "${OPT_CCACHE_EXECUTABLE}") + endif() +endif() + include(${LibComms_DIR}/CC_Compile.cmake) -cc_compile(WARN_AS_ERR) +cc_compile(${extra_opts}) cc_msvc_force_warn_opt(/W4) include(GNUInstallDirs) diff --git a/cc_tools_qt_plugin/cc_demo1/Message.cpp b/cc_tools_qt_plugin/cc_demo1/Message.cpp index 60c2a2f..b13e7f3 100644 --- a/cc_tools_qt_plugin/cc_demo1/Message.cpp +++ b/cc_tools_qt_plugin/cc_demo1/Message.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Message.h" diff --git a/cc_tools_qt_plugin/cc_demo1/Message.h b/cc_tools_qt_plugin/cc_demo1/Message.h index 9282759..023a8bd 100644 --- a/cc_tools_qt_plugin/cc_demo1/Message.h +++ b/cc_tools_qt_plugin/cc_demo1/Message.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once diff --git a/cc_tools_qt_plugin/cc_demo1/Version.h b/cc_tools_qt_plugin/cc_demo1/Version.h index f0d83fb..b9303a0 100644 --- a/cc_tools_qt_plugin/cc_demo1/Version.h +++ b/cc_tools_qt_plugin/cc_demo1/Version.h @@ -1,8 +1,8 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once #include "cc_tools_qt/version.h" -static_assert(CC_TOOLS_QT_MAKE_VERSION(5, 2, 1) <= cc_tools_qt::version(), +static_assert(CC_TOOLS_QT_MAKE_VERSION(5, 3, 1) <= cc_tools_qt::version(), "The version of cc_tools_qt library is too old"); diff --git a/cc_tools_qt_plugin/cc_demo1/factory/AllMessagesDynMemMsgFactory.cpp b/cc_tools_qt_plugin/cc_demo1/factory/AllMessagesDynMemMsgFactory.cpp index 32f8e67..f57deae 100644 --- a/cc_tools_qt_plugin/cc_demo1/factory/AllMessagesDynMemMsgFactory.cpp +++ b/cc_tools_qt_plugin/cc_demo1/factory/AllMessagesDynMemMsgFactory.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "cc_demo1/MsgId.h" #include "cc_tools_qt_plugin/cc_demo1/factory/AllMessagesDynMemMsgFactory.h" diff --git a/cc_tools_qt_plugin/cc_demo1/factory/AllMessagesDynMemMsgFactory.h b/cc_tools_qt_plugin/cc_demo1/factory/AllMessagesDynMemMsgFactory.h index 10f5815..a4dfe0a 100644 --- a/cc_tools_qt_plugin/cc_demo1/factory/AllMessagesDynMemMsgFactory.h +++ b/cc_tools_qt_plugin/cc_demo1/factory/AllMessagesDynMemMsgFactory.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once diff --git a/cc_tools_qt_plugin/cc_demo1/field/Lat.cpp b/cc_tools_qt_plugin/cc_demo1/field/Lat.cpp index ab4f308..0b7649d 100644 --- a/cc_tools_qt_plugin/cc_demo1/field/Lat.cpp +++ b/cc_tools_qt_plugin/cc_demo1/field/Lat.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Lat.h" diff --git a/cc_tools_qt_plugin/cc_demo1/field/Lat.h b/cc_tools_qt_plugin/cc_demo1/field/Lat.h index 5d385d2..6ab1a6c 100644 --- a/cc_tools_qt_plugin/cc_demo1/field/Lat.h +++ b/cc_tools_qt_plugin/cc_demo1/field/Lat.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once diff --git a/cc_tools_qt_plugin/cc_demo1/field/Lon.cpp b/cc_tools_qt_plugin/cc_demo1/field/Lon.cpp index 1ccecac..62f1397 100644 --- a/cc_tools_qt_plugin/cc_demo1/field/Lon.cpp +++ b/cc_tools_qt_plugin/cc_demo1/field/Lon.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Lon.h" diff --git a/cc_tools_qt_plugin/cc_demo1/field/Lon.h b/cc_tools_qt_plugin/cc_demo1/field/Lon.h index 219e4e8..2e2f919 100644 --- a/cc_tools_qt_plugin/cc_demo1/field/Lon.h +++ b/cc_tools_qt_plugin/cc_demo1/field/Lon.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once diff --git a/cc_tools_qt_plugin/cc_demo1/field/MsgId.cpp b/cc_tools_qt_plugin/cc_demo1/field/MsgId.cpp index 31b211c..93ea8ba 100644 --- a/cc_tools_qt_plugin/cc_demo1/field/MsgId.cpp +++ b/cc_tools_qt_plugin/cc_demo1/field/MsgId.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "MsgId.h" diff --git a/cc_tools_qt_plugin/cc_demo1/field/MsgId.h b/cc_tools_qt_plugin/cc_demo1/field/MsgId.h index 1d49cd2..0f1feec 100644 --- a/cc_tools_qt_plugin/cc_demo1/field/MsgId.h +++ b/cc_tools_qt_plugin/cc_demo1/field/MsgId.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once diff --git a/cc_tools_qt_plugin/cc_demo1/field/PropRemLen.cpp b/cc_tools_qt_plugin/cc_demo1/field/PropRemLen.cpp index 2c89fbf..6bf955c 100644 --- a/cc_tools_qt_plugin/cc_demo1/field/PropRemLen.cpp +++ b/cc_tools_qt_plugin/cc_demo1/field/PropRemLen.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "PropRemLen.h" diff --git a/cc_tools_qt_plugin/cc_demo1/field/PropRemLen.h b/cc_tools_qt_plugin/cc_demo1/field/PropRemLen.h index add17f6..28f1927 100644 --- a/cc_tools_qt_plugin/cc_demo1/field/PropRemLen.h +++ b/cc_tools_qt_plugin/cc_demo1/field/PropRemLen.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once diff --git a/cc_tools_qt_plugin/cc_demo1/frame/Frame.h b/cc_tools_qt_plugin/cc_demo1/frame/Frame.h index 38150f7..f347adb 100644 --- a/cc_tools_qt_plugin/cc_demo1/frame/Frame.h +++ b/cc_tools_qt_plugin/cc_demo1/frame/Frame.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once diff --git a/cc_tools_qt_plugin/cc_demo1/frame/FrameTransportMessage.cpp b/cc_tools_qt_plugin/cc_demo1/frame/FrameTransportMessage.cpp index 5ec5d69..7b47b09 100644 --- a/cc_tools_qt_plugin/cc_demo1/frame/FrameTransportMessage.cpp +++ b/cc_tools_qt_plugin/cc_demo1/frame/FrameTransportMessage.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "FrameTransportMessage.h" diff --git a/cc_tools_qt_plugin/cc_demo1/frame/FrameTransportMessage.h b/cc_tools_qt_plugin/cc_demo1/frame/FrameTransportMessage.h index 7cf7170..ee0dce4 100644 --- a/cc_tools_qt_plugin/cc_demo1/frame/FrameTransportMessage.h +++ b/cc_tools_qt_plugin/cc_demo1/frame/FrameTransportMessage.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once diff --git a/cc_tools_qt_plugin/cc_demo1/input/AllMessages.h b/cc_tools_qt_plugin/cc_demo1/input/AllMessages.h index 595ed39..7517068 100644 --- a/cc_tools_qt_plugin/cc_demo1/input/AllMessages.h +++ b/cc_tools_qt_plugin/cc_demo1/input/AllMessages.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once diff --git a/cc_tools_qt_plugin/cc_demo1/message/Ack.cpp b/cc_tools_qt_plugin/cc_demo1/message/Ack.cpp index 38cc144..df10ce5 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Ack.cpp +++ b/cc_tools_qt_plugin/cc_demo1/message/Ack.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Ack.h" diff --git a/cc_tools_qt_plugin/cc_demo1/message/Ack.h b/cc_tools_qt_plugin/cc_demo1/message/Ack.h index 7cbb92e..6184062 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Ack.h +++ b/cc_tools_qt_plugin/cc_demo1/message/Ack.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once @@ -26,6 +26,8 @@ class Ack : public cc_tools_qt_plugin::cc_demo1::Message Ack& operator=(const Ack& other); Ack& operator=(Ack&&); static MsgIdParamType doGetId(); + static constexpr bool hasStaticMsgId() { return true; } + static constexpr MsgIdType staticMsgId() { return static_cast(0U); } protected: virtual const char* nameImpl() const override; diff --git a/cc_tools_qt_plugin/cc_demo1/message/Bitfields.cpp b/cc_tools_qt_plugin/cc_demo1/message/Bitfields.cpp index ec46f86..62c9feb 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Bitfields.cpp +++ b/cc_tools_qt_plugin/cc_demo1/message/Bitfields.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Bitfields.h" diff --git a/cc_tools_qt_plugin/cc_demo1/message/Bitfields.h b/cc_tools_qt_plugin/cc_demo1/message/Bitfields.h index 9a50f78..68f91aa 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Bitfields.h +++ b/cc_tools_qt_plugin/cc_demo1/message/Bitfields.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once @@ -26,6 +26,8 @@ class Bitfields : public cc_tools_qt_plugin::cc_demo1::Message Bitfields& operator=(const Bitfields& other); Bitfields& operator=(Bitfields&&); static MsgIdParamType doGetId(); + static constexpr bool hasStaticMsgId() { return true; } + static constexpr MsgIdType staticMsgId() { return static_cast(6U); } protected: virtual const char* nameImpl() const override; diff --git a/cc_tools_qt_plugin/cc_demo1/message/Datas.cpp b/cc_tools_qt_plugin/cc_demo1/message/Datas.cpp index bde2f0e..ce577c4 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Datas.cpp +++ b/cc_tools_qt_plugin/cc_demo1/message/Datas.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Datas.h" diff --git a/cc_tools_qt_plugin/cc_demo1/message/Datas.h b/cc_tools_qt_plugin/cc_demo1/message/Datas.h index cad256c..ce8525d 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Datas.h +++ b/cc_tools_qt_plugin/cc_demo1/message/Datas.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once @@ -26,6 +26,8 @@ class Datas : public cc_tools_qt_plugin::cc_demo1::Message Datas& operator=(const Datas& other); Datas& operator=(Datas&&); static MsgIdParamType doGetId(); + static constexpr bool hasStaticMsgId() { return true; } + static constexpr MsgIdType staticMsgId() { return static_cast(8U); } protected: virtual const char* nameImpl() const override; diff --git a/cc_tools_qt_plugin/cc_demo1/message/Enums.cpp b/cc_tools_qt_plugin/cc_demo1/message/Enums.cpp index 7398d13..d950b5b 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Enums.cpp +++ b/cc_tools_qt_plugin/cc_demo1/message/Enums.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Enums.h" diff --git a/cc_tools_qt_plugin/cc_demo1/message/Enums.h b/cc_tools_qt_plugin/cc_demo1/message/Enums.h index 35a7080..13afb2d 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Enums.h +++ b/cc_tools_qt_plugin/cc_demo1/message/Enums.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once @@ -26,6 +26,8 @@ class Enums : public cc_tools_qt_plugin::cc_demo1::Message Enums& operator=(const Enums& other); Enums& operator=(Enums&&); static MsgIdParamType doGetId(); + static constexpr bool hasStaticMsgId() { return true; } + static constexpr MsgIdType staticMsgId() { return static_cast(4U); } protected: virtual const char* nameImpl() const override; diff --git a/cc_tools_qt_plugin/cc_demo1/message/Floats.cpp b/cc_tools_qt_plugin/cc_demo1/message/Floats.cpp index ea2408b..ad8b964 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Floats.cpp +++ b/cc_tools_qt_plugin/cc_demo1/message/Floats.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Floats.h" diff --git a/cc_tools_qt_plugin/cc_demo1/message/Floats.h b/cc_tools_qt_plugin/cc_demo1/message/Floats.h index a1de807..e8d3901 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Floats.h +++ b/cc_tools_qt_plugin/cc_demo1/message/Floats.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once @@ -26,6 +26,8 @@ class Floats : public cc_tools_qt_plugin::cc_demo1::Message Floats& operator=(const Floats& other); Floats& operator=(Floats&&); static MsgIdParamType doGetId(); + static constexpr bool hasStaticMsgId() { return true; } + static constexpr MsgIdType staticMsgId() { return static_cast(3U); } protected: virtual const char* nameImpl() const override; diff --git a/cc_tools_qt_plugin/cc_demo1/message/Lists.cpp b/cc_tools_qt_plugin/cc_demo1/message/Lists.cpp index 1a8bca0..523cdd4 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Lists.cpp +++ b/cc_tools_qt_plugin/cc_demo1/message/Lists.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Lists.h" diff --git a/cc_tools_qt_plugin/cc_demo1/message/Lists.h b/cc_tools_qt_plugin/cc_demo1/message/Lists.h index c1885b3..0dd65cd 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Lists.h +++ b/cc_tools_qt_plugin/cc_demo1/message/Lists.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once @@ -26,6 +26,8 @@ class Lists : public cc_tools_qt_plugin::cc_demo1::Message Lists& operator=(const Lists& other); Lists& operator=(Lists&&); static MsgIdParamType doGetId(); + static constexpr bool hasStaticMsgId() { return true; } + static constexpr MsgIdType staticMsgId() { return static_cast(9U); } protected: virtual const char* nameImpl() const override; diff --git a/cc_tools_qt_plugin/cc_demo1/message/Optionals.cpp b/cc_tools_qt_plugin/cc_demo1/message/Optionals.cpp index d986bf2..f17b8d1 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Optionals.cpp +++ b/cc_tools_qt_plugin/cc_demo1/message/Optionals.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Optionals.h" diff --git a/cc_tools_qt_plugin/cc_demo1/message/Optionals.h b/cc_tools_qt_plugin/cc_demo1/message/Optionals.h index 54e922d..af32ae4 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Optionals.h +++ b/cc_tools_qt_plugin/cc_demo1/message/Optionals.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once @@ -26,6 +26,8 @@ class Optionals : public cc_tools_qt_plugin::cc_demo1::Message Optionals& operator=(const Optionals& other); Optionals& operator=(Optionals&&); static MsgIdParamType doGetId(); + static constexpr bool hasStaticMsgId() { return true; } + static constexpr MsgIdType staticMsgId() { return static_cast(10U); } protected: virtual const char* nameImpl() const override; diff --git a/cc_tools_qt_plugin/cc_demo1/message/ScaledInts.cpp b/cc_tools_qt_plugin/cc_demo1/message/ScaledInts.cpp index be98a0a..2416db4 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/ScaledInts.cpp +++ b/cc_tools_qt_plugin/cc_demo1/message/ScaledInts.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "ScaledInts.h" diff --git a/cc_tools_qt_plugin/cc_demo1/message/ScaledInts.h b/cc_tools_qt_plugin/cc_demo1/message/ScaledInts.h index ea52cb6..45e4398 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/ScaledInts.h +++ b/cc_tools_qt_plugin/cc_demo1/message/ScaledInts.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once @@ -26,6 +26,8 @@ class ScaledInts : public cc_tools_qt_plugin::cc_demo1::Message ScaledInts& operator=(const ScaledInts& other); ScaledInts& operator=(ScaledInts&&); static MsgIdParamType doGetId(); + static constexpr bool hasStaticMsgId() { return true; } + static constexpr MsgIdType staticMsgId() { return static_cast(2U); } protected: virtual const char* nameImpl() const override; diff --git a/cc_tools_qt_plugin/cc_demo1/message/Sets.cpp b/cc_tools_qt_plugin/cc_demo1/message/Sets.cpp index fb7f623..1e6ea4e 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Sets.cpp +++ b/cc_tools_qt_plugin/cc_demo1/message/Sets.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Sets.h" diff --git a/cc_tools_qt_plugin/cc_demo1/message/Sets.h b/cc_tools_qt_plugin/cc_demo1/message/Sets.h index 2c0658a..85f548f 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Sets.h +++ b/cc_tools_qt_plugin/cc_demo1/message/Sets.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once @@ -26,6 +26,8 @@ class Sets : public cc_tools_qt_plugin::cc_demo1::Message Sets& operator=(const Sets& other); Sets& operator=(Sets&&); static MsgIdParamType doGetId(); + static constexpr bool hasStaticMsgId() { return true; } + static constexpr MsgIdType staticMsgId() { return static_cast(5U); } protected: virtual const char* nameImpl() const override; diff --git a/cc_tools_qt_plugin/cc_demo1/message/SimpleInts.cpp b/cc_tools_qt_plugin/cc_demo1/message/SimpleInts.cpp index da79ae1..a46eada 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/SimpleInts.cpp +++ b/cc_tools_qt_plugin/cc_demo1/message/SimpleInts.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "SimpleInts.h" diff --git a/cc_tools_qt_plugin/cc_demo1/message/SimpleInts.h b/cc_tools_qt_plugin/cc_demo1/message/SimpleInts.h index 5b6189e..d7ec212 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/SimpleInts.h +++ b/cc_tools_qt_plugin/cc_demo1/message/SimpleInts.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once @@ -26,6 +26,8 @@ class SimpleInts : public cc_tools_qt_plugin::cc_demo1::Message SimpleInts& operator=(const SimpleInts& other); SimpleInts& operator=(SimpleInts&&); static MsgIdParamType doGetId(); + static constexpr bool hasStaticMsgId() { return true; } + static constexpr MsgIdType staticMsgId() { return static_cast(1U); } protected: virtual const char* nameImpl() const override; diff --git a/cc_tools_qt_plugin/cc_demo1/message/Strings.cpp b/cc_tools_qt_plugin/cc_demo1/message/Strings.cpp index fe1f168..c28157f 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Strings.cpp +++ b/cc_tools_qt_plugin/cc_demo1/message/Strings.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Strings.h" diff --git a/cc_tools_qt_plugin/cc_demo1/message/Strings.h b/cc_tools_qt_plugin/cc_demo1/message/Strings.h index a32877d..4e291be 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Strings.h +++ b/cc_tools_qt_plugin/cc_demo1/message/Strings.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once @@ -26,6 +26,8 @@ class Strings : public cc_tools_qt_plugin::cc_demo1::Message Strings& operator=(const Strings& other); Strings& operator=(Strings&&); static MsgIdParamType doGetId(); + static constexpr bool hasStaticMsgId() { return true; } + static constexpr MsgIdType staticMsgId() { return static_cast(7U); } protected: virtual const char* nameImpl() const override; diff --git a/cc_tools_qt_plugin/cc_demo1/message/Variants.cpp b/cc_tools_qt_plugin/cc_demo1/message/Variants.cpp index 4e1d6c5..ea4926d 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Variants.cpp +++ b/cc_tools_qt_plugin/cc_demo1/message/Variants.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Variants.h" diff --git a/cc_tools_qt_plugin/cc_demo1/message/Variants.h b/cc_tools_qt_plugin/cc_demo1/message/Variants.h index b3feab2..74e30d6 100644 --- a/cc_tools_qt_plugin/cc_demo1/message/Variants.h +++ b/cc_tools_qt_plugin/cc_demo1/message/Variants.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once @@ -26,6 +26,8 @@ class Variants : public cc_tools_qt_plugin::cc_demo1::Message Variants& operator=(const Variants& other); Variants& operator=(Variants&&); static MsgIdParamType doGetId(); + static constexpr bool hasStaticMsgId() { return true; } + static constexpr MsgIdType staticMsgId() { return static_cast(11U); } protected: virtual const char* nameImpl() const override; diff --git a/cc_tools_qt_plugin/cc_demo1/options/DefaultOptions.h b/cc_tools_qt_plugin/cc_demo1/options/DefaultOptions.h index b60e7dd..795af9b 100644 --- a/cc_tools_qt_plugin/cc_demo1/options/DefaultOptions.h +++ b/cc_tools_qt_plugin/cc_demo1/options/DefaultOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 /// @file /// @brief Contains definition of the default options for plugin. diff --git a/cc_tools_qt_plugin/cc_demo1/options/MsgFactoryFrameOptions.h b/cc_tools_qt_plugin/cc_demo1/options/MsgFactoryFrameOptions.h index 8b50dab..42f4ddc 100644 --- a/cc_tools_qt_plugin/cc_demo1/options/MsgFactoryFrameOptions.h +++ b/cc_tools_qt_plugin/cc_demo1/options/MsgFactoryFrameOptions.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 /// @file /// @brief Contains definition of the options for framing which force usage of message factory. diff --git a/cc_tools_qt_plugin/cc_demo1/plugin/Plugin_CC_Demo1.cpp b/cc_tools_qt_plugin/cc_demo1/plugin/Plugin_CC_Demo1.cpp index 9cbaece..ef31495 100644 --- a/cc_tools_qt_plugin/cc_demo1/plugin/Plugin_CC_Demo1.cpp +++ b/cc_tools_qt_plugin/cc_demo1/plugin/Plugin_CC_Demo1.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Plugin_CC_Demo1.h" diff --git a/cc_tools_qt_plugin/cc_demo1/plugin/Plugin_CC_Demo1.h b/cc_tools_qt_plugin/cc_demo1/plugin/Plugin_CC_Demo1.h index 5dff02c..7677254 100644 --- a/cc_tools_qt_plugin/cc_demo1/plugin/Plugin_CC_Demo1.h +++ b/cc_tools_qt_plugin/cc_demo1/plugin/Plugin_CC_Demo1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once diff --git a/cc_tools_qt_plugin/cc_demo1/plugin/Protocol_CC_Demo1.cpp b/cc_tools_qt_plugin/cc_demo1/plugin/Protocol_CC_Demo1.cpp index 36dccae..5d15c1e 100644 --- a/cc_tools_qt_plugin/cc_demo1/plugin/Protocol_CC_Demo1.cpp +++ b/cc_tools_qt_plugin/cc_demo1/plugin/Protocol_CC_Demo1.cpp @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #include "Protocol_CC_Demo1.h" diff --git a/cc_tools_qt_plugin/cc_demo1/plugin/Protocol_CC_Demo1.h b/cc_tools_qt_plugin/cc_demo1/plugin/Protocol_CC_Demo1.h index a4fbf7f..0d3c599 100644 --- a/cc_tools_qt_plugin/cc_demo1/plugin/Protocol_CC_Demo1.h +++ b/cc_tools_qt_plugin/cc_demo1/plugin/Protocol_CC_Demo1.h @@ -1,4 +1,4 @@ -// Generated by commsdsl2tools_qt v6.3.2 +// Generated by commsdsl2tools_qt v6.3.3 #pragma once