From: Enar Väikene <enar@vaikene.net>
Date: Wed, 19 Oct 2011 10:26:31 +0000 (+0300)
Subject: Added Qt plugin macros to Plugins::iPlugin and Plugins::iPluginFactory for proper... 
X-Git-Url: https://vaikene.ee/gitweb/gitweb.cgi?a=commitdiff_plain;h=d50faf159f17a66fb89ea3e7878b6f56e34b9e72;p=evaf

Added Qt plugin macros to Plugins::iPlugin and Plugins::iPluginFactory for proper interface versioning.
---

diff --git a/src/apps/PswGen/GUI/gui.h b/src/apps/PswGen/GUI/gui.h
index 9102945..d3c89d4 100644
--- a/src/apps/PswGen/GUI/gui.h
+++ b/src/apps/PswGen/GUI/gui.h
@@ -43,6 +43,7 @@ namespace GUI {
 class Module : public Plugins::iPlugin
 {
     Q_OBJECT
+    Q_INTERFACES(eVaf::Plugins::iPlugin)
 
 public:
 
diff --git a/src/apps/PswGen/Generator/module.h b/src/apps/PswGen/Generator/module.h
index 927adc6..90affff 100644
--- a/src/apps/PswGen/Generator/module.h
+++ b/src/apps/PswGen/Generator/module.h
@@ -44,6 +44,7 @@ namespace Internal {
 class Module : public Plugins::iPlugin
 {
     Q_OBJECT
+    Q_INTERFACES(eVaf::Plugins::iPlugin)
 
 public:
 
diff --git a/src/apps/PswGen/Storage/module.h b/src/apps/PswGen/Storage/module.h
index ae784e9..95b935f 100644
--- a/src/apps/PswGen/Storage/module.h
+++ b/src/apps/PswGen/Storage/module.h
@@ -48,6 +48,7 @@ namespace Internal {
 class Module : public Plugins::iPlugin
 {
     Q_OBJECT
+    Q_INTERFACES(eVaf::Plugins::iPlugin)
 
 public:
 
diff --git a/src/libs/Plugins/iplugin.h b/src/libs/Plugins/iplugin.h
index 4b8b198..f83bbbc 100644
--- a/src/libs/Plugins/iplugin.h
+++ b/src/libs/Plugins/iplugin.h
@@ -91,4 +91,6 @@ public:
 } // namespace eVaf::Plugins
 } // namespace eVaf
 
+Q_DECLARE_INTERFACE(eVaf::Plugins::iPlugin, "eVaf.Plugins.iPlugin/1.0")
+
 #endif // iplugin.h
diff --git a/src/libs/Plugins/ipluginfactory.h b/src/libs/Plugins/ipluginfactory.h
index 59f64ca..ea3e9cb 100644
--- a/src/libs/Plugins/ipluginfactory.h
+++ b/src/libs/Plugins/ipluginfactory.h
@@ -70,4 +70,6 @@ public:
 } // namespace eVaf::Plugins
 } // namespace eVaf
 
+Q_DECLARE_INTERFACE(eVaf::Plugins::iPluginFactory, "eVaf.Plugins.iPluginFactory/1.0")
+
 #endif // ipluginfactory.h
diff --git a/src/libs/Plugins/version.h b/src/libs/Plugins/version.h
index 219a10a..cbf8f0f 100644
--- a/src/libs/Plugins/version.h
+++ b/src/libs/Plugins/version.h
@@ -25,12 +25,12 @@
 /**
  * Module/library version number in the form major,minor,release,build
  */
-#define VER_FILE_VERSION                0,1,2,4
+#define VER_FILE_VERSION                0,1,3,5
 
 /**
  * Module/library version number in the string format (shall end with \0)
  */
-#define VER_FILE_VERSION_STR            "0.1.2.4\0"
+#define VER_FILE_VERSION_STR            "0.1.3.5\0"
 
 /**
  * Module/library name (shall end with \0)
diff --git a/src/plugins/LogView/factory.h b/src/plugins/LogView/factory.h
index cec48ac..4d36f91 100644
--- a/src/plugins/LogView/factory.h
+++ b/src/plugins/LogView/factory.h
@@ -35,6 +35,7 @@ namespace Internal {
 class Factory : public Plugins::iPluginFactory
 {
     Q_OBJECT
+    Q_INTERFACES(eVaf::Plugins::iPluginFactory)
 
 public:
 
diff --git a/src/plugins/LogView/logview.h b/src/plugins/LogView/logview.h
index 1800018..383588d 100644
--- a/src/plugins/LogView/logview.h
+++ b/src/plugins/LogView/logview.h
@@ -144,6 +144,7 @@ private: // Methods
 class Module : public Plugins::iPlugin
 {
     Q_OBJECT
+    Q_INTERFACES(eVaf::Plugins::iPlugin)
 
 public:
 
diff --git a/src/plugins/SdiWindow/factory.h b/src/plugins/SdiWindow/factory.h
index 3b7201b..5010928 100644
--- a/src/plugins/SdiWindow/factory.h
+++ b/src/plugins/SdiWindow/factory.h
@@ -45,6 +45,7 @@ namespace Internal {
 class Factory : public Plugins::iPluginFactory
 {
     Q_OBJECT
+    Q_INTERFACES(eVaf::Plugins::iPluginFactory)
 
 public:
 
diff --git a/src/plugins/SdiWindow/sdiwindow.h b/src/plugins/SdiWindow/sdiwindow.h
index a73f2ee..f0cfe6f 100644
--- a/src/plugins/SdiWindow/sdiwindow.h
+++ b/src/plugins/SdiWindow/sdiwindow.h
@@ -89,6 +89,7 @@ private: // Members
 class SdiWindowPlugin : public Plugins::iPlugin
 {
     Q_OBJECT
+    Q_INTERFACES(eVaf::Plugins::iPlugin)
 
 public:
 
diff --git a/src/plugins/Test/factory.h b/src/plugins/Test/factory.h
index 2b798a2..089d869 100644
--- a/src/plugins/Test/factory.h
+++ b/src/plugins/Test/factory.h
@@ -43,6 +43,7 @@ namespace Internal {
 class Factory : public Plugins::iPluginFactory
 {
     Q_OBJECT
+    Q_INTERFACES(eVaf::Plugins::iPluginFactory)
 
 public:
 
diff --git a/src/plugins/Test/test.h b/src/plugins/Test/test.h
index 35630cd..0526d6e 100644
--- a/src/plugins/Test/test.h
+++ b/src/plugins/Test/test.h
@@ -36,6 +36,7 @@ namespace Internal {
 class TestPlugin : public Plugins::iPlugin
 {
     Q_OBJECT
+    Q_INTERFACES(eVaf::Plugins::iPlugin)
 
 public: