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>

40 files changed, 80 insertions, 79 deletions

diff --git a/src/imports/core/plugin.cpp b/src/imports/core/plugin.cpp
index fef1c51..f6c023d 100644
--- a/src/imports/core/plugin.cpp
+++ b/src/imports/core/plugin.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 class QIviCorePlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     virtual void registerTypes(const char *uri)
     {
diff --git a/src/imports/media/plugin.cpp b/src/imports/media/plugin.cpp
index 54e47d4..149ee5b 100644
--- a/src/imports/media/plugin.cpp
+++ b/src/imports/media/plugin.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 class QIviMediaPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     virtual void registerTypes(const char *uri)
     {
diff --git a/src/imports/vehiclefunctions/plugin.cpp b/src/imports/vehiclefunctions/plugin.cpp
index f7160da..aecd38d 100644
--- a/src/imports/vehiclefunctions/plugin.cpp
+++ b/src/imports/vehiclefunctions/plugin.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 class QIviVehicleFunctionsPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     virtual void registerTypes(const char *uri)
     {
diff --git a/src/ivicore/qivisearchandbrowsemodel.cpp b/src/ivicore/qivisearchandbrowsemodel.cpp
index ea5dd50..7770ad7 100644
--- a/src/ivicore/qivisearchandbrowsemodel.cpp
+++ b/src/ivicore/qivisearchandbrowsemodel.cpp
@@ -302,7 +302,7 @@ QIviSearchAndBrowseModelInterface *QIviSearchAndBrowseModelPrivate::searchBacken
     Q_Q(const QIviSearchAndBrowseModel);
     QIviServiceObject *so = q->serviceObject();
     if (so)
-        return qobject_cast<QIviSearchAndBrowseModelInterface*>(so->interfaceInstance(QIviStringSearchAndBrowseModelInterfaceName));
+        return qobject_cast<QIviSearchAndBrowseModelInterface*>(so->interfaceInstance(QLatin1String(QIviSearchAndBrowseModel_iid)));
 
     return nullptr;
 }
@@ -456,7 +456,7 @@ void QIviSearchAndBrowseModelPrivate::updateContentType(const QString &contentTy
    The \a parent argument is passed on to the \l QIviAbstractFeatureListModel base class.
  */
 QIviSearchAndBrowseModel::QIviSearchAndBrowseModel(QObject *parent)
-    : QIviAbstractFeatureListModel(*new QIviSearchAndBrowseModelPrivate(QIviStringSearchAndBrowseModelInterfaceName, this), parent)
+    : QIviAbstractFeatureListModel(*new QIviSearchAndBrowseModelPrivate(QLatin1String(QIviSearchAndBrowseModel_iid), this), parent)
 {
     Q_D(QIviSearchAndBrowseModel);
     d->init();
@@ -1190,7 +1190,7 @@ void QIviSearchAndBrowseModel::connectToServiceObject(QIviServiceObject *service
 */
 void QIviSearchAndBrowseModel::disconnectFromServiceObject(QIviServiceObject *serviceObject)
 {
-    QIviSearchAndBrowseModelInterface *backend = qobject_cast<QIviSearchAndBrowseModelInterface*>(serviceObject->interfaceInstance(QIviStringSearchAndBrowseModelInterfaceName));
+    QIviSearchAndBrowseModelInterface *backend = qobject_cast<QIviSearchAndBrowseModelInterface*>(serviceObject->interfaceInstance(QLatin1String(QIviSearchAndBrowseModel_iid)));
 
     if (backend)
         disconnect(backend, 0, this, 0);
diff --git a/src/ivicore/qivisearchandbrowsemodel.h b/src/ivicore/qivisearchandbrowsemodel.h
index ba2d778..7ed7a3d 100644
--- a/src/ivicore/qivisearchandbrowsemodel.h
+++ b/src/ivicore/qivisearchandbrowsemodel.h
@@ -50,8 +50,6 @@ QT_BEGIN_NAMESPACE
 
 class QIviSearchAndBrowseModelPrivate;
 
-static const QLatin1String QIviStringSearchAndBrowseModelInterfaceName("com.qt-project.qtivi.SearchAndBrowseModel");
-
 class Q_QTIVICORE_EXPORT QIviSearchAndBrowseModel : public QIviAbstractFeatureListModel
 {
     Q_OBJECT
diff --git a/src/ivicore/qivisearchandbrowsemodelinterface.h b/src/ivicore/qivisearchandbrowsemodelinterface.h
index 7f99d93..e599885 100644
--- a/src/ivicore/qivisearchandbrowsemodelinterface.h
+++ b/src/ivicore/qivisearchandbrowsemodelinterface.h
@@ -96,6 +96,8 @@ private:
     Q_DECLARE_PRIVATE(QIviSearchAndBrowseModelInterface)
 };
 
+#define QIviSearchAndBrowseModel_iid "org.qt-project.qtivi.SearchAndBrowseModel/1.0"
+
 QT_END_NAMESPACE
 
 #endif // QIVISEARCHMODELINTERFACE_H
diff --git a/src/ivicore/qiviserviceinterface.h b/src/ivicore/qiviserviceinterface.h
index 1d8b0fd..3b261e1 100644
--- a/src/ivicore/qiviserviceinterface.h
+++ b/src/ivicore/qiviserviceinterface.h
@@ -55,7 +55,8 @@ public:
     virtual QObject *interfaceInstance(const QString &interface) const = 0;
 };
 
-Q_DECLARE_INTERFACE(QIviServiceInterface, "com.pelagicore.QIviServiceInterface")
+#define QIviServiceInterface_iid "org.qt-project.qtivi.QIviServiceInterface/1.0"
+Q_DECLARE_INTERFACE(QIviServiceInterface, QIviServiceInterface_iid)
 
 QT_END_NAMESPACE
 
diff --git a/src/ivimedia/qiviamfmtuner.cpp b/src/ivimedia/qiviamfmtuner.cpp
index 93da1ea..9a148a3 100644
--- a/src/ivimedia/qiviamfmtuner.cpp
+++ b/src/ivimedia/qiviamfmtuner.cpp
@@ -152,7 +152,7 @@ QIviAmFmTunerBackendInterface *QIviAmFmTunerPrivate::tunerBackend() const
     Q_Q(const QIviAmFmTuner);
     QIviServiceObject *so = q->serviceObject();
     if (so)
-        return qobject_cast<QIviAmFmTunerBackendInterface*>(so->interfaceInstance(QIviStringAmFmTunerInterfaceName));
+        return qobject_cast<QIviAmFmTunerBackendInterface*>(so->interfaceInstance(QLatin1String(QIviAmFmTuner_iid)));
 
     return nullptr;
 }
@@ -191,7 +191,7 @@ QIviAmFmTunerBackendInterface *QIviAmFmTunerPrivate::tunerBackend() const
    The \a parent argument is passed on to the \l QIviAbstractFeature base class.
 */
 QIviAmFmTuner::QIviAmFmTuner(QObject *parent)
-    : QIviAbstractFeature(*new QIviAmFmTunerPrivate(QIviStringAmFmTunerInterfaceName, this), parent)
+    : QIviAbstractFeature(*new QIviAmFmTunerPrivate(QLatin1String(QIviAmFmTuner_iid), this), parent)
 {
     Q_D(QIviAmFmTuner);
     d->init();
@@ -545,7 +545,7 @@ QIviAmFmTuner::QIviAmFmTuner(QIviAmFmTunerPrivate &dd, QObject *parent)
  */
 bool QIviAmFmTuner::acceptServiceObject(QIviServiceObject *serviceObject)
 {
-    return serviceObject->interfaces().contains(QIviStringAmFmTunerInterfaceName);
+    return serviceObject->interfaces().contains(QLatin1String(QIviAmFmTuner_iid));
 }
 
 /*!
@@ -583,7 +583,7 @@ void QIviAmFmTuner::connectToServiceObject(QIviServiceObject *serviceObject)
  */
 void QIviAmFmTuner::disconnectFromServiceObject(QIviServiceObject *serviceObject)
 {
-    QIviAmFmTunerBackendInterface *backend = qobject_cast<QIviAmFmTunerBackendInterface*>(serviceObject->interfaceInstance(QIviStringAmFmTunerInterfaceName));
+    QIviAmFmTunerBackendInterface *backend = qobject_cast<QIviAmFmTunerBackendInterface*>(serviceObject->interfaceInstance(QLatin1String(QIviAmFmTuner_iid)));
 
     if (backend)
         disconnect(backend, 0, this, 0);
diff --git a/src/ivimedia/qiviamfmtuner.h b/src/ivimedia/qiviamfmtuner.h
index b021c68..b0d55ae 100644
--- a/src/ivimedia/qiviamfmtuner.h
+++ b/src/ivimedia/qiviamfmtuner.h
@@ -51,8 +51,6 @@ QT_BEGIN_NAMESPACE
 class QIviAmFmTunerStation;
 class QIviAmFmTunerPrivate;
 
-static const QLatin1String QIviStringAmFmTunerInterfaceName("com.qt-project.qtivi.AmFmTuner");
-
 class Q_QTIVIMEDIA_EXPORT QIviAmFmTuner : public QIviAbstractFeature
 {
     Q_OBJECT
diff --git a/src/ivimedia/qiviamfmtunerbackendinterface.h b/src/ivimedia/qiviamfmtunerbackendinterface.h
index 114b164..34bb94a 100644
--- a/src/ivimedia/qiviamfmtunerbackendinterface.h
+++ b/src/ivimedia/qiviamfmtunerbackendinterface.h
@@ -77,6 +77,8 @@ Q_SIGNALS:
     void scanStatusChanged(bool scanRunning);
 };
 
+#define QIviAmFmTuner_iid "org.qt-project.qtivi.AmFmTuner/1.0"
+
 QT_END_NAMESPACE
 
 #endif // QIVIAMFMTUNERBACKENDINTERFACE_H
diff --git a/src/ivimedia/qivimediadevicediscoverymodel.cpp b/src/ivimedia/qivimediadevicediscoverymodel.cpp
index 3b28022..106eb7c 100644
--- a/src/ivimedia/qivimediadevicediscoverymodel.cpp
+++ b/src/ivimedia/qivimediadevicediscoverymodel.cpp
@@ -124,7 +124,7 @@ QIviMediaDeviceDiscoveryModelBackendInterface *QIviMediaDeviceDiscoveryModelPriv
     Q_Q(const QIviMediaDeviceDiscoveryModel);
     QIviServiceObject *so = q->serviceObject();
     if (so)
-        return qobject_cast<QIviMediaDeviceDiscoveryModelBackendInterface*>(so->interfaceInstance(QIviStringMediaDeviceDiscoveryInterfaceName));
+        return qobject_cast<QIviMediaDeviceDiscoveryModelBackendInterface*>(so->interfaceInstance(QLatin1String(QIviMediaDeviceDiscovery_iid)));
 
     return nullptr;
 }
@@ -197,7 +197,7 @@ QIviMediaDeviceDiscoveryModelBackendInterface *QIviMediaDeviceDiscoveryModelPriv
    The \a parent argument is passed on to the \l QIviAbstractFeatureListModel base class.
 */
 QIviMediaDeviceDiscoveryModel::QIviMediaDeviceDiscoveryModel(QObject *parent)
-    : QIviAbstractFeatureListModel(*new QIviMediaDeviceDiscoveryModelPrivate(QIviStringMediaDeviceDiscoveryInterfaceName, this), parent)
+    : QIviAbstractFeatureListModel(*new QIviMediaDeviceDiscoveryModelPrivate(QLatin1String(QIviMediaDeviceDiscovery_iid), this), parent)
 {
     Q_D(QIviMediaDeviceDiscoveryModel);
     d->init();
@@ -309,7 +309,7 @@ QIviMediaDeviceDiscoveryModel::QIviMediaDeviceDiscoveryModel(QIviMediaDeviceDisc
 */
 bool QIviMediaDeviceDiscoveryModel::acceptServiceObject(QIviServiceObject *serviceObject)
 {
-    return serviceObject->interfaces().contains(QIviStringMediaDeviceDiscoveryInterfaceName);
+    return serviceObject->interfaces().contains(QLatin1String(QIviMediaDeviceDiscovery_iid));
 }
 
 /*!
@@ -339,7 +339,7 @@ void QIviMediaDeviceDiscoveryModel::connectToServiceObject(QIviServiceObject *se
 */
 void QIviMediaDeviceDiscoveryModel::disconnectFromServiceObject(QIviServiceObject *serviceObject)
 {
-    QIviMediaDeviceDiscoveryModelBackendInterface *backend = qobject_cast<QIviMediaDeviceDiscoveryModelBackendInterface*>(serviceObject->interfaceInstance(QIviStringMediaDeviceDiscoveryInterfaceName));
+    QIviMediaDeviceDiscoveryModelBackendInterface *backend = qobject_cast<QIviMediaDeviceDiscoveryModelBackendInterface*>(serviceObject->interfaceInstance(QLatin1String(QIviMediaDeviceDiscovery_iid)));
 
     if (backend)
         disconnect(backend, 0, this, 0);
diff --git a/src/ivimedia/qivimediadevicediscoverymodel.h b/src/ivimedia/qivimediadevicediscoverymodel.h
index a553a27..56d20cf 100644
--- a/src/ivimedia/qivimediadevicediscoverymodel.h
+++ b/src/ivimedia/qivimediadevicediscoverymodel.h
@@ -50,8 +50,6 @@ QT_BEGIN_NAMESPACE
 class QIviMediaDeviceDiscoveryModelPrivate;
 class QIviMediaDevice;
 
-static const QLatin1String QIviStringMediaDeviceDiscoveryInterfaceName("com.qt-project.qtivi.MediaDiscovery");
-
 //TODO Should we add a generic base class ? If not we should use QIviMediaDevice* internally
 class Q_QTIVIMEDIA_EXPORT QIviMediaDeviceDiscoveryModel : public QIviAbstractFeatureListModel
 {
diff --git a/src/ivimedia/qivimediadevicediscoverymodelbackendinterface.h b/src/ivimedia/qivimediadevicediscoverymodelbackendinterface.h
index 44eea1b..fa6d830 100644
--- a/src/ivimedia/qivimediadevicediscoverymodelbackendinterface.h
+++ b/src/ivimedia/qivimediadevicediscoverymodelbackendinterface.h
@@ -64,6 +64,8 @@ Q_SIGNALS:
     void deviceRemoved(QIviServiceObject *device);
 };
 
+#define QIviMediaDeviceDiscovery_iid "org.qt-project.qtivi.MediaDiscovery/1.0"
+
 QT_END_NAMESPACE
 
 #endif // QIVIMEDIADEVICEDISCOVERYMODELBACKENDINTERFACE_H
diff --git a/src/ivimedia/qivimediaindexercontrol.cpp b/src/ivimedia/qivimediaindexercontrol.cpp
index 3739556..a37ebed 100644
--- a/src/ivimedia/qivimediaindexercontrol.cpp
+++ b/src/ivimedia/qivimediaindexercontrol.cpp
@@ -88,7 +88,7 @@ QIviMediaIndexerControlBackendInterface *QIviMediaIndexerControlPrivate::indexer
     Q_Q(const QIviMediaIndexerControl);
     QIviServiceObject *so = q->serviceObject();
     if (so)
-        return qobject_cast<QIviMediaIndexerControlBackendInterface*>(so->interfaceInstance(QIviStringMediaIndexerInterfaceName));
+        return qobject_cast<QIviMediaIndexerControlBackendInterface*>(so->interfaceInstance(QLatin1String(QIviMediaIndexer_iid)));
 
     return nullptr;
 }
@@ -137,7 +137,7 @@ QIviMediaIndexerControlBackendInterface *QIviMediaIndexerControlPrivate::indexer
    The \a parent argument is passed on to the \l QIviAbstractFeature base class.
 */
 QIviMediaIndexerControl::QIviMediaIndexerControl(QObject *parent)
-    : QIviAbstractFeature(*new QIviMediaIndexerControlPrivate(QIviStringMediaIndexerInterfaceName, this), parent)
+    : QIviAbstractFeature(*new QIviMediaIndexerControlPrivate(QLatin1String(QIviMediaIndexer_iid), this), parent)
 {
     Q_D(QIviMediaIndexerControl);
     d->init();
@@ -254,7 +254,7 @@ QIviMediaIndexerControl::QIviMediaIndexerControl(QIviMediaIndexerControlPrivate
 */
 bool QIviMediaIndexerControl::acceptServiceObject(QIviServiceObject *serviceObject)
 {
-    return serviceObject->interfaces().contains(QIviStringMediaIndexerInterfaceName);
+    return serviceObject->interfaces().contains(QLatin1String(QIviMediaIndexer_iid));
 }
 
 /*!
@@ -283,7 +283,7 @@ void QIviMediaIndexerControl::connectToServiceObject(QIviServiceObject *serviceO
 */
 void QIviMediaIndexerControl::disconnectFromServiceObject(QIviServiceObject *serviceObject)
 {
-    QIviMediaIndexerControlBackendInterface *backend = qobject_cast<QIviMediaIndexerControlBackendInterface*>(serviceObject->interfaceInstance(QIviStringMediaIndexerInterfaceName));
+    QIviMediaIndexerControlBackendInterface *backend = qobject_cast<QIviMediaIndexerControlBackendInterface*>(serviceObject->interfaceInstance(QLatin1String(QIviMediaIndexer_iid)));
 
     if (backend)
         disconnect(backend, 0, this, 0);
diff --git a/src/ivimedia/qivimediaindexercontrol.h b/src/ivimedia/qivimediaindexercontrol.h
index f97ddf2..4fd0e3e 100644
--- a/src/ivimedia/qivimediaindexercontrol.h
+++ b/src/ivimedia/qivimediaindexercontrol.h
@@ -49,8 +49,6 @@ QT_BEGIN_NAMESPACE
 
 class QIviMediaIndexerControlPrivate;
 
-static const QLatin1String QIviStringMediaIndexerInterfaceName("com.qt-project.qtivi.MediaIndexer");
-
 class Q_QTIVIMEDIA_EXPORT QIviMediaIndexerControl : public QIviAbstractFeature
 {
     Q_OBJECT
diff --git a/src/ivimedia/qivimediaindexercontrolbackendinterface.h b/src/ivimedia/qivimediaindexercontrolbackendinterface.h
index 535e5fa..e884b1b 100644
--- a/src/ivimedia/qivimediaindexercontrolbackendinterface.h
+++ b/src/ivimedia/qivimediaindexercontrolbackendinterface.h
@@ -63,6 +63,8 @@ Q_SIGNALS:
     void stateChanged(QIviMediaIndexerControl::State state);
 };
 
+#define QIviMediaIndexer_iid "org.qt-project.qtivi.MediaIndexer/1.0"
+
 QT_END_NAMESPACE
 
 #endif // QIVIMEDIAINDEXERCONTROLBACKENDINTERFACE_H
diff --git a/src/ivimedia/qivimediaplayer.cpp b/src/ivimedia/qivimediaplayer.cpp
index c30a9b5..daaf65c 100644
--- a/src/ivimedia/qivimediaplayer.cpp
+++ b/src/ivimedia/qivimediaplayer.cpp
@@ -112,7 +112,7 @@ QIviMediaPlayerBackendInterface *QIviMediaPlayerPrivate::playerBackend() const
     Q_Q(const QIviMediaPlayer);
     QIviServiceObject *so = q->serviceObject();
     if (so)
-        return qobject_cast<QIviMediaPlayerBackendInterface*>(so->interfaceInstance(QIviStringMediaPlayerInterfaceName));
+        return qobject_cast<QIviMediaPlayerBackendInterface*>(so->interfaceInstance(QLatin1String(QIviMediaPlayer_iid)));
 
     return nullptr;
 }
@@ -149,7 +149,7 @@ QIviMediaPlayerBackendInterface *QIviMediaPlayerPrivate::playerBackend() const
    The \a parent argument is passed on to the \l QIviAbstractFeature base class.
 */
 QIviMediaPlayer::QIviMediaPlayer(QObject *parent)
-    : QIviAbstractFeature(*new QIviMediaPlayerPrivate(QIviStringMediaPlayerInterfaceName, this), parent)
+    : QIviAbstractFeature(*new QIviMediaPlayerPrivate(QLatin1String(QIviMediaPlayer_iid), this), parent)
 {
     Q_D(QIviMediaPlayer);
     d->init();
@@ -402,7 +402,7 @@ QIviMediaPlayer::QIviMediaPlayer(QIviMediaPlayerPrivate &dd, QObject *parent)
  */
 bool QIviMediaPlayer::acceptServiceObject(QIviServiceObject *serviceObject)
 {
-    return serviceObject->interfaces().contains(QIviStringMediaPlayerInterfaceName);
+    return serviceObject->interfaces().contains(QLatin1String(QIviMediaPlayer_iid));
 }
 
 /*!
@@ -442,7 +442,7 @@ void QIviMediaPlayer::connectToServiceObject(QIviServiceObject *serviceObject)
  */
 void QIviMediaPlayer::disconnectFromServiceObject(QIviServiceObject *serviceObject)
 {
-    QIviMediaPlayerBackendInterface *backend = qobject_cast<QIviMediaPlayerBackendInterface*>(serviceObject->interfaceInstance(QIviStringMediaPlayerInterfaceName));
+    QIviMediaPlayerBackendInterface *backend = qobject_cast<QIviMediaPlayerBackendInterface*>(serviceObject->interfaceInstance(QLatin1String(QIviMediaPlayer_iid)));
 
     if (backend)
         disconnect(backend, 0, this, 0);
diff --git a/src/ivimedia/qivimediaplayer.h b/src/ivimedia/qivimediaplayer.h
index ba6f1f4..0fcc41b 100644
--- a/src/ivimedia/qivimediaplayer.h
+++ b/src/ivimedia/qivimediaplayer.h
@@ -51,8 +51,6 @@ QT_BEGIN_NAMESPACE
 class QIviMediaPlayerPrivate;
 class QIviPlayQueue;
 
-static const QLatin1String QIviStringMediaPlayerInterfaceName("com.qt-project.qtivi.MediaPlayer");
-
 class Q_QTIVIMEDIA_EXPORT QIviMediaPlayer : public QIviAbstractFeature
 {
     Q_OBJECT
diff --git a/src/ivimedia/qivimediaplayerbackendinterface.h b/src/ivimedia/qivimediaplayerbackendinterface.h
index 224343c..951f5dd 100644
--- a/src/ivimedia/qivimediaplayerbackendinterface.h
+++ b/src/ivimedia/qivimediaplayerbackendinterface.h
@@ -82,6 +82,8 @@ Q_SIGNALS:
     void dataChanged(const QList<QVariant> &data, int start, int count);
 };
 
+#define QIviMediaPlayer_iid "org.qt-project.qtivi.MediaPlayer/1.0"
+
 QT_END_NAMESPACE
 
 #endif // QIVIMEDIAPLAYERBACKENDINTERFACE_H
diff --git a/src/ivivehiclefunctions/qiviclimatecontrol.cpp b/src/ivivehiclefunctions/qiviclimatecontrol.cpp
index 05e94d1..8e00271 100644
--- a/src/ivivehiclefunctions/qiviclimatecontrol.cpp
+++ b/src/ivivehiclefunctions/qiviclimatecontrol.cpp
@@ -643,7 +643,7 @@ QIviClimateControlBackendInterface *QIviClimateControlPrivate::climateControlBac
    The \a parent argument is passed on to the \l QIviAbstractZonedFeature base class.
 */
 QIviClimateControl::QIviClimateControl(const QString &zone, QObject *parent)
-    : QIviAbstractZonedFeature(*new QIviClimateControlPrivate(QIviStringClimateControlInterfaceName, zone, this), parent)
+    : QIviAbstractZonedFeature(*new QIviClimateControlPrivate(QLatin1String(QIviClimateControl_iid), zone, this), parent)
 {
     Q_D(QIviClimateControl);
     d->init();
@@ -741,7 +741,7 @@ void QIviClimateControl::connectToServiceObject(QIviServiceObject *serviceObject
 */
 void QIviClimateControl::disconnectFromServiceObject(QIviServiceObject *serviceObject)
 {
-    QIviClimateControlBackendInterface *backend = qobject_cast<QIviClimateControlBackendInterface*>(serviceObject->interfaceInstance(QIviStringClimateControlInterfaceName));
+    QIviClimateControlBackendInterface *backend = qobject_cast<QIviClimateControlBackendInterface*>(serviceObject->interfaceInstance(QLatin1String(QIviClimateControl_iid)));
 
     if (backend)
         disconnect(backend, 0, this, 0);
diff --git a/src/ivivehiclefunctions/qiviclimatecontrol.h b/src/ivivehiclefunctions/qiviclimatecontrol.h
index 1aedb10..f0138c8 100644
--- a/src/ivivehiclefunctions/qiviclimatecontrol.h
+++ b/src/ivivehiclefunctions/qiviclimatecontrol.h
@@ -51,8 +51,6 @@ QT_BEGIN_NAMESPACE
 class QIviClimateControlBackendInterface;
 class QIviClimateControlPrivate;
 
-static const QLatin1String QIviStringClimateControlInterfaceName("com.qt-project.qtivi.ClimateControl");
-
 class Q_QTIVIVEHICLEFUNCTIONS_EXPORT QIviClimateControl : public QIviAbstractZonedFeature
 {
     Q_OBJECT
diff --git a/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.h b/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.h
index e49a019..5c5d9e5 100644
--- a/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.h
+++ b/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.h
@@ -107,6 +107,8 @@ Q_SIGNALS:
     void automaticClimateFanIntensityLevelAttributeChanged(const QIviPropertyAttribute<int> &automaticClimateFanIntensityLevel, const QString &zone = QString());
 };
 
+#define QIviClimateControl_iid "org.qt-project.qtivi.ClimateControl/1.0"
+
 QT_END_NAMESPACE
 
 #endif // QIVICLIMATECONTROLBACKENDINTERFACE_H
diff --git a/src/ivivehiclefunctions/qiviwindowcontrol.cpp b/src/ivivehiclefunctions/qiviwindowcontrol.cpp
index 85fb1f8..a6193c6 100644
--- a/src/ivivehiclefunctions/qiviwindowcontrol.cpp
+++ b/src/ivivehiclefunctions/qiviwindowcontrol.cpp
@@ -294,7 +294,7 @@ QIviWindowControlBackendInterface *QIviWindowControlPrivate::windowControlBacken
    The \a parent argument is passed on to the \l QIviAbstractZonedFeature base class.
 */
 QIviWindowControl::QIviWindowControl(const QString &zone, QObject *parent)
-    : QIviAbstractZonedFeature(*new QIviWindowControlPrivate(QIviStringWindowControlInterfaceName, zone, this), parent)
+    : QIviAbstractZonedFeature(*new QIviWindowControlPrivate(QLatin1String(QIviWindowControl_iid), zone, this), parent)
 {
     Q_D(QIviWindowControl);
     d->init();
@@ -349,7 +349,7 @@ void QIviWindowControl::connectToServiceObject(QIviServiceObject *serviceObject)
 */
 void QIviWindowControl::disconnectFromServiceObject(QIviServiceObject *serviceObject)
 {
-    QIviWindowControlBackendInterface *backend = qobject_cast<QIviWindowControlBackendInterface*>(serviceObject->interfaceInstance(QIviStringWindowControlInterfaceName));
+    QIviWindowControlBackendInterface *backend = qobject_cast<QIviWindowControlBackendInterface*>(serviceObject->interfaceInstance(QLatin1String(QIviWindowControl_iid)));
 
     if (backend)
         disconnect(backend, 0, this, 0);
diff --git a/src/ivivehiclefunctions/qiviwindowcontrol.h b/src/ivivehiclefunctions/qiviwindowcontrol.h
index d99f14b..812599a 100644
--- a/src/ivivehiclefunctions/qiviwindowcontrol.h
+++ b/src/ivivehiclefunctions/qiviwindowcontrol.h
@@ -51,8 +51,6 @@ QT_BEGIN_NAMESPACE
 class QIviWindowControlBackendInterface;
 class QIviWindowControlPrivate;
 
-static const QLatin1String QIviStringWindowControlInterfaceName("com.qt-project.qtivi.WindowControl");
-
 class Q_QTIVIVEHICLEFUNCTIONS_EXPORT QIviWindowControl : public QIviAbstractZonedFeature
 {
     Q_OBJECT
diff --git a/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.h b/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.h
index 4a768b9..97886db 100644
--- a/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.h
+++ b/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.h
@@ -75,6 +75,8 @@ Q_SIGNALS:
     void stateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &state, const QString &zone = QString());
 };
 
+#define QIviWindowControl_iid "org.qt-project.qtivi.WindowControl/1.0"
+
 QT_END_NAMESPACE
 
 #endif // QIVIWINDOWCONTROLBACKENDINTERFACE_H
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:
diff --git a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehiclefunction_simulator.json b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehiclefunction_simulator.json
index 46cff0c..246bc2d 100644
--- a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehiclefunction_simulator.json
+++ b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehiclefunction_simulator.json
@@ -1,3 +1,3 @@
 {
-    "interfaces" : [ "com.qt-project.qtivi.ClimateControl", "com.qt-project.qtivi.WindowControl" ]
+    "interfaces" : [ "org.qt-project.qtivi.ClimateControl", "org.qt-project.qtivi.WindowControl" ]
 }
diff --git a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.cpp b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.cpp
index 0fac062..2006055 100644
--- a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.cpp
+++ b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.cpp
@@ -56,16 +56,16 @@ VehiclePlugin::VehiclePlugin(QObject *parent) :
 QStringList VehiclePlugin::interfaces() const
 {
     QStringList list;
-    list << QIviStringClimateControlInterfaceName;
-    list << QIviStringWindowControlInterfaceName;
+    list << QIviClimateControl_iid;
+    list << QIviWindowControl_iid;
     return list;
 }
 
 QObject *VehiclePlugin::interfaceInstance(const QString &interface) const
 {
-    if (interface == QIviStringClimateControlInterfaceName)
+    if (interface == QIviClimateControl_iid)
         return m_climate;
-    else if (interface == QIviStringWindowControlInterfaceName)
+    else if (interface == QIviWindowControl_iid)
         return m_window;
 
     return 0;
diff --git a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.h b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.h
index da3bbb3..ff3545a 100644
--- a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.h
+++ b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.h
@@ -50,7 +50,7 @@ class WindowControlBackend;
 class VehiclePlugin : public QObject, QIviServiceInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "com.pelagicore.QIviServiceInterface" FILE "vehiclefunction_simulator.json")
+    Q_PLUGIN_METADATA(IID QIviServiceInterface_iid FILE "vehiclefunction_simulator.json")
     Q_INTERFACES(QIviServiceInterface)
 
 public:
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; }