Changed the plugin interfaces to match the Qt standard

Changed them to defines
Renamed them to <classname>_iid
Moved them into the Intereface class

Change-Id: Iaa009244b5451db3ebf4ed5d5b1bb5d053bebd8a
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>

5 files changed, 10 insertions, 10 deletions

diff --git a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
index 9fdb27a..810b653 100644
--- a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
+++ b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
@@ -300,13 +300,13 @@ public:
         QIviServiceObject(parent)
     {
         m_backend = new TestBackend;
-        m_interfaces << QIviStringSearchAndBrowseModelInterfaceName;
+        m_interfaces << QIviSearchAndBrowseModel_iid;
     }
 
     QStringList interfaces() const { return m_interfaces; }
     QObject *interfaceInstance(const QString &interface) const
     {
-        if (interface == QIviStringSearchAndBrowseModelInterfaceName)
+        if (interface == QIviSearchAndBrowseModel_iid)
             return testBackend();
         else
             return 0;
diff --git a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h
index 1441c04..f834199 100644
--- a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h
+++ b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h
@@ -38,7 +38,7 @@ class SimplePlugin : public QObject, public QIviServiceInterface
 {
     Q_OBJECT
     Q_INTERFACES(QIviServiceInterface)
-    Q_PLUGIN_METADATA(IID "com.pelagicore.QIviServiceInterface" FILE "simple_plugin.json")
+    Q_PLUGIN_METADATA(IID QIviServiceInterface_iid FILE "simple_plugin.json")
 public:
     SimplePlugin();
     virtual ~SimplePlugin() {}
diff --git a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h
index faaf8f7..f7cbb24 100644
--- a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h
+++ b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h
@@ -38,7 +38,7 @@ class WrongPlugin : public QObject
 {
     Q_OBJECT
     //Q_INTERFACES(QIviServiceInterface)
-    Q_PLUGIN_METADATA(IID "com.pelagicore.QIviServiceInterface" FILE "wrong_plugin.json")
+    Q_PLUGIN_METADATA(IID QIviServiceInterface_iid FILE "wrong_plugin.json")
 public:
     WrongPlugin();
     virtual ~WrongPlugin() {}
diff --git a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
index a69ea83..2629754 100644
--- a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
+++ b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
@@ -512,14 +512,14 @@ public:
         QIviServiceObject(parent), m_name(QLatin1String(""))
     {
         m_backend = new ClimateControlTestBackend;
-        m_interfaces << QIviStringClimateControlInterfaceName;
+        m_interfaces << QIviClimateControl_iid;
     }
 
     QString name() const { return m_name; }
     QStringList interfaces() const { return m_interfaces; }
     QObject *interfaceInstance(const QString& interface) const
     {
-        if (interface == QIviStringClimateControlInterfaceName)
+        if (interface == QIviClimateControl_iid)
             return testBackend();
         else
             return 0;
@@ -542,7 +542,7 @@ public:
     explicit ClimateControlInvalidServiceObject(QObject *parent=0) :
         QIviServiceObject(parent), m_name(QLatin1String("")), m_dummyBackend(new QObject(this))
     {
-        m_interfaces << QIviStringClimateControlInterfaceName;
+        m_interfaces << QIviClimateControl_iid;
     }
 
     QString name() const { return m_name; }
diff --git a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
index db84ee3..bf20000 100644
--- a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
+++ b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
@@ -233,14 +233,14 @@ public:
         QIviServiceObject(parent), m_name(QLatin1String(""))
     {
         m_backend = new WindowControlTestBackend;
-        m_interfaces << QIviStringWindowControlInterfaceName;
+        m_interfaces << QIviWindowControl_iid;
     }
 
     QString name() const { return m_name; }
     QStringList interfaces() const { return m_interfaces; }
     QObject *interfaceInstance(const QString& interface) const
     {
-        if (interface == QIviStringWindowControlInterfaceName)
+        if (interface == QIviWindowControl_iid)
             return testBackend();
         else
             return 0;
@@ -263,7 +263,7 @@ public:
     explicit WindowControlInvalidServiceObject(QObject *parent=0) :
         QIviServiceObject(parent), m_name(QLatin1String("")), m_dummyBackend(new QObject(this))
     {
-        m_interfaces << QIviStringWindowControlInterfaceName;
+        m_interfaces << QIviWindowControl_iid;
     }
 
     QString name() const { return m_name; }