Requiring v2.0.7 of the cc.mqttsn.libs and v6.0 of cc_tools_qt.

Author: arobenko

.github/workflows/actions_build.yml

@@ -8,10 +8,10 @@ on:
       - '**'
 
 env:
-  COMMS_TAG: v5.2.7
-  CC_TOOLS_QT_TAG: v5.3.3
-  CC_MQTTSN_GENERATED_TAG: v2.9
-  CC_MQTTSN_LIBS_TAG: v2.0.4
+  COMMS_TAG: develop
+  CC_TOOLS_QT_TAG: develop
+  CC_MQTTSN_GENERATED_TAG: develop
+  CC_MQTTSN_LIBS_TAG: develop
 
 jobs:
 

src/MqttsnClientFilter.cpp

@@ -366,7 +366,7 @@ void MqttsnClientFilter::stopImpl()
     }    
 }
 
-QList<cc_tools_qt::DataInfoPtr> MqttsnClientFilter::recvDataImpl(cc_tools_qt::DataInfoPtr dataPtr)
+QList<cc_tools_qt::ToolsDataInfoPtr> MqttsnClientFilter::recvDataImpl(cc_tools_qt::ToolsDataInfoPtr dataPtr)
 {
     m_recvData.clear();
     m_recvDataPtr = std::move(dataPtr);
@@ -375,7 +375,7 @@ QList<cc_tools_qt::DataInfoPtr> MqttsnClientFilter::recvDataImpl(cc_tools_qt::Da
     return std::move(m_recvData);
 }
 
-QList<cc_tools_qt::DataInfoPtr> MqttsnClientFilter::sendDataImpl(cc_tools_qt::DataInfoPtr dataPtr)
+QList<cc_tools_qt::ToolsDataInfoPtr> MqttsnClientFilter::sendDataImpl(cc_tools_qt::ToolsDataInfoPtr dataPtr)
 {
     m_sendData.clear();
 

src/MqttsnClientFilter.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <cc_tools_qt/Filter.h>
+#include <cc_tools_qt/ToolsFilter.h>
 #include <cc_tools_qt/version.h>
 
 #include <cc_mqttsn_client/client.h>
@@ -32,13 +32,13 @@
 #include <memory>
 #include <string>
 
-static_assert(CC_MQTTSN_CLIENT_MAKE_VERSION(2, 0, 4) <= CC_MQTTSN_CLIENT_VERSION, "The version of the cc_mqttsn_client library is too old");
-static_assert(CC_TOOLS_QT_MAKE_VERSION(5, 3, 3) <= CC_TOOLS_QT_VERSION, "The version of the cc_tools_qt library is too old");
+static_assert(CC_MQTTSN_CLIENT_MAKE_VERSION(2, 0, 7) <= CC_MQTTSN_CLIENT_VERSION, "The version of the cc_mqttsn_client library is too old");
+static_assert(CC_TOOLS_QT_MAKE_VERSION(6, 0, 0) <= CC_TOOLS_QT_VERSION, "The version of the cc_tools_qt library is too old");
 
 namespace cc_plugin_mqttsn_client_filter
 {
 
-class MqttsnClientFilter final : public QObject, public cc_tools_qt::Filter
+class MqttsnClientFilter final : public cc_tools_qt::ToolsFilter
 {
     Q_OBJECT
 
@@ -85,8 +85,8 @@ class MqttsnClientFilter final : public QObject, public cc_tools_qt::Filter
 protected:
     virtual bool startImpl() override;
     virtual void stopImpl() override;
-    virtual QList<cc_tools_qt::DataInfoPtr> recvDataImpl(cc_tools_qt::DataInfoPtr dataPtr) override;
-    virtual QList<cc_tools_qt::DataInfoPtr> sendDataImpl(cc_tools_qt::DataInfoPtr dataPtr) override;
+    virtual QList<cc_tools_qt::ToolsDataInfoPtr> recvDataImpl(cc_tools_qt::ToolsDataInfoPtr dataPtr) override;
+    virtual QList<cc_tools_qt::ToolsDataInfoPtr> sendDataImpl(cc_tools_qt::ToolsDataInfoPtr dataPtr) override;
     virtual void socketConnectionReportImpl(bool connected) override;
     virtual void applyInterPluginConfigImpl(const QVariantMap& props) override;     
     virtual const char* debugNameImpl() const override;
@@ -132,15 +132,15 @@ private slots:
 
     ClientPtr m_client;
     QTimer m_timer;
-    std::list<cc_tools_qt::DataInfoPtr> m_pendingData;
+    std::list<cc_tools_qt::ToolsDataInfoPtr> m_pendingData;
     Config m_config;
     std::string m_prevClientId;
     unsigned m_tickMs = 0U;
     qint64 m_tickMeasureTs = 0;
-    cc_tools_qt::DataInfoPtr m_recvDataPtr;
-    QList<cc_tools_qt::DataInfoPtr> m_recvData;
-    cc_tools_qt::DataInfoPtr m_sendDataPtr;
-    QList<cc_tools_qt::DataInfoPtr> m_sendData;
+    cc_tools_qt::ToolsDataInfoPtr m_recvDataPtr;
+    QList<cc_tools_qt::ToolsDataInfoPtr> m_recvData;
+    cc_tools_qt::ToolsDataInfoPtr m_sendDataPtr;
+    QList<cc_tools_qt::ToolsDataInfoPtr> m_sendData;
     bool m_firstConnect = true;
     bool m_socketConnected = false;
     bool m_cleanSession = false;

src/MqttsnClientFilterPlugin.cpp

@@ -108,24 +108,9 @@ void getListFromConfigMap(const QVariantMap& subConfig, const QString& key, T& l
 } // namespace 
 
 
-MqttsnClientFilterPlugin::MqttsnClientFilterPlugin()
+MqttsnClientFilterPlugin::MqttsnClientFilterPlugin() :
+    Base(Type_Filter)
 {
-    pluginProperties()
-        .setFiltersCreateFunc(
-            [this]()
-            {
-                createFilterIfNeeded();
-                cc_tools_qt::PluginProperties::ListOfFilters result;
-                result.append(m_filter);
-                return result;
-            })
-        .setConfigWidgetCreateFunc(
-            [this]()
-            {
-                createFilterIfNeeded();
-                return new MqttsnClientFilterConfigWidget(*m_filter);
-            })            
-        ;
 }
 
 MqttsnClientFilterPlugin::~MqttsnClientFilterPlugin() noexcept = default;
@@ -186,6 +171,18 @@ void MqttsnClientFilterPlugin::createFilterIfNeeded()
     m_filter = makeMqttsnClientFilter();
 }
 
+cc_tools_qt::ToolsFilterPtr MqttsnClientFilterPlugin::createFilterImpl()
+{
+    createFilterIfNeeded();
+    return m_filter;
+}
+
+QWidget* MqttsnClientFilterPlugin::createConfigurationWidgetImpl()
+{
+    createFilterIfNeeded();
+    return new MqttsnClientFilterConfigWidget(*m_filter);
+}
+
 }  // namespace cc_plugin_mqttsn_client_filter
 
 

src/MqttsnClientFilterPlugin.h

@@ -20,16 +20,18 @@
 
 #include "MqttsnClientFilter.h"
 
-#include <cc_tools_qt/Plugin.h>
+#include <cc_tools_qt/ToolsPlugin.h>
 
 namespace cc_plugin_mqttsn_client_filter
 {
 
-class MqttsnClientFilterPlugin : public cc_tools_qt::Plugin
+class MqttsnClientFilterPlugin : public cc_tools_qt::ToolsPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "cc.MqttsnClientFilter" FILE "cc_plugin_mqttsn_client_filter.json")
-    Q_INTERFACES(cc_tools_qt::Plugin)
+    Q_INTERFACES(cc_tools_qt::ToolsPlugin)
+
+    using Base = cc_tools_qt::ToolsPlugin;
 
 public:
     MqttsnClientFilterPlugin();
@@ -39,6 +41,8 @@ class MqttsnClientFilterPlugin : public cc_tools_qt::Plugin
     virtual void getCurrentConfigImpl(QVariantMap& config) override;
     virtual void reconfigureImpl(const QVariantMap& config) override;
     virtual void applyInterPluginConfigImpl(const QVariantMap& props) override;     
+    virtual cc_tools_qt::ToolsFilterPtr createFilterImpl() override;
+    virtual QWidget* createConfigurationWidgetImpl() override;    
 
 private:
     void createFilterIfNeeded();