diff options
Diffstat (limited to 'examples/ivicore/qface-tutorial/chapter6-own-backend')
5 files changed, 10 insertions, 10 deletions
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentcluster_dbus.json b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentcluster_dbus.json index 7461695..24c159f 100644 --- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentcluster_dbus.json +++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentcluster_dbus.json @@ -1,5 +1,5 @@ { "interfaces" : [ - "Example.IVI.InstrumentCluster.InstrumentCluster" + "Example.IVI.InstrumentClusterModule.InstrumentCluster" ] } diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentclusterplugin.cpp b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentclusterplugin.cpp index 8c7d65d..acb2248 100644 --- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentclusterplugin.cpp +++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentclusterplugin.cpp @@ -61,12 +61,12 @@ InstrumentClusterPlugin::InstrumentClusterPlugin(QObject *parent) QStringList InstrumentClusterPlugin::interfaces() const { - return QStringList(InstrumentCluster_InstrumentCluster_iid); + return QStringList(InstrumentClusterModule_InstrumentCluster_iid); } QIviFeatureInterface *InstrumentClusterPlugin::interfaceInstance(const QString &interface) const { - if (interface == InstrumentCluster_InstrumentCluster_iid) + if (interface == InstrumentClusterModule_InstrumentCluster_iid) return m_backend; return nullptr; diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/simulation.qml b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/simulation.qml index 58cac5b..797cfcf 100644 --- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/simulation.qml +++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/simulation.qml @@ -52,13 +52,13 @@ ****************************************************************************/ import QtQuick 2.10 -import Example.IVI.InstrumentCluster.simulation 1.0 +import Example.IVI.InstrumentClusterModule.simulation 1.0 QtObject { property var settings : IviSimulator.findData(IviSimulator.simulationData, "InstrumentCluster") property bool defaultInitialized: false property LoggingCategory qLcInstrumentCluster: LoggingCategory { - name: "example.ivi.instrumentcluster.simulation.instrumentclusterbackend" + name: "example.ivi.instrumentclustermodule.simulation.instrumentclusterbackend" } property var backend : InstrumentClusterBackend { @@ -107,7 +107,7 @@ QtObject { ScriptAction { script: { - backend.currentWarning = InstrumentCluster.warning("red","LOW FUEL", "images/fuelsymbol_orange.png") + backend.currentWarning = InstrumentClusterModule.warning("red","LOW FUEL", "images/fuelsymbol_orange.png") } } @@ -120,7 +120,7 @@ QtObject { ScriptAction { script: { - backend.currentWarning = InstrumentCluster.warning() + backend.currentWarning = InstrumentClusterModule.warning() } } } diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster.qface b/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster.qface index f6a5c9f..b06dffc 100644 --- a/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster.qface +++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster.qface @@ -1,5 +1,5 @@ @config_simulator: { simulationFile: "qrc:/simulation.qml" } -module Example.IVI.InstrumentCluster 1.0 +module Example.IVI.InstrumentClusterModule 1.0 interface InstrumentCluster { readonly int speed; diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster/Cluster.qml b/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster/Cluster.qml index 3833d67..9ed127d 100644 --- a/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster/Cluster.qml +++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster/Cluster.qml @@ -53,7 +53,7 @@ import QtQuick 2.1 import QtQuick.Window 2.2 -import Example.IVI.InstrumentCluster 1.0 +import Example.IVI.InstrumentClusterModule 1.0 Window { id: root @@ -74,7 +74,7 @@ Window { anchors.leftMargin: 0.1 * width value: instrumentCluster.speed - metricSystem: instrumentCluster.systemType === InstrumentCluster.Metric + metricSystem: instrumentCluster.systemType === InstrumentClusterModule.Metric } RightDial { |