diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2019-09-12 14:19:15 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2019-09-12 14:50:12 +0200 |
| commit | 346c7aea64f1cdee06cdee4b7ffb1cfb63b67fb2 (patch) | |
| tree | 43334798e99790620d9875d4fcd1c710c097b23b | |
| parent | 51d1472eb3e605c9da7030be1f7ef5ae36975aa6 (diff) | |
| download | qtivi-346c7aea64f1cdee06cdee4b7ffb1cfb63b67fb2.tar.gz | |
ivigenerator: Fix the 'server_qtro_simulator' template to handle 'getter-name' correctly
The underlying QtRO transport doesn't allow us to define the getter or
setter names for the property, that's why we need to use the property
name when deriving from the autogenerated source classes.
Change-Id: I417e85af5460d51fab9964fc163279e5eea3afe1
Fixes: AUTOSUITE-1242
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
3 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/ivigenerator/templates_server_qtro_simulator/adapter.cpp.tpl b/src/tools/ivigenerator/templates_server_qtro_simulator/adapter.cpp.tpl index fc4e68f..a006ae7 100644 --- a/src/tools/ivigenerator/templates_server_qtro_simulator/adapter.cpp.tpl +++ b/src/tools/ivigenerator/templates_server_qtro_simulator/adapter.cpp.tpl @@ -84,7 +84,7 @@ QStringList {{class}}::availableZones() {% endif %} } {% else %} -{{ivi.prop_getter(property, class, model_interface = true)}} +{{property|return_type}} {{class}}::{{property}}() const { {% if property.type.is_var %} return m_helper.toRemoteObjectVariant(m_backend->{{property|getter_name}}()); diff --git a/src/tools/ivigenerator/templates_server_qtro_simulator/adapter.h.tpl b/src/tools/ivigenerator/templates_server_qtro_simulator/adapter.h.tpl index f19d9f1..27ccc31 100644 --- a/src/tools/ivigenerator/templates_server_qtro_simulator/adapter.h.tpl +++ b/src/tools/ivigenerator/templates_server_qtro_simulator/adapter.h.tpl @@ -90,7 +90,7 @@ public: {% if interface_zoned %} Q_INVOKABLE {{property|return_type}} {{property|getter_name}}(const QString &zone = QString()) override; {% else %} - {{ivi.prop_getter(property)}} override; + {{property|return_type}} {{property}}() const override; {% endif %} {% endif %} {% endfor %} diff --git a/tests/auto/core/ivigenerator/org.example.echo.qface b/tests/auto/core/ivigenerator/org.example.echo.qface index d5d9f23..17a519c 100644 --- a/tests/auto/core/ivigenerator/org.example.echo.qface +++ b/tests/auto/core/ivigenerator/org.example.echo.qface @@ -19,6 +19,8 @@ interface Echo { readonly string lastMessage; int intValue; var varValue; + @config: { getter_name: "isEchoEnabled" } + bool echoEnabled; @config_simulator: {minimum: 10.} real floatValue1; @config_simulator: {maximum: 10.} |