diff options
author | Dominik Holland <dominik.holland@qt.io> | 2021-05-27 17:43:38 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@qt.io> | 2021-05-28 14:13:31 +0200 |
commit | b2107c897eb0a945c2a3b756322f261c549c13aa (patch) | |
tree | 72394e20f7996995caa05d27a156f65e9096a918 /tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp | |
parent | e63abd2a122a21623e0c623b94f4719149c1eca7 (diff) |
ivigenerator: Remove the "Module" postfix in the autogenerated classes
The module class which is autogenerated by the ivigenerator always got
a postfix which was used to prevent compilation errors when module and
interface had the same name.
As we don't use any extra postfix for structs or interfaces either
the "Module" postfix is now dropped as well and the module should rather
be renamed already in the IDL file instead.
Change-Id: I91bf95e824436e65e374aaf397ecd5c548444589
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp')
-rw-r--r-- | tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp index 0010d89..8e0c764 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp @@ -41,7 +41,7 @@ EchoZonedService::EchoZonedService(QObject *parent) : EchoZonedSimpleSource(parent) - , m_testCombo(Contact(QStringLiteral("Antti"), 34, true, QVariant()), EchoModule::Friday) + , m_testCombo(Contact(QStringLiteral("Antti"), 34, true, QVariant()), Echomodule::Friday) , m_testId(QStringLiteral("id123")) { m_zoneHash.insert(QString(), ZoneObject()); @@ -123,12 +123,12 @@ void EchoZonedService::setEchoEnabled(bool echoEnabled, const QString &zone) SET_VALUE(m_echoEnabled, echoEnabled, echoEnabledChanged); } -EchoModule::AirflowDirections EchoZonedService::airflowDirection(const QString &zone) +Echomodule::AirflowDirections EchoZonedService::airflowDirection(const QString &zone) { return m_zoneHash.value(zone).m_airflowDirection; } -void EchoZonedService::setAirflowDirection(EchoModule::AirflowDirections airflowDirection, const QString &zone) +void EchoZonedService::setAirflowDirection(Echomodule::AirflowDirections airflowDirection, const QString &zone) { SET_VALUE(m_airflowDirection, airflowDirection, airflowDirectionChanged); } @@ -193,22 +193,22 @@ void EchoZonedService::setComboList(const QVariantList &comboList, const QString SET_VALUE(m_comboList, comboList, comboListChanged); } -EchoModule::DaysOfTheWeek EchoZonedService::weekDay(const QString &zone) +Echomodule::DaysOfTheWeek EchoZonedService::weekDay(const QString &zone) { return m_zoneHash.value(zone).m_weekDay; } -void EchoZonedService::setWeekDay(EchoModule::DaysOfTheWeek weekDay, const QString &zone) +void EchoZonedService::setWeekDay(Echomodule::DaysOfTheWeek weekDay, const QString &zone) { SET_VALUE(m_weekDay, weekDay, weekDayChanged); } -EchoModule::TestEnum EchoZonedService::testEnum(const QString &zone) +Echomodule::TestEnum EchoZonedService::testEnum(const QString &zone) { return m_zoneHash.value(zone).m_testEnum; } -void EchoZonedService::setTestEnum(EchoModule::TestEnum testEnum, const QString &zone) +void EchoZonedService::setTestEnum(Echomodule::TestEnum testEnum, const QString &zone) { SET_VALUE(m_testEnum, testEnum, testEnumChanged); } @@ -264,13 +264,13 @@ QVariant EchoZonedService::timer(int interval, const QString &zone) return QVariant::fromValue(pendingResult); } -QVariant EchoZonedService::flagMethod(EchoModule::AirflowDirections direction, const QString &zone) +QVariant EchoZonedService::flagMethod(Echomodule::AirflowDirections direction, const QString &zone) { emit flagMethodCalled(direction, zone); return QVariant::fromValue(direction); } -QVariant EchoZonedService::enumMethod(EchoModule::TestEnum testEnum, const QString &zone) +QVariant EchoZonedService::enumMethod(Echomodule::TestEnum testEnum, const QString &zone) { emit enumMethodCalled(testEnum, zone); return QVariant::fromValue(testEnum); |