aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2021-05-18 11:53:11 +0200
committerDominik Holland <dominik.holland@qt.io>2021-05-20 15:23:45 +0200
commit43c9feb0c4e7b9550d539ac0c1b3c83fe6d20ecb (patch)
treec2ae3016ee0ca0f020ab31b40b3baa2135e19e88
parent2d2d4e0cdaec8dbb6e8612f4d408d247ea57f993 (diff)
ivigenerator: Fix class names of the backend_qtro backend
All classes using a ro in the name to make sure they don't clash with other backend classes. Change-Id: I7898923b53ba2e4d3283f5dbf5d4bc0af05176f9 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
-rw-r--r--src/tools/ivigenerator/templates/backend_qtro.yaml8
-rw-r--r--src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl4
-rw-r--r--src/tools/ivigenerator/templates/backend_qtro/backend.cpp.tpl12
-rw-r--r--src/tools/ivigenerator/templates/backend_qtro/backend.h.tpl10
-rw-r--r--src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl4
-rw-r--r--src/tools/ivigenerator/templates/backend_qtro/pagingmodel.h.tpl4
-rw-r--r--src/tools/ivigenerator/templates/backend_qtro/plugin.cpp.tpl6
-rw-r--r--src/tools/ivigenerator/templates/backend_qtro/plugin.h.tpl2
-rw-r--r--src/tools/ivigenerator/templates/backend_qtro/plugin.pri.tpl8
9 files changed, 29 insertions, 29 deletions
diff --git a/src/tools/ivigenerator/templates/backend_qtro.yaml b/src/tools/ivigenerator/templates/backend_qtro.yaml
index 0d0fbff..b5c927a 100644
--- a/src/tools/ivigenerator/templates/backend_qtro.yaml
+++ b/src/tools/ivigenerator/templates/backend_qtro.yaml
@@ -1,13 +1,13 @@
backend_qtro:
module:
documents:
- - "{{module.module_name|lower}}qtroplugin.h": "plugin.h.tpl"
- - "{{module.module_name|lower}}qtroplugin.cpp": "plugin.cpp.tpl"
+ - "{{module.module_name|lower}}roplugin.h": "plugin.h.tpl"
+ - "{{module.module_name|lower}}roplugin.cpp": "plugin.cpp.tpl"
- "{{module.module_name|lower}}.json": "plugin.json"
- "{{srcBase|lower}}.pri": "plugin.pri.tpl"
- '{{srcBase|lower}}.cmake': 'CMakeLists.txt.tpl'
interface:
documents:
- - '{{interface|lower}}backend.h': 'backend.h.tpl'
- - '{{interface|lower}}backend.cpp': 'backend.cpp.tpl'
+ - '{{interface|lower}}robackend.h': 'backend.h.tpl'
+ - '{{interface|lower}}robackend.cpp': 'backend.cpp.tpl'
- "{{interface|lower}}.rep": "common/interface.rep.tpl"
diff --git a/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl
index e1fbcd2..2308273 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl
@@ -5,9 +5,9 @@ endif()
target_sources(${CURRENT_TARGET}
PRIVATE
{% for interface in module.interfaces %}
- {{interface|lower}}backend.cpp
+ {{interface|lower}}robackend.cpp
{% endfor %}
- {{module.module_name|lower}}qtroplugin.cpp
+ {{module.module_name|lower}}roplugin.cpp
)
qt6_add_repc_replica(${CURRENT_TARGET}
diff --git a/src/tools/ivigenerator/templates/backend_qtro/backend.cpp.tpl b/src/tools/ivigenerator/templates/backend_qtro/backend.cpp.tpl
index cf9aebc..b4a43c8 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/backend.cpp.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/backend.cpp.tpl
@@ -39,8 +39,8 @@
#}
{% import 'common/qtivi_macros.j2' as ivi %}
{% include "common/generated_comment.cpp.tpl" %}
-{% set class = '{0}Backend'.format(interface) %}
-{% set zone_class = '{0}Zone'.format(interface) %}
+{% set class = '{0}RoBackend'.format(interface) %}
+{% set zone_class = '{0}RoZone'.format(interface) %}
{% set interface_zoned = interface.tags.config and interface.tags.config.zoned %}
#include "{{class|lower}}.h"
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
, m_zone(zone)
{% for property in interface.properties %}
{% if property.type.is_model %}
- , m_{{property}}(new Zoned{{property|upperfirst}}ModelBackend(QStringLiteral("{{interface.qualified_name}}.{{property}}.") + m_zone, this))
+ , m_{{property}}(new Zoned{{property|upperfirst}}RoModelBackend(QStringLiteral("{{interface.qualified_name}}.{{property}}.") + m_zone, this))
{% else %}
, m_{{ property }}({{property|default_type_value}})
{% endif %}
@@ -129,16 +129,16 @@ void {{zone_class}}::emitCurrentState()
{% endif %}
{{class}}::{{class}}(const QString &remoteObjectsLookupName, QObject *parent)
- : {{class}}Interface(parent)
+ : {{interface}}BackendInterface(parent)
, m_node(nullptr)
, m_remoteObjectsLookupName(remoteObjectsLookupName)
, m_helper(new QIviRemoteObjectReplicaHelper(qLcRO{{interface}}(), this))
{% for property in interface.properties %}
{% if property.type.is_model %}
{% if interface_zoned %}
- , m_{{property}}(new Zoned{{property|upperfirst}}ModelBackend(QStringLiteral("{{interface.qualified_name}}.{{property}}"), this))
+ , m_{{property}}(new Zoned{{property|upperfirst}}RoModelBackend(QStringLiteral("{{interface.qualified_name}}.{{property}}"), this))
{% else %}
- , m_{{property}}(new {{property|upperfirst}}ModelBackend(QStringLiteral("{{interface.qualified_name}}.{{property}}"), this))
+ , m_{{property}}(new {{property|upperfirst}}RoModelBackend(QStringLiteral("{{interface.qualified_name}}.{{property}}"), this))
{% endif %}
{% endif %}
{% endfor %}
diff --git a/src/tools/ivigenerator/templates/backend_qtro/backend.h.tpl b/src/tools/ivigenerator/templates/backend_qtro/backend.h.tpl
index 26934f5..70b4581 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/backend.h.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/backend.h.tpl
@@ -39,8 +39,8 @@
#}
{% import 'common/qtivi_macros.j2' as ivi %}
{% include "common/generated_comment.cpp.tpl" %}
-{% set class = '{0}Backend'.format(interface) %}
-{% set zone_class = '{0}Zone'.format(interface) %}
+{% set class = '{0}RoBackend'.format(interface) %}
+{% set zone_class = '{0}RoZone'.format(interface) %}
{% set interface_zoned = interface.tags.config and interface.tags.config.zoned %}
{% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %}
#ifndef {{oncedefine}}
@@ -49,9 +49,9 @@
#include <QRemoteObjectNode>
#include <QIviRemoteObjectReplicaHelper>
{% if module.tags.config.module %}
-#include <{{module.tags.config.module}}/{{class}}Interface>
+#include <{{module.tags.config.module}}/{{interface}}BackendInterface>
{% else %}
-#include "{{class|lower}}interface.h"
+#include "{{interface|lower}}backendinterface.h"
{% endif %}
#include "rep_{{interface|lower}}_replica.h"
@@ -101,7 +101,7 @@ private:
};
{% endif %}
-class {{class}} : public {{class}}Interface
+class {{class}} : public {{interface}}BackendInterface
{
Q_OBJECT
diff --git a/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl b/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl
index 69be2a2..8662e2b 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl
@@ -38,9 +38,9 @@
#}
{% set interface_zoned = interface.tags.config and interface.tags.config.zoned %}
{% if interface_zoned %}
-{% set class = 'Zoned{0}ModelBackend'.format(property|upperfirst) %}
+{% set class = 'Zoned{0}RoModelBackend'.format(property|upperfirst) %}
{% else %}
-{% set class = '{0}ModelBackend'.format(property|upperfirst) %}
+{% set class = '{0}RoModelBackend'.format(property|upperfirst) %}
{% endif %}
Q_LOGGING_CATEGORY(qLcRO{{interface}}{{property|upper_first}}, "{{module|qml_type|lower}}.{{interface|lower}}backend.{{property|lower}}.remoteobjects", QtInfoMsg)
diff --git a/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.h.tpl b/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.h.tpl
index 740298f..4f4774b 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.h.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.h.tpl
@@ -38,9 +38,9 @@
#}
{% set interface_zoned = interface.tags.config and interface.tags.config.zoned %}
{% if interface_zoned %}
-{% set class = 'Zoned{0}ModelBackend'.format(property|upperfirst) %}
+{% set class = 'Zoned{0}RoModelBackend'.format(property|upperfirst) %}
{% else %}
-{% set class = '{0}ModelBackend'.format(property|upperfirst) %}
+{% set class = '{0}RoModelBackend'.format(property|upperfirst) %}
{% endif %}
#include <QIviPagingModelInterface>
diff --git a/src/tools/ivigenerator/templates/backend_qtro/plugin.cpp.tpl b/src/tools/ivigenerator/templates/backend_qtro/plugin.cpp.tpl
index 290b5e9..88dedae 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/plugin.cpp.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/plugin.cpp.tpl
@@ -38,12 +38,12 @@
# SPDX-License-Identifier: LGPL-3.0
#}
{% include "common/generated_comment.cpp.tpl" %}
-{% set class = '{0}QtROPlugin'.format(module.module_name) %}
+{% set class = '{0}RoPlugin'.format(module.module_name) %}
#include "{{class|lower}}.h"
{% for interface in module.interfaces %}
-#include "{{interface|lower}}backend.h"
+#include "{{interface|lower}}robackend.h"
{% endfor %}
#include <QStringList>
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
: QObject(parent)
{
{% for interface in module.interfaces %}
- m_interfaces << new {{interface}}Backend(QStringLiteral("{{interface.qualified_name}}"), this);
+ m_interfaces << new {{interface}}RoBackend(QStringLiteral("{{interface.qualified_name}}"), this);
{% endfor %}
}
diff --git a/src/tools/ivigenerator/templates/backend_qtro/plugin.h.tpl b/src/tools/ivigenerator/templates/backend_qtro/plugin.h.tpl
index 355583f..04e9e85 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}QtROPlugin'.format(module.module_name) %}
+{% set class = '{0}RoPlugin'.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 cb2e822..5daa562 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/plugin.pri.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/plugin.pri.tpl
@@ -46,15 +46,15 @@ QT += remoteobjects iviremoteobjects_helper_private
HEADERS += \
{% for interface in module.interfaces %}
- $$PWD/{{interface|lower}}backend.h \
+ $$PWD/{{interface|lower}}robackend.h \
{% endfor %}
- $$PWD/{{module.module_name|lower}}qtroplugin.h
+ $$PWD/{{module.module_name|lower}}roplugin.h
SOURCES += \
{% for interface in module.interfaces %}
- $$PWD/{{interface|lower}}backend.cpp \
+ $$PWD/{{interface|lower}}robackend.cpp \
{% endfor %}
- $$PWD/{{module.module_name|lower}}qtroplugin.cpp
+ $$PWD/{{module.module_name|lower}}roplugin.cpp
REPC_REPLICA += \
{% for interface in module.interfaces %}