aboutsummaryrefslogtreecommitdiffstats
path: root/src/tools/ivigenerator/templates_frontend
diff options
context:
space:
mode:
authorAntti Hölttä <AHoelttae@luxoft.com>2018-03-21 11:37:56 +0100
committerAntti Hölttä <ahoelttae@luxoft.com>2018-03-21 15:09:54 +0000
commita3af38e5f6df4a452f2be22d480faaffe31af908 (patch)
tree87a337bdd5a7e0b9ad907cadafe31c3a37644a44 /src/tools/ivigenerator/templates_frontend
parentf3dfd4e6c846e7b0d406d898a1cf8b7a766f59eb (diff)
Fix backend initialization issues
Fix initialization issues in generated backend classes and also in the QIviAbstractFeature class. Add initialization check to the autogenerated test. Add initialization and reconnection tests for remote object features. Change-Id: I5dbb179c612da721676a4b4959d8626a237f479a Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'src/tools/ivigenerator/templates_frontend')
-rw-r--r--src/tools/ivigenerator/templates_frontend/interface.cpp.tpl11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/tools/ivigenerator/templates_frontend/interface.cpp.tpl b/src/tools/ivigenerator/templates_frontend/interface.cpp.tpl
index 9adb81e..f327da4 100644
--- a/src/tools/ivigenerator/templates_frontend/interface.cpp.tpl
+++ b/src/tools/ivigenerator/templates_frontend/interface.cpp.tpl
@@ -369,11 +369,6 @@ QIviAbstractZonedFeature *{{class}}::createZoneFeature(const QString &zone)
/*! \internal */
void {{class}}::connectToServiceObject(QIviServiceObject *serviceObject)
{
-{% if interface.tags.config.zoned %}
- QIviAbstractZonedFeature::connectToServiceObject(serviceObject);
-{% else %}
- Q_UNUSED(serviceObject);
-{% endif %}
auto d = {{class}}Private::get(this);
auto *backend = qobject_cast<{{class}}BackendInterface*>(this->backend());
@@ -393,7 +388,11 @@ void {{class}}::connectToServiceObject(QIviServiceObject *serviceObject)
d, &{{class}}Private::on{{signal|upperfirst}});
{% endfor %}
- backend->initialize();
+{% if interface.tags.config.zoned %}
+ QIviAbstractZonedFeature::connectToServiceObject(serviceObject);
+{% else %}
+ QIviAbstractFeature::connectToServiceObject(serviceObject);
+{% endif %}
}
/*! \internal */