From 9cc6f18e75f4c311bdb9010802fd1ecb0965fa9c 2012-07-04 07:01:22
From: Michal Klocek <michal.klocek@digia.com>
Date: 2012-07-04 07:01:22
Subject: [PATCH] QCategoryAxis to QIntervalAxis part 2 of 2

---

diff --git a/src/axis/axis.pri b/src/axis/axis.pri
index fbefc81..9841ade 100644
--- a/src/axis/axis.pri
+++ b/src/axis/axis.pri
@@ -8,7 +8,7 @@ SOURCES += \
     $$PWD/chartcategoriesaxisx.cpp \
     $$PWD/chartcategoriesaxisy.cpp \
     $$PWD/qbarcategoriesaxis.cpp \
-    $$PWD/qcategoriesaxis.cpp \
+    $$PWD/qintervalaxis.cpp \
     $$PWD/qvaluesaxis.cpp \
     $$PWD/qabstractaxis.cpp
     
@@ -19,12 +19,12 @@ PRIVATE_HEADERS += \
     $$PWD/chartcategoriesaxisx_p.h \
     $$PWD/chartcategoriesaxisy_p.h \
     $$PWD/qbarcategoriesaxis_p.h \
-    $$PWD/qcategoriesaxis_p.h \
+    $$PWD/qintervalaxis_p.h \
     $$PWD/qvaluesaxis_p.h \
     $$PWD/qabstractaxis_p.h
 
 PUBLIC_HEADERS += \
     $$PWD/qbarcategoriesaxis.h \
-    $$PWD/qcategoriesaxis.h \
+    $$PWD/qintervalaxis.h \
     $$PWD/qvaluesaxis.h \
     $$PWD/qabstractaxis.h 
diff --git a/src/axis/qcategoriesaxis.cpp b/src/axis/qintervalaxis.cpp
similarity index 97%
rename from src/axis/qcategoriesaxis.cpp
rename to src/axis/qintervalaxis.cpp
index f79fddc..446ad9e 100644
--- a/src/axis/qcategoriesaxis.cpp
+++ b/src/axis/qintervalaxis.cpp
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#include "qcategoriesaxis.h"
-#include "qcategoriesaxis_p.h"
+#include "qintervalaxis.h"
+#include "qintervalaxis_p.h"
 #include "chartcategoriesaxisx_p.h"
 #include "chartcategoriesaxisy_p.h"
 #include <qmath.h>
@@ -143,7 +143,7 @@ ChartAxis* QIntervalAxisPrivate::createGraphics(ChartPresenter* presenter)
     }
 }
 
-#include "moc_qcategoriesaxis.cpp"
-#include "moc_qcategoriesaxis_p.cpp"
+#include "moc_qintervalaxis.cpp"
+#include "moc_qintervalaxis_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/axis/qcategoriesaxis.h b/src/axis/qintervalaxis.h
similarity index 100%
rename from src/axis/qcategoriesaxis.h
rename to src/axis/qintervalaxis.h
diff --git a/src/axis/qcategoriesaxis_p.h b/src/axis/qintervalaxis_p.h
similarity index 94%
rename from src/axis/qcategoriesaxis_p.h
rename to src/axis/qintervalaxis_p.h
index bfcdf55..8c92b9b 100644
--- a/src/axis/qcategoriesaxis_p.h
+++ b/src/axis/qintervalaxis_p.h
@@ -27,10 +27,10 @@
 //
 // We mean it.
 
-#ifndef QCATEGORIESAXIS_P_H
-#define QCATEGORIESAXIS_P_H
+#ifndef QINTERVALAXIS_P_H
+#define QINTERVALAXIS_P_H
 
-#include "qcategoriesaxis.h"
+#include "qintervalaxis.h"
 #include "qvaluesaxis_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp
index be9ee6e..4115ea7 100644
--- a/src/barchart/qbarseries.cpp
+++ b/src/barchart/qbarseries.cpp
@@ -24,7 +24,6 @@
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
-#include "qcategoriesaxis.h"
 #include "qvaluesaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/barchart/qpercentbarseries.cpp b/src/barchart/qpercentbarseries.cpp
index ecfd514..503d444 100644
--- a/src/barchart/qpercentbarseries.cpp
+++ b/src/barchart/qpercentbarseries.cpp
@@ -24,7 +24,6 @@
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
-#include "qcategoriesaxis.h"
 #include "qvaluesaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/barchart/qstackedbarseries.cpp b/src/barchart/qstackedbarseries.cpp
index 004e5d2..cac6f44 100644
--- a/src/barchart/qstackedbarseries.cpp
+++ b/src/barchart/qstackedbarseries.cpp
@@ -24,7 +24,6 @@
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
-#include "qcategoriesaxis.h"
 #include "qvaluesaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE