From 46e4d06d4e0f6eeaf9ae9b4cca3e87818e2edbaa 2012-06-19 10:45:47
From: Tero Ahola <tero.ahola@digia.com>
Date: 2012-06-19 10:45:47
Subject: [PATCH] Updated QML bar model mapper property names

---

diff --git a/demos/qmlcustommodel/qml/qmlcustommodel/main.qml b/demos/qmlcustommodel/qml/qmlcustommodel/main.qml
index 34b60eb..cbcb77f 100644
--- a/demos/qmlcustommodel/qml/qmlcustommodel/main.qml
+++ b/demos/qmlcustommodel/qml/qmlcustommodel/main.qml
@@ -62,7 +62,7 @@ Rectangle {
                 model: customModel
                 firstBarSetRow: 6
                 lastBarSetRow: 6
-                first: 2
+                firstColumn: 2
             }
         }
         //![5]
diff --git a/src/barchart/qhbarmodelmapper.cpp b/src/barchart/qhbarmodelmapper.cpp
index bc4ed0c..65d7951 100644
--- a/src/barchart/qhbarmodelmapper.cpp
+++ b/src/barchart/qhbarmodelmapper.cpp
@@ -48,7 +48,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 model: myCustomModel
                 firstBarSetRow: 1
                 lastBarSetRow: 3
-                first: 1
+                firstColumn: 1
             }
         }
     \endcode
@@ -74,7 +74,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
     Minimal and default value is: 0
 */
 /*!
-    \qmlproperty int BarModelMapper::first
+    \qmlproperty int BarModelMapper::firstColumn
     Defines which column of the model contains the first values of the QBarSets in the series.
     The default value is 0.
 */
@@ -85,7 +85,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
     Minimal and default value is: -1 (count limited by the number of rows in the model)
 */
 /*!
-    \qmlproperty int BarModelMapper::count
+    \qmlproperty int BarModelMapper::columnCount
     Defines the number of rows of the model that are mapped as the data for QBarSeries. The default value is
     -1 (count limited by the number of rows in the model)
 */
diff --git a/src/barchart/qvbarmodelmapper.cpp b/src/barchart/qvbarmodelmapper.cpp
index 8dad1cd..4ea2ac1 100644
--- a/src/barchart/qvbarmodelmapper.cpp
+++ b/src/barchart/qvbarmodelmapper.cpp
@@ -48,7 +48,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 model: myCustomModel
                 firstBarSetColumn: 1
                 lastBarSetColumn: 3
-                first: 1
+                firstRow: 1
             }
         }
     \endcode
@@ -82,7 +82,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
     Minimal and default value is: 0
 */
 /*!
-    \qmlproperty int BarModelMapper::first
+    \qmlproperty int BarModelMapper::firstRow
     Defines which row of the model contains the first values of the QBarSets in the series.
     The default value is 0.
 */
@@ -93,7 +93,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
     Minimal and default value is: -1 (count limited by the number of rows in the model)
 */
 /*!
-    \qmlproperty int BarModelMapper::count
+    \qmlproperty int BarModelMapper::rowCount
     Defines the number of rows of the model that are mapped as the data for QBarSeries. The default value is
     -1 (count limited by the number of rows in the model)
 */