From 6fbac6697666099142c081135d3c092863e2bd43 2012-04-10 11:34:24
From: Michal Klocek <michal.klocek@digia.com>
Date: 2012-04-10 11:34:24
Subject: [PATCH] Renames header axisitem -> axis

---

diff --git a/src/animations/axisanimation_p.h b/src/animations/axisanimation_p.h
index b0d53b7..6d92b33 100644
--- a/src/animations/axisanimation_p.h
+++ b/src/animations/axisanimation_p.h
@@ -21,7 +21,7 @@
 #ifndef AXISANIMATIONITEM_H_
 #define AXISANIMATIONITEM_H_
 
-#include "axisitem_p.h"
+#include "axis_p.h"
 #include "chartanimation_p.h"
 
 
@@ -33,8 +33,8 @@ public:
     AxisAnimation(Axis *axis);
     ~AxisAnimation();
 protected:
-    virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress ) const;
-    virtual void updateCurrentValue(const QVariant &value );
+    QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress ) const;
+    void updateCurrentValue(const QVariant &value );
 private:
     Axis *m_axis;
 };
diff --git a/src/axis/axisitem.cpp b/src/axis/axis.cpp
similarity index 95%
rename from src/axis/axisitem.cpp
rename to src/axis/axis.cpp
index 2079f98..b69aa1d 100644
--- a/src/axis/axisitem.cpp
+++ b/src/axis/axis.cpp
@@ -18,12 +18,11 @@
 **
 ****************************************************************************/
 
-#include "axisitem_p.h"
+#include "axis_p.h"
 #include "qchartaxis.h"
 #include "chartpresenter_p.h"
 #include "chartanimator_p.h"
 #include <QPainter>
-#include <QDebug>
 #include <cmath>
 
 static int label_padding = 5;
@@ -460,6 +459,6 @@ void Axis::axisSelected()
 }
 
 //TODO "nice numbers algorithm"
-#include "moc_axisitem_p.cpp"
+#include "moc_axis_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/axis/axis.pri b/src/axis/axis.pri
index bfbdd88..68175cf 100644
--- a/src/axis/axis.pri
+++ b/src/axis/axis.pri
@@ -2,12 +2,12 @@ INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 
 SOURCES += \
-    $$PWD/axisitem.cpp \
+    $$PWD/axis.cpp \
     $$PWD/qchartaxis.cpp \
     $$PWD/qchartaxiscategories.cpp 
     
 PRIVATE_HEADERS += \
-    $$PWD/axisitem_p.h 
+    $$PWD/axis_p.h 
 
 PUBLIC_HEADERS += \    
     $$PWD/qchartaxis.h \
diff --git a/src/axis/axisitem_p.h b/src/axis/axis_p.h
similarity index 100%
rename from src/axis/axisitem_p.h
rename to src/axis/axis_p.h
diff --git a/src/chartpresenter.cpp b/src/chartpresenter.cpp
index 7d30979..8e53ca4 100644
--- a/src/chartpresenter.cpp
+++ b/src/chartpresenter.cpp
@@ -27,7 +27,7 @@
 #include "chartanimator_p.h"
 #include "qseries_p.h"
 #include "qareaseries.h"
-#include "axisitem_p.h"
+#include "axis_p.h"
 #include "areachartitem_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/charttheme.cpp b/src/charttheme.cpp
index de6a7b3..517ed98 100644
--- a/src/charttheme.cpp
+++ b/src/charttheme.cpp
@@ -38,7 +38,7 @@
 #include "qsplineseries.h"
 
 //items
-#include "axisitem_p.h"
+#include "axis_p.h"
 #include "barchartitem_p.h"
 #include "stackedbarchartitem_p.h"
 #include "percentbarchartitem_p.h"