Replace 'chart' with 'graph'

Task-number: QTRD-2369

Change-Id: Ic39bc03a0eee4fe75978e71af06ad7a655e958a9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

12 files changed, 24 insertions, 21 deletions

diff --git a/src/datavisualization/data/qitemmodelbardatamapping.cpp b/src/datavisualization/data/qitemmodelbardatamapping.cpp
index 83d6c784..54cb0708 100644
--- a/src/datavisualization/data/qitemmodelbardatamapping.cpp
+++ b/src/datavisualization/data/qitemmodelbardatamapping.cpp
@@ -46,7 +46,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  *    For example, assume that you have a custom QAbstractItemModel for storing various monthly values
  *    related to a business.
  *    Each item in the model has roles "year", "month", "income", and "expenses".
- *    You could do the following to display the data in a bar chart:
+ *    You could do the following to display the data in a bar graph:
  *
  *    \snippet doc_src_qtdatavisualization.cpp 3
  *
diff --git a/src/datavisualization/data/qitemmodelscatterdatamapping.cpp b/src/datavisualization/data/qitemmodelscatterdatamapping.cpp
index 7ffd44f9..f9ef6d04 100644
--- a/src/datavisualization/data/qitemmodelscatterdatamapping.cpp
+++ b/src/datavisualization/data/qitemmodelscatterdatamapping.cpp
@@ -35,7 +35,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  *
  * For example, assume that you have a custom QAbstractItemModel for storing various measurements
  * done on material samples, providing data for roles such as "density", "hardness" and
- * "conductivity". You could visualize these properties on a scatter chart:
+ * "conductivity". You could visualize these properties on a scatter graph:
  *
  * \snippet doc_src_qtdatavisualization.cpp 4
  *
diff --git a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc
index 2a09dc68..7ec90eaa 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc
@@ -75,12 +75,13 @@
     Qt Data Visualization comes with the following examples:
 
     \list
-        \li \l{Barchart Example}
-        \li \l{Qt Quick 2 Barchart Example}
+        \li \l{Bars Example}
+        \li \l{Qt Quick 2 Bars Example}
         \li \l{Qt Quick 2 Scatter Example}
         \li \l{Qt Quick 2 Surface Example}
         \li \l{Rainfall Example}
-        \li \l{Scatter Chart Example}
+        \li \l{Scatter Example}
+        \li \l{Surface Example}
         \li \l{Audiolevels Example}
         \li \l{Widget Example}
     \endlist
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc
index f778cc92..213542b9 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc
@@ -34,7 +34,7 @@
  *
  * \snippet doc_src_qmldatavisualization.cpp 1
  *
- * See \l{Qt Quick 2 Barchart Example} for more thorough usage example.
+ * See \l{Qt Quick 2 Bars Example} for more thorough usage example.
  *
  * \sa ItemModelBarDataProxy, Scatter3D, Surface3D, {Qt Data Visualization C++ Classes}
  */
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 13bc8801..3631bad1 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -1015,7 +1015,7 @@ Q3DAbstractAxis *Abstract3DController::createDefaultAxis(Q3DAbstractAxis::AxisOr
 {
     Q_UNUSED(orientation)
 
-    // The default default axis is a value axis. If the chart type has a different default axis
+    // The default default axis is a value axis. If the graph type has a different default axis
     // for some orientation, this function needs to be overridden.
     Q3DAbstractAxis *defaultAxis = createDefaultValueAxis();
     return defaultAxis;
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index 26014c12..abd09b55 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -43,7 +43,7 @@ Bars3DController::Bars3DController(QRect boundRect)
 
     setActiveDataProxy(0);
 
-    // Setting a null axis creates a new default axis according to orientation and chart type.
+    // Setting a null axis creates a new default axis according to orientation and graph type.
     // Note: These cannot be set in Abstract3DController constructor, as they will call virtual
     //       functions implemented by subclasses.
     setAxisX(0);
@@ -399,7 +399,7 @@ void Bars3DController::adjustAxisRanges()
                                                                     categoryAxisZ->min(),
                                                                     categoryAxisZ->max());
         if (limits.first < 0) {
-            // TODO: Currently we only support symmetric y-axis for bar chart if there are negative values
+            // TODO: Currently we only support symmetric y-axis for bar graph if there are negative values
             qreal maxAbs = qMax(qFabs(limits.first), qFabs(limits.second));
             // Call private implementation to avoid unsetting auto adjust flag
             valueAxis->dptr()->setRange(-maxAbs, maxAbs);
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 2649fe85..360b346c 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -1526,9 +1526,11 @@ void Bars3DRenderer::updateAxisRange(Q3DAbstractAxis::AxisOrientation orientatio
             emit needRender();
         }
 
-        // TODO Currently barchart only supports zero centered or zero minimum ranges
-        if (min > 0.0 || (min != 0.0 && (qFabs(min) != qFabs(max))))
-            qWarning() << __FUNCTION__ << "Bar chart currently properly supports only zero-centered and zero minimum ranges for Y-axis.";
+        // TODO Currently bargraph only supports zero centered or zero minimum ranges
+        if (min > 0.0 || (min != 0.0 && (qFabs(min) != qFabs(max)))) {
+            qWarning() << __FUNCTION__ << "Bar graph currently properly supports only "
+                          "zero-centered and zero minimum ranges for Y-axis.";
+        }
     }
 }
 
diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp
index b1b74b93..660b046b 100644
--- a/src/datavisualization/engine/q3dbars.cpp
+++ b/src/datavisualization/engine/q3dbars.cpp
@@ -52,7 +52,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  * Methods are provided for changing bar types, themes, bar selection modes and so on. See the
  * methods for more detailed descriptions.
  *
- * \section1 How to construct a minimal Q3DBars chart
+ * \section1 How to construct a minimal Q3DBars graph
  *
  * After constructing Q3DBars, you can set the data window by changing the range on the row and
  * column axes. It is not mandatory, as data window will default to showing all of the data in
@@ -73,7 +73,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  *
  * \snippet doc_src_q3dbars_construction.cpp 2
  *
- * The complete code needed to create and display this chart is:
+ * The complete code needed to create and display this graph is:
  *
  * \snippet doc_src_q3dbars_construction.cpp 3
  *
diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp
index 78b60968..55e353bf 100644
--- a/src/datavisualization/engine/q3dscatter.cpp
+++ b/src/datavisualization/engine/q3dscatter.cpp
@@ -51,7 +51,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  * Methods are provided for changing item styles, themes, item selection modes and so on. See the
  * methods for more detailed descriptions.
  *
- * \section1 How to construct a minimal Q3DScatter chart
+ * \section1 How to construct a minimal Q3DScatter graph
  *
  * First, construct Q3DScatter:
  *
@@ -65,7 +65,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  *
  * \snippet doc_src_q3dscatter_construction.cpp 2
  *
- * The complete code needed to create and display this chart is:
+ * The complete code needed to create and display this graph is:
  *
  * \snippet doc_src_q3dscatter_construction.cpp 3
  *
@@ -75,7 +75,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  *
  * The scene can be rotated and zoomed into, but no other interaction is included in this minimal
  * code example. You can learn more by familiarizing yourself with the examples provided, like
- * the \l{Scatter Chart Example}.
+ * the \l{Scatter Example}.
  *
  * \sa Q3DBars, Q3DSurface, {Qt Data Visualization C++ Classes}
  */
diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp
index ff1e3113..8e32d5d7 100644
--- a/src/datavisualization/engine/q3dsurface.cpp
+++ b/src/datavisualization/engine/q3dsurface.cpp
@@ -55,7 +55,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  * proxy. If any other proxy is set as active data proxy later, the default proxy and all data
  * added to it is destroyed.
  *
- * \section1 How to construct a minimal Q3DSurface chart
+ * \section1 How to construct a minimal Q3DSurface graph
  *
  * First, construct Q3DSurface:
  *
@@ -77,7 +77,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  *
  * \snippet doc_src_q3dsurface_construction.cpp 4
  *
- * The complete code needed to create and display this chart is:
+ * The complete code needed to create and display this graph is:
  *
  * \snippet doc_src_q3dsurface_construction.cpp 5
  *
diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp
index e3b649db..e27c8b2b 100644
--- a/src/datavisualization/engine/scatter3dcontroller.cpp
+++ b/src/datavisualization/engine/scatter3dcontroller.cpp
@@ -39,7 +39,7 @@ Scatter3DController::Scatter3DController(QRect boundRect)
 
     setActiveDataProxy(new QScatterDataProxy);
 
-    // Setting a null axis creates a new default axis according to orientation and chart type.
+    // Setting a null axis creates a new default axis according to orientation and graph type.
     // Note: These cannot be set in Abstract3DController constructor, as they will call virtual
     //       functions implemented by subclasses.
     setAxisX(0);
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index a68f919e..514c5d07 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -39,7 +39,7 @@ Surface3DController::Surface3DController(QRect rect)
 {
     setActiveDataProxy(0);
 
-    // Setting a null axis creates a new default axis according to orientation and chart type.
+    // Setting a null axis creates a new default axis according to orientation and graph type.
     // Note: These cannot be set in Abstract3DController constructor, as they will call virtual
     //       functions implemented by subclasses.
     setAxisX(0);