Fix all plugin class names to be unique within the module

The plugin class name is used to instantiate the plugin when used as
static plugin and also defines the name for the cmake files to include
those plugins.
Using the same name sometimes caused build errors when generating the
same cmake file.

Change-Id: I28e6b83148d14265fb74690d2b912628446301eb
Fixes: AUTOSUITE-1322
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

17 files changed, 30 insertions, 30 deletions

diff --git a/src/plugins/ivimedia/media_qtro/media_qtro.pro b/src/plugins/ivimedia/media_qtro/media_qtro.pro
index 20b2881..f6f96c5 100644
--- a/src/plugins/ivimedia/media_qtro/media_qtro.pro
+++ b/src/plugins/ivimedia/media_qtro/media_qtro.pro
@@ -2,7 +2,7 @@ TARGET = media_qtro
 
 PLUGIN_TYPE = qtivi
 PLUGIN_EXTENDS = ivimedia
-PLUGIN_CLASS_NAME = MediaPlugin
+PLUGIN_CLASS_NAME = MediaQtROPlugin
 
 load(qt_plugin)
 
diff --git a/src/plugins/ivimedia/media_qtro/mediaplugin.cpp b/src/plugins/ivimedia/media_qtro/mediaplugin.cpp
index eca202d..c8f73df 100644
--- a/src/plugins/ivimedia/media_qtro/mediaplugin.cpp
+++ b/src/plugins/ivimedia/media_qtro/mediaplugin.cpp
@@ -54,7 +54,7 @@
 #include <QSettings>
 #include <QRemoteObjectNode>
 
-MediaPlugin::MediaPlugin(QObject *parent)
+MediaQtROPlugin::MediaQtROPlugin(QObject *parent)
     : QObject(parent)
     , m_player(new MediaPlayerBackend(this))
     , m_indexer(new MediaIndexerBackend(this))
@@ -63,7 +63,7 @@ MediaPlugin::MediaPlugin(QObject *parent)
 {
 }
 
-QStringList MediaPlugin::interfaces() const
+QStringList MediaQtROPlugin::interfaces() const
 {
     QStringList list;
 
@@ -74,7 +74,7 @@ QStringList MediaPlugin::interfaces() const
     return list;
 }
 
-QIviFeatureInterface *MediaPlugin::interfaceInstance(const QString &interface) const
+QIviFeatureInterface *MediaQtROPlugin::interfaceInstance(const QString &interface) const
 {
     if (interface == QStringLiteral(QIviMediaPlayer_iid))
         return m_player;
diff --git a/src/plugins/ivimedia/media_qtro/mediaplugin.h b/src/plugins/ivimedia/media_qtro/mediaplugin.h
index 79bad77..b77be79 100644
--- a/src/plugins/ivimedia/media_qtro/mediaplugin.h
+++ b/src/plugins/ivimedia/media_qtro/mediaplugin.h
@@ -49,14 +49,14 @@ class MediaIndexerBackend;
 class SearchAndBrowseModel;
 class MediaDiscoveryBackend;
 
-class MediaPlugin : public QObject, QIviServiceInterface
+class MediaQtROPlugin : public QObject, QIviServiceInterface
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QIviServiceInterface_iid FILE "media_qtro.json")
     Q_INTERFACES(QIviServiceInterface)
 
 public:
-    explicit MediaPlugin(QObject *parent = nullptr);
+    explicit MediaQtROPlugin(QObject *parent = nullptr);
 
     QStringList interfaces() const override;
     QIviFeatureInterface *interfaceInstance(const QString &interface) const override;
diff --git a/src/plugins/ivimedia/media_simulator/mediaplugin.cpp b/src/plugins/ivimedia/media_simulator/mediaplugin.cpp
index 68e9c8f..b158dc2 100644
--- a/src/plugins/ivimedia/media_simulator/mediaplugin.cpp
+++ b/src/plugins/ivimedia/media_simulator/mediaplugin.cpp
@@ -56,7 +56,7 @@
 #include <QStringList>
 #include <QtDebug>
 
-MediaPlugin::MediaPlugin(QObject *parent)
+MediaSimulatorPlugin::MediaSimulatorPlugin(QObject *parent)
     : QObject(parent)
     , m_discovery(new MediaDiscoveryBackend(this))
 {
@@ -85,7 +85,7 @@ MediaPlugin::MediaPlugin(QObject *parent)
 
 }
 
-QStringList MediaPlugin::interfaces() const
+QStringList MediaSimulatorPlugin::interfaces() const
 {
     QStringList list;
     list << QStringLiteral(QIviMediaPlayer_iid);
@@ -95,7 +95,7 @@ QStringList MediaPlugin::interfaces() const
     return list;
 }
 
-QIviFeatureInterface *MediaPlugin::interfaceInstance(const QString &interface) const
+QIviFeatureInterface *MediaSimulatorPlugin::interfaceInstance(const QString &interface) const
 {
     if (interface == QStringLiteral(QIviMediaPlayer_iid))
         return m_player;
diff --git a/src/plugins/ivimedia/media_simulator/mediaplugin.h b/src/plugins/ivimedia/media_simulator/mediaplugin.h
index 23f42d6..1e27d3e 100644
--- a/src/plugins/ivimedia/media_simulator/mediaplugin.h
+++ b/src/plugins/ivimedia/media_simulator/mediaplugin.h
@@ -54,14 +54,14 @@ class MediaDiscoveryBackend;
 class MediaIndexerBackend;
 class AmFmTunerBackend;
 
-class MediaPlugin : public QObject, QIviServiceInterface
+class MediaSimulatorPlugin : public QObject, QIviServiceInterface
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QIviServiceInterface_iid FILE "media_simulator.json")
     Q_INTERFACES(QIviServiceInterface)
 
 public:
-    explicit MediaPlugin(QObject *parent = nullptr);
+    explicit MediaSimulatorPlugin(QObject *parent = nullptr);
 
     QStringList interfaces() const override;
     QIviFeatureInterface *interfaceInstance(const QString &interface) const override;
diff --git a/src/plugins/ivimedia/tuner_simulator/tunerplugin.cpp b/src/plugins/ivimedia/tuner_simulator/tunerplugin.cpp
index 5be4e5d..74c54ce 100644
--- a/src/plugins/ivimedia/tuner_simulator/tunerplugin.cpp
+++ b/src/plugins/ivimedia/tuner_simulator/tunerplugin.cpp
@@ -49,14 +49,14 @@
 #include <QtIviCore/QIviSearchAndBrowseModel>
 #include <QtIviMedia/QIviMediaPlayer>
 
-TunerPlugin::TunerPlugin(QObject *parent)
+TunerSimulatorPlugin::TunerSimulatorPlugin(QObject *parent)
     : QObject(parent)
     , m_amfmtuner(new AmFmTunerBackend(this))
     , m_searchbackend(new SearchAndBrowseBackend(m_amfmtuner, this))
 {
 }
 
-QStringList TunerPlugin::interfaces() const
+QStringList TunerSimulatorPlugin::interfaces() const
 {
     QStringList list;
     list << QStringLiteral(QIviSearchAndBrowseModel_iid);
@@ -64,7 +64,7 @@ QStringList TunerPlugin::interfaces() const
     return list;
 }
 
-QIviFeatureInterface *TunerPlugin::interfaceInstance(const QString &interface) const
+QIviFeatureInterface *TunerSimulatorPlugin::interfaceInstance(const QString &interface) const
 {
     if (interface == QLatin1String(QIviAmFmTuner_iid))
         return m_amfmtuner;
diff --git a/src/plugins/ivimedia/tuner_simulator/tunerplugin.h b/src/plugins/ivimedia/tuner_simulator/tunerplugin.h
index 73999bc..bbbebc3 100644
--- a/src/plugins/ivimedia/tuner_simulator/tunerplugin.h
+++ b/src/plugins/ivimedia/tuner_simulator/tunerplugin.h
@@ -48,14 +48,14 @@
 class AmFmTunerBackend;
 class SearchAndBrowseBackend;
 
-class TunerPlugin : public QObject, QIviServiceInterface
+class TunerSimulatorPlugin : public QObject, QIviServiceInterface
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QIviServiceInterface_iid FILE "tuner_simulator.json")
     Q_INTERFACES(QIviServiceInterface)
 
 public:
-    explicit TunerPlugin(QObject *parent = nullptr);
+    explicit TunerSimulatorPlugin(QObject *parent = nullptr);
 
     QStringList interfaces() const override;
     QIviFeatureInterface *interfaceInstance(const QString &interface) const override;
diff --git a/src/plugins/ivivehiclefunctions/vehiclefunctions_qtro/vehiclefunctions_qtro.pro b/src/plugins/ivivehiclefunctions/vehiclefunctions_qtro/vehiclefunctions_qtro.pro
index 009d19d..016900c 100644
--- a/src/plugins/ivivehiclefunctions/vehiclefunctions_qtro/vehiclefunctions_qtro.pro
+++ b/src/plugins/ivivehiclefunctions/vehiclefunctions_qtro/vehiclefunctions_qtro.pro
@@ -11,6 +11,6 @@ QFACE_SOURCES += ../../../ivivehiclefunctions/ivivehiclefunctions.qface
 
 PLUGIN_TYPE = qtivi
 PLUGIN_EXTENDS = ivivehiclefunctions
-PLUGIN_CLASS_NAME = QtIviVehicleFunctionsPlugin
+PLUGIN_CLASS_NAME = QtIviVehicleFunctionsQtROPlugin
 
 load(qt_plugin)
diff --git a/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro b/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro
index ea81268..8751c91 100644
--- a/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro
+++ b/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro
@@ -11,7 +11,7 @@ QFACE_SOURCES += ../../../ivivehiclefunctions/ivivehiclefunctions.qface
 
 PLUGIN_TYPE = qtivi
 PLUGIN_EXTENDS = ivivehiclefunctions
-PLUGIN_CLASS_NAME = QtIviVehicleFunctionsPlugin
+PLUGIN_CLASS_NAME = QtIviVehicleFunctionsSimulatorPlugin
 
 load(qt_plugin)
 
diff --git a/src/tools/ivigenerator/templates/backend_qtro.yaml b/src/tools/ivigenerator/templates/backend_qtro.yaml
index 1769ef0..795d781 100644
--- a/src/tools/ivigenerator/templates/backend_qtro.yaml
+++ b/src/tools/ivigenerator/templates/backend_qtro.yaml
@@ -1,8 +1,8 @@
 backend_qtro:
     module:
         documents:
-            - "{{module.module_name|lower}}plugin.h": "plugin.h.tpl"
-            - "{{module.module_name|lower}}plugin.cpp": "plugin.cpp.tpl"
+            - "{{module.module_name|lower}}qtroplugin.h": "plugin.h.tpl"
+            - "{{module.module_name|lower}}qtroplugin.cpp": "plugin.cpp.tpl"
             - "{{module.module_name|lower}}.json": "plugin.json"
             - "{{srcBase|lower}}.pri": "plugin.pri.tpl"
     interface:
diff --git a/src/tools/ivigenerator/templates/backend_qtro/plugin.cpp.tpl b/src/tools/ivigenerator/templates/backend_qtro/plugin.cpp.tpl
index 2224ec8..290b5e9 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/plugin.cpp.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/plugin.cpp.tpl
@@ -38,7 +38,7 @@
 # SPDX-License-Identifier: LGPL-3.0
 #}
 {% include "common/generated_comment.cpp.tpl" %}
-{% set class = '{0}Plugin'.format(module.module_name) %}
+{% set class = '{0}QtROPlugin'.format(module.module_name) %}
 
 #include "{{class|lower}}.h"
 
diff --git a/src/tools/ivigenerator/templates/backend_qtro/plugin.h.tpl b/src/tools/ivigenerator/templates/backend_qtro/plugin.h.tpl
index bc8ddc5..ea9cd6b 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/plugin.h.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/plugin.h.tpl
@@ -38,7 +38,7 @@
 # SPDX-License-Identifier: LGPL-3.0
 #}
 {% include "common/generated_comment.cpp.tpl" %}
-{% set class = '{0}Plugin'.format(module.module_name) %}
+{% set class = '{0}QtROPlugin'.format(module.module_name) %}
 {% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %}
 
 #ifndef {{oncedefine}}
diff --git a/src/tools/ivigenerator/templates/backend_qtro/plugin.pri.tpl b/src/tools/ivigenerator/templates/backend_qtro/plugin.pri.tpl
index e1372da..cb2e822 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/plugin.pri.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/plugin.pri.tpl
@@ -48,13 +48,13 @@ HEADERS += \
 {% for interface in module.interfaces %}
     $$PWD/{{interface|lower}}backend.h \
 {% endfor %}
-    $$PWD/{{module.module_name|lower}}plugin.h
+    $$PWD/{{module.module_name|lower}}qtroplugin.h
 
 SOURCES += \
 {% for interface in module.interfaces %}
     $$PWD/{{interface|lower}}backend.cpp \
 {% endfor %}
-    $$PWD/{{module.module_name|lower}}plugin.cpp
+    $$PWD/{{module.module_name|lower}}qtroplugin.cpp
 
 REPC_REPLICA += \
 {% for interface in module.interfaces %}
diff --git a/src/tools/ivigenerator/templates/backend_simulator.yaml b/src/tools/ivigenerator/templates/backend_simulator.yaml
index 6c7e8aa..9228664 100644
--- a/src/tools/ivigenerator/templates/backend_simulator.yaml
+++ b/src/tools/ivigenerator/templates/backend_simulator.yaml
@@ -1,8 +1,8 @@
 backend_simulator:
     module:
         documents:
-            - "{{module.module_name|lower}}plugin.h": "plugin.h.tpl"
-            - "{{module.module_name|lower}}plugin.cpp": "plugin.cpp.tpl"
+            - "{{module.module_name|lower}}simulatorplugin.h": "plugin.h.tpl"
+            - "{{module.module_name|lower}}simulatorplugin.cpp": "plugin.cpp.tpl"
             - "{{module.module_name|lower}}_simulation.qml": "common/module_simulation.qml.tpl"
             - "{{module.module_name|lower}}.json": "plugin.json"
             - "{{module.module_name|lower}}_simulation_data.json": "common/simulation_data.json.tpl"
diff --git a/src/tools/ivigenerator/templates/backend_simulator/plugin.cpp.tpl b/src/tools/ivigenerator/templates/backend_simulator/plugin.cpp.tpl
index 710c504..22d1a58 100644
--- a/src/tools/ivigenerator/templates/backend_simulator/plugin.cpp.tpl
+++ b/src/tools/ivigenerator/templates/backend_simulator/plugin.cpp.tpl
@@ -39,7 +39,7 @@
 # SPDX-License-Identifier: LGPL-3.0
 #}
 {% include "common/generated_comment.cpp.tpl" %}
-{% set class = '{0}Plugin'.format(module.module_name|upperfirst) %}
+{% set class = '{0}SimulatorPlugin'.format(module.module_name|upperfirst) %}
 
 #include "{{class|lower}}.h"
 
diff --git a/src/tools/ivigenerator/templates/backend_simulator/plugin.h.tpl b/src/tools/ivigenerator/templates/backend_simulator/plugin.h.tpl
index dfb86b1..cd235d6 100644
--- a/src/tools/ivigenerator/templates/backend_simulator/plugin.h.tpl
+++ b/src/tools/ivigenerator/templates/backend_simulator/plugin.h.tpl
@@ -39,7 +39,7 @@
 # SPDX-License-Identifier: LGPL-3.0
 #}
 {% include "common/generated_comment.cpp.tpl" %}
-{% set class = '{0}Plugin'.format(module.module_name|upperfirst) %}
+{% set class = '{0}SimulatorPlugin'.format(module.module_name|upperfirst) %}
 {% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %}
 
 #ifndef {{oncedefine}}
diff --git a/src/tools/ivigenerator/templates/backend_simulator/plugin.pri.tpl b/src/tools/ivigenerator/templates/backend_simulator/plugin.pri.tpl
index 2ad5932..84dbe37 100644
--- a/src/tools/ivigenerator/templates/backend_simulator/plugin.pri.tpl
+++ b/src/tools/ivigenerator/templates/backend_simulator/plugin.pri.tpl
@@ -50,13 +50,13 @@ HEADERS += \
 {% for interface in module.interfaces %}
     $$PWD/{{interface|lower}}backend.h \
 {% endfor %}
-    $$PWD/{{module.module_name|lower}}plugin.h
+    $$PWD/{{module.module_name|lower}}simulatorplugin.h
 
 SOURCES += \
 {% for interface in module.interfaces %}
     $$PWD/{{interface|lower}}backend.cpp \
 {% endfor %}
-    $$PWD/{{module.module_name|lower}}plugin.cpp
+    $$PWD/{{module.module_name|lower}}simulatorplugin.cpp
 
 RESOURCES += $$PWD/{{module.module_name|lower}}_simulation.qrc