From b6476cc38bfd70be51a242a3fb0ea1a0adffe4ec 2012-08-22 10:58:21
From: Marek Rosa <marek.rosa@digia.com>
Date: 2012-08-22 10:58:21
Subject: [PATCH] QBarCategoriesAxis renamed to QBarCategoryAxis

---

diff --git a/demos/chartthemes/themewidget.cpp b/demos/chartthemes/themewidget.cpp
index 78619f7..df2121f 100644
--- a/demos/chartthemes/themewidget.cpp
+++ b/demos/chartthemes/themewidget.cpp
@@ -41,7 +41,7 @@
 #include <QGroupBox>
 #include <QLabel>
 #include <QTime>
-#include <QBarCategoriesAxis>
+#include <QBarCategoryAxis>
 
 ThemeWidget::ThemeWidget(QWidget* parent) :
     QWidget(parent),
diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp
index 96e0347..cae476b 100644
--- a/examples/barchart/main.cpp
+++ b/examples/barchart/main.cpp
@@ -24,7 +24,7 @@
 #include <QBarSeries>
 #include <QBarSet>
 #include <QLegend>
-#include <QBarCategoriesAxis>
+#include <QBarCategoryAxis>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
diff --git a/examples/barmodelmapper/tablewidget.cpp b/examples/barmodelmapper/tablewidget.cpp
index 3d45009..46f48cf 100644
--- a/examples/barmodelmapper/tablewidget.cpp
+++ b/examples/barmodelmapper/tablewidget.cpp
@@ -30,7 +30,7 @@
 #include <QBarSet>
 #include <QVBarModelMapper>
 #include <QHeaderView>
-#include <QBarCategoriesAxis>
+#include <QBarCategoryAxis>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
diff --git a/examples/horizontalbarchart/main.cpp b/examples/horizontalbarchart/main.cpp
index cb3d3cb..9ac5693 100644
--- a/examples/horizontalbarchart/main.cpp
+++ b/examples/horizontalbarchart/main.cpp
@@ -24,7 +24,7 @@
 #include <QBarSeries>
 #include <QBarSet>
 #include <QLegend>
-#include <QBarCategoriesAxis>
+#include <QBarCategoryAxis>
 #include <QHorizontalBarSeries>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
diff --git a/examples/horizontalpercentbarchart/main.cpp b/examples/horizontalpercentbarchart/main.cpp
index f8bf5a1..0972cc7 100644
--- a/examples/horizontalpercentbarchart/main.cpp
+++ b/examples/horizontalpercentbarchart/main.cpp
@@ -24,7 +24,7 @@
 #include <QBarSeries>
 #include <QBarSet>
 #include <QLegend>
-#include <QBarCategoriesAxis>
+#include <QBarCategoryAxis>
 #include <QHorizontalPercentBarSeries>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
diff --git a/examples/horizontalstackedbarchart/main.cpp b/examples/horizontalstackedbarchart/main.cpp
index e1ea925..e03839a 100644
--- a/examples/horizontalstackedbarchart/main.cpp
+++ b/examples/horizontalstackedbarchart/main.cpp
@@ -24,7 +24,7 @@
 #include <QBarSeries>
 #include <QBarSet>
 #include <QLegend>
-#include <QBarCategoriesAxis>
+#include <QBarCategoryAxis>
 #include <QHorizontalStackedBarSeries>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
diff --git a/examples/lineandbar/main.cpp b/examples/lineandbar/main.cpp
index 27a219c..56f685c 100644
--- a/examples/lineandbar/main.cpp
+++ b/examples/lineandbar/main.cpp
@@ -25,7 +25,7 @@
 #include <QBarSet>
 #include <QLineSeries>
 #include <QLegend>
-#include <QBarCategoriesAxis>
+#include <QBarCategoryAxis>
 #include <QValueAxis>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
diff --git a/examples/percentbarchart/main.cpp b/examples/percentbarchart/main.cpp
index 7535f87..5b3a754 100644
--- a/examples/percentbarchart/main.cpp
+++ b/examples/percentbarchart/main.cpp
@@ -24,7 +24,7 @@
 #include <QPercentBarSeries>
 #include <QBarSet>
 #include <QLegend>
-#include <QBarCategoriesAxis>
+#include <QBarCategoryAxis>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
diff --git a/examples/populationpyramid/main.cpp b/examples/populationpyramid/main.cpp
index 3a705dc..5b26b9d 100644
--- a/examples/populationpyramid/main.cpp
+++ b/examples/populationpyramid/main.cpp
@@ -24,7 +24,7 @@
 #include <QBarSeries>
 #include <QBarSet>
 #include <QLegend>
-#include <QBarCategoriesAxis>
+#include <QBarCategoryAxis>
 #include <QHorizontalBarSeries>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
diff --git a/examples/scrollchart/main.cpp b/examples/scrollchart/main.cpp
index 7783739..c0fbd21 100644
--- a/examples/scrollchart/main.cpp
+++ b/examples/scrollchart/main.cpp
@@ -25,7 +25,7 @@
 #include <qmath.h>
 #include <QBarSeries>
 #include <QBarSet>
-#include <QBarCategoriesAxis>
+#include <QBarCategoryAxis>
 #include <QLineSeries>
 #include <QHorizontalBarSeries>
 
diff --git a/examples/stackedbarchart/main.cpp b/examples/stackedbarchart/main.cpp
index da6d4d2..292e486 100644
--- a/examples/stackedbarchart/main.cpp
+++ b/examples/stackedbarchart/main.cpp
@@ -24,7 +24,7 @@
 #include <QStackedBarSeries>
 #include <QBarSet>
 #include <QLegend>
-#include <QBarCategoriesAxis>
+#include <QBarCategoryAxis>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
diff --git a/examples/stackedbarchartdrilldown/drilldownchart.cpp b/examples/stackedbarchartdrilldown/drilldownchart.cpp
index b6cb708..1e8c15d 100644
--- a/examples/stackedbarchartdrilldown/drilldownchart.cpp
+++ b/examples/stackedbarchartdrilldown/drilldownchart.cpp
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 #include "drilldownchart.h"
-#include <QBarCategoriesAxis>
+#include <QBarCategoryAxis>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
diff --git a/src/axis/categoriesaxis/qbarcategoriesaxis.cpp b/src/axis/categoriesaxis/qbarcategoriesaxis.cpp
index c7beef1..39b12b4 100644
--- a/src/axis/categoriesaxis/qbarcategoriesaxis.cpp
+++ b/src/axis/categoriesaxis/qbarcategoriesaxis.cpp
@@ -28,8 +28,8 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 /*!
-    \class QBarCategoriesAxis
-    \brief The QBarCategoriesAxis class is used for manipulating chart's axis.
+    \class QBarCategoryAxis
+    \brief The QBarCategoryAxis class is used for manipulating chart's axis.
     \mainclass
 
     BarCategoriesAxis can be setup to show axis line with tick marks, grid lines and shades.
@@ -38,7 +38,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlclass BarCategoriesAxis QBarCategoriesAxis
+    \qmlclass BarCategoriesAxis QBarCategoryAxis
     \brief The Axis element is used for manipulating chart's axes.
 
     Axis can be setup to show axis line with tick marks, grid lines and shades.
@@ -57,7 +57,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
-  \property QBarCategoriesAxis::categories
+  \property QBarCategoryAxis::categories
   Defines the categories of axis
 */
 /*!
@@ -66,7 +66,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
-  \property QBarCategoriesAxis::min
+  \property QBarCategoryAxis::min
   Defines the minimum value on the axis.
 */
 /*!
@@ -75,7 +75,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
-  \property QBarCategoriesAxis::max
+  \property QBarCategoryAxis::max
   Defines the maximum value on the axis.
 */
 /*!
@@ -85,11 +85,11 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 
 /*!
-  \fn void QBarCategoriesAxis::categoriesChanged()
+  \fn void QBarCategoryAxis::categoriesChanged()
   Axis emits signal when the categories of the axis has changed.
 */
 /*!
-  \fn void QBarCategoriesAxis::minChanged(const QString &min)
+  \fn void QBarCategoryAxis::minChanged(const QString &min)
   Axis emits signal when \a min of axis has changed.
 */
 /*!
@@ -98,7 +98,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
-  \fn void QBarCategoriesAxis::maxChanged(const QString &max)
+  \fn void QBarCategoryAxis::maxChanged(const QString &max)
   Axis emits signal when \a max of axis has changed.
 */
 /*!
@@ -107,7 +107,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
-  \fn void QBarCategoriesAxis::rangeChanged(const QString &min, const QString &max)
+  \fn void QBarCategoryAxis::rangeChanged(const QString &min, const QString &max)
   Axis emits signal when \a min or \a max of axis has changed.
 */
 
diff --git a/src/qchart.cpp b/src/qchart.cpp
index 19313a0..edf9275 100644
--- a/src/qchart.cpp
+++ b/src/qchart.cpp
@@ -339,7 +339,7 @@ QAbstractAxis* QChart::axisY(QAbstractSeries *series) const
          \o QValueAxis
      \row
          \o QBarSeries
-         \o QBarCategoriesAxis
+         \o QBarCategoryAxis
          \o QValueAxis
      \row
          \o QPieSeries
diff --git a/tests/chartwidgettest/mainwidget.cpp b/tests/chartwidgettest/mainwidget.cpp
index 7f0b831..bb5f1bf 100644
--- a/tests/chartwidgettest/mainwidget.cpp
+++ b/tests/chartwidgettest/mainwidget.cpp
@@ -42,7 +42,7 @@
 #include <cmath>
 #include <QDebug>
 #include <QStandardItemModel>
-#include <QBarCategoriesAxis>
+#include <QBarCategoryAxis>
 #include <QGLWidget>
 
 QTCOMMERCIALCHART_USE_NAMESPACE