refactoring internal barchart items

8 files changed, 14 insertions, 14 deletions

diff --git a/src/animations/abstractbaranimation.cpp b/src/animations/abstractbaranimation.cpp
index e3f9faf9..aa149fc0 100644
--- a/src/animations/abstractbaranimation.cpp
+++ b/src/animations/abstractbaranimation.cpp
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 #include "abstractbaranimation_p.h"
-#include "barchartitem_p.h"
+#include "abstractbarchartitem_p.h"
 #include <QTimer>
 #include <QDebug>
 
@@ -27,7 +27,7 @@ Q_DECLARE_METATYPE(QVector<QRectF>)
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-AbstractBarAnimation::AbstractBarAnimation(BarChartItem *item)
+AbstractBarAnimation::AbstractBarAnimation(AbstractBarChartItem *item)
     :ChartAnimation(item),
     m_item(item)
 {
diff --git a/src/animations/abstractbaranimation_p.h b/src/animations/abstractbaranimation_p.h
index c5d6c3c2..3a8bb6b8 100644
--- a/src/animations/abstractbaranimation_p.h
+++ b/src/animations/abstractbaranimation_p.h
@@ -34,14 +34,14 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-class BarChartItem;
+class AbstractBarChartItem;
 
 class AbstractBarAnimation : public ChartAnimation
 {
     Q_OBJECT
 
 public:
-    AbstractBarAnimation(BarChartItem *item);
+    AbstractBarAnimation(AbstractBarChartItem *item);
     ~AbstractBarAnimation();
 
 public: // from QVariantAnimation
@@ -51,7 +51,7 @@ public: // from QVariantAnimation
     void setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
 
 protected:
-    BarChartItem *m_item;
+    AbstractBarChartItem *m_item;
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/animations/baranimation.cpp b/src/animations/baranimation.cpp
index 22d453e5..6c7018b3 100644
--- a/src/animations/baranimation.cpp
+++ b/src/animations/baranimation.cpp
@@ -19,14 +19,14 @@
 ****************************************************************************/
 
 #include "baranimation_p.h"
-#include "barchartitem_p.h"
+#include "abstractbarchartitem_p.h"
 #include <QTimer>
 
 Q_DECLARE_METATYPE(QVector<QRectF>)
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-BarAnimation::BarAnimation(BarChartItem *item)
+BarAnimation::BarAnimation(AbstractBarChartItem *item)
     :AbstractBarAnimation(item)
 {
     setDuration(ChartAnimationDuration);
diff --git a/src/animations/baranimation_p.h b/src/animations/baranimation_p.h
index 0db25f18..8b6bd6b3 100644
--- a/src/animations/baranimation_p.h
+++ b/src/animations/baranimation_p.h
@@ -32,18 +32,18 @@
 
 #include "abstractbaranimation_p.h"
 #include "chartanimation_p.h"
-#include "barchartitem_p.h"
+#include "abstractbarchartitem_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-class BarChartItem;
+class AbstractBarChartItem;
 
 class BarAnimation : public AbstractBarAnimation
 {
     Q_OBJECT
 
 public:
-    BarAnimation(BarChartItem *item);
+    BarAnimation(AbstractBarChartItem *item);
     ~BarAnimation();
 
 public: // from QVariantAnimation
diff --git a/src/animations/chartanimator.cpp b/src/animations/chartanimator.cpp
index d854660d..def92929 100644
--- a/src/animations/chartanimator.cpp
+++ b/src/animations/chartanimator.cpp
@@ -25,7 +25,7 @@
 #include "xychart_p.h"
 #include "pieanimation_p.h"
 #include "baranimation_p.h"
-#include "barchartitem_p.h"
+#include "abstractbarchartitem_p.h"
 #include "stackedbaranimation_p.h"
 #include "stackedbarchartitem_p.h"
 #include "percentbaranimation_p.h"
diff --git a/src/animations/chartanimator_p.h b/src/animations/chartanimator_p.h
index 53db1e1b..a8fbc421 100644
--- a/src/animations/chartanimator_p.h
+++ b/src/animations/chartanimator_p.h
@@ -33,7 +33,7 @@
 #include "qchartglobal.h"
 #include "chartanimation_p.h"
 #include "piechartitem_p.h"
-#include "barchartitem_p.h"
+#include "abstractbarchartitem_p.h"
 #include <QPointF>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/src/animations/percentbaranimation_p.h b/src/animations/percentbaranimation_p.h
index 1e896386..d8fd2186 100644
--- a/src/animations/percentbaranimation_p.h
+++ b/src/animations/percentbaranimation_p.h
@@ -12,7 +12,7 @@
 
 #include "chartanimation_p.h"
 #include "abstractbaranimation_p.h"
-#include "barchartitem_p.h"
+#include "abstractbarchartitem_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/src/animations/stackedbaranimation_p.h b/src/animations/stackedbaranimation_p.h
index 2de4988b..799b9d6e 100644
--- a/src/animations/stackedbaranimation_p.h
+++ b/src/animations/stackedbaranimation_p.h
@@ -11,7 +11,7 @@
 #define STACKEDBARANIMATION_P_H
 
 #include "chartanimation_p.h"
-#include "barchartitem_p.h"
+#include "abstractbarchartitem_p.h"
 #include "abstractbaranimation_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE