From 08849c38dd18143ce196b77126ab5014d224032e 2012-08-24 08:28:00 From: Tero Ahola Date: 2012-08-24 08:28:00 Subject: [PATCH] Removed unneeded includes from declarative plugin --- diff --git a/plugins/declarative/declarativeareaseries.cpp b/plugins/declarative/declarativeareaseries.cpp index c9cd855..c373822 100644 --- a/plugins/declarative/declarativeareaseries.cpp +++ b/plugins/declarative/declarativeareaseries.cpp @@ -19,6 +19,7 @@ ****************************************************************************/ #include "declarativeareaseries.h" +#include "declarativelineseries.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/declarativeareaseries.h b/plugins/declarative/declarativeareaseries.h index 0bf359b..73a22b6 100644 --- a/plugins/declarative/declarativeareaseries.h +++ b/plugins/declarative/declarativeareaseries.h @@ -22,9 +22,9 @@ #define DECLARATIVEAREASERIES_H #include "qareaseries.h" -#include "declarativelineseries.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE +class DeclarativeLineSeries; class DeclarativeAreaSeries : public QAreaSeries { diff --git a/plugins/declarative/declarativebarseries.cpp b/plugins/declarative/declarativebarseries.cpp index 47ea227..7e32cab 100644 --- a/plugins/declarative/declarativebarseries.cpp +++ b/plugins/declarative/declarativebarseries.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "declarativebarseries.h" -#include -#include -#include +#include "qbarset.h" +#include "qvbarmodelmapper.h" +#include "qhbarmodelmapper.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/declarativechart.h b/plugins/declarative/declarativechart.h index 28c42ad..4d2d7f5 100644 --- a/plugins/declarative/declarativechart.h +++ b/plugins/declarative/declarativechart.h @@ -23,7 +23,7 @@ #include #include -#include +#include "qchart.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE @@ -48,7 +48,6 @@ class DeclarativeChart : public QDeclarativeItem Q_ENUMS(Animation) Q_ENUMS(Theme) Q_ENUMS(SeriesType) -// Q_ENUMS(AxisType) public: // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api diff --git a/plugins/declarative/declarativepieseries.cpp b/plugins/declarative/declarativepieseries.cpp index 6063cee..fb6db8b 100644 --- a/plugins/declarative/declarativepieseries.cpp +++ b/plugins/declarative/declarativepieseries.cpp @@ -19,8 +19,9 @@ ****************************************************************************/ #include "declarativepieseries.h" -#include -#include +#include "qpieslice.h" +#include "qvpiemodelmapper.h" +#include "qhpiemodelmapper.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/declarativepieseries.h b/plugins/declarative/declarativepieseries.h index 3f57c8e..3a26bb6 100644 --- a/plugins/declarative/declarativepieseries.h +++ b/plugins/declarative/declarativepieseries.h @@ -21,12 +21,12 @@ #ifndef DECLARATIVEPIESERIES_H #define DECLARATIVEPIESERIES_H -#include "qpieslice.h" #include "qpieseries.h" #include #include QTCOMMERCIALCHART_BEGIN_NAMESPACE +class QPieSlice; class DeclarativePieSeries : public QPieSeries, public QDeclarativeParserStatus { diff --git a/plugins/declarative/declarativexypoint.cpp b/plugins/declarative/declarativexypoint.cpp index 40b07e1..d274301 100644 --- a/plugins/declarative/declarativexypoint.cpp +++ b/plugins/declarative/declarativexypoint.cpp @@ -19,6 +19,7 @@ ****************************************************************************/ #include "declarativexypoint.h" +#include QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/declarativexypoint.h b/plugins/declarative/declarativexypoint.h index 4d02a21..fca2563 100644 --- a/plugins/declarative/declarativexypoint.h +++ b/plugins/declarative/declarativexypoint.h @@ -24,7 +24,6 @@ #include "qchartglobal.h" #include #include -#include QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/declarativexyseries.cpp b/plugins/declarative/declarativexyseries.cpp index b9830e5..44fca7b 100644 --- a/plugins/declarative/declarativexyseries.cpp +++ b/plugins/declarative/declarativexyseries.cpp @@ -20,8 +20,9 @@ #include "declarativexyseries.h" -#include -#include +#include "declarativexypoint.h" +#include "qvxymodelmapper.h" +#include "qhxymodelmapper.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/declarativexyseries.h b/plugins/declarative/declarativexyseries.h index b0866e9..6f19037 100644 --- a/plugins/declarative/declarativexyseries.h +++ b/plugins/declarative/declarativexyseries.h @@ -21,7 +21,6 @@ #ifndef DECLARATIVE_XY_SERIES_H #define DECLARATIVE_XY_SERIES_H -#include "declarativexypoint.h" #include QTCOMMERCIALCHART_BEGIN_NAMESPACE