Invalid point/selection as constant property in qml

Also fixed 0,0 QPoint -> QPointF conversion issue for Q3DScene

Task-number: QTRD-2688
Change-Id: I3778081bb6ef2b5dbfcaad7502a4e164286c2646
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>

6 files changed, 18 insertions, 19 deletions

diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp
index 6f0973cc..fea0b359 100644
--- a/src/datavisualization/data/qbar3dseries.cpp
+++ b/src/datavisualization/data/qbar3dseries.cpp
@@ -93,16 +93,16 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  * Selects a bar at the \a position. The \a position is the (row, column) position in
  * the data array of the series.
  * Only one bar can be selected at a time.
- * To clear selection, set invalidSelectionPosition() as the \a position.
+ * To clear selection, set invalidSelectionPosition as the \a position.
  * If this series is added to a graph, the graph can adjust the selection according to user
  * interaction or if it becomes invalid. Selecting a bar on another added series will also
  * clear the selection.
  */
 
 /*!
- * \qmlmethod point Bar3DSeries::invalidSelectionPosition()
- * \return an invalid position for selection. Set this position to selectedBar property if you
- * want to clear the selection.
+ * \qmlproperty point Bar3DSeries::invalidSelectionPosition
+ * A constant property providing an invalid position for selection. Set this position to
+ * selectedBar property if you want to clear the selection.
  */
 
 /*!
@@ -185,7 +185,7 @@ QPoint QBar3DSeries::selectedBar() const
  * \return an invalid position for selection. Set this position to selectedBar property if you
  * want to clear the selection.
  */
-QPoint QBar3DSeries::invalidSelectionPosition() const
+QPoint QBar3DSeries::invalidSelectionPosition()
 {
     return Bars3DController::invalidSelectionPosition();
 }
diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h
index 5883cbfb..d4e948ad 100644
--- a/src/datavisualization/data/qbar3dseries.h
+++ b/src/datavisualization/data/qbar3dseries.h
@@ -43,7 +43,7 @@ public:
 
     void setSelectedBar(const QPoint &position);
     QPoint selectedBar() const;
-    QPoint invalidSelectionPosition() const;
+    static QPoint invalidSelectionPosition();
 
 signals:
     void dataProxyChanged(QBarDataProxy *proxy);
diff --git a/src/datavisualization/data/qscatter3dseries.cpp b/src/datavisualization/data/qscatter3dseries.cpp
index 0e7ce921..5aa17ed3 100644
--- a/src/datavisualization/data/qscatter3dseries.cpp
+++ b/src/datavisualization/data/qscatter3dseries.cpp
@@ -88,7 +88,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  *
  * Selects an item at the \a index. The \a index is the index in the data array of the series.
  * Only one item can be selected at a time.
- * To clear selection, set invalidSelectionIndex() as the \a index.
+ * To clear selection, set invalidSelectionIndex as the \a index.
  * If this series is added to a graph, the graph can adjust the selection according to user
  * interaction or if it becomes invalid. Selecting an item on another added series will also
  * clear the selection.
@@ -103,9 +103,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  */
 
 /*!
- * \qmlmethod int Scatter3DSeries::invalidSelectionIndex()
- * \return an invalid index for selection. Set this index to selectedItem property if you
- * want to clear the selection.
+ * \qmlproperty int Scatter3DSeries::invalidSelectionIndex
+ * A constant property providing an invalid index for selection. Set this index to
+ * selectedItem property if you want to clear the selection.
  */
 
 /*!
@@ -209,7 +209,7 @@ float QScatter3DSeries::itemSize() const
  * \return an invalid index for selection. Set this index to selectedItem property if you
  * want to clear the selection.
  */
-int QScatter3DSeries::invalidSelectionIndex() const
+int QScatter3DSeries::invalidSelectionIndex()
 {
     return Scatter3DController::invalidSelectionIndex();
 }
diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h
index 1d9abc11..758277c0 100644
--- a/src/datavisualization/data/qscatter3dseries.h
+++ b/src/datavisualization/data/qscatter3dseries.h
@@ -43,12 +43,11 @@ public:
 
     void setSelectedItem(int index);
     int selectedItem() const;
+    static int invalidSelectionIndex();
 
     void setItemSize(float size);
     float itemSize() const;
 
-    Q_INVOKABLE int invalidSelectionIndex() const;
-
 signals:
     void dataProxyChanged(QScatterDataProxy *proxy);
     void selectedItemChanged(int index);
diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp
index da285b2d..25405959 100644
--- a/src/datavisualization/data/qsurface3dseries.cpp
+++ b/src/datavisualization/data/qsurface3dseries.cpp
@@ -92,15 +92,15 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  * Selects a surface grid point in a \a position. The position is the (row, column) position in
  * the data array of the series.
  * Only one point can be selected at a time.
- * To clear selection, set invalidSelectionPosition() as the \a position.
+ * To clear selection, set invalidSelectionPosition as the \a position.
  * If this series is added to a graph, the graph can adjust the selection according to user
  * interaction or if it becomes invalid.
  */
 
 /*!
- * \qmlmethod point Surface3DSeries::invalidSelectionPosition()
- * \return a point signifying an invalid selection position. Set this to selectedPoint property
- * to clear the selection.
+ * \qmlproperty point Surface3DSeries::invalidSelectionPosition
+ * A constant property providing an invalid selection position.
+ * Set this to selectedPoint property to clear the selection.
  */
 
 /*!
@@ -221,7 +221,7 @@ QPoint QSurface3DSeries::selectedPoint() const
  * \return a QPoint signifying an invalid selection position. Set this to selectedPoint property
  * to clear the selection.
  */
-QPoint QSurface3DSeries::invalidSelectionPosition() const
+QPoint QSurface3DSeries::invalidSelectionPosition()
 {
     return Surface3DController::invalidSelectionPosition();
 }
diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index 6681495b..0ddd53da 100644
--- a/src/datavisualization/data/qsurface3dseries.h
+++ b/src/datavisualization/data/qsurface3dseries.h
@@ -53,7 +53,7 @@ public:
 
     void setSelectedPoint(const QPoint &position);
     QPoint selectedPoint() const;
-    QPoint invalidSelectionPosition() const;
+    static QPoint invalidSelectionPosition();
 
     void setFlatShadingEnabled(bool enabled);
     bool isFlatShadingEnabled() const;