Integrated item model mappings to item model proxies

Separate mapping object was redundant.

Task-number: QTRD-2564
Change-Id: I6b1a23ba52dbb184f46df0fdd64184eeb145c0c3
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

2 files changed, 9 insertions, 15 deletions

diff --git a/tests/qmlcamera/qml/qmlcamera/Data.qml b/tests/qmlcamera/qml/qmlcamera/Data.qml
index 2072aaed..f7b71c7a 100644
--- a/tests/qmlcamera/qml/qmlcamera/Data.qml
+++ b/tests/qmlcamera/qml/qmlcamera/Data.qml
@@ -20,22 +20,16 @@ import QtQuick 2.1
 import QtDataVisualization 1.0
 
 Item {
-    property alias mapping: valueMapping
     property alias model: dataModel
     property alias proxy: modelProxy
     property alias series: barSeries
 
-    BarDataMapping {
-        id: valueMapping
-        rowRole: "year"
-        columnRole: "month"
-        valueRole: "expenses"
-    }
-
     ItemModelBarDataProxy {
         id: modelProxy
-        activeMapping: valueMapping
         itemModel: dataModel
+        rowRole: "year"
+        columnRole: "month"
+        valueRole: "expenses"
     }
 
     Bar3DSeries {
diff --git a/tests/qmlcamera/qml/qmlcamera/main.qml b/tests/qmlcamera/qml/qmlcamera/main.qml
index fce5cc33..aad60f42 100644
--- a/tests/qmlcamera/qml/qmlcamera/main.qml
+++ b/tests/qmlcamera/qml/qmlcamera/main.qml
@@ -118,12 +118,12 @@ Item {
         width: camControlArea.width
         text: "Show Income"
         onClicked: {
-            if (chartData.mapping.valueRole === "expenses") {
-                chartData.mapping.valueRole = "income"
+            if (chartData.proxy.valueRole === "expenses") {
+                chartData.proxy.valueRole = "income"
                 text = "Show Expenses"
                 testChart.valueAxis = chartAxes.income
             } else {
-                chartData.mapping.valueRole = "expenses"
+                chartData.proxy.valueRole = "expenses"
                 text = "Show Income"
                 testChart.valueAxis = chartAxes.expenses
             }
@@ -154,13 +154,13 @@ Item {
         onClicked: {
             if (testChart.rowAxis.max !== 6) {
                 text = "Show 2010 - 2012"
-                chartData.mapping.autoRowCategories = true
+                chartData.proxy.autoRowCategories = true
             } else {
                 text = "Show all years"
                 // Explicitly defining row categories, since we do not want to show data for
                 // all years in the model, just for the selected ones.
-                chartData.mapping.autoRowCategories = false
-                chartData.mapping.rowCategories = ["2010", "2011", "2012"]
+                chartData.proxy.autoRowCategories = false
+                chartData.proxy.rowCategories = ["2010", "2011", "2012"]
             }
         }
     }