Requiring v1.0.3 of cc.mqtt311.libs and v6.0 of cc_tools_qt.

commschamp · Jan 6, 2025 · 8fdca8b · 8fdca8b
1 parent 7570600
commit 8fdca8b
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 38 deletions.
diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -8,10 +8,10 @@ on:
       - '**'
 
 env:
-  COMMS_TAG: v5.2.7
-  CC_TOOLS_QT_TAG: v5.3.3
-  CC_MQTT311_GENERATED_TAG: v2.9
-  CC_MQTT311_LIBS_TAG: v1.0.1
+  COMMS_TAG: develop
+  CC_TOOLS_QT_TAG: develop
+  CC_MQTT311_GENERATED_TAG: develop
+  CC_MQTT311_LIBS_TAG: develop
 
 jobs:
   build_gcc_ubuntu_22_04:

diff --git a/src/Mqtt311ClientFilter.cpp b/src/Mqtt311ClientFilter.cpp
@@ -352,7 +352,7 @@ void Mqtt311ClientFilter::stopImpl()
     }    
 }
 
-QList<cc_tools_qt::DataInfoPtr> Mqtt311ClientFilter::recvDataImpl(cc_tools_qt::DataInfoPtr dataPtr)
+QList<cc_tools_qt::ToolsDataInfoPtr> Mqtt311ClientFilter::recvDataImpl(cc_tools_qt::ToolsDataInfoPtr dataPtr)
 {
     m_recvData.clear();
     m_recvDataPtr = std::move(dataPtr);
@@ -367,7 +367,7 @@ QList<cc_tools_qt::DataInfoPtr> Mqtt311ClientFilter::recvDataImpl(cc_tools_qt::D
     return std::move(m_recvData);
 }
 
-QList<cc_tools_qt::DataInfoPtr> Mqtt311ClientFilter::sendDataImpl(cc_tools_qt::DataInfoPtr dataPtr)
+QList<cc_tools_qt::ToolsDataInfoPtr> Mqtt311ClientFilter::sendDataImpl(cc_tools_qt::ToolsDataInfoPtr dataPtr)
 {
     m_sendData.clear();
 

diff --git a/src/Mqtt311ClientFilter.h b/src/Mqtt311ClientFilter.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_mqtt311_client/client.h>
@@ -32,13 +32,13 @@
 #include <memory>
 #include <string>
 
-static_assert(CC_MQTT311_CLIENT_MAKE_VERSION(1, 0, 1) <= CC_MQTT311_CLIENT_VERSION, "The version of the cc_mqtt311_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_MQTT311_CLIENT_MAKE_VERSION(1, 0, 3) <= CC_MQTT311_CLIENT_VERSION, "The version of the cc_mqtt311_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_mqtt311_client_filter
 {
 
-class Mqtt311ClientFilter final : public QObject, public cc_tools_qt::Filter
+class Mqtt311ClientFilter final : public cc_tools_qt::ToolsFilter
 {
     Q_OBJECT
 
@@ -84,8 +84,8 @@ class Mqtt311ClientFilter 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;
@@ -130,16 +130,16 @@ private slots:
 
     ClientPtr m_client;
     QTimer m_timer;
-    std::list<cc_tools_qt::DataInfoPtr> m_pendingData;
-    cc_tools_qt::DataInfo::DataSeq m_inData;
+    std::list<cc_tools_qt::ToolsDataInfoPtr> m_pendingData;
+    cc_tools_qt::ToolsDataInfo::DataSeq m_inData;
     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;
 };

diff --git a/src/Mqtt311ClientFilterPlugin.cpp b/src/Mqtt311ClientFilterPlugin.cpp
@@ -105,24 +105,9 @@ void getListFromConfigMap(const QVariantMap& subConfig, const QString& key, T& l
 } // namespace 
 
 
-Mqtt311ClientFilterPlugin::Mqtt311ClientFilterPlugin()
+Mqtt311ClientFilterPlugin::Mqtt311ClientFilterPlugin() :
+    Base(Type_Filter)
 {
-    pluginProperties()
-        .setFiltersCreateFunc(
-            [this]()
-            {
-                createFilterIfNeeded();
-                cc_tools_qt::PluginProperties::ListOfFilters result;
-                result.append(m_filter);
-                return result;
-            })
-        .setConfigWidgetCreateFunc(
-            [this]()
-            {
-                createFilterIfNeeded();
-                return new Mqtt311ClientFilterConfigWidget(*m_filter);
-            })            
-        ;
 }
 
 Mqtt311ClientFilterPlugin::~Mqtt311ClientFilterPlugin() noexcept = default;
@@ -183,6 +168,18 @@ void Mqtt311ClientFilterPlugin::createFilterIfNeeded()
     m_filter = makeMqtt311ClientFilter();
 }
 
+cc_tools_qt::ToolsFilterPtr Mqtt311ClientFilterPlugin::createFilterImpl()
+{
+    createFilterIfNeeded();
+    return m_filter;
+}
+
+QWidget* Mqtt311ClientFilterPlugin::createConfigurationWidgetImpl()
+{
+    createFilterIfNeeded();
+    return new Mqtt311ClientFilterConfigWidget(*m_filter);
+}
+
 }  // namespace cc_plugin_mqtt311_client_filter
 
 
diff --git a/src/Mqtt311ClientFilterPlugin.h b/src/Mqtt311ClientFilterPlugin.h
@@ -20,16 +20,18 @@
 
 #include "Mqtt311ClientFilter.h"
 
-#include <cc_tools_qt/Plugin.h>
+#include <cc_tools_qt/ToolsPlugin.h>
 
 namespace cc_plugin_mqtt311_client_filter
 {
 
-class Mqtt311ClientFilterPlugin : public cc_tools_qt::Plugin
+class Mqtt311ClientFilterPlugin : public cc_tools_qt::ToolsPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "cc.Mqtt311ClientFilter" FILE "cc_plugin_mqtt311_client_filter.json")
-    Q_INTERFACES(cc_tools_qt::Plugin)
+    Q_INTERFACES(cc_tools_qt::ToolsPlugin)
+
+    using Base = cc_tools_qt::ToolsPlugin;
 
 public:
     Mqtt311ClientFilterPlugin();
@@ -39,6 +41,8 @@ class Mqtt311ClientFilterPlugin : 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();