diff --git a/src/ATBAPP/ATBAPPplugin.h b/src/ATBAPP/ATBAPPplugin.h index d26b2ef..5c23a25 100644 --- a/src/ATBAPP/ATBAPPplugin.h +++ b/src/ATBAPP/ATBAPPplugin.h @@ -5,7 +5,7 @@ * a simple class with only one method for plugin info */ #include -#include +#include class ATBAPPplugin { @@ -14,7 +14,7 @@ public: explicit ATBAPPplugin() = default; virtual ~ATBAPPplugin() = default; - virtual const QString & getPluginInfo() = 0; + virtual QStringList getPluginInfo() = 0; }; Q_DECLARE_INTERFACE(ATBAPPplugin, diff --git a/src/ATBAPP/ATBVMCPlugin.cpp b/src/ATBAPP/ATBVMCPlugin.cpp index e69a6b8..933d728 100644 --- a/src/ATBAPP/ATBVMCPlugin.cpp +++ b/src/ATBAPP/ATBVMCPlugin.cpp @@ -17,21 +17,18 @@ ATBVMCPlugin::ATBVMCPlugin(QObject *parent) : VMCInterface(parent) , m_errorCode("") , m_errorDescription("") - , m_pluginInfo("") , m_serialPortName("") , m_useDebug(false) , m_pluginState(PLUGIN_STATE::NOT_INITIALIZED) , m_vmc(nullptr) { - QStringList lst; - lst << QString(" Interface: ") + INTERFACE; - lst << QString("Interface Version: ") + INTERFACE_VERSION; - lst << QString(" PluginName: ") + PLUGIN_NAME; - lst << QString(" Version: ") + PLUGIN_VERSION; - lst << QString(" git-describe: ") + PLUGIN_GIT_DESCRIBE; - lst << QString(" Extended version: ") + PLUGIN_EXTENDED_VERSION; - - m_pluginInfo = lst.join('\n'); + m_pluginInfo.clear(); + m_pluginInfo << QString(" Interface: ") + INTERFACE; + m_pluginInfo << QString("Interface Version: ") + INTERFACE_VERSION; + m_pluginInfo << QString(" PluginName: ") + PLUGIN_NAME; + m_pluginInfo << QString(" Version: ") + PLUGIN_VERSION; + m_pluginInfo << QString(" git-describe: ") + PLUGIN_GIT_DESCRIBE; + m_pluginInfo << QString(" Extended version: ") + PLUGIN_EXTENDED_VERSION; } ATBVMCPlugin::~ATBVMCPlugin() { @@ -41,7 +38,7 @@ ATBVMCPlugin::~ATBVMCPlugin() { } } -QString const &ATBVMCPlugin::getPluginInfo() { +QStringList ATBVMCPlugin::getPluginInfo() { return m_pluginInfo; } diff --git a/src/ATBAPP/ATBVMCPlugin.h b/src/ATBAPP/ATBVMCPlugin.h index 87aca8e..6c2c7f2 100644 --- a/src/ATBAPP/ATBVMCPlugin.h +++ b/src/ATBAPP/ATBVMCPlugin.h @@ -24,7 +24,7 @@ public: explicit ATBVMCPlugin(QObject *parent = nullptr); virtual ~ATBVMCPlugin(); - virtual const QString & getPluginInfo() override; + virtual QStringList getPluginInfo() override; // ---------------------------------------------------------------------------- // interface: @@ -59,7 +59,7 @@ public slots: private: QString m_errorCode; QString m_errorDescription; - QString m_pluginInfo; + QStringList m_pluginInfo; QString m_serialPortName; bool m_useDebug; PLUGIN_STATE m_pluginState; diff --git a/src/ATBAPP/UnifiedDCVMCInterface.h b/src/ATBAPP/UnifiedDCVMCInterface.h index 58471c9..ca33a99 100644 --- a/src/ATBAPP/UnifiedDCVMCInterface.h +++ b/src/ATBAPP/UnifiedDCVMCInterface.h @@ -45,7 +45,7 @@ public: explicit UnifiedDCVMCInterface() = default; virtual ~UnifiedDCVMCInterface() = default; - virtual const QString & getPluginInfo() = 0; + virtual QStringList getPluginInfo() = 0; // mandantory ATBAPP plugin methods: virtual PLUGIN_STATE getState() = 0; diff --git a/src/ATBAPP/VMCInterface.h b/src/ATBAPP/VMCInterface.h index 2b25c3c..cd02960 100644 --- a/src/ATBAPP/VMCInterface.h +++ b/src/ATBAPP/VMCInterface.h @@ -27,7 +27,7 @@ public: explicit VMCInterface(QObject *parent = nullptr) : QObject(parent) {} virtual ~VMCInterface() = default; - virtual const QString & getPluginInfo() = 0; + virtual QStringList getPluginInfo() = 0; virtual PLUGIN_STATE initPlugin(QObject *eventReceiver, QObject *atbSystem, QObject *hmiConfig, QSettings const &settings) override {