From ec094357a3fd44a7a7eac59266849d1a49ea5a14 2012-07-04 06:51:50
From: Michal Klocek <michal.klocek@digia.com>
Date: 2012-07-04 06:51:50
Subject: [PATCH] QCategoryAxis to QIntervalAxis part 1 of 2

---

diff --git a/src/axis/qcategoriesaxis.cpp b/src/axis/qcategoriesaxis.cpp
index 8f9d84c..f79fddc 100644
--- a/src/axis/qcategoriesaxis.cpp
+++ b/src/axis/qcategoriesaxis.cpp
@@ -27,16 +27,16 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-QCategoriesAxis::QCategoriesAxis(QObject *parent):
-    QValuesAxis(*new QCategoriesAxisPrivate(this),parent)
+QIntervalAxis::QIntervalAxis(QObject *parent):
+    QValuesAxis(*new QIntervalAxisPrivate(this),parent)
 {
 }
 
-QCategoriesAxis::~QCategoriesAxis()
+QIntervalAxis::~QIntervalAxis()
 {
 }
 
-QCategoriesAxis::QCategoriesAxis(QCategoriesAxisPrivate &d,QObject *parent):QValuesAxis(d,parent)
+QIntervalAxis::QIntervalAxis(QIntervalAxisPrivate &d,QObject *parent):QValuesAxis(d,parent)
 {
 
 }
@@ -44,9 +44,9 @@ QCategoriesAxis::QCategoriesAxis(QCategoriesAxisPrivate &d,QObject *parent):QVal
 /*!
     Appends \a categories to axis
 */
-void QCategoriesAxis::append(const QString& category, qreal x)
+void QIntervalAxis::append(const QString& category, qreal x)
 {
-    Q_D(QCategoriesAxis);
+    Q_D(QIntervalAxis);
     if (!d->m_categories.contains(category))
     {
     	if(d->m_categories.isEmpty()){
@@ -62,9 +62,9 @@ void QCategoriesAxis::append(const QString& category, qreal x)
     }
 }
 
-void QCategoriesAxis::setFisrtCategoryMinimum(qreal x)
+void QIntervalAxis::setFisrtCategoryMinimum(qreal x)
 {
-	 Q_D(QCategoriesAxis);
+	 Q_D(QIntervalAxis);
 	 if(d->m_categories.isEmpty()){
 		 d->m_categoryMinimum=x;
 	 }else{
@@ -77,62 +77,62 @@ void QCategoriesAxis::setFisrtCategoryMinimum(qreal x)
 /*!
     Removes \a category from axis
 */
-void QCategoriesAxis::remove(const QString &category)
+void QIntervalAxis::remove(const QString &category)
 {
 	Q_UNUSED(category);
 	//TODO
 }
 
-QStringList QCategoriesAxis::categories()
+QStringList QIntervalAxis::categories()
 {
-    Q_D(QCategoriesAxis);
+    Q_D(QIntervalAxis);
     return d->m_categories;
 }
 
 /*!
   Returns number of categories.
  */
-int QCategoriesAxis::count() const
+int QIntervalAxis::count() const
 {
-    Q_D(const QCategoriesAxis);
+    Q_D(const QIntervalAxis);
     return d->m_categories.count();
 }
 
 /*!
     Returns the type of axis.
 */
-QAbstractAxis::AxisType QCategoriesAxis::type() const
+QAbstractAxis::AxisType QIntervalAxis::type() const
 {
     return AxisTypeCategories;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-QCategoriesAxisPrivate::QCategoriesAxisPrivate(QCategoriesAxis* q):
+QIntervalAxisPrivate::QIntervalAxisPrivate(QIntervalAxis* q):
     QValuesAxisPrivate(q),
     m_categoryMinimum(0)
 {
 
 }
 
-QCategoriesAxisPrivate::~QCategoriesAxisPrivate()
+QIntervalAxisPrivate::~QIntervalAxisPrivate()
 {
 
 }
 
-int QCategoriesAxisPrivate::ticksCount() const
+int QIntervalAxisPrivate::ticksCount() const
 {
     return m_categories.count()+1;
 }
 
-void QCategoriesAxisPrivate::handleAxisRangeChanged(qreal min, qreal max,int count)
+void QIntervalAxisPrivate::handleAxisRangeChanged(qreal min, qreal max,int count)
 {
     m_min = min;
     m_max = max;
     m_ticksCount = count;
 }
 
-ChartAxis* QCategoriesAxisPrivate::createGraphics(ChartPresenter* presenter)
+ChartAxis* QIntervalAxisPrivate::createGraphics(ChartPresenter* presenter)
 {
 	Q_UNUSED(presenter);
    // Q_Q( QCategoriesAxis);
diff --git a/src/axis/qcategoriesaxis.h b/src/axis/qcategoriesaxis.h
index ef91f25..3ef9290 100644
--- a/src/axis/qcategoriesaxis.h
+++ b/src/axis/qcategoriesaxis.h
@@ -26,18 +26,18 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-class QCategoriesAxisPrivate;
+class QIntervalAxisPrivate;
 
-class QTCOMMERCIALCHART_EXPORT QCategoriesAxis : public QValuesAxis
+class QTCOMMERCIALCHART_EXPORT QIntervalAxis : public QValuesAxis
 {
     Q_OBJECT
 
 public:
-    explicit QCategoriesAxis(QObject *parent = 0);
-    ~QCategoriesAxis();
+    explicit QIntervalAxis(QObject *parent = 0);
+    ~QIntervalAxis();
 
 protected:
-    QCategoriesAxis(QCategoriesAxisPrivate &d,QObject *parent = 0);
+    QIntervalAxis(QIntervalAxisPrivate &d,QObject *parent = 0);
 
 public:
     AxisType type() const;
@@ -55,8 +55,8 @@ public:
 
 
 private:
-    Q_DECLARE_PRIVATE(QCategoriesAxis)
-    Q_DISABLE_COPY(QCategoriesAxis)
+    Q_DECLARE_PRIVATE(QIntervalAxis)
+    Q_DISABLE_COPY(QIntervalAxis)
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/axis/qcategoriesaxis_p.h b/src/axis/qcategoriesaxis_p.h
index c5ee93e..bfcdf55 100644
--- a/src/axis/qcategoriesaxis_p.h
+++ b/src/axis/qcategoriesaxis_p.h
@@ -38,13 +38,13 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 typedef QPair<qreal, qreal> Range;
 
-class QCategoriesAxisPrivate : public QValuesAxisPrivate
+class QIntervalAxisPrivate : public QValuesAxisPrivate
 {
     Q_OBJECT
 
 public:
-    QCategoriesAxisPrivate(QCategoriesAxis *q);
-    ~QCategoriesAxisPrivate();
+    QIntervalAxisPrivate(QIntervalAxis *q);
+    ~QIntervalAxisPrivate();
 
 
 public:
@@ -63,7 +63,7 @@ private:
     qreal m_categoryMinimum;
 
 private:
-    Q_DECLARE_PUBLIC(QCategoriesAxis)
+    Q_DECLARE_PUBLIC(QIntervalAxis)
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE