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>

7 files changed, 22 insertions, 22 deletions

diff --git a/src/plugins/ivimedia/media_simulator/media_simulator.json b/src/plugins/ivimedia/media_simulator/media_simulator.json
index 565930d..af13964 100644
--- a/src/plugins/ivimedia/media_simulator/media_simulator.json
+++ b/src/plugins/ivimedia/media_simulator/media_simulator.json
@@ -1,8 +1,8 @@
 {
     "interfaces" : [
-        "com.qt-project.qtivi.MediaPlayer",
-        "com.qt-project.qtivi.SearchAndBrowseModel",
-        "com.qt-project.qtivi.MediaDiscovery",
-        "com.qt-project.qtivi.MediaIndexer"
+        "org.qt-project.qtivi.MediaPlayer",
+        "org.qt-project.qtivi.SearchAndBrowseModel",
+        "org.qt-project.qtivi.MediaDiscovery",
+        "org.qt-project.qtivi.MediaIndexer"
     ]
 }
diff --git a/src/plugins/ivimedia/media_simulator/mediaplugin.cpp b/src/plugins/ivimedia/media_simulator/mediaplugin.cpp
index 1d01723..f1bd8ae 100644
--- a/src/plugins/ivimedia/media_simulator/mediaplugin.cpp
+++ b/src/plugins/ivimedia/media_simulator/mediaplugin.cpp
@@ -75,22 +75,22 @@ MediaPlugin::MediaPlugin(QObject *parent)
 QStringList MediaPlugin::interfaces() const
 {
     QStringList list;
-    list << QIviStringMediaPlayerInterfaceName;
-    list << QIviStringSearchAndBrowseModelInterfaceName;
-    list << QIviStringMediaDeviceDiscoveryInterfaceName;
-    list << QIviStringMediaIndexerInterfaceName;
+    list << QIviMediaPlayer_iid;
+    list << QIviSearchAndBrowseModel_iid;
+    list << QIviMediaDeviceDiscovery_iid;
+    list << QIviMediaIndexer_iid;
     return list;
 }
 
 QObject *MediaPlugin::interfaceInstance(const QString &interface) const
 {
-    if (interface == QIviStringMediaPlayerInterfaceName)
+    if (interface == QIviMediaPlayer_iid)
         return m_player;
-    else if (interface == QIviStringSearchAndBrowseModelInterfaceName)
+    else if (interface == QIviSearchAndBrowseModel_iid)
         return m_browse;
-    else if (interface == QIviStringMediaDeviceDiscoveryInterfaceName)
+    else if (interface == QIviMediaDeviceDiscovery_iid)
         return m_discovery;
-    else if (interface == QIviStringMediaIndexerInterfaceName)
+    else if (interface == QIviMediaIndexer_iid)
         return m_indexer;
 
     return 0;
diff --git a/src/plugins/ivimedia/media_simulator/mediaplugin.h b/src/plugins/ivimedia/media_simulator/mediaplugin.h
index 8ff2ba5..747b0a8 100644
--- a/src/plugins/ivimedia/media_simulator/mediaplugin.h
+++ b/src/plugins/ivimedia/media_simulator/mediaplugin.h
@@ -55,7 +55,7 @@ class AmFmTunerBackend;
 class MediaPlugin : public QObject, QIviServiceInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "com.pelagicore.QIviServiceInterface" FILE "media_simulator.json")
+    Q_PLUGIN_METADATA(IID QIviServiceInterface_iid FILE "media_simulator.json")
     Q_INTERFACES(QIviServiceInterface)
 
 public:
diff --git a/src/plugins/ivimedia/media_simulator/usbdevice.cpp b/src/plugins/ivimedia/media_simulator/usbdevice.cpp
index 455e452..47e76af 100644
--- a/src/plugins/ivimedia/media_simulator/usbdevice.cpp
+++ b/src/plugins/ivimedia/media_simulator/usbdevice.cpp
@@ -64,13 +64,13 @@ void USBDevice::eject()
 QStringList USBDevice::interfaces() const
 {
     QStringList list;
-    list << QIviStringSearchAndBrowseModelInterfaceName;
+    list << QIviSearchAndBrowseModel_iid;
     return list;
 }
 
 QObject *USBDevice::interfaceInstance(const QString &interface) const
 {
-    if (interface == QIviStringSearchAndBrowseModelInterfaceName)
+    if (interface == QIviSearchAndBrowseModel_iid)
         return m_browseModel;
 
     return nullptr;
diff --git a/src/plugins/ivimedia/tuner_simulator/tuner_simulator.json b/src/plugins/ivimedia/tuner_simulator/tuner_simulator.json
index 742135f..ae12fcd 100644
--- a/src/plugins/ivimedia/tuner_simulator/tuner_simulator.json
+++ b/src/plugins/ivimedia/tuner_simulator/tuner_simulator.json
@@ -1,6 +1,6 @@
 {
     "interfaces" : [
-        "com.qt-project.qtivi.AmFmTuner",
-        "com.qt-project.qtivi.SearchAndBrowseModel"
+        "org.qt-project.qtivi.AmFmTuner",
+        "org.qt-project.qtivi.SearchAndBrowseModel"
     ]
 }
diff --git a/src/plugins/ivimedia/tuner_simulator/tunerplugin.cpp b/src/plugins/ivimedia/tuner_simulator/tunerplugin.cpp
index d54efe7..f40f7ca 100644
--- a/src/plugins/ivimedia/tuner_simulator/tunerplugin.cpp
+++ b/src/plugins/ivimedia/tuner_simulator/tunerplugin.cpp
@@ -58,16 +58,16 @@ TunerPlugin::TunerPlugin(QObject *parent)
 QStringList TunerPlugin::interfaces() const
 {
     QStringList list;
-    list << QIviStringSearchAndBrowseModelInterfaceName;
-    list << QIviStringAmFmTunerInterfaceName;
+    list << QIviSearchAndBrowseModel_iid;
+    list << QIviAmFmTuner_iid;
     return list;
 }
 
 QObject *TunerPlugin::interfaceInstance(const QString &interface) const
 {
-    if (interface == QIviStringAmFmTunerInterfaceName)
+    if (interface == QIviAmFmTuner_iid)
         return m_amfmtuner;
-    else if (interface == QIviStringSearchAndBrowseModelInterfaceName)
+    else if (interface == QIviSearchAndBrowseModel_iid)
         return m_searchbackend;
 
     return 0;
diff --git a/src/plugins/ivimedia/tuner_simulator/tunerplugin.h b/src/plugins/ivimedia/tuner_simulator/tunerplugin.h
index e836653..9357744 100644
--- a/src/plugins/ivimedia/tuner_simulator/tunerplugin.h
+++ b/src/plugins/ivimedia/tuner_simulator/tunerplugin.h
@@ -50,7 +50,7 @@ class SearchAndBrowseBackend;
 class TunerPlugin : public QObject, QIviServiceInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "com.pelagicore.QIviServiceInterface" FILE "tuner_simulator.json")
+    Q_PLUGIN_METADATA(IID QIviServiceInterface_iid FILE "tuner_simulator.json")
     Q_INTERFACES(QIviServiceInterface)
 
 public: