18 files changed, 76 insertions, 76 deletions
diff --git a/src/charts/piechart/piechartitem.cpp b/src/charts/piechart/piechartitem.cpp
index dbf7edf8..b81058a0 100644
--- a/src/charts/piechart/piechartitem.cpp
+++ b/src/charts/piechart/piechartitem.cpp
@@ -18,17 +18,17 @@
 **
 ****************************************************************************/
 
-#include "piechartitem_p.h"
-#include "piesliceitem_p.h"
-#include "qpieslice.h"
-#include "qpieslice_p.h"
-#include "qpieseries.h"
-#include "qpieseries_p.h"
-#include "chartpresenter_p.h"
-#include "chartdataset_p.h"
-#include "pieanimation_p.h"
-#include <QPainter>
-#include <QTimer>
+#include <private/piechartitem_p.h>
+#include <private/piesliceitem_p.h>
+#include <QtCharts/QPieSlice>
+#include <private/qpieslice_p.h>
+#include <QtCharts/QPieSeries>
+#include <private/qpieseries_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/chartdataset_p.h>
+#include <private/pieanimation_p.h>
+#include <QtGui/QPainter>
+#include <QtCore/QTimer>
 
 QT_CHARTS_BEGIN_NAMESPACE
 
diff --git a/src/charts/piechart/piechartitem_p.h b/src/charts/piechart/piechartitem_p.h
index a6511b42..8bcf7510 100644
--- a/src/charts/piechart/piechartitem_p.h
+++ b/src/charts/piechart/piechartitem_p.h
@@ -30,10 +30,10 @@
 #ifndef PIECHARTITEM_H
 #define PIECHARTITEM_H
 
-#include "qpieseries.h"
-#include "chartitem_p.h"
-#include "piesliceitem_p.h"
-#include <QPointer>
+#include <QtCharts/QPieSeries>
+#include <private/chartitem_p.h>
+#include <private/piesliceitem_p.h>
+#include <QtCore/QPointer>
 
 class QGraphicsItem;
 QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/piechart/pieslicedata_p.h b/src/charts/piechart/pieslicedata_p.h
index 37985121..5dc3d248 100644
--- a/src/charts/piechart/pieslicedata_p.h
+++ b/src/charts/piechart/pieslicedata_p.h
@@ -30,10 +30,10 @@
 #ifndef PIESLICEDATA_P_H
 #define PIESLICEDATA_P_H
 
-#include <qchartglobal.h>
-#include <qpieslice.h>
-#include <QPen>
-#include <QBrush>
+#include <QtCharts/QChartGlobal>
+#include <QtCharts/QPieSlice>
+#include <QtGui/QPen>
+#include <QtGui/QBrush>
 
 QT_CHARTS_BEGIN_NAMESPACE
 
diff --git a/src/charts/piechart/piesliceitem.cpp b/src/charts/piechart/piesliceitem.cpp
index 70f03a94..09c8a578 100644
--- a/src/charts/piechart/piesliceitem.cpp
+++ b/src/charts/piechart/piesliceitem.cpp
@@ -18,17 +18,17 @@
 **
 ****************************************************************************/
 
-#include "piesliceitem_p.h"
-#include "piechartitem_p.h"
-#include "qpieseries.h"
-#include "qpieslice.h"
-#include "chartpresenter_p.h"
-#include <QPainter>
-#include <qmath.h>
-#include <QGraphicsSceneEvent>
-#include <QTime>
-#include <QTextDocument>
-#include <QDebug>
+#include <private/piesliceitem_p.h>
+#include <private/piechartitem_p.h>
+#include <QtCharts/QPieSeries>
+#include <QtCharts/QPieSlice>
+#include <private/chartpresenter_p.h>
+#include <QtGui/QPainter>
+#include <QtCore/QtMath>
+#include <QtWidgets/QGraphicsSceneEvent>
+#include <QtCore/QTime>
+#include <QtGui/QTextDocument>
+#include <QtCore/QDebug>
 
 QT_CHARTS_BEGIN_NAMESPACE
 
diff --git a/src/charts/piechart/piesliceitem_p.h b/src/charts/piechart/piesliceitem_p.h
index d6b7768c..b062d333 100644
--- a/src/charts/piechart/piesliceitem_p.h
+++ b/src/charts/piechart/piesliceitem_p.h
@@ -30,14 +30,14 @@
 #ifndef PIESLICEITEM_H
 #define PIESLICEITEM_H
 
-#include "qchartglobal.h"
-#include "charttheme_p.h"
-#include "qpieseries.h"
-#include "pieslicedata_p.h"
-#include <QGraphicsItem>
-#include <QRectF>
-#include <QColor>
-#include <QPen>
+#include <QtCharts/QChartGlobal>
+#include <private/charttheme_p.h>
+#include <QtCharts/QPieSeries>
+#include <private/pieslicedata_p.h>
+#include <QtWidgets/QGraphicsItem>
+#include <QtCore/QRectF>
+#include <QtGui/QColor>
+#include <QtGui/QPen>
 
 #define PIESLICE_LABEL_GAP 5
 
diff --git a/src/charts/piechart/qhpiemodelmapper.cpp b/src/charts/piechart/qhpiemodelmapper.cpp
index b1c7d84f..33d7e864 100644
--- a/src/charts/piechart/qhpiemodelmapper.cpp
+++ b/src/charts/piechart/qhpiemodelmapper.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include "qhpiemodelmapper.h"
+#include <QtCharts/QHPieModelMapper>
 
 QT_CHARTS_BEGIN_NAMESPACE
 
diff --git a/src/charts/piechart/qhpiemodelmapper.h b/src/charts/piechart/qhpiemodelmapper.h
index 50b5c6f2..8e10afdd 100644
--- a/src/charts/piechart/qhpiemodelmapper.h
+++ b/src/charts/piechart/qhpiemodelmapper.h
@@ -21,7 +21,7 @@
 #ifndef QHPIEMODELMAPPER_H
 #define QHPIEMODELMAPPER_H
 
-#include <QtCharts/qpiemodelmapper.h>
+#include <QtCharts/QPieModelMapper>
 
 QT_CHARTS_BEGIN_NAMESPACE
 /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */
diff --git a/src/charts/piechart/qpiemodelmapper.cpp b/src/charts/piechart/qpiemodelmapper.cpp
index 186be815..ca264ce4 100644
--- a/src/charts/piechart/qpiemodelmapper.cpp
+++ b/src/charts/piechart/qpiemodelmapper.cpp
@@ -18,11 +18,11 @@
 **
 ****************************************************************************/
 
-#include "qpiemodelmapper.h"
-#include "qpiemodelmapper_p.h"
-#include "qpieseries.h"
-#include "qpieslice.h"
-#include <QAbstractItemModel>
+#include <QtCharts/QPieModelMapper>
+#include <private/qpiemodelmapper_p.h>
+#include <QtCharts/QPieSeries>
+#include <QtCharts/QPieSlice>
+#include <QtCore/QAbstractItemModel>
 
 QT_CHARTS_BEGIN_NAMESPACE
 
diff --git a/src/charts/piechart/qpiemodelmapper.h b/src/charts/piechart/qpiemodelmapper.h
index a4ab6a2c..4b08125c 100644
--- a/src/charts/piechart/qpiemodelmapper.h
+++ b/src/charts/piechart/qpiemodelmapper.h
@@ -21,8 +21,8 @@
 #ifndef QPIEMODELMAPPER_H
 #define QPIEMODELMAPPER_H
 
-#include <QtCharts/qchartglobal.h>
-#include <QObject>
+#include <QtCharts/QChartGlobal>
+#include <QtCore/QObject>
 
 class QAbstractItemModel;
 
diff --git a/src/charts/piechart/qpiemodelmapper_p.h b/src/charts/piechart/qpiemodelmapper_p.h
index a287497f..3068ba86 100644
--- a/src/charts/piechart/qpiemodelmapper_p.h
+++ b/src/charts/piechart/qpiemodelmapper_p.h
@@ -30,8 +30,8 @@
 #ifndef QPIEMODELMAPPER_P_H
 #define QPIEMODELMAPPER_P_H
 
-#include <QObject>
-#include <qpiemodelmapper.h>
+#include <QtCore/QObject>
+#include <QtCharts/QPieModelMapper>
 
 class QModelIndex;
 
diff --git a/src/charts/piechart/qpieseries.cpp b/src/charts/piechart/qpieseries.cpp
index 733429d1..d536fe7a 100644
--- a/src/charts/piechart/qpieseries.cpp
+++ b/src/charts/piechart/qpieseries.cpp
@@ -18,18 +18,18 @@
 **
 ****************************************************************************/
 
-#include "qpieseries.h"
-#include "qpieseries_p.h"
-#include "qpieslice.h"
-#include "qpieslice_p.h"
-#include "pieslicedata_p.h"
-#include "chartdataset_p.h"
-#include "charttheme_p.h"
-#include "qabstractaxis.h"
-#include "pieanimation_p.h"
-#include "charthelpers_p.h"
-
-#include "qpielegendmarker.h"
+#include <QtCharts/QPieSeries>
+#include <private/qpieseries_p.h>
+#include <QtCharts/QPieSlice>
+#include <private/qpieslice_p.h>
+#include <private/pieslicedata_p.h>
+#include <private/chartdataset_p.h>
+#include <private/charttheme_p.h>
+#include <QtCharts/QAbstractAxis>
+#include <private/pieanimation_p.h>
+#include <private/charthelpers_p.h>
+
+#include <QtCharts/QPieLegendMarker>
 
 QT_CHARTS_BEGIN_NAMESPACE
 
diff --git a/src/charts/piechart/qpieseries.h b/src/charts/piechart/qpieseries.h
index 27c8042b..b8fd20dc 100644
--- a/src/charts/piechart/qpieseries.h
+++ b/src/charts/piechart/qpieseries.h
@@ -21,7 +21,7 @@
 #ifndef QPIESERIES_H
 #define QPIESERIES_H
 
-#include <QtCharts/qabstractseries.h>
+#include <QtCharts/QAbstractSeries>
 #include <QtCharts/QPieSlice>
 
 QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/piechart/qpieseries_p.h b/src/charts/piechart/qpieseries_p.h
index f2a52180..bdc552dc 100644
--- a/src/charts/piechart/qpieseries_p.h
+++ b/src/charts/piechart/qpieseries_p.h
@@ -30,8 +30,8 @@
 #ifndef QPIESERIES_P_H
 #define QPIESERIES_P_H
 
-#include "qpieseries.h"
-#include "qabstractseries_p.h"
+#include <QtCharts/QPieSeries>
+#include <private/qabstractseries_p.h>
 
 QT_CHARTS_BEGIN_NAMESPACE
 class QLegendPrivate;
diff --git a/src/charts/piechart/qpieslice.cpp b/src/charts/piechart/qpieslice.cpp
index 48227e26..4a971e5b 100644
--- a/src/charts/piechart/qpieslice.cpp
+++ b/src/charts/piechart/qpieslice.cpp
@@ -18,8 +18,8 @@
 **
 ****************************************************************************/
 
-#include "qpieslice.h"
-#include "qpieslice_p.h"
+#include <QtCharts/QPieSlice>
+#include <private/qpieslice_p.h>
 
 QT_CHARTS_BEGIN_NAMESPACE
 
diff --git a/src/charts/piechart/qpieslice.h b/src/charts/piechart/qpieslice.h
index 8be5d3cc..6a5612b4 100644
--- a/src/charts/piechart/qpieslice.h
+++ b/src/charts/piechart/qpieslice.h
@@ -21,11 +21,11 @@
 #ifndef QPIESLICE_H
 #define QPIESLICE_H
 
-#include <QtCharts/qchartglobal.h>
-#include <QObject>
-#include <QPen>
-#include <QBrush>
-#include <QFont>
+#include <QtCharts/QChartGlobal>
+#include <QtCore/QObject>
+#include <QtGui/QPen>
+#include <QtGui/QBrush>
+#include <QtGui/QFont>
 
 QT_CHARTS_BEGIN_NAMESPACE
 class QPieSlicePrivate;
diff --git a/src/charts/piechart/qpieslice_p.h b/src/charts/piechart/qpieslice_p.h
index 340a4753..4e87728a 100644
--- a/src/charts/piechart/qpieslice_p.h
+++ b/src/charts/piechart/qpieslice_p.h
@@ -30,9 +30,9 @@
 #ifndef QPIESLICE_P_H
 #define QPIESLICE_P_H
 
-#include <QObject>
-#include "qpieslice.h"
-#include "pieslicedata_p.h"
+#include <QtCore/QObject>
+#include <QtCharts/QPieSlice>
+#include <private/pieslicedata_p.h>
 
 QT_CHARTS_BEGIN_NAMESPACE
 class QPieSeries;
diff --git a/src/charts/piechart/qvpiemodelmapper.cpp b/src/charts/piechart/qvpiemodelmapper.cpp
index 7b9c0a0c..ab00f520 100644
--- a/src/charts/piechart/qvpiemodelmapper.cpp
+++ b/src/charts/piechart/qvpiemodelmapper.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include "qvpiemodelmapper.h"
+#include <QtCharts/QVPieModelMapper>
 
 QT_CHARTS_BEGIN_NAMESPACE
 
diff --git a/src/charts/piechart/qvpiemodelmapper.h b/src/charts/piechart/qvpiemodelmapper.h
index 2135ff9b..0f596221 100644
--- a/src/charts/piechart/qvpiemodelmapper.h
+++ b/src/charts/piechart/qvpiemodelmapper.h
@@ -21,7 +21,7 @@
 #ifndef QVPIEMODELMAPPER_H
 #define QVPIEMODELMAPPER_H
 
-#include <QtCharts/qpiemodelmapper.h>
+#include <QtCharts/QPieModelMapper>
 
 QT_CHARTS_BEGIN_NAMESPACE
 /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */