diff options
author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-12-21 11:50:54 +0100 |
---|---|---|
committer | Robert Griebl <robert.griebl@pelagicore.com> | 2019-01-10 14:26:45 +0000 |
commit | 7a52f22258eabc31249028e64d0d62311395040c (patch) | |
tree | ac54ab7721ea64f7575ebad528584f8ee7a8136f | |
parent | 549e761b169374bf81d282f58790a33beb7978ac (diff) | |
download | qtivi-7a52f22258eabc31249028e64d0d62311395040c.tar.gz |
Fix code style issues in the autogenerated code
Change-Id: I27646c536069820c3fa952d1f34b9461fe63c356
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
9 files changed, 25 insertions, 11 deletions
diff --git a/src/tools/ivigenerator/common/qtivi_macros.j2 b/src/tools/ivigenerator/common/qtivi_macros.j2 index 9c50073..d35a405 100644 --- a/src/tools/ivigenerator/common/qtivi_macros.j2 +++ b/src/tools/ivigenerator/common/qtivi_macros.j2 @@ -96,7 +96,7 @@ QIviPendingReply<{{operation|return_type}}> {{scope}}{{operation}}({{join_params {% set _notify = ''%} {% endif %} Q_PROPERTY({{property|return_type}} {{property}} READ {{property|getter_name}}{{write}}{{_notify}}) -{% endmacro %} +{%- endmacro %} {# function header for a property setter: setProperty(...) diff --git a/src/tools/ivigenerator/templates_backend_simulator/backend.cpp.tpl b/src/tools/ivigenerator/templates_backend_simulator/backend.cpp.tpl index 45acd34..7ff9502 100644 --- a/src/tools/ivigenerator/templates_backend_simulator/backend.cpp.tpl +++ b/src/tools/ivigenerator/templates_backend_simulator/backend.cpp.tpl @@ -109,7 +109,9 @@ QT_BEGIN_NAMESPACE , m_{{ property }}({{property|default_value}}) {% endif %} {% endfor %} +{% if interface_zoned %} , m_zones(new QQmlPropertyMap(this)) +{% endif %} {% if 'simulator' in features %} , mWorker(nullptr) {% endif %} diff --git a/src/tools/ivigenerator/templates_backend_simulator/backend.h.tpl b/src/tools/ivigenerator/templates_backend_simulator/backend.h.tpl index 4c28805..8db8c38 100644 --- a/src/tools/ivigenerator/templates_backend_simulator/backend.h.tpl +++ b/src/tools/ivigenerator/templates_backend_simulator/backend.h.tpl @@ -124,7 +124,9 @@ class {{class}} : public {{class}}Interface {% endif %} Q_PROPERTY({{type}} {{property}} READ {{property|getter_name}} WRITE {{property|setter_name}} NOTIFY {{property.name}}Changed FINAL) {% endfor %} +{% if interface_zoned %} Q_PROPERTY(QQmlPropertyMap *zones READ zones CONSTANT) +{% endif %} public: explicit {{class}}(QObject *parent = nullptr); explicit {{class}}(QIviSimulationEngine *engine, QObject *parent = nullptr); @@ -143,7 +145,9 @@ public: {% for property in interface.properties %} {{ivi.prop_getter(property, model_interface = true)}}; {% endfor %} +{% if interface_zoned %} QQmlPropertyMap *zones() const { return m_zones; } +{% endif %} public Q_SLOTS: {% for property in interface.properties %} @@ -171,7 +175,9 @@ protected: {% endif %} {#{% endif %}#} {% endfor %} +{% if interface_zoned %} QQmlPropertyMap *m_zones; +{% endif %} {% if 'simulator' in features %} QSimulatorConnection *mConnection; diff --git a/src/tools/ivigenerator/templates_frontend/backendinterface.h.tpl b/src/tools/ivigenerator/templates_frontend/backendinterface.h.tpl index 09fc71c..fca51b0 100644 --- a/src/tools/ivigenerator/templates_frontend/backendinterface.h.tpl +++ b/src/tools/ivigenerator/templates_frontend/backendinterface.h.tpl @@ -69,6 +69,7 @@ QT_BEGIN_NAMESPACE class {{exportsymbol}} {{class}} : public {{base_class}} { Q_OBJECT + public: explicit {{class}}(QObject *parent = nullptr); ~{{class}}(); diff --git a/src/tools/ivigenerator/templates_frontend/interface.h.tpl b/src/tools/ivigenerator/templates_frontend/interface.h.tpl index 7bb2064..e972f32 100644 --- a/src/tools/ivigenerator/templates_frontend/interface.h.tpl +++ b/src/tools/ivigenerator/templates_frontend/interface.h.tpl @@ -70,7 +70,8 @@ QT_BEGIN_NAMESPACE class {{class}}Private; class {{class}}BackendInterface; -class {{exportsymbol}} {{class}} : public {{base_class}} { +class {{exportsymbol}} {{class}} : public {{base_class}} +{ Q_OBJECT {% for property in interface.properties %} {{ivi.property(property)}} @@ -79,6 +80,7 @@ class {{exportsymbol}} {{class}} : public {{base_class}} { {% if interface.module.tags.config.validation_info %} Q_CLASSINFO("IviJson", "{{ module|jsonify|replace("\"", "\\\"")|replace("\n", " \\\n") }}") {% endif %} + public: {% if interface.tags.config.zoned %} explicit {{class}}(const QString &zone = QString(), QObject *parent = nullptr); diff --git a/src/tools/ivigenerator/templates_frontend/module.cpp.tpl b/src/tools/ivigenerator/templates_frontend/module.cpp.tpl index 3e32599..73798d9 100644 --- a/src/tools/ivigenerator/templates_frontend/module.cpp.tpl +++ b/src/tools/ivigenerator/templates_frontend/module.cpp.tpl @@ -84,18 +84,17 @@ QObject* {{class|lower}}_singletontype_provider(QQmlEngine*, QJSEngine*) {% for enum in module.enums %} /*! \internal */ -{{class}}::{{enum}} {{class}}::to{{enum}}(quint8 v, bool *ok) { - if (ok) { +{{class}}::{{enum}} {{class}}::to{{enum}}(quint8 v, bool *ok) +{ + if (ok) *ok = true; - } switch (v) { {% for member in enum.members %} case {{member.value}}: return {{member.name}}; {% endfor %} default: - if (ok) { + if (ok) *ok = false; - } return {{enum.members|first}}; } } @@ -140,9 +139,8 @@ QDataStream &operator>>(QDataStream &in, {{class}}::{{enum|flag_type}} &var) quint8 val; in >> val; var = {{class}}::to{{enum}}(val, &ok); - if (!ok) { + if (!ok) qWarning() << "Received an invalid enum value for type {{class}}::{{enum|flag_type}}, value =" << var; - } return in; } {% endfor %} diff --git a/src/tools/ivigenerator/templates_frontend/module.h.tpl b/src/tools/ivigenerator/templates_frontend/module.h.tpl index fb1f80f..dd81b45 100644 --- a/src/tools/ivigenerator/templates_frontend/module.h.tpl +++ b/src/tools/ivigenerator/templates_frontend/module.h.tpl @@ -54,8 +54,10 @@ QT_BEGIN_NAMESPACE -class {{exportsymbol}} {{class}} : public QObject { +class {{exportsymbol}} {{class}} : public QObject +{ Q_OBJECT + public: {{class}}(QObject *parent=nullptr); diff --git a/src/tools/ivigenerator/templates_frontend/modulefactory.h.tpl b/src/tools/ivigenerator/templates_frontend/modulefactory.h.tpl index 883026f..e48496d 100644 --- a/src/tools/ivigenerator/templates_frontend/modulefactory.h.tpl +++ b/src/tools/ivigenerator/templates_frontend/modulefactory.h.tpl @@ -58,8 +58,10 @@ QT_BEGIN_NAMESPACE -class {{exportsymbol}} {{class}} : public {{module.module_name|upperfirst}}Module { +class {{exportsymbol}} {{class}} : public {{module.module_name|upperfirst}}Module +{ Q_OBJECT + public: {{class}}(QObject *parent = nullptr); diff --git a/src/tools/ivigenerator/templates_frontend/struct.h.tpl b/src/tools/ivigenerator/templates_frontend/struct.h.tpl index 376ff64..6e99119 100644 --- a/src/tools/ivigenerator/templates_frontend/struct.h.tpl +++ b/src/tools/ivigenerator/templates_frontend/struct.h.tpl @@ -71,6 +71,7 @@ class {{exportsymbol}} {{class}} : public QIviStandardItem {{ivi.property(field, notify=false)}} {% endfor %} Q_CLASSINFO("IviPropertyDomains", "{{ struct.fields|json_domain|replace("\"", "\\\"") }}") + public: Q_INVOKABLE {{class}}(); Q_INVOKABLE {{class}}(const {{class}} &rhs); |