Rename qml var from dataModel to sysinfo

Avoid confusion with modelData when using QMl models.

7 files changed, 19 insertions, 19 deletions

diff --git a/mobility/sysinfo/qml/AvailableLanguages.qml b/mobility/sysinfo/qml/AvailableLanguages.qml
index 279ae0b..9d20ca6 100644
--- a/mobility/sysinfo/qml/AvailableLanguages.qml
+++ b/mobility/sysinfo/qml/AvailableLanguages.qml
@@ -9,7 +9,7 @@ Page {
     ListView {
         anchors.fill: parent
         anchors.centerIn: parent
-        model: dataModel.availableManagers
+        model: sysinfo.availableManagers
         delegate: Button {
             text: modelData
             onClicked: {
diff --git a/mobility/sysinfo/qml/DevicePage.qml b/mobility/sysinfo/qml/DevicePage.qml
index 8dae22f..ab60424 100644
--- a/mobility/sysinfo/qml/DevicePage.qml
+++ b/mobility/sysinfo/qml/DevicePage.qml
@@ -34,37 +34,37 @@ Page {
             }
             Row { 
                 Label { text: "IMEI: "  }
-                Label { id: labelIMEI; text: dataModel.imei }
+                Label { id: labelIMEI; text: sysinfo.imei }
             }
             Row {
                 Label { text: "IMSI: " }
-                Label { id: labelIMSI; text: dataModel.imsi }
+                Label { id: labelIMSI; text: sysinfo.imsi }
             }
             Row {
                 Label { text: "Manufacturer: " }
-                Label { id: labelManufacturer; text: dataModel.manufacturer }
+                Label { id: labelManufacturer; text: sysinfo.manufacturer }
             }
             Row {
                 Label { text: "Model: " }
-                Label { id: labelModel; text: dataModel.model }
+                Label { id: labelModel; text: sysinfo.model }
             }
             Row {
                 Label { text: "Product: " }
-                Label { id: labelProduct; text: dataModel.product }
+                Label { id: labelProduct; text: sysinfo.product }
             }
             Row {
-                Button { id: buttonLock; iconSource: "../general_unlock.png"; checked: dataModel.deviceLock }
+                Button { id: buttonLock; iconSource: "../general_unlock.png"; checked: sysinfo.deviceLock }
                 Label { text: "Device lock"; anchors.verticalCenter: parent.verticalCenter }
             }
             Row {
                 Label { text: "Current profile: " }
-                Label { id: labelProfile; text: dataModel.profile }
+                Label { id: labelProfile; text: sysinfo.profile }
             }
             Row {
                 Label { text: "Input method " }
-                Label { id: labelInputMethod; text: dataModel.inputMethod }
+                Label { id: labelInputMethod; text: sysinfo.inputMethod }
             }
-            RadioButton { text: "Bluetooth on"; checked: dataModel.bluetoothState }
+            RadioButton { text: "Bluetooth on"; checked: sysinfo.bluetoothState }
         }
     }
     ScrollDecorator {
diff --git a/mobility/sysinfo/qml/DisplayPage.qml b/mobility/sysinfo/qml/DisplayPage.qml
index 0c88e2a..205fafc 100644
--- a/mobility/sysinfo/qml/DisplayPage.qml
+++ b/mobility/sysinfo/qml/DisplayPage.qml
@@ -20,11 +20,11 @@ Page {
             spacing: 25
             Row {
                 Label { text: "Brightness: "  }
-                Label { id: labelBrightness; text: dataModel.displayBrightness }
+                Label { id: labelBrightness; text: sysinfo.displayBrightness }
             }
             Row {
                 Label { text: "Color depth: " }
-                Label { id: labelColorDepth; text: dataModel.colorDepth }
+                Label { id: labelColorDepth; text: sysinfo.colorDepth }
             }
 /*          Row {
                 Label { text: "Orientation: " }
diff --git a/mobility/sysinfo/qml/GeneralPage.qml b/mobility/sysinfo/qml/GeneralPage.qml
index 3767c1b..48dafbb 100644
--- a/mobility/sysinfo/qml/GeneralPage.qml
+++ b/mobility/sysinfo/qml/GeneralPage.qml
@@ -12,7 +12,7 @@ Page {
         Row {
             spacing: 20
             Label { text: "Current language:" }
-            Label { id: currentLanguage; text: dataModel.currentLanguage }
+            Label { id: currentLanguage; text: sysinfo.currentLanguage }
         }
         Row {
             spacing: 20
diff --git a/mobility/sysinfo/qml/ScreenSaverPage.qml b/mobility/sysinfo/qml/ScreenSaverPage.qml
index 26d4e92..d25e760 100644
--- a/mobility/sysinfo/qml/ScreenSaverPage.qml
+++ b/mobility/sysinfo/qml/ScreenSaverPage.qml
@@ -6,5 +6,5 @@ Page {
     orientationLock: PageOrientation.LockLandscape
     anchors.margins: UiConstants.DefaultMargin
 
-    RadioButton { text: "Screen saver inhibited"; checked: dataModel.screenSaverInhibited }
+    RadioButton { text: "Screen saver inhibited"; checked: sysinfo.screenSaverInhibited }
 }
diff --git a/mobility/sysinfo/qml/StoragePage.qml b/mobility/sysinfo/qml/StoragePage.qml
index 8db0a36..6c5ad2a 100644
--- a/mobility/sysinfo/qml/StoragePage.qml
+++ b/mobility/sysinfo/qml/StoragePage.qml
@@ -20,7 +20,7 @@ Page {
 
             Repeater {
 
-                model: dataModel.volumeNames
+                model: sysinfo.volumeNames
 
                 Column {
 
@@ -37,15 +37,15 @@ Page {
                     Row {
                         spacing: 30
                         Label {
-                            text: "Type: " + dataModel.storageType(modelData)
+                            text: "Type: " + sysinfo.storageType(modelData)
                         }
 
                         Label {
-                            text: "Total size: " + dataModel.totalStorageSize(modelData)
+                            text: "Total size: " + sysinfo.totalStorageSize(modelData)
                         }
 
                         Label {
-                            text: "Available: " + dataModel.availableStorageSize(modelData)
+                            text: "Available: " + sysinfo.availableStorageSize(modelData)
                         }
                     }
                 }
diff --git a/mobility/sysinfo/qml/main.py b/mobility/sysinfo/qml/main.py
index 407b305..c397b1d 100644
--- a/mobility/sysinfo/qml/main.py
+++ b/mobility/sysinfo/qml/main.py
@@ -238,7 +238,7 @@ class SystemInfoUI(QtCore.QObject):
         self.rc = self.view.rootContext()
 
         self.model = SystemInfoModel()
-        self.rc.setContextProperty('dataModel', self.model)
+        self.rc.setContextProperty('sysinfo', self.model)
 
         self.view.setSource('main.qml')