diff options
author | Dominik Holland <dominik.holland@pelagicore.com> | 2016-07-28 09:28:03 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@pelagicore.com> | 2016-07-28 15:17:03 +0000 |
commit | 7bd4a1f1ee476e38aab923a9315250171145aa73 (patch) | |
tree | d1f5890d0a522dc37fe9f39615c61a0077cd3599 /tests/auto/vehiclefunctions | |
parent | a805eb6681cb3ad7e8eb61035fb4fc7c1efdf88f (diff) | |
download | qtivi-7bd4a1f1ee476e38aab923a9315250171145aa73.tar.gz |
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>
Diffstat (limited to 'tests/auto/vehiclefunctions')
-rw-r--r-- | tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp | 6 | ||||
-rw-r--r-- | tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
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; } |