qtcharts: do not rely on transitive includes

And adjust to coding style in a few places.

Change-Id: Ib82d8773c3927852136f6f77e884c120b248f72f
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

13 files changed, 34 insertions, 11 deletions

diff --git a/src/charts/animations/boxplotanimation_p.h b/src/charts/animations/boxplotanimation_p.h
index e736ef6a..87cbd3d1 100644
--- a/src/charts/animations/boxplotanimation_p.h
+++ b/src/charts/animations/boxplotanimation_p.h
@@ -44,6 +44,7 @@
 #include <private/boxwhiskersdata_p.h>
 #include <private/boxwhiskersanimation_p.h>
 #include <QtCharts/private/qchartglobal_p.h>
+#include <QtCore/qhash.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/charts/animations/candlestickanimation_p.h b/src/charts/animations/candlestickanimation_p.h
index f075371d..27d65970 100644
--- a/src/charts/animations/candlestickanimation_p.h
+++ b/src/charts/animations/candlestickanimation_p.h
@@ -41,6 +41,8 @@
 
 #include <private/chartanimation_p.h>
 #include <QtCharts/private/qchartglobal_p.h>
+#include <QtCore/qobject.h>
+#include <QtCore/qhash.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/charts/axis/categoryaxis/qcategoryaxis_p.h b/src/charts/axis/categoryaxis/qcategoryaxis_p.h
index 19ccb18f..94781efc 100644
--- a/src/charts/axis/categoryaxis/qcategoryaxis_p.h
+++ b/src/charts/axis/categoryaxis/qcategoryaxis_p.h
@@ -42,6 +42,9 @@
 #include <QtCharts/QCategoryAxis>
 #include <private/qvalueaxis_p.h>
 #include <QtCharts/private/qchartglobal_p.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qlist.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/charts/axis/qabstractaxis.h b/src/charts/axis/qabstractaxis.h
index 01f8bfda..9b5add2f 100644
--- a/src/charts/axis/qabstractaxis.h
+++ b/src/charts/axis/qabstractaxis.h
@@ -34,6 +34,7 @@
 #include <QtGui/QPen>
 #include <QtGui/QFont>
 #include <QtCore/QVariant>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/charts/barchart/abstractbarchartitem_p.h b/src/charts/barchart/abstractbarchartitem_p.h
index 6856eb49..e8735993 100644
--- a/src/charts/barchart/abstractbarchartitem_p.h
+++ b/src/charts/barchart/abstractbarchartitem_p.h
@@ -45,6 +45,8 @@
 #include <QtCharts/private/qchartglobal_p.h>
 #include <QtGui/QPen>
 #include <QtGui/QBrush>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/charts/barchart/qbarset.h b/src/charts/barchart/qbarset.h
index 597d8e88..0ff82b10 100644
--- a/src/charts/barchart/qbarset.h
+++ b/src/charts/barchart/qbarset.h
@@ -30,10 +30,11 @@
 #ifndef QBARSET_H
 #define QBARSET_H
 
-#include <QtCharts/QChartGlobal>
-#include <QtGui/QPen>
-#include <QtGui/QBrush>
-#include <QtGui/QFont>
+#include <QtCharts/qchartglobal.h>
+#include <QtGui/qpen.h>
+#include <QtGui/qbrush.h>
+#include <QtGui/qfont.h>
+#include <QtCore/qobject.h>
 
 QT_BEGIN_NAMESPACE
 class QBarSetPrivate;
diff --git a/src/charts/boxplotchart/qboxset.h b/src/charts/boxplotchart/qboxset.h
index a093d7ff..4e05ec0c 100644
--- a/src/charts/boxplotchart/qboxset.h
+++ b/src/charts/boxplotchart/qboxset.h
@@ -30,10 +30,11 @@
 #ifndef QBOXSET_H
 #define QBOXSET_H
 
-#include <QtCharts/QChartGlobal>
-#include <QtGui/QPen>
-#include <QtGui/QBrush>
-#include <QtGui/QFont>
+#include <QtCharts/qchartglobal.h>
+#include <QtGui/qpen.h>
+#include <QtGui/qbrush.h>
+#include <QtGui/qfont.h>
+#include <QtCore/qobject.h>
 
 QT_BEGIN_NAMESPACE
 class QBoxSetPrivate;
diff --git a/src/charts/candlestickchart/qcandlestickset.h b/src/charts/candlestickchart/qcandlestickset.h
index e3d653be..70d947d5 100644
--- a/src/charts/candlestickchart/qcandlestickset.h
+++ b/src/charts/candlestickchart/qcandlestickset.h
@@ -30,9 +30,10 @@
 #ifndef QCANDLESTICKSET_H
 #define QCANDLESTICKSET_H
 
-#include <QtCharts/QChartGlobal>
-#include <QtGui/QBrush>
-#include <QtGui/QPen>
+#include <QtCharts/qchartglobal.h>
+#include <QtGui/qbrush.h>
+#include <QtGui/qpen.h>
+#include <QtCore/qobject.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/charts/chartthememanager_p.h b/src/charts/chartthememanager_p.h
index 5dbb5da8..2d5dbde9 100644
--- a/src/charts/chartthememanager_p.h
+++ b/src/charts/chartthememanager_p.h
@@ -44,6 +44,7 @@
 #include <QtGui/QColor>
 #include <QtGui/QGradientStops>
 #include <QtCharts/private/qchartglobal_p.h>
+#include <QtCore/qmap.h>
 
 QT_BEGIN_NAMESPACE
 class ChartTheme;
diff --git a/src/charts/domain/abstractdomain_p.h b/src/charts/domain/abstractdomain_p.h
index 11863409..74a38782 100644
--- a/src/charts/domain/abstractdomain_p.h
+++ b/src/charts/domain/abstractdomain_p.h
@@ -43,6 +43,7 @@
 #include <QtCore/QRectF>
 #include <QtCore/QSizeF>
 #include <QtCore/QDebug>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/charts/legend/qlegend_p.h b/src/charts/legend/qlegend_p.h
index ae1b2611..26833ffa 100644
--- a/src/charts/legend/qlegend_p.h
+++ b/src/charts/legend/qlegend_p.h
@@ -41,6 +41,8 @@
 
 #include <QtCharts/QLegend>
 #include <QtCharts/private/qchartglobal_p.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qhash.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/charts/scatterchart/scatterchartitem_p.h b/src/charts/scatterchart/scatterchartitem_p.h
index 93969173..77de689c 100644
--- a/src/charts/scatterchart/scatterchartitem_p.h
+++ b/src/charts/scatterchart/scatterchartitem_p.h
@@ -45,6 +45,7 @@
 #include <QtGui/QPen>
 #include <QtWidgets/QGraphicsSceneMouseEvent>
 #include <QtCharts/private/qchartglobal_p.h>
+#include <QtCore/qmap.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/charts/xychart/qxyseries_p.h b/src/charts/xychart/qxyseries_p.h
index 8a92ce1c..94c07d5c 100644
--- a/src/charts/xychart/qxyseries_p.h
+++ b/src/charts/xychart/qxyseries_p.h
@@ -41,6 +41,12 @@
 
 #include <private/qabstractseries_p.h>
 #include <QtCharts/private/qchartglobal_p.h>
+#include <QtCore/qvariant.h>
+#include <QtCore/qhash.h>
+#include <QtCore/qset.h>
+#include <QtGui/qcolor.h>
+#include <QtGui/qpen.h>
+#include <QtCore/qlist.h>
 
 QT_BEGIN_NAMESPACE