diff options
| author | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-20 10:50:08 +0300 |
|---|---|---|
| committer | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-20 13:28:52 +0300 |
| commit | 929d943d1aabf414eaa6e402464124f18d4f2abc (patch) | |
| tree | 41f45a47bc0692a6f107cfbbfc61361029d17f00 | |
| parent | f6fba9e059d74a732a978234ae8271ff32ffd929 (diff) | |
Fix include syntax
The includes for the whole project are changed to syntax:
'#include <module/class>
Change-Id: If32f8b6c3f47516ad6bc30ed40789ea9042d5664
Task-number: QTRD-3373
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
529 files changed, 2092 insertions, 2091 deletions
diff --git a/examples/charts/areachart/main.cpp b/examples/charts/areachart/main.cpp index 6f2a1cac..5254b2c4 100644 --- a/examples/charts/areachart/main.cpp +++ b/examples/charts/areachart/main.cpp @@ -18,8 +18,8 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> #include <QtCharts/QChartView> #include <QtCharts/QLineSeries> #include <QtCharts/QAreaSeries> diff --git a/examples/charts/audio/main.cpp b/examples/charts/audio/main.cpp index dd9069df..f4fa8c3e 100644 --- a/examples/charts/audio/main.cpp +++ b/examples/charts/audio/main.cpp @@ -18,7 +18,7 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QtWidgets/QApplication> #include "widget.h" int main(int argc, char *argv[]) diff --git a/examples/charts/audio/widget.cpp b/examples/charts/audio/widget.cpp index 6cd5d442..9acf8274 100644 --- a/examples/charts/audio/widget.cpp +++ b/examples/charts/audio/widget.cpp @@ -19,13 +19,13 @@ ****************************************************************************/ #include "widget.h" -#include <QAudioDeviceInfo> -#include <QAudioInput> -#include <QChartView> -#include <QLineSeries> -#include <QChart> -#include <QVBoxLayout> -#include <QValueAxis> +#include <QtMultimedia/QAudioDeviceInfo> +#include <QtMultimedia/QAudioInput> +#include <QtCharts/QChartView> +#include <QtCharts/QLineSeries> +#include <QtCharts/QChart> +#include <QtWidgets/QVBoxLayout> +#include <QtCharts/QValueAxis> #include "xyseriesiodevice.h" QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/audio/widget.h b/examples/charts/audio/widget.h index 6f745069..f5a6fd89 100644 --- a/examples/charts/audio/widget.h +++ b/examples/charts/audio/widget.h @@ -21,8 +21,8 @@ #ifndef WIDGET_H #define WIDGET_H -#include <QWidget> -#include <QChartGlobal> +#include <QtWidgets/QWidget> +#include <QtCharts/QChartGlobal> QT_CHARTS_BEGIN_NAMESPACE class QLineSeries; diff --git a/examples/charts/audio/xyseriesiodevice.cpp b/examples/charts/audio/xyseriesiodevice.cpp index 5440771f..83facaac 100644 --- a/examples/charts/audio/xyseriesiodevice.cpp +++ b/examples/charts/audio/xyseriesiodevice.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "xyseriesiodevice.h" -#include <QXYSeries> +#include <QtCharts/QXYSeries> XYSeriesIODevice::XYSeriesIODevice(QXYSeries * series, QObject *parent) : QIODevice(parent), diff --git a/examples/charts/audio/xyseriesiodevice.h b/examples/charts/audio/xyseriesiodevice.h index 6e504b08..d78a35de 100644 --- a/examples/charts/audio/xyseriesiodevice.h +++ b/examples/charts/audio/xyseriesiodevice.h @@ -21,8 +21,8 @@ #ifndef XYSERIESIODEVICE_H #define XYSERIESIODEVICE_H -#include <QIODevice> -#include <QChartGlobal> +#include <QtCore/QIODevice> +#include <QtCharts/QChartGlobal> QT_CHARTS_BEGIN_NAMESPACE class QXYSeries; diff --git a/examples/charts/barchart/main.cpp b/examples/charts/barchart/main.cpp index a0e3cd89..c69e9bb0 100644 --- a/examples/charts/barchart/main.cpp +++ b/examples/charts/barchart/main.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QBarSeries> -#include <QBarSet> -#include <QLegend> -#include <QBarCategoryAxis> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLegend> +#include <QtCharts/QBarCategoryAxis> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/barmodelmapper/customtablemodel.cpp b/examples/charts/barmodelmapper/customtablemodel.cpp index 3ec58384..e70fdf34 100644 --- a/examples/charts/barmodelmapper/customtablemodel.cpp +++ b/examples/charts/barmodelmapper/customtablemodel.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "customtablemodel.h" -#include <QVector> -#include <QTime> -#include <QRect> -#include <QColor> +#include <QtCore/QVector> +#include <QtCore/QTime> +#include <QtCore/QRect> +#include <QtGui/QColor> CustomTableModel::CustomTableModel(QObject *parent) : QAbstractTableModel(parent) diff --git a/examples/charts/barmodelmapper/customtablemodel.h b/examples/charts/barmodelmapper/customtablemodel.h index 755f4c7d..7294d289 100644 --- a/examples/charts/barmodelmapper/customtablemodel.h +++ b/examples/charts/barmodelmapper/customtablemodel.h @@ -21,9 +21,9 @@ #ifndef CUSTOMTABLEMODEL_H #define CUSTOMTABLEMODEL_H -#include <QAbstractTableModel> -#include <QHash> -#include <QRect> +#include <QtCore/QAbstractTableModel> +#include <QtCore/QHash> +#include <QtCore/QRect> class CustomTableModel : public QAbstractTableModel { diff --git a/examples/charts/barmodelmapper/main.cpp b/examples/charts/barmodelmapper/main.cpp index bf0b384b..618722b4 100644 --- a/examples/charts/barmodelmapper/main.cpp +++ b/examples/charts/barmodelmapper/main.cpp @@ -18,7 +18,7 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QtWidgets/QApplication> #include "tablewidget.h" int main(int argc, char *argv[]) diff --git a/examples/charts/barmodelmapper/tablewidget.cpp b/examples/charts/barmodelmapper/tablewidget.cpp index 81e881e9..ba07e757 100644 --- a/examples/charts/barmodelmapper/tablewidget.cpp +++ b/examples/charts/barmodelmapper/tablewidget.cpp @@ -20,17 +20,17 @@ #include "tablewidget.h" #include "customtablemodel.h" -#include <QGridLayout> -#include <QTableView> -#include <QChart> -#include <QChartView> -#include <QLineSeries> -#include <QVXYModelMapper> -#include <QBarSeries> -#include <QBarSet> -#include <QVBarModelMapper> -#include <QHeaderView> -#include <QBarCategoryAxis> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QTableView> +#include <QtCharts/QChart> +#include <QtCharts/QChartView> +#include <QtCharts/QLineSeries> +#include <QtCharts/QVXYModelMapper> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QVBarModelMapper> +#include <QtWidgets/QHeaderView> +#include <QtCharts/QBarCategoryAxis> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/barmodelmapper/tablewidget.h b/examples/charts/barmodelmapper/tablewidget.h index 3846cc11..126d3066 100644 --- a/examples/charts/barmodelmapper/tablewidget.h +++ b/examples/charts/barmodelmapper/tablewidget.h @@ -21,7 +21,7 @@ #ifndef TABLEWIDGET_H #define TABLEWIDGET_H -#include <QWidget> +#include <QtWidgets/QWidget> class TableWidget : public QWidget { diff --git a/examples/charts/boxplotchart/boxdatareader.h b/examples/charts/boxplotchart/boxdatareader.h index 5dbddc14..1d9b89a9 100644 --- a/examples/charts/boxplotchart/boxdatareader.h +++ b/examples/charts/boxplotchart/boxdatareader.h @@ -21,8 +21,8 @@ #ifndef BOXDATAREADER_H #define BOXDATAREADER_H -#include <QTextStream> -#include <QBoxSet> +#include <QtCore/QTextStream> +#include <QtCharts/QBoxSet> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/boxplotchart/main.cpp b/examples/charts/boxplotchart/main.cpp index 802217e1..22e0aecf 100644 --- a/examples/charts/boxplotchart/main.cpp +++ b/examples/charts/boxplotchart/main.cpp @@ -18,14 +18,14 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QBoxPlotSeries> -#include <QBoxSet> -#include <QLegend> -#include <QBarCategoryAxis> -#include <QFile> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QBoxPlotSeries> +#include <QtCharts/QBoxSet> +#include <QtCharts/QLegend> +#include <QtCharts/QBarCategoryAxis> +#include <QtCore/QFile> #include "boxdatareader.h" diff --git a/examples/charts/callout/callout.cpp b/examples/charts/callout/callout.cpp index 2491368f..906e8d6b 100644 --- a/examples/charts/callout/callout.cpp +++ b/examples/charts/callout/callout.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "callout.h" -#include <QPainter> -#include <QFontMetrics> -#include <QGraphicsSceneMouseEvent> -#include <QMouseEvent> +#include <QtGui/QPainter> +#include <QtGui/QFontMetrics> +#include <QtWidgets/QGraphicsSceneMouseEvent> +#include <QtGui/QMouseEvent> Callout::Callout(QGraphicsItem * parent): QGraphicsItem(parent) diff --git a/examples/charts/callout/callout.h b/examples/charts/callout/callout.h index 23fc8484..bf6ce197 100644 --- a/examples/charts/callout/callout.h +++ b/examples/charts/callout/callout.h @@ -21,8 +21,8 @@ #ifndef CALLOUT_H #define CALLOUT_H -#include <QGraphicsItem> -#include <QFont> +#include <QtWidgets/QGraphicsItem> +#include <QtGui/QFont> class QGraphicsSceneMouseEvent; diff --git a/examples/charts/callout/main.cpp b/examples/charts/callout/main.cpp index a6dfc2e9..8673c7d2 100644 --- a/examples/charts/callout/main.cpp +++ b/examples/charts/callout/main.cpp @@ -18,7 +18,7 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QtWidgets/QApplication> #include "view.h" int main(int argc, char *argv[]) diff --git a/examples/charts/callout/view.cpp b/examples/charts/callout/view.cpp index a7c43863..1f1ce8f6 100644 --- a/examples/charts/callout/view.cpp +++ b/examples/charts/callout/view.cpp @@ -19,14 +19,14 @@ ****************************************************************************/ #include "view.h" -#include <QResizeEvent> -#include <QGraphicsScene> -#include <QChart> -#include <QLineSeries> -#include <QSplineSeries> -#include <QGraphicsTextItem> +#include <QtGui/QResizeEvent> +#include <QtWidgets/QGraphicsScene> +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QSplineSeries> +#include <QtWidgets/QGraphicsTextItem> #include "callout.h" -#include <QMouseEvent> +#include <QtGui/QMouseEvent> View::View(QWidget *parent) : QGraphicsView(new QGraphicsScene, parent), diff --git a/examples/charts/callout/view.h b/examples/charts/callout/view.h index 3a322382..82f41696 100644 --- a/examples/charts/callout/view.h +++ b/examples/charts/callout/view.h @@ -20,8 +20,8 @@ #ifndef VIEW_H #define VIEW_H -#include <QGraphicsView> -#include <QChartGlobal> +#include <QtWidgets/QGraphicsView> +#include <QtCharts/QChartGlobal> QT_CHARTS_BEGIN_NAMESPACE class QChart; diff --git a/examples/charts/chartinteractions/chart.cpp b/examples/charts/chartinteractions/chart.cpp index 8aa2a443..e969a9b6 100644 --- a/examples/charts/chartinteractions/chart.cpp +++ b/examples/charts/chartinteractions/chart.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "chart.h" -#include <QValueAxis> -#include <QAbstractAxis> -#include <qmath.h> +#include <QtCharts/QValueAxis> +#include <QtCharts/QAbstractAxis> +#include <QtCore/QtMath> Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags, QLineSeries *series) : QChart(QChart::ChartTypeCartesian, parent, wFlags), m_series(series) diff --git a/examples/charts/chartinteractions/chart.h b/examples/charts/chartinteractions/chart.h index 9a10387b..b4023fad 100644 --- a/examples/charts/chartinteractions/chart.h +++ b/examples/charts/chartinteractions/chart.h @@ -21,8 +21,8 @@ #ifndef CHART_H #define CHART_H -#include <QChart> -#include <QLineSeries> +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/chartinteractions/chartview.cpp b/examples/charts/chartinteractions/chartview.cpp index 95fae6cd..0be8c0f1 100644 --- a/examples/charts/chartinteractions/chartview.cpp +++ b/examples/charts/chartinteractions/chartview.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "chartview.h" -#include <QMouseEvent> +#include <QtGui/QMouseEvent> #include "chart.h" ChartView::ChartView(Chart *chart, QWidget *parent) : diff --git a/examples/charts/chartinteractions/chartview.h b/examples/charts/chartinteractions/chartview.h index 931feee0..056bb329 100644 --- a/examples/charts/chartinteractions/chartview.h +++ b/examples/charts/chartinteractions/chartview.h @@ -21,7 +21,7 @@ #ifndef CHARTVIEW_H #define CHARTVIEW_H -#include <QChartView> +#include <QtCharts/QChartView> class Chart; diff --git a/examples/charts/chartinteractions/main.cpp b/examples/charts/chartinteractions/main.cpp index 67cfb800..b4c05fa0 100644 --- a/examples/charts/chartinteractions/main.cpp +++ b/examples/charts/chartinteractions/main.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QLineSeries> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QLineSeries> -#include <QValueAxis> +#include <QtCharts/QValueAxis> #include "chart.h" #include "chartview.h" diff --git a/examples/charts/chartthemes/main.cpp b/examples/charts/chartthemes/main.cpp index 5bc1af84..c8e278fe 100644 --- a/examples/charts/chartthemes/main.cpp +++ b/examples/charts/chartthemes/main.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "themewidget.h" -#include <QApplication> -#include <QMainWindow> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> int main(int argc, char *argv[]) { diff --git a/examples/charts/chartthemes/themewidget.cpp b/examples/charts/chartthemes/themewidget.cpp index d1b0051b..c888b4fc 100644 --- a/examples/charts/chartthemes/themewidget.cpp +++ b/examples/charts/chartthemes/themewidget.cpp @@ -20,28 +20,28 @@ #include "themewidget.h" -#include <QChartView> -#include <QPieSeries> -#include <QPieSlice> -#include <QAbstractBarSeries> -#include <QPercentBarSeries> -#include <QStackedBarSeries> -#include <QBarSeries> -#include <QBarSet> -#include <QLineSeries> -#include <QSplineSeries> -#include <QScatterSeries> -#include <QAreaSeries> -#include <QLegend> -#include <QGridLayout> -#include <QFormLayout> -#include <QComboBox> -#include <QSpinBox> -#include <QCheckBox> -#include <QGroupBox> -#include <QLabel> -#include <QTime> -#include <QBarCategoryAxis> +#include <QtCharts/QChartView> +#include <QtCharts/QPieSeries> +#include <QtCharts/QPieSlice> +#include <QtCharts/QAbstractBarSeries> +#include <QtCharts/QPercentBarSeries> +#include <QtCharts/QStackedBarSeries> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLineSeries> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QAreaSeries> +#include <QtCharts/QLegend> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QSpinBox> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QLabel> +#include <QtCore/QTime> +#include <QtCharts/QBarCategoryAxis> ThemeWidget::ThemeWidget(QWidget *parent) : QWidget(parent), diff --git a/examples/charts/chartthemes/themewidget.h b/examples/charts/chartthemes/themewidget.h index d1a4d997..02781480 100644 --- a/examples/charts/chartthemes/themewidget.h +++ b/examples/charts/chartthemes/themewidget.h @@ -21,8 +21,8 @@ #ifndef THEMEWIDGET_H #define THEMEWIDGET_H -#include <QWidget> -#include <QChartGlobal> +#include <QtWidgets/QWidget> +#include <QtCharts/QChartGlobal> class QComboBox; class QCheckBox; diff --git a/examples/charts/customchart/main.cpp b/examples/charts/customchart/main.cpp index 8a35dfb1..7735b7c5 100644 --- a/examples/charts/customchart/main.cpp +++ b/examples/charts/customchart/main.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QLineSeries> -#include <QCategoryAxis> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QLineSeries> +#include <QtCharts/QCategoryAxis> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/datetimeaxis/main.cpp b/examples/charts/datetimeaxis/main.cpp index 988b74f2..cd178220 100644 --- a/examples/charts/datetimeaxis/main.cpp +++ b/examples/charts/datetimeaxis/main.cpp @@ -18,16 +18,16 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QLineSeries> -#include <QDateTime> -#include <QDateTimeAxis> -#include <QFile> -#include <QTextStream> -#include <QDebug> -#include <QValueAxis> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QLineSeries> +#include <QtCore/QDateTime> +#include <QtCharts/QDateTimeAxis> +#include <QtCore/QFile> +#include <QtCore/QTextStream> +#include <QtCore/QDebug> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/donutbreakdown/donutbreakdownchart.cpp b/examples/charts/donutbreakdown/donutbreakdownchart.cpp index 5272f105..405b7a95 100644 --- a/examples/charts/donutbreakdown/donutbreakdownchart.cpp +++ b/examples/charts/donutbreakdown/donutbreakdownchart.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "donutbreakdownchart.h" #include "mainslice.h" -#include <QPieSlice> -#include <QPieLegendMarker> +#include <QtCharts/QPieSlice> +#include <QtCharts/QPieLegendMarker> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/donutbreakdown/donutbreakdownchart.h b/examples/charts/donutbreakdown/donutbreakdownchart.h index 71b3ecf4..33829732 100644 --- a/examples/charts/donutbreakdown/donutbreakdownchart.h +++ b/examples/charts/donutbreakdown/donutbreakdownchart.h @@ -20,8 +20,8 @@ #ifndef DONUTBREAKDOWNCHART_H #define DONUTBREAKDOWNCHART_H -#include <QChart> -#include <QPieSeries> +#include <QtCharts/QChart> +#include <QtCharts/QPieSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/donutbreakdown/main.cpp b/examples/charts/donutbreakdown/main.cpp index fb3925b6..13e3f205 100644 --- a/examples/charts/donutbreakdown/main.cpp +++ b/examples/charts/donutbreakdown/main.cpp @@ -17,10 +17,10 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QStatusBar> -#include <QChartView> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QStatusBar> +#include <QtCharts/QChartView> #include "donutbreakdownchart.h" QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/donutbreakdown/mainslice.h b/examples/charts/donutbreakdown/mainslice.h index 6c6d63c2..b7a1b9ac 100644 --- a/examples/charts/donutbreakdown/mainslice.h +++ b/examples/charts/donutbreakdown/mainslice.h @@ -21,8 +21,8 @@ #ifndef MAINSLICE_H #define MAINSLICE_H -#include <QPieSlice> -#include <QPieSeries> +#include <QtCharts/QPieSlice> +#include <QtCharts/QPieSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/donutchart/main.cpp b/examples/charts/donutchart/main.cpp index 78b2a7c3..eeef6d87 100644 --- a/examples/charts/donutchart/main.cpp +++ b/examples/charts/donutchart/main.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QPieSeries> -#include <QPieSlice> -#include <QDebug> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QPieSeries> +#include <QtCharts/QPieSlice> +#include <QtCore/QDebug> QT_CHARTS_USE_NAMESPACE int main(int argc, char *argv[]) diff --git a/examples/charts/dynamicspline/chart.cpp b/examples/charts/dynamicspline/chart.cpp index 4c7bc355..ce573131 100644 --- a/examples/charts/dynamicspline/chart.cpp +++ b/examples/charts/dynamicspline/chart.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "chart.h" -#include <QAbstractAxis> -#include <QSplineSeries> -#include <QValueAxis> -#include <QTime> -#include <QDebug> +#include <QtCharts/QAbstractAxis> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QValueAxis> +#include <QtCore/QTime> +#include <QtCore/QDebug> Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags): QChart(QChart::ChartTypeCartesian, parent, wFlags), diff --git a/examples/charts/dynamicspline/chart.h b/examples/charts/dynamicspline/chart.h index b6d5eb1c..81ddf9dd 100644 --- a/examples/charts/dynamicspline/chart.h +++ b/examples/charts/dynamicspline/chart.h @@ -21,8 +21,8 @@ #ifndef CHART_H #define CHART_H -#include <QChart> -#include <QTimer> +#include <QtCharts/QChart> +#include <QtCore/QTimer> QT_CHARTS_BEGIN_NAMESPACE class QSplineSeries; diff --git a/examples/charts/dynamicspline/main.cpp b/examples/charts/dynamicspline/main.cpp index 00f18c2f..1bf356db 100644 --- a/examples/charts/dynamicspline/main.cpp +++ b/examples/charts/dynamicspline/main.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "chart.h" -#include <QChartView> -#include <QApplication> -#include <QMainWindow> +#include <QtCharts/QChartView> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/horizontalbarchart/main.cpp b/examples/charts/horizontalbarchart/main.cpp index 725aa127..d78bff78 100644 --- a/examples/charts/horizontalbarchart/main.cpp +++ b/examples/charts/horizontalbarchart/main.cpp @@ -18,15 +18,15 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QBarSeries> -#include <QBarSet> -#include <QLegend> -#include <QBarCategoryAxis> -#include <QValueAxis> -#include <QHorizontalBarSeries> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLegend> +#include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QValueAxis> +#include <QtCharts/QHorizontalBarSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/horizontalpercentbarchart/main.cpp b/examples/charts/horizontalpercentbarchart/main.cpp index d8adab49..37614b65 100644 --- a/examples/charts/horizontalpercentbarchart/main.cpp +++ b/examples/charts/horizontalpercentbarchart/main.cpp @@ -18,14 +18,14 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QBarSeries> -#include <QBarSet> -#include <QLegend> -#include <QBarCategoryAxis> -#include <QHorizontalPercentBarSeries> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLegend> +#include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QHorizontalPercentBarSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/horizontalstackedbarchart/main.cpp b/examples/charts/horizontalstackedbarchart/main.cpp index 13df0cdf..0de1ee43 100644 --- a/examples/charts/horizontalstackedbarchart/main.cpp +++ b/examples/charts/horizontalstackedbarchart/main.cpp @@ -18,14 +18,14 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QBarSeries> -#include <QBarSet> -#include <QLegend> -#include <QBarCategoryAxis> -#include <QHorizontalStackedBarSeries> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLegend> +#include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QHorizontalStackedBarSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/legend/main.cpp b/examples/charts/legend/main.cpp index 64d3903b..957aaf4e 100644 --- a/examples/charts/legend/main.cpp +++ b/examples/charts/legend/main.cpp @@ -20,8 +20,8 @@ #include "mainwidget.h" -#include <QApplication> -#include <QMainWindow> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/legend/mainwidget.cpp b/examples/charts/legend/mainwidget.cpp index 32bc2ae9..6ec9cf6d 100644 --- a/examples/charts/legend/mainwidget.cpp +++ b/examples/charts/legend/mainwidget.cpp @@ -19,15 +19,15 @@ ****************************************************************************/ #include "mainwidget.h" -#include <QChart> -#include <QChartView> -#include <QPushButton> -#include <QLabel> -#include <QDebug> -#include <QBarSet> -#include <QBarSeries> -#include <QLegend> -#include <QFormLayout> +#include <QtCharts/QChart> +#include <QtCharts/QChartView> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QLabel> +#include <QtCore/QDebug> +#include <QtCharts/QBarSet> +#include <QtCharts/QBarSeries> +#include <QtCharts/QLegend> +#include <QtWidgets/QFormLayout> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/legend/mainwidget.h b/examples/charts/legend/mainwidget.h index 3a24d674..cff9f3f3 100644 --- a/examples/charts/legend/mainwidget.h +++ b/examples/charts/legend/mainwidget.h @@ -21,16 +21,16 @@ #ifndef MAINWIDGET_H #define MAINWIDGET_H -#include "qchartglobal.h" -#include "qchart.h" -#include "qchartview.h" -#include <QWidget> -#include <QGraphicsWidget> -#include <QGridLayout> -#include <QGraphicsGridLayout> -#include <QDoubleSpinBox> -#include <QGroupBox> -#include <QBarSeries> +#include <QtCharts/QChartGlobal> +#include <QtCharts/QChart> +#include <QtCharts/QChartView> +#include <QtWidgets/QWidget> +#include <QtWidgets/QGraphicsWidget> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QGraphicsGridLayout> +#include <QtWidgets/QDoubleSpinBox> +#include <QtWidgets/QGroupBox> +#include <QtCharts/QBarSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/legendmarkers/main.cpp b/examples/charts/legendmarkers/main.cpp index f627e496..425ac800 100644 --- a/examples/charts/legendmarkers/main.cpp +++ b/examples/charts/legendmarkers/main.cpp @@ -20,8 +20,8 @@ #include "mainwidget.h" -#include <QApplication> -#include <QMainWindow> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> int main(int argc, char *argv[]) { diff --git a/examples/charts/legendmarkers/mainwidget.cpp b/examples/charts/legendmarkers/mainwidget.cpp index f71e7a61..f97626de 100644 --- a/examples/charts/legendmarkers/mainwidget.cpp +++ b/examples/charts/legendmarkers/mainwidget.cpp @@ -19,17 +19,17 @@ ****************************************************************************/ #include "mainwidget.h" -#include <QChart> -#include <QChartView> -#include <QPushButton> -#include <QLabel> -#include <QDebug> -#include <QLegend> -#include <QFormLayout> -#include <QLegendMarker> -#include <QLineSeries> -#include <QXYLegendMarker> -#include <qmath.h> +#include <QtCharts/QChart> +#include <QtCharts/QChartView> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QLabel> +#include <QtCore/QDebug> +#include <QtCharts/QLegend> +#include <QtWidgets/QFormLayout> +#include <QtCharts/QLegendMarker> +#include <QtCharts/QLineSeries> +#include <QtCharts/QXYLegendMarker> +#include <QtCore/QtMath> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/legendmarkers/mainwidget.h b/examples/charts/legendmarkers/mainwidget.h index 350808a2..522ffc8b 100644 --- a/examples/charts/legendmarkers/mainwidget.h +++ b/examples/charts/legendmarkers/mainwidget.h @@ -21,16 +21,16 @@ #ifndef MAINWIDGET_H #define MAINWIDGET_H -#include "qchartglobal.h" -#include "qchart.h" -#include "qchartview.h" -#include <QWidget> -#include <QGraphicsWidget> -#include <QGridLayout> -#include <QGraphicsGridLayout> -#include <QDoubleSpinBox> -#include <QGroupBox> -#include <QLineSeries> +#include <QtCharts/QChartGlobal> +#include <QtCharts/QChart> +#include <QtCharts/QChartView> +#include <QtWidgets/QWidget> +#include <QtWidgets/QGraphicsWidget> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QGraphicsGridLayout> +#include <QtWidgets/QDoubleSpinBox> +#include <QtWidgets/QGroupBox> +#include <QtCharts/QLineSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/lineandbar/main.cpp b/examples/charts/lineandbar/main.cpp index 264d5829..38e3f999 100644 --- a/examples/charts/lineandbar/main.cpp +++ b/examples/charts/lineandbar/main.cpp @@ -18,15 +18,15 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QBarSeries> -#include <QBarSet> -#include <QLineSeries> -#include <QLegend> -#include <QBarCategoryAxis> -#include <QValueAxis> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLineSeries> +#include <QtCharts/QLegend> +#include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/linechart/main.cpp b/examples/charts/linechart/main.cpp index c0040e51..990fdf0b 100644 --- a/examples/charts/linechart/main.cpp +++ b/examples/charts/linechart/main.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QLineSeries> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QLineSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/logvalueaxis/main.cpp b/examples/charts/logvalueaxis/main.cpp index 73591ae3..b95c6c8f 100644 --- a/examples/charts/logvalueaxis/main.cpp +++ b/examples/charts/logvalueaxis/main.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QLineSeries> -#include <QValueAxis> -#include <QLogValueAxis> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QLineSeries> +#include <QtCharts/QValueAxis> +#include <QtCharts/QLogValueAxis> QT_CHARTS_USE_NAMESPACE @@ -69,6 +69,7 @@ int main(int argc, char *argv[]) window.setCentralWidget(chartView); window.resize(400, 300); window.show(); + //![5] return a.exec(); diff --git a/examples/charts/modeldata/customtablemodel.cpp b/examples/charts/modeldata/customtablemodel.cpp index 2bec3c98..bf810bb3 100644 --- a/examples/charts/modeldata/customtablemodel.cpp +++ b/examples/charts/modeldata/customtablemodel.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "customtablemodel.h" -#include <QVector> -#include <QTime> -#include <QRect> -#include <QColor> +#include <QtCore/QVector> +#include <QtCore/QTime> +#include <QtCore/QRect> +#include <QtGui/QColor> CustomTableModel::CustomTableModel(QObject *parent) : QAbstractTableModel(parent) diff --git a/examples/charts/modeldata/customtablemodel.h b/examples/charts/modeldata/customtablemodel.h index 755f4c7d..7294d289 100644 --- a/examples/charts/modeldata/customtablemodel.h +++ b/examples/charts/modeldata/customtablemodel.h @@ -21,9 +21,9 @@ #ifndef CUSTOMTABLEMODEL_H #define CUSTOMTABLEMODEL_H -#include <QAbstractTableModel> -#include <QHash> -#include <QRect> +#include <QtCore/QAbstractTableModel> +#include <QtCore/QHash> +#include <QtCore/QRect> class CustomTableModel : public QAbstractTableModel { diff --git a/examples/charts/modeldata/main.cpp b/examples/charts/modeldata/main.cpp index bf0b384b..618722b4 100644 --- a/examples/charts/modeldata/main.cpp +++ b/examples/charts/modeldata/main.cpp @@ -18,7 +18,7 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QtWidgets/QApplication> #include "tablewidget.h" int main(int argc, char *argv[]) diff --git a/examples/charts/modeldata/tablewidget.cpp b/examples/charts/modeldata/tablewidget.cpp index 5d50dd70..4ed167ce 100644 --- a/examples/charts/modeldata/tablewidget.cpp +++ b/examples/charts/modeldata/tablewidget.cpp @@ -20,13 +20,13 @@ #include "tablewidget.h" #include "customtablemodel.h" -#include <QGridLayout> -#include <QTableView> -#include <QChart> -#include <QChartView> -#include <QLineSeries> -#include <QVXYModelMapper> -#include <QHeaderView> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QTableView> +#include <QtCharts/QChart> +#include <QtCharts/QChartView> +#include <QtCharts/QLineSeries> +#include <QtCharts/QVXYModelMapper> +#include <QtWidgets/QHeaderView> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/modeldata/tablewidget.h b/examples/charts/modeldata/tablewidget.h index 3846cc11..126d3066 100644 --- a/examples/charts/modeldata/tablewidget.h +++ b/examples/charts/modeldata/tablewidget.h @@ -21,7 +21,7 @@ #ifndef TABLEWIDGET_H #define TABLEWIDGET_H -#include <QWidget> +#include <QtWidgets/QWidget> class TableWidget : public QWidget { diff --git a/examples/charts/multiaxis/main.cpp b/examples/charts/multiaxis/main.cpp index b6b53e88..e5c14109 100644 --- a/examples/charts/multiaxis/main.cpp +++ b/examples/charts/multiaxis/main.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QLineSeries> -#include <QSplineSeries> -#include <QValueAxis> -#include <QCategoryAxis> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QLineSeries> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QValueAxis> +#include <QtCharts/QCategoryAxis> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/nesteddonuts/main.cpp b/examples/charts/nesteddonuts/main.cpp index 0b833a83..6d1d3a76 100644 --- a/examples/charts/nesteddonuts/main.cpp +++ b/examples/charts/nesteddonuts/main.cpp @@ -17,7 +17,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QApplication> +#include <QtWidgets/QApplication> #include "widget.h" int main(int argc, char *argv[]) diff --git a/examples/charts/nesteddonuts/widget.cpp b/examples/charts/nesteddonuts/widget.cpp index e11c4c7c..ee1e1a94 100644 --- a/examples/charts/nesteddonuts/widget.cpp +++ b/examples/charts/nesteddonuts/widget.cpp @@ -18,14 +18,14 @@ ** ****************************************************************************/ #include "widget.h" -#include <QChartView> -#include <QChart> -#include <QLegend> -#include <QPieSeries> -#include <QPieSlice> -#include <QTime> -#include <QGridLayout> -#include <QTimer> +#include <QtCharts/QChartView> +#include <QtCharts/QChart> +#include <QtCharts/QLegend> +#include <QtCharts/QPieSeries> +#include <QtCharts/QPieSlice> +#include <QtCore/QTime> +#include <QtWidgets/QGridLayout> +#include <QtCore/QTimer> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/nesteddonuts/widget.h b/examples/charts/nesteddonuts/widget.h index 6d2b749c..3851e76b 100644 --- a/examples/charts/nesteddonuts/widget.h +++ b/examples/charts/nesteddonuts/widget.h @@ -20,8 +20,8 @@ #ifndef WIDGET_H #define WIDGET_H -#include <QWidget> -#include <QPieSeries> +#include <QtWidgets/QWidget> +#include <QtCharts/QPieSeries> class QTimer; diff --git a/examples/charts/percentbarchart/main.cpp b/examples/charts/percentbarchart/main.cpp index 15a68206..fe0368b0 100644 --- a/examples/charts/percentbarchart/main.cpp +++ b/examples/charts/percentbarchart/main.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QPercentBarSeries> -#include <QBarSet> -#include <QLegend> -#include <QBarCategoryAxis> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QPercentBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLegend> +#include <QtCharts/QBarCategoryAxis> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/piechart/main.cpp b/examples/charts/piechart/main.cpp index 5e7b4ef1..4fed67ce 100644 --- a/examples/charts/piechart/main.cpp +++ b/examples/charts/piechart/main.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QPieSeries> -#include <QPieSlice> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QPieSeries> +#include <QtCharts/QPieSlice> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/piechartcustomization/brushtool.cpp b/examples/charts/piechartcustomization/brushtool.cpp index 08dff95a..944497d9 100644 --- a/examples/charts/piechartcustomization/brushtool.cpp +++ b/examples/charts/piechartcustomization/brushtool.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ #include "brushtool.h" -#include <QPushButton> -#include <QFormLayout> -#include <QComboBox> -#include <QColorDialog> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QColorDialog> BrushTool::BrushTool(QString title, QWidget *parent) : QWidget(parent) diff --git a/examples/charts/piechartcustomization/brushtool.h b/examples/charts/piechartcustomization/brushtool.h index f6e31b72..474bca31 100644 --- a/examples/charts/piechartcustomization/brushtool.h +++ b/examples/charts/piechartcustomization/brushtool.h @@ -20,8 +20,8 @@ #ifndef BRUSHTOOL_H #define BRUSHTOOL_H -#include <QWidget> -#include <QBrush> +#include <QtWidgets/QWidget> +#include <QtGui/QBrush> class QPushButton; class QComboBox; diff --git a/examples/charts/piechartcustomization/customslice.h b/examples/charts/piechartcustomization/customslice.h index 4c8e81fa..cac7f201 100644 --- a/examples/charts/piechartcustomization/customslice.h +++ b/examples/charts/piechartcustomization/customslice.h @@ -20,7 +20,7 @@ #ifndef CUSTOMSLICE_H #define CUSTOMSLICE_H -#include <QPieSlice> +#include <QtCharts/QPieSlice> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/piechartcustomization/main.cpp b/examples/charts/piechartcustomization/main.cpp index f35fd0fc..3e51316f 100644 --- a/examples/charts/piechartcustomization/main.cpp +++ b/examples/charts/piechartcustomization/main.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "mainwidget.h" -#include <QApplication> -#include <QMainWindow> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> int main(int argc, char *argv[]) { diff --git a/examples/charts/piechartcustomization/mainwidget.cpp b/examples/charts/piechartcustomization/mainwidget.cpp index fb0ed05d..f89c2d26 100644 --- a/examples/charts/piechartcustomization/mainwidget.cpp +++ b/examples/charts/piechartcustomization/mainwidget.cpp @@ -21,16 +21,16 @@ #include "customslice.h" #include "pentool.h" #include "brushtool.h" -#include <QPushButton> -#include <QComboBox> -#include <QCheckBox> -#include <QLineEdit> -#include <QGroupBox> -#include <QDoubleSpinBox> -#include <QFormLayout> -#include <QFontDialog> -#include <QChartView> -#include <QPieSeries> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QDoubleSpinBox> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QFontDialog> +#include <QtCharts/QChartView> +#include <QtCharts/QPieSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/piechartcustomization/mainwidget.h b/examples/charts/piechartcustomization/mainwidget.h index e9d3ada1..7ae0eb3e 100644 --- a/examples/charts/piechartcustomization/mainwidget.h +++ b/examples/charts/piechartcustomization/mainwidget.h @@ -20,8 +20,8 @@ #ifndef MAINWIDGET_H #define MAINWIDGET_H -#include <QWidget> -#include <QChartGlobal> +#include <QtWidgets/QWidget> +#include <QtCharts/QChartGlobal> class QLineEdit; class QPushButton; diff --git a/examples/charts/piechartcustomization/pentool.cpp b/examples/charts/piechartcustomization/pentool.cpp index 104231ee..b827039f 100644 --- a/examples/charts/piechartcustomization/pentool.cpp +++ b/examples/charts/piechartcustomization/pentool.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "pentool.h" -#include <QPushButton> -#include <QDoubleSpinBox> -#include <QComboBox> -#include <QFormLayout> -#include <QColorDialog> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QDoubleSpinBox> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QColorDialog> PenTool::PenTool(QString title, QWidget *parent) : QWidget(parent) diff --git a/examples/charts/piechartcustomization/pentool.h b/examples/charts/piechartcustomization/pentool.h index 66e7ab10..13b4064d 100644 --- a/examples/charts/piechartcustomization/pentool.h +++ b/examples/charts/piechartcustomization/pentool.h @@ -20,8 +20,8 @@ #ifndef PENTOOL_H #define PENTOOL_H -#include <QWidget> -#include <QPen> +#include <QtWidgets/QWidget> +#include <QtGui/QPen> class QPushButton; class QDoubleSpinBox; diff --git a/examples/charts/piechartdrilldown/drilldownchart.h b/examples/charts/piechartdrilldown/drilldownchart.h index 554b6651..c1d51529 100644 --- a/examples/charts/piechartdrilldown/drilldownchart.h +++ b/examples/charts/piechartdrilldown/drilldownchart.h @@ -20,7 +20,7 @@ #ifndef DRILLDOWNCHART_H #define DRILLDOWNCHART_H -#include <QChart> +#include <QtCharts/QChart> QT_CHARTS_BEGIN_NAMESPACE class QAbstractSeries; diff --git a/examples/charts/piechartdrilldown/drilldownslice.h b/examples/charts/piechartdrilldown/drilldownslice.h index 9743e852..aea50646 100644 --- a/examples/charts/piechartdrilldown/drilldownslice.h +++ b/examples/charts/piechartdrilldown/drilldownslice.h @@ -20,7 +20,7 @@ #ifndef DRILLDOWNSLICE_H #define DRILLDOWNSLICE_H -#include <QPieSlice> +#include <QtCharts/QPieSlice> QT_CHARTS_BEGIN_NAMESPACE class QAbstractSeries; diff --git a/examples/charts/piechartdrilldown/main.cpp b/examples/charts/piechartdrilldown/main.cpp index a32587ff..2ab41527 100644 --- a/examples/charts/piechartdrilldown/main.cpp +++ b/examples/charts/piechartdrilldown/main.cpp @@ -20,12 +20,12 @@ #include "drilldownchart.h" #include "drilldownslice.h" -#include <QApplication> -#include <QMainWindow> -#include <QTime> -#include <QChartView> -#include <QLegend> -#include <QPieSeries> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCore/QTime> +#include <QtCharts/QChartView> +#include <QtCharts/QLegend> +#include <QtCharts/QPieSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/polarchart/chartview.cpp b/examples/charts/polarchart/chartview.cpp index 038ce709..269ba7f2 100644 --- a/examples/charts/polarchart/chartview.cpp +++ b/examples/charts/polarchart/chartview.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "chartview.h" -#include <QMouseEvent> -#include <QDebug> -#include <QAbstractAxis> -#include <QValueAxis> +#include <QtGui/QMouseEvent> +#include <QtCore/QDebug> +#include <QtCharts/QAbstractAxis> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/polarchart/chartview.h b/examples/charts/polarchart/chartview.h index 9f59b469..c0cc1878 100644 --- a/examples/charts/polarchart/chartview.h +++ b/examples/charts/polarchart/chartview.h @@ -21,8 +21,8 @@ #ifndef CHARTVIEW_H #define CHARTVIEW_H -#include <QChartView> -#include <QPolarChart> +#include <QtCharts/QChartView> +#include <QtCharts/QPolarChart> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/polarchart/main.cpp b/examples/charts/polarchart/main.cpp index cc959519..2c91a0ef 100644 --- a/examples/charts/polarchart/main.cpp +++ b/examples/charts/polarchart/main.cpp @@ -19,15 +19,15 @@ ****************************************************************************/ #include "chartview.h" -#include <QApplication> -#include <QMainWindow> -#include <QScatterSeries> -#include <QLineSeries> -#include <QSplineSeries> -#include <QAreaSeries> -#include <QValueAxis> -#include <QPolarChart> -#include <QDebug> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QLineSeries> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QAreaSeries> +#include <QtCharts/QValueAxis> +#include <QtCharts/QPolarChart> +#include <QtCore/QDebug> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/qmlaxes/main.cpp b/examples/charts/qmlaxes/main.cpp index bb0957e8..8aab8347 100644 --- a/examples/charts/qmlaxes/main.cpp +++ b/examples/charts/qmlaxes/main.cpp @@ -18,7 +18,7 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QtWidgets/QApplication> #include <QtCore/QDir> #include <QtQuick/QQuickView> #include <QtQml/QQmlEngine> diff --git a/examples/charts/qmlboxplot/main.cpp b/examples/charts/qmlboxplot/main.cpp index 709bd5d2..7663eb95 100644 --- a/examples/charts/qmlboxplot/main.cpp +++ b/examples/charts/qmlboxplot/main.cpp @@ -18,8 +18,8 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QDir> +#include <QtWidgets/QApplication> +#include <QtCore/QDir> #include <QtQuick/QQuickView> #include <QtQml/QQmlEngine> diff --git a/examples/charts/qmloscilloscope/datasource.cpp b/examples/charts/qmloscilloscope/datasource.cpp index ff651110..36918471 100644 --- a/examples/charts/qmloscilloscope/datasource.cpp +++ b/examples/charts/qmloscilloscope/datasource.cpp @@ -19,12 +19,12 @@ ****************************************************************************/ #include "datasource.h" -#include <QXYSeries> -#include <QAreaSeries> +#include <QtCharts/QXYSeries> +#include <QtCharts/QAreaSeries> #include <QtQuick/QQuickView> #include <QtQuick/QQuickItem> -#include <QDebug> -#include <qmath.h> +#include <QtCore/QDebug> +#include <QtCore/QtMath> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/qmloscilloscope/datasource.h b/examples/charts/qmloscilloscope/datasource.h index 8cb8daa7..0461c162 100644 --- a/examples/charts/qmloscilloscope/datasource.h +++ b/examples/charts/qmloscilloscope/datasource.h @@ -21,8 +21,8 @@ #ifndef DATASOURCE_H #define DATASOURCE_H -#include <QObject> -#include <QAbstractSeries> +#include <QtCore/QObject> +#include <QtCharts/QAbstractSeries> class QQuickView; diff --git a/examples/charts/qmlweather/main.cpp b/examples/charts/qmlweather/main.cpp index 9bdd28d1..70f1de07 100644 --- a/examples/charts/qmlweather/main.cpp +++ b/examples/charts/qmlweather/main.cpp @@ -20,7 +20,7 @@ #include <QtWidgets/QApplication> #include <QtQuick/QQuickView> -#include <QDebug> +#include <QtCore/QDebug> #include <QtCore/QDir> #include <QtQml/QQmlContext> #include <QtQml/QQmlEngine> diff --git a/examples/charts/scatterchart/chartview.cpp b/examples/charts/scatterchart/chartview.cpp index 345be195..ac676731 100644 --- a/examples/charts/scatterchart/chartview.cpp +++ b/examples/charts/scatterchart/chartview.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "chartview.h" -#include <QScatterSeries> -#include <QLegendMarker> -#include <QImage> -#include <QPainter> -#include <qmath.h> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QLegendMarker> +#include <QtGui/QImage> +#include <QtGui/QPainter> +#include <QtCore/QtMath> const float Pi = 3.14159f; diff --git a/examples/charts/scatterchart/chartview.h b/examples/charts/scatterchart/chartview.h index c2c03038..a870fdfa 100644 --- a/examples/charts/scatterchart/chartview.h +++ b/examples/charts/scatterchart/chartview.h @@ -21,7 +21,7 @@ #ifndef CHARTVIEW_H #define CHARTVIEW_H -#include <QChartView> +#include <QtCharts/QChartView> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/scatterchart/main.cpp b/examples/charts/scatterchart/main.cpp index e1a76ed2..36c87276 100644 --- a/examples/charts/scatterchart/main.cpp +++ b/examples/charts/scatterchart/main.cpp @@ -18,8 +18,8 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> #include "chartview.h" QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/scatterinteractions/chartview.cpp b/examples/charts/scatterinteractions/chartview.cpp index 7e55c4e0..6e63bd63 100644 --- a/examples/charts/scatterinteractions/chartview.cpp +++ b/examples/charts/scatterinteractions/chartview.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "chartview.h" -#include <qmath.h> -#include <QDebug> +#include <QtCore/QtMath> +#include <QtCore/QDebug> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/scatterinteractions/chartview.h b/examples/charts/scatterinteractions/chartview.h index da280051..3d7d1e5a 100644 --- a/examples/charts/scatterinteractions/chartview.h +++ b/examples/charts/scatterinteractions/chartview.h @@ -21,9 +21,9 @@ #ifndef CHARTVIEW_H #define CHARTVIEW_H -#include <QChartGlobal> -#include <QChartView> -#include <QScatterSeries> +#include <QtCharts/QChartGlobal> +#include <QtCharts/QChartView> +#include <QtCharts/QScatterSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/scatterinteractions/main.cpp b/examples/charts/scatterinteractions/main.cpp index fb5dd8fc..ecb10941 100644 --- a/examples/charts/scatterinteractions/main.cpp +++ b/examples/charts/scatterinteractions/main.cpp @@ -18,8 +18,8 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> #include "chartview.h" int main(int argc, char *argv[]) diff --git a/examples/charts/splinechart/main.cpp b/examples/charts/splinechart/main.cpp index e6a40dd0..6018b95e 100644 --- a/examples/charts/splinechart/main.cpp +++ b/examples/charts/splinechart/main.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QSplineSeries> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QSplineSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/stackedbarchart/main.cpp b/examples/charts/stackedbarchart/main.cpp index c94b18de..ce8fb517 100644 --- a/examples/charts/stackedbarchart/main.cpp +++ b/examples/charts/stackedbarchart/main.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QStackedBarSeries> -#include <QBarSet> -#include <QLegend> -#include <QBarCategoryAxis> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QStackedBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLegend> +#include <QtCharts/QBarCategoryAxis> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp b/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp index 1acfa172..02c73f4c 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp +++ b/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "drilldownchart.h" -#include <QBarCategoryAxis> +#include <QtCharts/QBarCategoryAxis> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/stackedbarchartdrilldown/drilldownchart.h b/examples/charts/stackedbarchartdrilldown/drilldownchart.h index c75216f7..c2fb636d 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownchart.h +++ b/examples/charts/stackedbarchartdrilldown/drilldownchart.h @@ -21,7 +21,7 @@ #ifndef DRILLDOWNCHART_H #define DRILLDOWNCHART_H -#include <QChart> +#include <QtCharts/QChart> #include "drilldownseries.h" QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/stackedbarchartdrilldown/drilldownseries.h b/examples/charts/stackedbarchartdrilldown/drilldownseries.h index 5a340839..dec2e9d5 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownseries.h +++ b/examples/charts/stackedbarchartdrilldown/drilldownseries.h @@ -21,8 +21,8 @@ #ifndef DRILLDOWNSERIES_H #define DRILLDOWNSERIES_H -#include <QStackedBarSeries> -#include <QMap> +#include <QtCharts/QStackedBarSeries> +#include <QtCore/QMap> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/stackedbarchartdrilldown/main.cpp b/examples/charts/stackedbarchartdrilldown/main.cpp index 6a46520d..b0bc0420 100644 --- a/examples/charts/stackedbarchartdrilldown/main.cpp +++ b/examples/charts/stackedbarchartdrilldown/main.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QBarSet> -#include <QLegend> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QBarSet> +#include <QtCharts/QLegend> #include "drilldownseries.h" #include "drilldownchart.h" diff --git a/examples/charts/temperaturerecords/main.cpp b/examples/charts/temperaturerecords/main.cpp index 24caec8e..ccd8cfa7 100644 --- a/examples/charts/temperaturerecords/main.cpp +++ b/examples/charts/temperaturerecords/main.cpp @@ -18,14 +18,14 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QMainWindow> -#include <QChartView> -#include <QBarSeries> -#include <QBarSet> -#include <QLegend> -#include <QBarCategoryAxis> -#include <QStackedBarSeries> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartView> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLegend> +#include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QStackedBarSeries> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/zoomlinechart/chart.cpp b/examples/charts/zoomlinechart/chart.cpp index 890c6c03..37836ec5 100644 --- a/examples/charts/zoomlinechart/chart.cpp +++ b/examples/charts/zoomlinechart/chart.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "chart.h" -#include <QGesture> -#include <QGraphicsScene> -#include <QGraphicsView> +#include <QtWidgets/QGesture> +#include <QtWidgets/QGraphicsScene> +#include <QtWidgets/QGraphicsView> Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QChart(QChart::ChartTypeCartesian, parent, wFlags) diff --git a/examples/charts/zoomlinechart/chart.h b/examples/charts/zoomlinechart/chart.h index a0ebb223..db86a89b 100644 --- a/examples/charts/zoomlinechart/chart.h +++ b/examples/charts/zoomlinechart/chart.h @@ -21,7 +21,7 @@ #ifndef CHART_H #define CHART_H -#include <QChart> +#include <QtCharts/QChart> class QGestureEvent; diff --git a/examples/charts/zoomlinechart/chartview.cpp b/examples/charts/zoomlinechart/chartview.cpp index 64369c62..e69d0e5b 100644 --- a/examples/charts/zoomlinechart/chartview.cpp +++ b/examples/charts/zoomlinechart/chartview.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "chartview.h" -#include <QMouseEvent> +#include <QtGui/QMouseEvent> ChartView::ChartView(QChart *chart, QWidget *parent) : QChartView(chart, parent), diff --git a/examples/charts/zoomlinechart/chartview.h b/examples/charts/zoomlinechart/chartview.h index 3ad7c85e..db4af5de 100644 --- a/examples/charts/zoomlinechart/chartview.h +++ b/examples/charts/zoomlinechart/chartview.h @@ -21,8 +21,8 @@ #ifndef CHARTVIEW_H #define CHARTVIEW_H -#include <QChartView> -#include <QRubberBand> +#include <QtCharts/QChartView> +#include <QtWidgets/QRubberBand> QT_CHARTS_USE_NAMESPACE diff --git a/examples/charts/zoomlinechart/main.cpp b/examples/charts/zoomlinechart/main.cpp index 7dd5865a..6bf339b9 100644 --- a/examples/charts/zoomlinechart/main.cpp +++ b/examples/charts/zoomlinechart/main.cpp @@ -20,11 +20,11 @@ #include "chart.h" #include "chartview.h" -#include <QApplication> -#include <QMainWindow> -#include <qmath.h> -#include <QLineSeries> -#include <QValueAxis> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtCore/QtMath> +#include <QtCharts/QLineSeries> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE diff --git a/plugins/designer/qchartsplugin.cpp b/plugins/designer/qchartsplugin.cpp index 9cf3156d..dd5b5ea9 100644 --- a/plugins/designer/qchartsplugin.cpp +++ b/plugins/designer/qchartsplugin.cpp @@ -20,7 +20,7 @@ #include "qchartsplugin.h" #include <QtCharts/QChartView> -#include <QtPlugin> +#include <QtCore/QtPlugin> QT_CHARTS_USE_NAMESPACE diff --git a/plugins/designer/qchartsplugin.h b/plugins/designer/qchartsplugin.h index 90d0abe7..d79b358b 100644 --- a/plugins/designer/qchartsplugin.h +++ b/plugins/designer/qchartsplugin.h @@ -21,7 +21,7 @@ #ifndef QCHARTSPLUGIN_H #define QCHARTSPLUGIN_H -#include <QDesignerCustomWidgetInterface> +#include <QtDesigner/QDesignerCustomWidgetInterface> class QChartsPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/src/charts/animations/axisanimation.cpp b/src/charts/animations/axisanimation.cpp index ef346287..ae293b44 100644 --- a/src/charts/animations/axisanimation.cpp +++ b/src/charts/animations/axisanimation.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "axisanimation_p.h" -#include "chartaxiselement_p.h" -#include "qabstractaxis_p.h" +#include <private/axisanimation_p.h> +#include <private/chartaxiselement_p.h> +#include <private/qabstractaxis_p.h> Q_DECLARE_METATYPE(QVector<qreal>) diff --git a/src/charts/animations/axisanimation_p.h b/src/charts/animations/axisanimation_p.h index 9e886b2b..480db180 100644 --- a/src/charts/animations/axisanimation_p.h +++ b/src/charts/animations/axisanimation_p.h @@ -30,8 +30,8 @@ #ifndef AXISANIMATION_H #define AXISANIMATION_H -#include "chartanimation_p.h" -#include <QPointF> +#include <private/chartanimation_p.h> +#include <QtCore/QPointF> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/animations/baranimation.cpp b/src/charts/animations/baranimation.cpp index 15b69288..d2087ffe 100644 --- a/src/charts/animations/baranimation.cpp +++ b/src/charts/animations/baranimation.cpp @@ -18,8 +18,8 @@ ** ****************************************************************************/ -#include "baranimation_p.h" -#include "abstractbarchartitem_p.h" +#include <private/baranimation_p.h> +#include <private/abstractbarchartitem_p.h> Q_DECLARE_METATYPE(QVector<QRectF>) diff --git a/src/charts/animations/baranimation_p.h b/src/charts/animations/baranimation_p.h index 5b49f302..260f6ff6 100644 --- a/src/charts/animations/baranimation_p.h +++ b/src/charts/animations/baranimation_p.h @@ -30,7 +30,7 @@ #ifndef BARANIMATION_P_H #define BARANIMATION_P_H -#include "chartanimation_p.h" +#include <private/chartanimation_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/animations/boxplotanimation.cpp b/src/charts/animations/boxplotanimation.cpp index cfd474bb..e1e4bc7c 100644 --- a/src/charts/animations/boxplotanimation.cpp +++ b/src/charts/animations/boxplotanimation.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "boxplotanimation_p.h" -#include "boxplotchartitem_p.h" -#include "boxwhiskersdata_p.h" -#include "boxwhiskersanimation_p.h" +#include <private/boxplotanimation_p.h> +#include <private/boxplotchartitem_p.h> +#include <private/boxwhiskersdata_p.h> +#include <private/boxwhiskersanimation_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/animations/boxplotanimation_p.h b/src/charts/animations/boxplotanimation_p.h index 3eba311b..00b7f186 100644 --- a/src/charts/animations/boxplotanimation_p.h +++ b/src/charts/animations/boxplotanimation_p.h @@ -30,10 +30,10 @@ #ifndef BOXPLOTANIMATION_P_H #define BOXPLOTANIMATION_P_H -#include "chartanimation_p.h" -#include "boxwhiskers_p.h" -#include "boxwhiskersdata_p.h" -#include "boxwhiskersanimation_p.h" +#include <private/chartanimation_p.h> +#include <private/boxwhiskers_p.h> +#include <private/boxwhiskersdata_p.h> +#include <private/boxwhiskersanimation_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/animations/boxwhiskersanimation.cpp b/src/charts/animations/boxwhiskersanimation.cpp index 6d5404fa..201ffb89 100644 --- a/src/charts/animations/boxwhiskersanimation.cpp +++ b/src/charts/animations/boxwhiskersanimation.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "boxwhiskersanimation_p.h" -#include "boxplotanimation_p.h" -#include "boxplotchartitem_p.h" -#include "boxwhiskersdata_p.h" +#include <private/boxwhiskersanimation_p.h> +#include <private/boxplotanimation_p.h> +#include <private/boxplotchartitem_p.h> +#include <private/boxwhiskersdata_p.h> Q_DECLARE_METATYPE(QVector<QRectF>) Q_DECLARE_METATYPE(QT_CHARTS_NAMESPACE::BoxWhiskersData) diff --git a/src/charts/animations/boxwhiskersanimation_p.h b/src/charts/animations/boxwhiskersanimation_p.h index ff56222b..5a3417bf 100644 --- a/src/charts/animations/boxwhiskersanimation_p.h +++ b/src/charts/animations/boxwhiskersanimation_p.h @@ -30,9 +30,9 @@ #ifndef BOXWHISKERSANIMATION_P_H #define BOXWHISKERSANIMATION_P_H -#include "chartanimation_p.h" -#include "boxwhiskers_p.h" -#include "boxwhiskersdata_p.h" +#include <private/chartanimation_p.h> +#include <private/boxwhiskers_p.h> +#include <private/boxwhiskersdata_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/animations/chartanimation.cpp b/src/charts/animations/chartanimation.cpp index 0e512932..b8b58b82 100644 --- a/src/charts/animations/chartanimation.cpp +++ b/src/charts/animations/chartanimation.cpp @@ -18,7 +18,7 @@ ** ****************************************************************************/ -#include "chartanimation_p.h" +#include <private/chartanimation_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/animations/chartanimation_p.h b/src/charts/animations/chartanimation_p.h index 81ec72c4..3bf6d26b 100644 --- a/src/charts/animations/chartanimation_p.h +++ b/src/charts/animations/chartanimation_p.h @@ -30,8 +30,8 @@ #ifndef CHARTANIMATION_H #define CHARTANIMATION_H -#include "qchartglobal.h" -#include <QVariantAnimation> +#include <QtCharts/QChartGlobal> +#include <QtCore/QVariantAnimation> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/animations/pieanimation.cpp b/src/charts/animations/pieanimation.cpp index 30d6865f..445b3cb6 100644 --- a/src/charts/animations/pieanimation.cpp +++ b/src/charts/animations/pieanimation.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "pieanimation_p.h" -#include "piesliceanimation_p.h" -#include "piechartitem_p.h" +#include <private/pieanimation_p.h> +#include <private/piesliceanimation_p.h> +#include <private/piechartitem_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/animations/pieanimation_p.h b/src/charts/animations/pieanimation_p.h index 33599694..4e082286 100644 --- a/src/charts/animations/pieanimation_p.h +++ b/src/charts/animations/pieanimation_p.h @@ -30,9 +30,9 @@ #ifndef PIEANIMATION_P_H #define PIEANIMATION_P_H -#include "chartanimation_p.h" -#include "piechartitem_p.h" -#include "piesliceanimation_p.h" +#include <private/chartanimation_p.h> +#include <private/piechartitem_p.h> +#include <private/piesliceanimation_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/animations/piesliceanimation.cpp b/src/charts/animations/piesliceanimation.cpp index 0a4503c9..4c1b5edc 100644 --- a/src/charts/animations/piesliceanimation.cpp +++ b/src/charts/animations/piesliceanimation.cpp @@ -18,8 +18,8 @@ ** ****************************************************************************/ -#include "piesliceanimation_p.h" -#include "piechartitem_p.h" +#include <private/piesliceanimation_p.h> +#include <private/piechartitem_p.h> Q_DECLARE_METATYPE(QT_CHARTS_NAMESPACE::PieSliceData) diff --git a/src/charts/animations/piesliceanimation_p.h b/src/charts/animations/piesliceanimation_p.h index 88155054..e081f56b 100644 --- a/src/charts/animations/piesliceanimation_p.h +++ b/src/charts/animations/piesliceanimation_p.h @@ -30,8 +30,8 @@ #ifndef PIESLICEANIMATION_P_H #define PIESLICEANIMATION_P_H -#include "chartanimation_p.h" -#include "piesliceitem_p.h" +#include <private/chartanimation_p.h> +#include <private/piesliceitem_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/animations/scatteranimation.cpp b/src/charts/animations/scatteranimation.cpp index faf66d11..3ffe99b6 100644 --- a/src/charts/animations/scatteranimation.cpp +++ b/src/charts/animations/scatteranimation.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "scatteranimation_p.h" -#include "scatterchartitem_p.h" -#include <QDebug> +#include <private/scatteranimation_p.h> +#include <private/scatterchartitem_p.h> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/animations/scatteranimation_p.h b/src/charts/animations/scatteranimation_p.h index 7a4f8bfb..089c1557 100644 --- a/src/charts/animations/scatteranimation_p.h +++ b/src/charts/animations/scatteranimation_p.h @@ -29,7 +29,7 @@ #ifndef SCATTERANIMATION_P_H #define SCATTERANIMATION_P_H -#include "xyanimation_p.h" +#include <private/xyanimation_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/animations/splineanimation.cpp b/src/charts/animations/splineanimation.cpp index 4056d825..bc92ab44 100644 --- a/src/charts/animations/splineanimation.cpp +++ b/src/charts/animations/splineanimation.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "splineanimation_p.h" -#include "splinechartitem_p.h" -#include <QDebug> +#include <private/splineanimation_p.h> +#include <private/splinechartitem_p.h> +#include <QtCore/QDebug> Q_DECLARE_METATYPE(QVector<QPointF>) Q_DECLARE_METATYPE(SplineVector) diff --git a/src/charts/animations/splineanimation_p.h b/src/charts/animations/splineanimation_p.h index ad9120ed..0ff83ad7 100644 --- a/src/charts/animations/splineanimation_p.h +++ b/src/charts/animations/splineanimation_p.h @@ -29,8 +29,8 @@ #ifndef SPLINEANIMATION_P_H #define SPLINEANIMATION_P_H -#include "xyanimation_p.h" -#include <QPointF> +#include <private/xyanimation_p.h> +#include <QtCore/QPointF> typedef QPair<QVector<QPointF >, QVector<QPointF > > SplineVector; diff --git a/src/charts/animations/xyanimation.cpp b/src/charts/animations/xyanimation.cpp index 3e395c1a..5df3ebcc 100644 --- a/src/charts/animations/xyanimation.cpp +++ b/src/charts/animations/xyanimation.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "xyanimation_p.h" -#include "xychart_p.h" -#include <QDebug> +#include <private/xyanimation_p.h> +#include <private/xychart_p.h> +#include <QtCore/QDebug> Q_DECLARE_METATYPE(QVector<QPointF>) diff --git a/src/charts/animations/xyanimation_p.h b/src/charts/animations/xyanimation_p.h index ef54c530..62833277 100644 --- a/src/charts/animations/xyanimation_p.h +++ b/src/charts/animations/xyanimation_p.h @@ -30,8 +30,8 @@ #ifndef XYANIMATION_P_H #define XYANIMATION_P_H -#include "chartanimation_p.h" -#include <QPointF> +#include <private/chartanimation_p.h> +#include <QtCore/QPointF> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/areachart/areachartitem.cpp b/src/charts/areachart/areachartitem.cpp index cf2d0e8f..a4ccedd0 100644 --- a/src/charts/areachart/areachartitem.cpp +++ b/src/charts/areachart/areachartitem.cpp @@ -18,15 +18,15 @@ ** ****************************************************************************/ -#include "areachartitem_p.h" -#include "qareaseries.h" -#include "qareaseries_p.h" -#include "qlineseries.h" -#include "chartpresenter_p.h" -#include "abstractdomain_p.h" -#include <QPainter> -#include <QGraphicsSceneMouseEvent> -#include <QDebug> +#include <private/areachartitem_p.h> +#include <QtCharts/QAreaSeries> +#include <private/qareaseries_p.h> +#include <QtCharts/QLineSeries> +#include <private/chartpresenter_p.h> +#include <private/abstractdomain_p.h> +#include <QtGui/QPainter> +#include <QtWidgets/QGraphicsSceneMouseEvent> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/areachart/areachartitem_p.h b/src/charts/areachart/areachartitem_p.h index 5f806af6..c0b86ee0 100644 --- a/src/charts/areachart/areachartitem_p.h +++ b/src/charts/areachart/areachartitem_p.h @@ -30,10 +30,10 @@ #ifndef AREACHARTITEM_H #define AREACHARTITEM_H -#include "qchartglobal.h" -#include "linechartitem_p.h" -#include "qareaseries.h" -#include <QPen> +#include <QtCharts/QChartGlobal> +#include <private/linechartitem_p.h> +#include <QtCharts/QAreaSeries> +#include <QtGui/QPen> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/areachart/qareaseries.cpp b/src/charts/areachart/qareaseries.cpp index e2a2ea2f..9060294b 100644 --- a/src/charts/areachart/qareaseries.cpp +++ b/src/charts/areachart/qareaseries.cpp @@ -18,16 +18,16 @@ ** ****************************************************************************/ -#include "qareaseries.h" -#include "qareaseries_p.h" -#include "qlineseries.h" -#include "areachartitem_p.h" -#include "abstractdomain_p.h" -#include "chartdataset_p.h" -#include "charttheme_p.h" -#include "qvalueaxis.h" -#include "qarealegendmarker.h" -#include "qchart_p.h" +#include <QtCharts/QAreaSeries> +#include <private/qareaseries_p.h> +#include <QtCharts/QLineSeries> +#include <private/areachartitem_p.h> +#include <private/abstractdomain_p.h> +#include <private/chartdataset_p.h> +#include <private/charttheme_p.h> +#include <QtCharts/QValueAxis> +#include <QtCharts/QAreaLegendMarker> +#include <private/qchart_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/areachart/qareaseries.h b/src/charts/areachart/qareaseries.h index cad15c77..2e4c89c3 100644 --- a/src/charts/areachart/qareaseries.h +++ b/src/charts/areachart/qareaseries.h @@ -21,10 +21,10 @@ #ifndef QAREASERIES_H #define QAREASERIES_H -#include <QtCharts/qchartglobal.h> -#include <QtCharts/qabstractseries.h> -#include <QPen> -#include <QBrush> +#include <QtCharts/QChartGlobal> +#include <QtCharts/QAbstractSeries> +#include <QtGui/QPen> +#include <QtGui/QBrush> QT_CHARTS_BEGIN_NAMESPACE class QLineSeries; diff --git a/src/charts/areachart/qareaseries_p.h b/src/charts/areachart/qareaseries_p.h index 3f6293d3..f02bb329 100644 --- a/src/charts/areachart/qareaseries_p.h +++ b/src/charts/areachart/qareaseries_p.h @@ -30,11 +30,12 @@ #ifndef QAREASERIES_P_H #define QAREASERIES_P_H -#include "qabstractseries_p.h" +#include <private/qabstractseries_p.h> QT_CHARTS_BEGIN_NAMESPACE class QAreaSeries; +class QLineSeries; class QAreaSeriesPrivate: public QAbstractSeriesPrivate { diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp index 259cdaa9..c911ebb9 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include "chartbarcategoryaxisx_p.h" -#include "chartpresenter_p.h" -#include "qbarcategoryaxis_p.h" -#include "abstractchartlayout_p.h" -#include <QDebug> -#include <qmath.h> +#include <private/chartbarcategoryaxisx_p.h> +#include <private/chartpresenter_p.h> +#include <private/qbarcategoryaxis_p.h> +#include <private/abstractchartlayout_p.h> +#include <QtCore/QDebug> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h index 177540e2..bc5be25b 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h @@ -30,7 +30,7 @@ #ifndef CHARTBARCATEGORYAXISX_H #define CHARTBARCATEGORYAXISX_H -#include "horizontalaxis_p.h" +#include <private/horizontalaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp index 126c7da3..3d661c07 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include "chartbarcategoryaxisy_p.h" -#include "chartpresenter_p.h" -#include "qbarcategoryaxis_p.h" -#include "abstractchartlayout_p.h" -#include <qmath.h> -#include <QDebug> +#include <private/chartbarcategoryaxisy_p.h> +#include <private/chartpresenter_p.h> +#include <private/qbarcategoryaxis_p.h> +#include <private/abstractchartlayout_p.h> +#include <QtCore/QtMath> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h index 82f2c505..89c41dfd 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h @@ -30,7 +30,7 @@ #ifndef CHARTBARCATEGORYAXISY_H #define CHARTBARCATEGORYAXISY_H -#include "verticalaxis_p.h" +#include <private/verticalaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp index 7818d6f6..446bfd18 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "qbarcategoryaxis.h" -#include "qbarcategoryaxis_p.h" -#include "chartbarcategoryaxisx_p.h" -#include "chartbarcategoryaxisy_p.h" -#include "abstractdomain_p.h" -#include "qchart.h" -#include <qmath.h> +#include <QtCharts/QBarCategoryAxis> +#include <private/qbarcategoryaxis_p.h> +#include <private/chartbarcategoryaxisx_p.h> +#include <private/chartbarcategoryaxisy_p.h> +#include <private/abstractdomain_p.h> +#include <QtCharts/QChart> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE /*! diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h index 55a2430f..3e6bdb96 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h @@ -21,7 +21,7 @@ #ifndef QBARCATEGORYAXIS_H #define QBARCATEGORYAXIS_H -#include <QtCharts/qabstractaxis.h> +#include <QtCharts/QAbstractAxis> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h b/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h index 8ebc5a4c..95a47ede 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h @@ -30,8 +30,8 @@ #ifndef QBARCATEGORYAXIS_P_H #define QBARCATEGORYAXIS_P_H -#include <qbarcategoryaxis.h> -#include "qabstractaxis_p.h" +#include <QtCharts/QBarCategoryAxis> +#include <private/qabstractaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/cartesianchartaxis.cpp b/src/charts/axis/cartesianchartaxis.cpp index d067921d..399662ec 100644 --- a/src/charts/axis/cartesianchartaxis.cpp +++ b/src/charts/axis/cartesianchartaxis.cpp @@ -18,17 +18,17 @@ ** ****************************************************************************/ -#include "cartesianchartaxis_p.h" -#include "qabstractaxis.h" -#include "qabstractaxis_p.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" -#include "abstractdomain_p.h" -#include "linearrowitem_p.h" -#include <QValueAxis> -#include <QLogValueAxis> -#include <QGraphicsLayout> -#include <QTextDocument> +#include <private/cartesianchartaxis_p.h> +#include <QtCharts/QAbstractAxis> +#include <private/qabstractaxis_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractchartlayout_p.h> +#include <private/abstractdomain_p.h> +#include <private/linearrowitem_p.h> +#include <QtCharts/QValueAxis> +#include <QtCharts/QLogValueAxis> +#include <QtWidgets/QGraphicsLayout> +#include <QtGui/QTextDocument> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/cartesianchartaxis_p.h b/src/charts/axis/cartesianchartaxis_p.h index c0c2252b..a2f6a81b 100644 --- a/src/charts/axis/cartesianchartaxis_p.h +++ b/src/charts/axis/cartesianchartaxis_p.h @@ -30,8 +30,8 @@ #ifndef CARTESIANCHARTAXIS_H #define CARTESIANCHARTAXIS_H -#include "qchartglobal.h" -#include "chartaxiselement_p.h" +#include <QtCharts/QChartGlobal> +#include <private/chartaxiselement_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp b/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp index 2141f353..e8e587d9 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp +++ b/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "chartcategoryaxisx_p.h" -#include "qcategoryaxis.h" -#include "qabstractaxis.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" -#include <QGraphicsLayout> -#include <qmath.h> +#include <private/chartcategoryaxisx_p.h> +#include <QtCharts/QCategoryAxis> +#include <QtCharts/QAbstractAxis> +#include <private/chartpresenter_p.h> +#include <private/abstractchartlayout_p.h> +#include <QtWidgets/QGraphicsLayout> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h index e526b01a..503f372c 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h +++ b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h @@ -30,7 +30,7 @@ #ifndef CHARTCATEGORYAXISX_H #define CHARTCATEGORYAXISX_H -#include "horizontalaxis_p.h" +#include <private/horizontalaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp b/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp index 7d5ba103..6f6f25a7 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp +++ b/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp @@ -18,14 +18,14 @@ ** ****************************************************************************/ -#include "chartcategoryaxisy_p.h" -#include "qcategoryaxis.h" -#include "qabstractaxis.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" -#include <QGraphicsLayout> -#include <qmath.h> -#include <QDebug> +#include <private/chartcategoryaxisy_p.h> +#include <QtCharts/QCategoryAxis> +#include <QtCharts/QAbstractAxis> +#include <private/chartpresenter_p.h> +#include <private/abstractchartlayout_p.h> +#include <QtWidgets/QGraphicsLayout> +#include <QtCore/QtMath> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h index e416e4c0..d4abbf4c 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h +++ b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h @@ -30,7 +30,7 @@ #ifndef CHARTCATEGORYAXISY_H #define CHARTCATEGORYAXISY_H -#include "verticalaxis_p.h" +#include <private/verticalaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp index 8c43dd32..4996d461 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include "polarchartcategoryaxisangular_p.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" -#include "qcategoryaxis.h" -#include <QDebug> +#include <private/polarchartcategoryaxisangular_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractchartlayout_p.h> +#include <QtCharts/QCategoryAxis> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h index 0432fc11..46b653da 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h @@ -30,7 +30,7 @@ #ifndef POLARCHARTCATEGORYAXISANGULAR_P_H #define POLARCHARTCATEGORYAXISANGULAR_P_H -#include "polarchartaxisangular_p.h" +#include <private/polarchartaxisangular_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp index 60b77f0c..0938b640 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include "polarchartcategoryaxisradial_p.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" -#include "qcategoryaxis.h" -#include <QDebug> +#include <private/polarchartcategoryaxisradial_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractchartlayout_p.h> +#include <QtCharts/QCategoryAxis> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h index 3186f5ec..1f23b884 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h @@ -30,7 +30,7 @@ #ifndef POLARCHARTCATEGORYAXISRADIAL_P_H #define POLARCHARTCATEGORYAXISRADIAL_P_H -#include "polarchartaxisradial_p.h" +#include <private/polarchartaxisradial_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/categoryaxis/qcategoryaxis.cpp b/src/charts/axis/categoryaxis/qcategoryaxis.cpp index d5b3d472..5ee885a1 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis.cpp +++ b/src/charts/axis/categoryaxis/qcategoryaxis.cpp @@ -18,15 +18,15 @@ ** ****************************************************************************/ -#include "qcategoryaxis.h" -#include "qcategoryaxis_p.h" -#include "chartcategoryaxisx_p.h" -#include "chartcategoryaxisy_p.h" -#include "polarchartcategoryaxisangular_p.h" -#include "polarchartcategoryaxisradial_p.h" -#include "qchart.h" -#include <qmath.h> -#include <QDebug> +#include <QtCharts/QCategoryAxis> +#include <private/qcategoryaxis_p.h> +#include <private/chartcategoryaxisx_p.h> +#include <private/chartcategoryaxisy_p.h> +#include <private/polarchartcategoryaxisangular_p.h> +#include <private/polarchartcategoryaxisradial_p.h> +#include <QtCharts/QChart> +#include <QtCore/QtMath> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE /*! diff --git a/src/charts/axis/categoryaxis/qcategoryaxis.h b/src/charts/axis/categoryaxis/qcategoryaxis.h index bd4b3d82..7109767a 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis.h +++ b/src/charts/axis/categoryaxis/qcategoryaxis.h @@ -21,8 +21,8 @@ #ifndef QCATEGORYAXIS_H #define QCATEGORYAXIS_H -#include <QtCharts/qabstractaxis.h> -#include <QtCharts/qvalueaxis.h> +#include <QtCharts/QAbstractAxis> +#include <QtCharts/QValueAxis> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/categoryaxis/qcategoryaxis_p.h b/src/charts/axis/categoryaxis/qcategoryaxis_p.h index bc657521..57a12ff8 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis_p.h +++ b/src/charts/axis/categoryaxis/qcategoryaxis_p.h @@ -30,8 +30,8 @@ #ifndef QCATEGORYAXIS_P_H #define QCATEGORYAXIS_P_H -#include <qcategoryaxis.h> -#include "qvalueaxis_p.h" +#include <QtCharts/QCategoryAxis> +#include <private/qvalueaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/chartaxiselement.cpp b/src/charts/axis/chartaxiselement.cpp index b7a60d27..73cd057e 100644 --- a/src/charts/axis/chartaxiselement.cpp +++ b/src/charts/axis/chartaxiselement.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "chartaxiselement_p.h" -#include "qabstractaxis_p.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" -#include <qmath.h> -#include <QDateTime> -#include <QTextDocument> +#include <private/chartaxiselement_p.h> +#include <private/qabstractaxis_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractchartlayout_p.h> +#include <QtCore/QtMath> +#include <QtCore/QDateTime> +#include <QtGui/QTextDocument> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/chartaxiselement_p.h b/src/charts/axis/chartaxiselement_p.h index 1cfac64d..1fba0aff 100644 --- a/src/charts/axis/chartaxiselement_p.h +++ b/src/charts/axis/chartaxiselement_p.h @@ -30,12 +30,12 @@ #ifndef CHARTAXISELEMENT_H #define CHARTAXISELEMENT_H -#include "qchartglobal.h" -#include "chartelement_p.h" -#include "axisanimation_p.h" -#include <QGraphicsItem> -#include <QGraphicsLayoutItem> -#include <QFont> +#include <QtCharts/QChartGlobal> +#include <private/chartelement_p.h> +#include <private/axisanimation_p.h> +#include <QtWidgets/QGraphicsItem> +#include <QtWidgets/QGraphicsLayoutItem> +#include <QtGui/QFont> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp b/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp index bdd010a0..1a234b56 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "chartdatetimeaxisx_p.h" -#include "chartpresenter_p.h" -#include "qdatetimeaxis.h" -#include "abstractchartlayout_p.h" -#include <QGraphicsLayout> -#include <QDateTime> -#include <qmath.h> +#include <private/chartdatetimeaxisx_p.h> +#include <private/chartpresenter_p.h> +#include <QtCharts/QDateTimeAxis> +#include <private/abstractchartlayout_p.h> +#include <QtWidgets/QGraphicsLayout> +#include <QtCore/QDateTime> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h index 3ca2ef45..1809915b 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h @@ -30,7 +30,7 @@ #ifndef CHARTDATETIMEAXISX_H #define CHARTDATETIMEAXISX_H -#include "horizontalaxis_p.h" +#include <private/horizontalaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp b/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp index 5e67936b..67d2c3fc 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "chartdatetimeaxisy_p.h" -#include "chartpresenter_p.h" -#include "qdatetimeaxis.h" -#include "abstractchartlayout_p.h" -#include <QGraphicsLayout> -#include <QDateTime> -#include <qmath.h> +#include <private/chartdatetimeaxisy_p.h> +#include <private/chartpresenter_p.h> +#include <QtCharts/QDateTimeAxis> +#include <private/abstractchartlayout_p.h> +#include <QtWidgets/QGraphicsLayout> +#include <QtCore/QDateTime> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h index 0631e157..8bd2f087 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h @@ -30,7 +30,7 @@ #ifndef CHARTDATETIMEAXISY_H #define CHARTDATETIMEAXISY_H -#include "verticalaxis_p.h" +#include <private/verticalaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp index 4ace5de6..1c1e9897 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "polarchartdatetimeaxisangular_p.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" -#include "qdatetimeaxis.h" +#include <private/polarchartdatetimeaxisangular_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractchartlayout_p.h> +#include <QtCharts/QDateTimeAxis> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h index bbfd8260..0e244e71 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h @@ -30,7 +30,7 @@ #ifndef POLARCHARTDATETIMEAXISANGULAR_P_H #define POLARCHARTDATETIMEAXISANGULAR_P_H -#include "polarchartaxisangular_p.h" +#include <private/polarchartaxisangular_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp index fdcfcc36..35965b3c 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "polarchartdatetimeaxisradial_p.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" -#include "qdatetimeaxis.h" +#include <private/polarchartdatetimeaxisradial_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractchartlayout_p.h> +#include <QtCharts/QDateTimeAxis> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h index 207d5a3a..f0816597 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h @@ -30,7 +30,7 @@ #ifndef POLARCHARTDATETIMEAXISRADIAL_P_H #define POLARCHARTDATETIMEAXISRADIAL_P_H -#include "polarchartaxisradial_p.h" +#include <private/polarchartaxisradial_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp b/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp index fffd80c2..cbe448fc 100644 --- a/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp +++ b/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp @@ -18,14 +18,14 @@ ** ****************************************************************************/ -#include "qdatetimeaxis.h" -#include "qdatetimeaxis_p.h" -#include "chartdatetimeaxisx_p.h" -#include "chartdatetimeaxisy_p.h" -#include "polarchartdatetimeaxisangular_p.h" -#include "polarchartdatetimeaxisradial_p.h" -#include "abstractdomain_p.h" -#include "qchart.h" +#include <QtCharts/QDateTimeAxis> +#include <private/qdatetimeaxis_p.h> +#include <private/chartdatetimeaxisx_p.h> +#include <private/chartdatetimeaxisy_p.h> +#include <private/polarchartdatetimeaxisangular_p.h> +#include <private/polarchartdatetimeaxisradial_p.h> +#include <private/abstractdomain_p.h> +#include <QtCharts/QChart> #include <float.h> #include <cmath> diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis.h b/src/charts/axis/datetimeaxis/qdatetimeaxis.h index 72d46b5e..be8d83e3 100644 --- a/src/charts/axis/datetimeaxis/qdatetimeaxis.h +++ b/src/charts/axis/datetimeaxis/qdatetimeaxis.h @@ -21,7 +21,7 @@ #ifndef QDATETIMEAXIS_H #define QDATETIMEAXIS_H -#include <QtCharts/qabstractaxis.h> +#include <QtCharts/QAbstractAxis> class QDateTime; diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h b/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h index 30551d55..01152523 100644 --- a/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h +++ b/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h @@ -30,9 +30,9 @@ #ifndef QDATETIMEAXIS_P_H #define QDATETIMEAXIS_P_H -#include "qdatetimeaxis.h" -#include "qabstractaxis_p.h" -#include <QDateTime> +#include <QtCharts/QDateTimeAxis> +#include <private/qabstractaxis_p.h> +#include <QtCore/QDateTime> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/horizontalaxis.cpp b/src/charts/axis/horizontalaxis.cpp index 941afc05..8e3bb975 100644 --- a/src/charts/axis/horizontalaxis.cpp +++ b/src/charts/axis/horizontalaxis.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include "horizontalaxis_p.h" -#include "qabstractaxis_p.h" -#include "chartpresenter_p.h" -#include <qmath.h> -#include <QDebug> +#include <private/horizontalaxis_p.h> +#include <private/qabstractaxis_p.h> +#include <private/chartpresenter_p.h> +#include <QtCore/QtMath> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/horizontalaxis_p.h b/src/charts/axis/horizontalaxis_p.h index 9f1ad596..c75e45ae 100644 --- a/src/charts/axis/horizontalaxis_p.h +++ b/src/charts/axis/horizontalaxis_p.h @@ -30,7 +30,7 @@ #ifndef HORIZONTALAXIS_P_H_ #define HORIZONTALAXIS_P_H_ -#include "cartesianchartaxis_p.h" +#include <private/cartesianchartaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/linearrowitem_p.h b/src/charts/axis/linearrowitem_p.h index f1f94acd..ecc261e7 100644 --- a/src/charts/axis/linearrowitem_p.h +++ b/src/charts/axis/linearrowitem_p.h @@ -30,9 +30,9 @@ #ifndef LINEARROWITEM_P_H #define LINEARROWITEM_P_H -#include "chartaxiselement_p.h" -#include "qabstractaxis_p.h" -#include <QGraphicsLineItem> +#include <private/chartaxiselement_p.h> +#include <private/qabstractaxis_p.h> +#include <QtWidgets/QGraphicsLineItem> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp index 6057fbb1..995bec39 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "chartlogvalueaxisx_p.h" -#include "chartpresenter_p.h" -#include "qlogvalueaxis.h" -#include "abstractchartlayout_p.h" -#include <QGraphicsLayout> -#include <qmath.h> -#include <QDebug> +#include <private/chartlogvalueaxisx_p.h> +#include <private/chartpresenter_p.h> +#include <QtCharts/QLogValueAxis> +#include <private/abstractchartlayout_p.h> +#include <QtWidgets/QGraphicsLayout> +#include <QtCore/QtMath> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h index 490832b5..28e2689d 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h @@ -30,7 +30,7 @@ #ifndef CHARTLOGVALUEAXISX_H #define CHARTLOGVALUEAXISX_H -#include "horizontalaxis_p.h" +#include <private/horizontalaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp index d0492f97..5759b5e4 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "chartlogvalueaxisy_p.h" -#include "chartpresenter_p.h" -#include "qlogvalueaxis.h" -#include "abstractchartlayout_p.h" -#include <QGraphicsLayout> -#include <qmath.h> -#include <QDebug> +#include <private/chartlogvalueaxisy_p.h> +#include <private/chartpresenter_p.h> +#include <QtCharts/QLogValueAxis> +#include <private/abstractchartlayout_p.h> +#include <QtWidgets/QGraphicsLayout> +#include <QtCore/QtMath> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h index d65275c3..3b5e99de 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h @@ -30,7 +30,7 @@ #ifndef CHARTLOGVALUEAXISY_H #define CHARTLOGVALUEAXISY_H -#include "verticalaxis_p.h" +#include <private/verticalaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp index f9fe664d..0c1f4c6a 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include "polarchartlogvalueaxisangular_p.h" -#include "abstractchartlayout_p.h" -#include "chartpresenter_p.h" -#include "qlogvalueaxis.h" -#include <qmath.h> -#include <QDebug> +#include <private/polarchartlogvalueaxisangular_p.h> +#include <private/abstractchartlayout_p.h> +#include <private/chartpresenter_p.h> +#include <QtCharts/QLogValueAxis> +#include <QtCore/QtMath> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h index d56f7fdc..ce65d303 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h @@ -30,7 +30,7 @@ #ifndef POLARCHARTLOGVALUEAXISANGULAR_P_H #define POLARCHARTLOGVALUEAXISANGULAR_P_H -#include "polarchartaxisangular_p.h" +#include <private/polarchartaxisangular_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp index 3c0d01b3..6bf688e2 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include "polarchartlogvalueaxisradial_p.h" -#include "abstractchartlayout_p.h" -#include "chartpresenter_p.h" -#include "qlogvalueaxis.h" -#include <qmath.h> -#include <QDebug> +#include <private/polarchartlogvalueaxisradial_p.h> +#include <private/abstractchartlayout_p.h> +#include <private/chartpresenter_p.h> +#include <QtCharts/QLogValueAxis> +#include <QtCore/QtMath> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h index 4bc59061..3f2f93ed 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h @@ -30,7 +30,7 @@ #ifndef POLARCHARTLOGVALUEAXISRADIAL_P_H #define POLARCHARTLOGVALUEAXISRADIAL_P_H -#include "polarchartaxisradial_p.h" +#include <private/polarchartaxisradial_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp b/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp index ad58905d..90711ef9 100644 --- a/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp +++ b/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "qlogvalueaxis.h" -#include "qlogvalueaxis_p.h" -#include "chartlogvalueaxisx_p.h" -#include "chartlogvalueaxisy_p.h" -#include "polarchartlogvalueaxisangular_p.h" -#include "polarchartlogvalueaxisradial_p.h" -#include "abstractdomain_p.h" +#include <QtCharts/QLogValueAxis> +#include <private/qlogvalueaxis_p.h> +#include <private/chartlogvalueaxisx_p.h> +#include <private/chartlogvalueaxisy_p.h> +#include <private/polarchartlogvalueaxisangular_p.h> +#include <private/polarchartlogvalueaxisradial_p.h> +#include <private/abstractdomain_p.h> #include <float.h> #include <cmath> diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis.h b/src/charts/axis/logvalueaxis/qlogvalueaxis.h index 2ad1f6ab..ecf8e399 100644 --- a/src/charts/axis/logvalueaxis/qlogvalueaxis.h +++ b/src/charts/axis/logvalueaxis/qlogvalueaxis.h @@ -21,7 +21,7 @@ #ifndef QLOGVALUEAXIS_H #define QLOGVALUEAXIS_H -#include <QtCharts/qabstractaxis.h> +#include <QtCharts/QAbstractAxis> class QDateTime; diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h index 741626f3..dd3eb215 100644 --- a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h +++ b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h @@ -30,8 +30,8 @@ #ifndef QLOGVALUEAXIS_P_H #define QLOGVALUEAXIS_P_H -#include <qlogvalueaxis.h> -#include "qabstractaxis_p.h" +#include <QtCharts/QLogValueAxis> +#include <private/qabstractaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/polarchartaxis.cpp b/src/charts/axis/polarchartaxis.cpp index bf9caaeb..70990741 100644 --- a/src/charts/axis/polarchartaxis.cpp +++ b/src/charts/axis/polarchartaxis.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "polarchartaxis_p.h" -#include "qabstractaxis_p.h" -#include "chartpresenter_p.h" +#include <private/polarchartaxis_p.h> +#include <private/qabstractaxis_p.h> +#include <private/chartpresenter_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/polarchartaxis_p.h b/src/charts/axis/polarchartaxis_p.h index 8924b812..e0a0d269 100644 --- a/src/charts/axis/polarchartaxis_p.h +++ b/src/charts/axis/polarchartaxis_p.h @@ -30,7 +30,7 @@ #ifndef POLARCHARTAXIS_P_H #define POLARCHARTAXIS_P_H -#include "chartaxiselement_p.h" +#include <private/chartaxiselement_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/polarchartaxisangular.cpp b/src/charts/axis/polarchartaxisangular.cpp index 83f1535c..e2ff4407 100644 --- a/src/charts/axis/polarchartaxisangular.cpp +++ b/src/charts/axis/polarchartaxisangular.cpp @@ -18,14 +18,14 @@ ** ****************************************************************************/ -#include "polarchartaxisangular_p.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" -#include "qabstractaxis.h" -#include "qabstractaxis_p.h" -#include <QDebug> -#include <qmath.h> -#include <QTextDocument> +#include <private/polarchartaxisangular_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractchartlayout_p.h> +#include <QtCharts/QAbstractAxis> +#include <private/qabstractaxis_p.h> +#include <QtCore/QDebug> +#include <QtCore/QtMath> +#include <QtGui/QTextDocument> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/polarchartaxisangular_p.h b/src/charts/axis/polarchartaxisangular_p.h index dd83cba7..545840bb 100644 --- a/src/charts/axis/polarchartaxisangular_p.h +++ b/src/charts/axis/polarchartaxisangular_p.h @@ -30,8 +30,8 @@ #ifndef POLARCHARTAXISANGULAR_P_H #define POLARCHARTAXISANGULAR_P_H -#include "polarchartaxis_p.h" -#include "qvalueaxis.h" +#include <private/polarchartaxis_p.h> +#include <QtCharts/QValueAxis> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/polarchartaxisradial.cpp b/src/charts/axis/polarchartaxisradial.cpp index 93bf1bd9..62f27269 100644 --- a/src/charts/axis/polarchartaxisradial.cpp +++ b/src/charts/axis/polarchartaxisradial.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include "polarchartaxisradial_p.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" -#include "qabstractaxis_p.h" -#include "linearrowitem_p.h" -#include <QTextDocument> +#include <private/polarchartaxisradial_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractchartlayout_p.h> +#include <private/qabstractaxis_p.h> +#include <private/linearrowitem_p.h> +#include <QtGui/QTextDocument> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/polarchartaxisradial_p.h b/src/charts/axis/polarchartaxisradial_p.h index 6ce21513..48e64145 100644 --- a/src/charts/axis/polarchartaxisradial_p.h +++ b/src/charts/axis/polarchartaxisradial_p.h @@ -30,8 +30,8 @@ #ifndef POLARCHARTAXISRADIAL_P_H #define POLARCHARTAXISRADIAL_P_H -#include "polarchartaxis_p.h" -#include "qvalueaxis.h" +#include <private/polarchartaxis_p.h> +#include <QtCharts/QValueAxis> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/qabstractaxis.cpp b/src/charts/axis/qabstractaxis.cpp index ff7c27b6..f882e0b9 100644 --- a/src/charts/axis/qabstractaxis.cpp +++ b/src/charts/axis/qabstractaxis.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include "qabstractaxis.h" -#include "qabstractaxis_p.h" -#include "chartdataset_p.h" -#include "charttheme_p.h" -#include "qchart_p.h" +#include <QtCharts/QAbstractAxis> +#include <private/qabstractaxis_p.h> +#include <private/chartdataset_p.h> +#include <private/charttheme_p.h> +#include <private/qchart_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/qabstractaxis.h b/src/charts/axis/qabstractaxis.h index cbad09e8..c50e9b01 100644 --- a/src/charts/axis/qabstractaxis.h +++ b/src/charts/axis/qabstractaxis.h @@ -21,10 +21,10 @@ #ifndef QABSTRACTAXIS_H #define QABSTRACTAXIS_H -#include <QtCharts/qchartglobal.h> -#include <QPen> -#include <QFont> -#include <QVariant> +#include <QtCharts/QChartGlobal> +#include <QtGui/QPen> +#include <QtGui/QFont> +#include <QtCore/QVariant> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/qabstractaxis_p.h b/src/charts/axis/qabstractaxis_p.h index f2f60038..bc9f9382 100644 --- a/src/charts/axis/qabstractaxis_p.h +++ b/src/charts/axis/qabstractaxis_p.h @@ -30,10 +30,10 @@ #ifndef QABSTRACTAXIS_P_H #define QABSTRACTAXIS_P_H -#include "qabstractaxis.h" -#include "chartaxiselement_p.h" -#include "qchart.h" -#include <QDebug> +#include <QtCharts/QAbstractAxis> +#include <private/chartaxiselement_p.h> +#include <QtCharts/QChart> +#include <QtCore/QDebug> class QGraphicsItem; diff --git a/src/charts/axis/valueaxis/chartvalueaxisx.cpp b/src/charts/axis/valueaxis/chartvalueaxisx.cpp index abf9c434..86981276 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisx.cpp +++ b/src/charts/axis/valueaxis/chartvalueaxisx.cpp @@ -18,14 +18,14 @@ ** ****************************************************************************/ -#include "chartvalueaxisx_p.h" -#include "qabstractaxis.h" -#include "chartpresenter_p.h" -#include "qvalueaxis.h" -#include "abstractchartlayout_p.h" -#include <QGraphicsLayout> -#include <qmath.h> -#include <QDebug> +#include <private/chartvalueaxisx_p.h> +#include <QtCharts/QAbstractAxis> +#include <private/chartpresenter_p.h> +#include <QtCharts/QValueAxis> +#include <private/abstractchartlayout_p.h> +#include <QtWidgets/QGraphicsLayout> +#include <QtCore/QtMath> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/valueaxis/chartvalueaxisx_p.h b/src/charts/axis/valueaxis/chartvalueaxisx_p.h index 7f83e5a3..08e692fa 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisx_p.h +++ b/src/charts/axis/valueaxis/chartvalueaxisx_p.h @@ -30,7 +30,7 @@ #ifndef CHARTVALUEAXISX_H #define CHARTVALUEAXISX_H -#include "horizontalaxis_p.h" +#include <private/horizontalaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/valueaxis/chartvalueaxisy.cpp b/src/charts/axis/valueaxis/chartvalueaxisy.cpp index d6b7c651..16d6ebaf 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisy.cpp +++ b/src/charts/axis/valueaxis/chartvalueaxisy.cpp @@ -18,14 +18,14 @@ ** ****************************************************************************/ -#include "chartvalueaxisy_p.h" -#include "qabstractaxis.h" -#include "chartpresenter_p.h" -#include "qvalueaxis.h" -#include "abstractchartlayout_p.h" -#include <QGraphicsLayout> -#include <qmath.h> -#include <QDebug> +#include <private/chartvalueaxisy_p.h> +#include <QtCharts/QAbstractAxis> +#include <private/chartpresenter_p.h> +#include <QtCharts/QValueAxis> +#include <private/abstractchartlayout_p.h> +#include <QtWidgets/QGraphicsLayout> +#include <QtCore/QtMath> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/valueaxis/chartvalueaxisy_p.h b/src/charts/axis/valueaxis/chartvalueaxisy_p.h index 3ec30faa..d0d6fdc3 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisy_p.h +++ b/src/charts/axis/valueaxis/chartvalueaxisy_p.h @@ -30,7 +30,7 @@ #ifndef CHARTVALUEAXISY_H #define CHARTVALUEAXISY_H -#include "verticalaxis_p.h" +#include <private/verticalaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp b/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp index 945449a8..8dc5284e 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp +++ b/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "polarchartvalueaxisangular_p.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" +#include <private/polarchartvalueaxisangular_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractchartlayout_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h index d4a2f653..ecd35763 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h +++ b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h @@ -30,7 +30,7 @@ #ifndef POLARCHARTVALUEAXISANGULAR_P_H #define POLARCHARTVALUEAXISANGULAR_P_H -#include "polarchartaxisangular_p.h" +#include <private/polarchartaxisangular_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp b/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp index 006477e8..f8eff7ac 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp +++ b/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "polarchartvalueaxisradial_p.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" +#include <private/polarchartvalueaxisradial_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractchartlayout_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h index 4e13b57a..9eb249fc 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h +++ b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h @@ -30,7 +30,7 @@ #ifndef POLARCHARTVALUEAXISRADIAL_P_H #define POLARCHARTVALUEAXISRADIAL_P_H -#include "polarchartaxisradial_p.h" +#include <private/polarchartaxisradial_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/valueaxis/qvalueaxis.cpp b/src/charts/axis/valueaxis/qvalueaxis.cpp index a055dc22..798b55f5 100644 --- a/src/charts/axis/valueaxis/qvalueaxis.cpp +++ b/src/charts/axis/valueaxis/qvalueaxis.cpp @@ -18,16 +18,16 @@ ** ****************************************************************************/ -#include "qvalueaxis.h" -#include "qvalueaxis_p.h" -#include "chartvalueaxisx_p.h" -#include "chartvalueaxisy_p.h" -#include "abstractdomain_p.h" -#include "polarchartvalueaxisangular_p.h" -#include "polarchartvalueaxisradial_p.h" -#include "chartdataset_p.h" -#include "chartpresenter_p.h" -#include "charttheme_p.h" +#include <QtCharts/QValueAxis> +#include <private/qvalueaxis_p.h> +#include <private/chartvalueaxisx_p.h> +#include <private/chartvalueaxisy_p.h> +#include <private/abstractdomain_p.h> +#include <private/polarchartvalueaxisangular_p.h> +#include <private/polarchartvalueaxisradial_p.h> +#include <private/chartdataset_p.h> +#include <private/chartpresenter_p.h> +#include <private/charttheme_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/valueaxis/qvalueaxis.h b/src/charts/axis/valueaxis/qvalueaxis.h index a51203a4..85ca4f17 100644 --- a/src/charts/axis/valueaxis/qvalueaxis.h +++ b/src/charts/axis/valueaxis/qvalueaxis.h @@ -21,7 +21,7 @@ #ifndef QVALUEAXIS_H #define QVALUEAXIS_H -#include <QtCharts/qabstractaxis.h> +#include <QtCharts/QAbstractAxis> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/valueaxis/qvalueaxis_p.h b/src/charts/axis/valueaxis/qvalueaxis_p.h index a1d9de5b..7648ea2c 100644 --- a/src/charts/axis/valueaxis/qvalueaxis_p.h +++ b/src/charts/axis/valueaxis/qvalueaxis_p.h @@ -30,8 +30,8 @@ #ifndef QVALUEAXIS_P_H #define QVALUEAXIS_P_H -#include <qvalueaxis.h> -#include "qabstractaxis_p.h" +#include <QtCharts/QValueAxis> +#include <private/qabstractaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/verticalaxis.cpp b/src/charts/axis/verticalaxis.cpp index 64c940f1..484ca1f8 100644 --- a/src/charts/axis/verticalaxis.cpp +++ b/src/charts/axis/verticalaxis.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "verticalaxis_p.h" -#include "qabstractaxis.h" -#include "chartpresenter_p.h" -#include <QDebug> +#include <private/verticalaxis_p.h> +#include <QtCharts/QAbstractAxis> +#include <private/chartpresenter_p.h> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/axis/verticalaxis_p.h b/src/charts/axis/verticalaxis_p.h index 8349ff51..dc4dfa5c 100644 --- a/src/charts/axis/verticalaxis_p.h +++ b/src/charts/axis/verticalaxis_p.h @@ -30,7 +30,7 @@ #ifndef VERTICALAXIS_P_H_ #define VERTICALAXIS_P_H_ -#include "cartesianchartaxis_p.h" +#include <private/cartesianchartaxis_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp index 4cf8b366..d0adca67 100644 --- a/src/charts/barchart/abstractbarchartitem.cpp +++ b/src/charts/barchart/abstractbarchartitem.cpp @@ -18,19 +18,20 @@ ** ****************************************************************************/ -#include "abstractbarchartitem_p.h" -#include "bar_p.h" -#include "qbarset.h" -#include "qbarset_p.h" -#include "qabstractbarseries.h" -#include "qabstractbarseries_p.h" -#include "qchart.h" -#include "chartpresenter_p.h" -#include "charttheme_p.h" -#include "baranimation_p.h" -#include "chartdataset_p.h" -#include <QPainter> -#include <QTextDocument> +#include <private/abstractbarchartitem_p.h> +#include <private/bar_p.h> +#include <QtCharts/QBarSet> +#include <private/qbarset_p.h> +#include <QtCharts/QAbstractBarSeries> +#include <private/qabstractbarseries_p.h> +#include <QtCharts/QChart> +#include <private/chartpresenter_p.h> +#include <private/charttheme_p.h> +#include <private/baranimation_p.h> + +#include <private/chartdataset_p.h> +#include <QtGui/QPainter> +#include <QtGui/QTextDocument> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/abstractbarchartitem_p.h b/src/charts/barchart/abstractbarchartitem_p.h index 66551a62..2cb2db63 100644 --- a/src/charts/barchart/abstractbarchartitem_p.h +++ b/src/charts/barchart/abstractbarchartitem_p.h @@ -31,10 +31,10 @@ #ifndef ABSTRACTBARCHARTITEM_H #define ABSTRACTBARCHARTITEM_H -#include "chartitem_p.h" -#include "qabstractbarseries.h" -#include <QPen> -#include <QBrush> +#include <private/chartitem_p.h> +#include <QtCharts/QAbstractBarSeries> +#include <QtGui/QPen> +#include <QtGui/QBrush> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/bar.cpp b/src/charts/barchart/bar.cpp index de6c442f..41f20b7b 100644 --- a/src/charts/barchart/bar.cpp +++ b/src/charts/barchart/bar.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "bar_p.h" -#include <QPainter> -#include <QGraphicsSceneEvent> +#include <private/bar_p.h> +#include <QtGui/QPainter> +#include <QtWidgets/QGraphicsSceneEvent> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/bar_p.h b/src/charts/barchart/bar_p.h index 0d46e2b6..5033fc3c 100644 --- a/src/charts/barchart/bar_p.h +++ b/src/charts/barchart/bar_p.h @@ -30,8 +30,8 @@ #ifndef BAR_H #define BAR_H -#include "qchartglobal.h" -#include <QGraphicsRectItem> +#include <QtCharts/QChartGlobal> +#include <QtWidgets/QGraphicsRectItem> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp b/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp index d5370a2f..81836687 100644 --- a/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp +++ b/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "horizontalbarchartitem_p.h" -#include "qabstractbarseries_p.h" -#include "qbarset_p.h" -#include "bar_p.h" +#include <private/horizontalbarchartitem_p.h> +#include <private/qabstractbarseries_p.h> +#include <private/qbarset_p.h> +#include <private/bar_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h b/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h index df7e793e..27acdea8 100644 --- a/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h +++ b/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h @@ -30,8 +30,8 @@ #ifndef HORIZONTALBARCHARTITEM_H #define HORIZONTALBARCHARTITEM_H -#include "abstractbarchartitem_p.h" -#include <QGraphicsItem> +#include <private/abstractbarchartitem_p.h> +#include <QtWidgets/QGraphicsItem> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp index d381aadf..e8da0c84 100644 --- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp +++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "qhorizontalbarseries.h" -#include "qhorizontalbarseries_p.h" -#include "horizontalbarchartitem_p.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QHorizontalBarSeries> +#include <private/qhorizontalbarseries_p.h> +#include <private/horizontalbarchartitem_p.h> +#include <QtCharts/QBarCategoryAxis> -#include "chartdataset_p.h" -#include "charttheme_p.h" +#include <private/chartdataset_p.h> +#include <private/charttheme_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h index b5cf137b..9e90f5df 100644 --- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h +++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h @@ -21,7 +21,7 @@ #ifndef QHORIZONTALBARSERIES_H #define QHORIZONTALBARSERIES_H -#include <QtCharts/qabstractbarseries.h> +#include <QtCharts/QAbstractBarSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h b/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h index d32ed320..588ca4ea 100644 --- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h +++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h @@ -30,8 +30,8 @@ #ifndef QHORIZONTALBARSERIES_P_H #define QHORIZONTALBARSERIES_P_H -#include "qabstractbarseries_p.h" -#include "abstractdomain_p.h" +#include <private/qabstractbarseries_p.h> +#include <private/abstractdomain_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp index 0bf9afbe..9ec04988 100644 --- a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp +++ b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "horizontalpercentbarchartitem_p.h" -#include "qabstractbarseries_p.h" -#include "qbarset_p.h" -#include "bar_p.h" +#include <private/horizontalpercentbarchartitem_p.h> +#include <private/qabstractbarseries_p.h> +#include <private/qbarset_p.h> +#include <private/bar_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h index e24cdcf0..a32c8def 100644 --- a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h +++ b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h @@ -30,8 +30,8 @@ #ifndef HORIZONTALPERCENTBARCHARTITEM_P_H #define HORIZONTALPERCENTBARCHARTITEM_P_H -#include "abstractbarchartitem_p.h" -#include <QGraphicsItem> +#include <private/abstractbarchartitem_p.h> +#include <QtWidgets/QGraphicsItem> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp index bf915c85..f46f7326 100644 --- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp +++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp @@ -17,12 +17,12 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qhorizontalpercentbarseries.h" -#include "qhorizontalpercentbarseries_p.h" -#include "horizontalpercentbarchartitem_p.h" +#include <QtCharts/QHorizontalPercentBarSeries> +#include <private/qhorizontalpercentbarseries_p.h> +#include <private/horizontalpercentbarchartitem_p.h> -#include "chartdataset_p.h" -#include "charttheme_p.h" +#include <private/chartdataset_p.h> +#include <private/charttheme_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h index 0595532b..9d14e6cb 100644 --- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h +++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h @@ -21,7 +21,7 @@ #ifndef QHORIZONTALPERCENTBARSERIES_H #define QHORIZONTALPERCENTBARSERIES_H -#include <QtCharts/qabstractbarseries.h> +#include <QtCharts/QAbstractBarSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h index 079f97bb..aab62a6c 100644 --- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h +++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h @@ -30,8 +30,8 @@ #ifndef QHORIZONTALPERCENTBARSERIES_P_H #define QHORIZONTALPERCENTBARSERIES_P_H -#include "qabstractbarseries_p.h" -#include "abstractdomain_p.h" +#include <private/qabstractbarseries_p.h> +#include <private/abstractdomain_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp index fe6f162d..29c8a1e9 100644 --- a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp +++ b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "horizontalstackedbarchartitem_p.h" -#include "qabstractbarseries_p.h" -#include "qbarset_p.h" -#include "bar_p.h" +#include <private/horizontalstackedbarchartitem_p.h> +#include <private/qabstractbarseries_p.h> +#include <private/qbarset_p.h> +#include <private/bar_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h index 930a53a5..c968ff60 100644 --- a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h +++ b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h @@ -30,8 +30,8 @@ #ifndef HORIZONTALSTACKEDBARCHARTITEM_P_H #define HORIZONTALSTACKEDBARCHARTITEM_P_H -#include "abstractbarchartitem_p.h" -#include <QGraphicsItem> +#include <private/abstractbarchartitem_p.h> +#include <QtWidgets/QGraphicsItem> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp index 32c553bf..64a07db6 100644 --- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp +++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp @@ -17,12 +17,12 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qhorizontalstackedbarseries.h" -#include "qhorizontalstackedbarseries_p.h" -#include "horizontalstackedbarchartitem_p.h" +#include <QtCharts/QHorizontalStackedBarSeries> +#include <private/qhorizontalstackedbarseries_p.h> +#include <private/horizontalstackedbarchartitem_p.h> -#include "chartdataset_p.h" -#include "charttheme_p.h" +#include <private/chartdataset_p.h> +#include <private/charttheme_p.h> QT_CHARTS_BEGIN_NAMESPACE /*! diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h index fbcf4011..e1959cac 100644 --- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h +++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h @@ -21,7 +21,7 @@ #ifndef QHORIZONTALSTACKEDBARSERIES_H #define QHORIZONTALSTACKEDBARSERIES_H -#include <QtCharts/qabstractbarseries.h> +#include <QtCharts/QAbstractBarSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h index ab643ebd..f085a694 100644 --- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h +++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h @@ -30,8 +30,8 @@ #ifndef QHORIZONTALSTACKEDBARSERIES_P_H #define QHORIZONTALSTACKEDBARSERIES_P_H -#include "qabstractbarseries_p.h" -#include "abstractdomain_p.h" +#include <private/qabstractbarseries_p.h> +#include <private/abstractdomain_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/qabstractbarseries.cpp b/src/charts/barchart/qabstractbarseries.cpp index 08345112..a4795248 100644 --- a/src/charts/barchart/qabstractbarseries.cpp +++ b/src/charts/barchart/qabstractbarseries.cpp @@ -18,19 +18,19 @@ ** ****************************************************************************/ -#include "qabstractbarseries.h" -#include "qabstractbarseries_p.h" -#include "qbarset.h" -#include "qbarset_p.h" -#include "abstractdomain_p.h" -#include "chartdataset_p.h" -#include "charttheme_p.h" -#include "qvalueaxis.h" -#include "qbarcategoryaxis.h" -#include "qbarlegendmarker.h" -#include "baranimation_p.h" -#include "abstractbarchartitem_p.h" -#include "qchart_p.h" +#include <QtCharts/QAbstractBarSeries> +#include <private/qabstractbarseries_p.h> +#include <QtCharts/QBarSet> +#include <private/qbarset_p.h> +#include <private/abstractdomain_p.h> +#include <private/chartdataset_p.h> +#include <private/charttheme_p.h> +#include <QtCharts/QValueAxis> +#include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QBarLegendMarker> +#include <private/baranimation_p.h> +#include <private/abstractbarchartitem_p.h> +#include <private/qchart_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/qabstractbarseries.h b/src/charts/barchart/qabstractbarseries.h index 85f32ff7..919c9abe 100644 --- a/src/charts/barchart/qabstractbarseries.h +++ b/src/charts/barchart/qabstractbarseries.h @@ -21,8 +21,8 @@ #ifndef QABSTRACTBARSERIES_H #define QABSTRACTBARSERIES_H -#include <QtCharts/qabstractseries.h> -#include <QStringList> +#include <QtCharts/QAbstractSeries> +#include <QtCore/QStringList> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/qabstractbarseries_p.h b/src/charts/barchart/qabstractbarseries_p.h index c7b0b827..c4ef1693 100644 --- a/src/charts/barchart/qabstractbarseries_p.h +++ b/src/charts/barchart/qabstractbarseries_p.h @@ -30,10 +30,10 @@ #ifndef QABSTRACTBARSERIES_P_H #define QABSTRACTBARSERIES_P_H -#include <QtCharts/qabstractbarseries.h> -#include "qabstractseries_p.h" -#include <QStringList> -#include <QAbstractSeries> +#include <QtCharts/QAbstractBarSeries> +#include <private/qabstractseries_p.h> +#include <QtCore/QStringList> +#include <QtCharts/QAbstractSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/qbarmodelmapper.cpp b/src/charts/barchart/qbarmodelmapper.cpp index 459a72ca..2620b4f4 100644 --- a/src/charts/barchart/qbarmodelmapper.cpp +++ b/src/charts/barchart/qbarmodelmapper.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include "qbarmodelmapper.h" -#include "qbarmodelmapper_p.h" -#include "qabstractbarseries.h" -#include "qbarset.h" -#include "qchart.h" -#include <QAbstractItemModel> +#include <QtCharts/QBarModelMapper> +#include <private/qbarmodelmapper_p.h> +#include <QtCharts/QAbstractBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QChart> +#include <QtCore/QAbstractItemModel> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/qbarmodelmapper.h b/src/charts/barchart/qbarmodelmapper.h index a527165a..7aa2288f 100644 --- a/src/charts/barchart/qbarmodelmapper.h +++ b/src/charts/barchart/qbarmodelmapper.h @@ -21,8 +21,8 @@ #ifndef QBARMODELMAPPER_H #define QBARMODELMAPPER_H -#include <QtCharts/qchartglobal.h> -#include <QObject> +#include <QtCharts/QChartGlobal> +#include <QtCore/QObject> class QAbstractItemModel; diff --git a/src/charts/barchart/qbarmodelmapper_p.h b/src/charts/barchart/qbarmodelmapper_p.h index 754ebec1..e613284b 100644 --- a/src/charts/barchart/qbarmodelmapper_p.h +++ b/src/charts/barchart/qbarmodelmapper_p.h @@ -30,8 +30,8 @@ #ifndef QBARMODELMAPPER_P_H #define QBARMODELMAPPER_P_H -#include <QObject> -#include "qbarmodelmapper.h" +#include <QtCore/QObject> +#include <QtCharts/QBarModelMapper> class QModelIndex; diff --git a/src/charts/barchart/qbarset.cpp b/src/charts/barchart/qbarset.cpp index e378b327..d7457ba6 100644 --- a/src/charts/barchart/qbarset.cpp +++ b/src/charts/barchart/qbarset.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "qbarset.h" -#include "qbarset_p.h" -#include "charthelpers_p.h" -#include "qchart_p.h" +#include <QtCharts/QBarSet> +#include <private/qbarset_p.h> +#include <private/charthelpers_p.h> +#include <private/qchart_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/qbarset.h b/src/charts/barchart/qbarset.h index 7d96dec4..ea708296 100644 --- a/src/charts/barchart/qbarset.h +++ b/src/charts/barchart/qbarset.h @@ -21,10 +21,10 @@ #ifndef QBARSET_H #define QBARSET_H -#include <QtCharts/qchartglobal.h> -#include <QPen> -#include <QBrush> -#include <QFont> +#include <QtCharts/QChartGlobal> +#include <QtGui/QPen> +#include <QtGui/QBrush> +#include <QtGui/QFont> QT_CHARTS_BEGIN_NAMESPACE class QBarSetPrivate; diff --git a/src/charts/barchart/qbarset_p.h b/src/charts/barchart/qbarset_p.h index d0b03efa..32107984 100644 --- a/src/charts/barchart/qbarset_p.h +++ b/src/charts/barchart/qbarset_p.h @@ -30,11 +30,11 @@ #ifndef QBARSET_P_H #define QBARSET_P_H -#include <qbarset.h> -#include <QMap> -#include <QPen> -#include <QBrush> -#include <QFont> +#include <QtCharts/QBarSet> +#include <QtCore/QMap> +#include <QtGui/QPen> +#include <QtGui/QBrush> +#include <QtGui/QFont> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/qhbarmodelmapper.cpp b/src/charts/barchart/qhbarmodelmapper.cpp index 0312df40..ef0af28b 100644 --- a/src/charts/barchart/qhbarmodelmapper.cpp +++ b/src/charts/barchart/qhbarmodelmapper.cpp @@ -18,7 +18,7 @@ ** ****************************************************************************/ -#include "qhbarmodelmapper.h" +#include <QtCharts/QHBarModelMapper> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/qvbarmodelmapper.cpp b/src/charts/barchart/qvbarmodelmapper.cpp index a239e696..fab64d71 100644 --- a/src/charts/barchart/qvbarmodelmapper.cpp +++ b/src/charts/barchart/qvbarmodelmapper.cpp @@ -18,7 +18,7 @@ ** ****************************************************************************/ -#include "qvbarmodelmapper.h" +#include <QtCharts/QVBarModelMapper> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/bar/barchartitem.cpp b/src/charts/barchart/vertical/bar/barchartitem.cpp index 86b63045..4c2b1d2a 100644 --- a/src/charts/barchart/vertical/bar/barchartitem.cpp +++ b/src/charts/barchart/vertical/bar/barchartitem.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include "barchartitem_p.h" -#include "bar_p.h" -#include "qabstractbarseries_p.h" -#include "qbarset.h" -#include "qbarset_p.h" +#include <private/barchartitem_p.h> +#include <private/bar_p.h> +#include <private/qabstractbarseries_p.h> +#include <QtCharts/QBarSet> +#include <private/qbarset_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/bar/barchartitem_p.h b/src/charts/barchart/vertical/bar/barchartitem_p.h index 09df0dbf..46309f39 100644 --- a/src/charts/barchart/vertical/bar/barchartitem_p.h +++ b/src/charts/barchart/vertical/bar/barchartitem_p.h @@ -31,9 +31,9 @@ #ifndef BARCHARTITEM_H #define BARCHARTITEM_H -#include "abstractbarchartitem_p.h" -#include <qstackedbarseries.h> -#include <QGraphicsItem> +#include <private/abstractbarchartitem_p.h> +#include <QtCharts/QStackedBarSeries> +#include <QtWidgets/QGraphicsItem> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/bar/qbarseries.cpp b/src/charts/barchart/vertical/bar/qbarseries.cpp index 3ab2a1ee..f4956623 100644 --- a/src/charts/barchart/vertical/bar/qbarseries.cpp +++ b/src/charts/barchart/vertical/bar/qbarseries.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "qbarseries.h" -#include "qbarseries_p.h" -#include "barchartitem_p.h" -#include "chartdataset_p.h" -#include "charttheme_p.h" -#include "qvalueaxis.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QBarSeries> +#include <private/qbarseries_p.h> +#include <private/barchartitem_p.h> +#include <private/chartdataset_p.h> +#include <private/charttheme_p.h> +#include <QtCharts/QValueAxis> +#include <QtCharts/QBarCategoryAxis> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/bar/qbarseries.h b/src/charts/barchart/vertical/bar/qbarseries.h index d3fefd8a..81e64f00 100644 --- a/src/charts/barchart/vertical/bar/qbarseries.h +++ b/src/charts/barchart/vertical/bar/qbarseries.h @@ -21,7 +21,7 @@ #ifndef QBARSERIES_H #define QBARSERIES_H -#include <QtCharts/qabstractbarseries.h> +#include <QtCharts/QAbstractBarSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/bar/qbarseries_p.h b/src/charts/barchart/vertical/bar/qbarseries_p.h index c74194d3..ba80ecb3 100644 --- a/src/charts/barchart/vertical/bar/qbarseries_p.h +++ b/src/charts/barchart/vertical/bar/qbarseries_p.h @@ -30,8 +30,8 @@ #ifndef QBARSERIES_P_H #define QBARSERIES_P_H -#include "qabstractbarseries_p.h" -#include "abstractdomain_p.h" +#include <private/qabstractbarseries_p.h> +#include <private/abstractdomain_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem.cpp b/src/charts/barchart/vertical/percent/percentbarchartitem.cpp index 1e0bbbae..ed7cf664 100644 --- a/src/charts/barchart/vertical/percent/percentbarchartitem.cpp +++ b/src/charts/barchart/vertical/percent/percentbarchartitem.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include "percentbarchartitem_p.h" -#include "bar_p.h" -#include "qabstractbarseries_p.h" -#include "qbarset.h" -#include "qbarset_p.h" +#include <private/percentbarchartitem_p.h> +#include <private/bar_p.h> +#include <private/qabstractbarseries_p.h> +#include <QtCharts/QBarSet> +#include <private/qbarset_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h index 4293d875..46fe51d5 100644 --- a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h +++ b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h @@ -31,8 +31,8 @@ #ifndef PERCENTBARCHARTITEM_H #define PERCENTBARCHARTITEM_H -#include "abstractbarchartitem_p.h" -#include <QGraphicsItem> +#include <private/abstractbarchartitem_p.h> +#include <QtWidgets/QGraphicsItem> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries.cpp b/src/charts/barchart/vertical/percent/qpercentbarseries.cpp index 7899899b..69df6458 100644 --- a/src/charts/barchart/vertical/percent/qpercentbarseries.cpp +++ b/src/charts/barchart/vertical/percent/qpercentbarseries.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include "qpercentbarseries.h" -#include "qpercentbarseries_p.h" -#include "percentbarchartitem_p.h" -#include "chartdataset_p.h" -#include "charttheme_p.h" -#include "qvalueaxis.h" +#include <QtCharts/QPercentBarSeries> +#include <private/qpercentbarseries_p.h> +#include <private/percentbarchartitem_p.h> +#include <private/chartdataset_p.h> +#include <private/charttheme_p.h> +#include <QtCharts/QValueAxis> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries.h b/src/charts/barchart/vertical/percent/qpercentbarseries.h index 5f9ce140..7fcea07b 100644 --- a/src/charts/barchart/vertical/percent/qpercentbarseries.h +++ b/src/charts/barchart/vertical/percent/qpercentbarseries.h @@ -21,8 +21,8 @@ #ifndef QPERCENTBARSERIES_H #define QPERCENTBARSERIES_H -#include <QStringList> -#include <QtCharts/qabstractbarseries.h> +#include <QtCore/QStringList> +#include <QtCharts/QAbstractBarSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries_p.h b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h index f31c9638..09eb978e 100644 --- a/src/charts/barchart/vertical/percent/qpercentbarseries_p.h +++ b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h @@ -30,8 +30,8 @@ #ifndef QPERCENTBARSERIES_P_H #define QPERCENTBARSERIES_P_H -#include "qabstractbarseries_p.h" -#include "abstractdomain_p.h" +#include <private/qabstractbarseries_p.h> +#include <private/abstractdomain_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp b/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp index 7a1946f7..c77f8c71 100644 --- a/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp +++ b/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include "qstackedbarseries.h" -#include "qstackedbarseries_p.h" -#include "stackedbarchartitem_p.h" -#include "chartdataset_p.h" -#include "charttheme_p.h" -#include "qvalueaxis.h" +#include <QtCharts/QStackedBarSeries> +#include <private/qstackedbarseries_p.h> +#include <private/stackedbarchartitem_p.h> +#include <private/chartdataset_p.h> +#include <private/charttheme_p.h> +#include <QtCharts/QValueAxis> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries.h b/src/charts/barchart/vertical/stacked/qstackedbarseries.h index bab6e174..9bdfc428 100644 --- a/src/charts/barchart/vertical/stacked/qstackedbarseries.h +++ b/src/charts/barchart/vertical/stacked/qstackedbarseries.h @@ -21,8 +21,8 @@ #ifndef QSTACKEDBARSERIES_H #define QSTACKEDBARSERIES_H -#include <QStringList> -#include <QtCharts/qabstractbarseries.h> +#include <QtCore/QStringList> +#include <QtCharts/QAbstractBarSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h b/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h index d5cf3c2d..b0479e18 100644 --- a/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h +++ b/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h @@ -30,8 +30,8 @@ #ifndef QSTACKEDBARSERIES_P_H #define QSTACKEDBARSERIES_P_H -#include "qabstractbarseries_p.h" -#include "abstractdomain_p.h" +#include <private/qabstractbarseries_p.h> +#include <private/abstractdomain_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp b/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp index 953bb455..ab41aef7 100644 --- a/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp +++ b/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include "stackedbarchartitem_p.h" -#include "bar_p.h" -#include "qbarset_p.h" -#include "qabstractbarseries_p.h" -#include "qbarset.h" +#include <private/stackedbarchartitem_p.h> +#include <private/bar_p.h> +#include <private/qbarset_p.h> +#include <private/qabstractbarseries_p.h> +#include <QtCharts/QBarSet> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h index f2fa6b73..82190da0 100644 --- a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h +++ b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h @@ -31,9 +31,9 @@ #ifndef STACKEDBARCHARTITEM_H #define STACKEDBARCHARTITEM_H -#include "abstractbarchartitem_p.h" -#include <qstackedbarseries.h> -#include <QGraphicsItem> +#include <private/abstractbarchartitem_p.h> +#include <QtCharts/QStackedBarSeries> +#include <QtWidgets/QGraphicsItem> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/boxplotchart/boxplotchartitem.cpp b/src/charts/boxplotchart/boxplotchartitem.cpp index ac1734d5..41baaafa 100644 --- a/src/charts/boxplotchart/boxplotchartitem.cpp +++ b/src/charts/boxplotchart/boxplotchartitem.cpp @@ -18,14 +18,14 @@ ** ****************************************************************************/ -#include "boxplotchartitem_p.h" -#include "qboxplotseries_p.h" -#include "bar_p.h" -#include "qboxset_p.h" -#include "qabstractbarseries_p.h" -#include "qboxset.h" -#include "boxwhiskers_p.h" -#include <QPainter> +#include <private/boxplotchartitem_p.h> +#include <private/qboxplotseries_p.h> +#include <private/bar_p.h> +#include <private/qboxset_p.h> +#include <private/qabstractbarseries_p.h> +#include <QtCharts/QBoxSet> +#include <private/boxwhiskers_p.h> +#include <QtGui/QPainter> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/boxplotchart/boxplotchartitem_p.h b/src/charts/boxplotchart/boxplotchartitem_p.h index 0bba5394..19d45331 100644 --- a/src/charts/boxplotchart/boxplotchartitem_p.h +++ b/src/charts/boxplotchart/boxplotchartitem_p.h @@ -31,12 +31,12 @@ #ifndef BOXPLOTCHARTITEM_H #define BOXPLOTCHARTITEM_H -#include "boxwhiskers_p.h" -#include "qboxplotseries.h" -#include "chartitem_p.h" -#include "boxplotanimation_p.h" -#include "qboxset.h" -#include <QGraphicsItem> +#include <private/boxwhiskers_p.h> +#include <QtCharts/QBoxPlotSeries> +#include <private/chartitem_p.h> +#include <private/boxplotanimation_p.h> +#include <QtCharts/QBoxSet> +#include <QtWidgets/QGraphicsItem> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/boxplotchart/boxwhiskers.cpp b/src/charts/boxplotchart/boxwhiskers.cpp index 1e78d127..db25ed21 100644 --- a/src/charts/boxplotchart/boxwhiskers.cpp +++ b/src/charts/boxplotchart/boxwhiskers.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "boxwhiskers_p.h" -#include <QPainter> -#include <QWidget> +#include <private/boxwhiskers_p.h> +#include <QtGui/QPainter> +#include <QtWidgets/QWidget> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/boxplotchart/boxwhiskers_p.h b/src/charts/boxplotchart/boxwhiskers_p.h index 3dee8335..40bb678b 100644 --- a/src/charts/boxplotchart/boxwhiskers_p.h +++ b/src/charts/boxplotchart/boxwhiskers_p.h @@ -30,14 +30,14 @@ #ifndef BOXWHISKERS_H #define BOXWHISKERS_H -#include "boxwhiskersdata_p.h" -#include "qchartglobal.h" -#include "abstractdomain_p.h" -#include <QBoxSet> -#include <QGraphicsRectItem> -#include <QGraphicsLineItem> -#include <QGraphicsLayoutItem> -#include <QPainterPath> +#include <private/boxwhiskersdata_p.h> +#include <QtCharts/QChartGlobal> +#include <private/abstractdomain_p.h> +#include <QtCharts/QBoxSet> +#include <QtWidgets/QGraphicsRectItem> +#include <QtWidgets/QGraphicsLineItem> +#include <QtWidgets/QGraphicsLayoutItem> +#include <QtGui/QPainterPath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/boxplotchart/boxwhiskersdata_p.h b/src/charts/boxplotchart/boxwhiskersdata_p.h index 041c9039..08198701 100644 --- a/src/charts/boxplotchart/boxwhiskersdata_p.h +++ b/src/charts/boxplotchart/boxwhiskersdata_p.h @@ -30,8 +30,8 @@ #ifndef BOXWHISKERSDATA_P_H #define BOXWHISKERSDATA_P_H -#include "qchartglobal.h" -#include <QSizeF> +#include <QtCharts/QChartGlobal> +#include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/boxplotchart/qboxplotmodelmapper.cpp b/src/charts/boxplotchart/qboxplotmodelmapper.cpp index 7f1487c8..feeb73ab 100644 --- a/src/charts/boxplotchart/qboxplotmodelmapper.cpp +++ b/src/charts/boxplotchart/qboxplotmodelmapper.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include "qboxplotmodelmapper.h" -#include "qboxplotmodelmapper_p.h" -#include "qboxplotseries.h" -#include "qboxset.h" -#include "qchart.h" -#include <QAbstractItemModel> +#include <QtCharts/QBoxPlotModelMapper> +#include <private/qboxplotmodelmapper_p.h> +#include <QtCharts/QBoxPlotSeries> +#include <QtCharts/QBoxSet> +#include <QtCharts/QChart> +#include <QtCore/QAbstractItemModel> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/boxplotchart/qboxplotmodelmapper.h b/src/charts/boxplotchart/qboxplotmodelmapper.h index a114be99..8ad90412 100644 --- a/src/charts/boxplotchart/qboxplotmodelmapper.h +++ b/src/charts/boxplotchart/qboxplotmodelmapper.h @@ -21,8 +21,8 @@ #ifndef QBOXPLOTMODELMAPPER_H #define QBOXPLOTMODELMAPPER_H -#include <QtCharts/qchartglobal.h> -#include <QObject> +#include <QtCharts/QChartGlobal> +#include <QtCore/QObject> class QAbstractItemModel; diff --git a/src/charts/boxplotchart/qboxplotmodelmapper_p.h b/src/charts/boxplotchart/qboxplotmodelmapper_p.h index 9e474d9e..9f1092c5 100644 --- a/src/charts/boxplotchart/qboxplotmodelmapper_p.h +++ b/src/charts/boxplotchart/qboxplotmodelmapper_p.h @@ -30,8 +30,8 @@ #ifndef QBOXPLOTMODELMAPPER_P_H #define QBOXPLOTMODELMAPPER_P_H -#include <QObject> -#include <qboxplotmodelmapper.h> +#include <QtCore/QObject> +#include <QtCharts/QBoxPlotModelMapper> class QModelIndex; diff --git a/src/charts/boxplotchart/qboxplotseries.cpp b/src/charts/boxplotchart/qboxplotseries.cpp index 2f444b40..e8b1c49c 100644 --- a/src/charts/boxplotchart/qboxplotseries.cpp +++ b/src/charts/boxplotchart/qboxplotseries.cpp @@ -18,19 +18,19 @@ ** ****************************************************************************/ -#include "qboxplotseries.h" -#include "qboxplotseries_p.h" -#include "qboxplotlegendmarker.h" -#include "qbarcategoryaxis.h" -#include "boxplotchartitem_p.h" -#include "chartdataset_p.h" -#include "charttheme_p.h" -#include "qvalueaxis.h" -#include "charttheme_p.h" -#include "boxplotanimation_p.h" -#include "qchart_p.h" -#include "qboxset.h" -#include "qboxset_p.h" +#include <QtCharts/QBoxPlotSeries> +#include <private/qboxplotseries_p.h> +#include <QtCharts/QBoxPlotLegendMarker> +#include <QtCharts/QBarCategoryAxis> +#include <private/boxplotchartitem_p.h> +#include <private/chartdataset_p.h> +#include <private/charttheme_p.h> +#include <QtCharts/QValueAxis> +#include <private/charttheme_p.h> +#include <private/boxplotanimation_p.h> +#include <private/qchart_p.h> +#include <QtCharts/QBoxSet> +#include <private/qboxset_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/boxplotchart/qboxplotseries.h b/src/charts/boxplotchart/qboxplotseries.h index f0684cfa..bce67f61 100644 --- a/src/charts/boxplotchart/qboxplotseries.h +++ b/src/charts/boxplotchart/qboxplotseries.h @@ -21,9 +21,9 @@ #ifndef QBOXPLOTSERIES_H #define QBOXPLOTSERIES_H -#include <QtCharts/qchartglobal.h> -#include <QtCharts/qboxset.h> -#include <QtCharts/qabstractseries.h> +#include <QtCharts/QChartGlobal> +#include <QtCharts/QBoxSet> +#include <QtCharts/QAbstractSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/boxplotchart/qboxplotseries_p.h b/src/charts/boxplotchart/qboxplotseries_p.h index b635064b..4655cffb 100644 --- a/src/charts/boxplotchart/qboxplotseries_p.h +++ b/src/charts/boxplotchart/qboxplotseries_p.h @@ -30,10 +30,10 @@ #ifndef QBOXPLOTSERIES_P_H #define QBOXPLOTSERIES_P_H -#include "qboxplotseries.h" -#include "qabstractbarseries_p.h" -#include "abstractdomain_p.h" -#include "qbarset.h" +#include <QtCharts/QBoxPlotSeries> +#include <private/qabstractbarseries_p.h> +#include <private/abstractdomain_p.h> +#include <QtCharts/QBarSet> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/boxplotchart/qboxset.cpp b/src/charts/boxplotchart/qboxset.cpp index 065746f3..d90ad68d 100644 --- a/src/charts/boxplotchart/qboxset.cpp +++ b/src/charts/boxplotchart/qboxset.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "qboxset.h" -#include "qboxset_p.h" -#include "charthelpers_p.h" +#include <QtCharts/QBoxSet> +#include <private/qboxset_p.h> +#include <private/charthelpers_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/boxplotchart/qboxset.h b/src/charts/boxplotchart/qboxset.h index 498b570d..d2268612 100644 --- a/src/charts/boxplotchart/qboxset.h +++ b/src/charts/boxplotchart/qboxset.h @@ -21,10 +21,10 @@ #ifndef QBOXSET_H #define QBOXSET_H -#include <QtCharts/qchartglobal.h> -#include <QPen> -#include <QBrush> -#include <QFont> +#include <QtCharts/QChartGlobal> +#include <QtGui/QPen> +#include <QtGui/QBrush> +#include <QtGui/QFont> QT_CHARTS_BEGIN_NAMESPACE class QBoxSetPrivate; diff --git a/src/charts/boxplotchart/qboxset_p.h b/src/charts/boxplotchart/qboxset_p.h index 3fd13080..999739c7 100644 --- a/src/charts/boxplotchart/qboxset_p.h +++ b/src/charts/boxplotchart/qboxset_p.h @@ -30,11 +30,11 @@ #ifndef QBOXSET_P_H #define QBOXSET_P_H -#include <qboxset.h> -#include <QMap> -#include <QPen> -#include <QBrush> -#include <QFont> +#include <QtCharts/QBoxSet> +#include <QtCore/QMap> +#include <QtGui/QPen> +#include <QtGui/QBrush> +#include <QtGui/QFont> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/boxplotchart/qvboxplotmodelmapper.cpp b/src/charts/boxplotchart/qvboxplotmodelmapper.cpp index fd35e938..3ed36f47 100644 --- a/src/charts/boxplotchart/qvboxplotmodelmapper.cpp +++ b/src/charts/boxplotchart/qvboxplotmodelmapper.cpp @@ -18,7 +18,7 @@ ** ****************************************************************************/ -#include "qvboxplotmodelmapper.h" +#include <QtCharts/QVBoxPlotModelMapper> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartbackground.cpp b/src/charts/chartbackground.cpp index ceec3772..b3044765 100644 --- a/src/charts/chartbackground.cpp +++ b/src/charts/chartbackground.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include "chartbackground_p.h" -#include "chartconfig_p.h" -#include <QPen> -#include <QBrush> -#include <QPainter> +#include <private/chartbackground_p.h> +#include <private/chartconfig_p.h> +#include <QtGui/QPen> +#include <QtGui/QBrush> +#include <QtGui/QPainter> #include <QGraphicsDropShadowEffect> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartbackground_p.h b/src/charts/chartbackground_p.h index cf27b5bc..7908ee7a 100644 --- a/src/charts/chartbackground_p.h +++ b/src/charts/chartbackground_p.h @@ -30,8 +30,8 @@ #ifndef CHARTBACKGROUND_H #define CHARTBACKGROUND_H -#include "qchartglobal.h" -#include <QGraphicsRectItem> +#include <QtCharts/QChartGlobal> +#include <QtWidgets/QGraphicsRectItem> class QGraphicsDropShadowEffect; QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartconfig_p.h b/src/charts/chartconfig_p.h index e14b1f21..20baa59c 100644 --- a/src/charts/chartconfig_p.h +++ b/src/charts/chartconfig_p.h @@ -30,7 +30,7 @@ #ifndef CHARTCONFIG_H #define CHARTCONFIG_H -#include "qchartglobal.h" +#include <QtCharts/QChartGlobal> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartdataset.cpp b/src/charts/chartdataset.cpp index b28e6be0..dd5ed424 100644 --- a/src/charts/chartdataset.cpp +++ b/src/charts/chartdataset.cpp @@ -18,31 +18,31 @@ ** ****************************************************************************/ -#include "chartdataset_p.h" -#include "chartpresenter_p.h" -#include "qchart.h" -#include "qchart_p.h" -#include "qvalueaxis.h" -#include "qbarcategoryaxis.h" -#include "qvalueaxis_p.h" -#include "qcategoryaxis.h" -#include "qabstractseries_p.h" -#include "qabstractbarseries.h" -#include "qstackedbarseries.h" -#include "qpercentbarseries.h" -#include "qpieseries.h" -#include "chartitem_p.h" -#include "xydomain_p.h" -#include "xypolardomain_p.h" -#include "xlogydomain_p.h" -#include "logxydomain_p.h" -#include "logxlogydomain_p.h" -#include "xlogypolardomain_p.h" -#include "logxypolardomain_p.h" -#include "logxlogypolardomain_p.h" +#include <private/chartdataset_p.h> +#include <private/chartpresenter_p.h> +#include <QtCharts/QChart> +#include <private/qchart_p.h> +#include <QtCharts/QValueAxis> +#include <QtCharts/QBarCategoryAxis> +#include <private/qvalueaxis_p.h> +#include <QtCharts/QCategoryAxis> +#include <private/qabstractseries_p.h> +#include <QtCharts/QAbstractBarSeries> +#include <QtCharts/QStackedBarSeries> +#include <QtCharts/QPercentBarSeries> +#include <QtCharts/QPieSeries> +#include <private/chartitem_p.h> +#include <private/xydomain_p.h> +#include <private/xypolardomain_p.h> +#include <private/xlogydomain_p.h> +#include <private/logxydomain_p.h> +#include <private/logxlogydomain_p.h> +#include <private/xlogypolardomain_p.h> +#include <private/logxypolardomain_p.h> +#include <private/logxlogypolardomain_p.h> #ifndef QT_ON_ARM -#include "qdatetimeaxis.h" +#include <QtCharts/QDateTimeAxis> #endif QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartdataset_p.h b/src/charts/chartdataset_p.h index fea47368..3e75987c 100644 --- a/src/charts/chartdataset_p.h +++ b/src/charts/chartdataset_p.h @@ -30,10 +30,10 @@ #ifndef CHARTDATASET_P_H #define CHARTDATASET_P_H -#include "qabstractseries.h" -#include "abstractdomain_p.h" -#include "qabstractaxis_p.h" -#include <QVector> +#include <QtCharts/QAbstractSeries> +#include <private/abstractdomain_p.h> +#include <private/qabstractaxis_p.h> +#include <QtCore/QVector> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartelement.cpp b/src/charts/chartelement.cpp index 6c40c439..aca56313 100644 --- a/src/charts/chartelement.cpp +++ b/src/charts/chartelement.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "chartelement_p.h" -#include "chartpresenter_p.h" -#include "abstractdomain_p.h" +#include <private/chartelement_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractdomain_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartelement_p.h b/src/charts/chartelement_p.h index 26ff5ca7..02efa39d 100644 --- a/src/charts/chartelement_p.h +++ b/src/charts/chartelement_p.h @@ -30,9 +30,9 @@ #ifndef CHARTELEMENT_H #define CHARTELEMENT_H -#include "qchartglobal.h" -#include <QObject> -#include <QRect> +#include <QtCharts/QChartGlobal> +#include <QtCore/QObject> +#include <QtCore/QRect> #include <QGraphicsObject> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/charthelpers_p.h b/src/charts/charthelpers_p.h index 8e96e842..db09be2a 100644 --- a/src/charts/charthelpers_p.h +++ b/src/charts/charthelpers_p.h @@ -30,8 +30,8 @@ #ifndef CHARTHELPERS_P_H #define CHARTHELPERS_P_H -#include <qnumeric.h> -#include <QPointF> +#include <QtCore/QtNumeric> +#include <QtCore/QPointF> static inline bool isValidValue(qreal value) { diff --git a/src/charts/chartitem.cpp b/src/charts/chartitem.cpp index dd8612ab..d2a06a21 100644 --- a/src/charts/chartitem.cpp +++ b/src/charts/chartitem.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "chartitem_p.h" -#include "qabstractseries_p.h" -#include "abstractdomain_p.h" +#include <private/chartitem_p.h> +#include <private/qabstractseries_p.h> +#include <private/abstractdomain_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartitem_p.h b/src/charts/chartitem_p.h index 2e100d67..e88668ce 100644 --- a/src/charts/chartitem_p.h +++ b/src/charts/chartitem_p.h @@ -30,9 +30,9 @@ #ifndef CHARTITEM_H #define CHARTITEM_H -#include "chartelement_p.h" -#include "chartpresenter_p.h" -#include <QGraphicsItem> +#include <private/chartelement_p.h> +#include <private/chartpresenter_p.h> +#include <QtWidgets/QGraphicsItem> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartpresenter.cpp b/src/charts/chartpresenter.cpp index 7d3f41a7..4eb0757c 100644 --- a/src/charts/chartpresenter.cpp +++ b/src/charts/chartpresenter.cpp @@ -17,23 +17,23 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "chartpresenter_p.h" -#include "qchart.h" -#include "chartitem_p.h" -#include "qchart_p.h" -#include "qabstractaxis.h" -#include "qabstractaxis_p.h" -#include "chartdataset_p.h" -#include "chartanimation_p.h" -#include "qabstractseries_p.h" -#include "qareaseries.h" -#include "chartaxiselement_p.h" -#include "chartbackground_p.h" -#include "cartesianchartlayout_p.h" -#include "polarchartlayout_p.h" -#include "charttitle_p.h" -#include <QTimer> -#include <QTextDocument> +#include <private/chartpresenter_p.h> +#include <QtCharts/QChart> +#include <private/chartitem_p.h> +#include <private/qchart_p.h> +#include <QtCharts/QAbstractAxis> +#include <private/qabstractaxis_p.h> +#include <private/chartdataset_p.h> +#include <private/chartanimation_p.h> +#include <private/qabstractseries_p.h> +#include <QtCharts/QAreaSeries> +#include <private/chartaxiselement_p.h> +#include <private/chartbackground_p.h> +#include <private/cartesianchartlayout_p.h> +#include <private/polarchartlayout_p.h> +#include <private/charttitle_p.h> +#include <QtCore/QTimer> +#include <QtGui/QTextDocument> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartpresenter_p.h b/src/charts/chartpresenter_p.h index 85f1b1bb..238ae3f1 100644 --- a/src/charts/chartpresenter_p.h +++ b/src/charts/chartpresenter_p.h @@ -30,11 +30,11 @@ #ifndef CHARTPRESENTER_H #define CHARTPRESENTER_H -#include "qchartglobal.h" -#include "qchart.h" //because of QChart::ChartThemeId -#include <QRectF> -#include <QMargins> -#include <QLocale> +#include <QtCharts/QChartGlobal> +#include <QtCharts/QChart> //because of QChart::ChartThemeId +#include <QtCore/QRectF> +#include <QtCore/QMargins> +#include <QtCore/QLocale> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartthememanager.cpp b/src/charts/chartthememanager.cpp index 211552da..047eb428 100644 --- a/src/charts/chartthememanager.cpp +++ b/src/charts/chartthememanager.cpp @@ -17,19 +17,19 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qabstractseries_p.h" -#include "qabstractaxis_p.h" -#include <QTime> +#include <private/qabstractseries_p.h> +#include <private/qabstractaxis_p.h> +#include <QtCore/QTime> //themes -#include "chartthemesystem_p.h" -#include "chartthemelight_p.h" -#include "chartthemebluecerulean_p.h" -#include "chartthemedark_p.h" -#include "chartthemebrownsand_p.h" -#include "chartthemebluencs_p.h" -#include "chartthemehighcontrast_p.h" -#include "chartthemeblueicy_p.h" -#include "chartthemeqt_p.h" +#include <private/chartthemesystem_p.h> +#include <private/chartthemelight_p.h> +#include <private/chartthemebluecerulean_p.h> +#include <private/chartthemedark_p.h> +#include <private/chartthemebrownsand_p.h> +#include <private/chartthemebluencs_p.h> +#include <private/chartthemehighcontrast_p.h> +#include <private/chartthemeblueicy_p.h> +#include <private/chartthemeqt_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/chartthememanager_p.h b/src/charts/chartthememanager_p.h index 3eabd8e5..e470ee8c 100644 --- a/src/charts/chartthememanager_p.h +++ b/src/charts/chartthememanager_p.h @@ -30,10 +30,10 @@ #ifndef CHARTTHEMEMANAGER_H #define CHARTTHEMEMANAGER_H -#include "qchartglobal.h" -#include "qchart.h" -#include <QColor> -#include <QGradientStops> +#include <QtCharts/QChartGlobal> +#include <QtCharts/QChart> +#include <QtGui/QColor> +#include <QtGui/QGradientStops> QT_CHARTS_BEGIN_NAMESPACE class ChartTheme; diff --git a/src/charts/charttitle.cpp b/src/charts/charttitle.cpp index c7e18b7e..a31620b4 100644 --- a/src/charts/charttitle.cpp +++ b/src/charts/charttitle.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include "charttitle_p.h" -#include "chartpresenter_p.h" -#include <QFont> -#include <QFontMetrics> -#include <QDebug> -#include <QTextDocument> +#include <private/charttitle_p.h> +#include <private/chartpresenter_p.h> +#include <QtGui/QFont> +#include <QtGui/QFontMetrics> +#include <QtCore/QDebug> +#include <QtGui/QTextDocument> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/charttitle_p.h b/src/charts/charttitle_p.h index dbdb4fbb..8e1fe2ba 100644 --- a/src/charts/charttitle_p.h +++ b/src/charts/charttitle_p.h @@ -30,8 +30,8 @@ #ifndef CHARTTITLE_P_H_ #define CHARTTITLE_P_H_ -#include "qchartglobal.h" -#include <QGraphicsTextItem> +#include <QtCharts/QChartGlobal> +#include <QtWidgets/QGraphicsTextItem> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/abstractdomain.cpp b/src/charts/domain/abstractdomain.cpp index c16e46d5..8546a91a 100644 --- a/src/charts/domain/abstractdomain.cpp +++ b/src/charts/domain/abstractdomain.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "abstractdomain_p.h" -#include "qabstractaxis_p.h" -#include <qmath.h> +#include <private/abstractdomain_p.h> +#include <private/qabstractaxis_p.h> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/abstractdomain_p.h b/src/charts/domain/abstractdomain_p.h index dfd4025f..14dad488 100644 --- a/src/charts/domain/abstractdomain_p.h +++ b/src/charts/domain/abstractdomain_p.h @@ -29,10 +29,10 @@ #ifndef ABSTRACTDOMAIN_H #define ABSTRACTDOMAIN_H -#include "qchartglobal.h" -#include <QRectF> -#include <QSizeF> -#include <QDebug> +#include <QtCharts/QChartGlobal> +#include <QtCore/QRectF> +#include <QtCore/QSizeF> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/logxlogydomain.cpp b/src/charts/domain/logxlogydomain.cpp index a2e781e3..6a579955 100644 --- a/src/charts/domain/logxlogydomain.cpp +++ b/src/charts/domain/logxlogydomain.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "logxlogydomain_p.h" -#include "qabstractaxis_p.h" -#include "qlogvalueaxis.h" -#include <qmath.h> +#include <private/logxlogydomain_p.h> +#include <private/qabstractaxis_p.h> +#include <QtCharts/QLogValueAxis> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/logxlogydomain_p.h b/src/charts/domain/logxlogydomain_p.h index eeb7d7f2..ebd49cc3 100644 --- a/src/charts/domain/logxlogydomain_p.h +++ b/src/charts/domain/logxlogydomain_p.h @@ -29,9 +29,9 @@ #ifndef LOGXLOGYDOMAIN_H #define LOGXLOGYDOMAIN_H -#include "abstractdomain_p.h" -#include <QRectF> -#include <QSizeF> +#include <private/abstractdomain_p.h> +#include <QtCore/QRectF> +#include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/logxlogypolardomain.cpp b/src/charts/domain/logxlogypolardomain.cpp index 33d8eff9..151909d2 100644 --- a/src/charts/domain/logxlogypolardomain.cpp +++ b/src/charts/domain/logxlogypolardomain.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "logxlogypolardomain_p.h" -#include "qabstractaxis_p.h" -#include "qlogvalueaxis.h" -#include <qmath.h> +#include <private/logxlogypolardomain_p.h> +#include <private/qabstractaxis_p.h> +#include <QtCharts/QLogValueAxis> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/logxlogypolardomain_p.h b/src/charts/domain/logxlogypolardomain_p.h index 853e5d3c..f1164659 100644 --- a/src/charts/domain/logxlogypolardomain_p.h +++ b/src/charts/domain/logxlogypolardomain_p.h @@ -29,9 +29,9 @@ #ifndef LOGXLOGYPOLARDOMAIN_H #define LOGXLOGYPOLARDOMAIN_H -#include "polardomain_p.h" -#include <QRectF> -#include <QSizeF> +#include <private/polardomain_p.h> +#include <QtCore/QRectF> +#include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/logxydomain.cpp b/src/charts/domain/logxydomain.cpp index 2901bd26..6c08a97f 100644 --- a/src/charts/domain/logxydomain.cpp +++ b/src/charts/domain/logxydomain.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "logxydomain_p.h" -#include "qabstractaxis_p.h" -#include "qlogvalueaxis.h" -#include <qmath.h> +#include <private/logxydomain_p.h> +#include <private/qabstractaxis_p.h> +#include <QtCharts/QLogValueAxis> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/logxydomain_p.h b/src/charts/domain/logxydomain_p.h index a9b507c4..99cd736d 100644 --- a/src/charts/domain/logxydomain_p.h +++ b/src/charts/domain/logxydomain_p.h @@ -29,9 +29,9 @@ #ifndef LOGXYDOMAIN_H #define LOGXYDOMAIN_H -#include "abstractdomain_p.h" -#include <QRectF> -#include <QSizeF> +#include <private/abstractdomain_p.h> +#include <QtCore/QRectF> +#include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/logxypolardomain.cpp b/src/charts/domain/logxypolardomain.cpp index bcbac505..ba162d7b 100644 --- a/src/charts/domain/logxypolardomain.cpp +++ b/src/charts/domain/logxypolardomain.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "logxypolardomain_p.h" -#include "qabstractaxis_p.h" -#include "qlogvalueaxis.h" -#include <qmath.h> +#include <private/logxypolardomain_p.h> +#include <private/qabstractaxis_p.h> +#include <QtCharts/QLogValueAxis> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/logxypolardomain_p.h b/src/charts/domain/logxypolardomain_p.h index 6234b593..dd39d399 100644 --- a/src/charts/domain/logxypolardomain_p.h +++ b/src/charts/domain/logxypolardomain_p.h @@ -29,9 +29,9 @@ #ifndef LOGXYPOLARDOMAIN_H #define LOGXYPOLARDOMAIN_H -#include "polardomain_p.h" -#include <QRectF> -#include <QSizeF> +#include <private/polardomain_p.h> +#include <QtCore/QRectF> +#include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/polardomain.cpp b/src/charts/domain/polardomain.cpp index 1c01071e..750004e3 100644 --- a/src/charts/domain/polardomain.cpp +++ b/src/charts/domain/polardomain.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "polardomain_p.h" -#include "qabstractaxis_p.h" -#include <qmath.h> +#include <private/polardomain_p.h> +#include <private/qabstractaxis_p.h> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/polardomain_p.h b/src/charts/domain/polardomain_p.h index 06c2993c..27af6d70 100644 --- a/src/charts/domain/polardomain_p.h +++ b/src/charts/domain/polardomain_p.h @@ -29,9 +29,9 @@ #ifndef POLARDOMAIN_H #define POLARDOMAIN_H -#include "abstractdomain_p.h" -#include <QRectF> -#include <QSizeF> +#include <private/abstractdomain_p.h> +#include <QtCore/QRectF> +#include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/xlogydomain.cpp b/src/charts/domain/xlogydomain.cpp index d13bbb67..893825f0 100644 --- a/src/charts/domain/xlogydomain.cpp +++ b/src/charts/domain/xlogydomain.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "xlogydomain_p.h" -#include "qabstractaxis_p.h" -#include "qlogvalueaxis.h" -#include <qmath.h> +#include <private/xlogydomain_p.h> +#include <private/qabstractaxis_p.h> +#include <QtCharts/QLogValueAxis> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/xlogydomain_p.h b/src/charts/domain/xlogydomain_p.h index 8d14d4a7..bb7fb31f 100644 --- a/src/charts/domain/xlogydomain_p.h +++ b/src/charts/domain/xlogydomain_p.h @@ -29,9 +29,9 @@ #ifndef XLOGYDOMAIN_H #define XLOGYDOMAIN_H -#include "abstractdomain_p.h" -#include <QRectF> -#include <QSizeF> +#include <private/abstractdomain_p.h> +#include <QtCore/QRectF> +#include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/xlogypolardomain.cpp b/src/charts/domain/xlogypolardomain.cpp index 76c92c51..ebb1dacf 100644 --- a/src/charts/domain/xlogypolardomain.cpp +++ b/src/charts/domain/xlogypolardomain.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "xlogypolardomain_p.h" -#include "qabstractaxis_p.h" -#include "qlogvalueaxis.h" -#include <qmath.h> +#include <private/xlogypolardomain_p.h> +#include <private/qabstractaxis_p.h> +#include <QtCharts/QLogValueAxis> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/xlogypolardomain_p.h b/src/charts/domain/xlogypolardomain_p.h index 5beace20..68e53c68 100644 --- a/src/charts/domain/xlogypolardomain_p.h +++ b/src/charts/domain/xlogypolardomain_p.h @@ -29,9 +29,9 @@ #ifndef XLOGYPOLARDOMAIN_H #define XLOGYPOLARDOMAIN_H -#include "polardomain_p.h" -#include <QRectF> -#include <QSizeF> +#include <private/polardomain_p.h> +#include <QtCore/QRectF> +#include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/xydomain.cpp b/src/charts/domain/xydomain.cpp index 9916b7ca..e782716d 100644 --- a/src/charts/domain/xydomain.cpp +++ b/src/charts/domain/xydomain.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "xydomain_p.h" -#include "qabstractaxis_p.h" -#include <qmath.h> +#include <private/xydomain_p.h> +#include <private/qabstractaxis_p.h> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/xydomain_p.h b/src/charts/domain/xydomain_p.h index a82596ba..b65d7d17 100644 --- a/src/charts/domain/xydomain_p.h +++ b/src/charts/domain/xydomain_p.h @@ -29,9 +29,9 @@ #ifndef XYDOMAIN_H #define XYDOMAIN_H -#include "abstractdomain_p.h" -#include <QRectF> -#include <QSizeF> +#include <private/abstractdomain_p.h> +#include <QtCore/QRectF> +#include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/xypolardomain.cpp b/src/charts/domain/xypolardomain.cpp index 30fdacd3..67f7428e 100644 --- a/src/charts/domain/xypolardomain.cpp +++ b/src/charts/domain/xypolardomain.cpp @@ -18,9 +18,9 @@ ** ****************************************************************************/ -#include "xypolardomain_p.h" -#include "qabstractaxis_p.h" -#include <qmath.h> +#include <private/xypolardomain_p.h> +#include <private/qabstractaxis_p.h> +#include <QtCore/QtMath> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/xypolardomain_p.h b/src/charts/domain/xypolardomain_p.h index 0d5abbab..4ad2ee43 100644 --- a/src/charts/domain/xypolardomain_p.h +++ b/src/charts/domain/xypolardomain_p.h @@ -29,8 +29,8 @@ #ifndef XYPOLARDOMAIN_H #define XYPOLARDOMAIN_H -#include "polardomain_p.h" -#include <QRectF> +#include <private/polardomain_p.h> +#include <QtCore/QRectF> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/layout/abstractchartlayout.cpp b/src/charts/layout/abstractchartlayout.cpp index b0d3d067..faa41ffb 100644 --- a/src/charts/layout/abstractchartlayout.cpp +++ b/src/charts/layout/abstractchartlayout.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "abstractchartlayout_p.h" -#include "chartpresenter_p.h" -#include "qlegend_p.h" -#include "chartaxiselement_p.h" -#include "charttitle_p.h" -#include "chartbackground_p.h" -#include <QDebug> +#include <private/abstractchartlayout_p.h> +#include <private/chartpresenter_p.h> +#include <private/qlegend_p.h> +#include <private/chartaxiselement_p.h> +#include <private/charttitle_p.h> +#include <private/chartbackground_p.h> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/layout/abstractchartlayout_p.h b/src/charts/layout/abstractchartlayout_p.h index a0bf6f25..0ca6eb33 100644 --- a/src/charts/layout/abstractchartlayout_p.h +++ b/src/charts/layout/abstractchartlayout_p.h @@ -30,9 +30,9 @@ #ifndef ABSTRACTCHARTLAYOUT_H #define ABSTRACTCHARTLAYOUT_H -#include <QGraphicsLayout> -#include <QMargins> -#include "qchartglobal.h" +#include <QtWidgets/QGraphicsLayout> +#include <QtCore/QMargins> +#include <QtCharts/QChartGlobal> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/layout/cartesianchartlayout.cpp b/src/charts/layout/cartesianchartlayout.cpp index 7018a638..698371fa 100644 --- a/src/charts/layout/cartesianchartlayout.cpp +++ b/src/charts/layout/cartesianchartlayout.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "cartesianchartlayout_p.h" -#include "chartpresenter_p.h" -#include "chartaxiselement_p.h" -#include <QDebug> +#include <private/cartesianchartlayout_p.h> +#include <private/chartpresenter_p.h> +#include <private/chartaxiselement_p.h> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/layout/cartesianchartlayout_p.h b/src/charts/layout/cartesianchartlayout_p.h index 2adcc233..ff3b7ab9 100644 --- a/src/charts/layout/cartesianchartlayout_p.h +++ b/src/charts/layout/cartesianchartlayout_p.h @@ -30,7 +30,7 @@ #ifndef CARTESIANCHARTLAYOUT_H #define CARTESIANCHARTLAYOUT_H -#include "abstractchartlayout_p.h" +#include <private/abstractchartlayout_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/layout/polarchartlayout.cpp b/src/charts/layout/polarchartlayout.cpp index 1f4bda39..20854e1b 100644 --- a/src/charts/layout/polarchartlayout.cpp +++ b/src/charts/layout/polarchartlayout.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "polarchartlayout_p.h" -#include "chartpresenter_p.h" -#include "polarchartaxis_p.h" -#include <QDebug> +#include <private/polarchartlayout_p.h> +#include <private/chartpresenter_p.h> +#include <private/polarchartaxis_p.h> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/layout/polarchartlayout_p.h b/src/charts/layout/polarchartlayout_p.h index 38cd8612..9a11dca1 100644 --- a/src/charts/layout/polarchartlayout_p.h +++ b/src/charts/layout/polarchartlayout_p.h @@ -30,7 +30,7 @@ #ifndef POLARCHARTLAYOUT_H #define POLARCHARTLAYOUT_H -#include "abstractchartlayout_p.h" +#include <private/abstractchartlayout_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/legendlayout.cpp b/src/charts/legend/legendlayout.cpp index b4e443c0..fcc37b05 100644 --- a/src/charts/legend/legendlayout.cpp +++ b/src/charts/legend/legendlayout.cpp @@ -18,14 +18,14 @@ ** ****************************************************************************/ -#include "legendlayout_p.h" -#include "chartpresenter_p.h" -#include "qlegend_p.h" -#include "abstractchartlayout_p.h" - -#include "qlegendmarker_p.h" -#include "legendmarkeritem_p.h" -#include "qlegendmarker.h" +#include <private/legendlayout_p.h> +#include <private/chartpresenter_p.h> +#include <private/qlegend_p.h> +#include <private/abstractchartlayout_p.h> + +#include <private/qlegendmarker_p.h> +#include <private/legendmarkeritem_p.h> +#include <QtCharts/QLegendMarker> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/legendlayout_p.h b/src/charts/legend/legendlayout_p.h index ec96aa31..873c624e 100644 --- a/src/charts/legend/legendlayout_p.h +++ b/src/charts/legend/legendlayout_p.h @@ -29,8 +29,8 @@ #ifndef LEGENDLAYOUT_H #define LEGENDLAYOUT_H -#include <QGraphicsLayout> -#include "qchartglobal.h" +#include <QtWidgets/QGraphicsLayout> +#include <QtCharts/QChartGlobal> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/legendmarkeritem.cpp b/src/charts/legend/legendmarkeritem.cpp index f40e4dd0..c8285925 100644 --- a/src/charts/legend/legendmarkeritem.cpp +++ b/src/charts/legend/legendmarkeritem.cpp @@ -18,17 +18,17 @@ ** ****************************************************************************/ -#include <QPainter> -#include <QGraphicsSceneEvent> -#include <QGraphicsTextItem> -#include <QTextDocument> - -#include "qlegend.h" -#include "qlegend_p.h" -#include "qlegendmarker.h" -#include "qlegendmarker_p.h" -#include "legendmarkeritem_p.h" -#include "chartpresenter_p.h" +#include <QtGui/QPainter> +#include <QtWidgets/QGraphicsSceneEvent> +#include <QtWidgets/QGraphicsTextItem> +#include <QtGui/QTextDocument> + +#include <QtCharts/QLegend> +#include <private/qlegend_p.h> +#include <QtCharts/QLegendMarker> +#include <private/qlegendmarker_p.h> +#include <private/legendmarkeritem_p.h> +#include <private/chartpresenter_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/legendmarkeritem_p.h b/src/charts/legend/legendmarkeritem_p.h index 8c49b9d0..19c474cc 100644 --- a/src/charts/legend/legendmarkeritem_p.h +++ b/src/charts/legend/legendmarkeritem_p.h @@ -30,13 +30,13 @@ #ifndef LEGENDMARKERITEM_P_H #define LEGENDMARKERITEM_P_H -#include <qchartglobal.h> +#include <QtCharts/QChartGlobal> #include <QGraphicsObject> -#include <QFont> -#include <QBrush> -#include <QPen> -#include <QGraphicsTextItem> -#include <QGraphicsLayoutItem> +#include <QtGui/QFont> +#include <QtGui/QBrush> +#include <QtGui/QPen> +#include <QtWidgets/QGraphicsTextItem> +#include <QtWidgets/QGraphicsLayoutItem> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/legendscroller.cpp b/src/charts/legend/legendscroller.cpp index ac1784b3..f0c2aa67 100644 --- a/src/charts/legend/legendscroller.cpp +++ b/src/charts/legend/legendscroller.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include <QDebug> -#include <QGraphicsSceneMouseEvent> -#include <QGraphicsScene> -#include <QLegendMarker> -#include "qlegendmarker_p.h" -#include "legendmarkeritem_p.h" -#include "legendscroller_p.h" +#include <QtCore/QDebug> +#include <QtWidgets/QGraphicsSceneMouseEvent> +#include <QtWidgets/QGraphicsScene> +#include <QtCharts/QLegendMarker> +#include <private/qlegendmarker_p.h> +#include <private/legendmarkeritem_p.h> +#include <private/legendscroller_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/legendscroller_p.h b/src/charts/legend/legendscroller_p.h index 8ea63d78..9ce7c3ed 100644 --- a/src/charts/legend/legendscroller_p.h +++ b/src/charts/legend/legendscroller_p.h @@ -32,8 +32,8 @@ #define LEGENDSCROLLER_P_H #include <QtCharts/qlegend.h> -#include "qlegend_p.h" -#include "scroller_p.h" +#include <private/qlegend_p.h> +#include <private/scroller_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qarealegendmarker.cpp b/src/charts/legend/qarealegendmarker.cpp index 6e8a1d53..c6f88248 100644 --- a/src/charts/legend/qarealegendmarker.cpp +++ b/src/charts/legend/qarealegendmarker.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "qarealegendmarker.h" -#include "qarealegendmarker_p.h" -#include "qareaseries_p.h" -#include <QAreaSeries> +#include <QtCharts/QAreaLegendMarker> +#include <private/qarealegendmarker_p.h> +#include <private/qareaseries_p.h> +#include <QtCharts/QAreaSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qarealegendmarker.h b/src/charts/legend/qarealegendmarker.h index 687b4431..f16ef884 100644 --- a/src/charts/legend/qarealegendmarker.h +++ b/src/charts/legend/qarealegendmarker.h @@ -21,7 +21,7 @@ #ifndef QAREALEGENDMARKER_H #define QAREALEGENDMARKER_H -#include <QtCharts/qchartglobal.h> +#include <QtCharts/QChartGlobal> #include <QtCharts/QLegendMarker> #include <QtCharts/QAreaSeries> diff --git a/src/charts/legend/qarealegendmarker_p.h b/src/charts/legend/qarealegendmarker_p.h index 54d4e657..c2c86b84 100644 --- a/src/charts/legend/qarealegendmarker_p.h +++ b/src/charts/legend/qarealegendmarker_p.h @@ -30,10 +30,10 @@ #ifndef QAREALEGENDMARKER_P_H #define QAREALEGENDMARKER_P_H -#include "qchartglobal.h" -#include "qlegendmarker_p.h" -#include "legendmarkeritem_p.h" -#include <QAreaSeries> +#include <QtCharts/QChartGlobal> +#include <private/qlegendmarker_p.h> +#include <private/legendmarkeritem_p.h> +#include <QtCharts/QAreaSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qbarlegendmarker.cpp b/src/charts/legend/qbarlegendmarker.cpp index 710c4129..3417a016 100644 --- a/src/charts/legend/qbarlegendmarker.cpp +++ b/src/charts/legend/qbarlegendmarker.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "qbarlegendmarker.h" -#include "qbarlegendmarker_p.h" -#include <QAbstractBarSeries> -#include <QBarSet> +#include <QtCharts/QBarLegendMarker> +#include <private/qbarlegendmarker_p.h> +#include <QtCharts/QAbstractBarSeries> +#include <QtCharts/QBarSet> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qbarlegendmarker.h b/src/charts/legend/qbarlegendmarker.h index 4af967f7..f5a9af5c 100644 --- a/src/charts/legend/qbarlegendmarker.h +++ b/src/charts/legend/qbarlegendmarker.h @@ -20,7 +20,7 @@ #ifndef QBARLEGENDMARKER_H #define QBARLEGENDMARKER_H -#include <QtCharts/qchartglobal.h> +#include <QtCharts/QChartGlobal> #include <QtCharts/QLegendMarker> #include <QtCharts/QAbstractBarSeries> #include <QtCharts/QBarSet> diff --git a/src/charts/legend/qbarlegendmarker_p.h b/src/charts/legend/qbarlegendmarker_p.h index a42fd0fa..89bb00da 100644 --- a/src/charts/legend/qbarlegendmarker_p.h +++ b/src/charts/legend/qbarlegendmarker_p.h @@ -30,11 +30,11 @@ #ifndef QBARLEGENDMARKER_P_H #define QBARLEGENDMARKER_P_H -#include "qchartglobal.h" -#include "qlegendmarker_p.h" -#include "legendmarkeritem_p.h" -#include <QAbstractBarSeries> -#include <QBarSet> +#include <QtCharts/QChartGlobal> +#include <private/qlegendmarker_p.h> +#include <private/legendmarkeritem_p.h> +#include <QtCharts/QAbstractBarSeries> +#include <QtCharts/QBarSet> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qboxplotlegendmarker.cpp b/src/charts/legend/qboxplotlegendmarker.cpp index 53594737..c587c0f7 100644 --- a/src/charts/legend/qboxplotlegendmarker.cpp +++ b/src/charts/legend/qboxplotlegendmarker.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "qboxplotlegendmarker.h" -#include "qboxplotlegendmarker_p.h" -#include "qboxplotseries.h" -#include "qboxplotseries_p.h" +#include <QtCharts/QBoxPlotLegendMarker> +#include <private/qboxplotlegendmarker_p.h> +#include <QtCharts/QBoxPlotSeries> +#include <private/qboxplotseries_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qboxplotlegendmarker.h b/src/charts/legend/qboxplotlegendmarker.h index 49a5859a..6bfbbc74 100644 --- a/src/charts/legend/qboxplotlegendmarker.h +++ b/src/charts/legend/qboxplotlegendmarker.h @@ -21,7 +21,7 @@ #ifndef QBOXPLOTLEGENDMARKER_H #define QBOXPLOTLEGENDMARKER_H -#include <QtCharts/qchartglobal.h> +#include <QtCharts/QChartGlobal> #include <QtCharts/QLegendMarker> #include <QtCharts/QBoxPlotSeries> diff --git a/src/charts/legend/qboxplotlegendmarker_p.h b/src/charts/legend/qboxplotlegendmarker_p.h index cdabb688..7c10e03d 100644 --- a/src/charts/legend/qboxplotlegendmarker_p.h +++ b/src/charts/legend/qboxplotlegendmarker_p.h @@ -30,10 +30,10 @@ #ifndef QBOXPLOTLEGENDMARKER_P_H #define QBOXPLOTLEGENDMARKER_P_H -#include "qchartglobal.h" -#include "qlegendmarker_p.h" -#include "legendmarkeritem_p.h" -#include <QBoxPlotSeries> +#include <QtCharts/QChartGlobal> +#include <private/qlegendmarker_p.h> +#include <private/legendmarkeritem_p.h> +#include <QtCharts/QBoxPlotSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qlegend.cpp b/src/charts/legend/qlegend.cpp index ead1fac8..ee59e2eb 100644 --- a/src/charts/legend/qlegend.cpp +++ b/src/charts/legend/qlegend.cpp @@ -18,21 +18,21 @@ ** ****************************************************************************/ -#include "qlegend.h" -#include "qlegend_p.h" -#include "qabstractseries.h" -#include "qabstractseries_p.h" -#include "qchart_p.h" -#include "legendlayout_p.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" -#include "qlegendmarker.h" -#include "qlegendmarker_p.h" -#include "legendmarkeritem_p.h" -#include "chartdataset_p.h" -#include <QPainter> -#include <QPen> -#include <QGraphicsItemGroup> +#include <QtCharts/QLegend> +#include <private/qlegend_p.h> +#include <QtCharts/QAbstractSeries> +#include <private/qabstractseries_p.h> +#include <private/qchart_p.h> +#include <private/legendlayout_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractchartlayout_p.h> +#include <QtCharts/QLegendMarker> +#include <private/qlegendmarker_p.h> +#include <private/legendmarkeritem_p.h> +#include <private/chartdataset_p.h> +#include <QtGui/QPainter> +#include <QtGui/QPen> +#include <QtWidgets/QGraphicsItemGroup> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qlegend.h b/src/charts/legend/qlegend.h index c727e8f3..9c0a8d30 100644 --- a/src/charts/legend/qlegend.h +++ b/src/charts/legend/qlegend.h @@ -21,10 +21,10 @@ #ifndef QLEGEND_H #define QLEGEND_H -#include <QtCharts/qchartglobal.h> -#include <QGraphicsWidget> -#include <QPen> -#include <QBrush> +#include <QtCharts/QChartGlobal> +#include <QtWidgets/QGraphicsWidget> +#include <QtGui/QPen> +#include <QtGui/QBrush> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qlegend_p.h b/src/charts/legend/qlegend_p.h index 655825c6..e2398111 100644 --- a/src/charts/legend/qlegend_p.h +++ b/src/charts/legend/qlegend_p.h @@ -30,7 +30,7 @@ #ifndef QLEGEND_P_H #define QLEGEND_P_H -#include "qlegend.h" +#include <QtCharts/QLegend> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qlegendmarker.cpp b/src/charts/legend/qlegendmarker.cpp index e170cb4d..eeb010ca 100644 --- a/src/charts/legend/qlegendmarker.cpp +++ b/src/charts/legend/qlegendmarker.cpp @@ -18,15 +18,15 @@ ** ****************************************************************************/ -#include "qlegendmarker.h" -#include "qlegendmarker_p.h" -#include "legendmarkeritem_p.h" -#include "qlegend.h" -#include "qlegend_p.h" -#include "legendlayout_p.h" -#include <QFontMetrics> -#include <QGraphicsSceneEvent> -#include <QAbstractSeries> +#include <QtCharts/QLegendMarker> +#include <private/qlegendmarker_p.h> +#include <private/legendmarkeritem_p.h> +#include <QtCharts/QLegend> +#include <private/qlegend_p.h> +#include <private/legendlayout_p.h> +#include <QtGui/QFontMetrics> +#include <QtWidgets/QGraphicsSceneEvent> +#include <QtCharts/QAbstractSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qlegendmarker.h b/src/charts/legend/qlegendmarker.h index 0d683886..5be899e3 100644 --- a/src/charts/legend/qlegendmarker.h +++ b/src/charts/legend/qlegendmarker.h @@ -21,11 +21,11 @@ #ifndef QLEGENDMARKER_H #define QLEGENDMARKER_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 diff --git a/src/charts/legend/qlegendmarker_p.h b/src/charts/legend/qlegendmarker_p.h index 09e46f09..d3053f31 100644 --- a/src/charts/legend/qlegendmarker_p.h +++ b/src/charts/legend/qlegendmarker_p.h @@ -30,11 +30,11 @@ #ifndef QLEGENDMARKERPRIVATE_H #define QLEGENDMARKERPRIVATE_H -#include "qchartglobal.h" +#include <QtCharts/QChartGlobal> #include <QGraphicsObject> -#include <QBrush> -#include <QPen> -#include <QGraphicsLayoutItem> +#include <QtGui/QBrush> +#include <QtGui/QPen> +#include <QtWidgets/QGraphicsLayoutItem> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qpielegendmarker.cpp b/src/charts/legend/qpielegendmarker.cpp index e7bc7281..4c584a24 100644 --- a/src/charts/legend/qpielegendmarker.cpp +++ b/src/charts/legend/qpielegendmarker.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "qpielegendmarker.h" -#include "qpielegendmarker_p.h" -#include <QPieSeries> -#include <QPieSlice> +#include <QtCharts/QPieLegendMarker> +#include <private/qpielegendmarker_p.h> +#include <QtCharts/QPieSeries> +#include <QtCharts/QPieSlice> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qpielegendmarker.h b/src/charts/legend/qpielegendmarker.h index c40fcf3a..000bc8ba 100644 --- a/src/charts/legend/qpielegendmarker.h +++ b/src/charts/legend/qpielegendmarker.h @@ -21,7 +21,7 @@ #ifndef QPIELEGENDMARKER_H #define QPIELEGENDMARKER_H -#include <QtCharts/qchartglobal.h> +#include <QtCharts/QChartGlobal> #include <QtCharts/QLegendMarker> #include <QtCharts/QPieSeries> #include <QtCharts/QPieSlice> diff --git a/src/charts/legend/qpielegendmarker_p.h b/src/charts/legend/qpielegendmarker_p.h index 44faf50b..a79216a5 100644 --- a/src/charts/legend/qpielegendmarker_p.h +++ b/src/charts/legend/qpielegendmarker_p.h @@ -30,11 +30,11 @@ #ifndef QPIELEGENDMARKER_P_H #define QPIELEGENDMARKER_P_H -#include "qchartglobal.h" -#include "qlegendmarker_p.h" -#include "legendmarkeritem_p.h" -#include <QPieSeries> -#include <QPieSlice> +#include <QtCharts/QChartGlobal> +#include <private/qlegendmarker_p.h> +#include <private/legendmarkeritem_p.h> +#include <QtCharts/QPieSeries> +#include <QtCharts/QPieSlice> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qxylegendmarker.cpp b/src/charts/legend/qxylegendmarker.cpp index 711e74c6..91a4a6ae 100644 --- a/src/charts/legend/qxylegendmarker.cpp +++ b/src/charts/legend/qxylegendmarker.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "qxylegendmarker.h" -#include "qxylegendmarker_p.h" -#include "qxyseries_p.h" -#include <QXYSeries> +#include <QtCharts/QXYLegendMarker> +#include <private/qxylegendmarker_p.h> +#include <private/qxyseries_p.h> +#include <QtCharts/QXYSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/legend/qxylegendmarker.h b/src/charts/legend/qxylegendmarker.h index 24f0fa44..5c28f1de 100644 --- a/src/charts/legend/qxylegendmarker.h +++ b/src/charts/legend/qxylegendmarker.h @@ -21,7 +21,7 @@ #ifndef QXYLEGENDMARKER_H #define QXYLEGENDMARKER_H -#include <QtCharts/qchartglobal.h> +#include <QtCharts/QChartGlobal> #include <QtCharts/QLegendMarker> #include <QtCharts/QXYSeries> diff --git a/src/charts/legend/qxylegendmarker_p.h b/src/charts/legend/qxylegendmarker_p.h index 196d942f..b6eab38b 100644 --- a/src/charts/legend/qxylegendmarker_p.h +++ b/src/charts/legend/qxylegendmarker_p.h @@ -30,10 +30,10 @@ #ifndef QXYLEGENDMARKER_P_H #define QXYLEGENDMARKER_P_H -#include "qchartglobal.h" -#include "qlegendmarker_p.h" -#include "legendmarkeritem_p.h" -#include <QXYSeries> +#include <QtCharts/QChartGlobal> +#include <private/qlegendmarker_p.h> +#include <private/legendmarkeritem_p.h> +#include <QtCharts/QXYSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/linechart/linechartitem.cpp b/src/charts/linechart/linechartitem.cpp index 1a87342e..65582f32 100644 --- a/src/charts/linechart/linechartitem.cpp +++ b/src/charts/linechart/linechartitem.cpp @@ -18,15 +18,15 @@ ** ****************************************************************************/ -#include "linechartitem_p.h" -#include "qlineseries.h" -#include "qlineseries_p.h" -#include "chartpresenter_p.h" -#include "polardomain_p.h" -#include "chartthememanager_p.h" -#include "charttheme_p.h" -#include <QPainter> -#include <QGraphicsSceneMouseEvent> +#include <private/linechartitem_p.h> +#include <QtCharts/QLineSeries> +#include <private/qlineseries_p.h> +#include <private/chartpresenter_p.h> +#include <private/polardomain_p.h> +#include <private/chartthememanager_p.h> +#include <private/charttheme_p.h> +#include <QtGui/QPainter> +#include <QtWidgets/QGraphicsSceneMouseEvent> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/linechart/linechartitem_p.h b/src/charts/linechart/linechartitem_p.h index 08b304f2..337c4cc2 100644 --- a/src/charts/linechart/linechartitem_p.h +++ b/src/charts/linechart/linechartitem_p.h @@ -30,10 +30,10 @@ #ifndef LINECHARTITEM_H #define LINECHARTITEM_H -#include "qchartglobal.h" -#include "xychart_p.h" -#include "qchart.h" -#include <QPen> +#include <QtCharts/QChartGlobal> +#include <private/xychart_p.h> +#include <QtCharts/QChart> +#include <QtGui/QPen> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/linechart/qlineseries.cpp b/src/charts/linechart/qlineseries.cpp index b4171b9c..15728dbf 100644 --- a/src/charts/linechart/qlineseries.cpp +++ b/src/charts/linechart/qlineseries.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include "qlineseries.h" -#include "qlineseries_p.h" -#include "linechartitem_p.h" -#include "chartdataset_p.h" -#include "charttheme_p.h" -#include "qchart_p.h" +#include <QtCharts/QLineSeries> +#include <private/qlineseries_p.h> +#include <private/linechartitem_p.h> +#include <private/chartdataset_p.h> +#include <private/charttheme_p.h> +#include <private/qchart_p.h> QT_CHARTS_BEGIN_NAMESPACE /*! diff --git a/src/charts/linechart/qlineseries.h b/src/charts/linechart/qlineseries.h index 02303c11..f8a5f5b0 100644 --- a/src/charts/linechart/qlineseries.h +++ b/src/charts/linechart/qlineseries.h @@ -21,9 +21,9 @@ #ifndef QLINESERIES_H #define QLINESERIES_H -#include <QtCharts/qchartglobal.h> -#include <QtCharts/qxyseries.h> -#include <QPen> +#include <QtCharts/QChartGlobal> +#include <QtCharts/QXYSeries> +#include <QtGui/QPen> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/linechart/qlineseries_p.h b/src/charts/linechart/qlineseries_p.h index 4fc9b904..353430a1 100644 --- a/src/charts/linechart/qlineseries_p.h +++ b/src/charts/linechart/qlineseries_p.h @@ -30,7 +30,7 @@ #ifndef QLINESERIES_P_H #define QLINESERIES_P_H -#include "qxyseries_p.h" +#include <private/qxyseries_p.h> QT_CHARTS_BEGIN_NAMESPACE 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 */ diff --git a/src/charts/qabstractseries.cpp b/src/charts/qabstractseries.cpp index 1db799f2..75e70a6c 100644 --- a/src/charts/qabstractseries.cpp +++ b/src/charts/qabstractseries.cpp @@ -18,16 +18,16 @@ ** ****************************************************************************/ -#include "qabstractseries.h" -#include "qabstractseries_p.h" -#include "chartdataset_p.h" -#include "qchart.h" -#include "qchart_p.h" -#include "chartitem_p.h" -#include "xydomain_p.h" -#include "xlogydomain_p.h" -#include "logxydomain_p.h" -#include "logxlogydomain_p.h" +#include <QtCharts/QAbstractSeries> +#include <private/qabstractseries_p.h> +#include <private/chartdataset_p.h> +#include <QtCharts/QChart> +#include <private/qchart_p.h> +#include <private/chartitem_p.h> +#include <private/xydomain_p.h> +#include <private/xlogydomain_p.h> +#include <private/logxydomain_p.h> +#include <private/logxlogydomain_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/qabstractseries.h b/src/charts/qabstractseries.h index 43e726ac..cf1648aa 100644 --- a/src/charts/qabstractseries.h +++ b/src/charts/qabstractseries.h @@ -21,10 +21,10 @@ #ifndef QABSTRACTSERIES_H #define QABSTRACTSERIES_H -#include <QtCharts/qchartglobal.h> -#include <QtCharts/qabstractaxis.h> -#include <QObject> -#include <QPen> +#include <QtCharts/QChartGlobal> +#include <QtCharts/QAbstractAxis> +#include <QtCore/QObject> +#include <QtGui/QPen> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/qabstractseries_p.h b/src/charts/qabstractseries_p.h index 3668829d..a53ef98b 100644 --- a/src/charts/qabstractseries_p.h +++ b/src/charts/qabstractseries_p.h @@ -30,9 +30,9 @@ #ifndef QABSTRACTSERIES_P_H #define QABSTRACTSERIES_P_H -#include "qabstractseries.h" -#include "qchart.h" -#include "abstractdomain_p.h" +#include <QtCharts/QAbstractSeries> +#include <QtCharts/QChart> +#include <private/abstractdomain_p.h> class QGraphicsItem; diff --git a/src/charts/qchart.cpp b/src/charts/qchart.cpp index 9f26ffee..69584a82 100644 --- a/src/charts/qchart.cpp +++ b/src/charts/qchart.cpp @@ -18,17 +18,17 @@ ** ****************************************************************************/ -#include "qchart.h" -#include "qchart_p.h" -#include "legendscroller_p.h" -#include "qlegend_p.h" -#include "chartbackground_p.h" -#include "qabstractaxis.h" -#include "abstractchartlayout_p.h" -#include "charttheme_p.h" -#include "chartpresenter_p.h" -#include "chartdataset_p.h" -#include <QGraphicsScene> +#include <QtCharts/QChart> +#include <private/qchart_p.h> +#include <private/legendscroller_p.h> +#include <private/qlegend_p.h> +#include <private/chartbackground_p.h> +#include <QtCharts/QAbstractAxis> +#include <private/abstractchartlayout_p.h> +#include <private/charttheme_p.h> +#include <private/chartpresenter_p.h> +#include <private/chartdataset_p.h> +#include <QtWidgets/QGraphicsScene> #include <QGraphicsSceneResizeEvent> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/qchart.h b/src/charts/qchart.h index 9e8c869d..40712c5d 100644 --- a/src/charts/qchart.h +++ b/src/charts/qchart.h @@ -23,8 +23,8 @@ #include <QtCharts/QAbstractSeries> #include <QtCharts/QLegend> -#include <QGraphicsWidget> -#include <QMargins> +#include <QtWidgets/QGraphicsWidget> +#include <QtCore/QMargins> class QGraphicsSceneResizeEvent; diff --git a/src/charts/qchart_p.h b/src/charts/qchart_p.h index e43ae07d..c9579fc4 100644 --- a/src/charts/qchart_p.h +++ b/src/charts/qchart_p.h @@ -30,8 +30,8 @@ #ifndef QCHART_P_H #define QCHART_P_H -#include "qchartglobal.h" -#include "qchart.h" +#include <QtCharts/QChartGlobal> +#include <QtCharts/QChart> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/qchartglobal.h b/src/charts/qchartglobal.h index ade1942e..9a79a92a 100644 --- a/src/charts/qchartglobal.h +++ b/src/charts/qchartglobal.h @@ -21,7 +21,7 @@ #ifndef QCHARTGLOBAL_H #define QCHARTGLOBAL_H -#include <qglobal.h> +#include <QtCore/QtGlobal> #define QT_CHARTS_VERSION_STR "2.0.0" /* diff --git a/src/charts/qchartview.cpp b/src/charts/qchartview.cpp index 234ef080..81211d2b 100644 --- a/src/charts/qchartview.cpp +++ b/src/charts/qchartview.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include "qchartview.h" -#include "qchartview_p.h" -#include "qchart_p.h" -#include <QGraphicsScene> -#include <QRubberBand> +#include <QtCharts/QChartView> +#include <private/qchartview_p.h> +#include <private/qchart_p.h> +#include <QtWidgets/QGraphicsScene> +#include <QtWidgets/QRubberBand> /*! \enum QChartView::RubberBand diff --git a/src/charts/qchartview.h b/src/charts/qchartview.h index 89aca5d4..499392cd 100644 --- a/src/charts/qchartview.h +++ b/src/charts/qchartview.h @@ -24,7 +24,7 @@ #include <QtCharts/QAbstractAxis> #include <QtCharts/QAbstractSeries> #include <QtCharts/QChart> -#include <QGraphicsView> +#include <QtWidgets/QGraphicsView> class QGraphicsScene; class QRubberBand; diff --git a/src/charts/qchartview_p.h b/src/charts/qchartview_p.h index a6103de6..04a42844 100644 --- a/src/charts/qchartview_p.h +++ b/src/charts/qchartview_p.h @@ -30,7 +30,7 @@ #ifndef QCHARTVIEW_P_H #define QCHARTVIEW_P_H -#include "qchartview.h" +#include <QtCharts/QChartView> class QGraphicsScene; class ChartPresenter; diff --git a/src/charts/qpolarchart.cpp b/src/charts/qpolarchart.cpp index b8ad49ee..241eb15e 100644 --- a/src/charts/qpolarchart.cpp +++ b/src/charts/qpolarchart.cpp @@ -18,8 +18,8 @@ ** ****************************************************************************/ -#include "qpolarchart.h" -#include "qabstractaxis.h" +#include <QtCharts/QPolarChart> +#include <QtCharts/QAbstractAxis> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/qpolarchart.h b/src/charts/qpolarchart.h index e9512525..c50f2e85 100644 --- a/src/charts/qpolarchart.h +++ b/src/charts/qpolarchart.h @@ -21,7 +21,7 @@ #ifndef QPOLARCHART_H #define QPOLARCHART_H -#include <QtCharts/qchart.h> +#include <QtCharts/QChart> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/scatterchart/qscatterseries.cpp b/src/charts/scatterchart/qscatterseries.cpp index 346ca83b..68edc920 100644 --- a/src/charts/scatterchart/qscatterseries.cpp +++ b/src/charts/scatterchart/qscatterseries.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "qscatterseries.h" -#include "qscatterseries_p.h" -#include "scatterchartitem_p.h" -#include "chartdataset_p.h" -#include "charttheme_p.h" -#include "scatteranimation_p.h" -#include "qchart_p.h" +#include <QtCharts/QScatterSeries> +#include <private/qscatterseries_p.h> +#include <private/scatterchartitem_p.h> +#include <private/chartdataset_p.h> +#include <private/charttheme_p.h> +#include <private/scatteranimation_p.h> +#include <private/qchart_p.h> /*! \class QScatterSeries diff --git a/src/charts/scatterchart/qscatterseries.h b/src/charts/scatterchart/qscatterseries.h index d7f9504a..af02974a 100644 --- a/src/charts/scatterchart/qscatterseries.h +++ b/src/charts/scatterchart/qscatterseries.h @@ -21,7 +21,7 @@ #ifndef QSCATTERSERIES_H #define QSCATTERSERIES_H -#include <QtCharts/qchartglobal.h> +#include <QtCharts/QChartGlobal> #include <QtCharts/qxyseries.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/scatterchart/qscatterseries_p.h b/src/charts/scatterchart/qscatterseries_p.h index 69e91655..59e04f3b 100644 --- a/src/charts/scatterchart/qscatterseries_p.h +++ b/src/charts/scatterchart/qscatterseries_p.h @@ -30,7 +30,7 @@ #ifndef QSCATTERSERIES_P_H #define QSCATTERSERIES_P_H -#include "qxyseries_p.h" +#include <private/qxyseries_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/scatterchart/scatterchartitem.cpp b/src/charts/scatterchart/scatterchartitem.cpp index 597d5d52..42bced1e 100644 --- a/src/charts/scatterchart/scatterchartitem.cpp +++ b/src/charts/scatterchart/scatterchartitem.cpp @@ -18,16 +18,16 @@ ** ****************************************************************************/ -#include "scatterchartitem_p.h" -#include "qscatterseries.h" -#include "qscatterseries_p.h" -#include "chartpresenter_p.h" -#include "abstractdomain_p.h" -#include "qchart.h" -#include <QPainter> -#include <QGraphicsScene> -#include <QDebug> -#include <QGraphicsSceneMouseEvent> +#include <private/scatterchartitem_p.h> +#include <QtCharts/QScatterSeries> +#include <private/qscatterseries_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractdomain_p.h> +#include <QtCharts/QChart> +#include <QtGui/QPainter> +#include <QtWidgets/QGraphicsScene> +#include <QtCore/QDebug> +#include <QtWidgets/QGraphicsSceneMouseEvent> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/scatterchart/scatterchartitem_p.h b/src/charts/scatterchart/scatterchartitem_p.h index 3c18546e..7e27b1c1 100644 --- a/src/charts/scatterchart/scatterchartitem_p.h +++ b/src/charts/scatterchart/scatterchartitem_p.h @@ -30,10 +30,10 @@ #ifndef SCATTERCHARTITEM_H #define SCATTERCHARTITEM_H -#include "qchartglobal.h" -#include "xychart_p.h" -#include <QGraphicsEllipseItem> -#include <QPen> +#include <QtCharts/QChartGlobal> +#include <private/xychart_p.h> +#include <QtWidgets/QGraphicsEllipseItem> +#include <QtGui/QPen> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/scroller.cpp b/src/charts/scroller.cpp index add8f92a..28965c48 100644 --- a/src/charts/scroller.cpp +++ b/src/charts/scroller.cpp @@ -18,10 +18,10 @@ ** ****************************************************************************/ -#include "scroller_p.h" -#include "qlegend.h" -#include <QGraphicsSceneMouseEvent> -#include <QDebug> +#include <private/scroller_p.h> +#include <QtCharts/QLegend> +#include <QtWidgets/QGraphicsSceneMouseEvent> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/scroller_p.h b/src/charts/scroller_p.h index 35258fc7..0c669f33 100644 --- a/src/charts/scroller_p.h +++ b/src/charts/scroller_p.h @@ -30,10 +30,10 @@ #ifndef SCROLLER_P_H #define SCROLLER_P_H -#include "qchartglobal.h" -#include <QBasicTimer> -#include <QTime> -#include <QPointF> +#include <QtCharts/QChartGlobal> +#include <QtCore/QBasicTimer> +#include <QtCore/QTime> +#include <QtCore/QPointF> class QGraphicsSceneMouseEvent; diff --git a/src/charts/splinechart/qsplineseries.cpp b/src/charts/splinechart/qsplineseries.cpp index 2ac5cabf..f55002b3 100644 --- a/src/charts/splinechart/qsplineseries.cpp +++ b/src/charts/splinechart/qsplineseries.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "qsplineseries.h" -#include "qsplineseries_p.h" -#include "splinechartitem_p.h" -#include "chartdataset_p.h" -#include "charttheme_p.h" -#include "splineanimation_p.h" -#include "qchart_p.h" +#include <QtCharts/QSplineSeries> +#include <private/qsplineseries_p.h> +#include <private/splinechartitem_p.h> +#include <private/chartdataset_p.h> +#include <private/charttheme_p.h> +#include <private/splineanimation_p.h> +#include <private/qchart_p.h> /*! \class QSplineSeries diff --git a/src/charts/splinechart/qsplineseries.h b/src/charts/splinechart/qsplineseries.h index a427f02c..ae8c4f5e 100644 --- a/src/charts/splinechart/qsplineseries.h +++ b/src/charts/splinechart/qsplineseries.h @@ -21,11 +21,11 @@ #ifndef QSPLINESERIES_H #define QSPLINESERIES_H -#include <QtCharts/qchartglobal.h> +#include <QtCharts/QChartGlobal> #include <QtCharts/qlineseries.h> -#include <QList> -#include <QPointF> -#include <QtGlobal> +#include <QtCore/QList> +#include <QtCore/QPointF> +#include <QtCore/QtGlobal> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/splinechart/qsplineseries_p.h b/src/charts/splinechart/qsplineseries_p.h index 9a786009..2b3ce631 100644 --- a/src/charts/splinechart/qsplineseries_p.h +++ b/src/charts/splinechart/qsplineseries_p.h @@ -30,7 +30,7 @@ #ifndef QSPLINESERIES_P_H #define QSPLINESERIES_P_H -#include "qlineseries_p.h" +#include <private/qlineseries_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/splinechart/splinechartitem.cpp b/src/charts/splinechart/splinechartitem.cpp index d47cd7ce..1365b2a8 100644 --- a/src/charts/splinechart/splinechartitem.cpp +++ b/src/charts/splinechart/splinechartitem.cpp @@ -18,13 +18,13 @@ ** ****************************************************************************/ -#include "splinechartitem_p.h" -#include "qsplineseries_p.h" -#include "chartpresenter_p.h" -#include "splineanimation_p.h" -#include "polardomain_p.h" -#include <QPainter> -#include <QGraphicsSceneMouseEvent> +#include <private/splinechartitem_p.h> +#include <private/qsplineseries_p.h> +#include <private/chartpresenter_p.h> +#include <private/splineanimation_p.h> +#include <private/polardomain_p.h> +#include <QtGui/QPainter> +#include <QtWidgets/QGraphicsSceneMouseEvent> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/splinechart/splinechartitem_p.h b/src/charts/splinechart/splinechartitem_p.h index ac323e59..d556c757 100644 --- a/src/charts/splinechart/splinechartitem_p.h +++ b/src/charts/splinechart/splinechartitem_p.h @@ -30,8 +30,8 @@ #ifndef SPLINECHARTITEM_P_H #define SPLINECHARTITEM_P_H -#include "qsplineseries.h" -#include "xychart_p.h" +#include <QtCharts/QSplineSeries> +#include <private/xychart_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/themes/charttheme_p.h b/src/charts/themes/charttheme_p.h index 58510bd7..9aa374a3 100644 --- a/src/charts/themes/charttheme_p.h +++ b/src/charts/themes/charttheme_p.h @@ -30,9 +30,9 @@ #ifndef CHARTTHEME_H #define CHARTTHEME_H -#include "chartthememanager_p.h" -#include <QColor> -#include <QGradientStops> +#include <private/chartthememanager_p.h> +#include <QtGui/QColor> +#include <QtGui/QGradientStops> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/themes/chartthemebluecerulean_p.h b/src/charts/themes/chartthemebluecerulean_p.h index 83f1441a..c9932b27 100644 --- a/src/charts/themes/chartthemebluecerulean_p.h +++ b/src/charts/themes/chartthemebluecerulean_p.h @@ -30,7 +30,7 @@ #ifndef CHARTTHEMEBLUECERULEAN_P_H #define CHARTTHEMEBLUECERULEAN_P_H -#include "charttheme_p.h" +#include <private/charttheme_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/themes/chartthemeblueicy_p.h b/src/charts/themes/chartthemeblueicy_p.h index 6dc6c9c4..dd190eb4 100644 --- a/src/charts/themes/chartthemeblueicy_p.h +++ b/src/charts/themes/chartthemeblueicy_p.h @@ -30,7 +30,7 @@ #ifndef CHARTTHEMEBLUEICY_P_H #define CHARTTHEMEBLUEICY_P_H -#include "charttheme_p.h" +#include <private/charttheme_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/themes/chartthemebluencs_p.h b/src/charts/themes/chartthemebluencs_p.h index 7806fd02..2264e5c5 100644 --- a/src/charts/themes/chartthemebluencs_p.h +++ b/src/charts/themes/chartthemebluencs_p.h @@ -30,7 +30,7 @@ #ifndef CHARTTHEMEBLUENCS_P_H #define CHARTTHEMEBLUENCS_P_H -#include "charttheme_p.h" +#include <private/charttheme_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/themes/chartthemebrownsand_p.h b/src/charts/themes/chartthemebrownsand_p.h index 9a980855..a25c0714 100644 --- a/src/charts/themes/chartthemebrownsand_p.h +++ b/src/charts/themes/chartthemebrownsand_p.h @@ -30,7 +30,7 @@ #ifndef CHARTTHEMEBROWNSAND_P_H #define CHARTTHEMEBROWNSAND_P_H -#include "charttheme_p.h" +#include <private/charttheme_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/themes/chartthemedark_p.h b/src/charts/themes/chartthemedark_p.h index 6ad3eaf7..41448f79 100644 --- a/src/charts/themes/chartthemedark_p.h +++ b/src/charts/themes/chartthemedark_p.h @@ -30,7 +30,7 @@ #ifndef CHARTTHEMEDARK_P_H #define CHARTTHEMEDARK_P_H -#include "charttheme_p.h" +#include <private/charttheme_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/themes/chartthemehighcontrast_p.h b/src/charts/themes/chartthemehighcontrast_p.h index 353cc659..1fbab0ec 100644 --- a/src/charts/themes/chartthemehighcontrast_p.h +++ b/src/charts/themes/chartthemehighcontrast_p.h @@ -30,7 +30,7 @@ #ifndef CHARTTHEMEHIGHCONTRAST_P_H #define CHARTTHEMEHIGHCONTRAST_P_H -#include "charttheme_p.h" +#include <private/charttheme_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/themes/chartthemelight_p.h b/src/charts/themes/chartthemelight_p.h index 161c3567..6cf20bfe 100644 --- a/src/charts/themes/chartthemelight_p.h +++ b/src/charts/themes/chartthemelight_p.h @@ -30,7 +30,7 @@ #ifndef CHARTTHEMELIGHT_P_H #define CHARTTHEMELIGHT_P_H -#include "charttheme_p.h" +#include <private/charttheme_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/themes/chartthemeqt_p.h b/src/charts/themes/chartthemeqt_p.h index 06c10eee..865aca8e 100644 --- a/src/charts/themes/chartthemeqt_p.h +++ b/src/charts/themes/chartthemeqt_p.h @@ -30,7 +30,7 @@ #ifndef CHARTTHEMEQT_P_H #define CHARTTHEMEQT_P_H -#include "charttheme_p.h" +#include <private/charttheme_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/themes/chartthemesystem_p.h b/src/charts/themes/chartthemesystem_p.h index 8d99d5b1..2698c0a4 100644 --- a/src/charts/themes/chartthemesystem_p.h +++ b/src/charts/themes/chartthemesystem_p.h @@ -30,7 +30,7 @@ #ifndef CHARTTHEMESYSTEM_P_H #define CHARTTHEMESYSTEM_P_H -#include "charttheme_p.h" +#include <private/charttheme_p.h> #ifdef Q_OS_WIN #include <windows.h> #include <stdio.h> diff --git a/src/charts/xychart/qhxymodelmapper.cpp b/src/charts/xychart/qhxymodelmapper.cpp index 4edc8aeb..f8054709 100644 --- a/src/charts/xychart/qhxymodelmapper.cpp +++ b/src/charts/xychart/qhxymodelmapper.cpp @@ -18,7 +18,7 @@ ** ****************************************************************************/ -#include "qhxymodelmapper.h" +#include <QtCharts/QHXYModelMapper> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/xychart/qvxymodelmapper.cpp b/src/charts/xychart/qvxymodelmapper.cpp index 6ede138e..b01929e9 100644 --- a/src/charts/xychart/qvxymodelmapper.cpp +++ b/src/charts/xychart/qvxymodelmapper.cpp @@ -18,7 +18,7 @@ ** ****************************************************************************/ -#include "qvxymodelmapper.h" +#include <QtCharts/QVXYModelMapper> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/xychart/qxymodelmapper.cpp b/src/charts/xychart/qxymodelmapper.cpp index 3907326d..b2ed7378 100644 --- a/src/charts/xychart/qxymodelmapper.cpp +++ b/src/charts/xychart/qxymodelmapper.cpp @@ -18,11 +18,11 @@ ** ****************************************************************************/ -#include "qxymodelmapper.h" -#include "qxymodelmapper_p.h" -#include "qxyseries.h" -#include <QAbstractItemModel> -#include <QDateTime> +#include <QtCharts/QXYModelMapper> +#include <private/qxymodelmapper_p.h> +#include <QtCharts/QXYSeries> +#include <QtCore/QAbstractItemModel> +#include <QtCore/QDateTime> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/xychart/qxymodelmapper.h b/src/charts/xychart/qxymodelmapper.h index 0cb6c11a..bddf1ead 100644 --- a/src/charts/xychart/qxymodelmapper.h +++ b/src/charts/xychart/qxymodelmapper.h @@ -21,8 +21,8 @@ #ifndef QXYMODELMAPPER_H #define QXYMODELMAPPER_H -#include <QtCharts/qchartglobal.h> -#include <QObject> +#include <QtCharts/QChartGlobal> +#include <QtCore/QObject> class QAbstractItemModel; diff --git a/src/charts/xychart/qxymodelmapper_p.h b/src/charts/xychart/qxymodelmapper_p.h index 390dcaf7..60afebd1 100644 --- a/src/charts/xychart/qxymodelmapper_p.h +++ b/src/charts/xychart/qxymodelmapper_p.h @@ -30,8 +30,8 @@ #ifndef QXYMODELMAPPER_P_H #define QXYMODELMAPPER_P_H -#include "qxymodelmapper.h" -#include <QObject> +#include <QtCharts/QXYModelMapper> +#include <QtCore/QObject> class QModelIndex; class QAbstractItemModel; diff --git a/src/charts/xychart/qxyseries.cpp b/src/charts/xychart/qxyseries.cpp index 6805a1c7..44371ae9 100644 --- a/src/charts/xychart/qxyseries.cpp +++ b/src/charts/xychart/qxyseries.cpp @@ -18,15 +18,15 @@ ** ****************************************************************************/ -#include "qxyseries.h" -#include "qxyseries_p.h" -#include "abstractdomain_p.h" -#include "qvalueaxis.h" -#include "xychart_p.h" -#include "qxylegendmarker.h" -#include "charthelpers_p.h" -#include "qchart_p.h" -#include <QPainter> +#include <QtCharts/QXYSeries> +#include <private/qxyseries_p.h> +#include <private/abstractdomain_p.h> +#include <QtCharts/QValueAxis> +#include <private/xychart_p.h> +#include <QtCharts/QXYLegendMarker> +#include <private/charthelpers_p.h> +#include <private/qchart_p.h> +#include <QtGui/QPainter> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/xychart/qxyseries.h b/src/charts/xychart/qxyseries.h index 4c73bf07..857d9ba7 100644 --- a/src/charts/xychart/qxyseries.h +++ b/src/charts/xychart/qxyseries.h @@ -21,10 +21,10 @@ #ifndef QXYSERIES_H #define QXYSERIES_H -#include <QtCharts/qchartglobal.h> -#include <QtCharts/qabstractseries.h> -#include <QPen> -#include <QBrush> +#include <QtCharts/QChartGlobal> +#include <QtCharts/QAbstractSeries> +#include <QtGui/QPen> +#include <QtGui/QBrush> class QModelIndex; diff --git a/src/charts/xychart/qxyseries_p.h b/src/charts/xychart/qxyseries_p.h index cee78a08..b3cd6622 100644 --- a/src/charts/xychart/qxyseries_p.h +++ b/src/charts/xychart/qxyseries_p.h @@ -30,7 +30,7 @@ #ifndef QXYSERIES_P_H #define QXYSERIES_P_H -#include "qabstractseries_p.h" +#include <private/qabstractseries_p.h> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/xychart/xychart.cpp b/src/charts/xychart/xychart.cpp index 18347d26..bd656b0b 100644 --- a/src/charts/xychart/xychart.cpp +++ b/src/charts/xychart/xychart.cpp @@ -18,15 +18,15 @@ ** ****************************************************************************/ -#include "xychart_p.h" -#include "qxyseries.h" -#include "qxyseries_p.h" -#include "chartpresenter_p.h" -#include "abstractdomain_p.h" -#include "qxymodelmapper.h" -#include "qabstractaxis_p.h" -#include <QPainter> -#include <QAbstractItemModel> +#include <private/xychart_p.h> +#include <QtCharts/QXYSeries> +#include <private/qxyseries_p.h> +#include <private/chartpresenter_p.h> +#include <private/abstractdomain_p.h> +#include <QtCharts/QXYModelMapper> +#include <private/qabstractaxis_p.h> +#include <QtGui/QPainter> +#include <QtCore/QAbstractItemModel> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/xychart/xychart_p.h b/src/charts/xychart/xychart_p.h index 78689045..7f99e058 100644 --- a/src/charts/xychart/xychart_p.h +++ b/src/charts/xychart/xychart_p.h @@ -30,11 +30,11 @@ #ifndef XYCHART_H #define XYCHART_H -#include <qchartglobal.h> -#include "chartitem_p.h" -#include "xyanimation_p.h" -#include "qvalueaxis.h" -#include <QPen> +#include <QtCharts/QChartGlobal> +#include <private/chartitem_p.h> +#include <private/xyanimation_p.h> +#include <QtCharts/QValueAxis> +#include <QtGui/QPen> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/chartsqml2.pro b/src/chartsqml2/chartsqml2.pro index 8fc6e92d..d9f02da9 100644 --- a/src/chartsqml2/chartsqml2.pro +++ b/src/chartsqml2/chartsqml2.pro @@ -1,7 +1,7 @@ TARGET = qtchartsqml2 QT += qml quick -QT += charts +QT += charts charts-private TARGETPATH = QtCharts IMPORT_VERSION = $$MODULE_VERSION diff --git a/src/chartsqml2/chartsqml2_plugin.cpp b/src/chartsqml2/chartsqml2_plugin.cpp index 477f088c..8540b5d2 100644 --- a/src/chartsqml2/chartsqml2_plugin.cpp +++ b/src/chartsqml2/chartsqml2_plugin.cpp @@ -18,12 +18,12 @@ ** ****************************************************************************/ -#include "qchart.h" -#include "qabstractaxis.h" -#include "qvalueaxis.h" -#include "qlogvalueaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QAbstractAxis> +#include <QtCharts/QValueAxis> +#include <QtCharts/QLogValueAxis> #include "declarativecategoryaxis.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QBarCategoryAxis> #include "declarativechart.h" #include "declarativepolarchart.h" #include "declarativexypoint.h" @@ -35,23 +35,23 @@ #include "declarativeboxplotseries.h" #include "declarativepieseries.h" #include "declarativeaxes.h" -#include "qvxymodelmapper.h" -#include "qhxymodelmapper.h" -#include "qhpiemodelmapper.h" -#include "qvpiemodelmapper.h" -#include "qhbarmodelmapper.h" -#include "qvbarmodelmapper.h" +#include <QtCharts/QVXYModelMapper> +#include <QtCharts/QHXYModelMapper> +#include <QtCharts/QHPieModelMapper> +#include <QtCharts/QVPieModelMapper> +#include <QtCharts/QHBarModelMapper> +#include <QtCharts/QVBarModelMapper> #include "declarativemargins.h" -#include "qarealegendmarker.h" -#include "qbarlegendmarker.h" -#include "qpielegendmarker.h" -#include "qxylegendmarker.h" -#include "qboxplotmodelmapper.h" -#include "qvboxplotmodelmapper.h" +#include <QtCharts/QAreaLegendMarker> +#include <QtCharts/QBarLegendMarker> +#include <QtCharts/QPieLegendMarker> +#include <QtCharts/QXYLegendMarker> +#include <QtCharts/QBoxPlotModelMapper> +#include <QtCharts/QVBoxPlotModelMapper> #ifndef QT_ON_ARM - #include "qdatetimeaxis.h" + #include <QtCharts/QDateTimeAxis> #endif -#include <QAbstractItemModel> +#include <QtCore/QAbstractItemModel> #include <QtQml> QT_CHARTS_USE_NAMESPACE diff --git a/src/chartsqml2/declarativeareaseries.h b/src/chartsqml2/declarativeareaseries.h index 7072ff07..57d069ac 100644 --- a/src/chartsqml2/declarativeareaseries.h +++ b/src/chartsqml2/declarativeareaseries.h @@ -21,7 +21,7 @@ #ifndef DECLARATIVEAREASERIES_H #define DECLARATIVEAREASERIES_H -#include "qareaseries.h" +#include <QtCharts/QAreaSeries> #include "declarativeaxes.h" QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativeaxes.cpp b/src/chartsqml2/declarativeaxes.cpp index 9c6d9ad8..4769a391 100644 --- a/src/chartsqml2/declarativeaxes.cpp +++ b/src/chartsqml2/declarativeaxes.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "declarativeaxes.h" -#include "qabstractaxis.h" +#include <QtCharts/QAbstractAxis> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativeaxes.h b/src/chartsqml2/declarativeaxes.h index 6e7d2346..6654dbe6 100644 --- a/src/chartsqml2/declarativeaxes.h +++ b/src/chartsqml2/declarativeaxes.h @@ -21,8 +21,8 @@ #ifndef DECLARATIVEAXES_H #define DECLARATIVEAXES_H -#include "qchartglobal.h" -#include <QObject> +#include <QtCharts/QChartGlobal> +#include <QtCore/QObject> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativebarseries.cpp b/src/chartsqml2/declarativebarseries.cpp index b773eb7b..d5216ced 100644 --- a/src/chartsqml2/declarativebarseries.cpp +++ b/src/chartsqml2/declarativebarseries.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "declarativebarseries.h" -#include "qbarset.h" -#include "qvbarmodelmapper.h" -#include "qhbarmodelmapper.h" +#include <QtCharts/QBarSet> +#include <QtCharts/QVBarModelMapper> +#include <QtCharts/QHBarModelMapper> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativebarseries.h b/src/chartsqml2/declarativebarseries.h index 6c3b6d89..0ca2127e 100644 --- a/src/chartsqml2/declarativebarseries.h +++ b/src/chartsqml2/declarativebarseries.h @@ -21,13 +21,13 @@ #ifndef DECLARATIVEBARSERIES_H #define DECLARATIVEBARSERIES_H -#include "qbarseries.h" -#include "qstackedbarseries.h" -#include "qpercentbarseries.h" -#include "qhorizontalbarseries.h" -#include "qhorizontalstackedbarseries.h" -#include "qhorizontalpercentbarseries.h" -#include "qbarset.h" +#include <QtCharts/QBarSeries> +#include <QtCharts/QStackedBarSeries> +#include <QtCharts/QPercentBarSeries> +#include <QtCharts/QHorizontalBarSeries> +#include <QtCharts/QHorizontalStackedBarSeries> +#include <QtCharts/QHorizontalPercentBarSeries> +#include <QtCharts/QBarSet> #include "declarativeaxes.h" #include <QtQuick/QQuickItem> diff --git a/src/chartsqml2/declarativeboxplotseries.cpp b/src/chartsqml2/declarativeboxplotseries.cpp index 101dab58..885012a3 100644 --- a/src/chartsqml2/declarativeboxplotseries.cpp +++ b/src/chartsqml2/declarativeboxplotseries.cpp @@ -20,8 +20,8 @@ #include "declarativebarseries.h" #include "declarativeboxplotseries.h" -#include "qboxset.h" -#include "qvboxplotmodelmapper.h" +#include <QtCharts/QBoxSet> +#include <QtCharts/QVBoxPlotModelMapper> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativeboxplotseries.h b/src/chartsqml2/declarativeboxplotseries.h index 10dab699..64bb2336 100644 --- a/src/chartsqml2/declarativeboxplotseries.h +++ b/src/chartsqml2/declarativeboxplotseries.h @@ -21,9 +21,9 @@ #ifndef DECLARATIVEBOXPLOT_H #define DECLARATIVEBOXPLOT_H -#include "qboxset.h" +#include <QtCharts/QBoxSet> #include "declarativeaxes.h" -#include "qboxplotseries.h" +#include <QtCharts/QBoxPlotSeries> #include <QtQuick/QQuickItem> #include <QtQml/QQmlParserStatus> diff --git a/src/chartsqml2/declarativecategoryaxis.cpp b/src/chartsqml2/declarativecategoryaxis.cpp index 423aab67..ab93d927 100644 --- a/src/chartsqml2/declarativecategoryaxis.cpp +++ b/src/chartsqml2/declarativecategoryaxis.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "declarativecategoryaxis.h" -#include <QDebug> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativecategoryaxis.h b/src/chartsqml2/declarativecategoryaxis.h index 3a6dda95..4f15fd0a 100644 --- a/src/chartsqml2/declarativecategoryaxis.h +++ b/src/chartsqml2/declarativecategoryaxis.h @@ -21,7 +21,7 @@ #ifndef DECLARATIVECATEGORYAXIS_H #define DECLARATIVECATEGORYAXIS_H -#include "qcategoryaxis.h" +#include <QtCharts/QCategoryAxis> #include <QtQml/QQmlListProperty> #include <QtQml/QQmlParserStatus> diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp index d2044ed0..8f67f2e8 100644 --- a/src/chartsqml2/declarativechart.cpp +++ b/src/chartsqml2/declarativechart.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "declarativechart.h" -#include <QPainter> +#include <QtGui/QPainter> #include "declarativelineseries.h" #include "declarativeareaseries.h" #include "declarativebarseries.h" @@ -27,26 +27,26 @@ #include "declarativesplineseries.h" #include "declarativeboxplotseries.h" #include "declarativescatterseries.h" -#include "qbarcategoryaxis.h" -#include "qvalueaxis.h" -#include "qlogvalueaxis.h" -#include "qcategoryaxis.h" -#include "qabstractseries_p.h" +#include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QValueAxis> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QCategoryAxis> +#include <private/qabstractseries_p.h> #include "declarativemargins.h" -#include "chartdataset_p.h" +#include <private/chartdataset_p.h> #include "declarativeaxes.h" -#include "qchart_p.h" -#include "qpolarchart.h" +#include <private/qchart_p.h> +#include <QtCharts/QPolarChart> #ifndef QT_ON_ARM - #include "qdatetimeaxis.h" + #include <QtCharts/QDateTimeAxis> #endif -#include <QGraphicsSceneMouseEvent> -#include <QGraphicsSceneHoverEvent> -#include <QApplication> -#include <QTimer> -#include <QThread> +#include <QtWidgets/QGraphicsSceneMouseEvent> +#include <QtWidgets/QGraphicsSceneHoverEvent> +#include <QtWidgets/QApplication> +#include <QtCore/QTimer> +#include <QtCore/QThread> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativechart.h b/src/chartsqml2/declarativechart.h index b9936eb6..f425e056 100644 --- a/src/chartsqml2/declarativechart.h +++ b/src/chartsqml2/declarativechart.h @@ -27,7 +27,7 @@ #include <QtWidgets/QGraphicsScene> #include <QtCore/QMutex> -#include "qchart.h" +#include <QtCharts/QChart> #include <QtCore/QLocale> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativelineseries.h b/src/chartsqml2/declarativelineseries.h index aab115c1..579eb458 100644 --- a/src/chartsqml2/declarativelineseries.h +++ b/src/chartsqml2/declarativelineseries.h @@ -21,7 +21,7 @@ #ifndef DECLARATIVELINESERIES_H #define DECLARATIVELINESERIES_H -#include "qlineseries.h" +#include <QtCharts/QLineSeries> #include "declarativexyseries.h" #include "declarativeaxes.h" diff --git a/src/chartsqml2/declarativemargins.cpp b/src/chartsqml2/declarativemargins.cpp index f9a913c8..78f1d6df 100644 --- a/src/chartsqml2/declarativemargins.cpp +++ b/src/chartsqml2/declarativemargins.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "declarativemargins.h" -#include <QDataStream> -#include <QDebug> +#include <QtCore/QDataStream> +#include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativemargins.h b/src/chartsqml2/declarativemargins.h index 3a346ce7..04267ca8 100644 --- a/src/chartsqml2/declarativemargins.h +++ b/src/chartsqml2/declarativemargins.h @@ -21,9 +21,9 @@ #ifndef DECLARATIVE_MARGINS_H #define DECLARATIVE_MARGINS_H -#include "qchartglobal.h" -#include <QObject> -#include <QMargins> +#include <QtCharts/QChartGlobal> +#include <QtCore/QObject> +#include <QtCore/QMargins> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativepieseries.cpp b/src/chartsqml2/declarativepieseries.cpp index 619d7c32..33b1f6f3 100644 --- a/src/chartsqml2/declarativepieseries.cpp +++ b/src/chartsqml2/declarativepieseries.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "declarativepieseries.h" -#include "qpieslice.h" -#include "qvpiemodelmapper.h" -#include "qhpiemodelmapper.h" +#include <QtCharts/QPieSlice> +#include <QtCharts/QVPieModelMapper> +#include <QtCharts/QHPieModelMapper> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativepieseries.h b/src/chartsqml2/declarativepieseries.h index 2fbddb67..44f3b37e 100644 --- a/src/chartsqml2/declarativepieseries.h +++ b/src/chartsqml2/declarativepieseries.h @@ -21,8 +21,8 @@ #ifndef DECLARATIVEPIESERIES_H #define DECLARATIVEPIESERIES_H -#include "qpieseries.h" -#include "qpieslice.h" +#include <QtCharts/QPieSeries> +#include <QtCharts/QPieSlice> #include <QtQuick/QQuickItem> #include <QtQml/QQmlParserStatus> diff --git a/src/chartsqml2/declarativepolarchart.cpp b/src/chartsqml2/declarativepolarchart.cpp index 0d5328cd..5d68d492 100644 --- a/src/chartsqml2/declarativepolarchart.cpp +++ b/src/chartsqml2/declarativepolarchart.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "declarativepolarchart.h" -#include "qchart.h" +#include <QtCharts/QChart> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativescatterseries.h b/src/chartsqml2/declarativescatterseries.h index 9745e06b..49eb96d7 100644 --- a/src/chartsqml2/declarativescatterseries.h +++ b/src/chartsqml2/declarativescatterseries.h @@ -21,7 +21,7 @@ #ifndef DECLARATIVESCATTERSERIES_H #define DECLARATIVESCATTERSERIES_H -#include "qscatterseries.h" +#include <QtCharts/QScatterSeries> #include "declarativexyseries.h" #include "declarativeaxes.h" diff --git a/src/chartsqml2/declarativesplineseries.h b/src/chartsqml2/declarativesplineseries.h index 369206f0..20e596d9 100644 --- a/src/chartsqml2/declarativesplineseries.h +++ b/src/chartsqml2/declarativesplineseries.h @@ -21,7 +21,7 @@ #ifndef DECLARATIVESPLINESERIES_H #define DECLARATIVESPLINESERIES_H -#include "qsplineseries.h" +#include <QtCharts/QSplineSeries> #include "declarativexyseries.h" #include "declarativeaxes.h" diff --git a/src/chartsqml2/declarativexypoint.cpp b/src/chartsqml2/declarativexypoint.cpp index 8df506e9..3dd78d49 100644 --- a/src/chartsqml2/declarativexypoint.cpp +++ b/src/chartsqml2/declarativexypoint.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "declarativexypoint.h" -#include <QDataStream> +#include <QtCore/QDataStream> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativexypoint.h b/src/chartsqml2/declarativexypoint.h index 578b4b99..a4a5f36c 100644 --- a/src/chartsqml2/declarativexypoint.h +++ b/src/chartsqml2/declarativexypoint.h @@ -21,9 +21,9 @@ #ifndef DECLARATIVE_XY_POINT_H #define DECLARATIVE_XY_POINT_H -#include "qchartglobal.h" -#include <QObject> -#include <QPointF> +#include <QtCharts/QChartGlobal> +#include <QtCore/QObject> +#include <QtCore/QPointF> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativexyseries.cpp b/src/chartsqml2/declarativexyseries.cpp index 55fb31d9..9e9c7cca 100644 --- a/src/chartsqml2/declarativexyseries.cpp +++ b/src/chartsqml2/declarativexyseries.cpp @@ -21,8 +21,8 @@ #include "declarativexyseries.h" #include "declarativexypoint.h" -#include "qvxymodelmapper.h" -#include "qhxymodelmapper.h" +#include <QtCharts/QVXYModelMapper> +#include <QtCharts/QHXYModelMapper> QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativexyseries.h b/src/chartsqml2/declarativexyseries.h index 237080bb..f69ef9b1 100644 --- a/src/chartsqml2/declarativexyseries.h +++ b/src/chartsqml2/declarativexyseries.h @@ -21,7 +21,7 @@ #ifndef DECLARATIVE_XY_SERIES_H #define DECLARATIVE_XY_SERIES_H -#include <QXYSeries> +#include <QtCharts/QXYSeries> QT_CHARTS_BEGIN_NAMESPACE diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri index a0915009..9d3ed05a 100644 --- a/tests/auto/auto.pri +++ b/tests/auto/auto.pri @@ -2,7 +2,7 @@ error( "Couldn't find the tests.pri file!" ) } - QT += testlib widgets +QT += testlib widgets !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp index 2a0f9637..29739b8c 100644 --- a/tests/auto/chartdataset/tst_chartdataset.cpp +++ b/tests/auto/chartdataset/tst_chartdataset.cpp @@ -40,21 +40,21 @@ QTEST_MAIN(tst_ChartDataSet) #else #include <QtTest/QtTest> -#include <qabstractaxis.h> -#include <qvalueaxis.h> -#include <qbarcategoryaxis.h> -#include <qcategoryaxis.h> +#include <QtCharts/QAbstractAxis> +#include <QtCharts/QValueAxis> +#include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QCategoryAxis> #ifndef QT_ON_ARM -#include "qdatetimeaxis.h" +#include <QtCharts/QDateTimeAxis> #endif -#include <qlineseries.h> -#include <qareaseries.h> -#include <qscatterseries.h> -#include <qsplineseries.h> -#include <qpieseries.h> -#include <qbarseries.h> -#include <qpercentbarseries.h> -#include <qstackedbarseries.h> +#include <QtCharts/QLineSeries> +#include <QtCharts/QAreaSeries> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QPieSeries> +#include <QtCharts/QBarSeries> +#include <QtCharts/QPercentBarSeries> +#include <QtCharts/QStackedBarSeries> #include <private/chartdataset_p.h> #include <private/abstractdomain_p.h> #include <tst_definitions.h> diff --git a/tests/auto/inc/tst_definitions.h b/tests/auto/inc/tst_definitions.h index 6dd4a837..b988c6c0 100644 --- a/tests/auto/inc/tst_definitions.h +++ b/tests/auto/inc/tst_definitions.h @@ -23,7 +23,7 @@ #include <QtCharts/qpolarchart.h> #include <QtTest/QtTest> -#include <QPushButton> +#include <QtWidgets/QPushButton> namespace QTest { diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.h b/tests/auto/qabstractaxis/tst_qabstractaxis.h index 2ca5107a..92bd3b43 100644 --- a/tests/auto/qabstractaxis/tst_qabstractaxis.h +++ b/tests/auto/qabstractaxis/tst_qabstractaxis.h @@ -23,8 +23,8 @@ #include <QtTest/QtTest> #include <tst_definitions.h> -#include <qabstractaxis.h> -#include <qchartview.h> +#include <QtCharts/QAbstractAxis> +#include <QtCharts/QChartView> QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp index 26d8dbb1..e9f53529 100644 --- a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp +++ b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "../qabstractaxis/tst_qabstractaxis.h" -#include <qbarseries.h> -#include <qbarset.h> -#include <qbarcategoryaxis.h> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QBarCategoryAxis> class tst_QBarCategoriesAxis: public tst_QAbstractAxis { diff --git a/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp b/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp index 0e9fef5a..7ff67f31 100644 --- a/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp +++ b/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp @@ -21,13 +21,13 @@ #include <QtCore/QString> #include <QtTest/QtTest> -#include <qchart.h> -#include <qchartview.h> -#include <qbarseries.h> -#include <qbarset.h> -#include <qvbarmodelmapper.h> -#include <qhbarmodelmapper.h> -#include <QStandardItemModel> +#include <QtCharts/QChart> +#include <QtCharts/QChartView> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QVBarModelMapper> +#include <QtCharts/QHBarModelMapper> +#include <QtGui/QStandardItemModel> QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index c9265e38..36876592 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <qbarseries.h> -#include <qbarset.h> -#include <qchartview.h> -#include <qchart.h> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QChartView> +#include <QtCharts/QChart> #include "tst_definitions.h" QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qbarset/tst_qbarset.cpp b/tests/auto/qbarset/tst_qbarset.cpp index 4c937dce..35a2ee58 100644 --- a/tests/auto/qbarset/tst_qbarset.cpp +++ b/tests/auto/qbarset/tst_qbarset.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <qbarset.h> -#include <qbarseries.h> -#include <qchartview.h> +#include <QtCharts/QBarSet> +#include <QtCharts/QBarSeries> +#include <QtCharts/QChartView> #include "tst_definitions.h" QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp index ae9d13d9..ff5f3a4a 100644 --- a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp +++ b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "../qabstractaxis/tst_qabstractaxis.h" -#include "qcategoryaxis.h" -#include <qlineseries.h> +#include <QtCharts/QCategoryAxis> +#include <QtCharts/QLineSeries> class tst_QCategoryAxis: public tst_QAbstractAxis { diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp index 18ae868c..bbc9ae19 100644 --- a/tests/auto/qchart/tst_qchart.cpp +++ b/tests/auto/qchart/tst_qchart.cpp @@ -19,18 +19,18 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <qchartview.h> -#include <qlineseries.h> -#include <qareaseries.h> -#include <qscatterseries.h> -#include <qsplineseries.h> -#include <qpieseries.h> -#include <qabstractbarseries.h> -#include <qbarseries.h> -#include <qpercentbarseries.h> -#include <qstackedbarseries.h> -#include <qvalueaxis.h> -#include <qbarcategoryaxis.h> +#include <QtCharts/QChartView> +#include <QtCharts/QLineSeries> +#include <QtCharts/QAreaSeries> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QPieSeries> +#include <QtCharts/QAbstractBarSeries> +#include <QtCharts/QBarSeries> +#include <QtCharts/QPercentBarSeries> +#include <QtCharts/QStackedBarSeries> +#include <QtCharts/QValueAxis> +#include <QtCharts/QBarCategoryAxis> #include "tst_definitions.h" QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qchartview/tst_qchartview.cpp b/tests/auto/qchartview/tst_qchartview.cpp index f8264bad..cf90085e 100644 --- a/tests/auto/qchartview/tst_qchartview.cpp +++ b/tests/auto/qchartview/tst_qchartview.cpp @@ -23,7 +23,7 @@ #include <QtCharts/qlineseries.h> #include <cmath> #include <tst_definitions.h> -#include <QtCharts/qvalueaxis.h> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp index 0c6c98cc..e71b9b56 100644 --- a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp +++ b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "../qabstractaxis/tst_qabstractaxis.h" -#include <qdatetimeaxis.h> -#include <qlineseries.h> +#include <QtCharts/QDateTimeAxis> +#include <QtCharts/QLineSeries> class tst_QDateTimeAxis : public QObject//: public tst_QAbstractAxis { diff --git a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp index 5294ff2c..6445476c 100644 --- a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp +++ b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <qhorizontalbarseries.h> -#include <qbarset.h> -#include <qchartview.h> -#include <qchart.h> +#include <QtCharts/QHorizontalBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QChartView> +#include <QtCharts/QChart> #include "tst_definitions.h" QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp index 63afbb2a..5300997e 100644 --- a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp +++ b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <qhorizontalpercentbarseries.h> -#include <qbarset.h> -#include <qchartview.h> -#include <qchart.h> +#include <QtCharts/QHorizontalPercentBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QChartView> +#include <QtCharts/QChart> #include "tst_definitions.h" QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp index df4f0837..1d2e17bb 100644 --- a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp +++ b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <qhorizontalstackedbarseries.h> -#include <qbarset.h> -#include <qchartview.h> -#include <qchart.h> +#include <QtCharts/QHorizontalStackedBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QChartView> +#include <QtCharts/QChart> #include "tst_definitions.h" QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qlegend/tst_qlegend.cpp b/tests/auto/qlegend/tst_qlegend.cpp index 7f14a43a..cc081e1e 100644 --- a/tests/auto/qlegend/tst_qlegend.cpp +++ b/tests/auto/qlegend/tst_qlegend.cpp @@ -19,18 +19,18 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <qchartview.h> -#include <qlegend.h> -#include <qpieseries.h> -#include <qpielegendmarker.h> -#include <qareaseries.h> -#include <qarealegendmarker.h> -#include <qlineseries.h> -#include <qxylegendmarker.h> -#include <qscatterseries.h> -#include <qbarseries.h> -#include <qbarset.h> -#include <qbarlegendmarker.h> +#include <QtCharts/QChartView> +#include <QtCharts/QLegend> +#include <QtCharts/QPieSeries> +#include <QtCharts/QPieLegendMarker> +#include <QtCharts/QAreaSeries> +#include <QtCharts/QAreaLegendMarker> +#include <QtCharts/QLineSeries> +#include <QtCharts/QXYLegendMarker> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QBarLegendMarker> #include "tst_definitions.h" QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qlineseries/tst_qlineseries.cpp b/tests/auto/qlineseries/tst_qlineseries.cpp index 4d270619..10ac896f 100644 --- a/tests/auto/qlineseries/tst_qlineseries.cpp +++ b/tests/auto/qlineseries/tst_qlineseries.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "../qxyseries/tst_qxyseries.h" -#include <qlineseries.h> +#include <QtCharts/QLineSeries> Q_DECLARE_METATYPE(QList<QPointF>) diff --git a/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp b/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp index 1b9dac09..3e764206 100644 --- a/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp +++ b/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "../qabstractaxis/tst_qabstractaxis.h" -#include "qlogvalueaxis.h" -#include <qlineseries.h> -#include <QDebug> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QLineSeries> +#include <QtCore/QDebug> class tst_QLogValueAxis: public tst_QAbstractAxis { diff --git a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp index dbe768e9..15bfc49e 100644 --- a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp +++ b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <qpercentbarseries.h> -#include <qbarset.h> -#include <qchartview.h> -#include <qchart.h> +#include <QtCharts/QPercentBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QChartView> +#include <QtCharts/QChart> #include "tst_definitions.h" QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp b/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp index 28cf4a29..704e61df 100644 --- a/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp +++ b/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp @@ -21,13 +21,13 @@ #include <QtCore/QString> #include <QtTest/QtTest> -#include <qchart.h> -#include <qchartview.h> -#include <qpieseries.h> -#include <qpieslice.h> -#include <qvpiemodelmapper.h> -#include <qhpiemodelmapper.h> -#include <QStandardItemModel> +#include <QtCharts/QChart> +#include <QtCharts/QChartView> +#include <QtCharts/QPieSeries> +#include <QtCharts/QPieSlice> +#include <QtCharts/QVPieModelMapper> +#include <QtCharts/QHPieModelMapper> +#include <QtGui/QStandardItemModel> QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qpieseries/tst_qpieseries.cpp b/tests/auto/qpieseries/tst_qpieseries.cpp index 3b8f2adb..7bcb6d6b 100644 --- a/tests/auto/qpieseries/tst_qpieseries.cpp +++ b/tests/auto/qpieseries/tst_qpieseries.cpp @@ -19,12 +19,12 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <qchartview.h> -#include <qchart.h> -#include <qpieseries.h> -#include <qpieslice.h> -#include <qpiemodelmapper.h> -#include <QStandardItemModel> +#include <QtCharts/QChartView> +#include <QtCharts/QChart> +#include <QtCharts/QPieSeries> +#include <QtCharts/QPieSlice> +#include <QtCharts/QPieModelMapper> +#include <QtGui/QStandardItemModel> #include <tst_definitions.h> QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qpieslice/tst_qpieslice.cpp b/tests/auto/qpieslice/tst_qpieslice.cpp index 3ad5c47d..7f8887af 100644 --- a/tests/auto/qpieslice/tst_qpieslice.cpp +++ b/tests/auto/qpieslice/tst_qpieslice.cpp @@ -20,10 +20,10 @@ #include <QtTest/QtTest> #include <tst_definitions.h> -#include <qchartview.h> -#include <qchart.h> -#include <qpieslice.h> -#include <qpieseries.h> +#include <QtCharts/QChartView> +#include <QtCharts/QChart> +#include <QtCharts/QPieSlice> +#include <QtCharts/QPieSeries> QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qscatterseries/tst_qscatterseries.cpp b/tests/auto/qscatterseries/tst_qscatterseries.cpp index 16e3f31e..2c8a210d 100644 --- a/tests/auto/qscatterseries/tst_qscatterseries.cpp +++ b/tests/auto/qscatterseries/tst_qscatterseries.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "../qxyseries/tst_qxyseries.h" -#include <qscatterseries.h> +#include <QtCharts/QScatterSeries> Q_DECLARE_METATYPE(QList<QPointF>) diff --git a/tests/auto/qsplineseries/tst_qsplineseries.cpp b/tests/auto/qsplineseries/tst_qsplineseries.cpp index a5e95618..2ab15d04 100644 --- a/tests/auto/qsplineseries/tst_qsplineseries.cpp +++ b/tests/auto/qsplineseries/tst_qsplineseries.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "../qxyseries/tst_qxyseries.h" -#include <qsplineseries.h> +#include <QtCharts/QSplineSeries> Q_DECLARE_METATYPE(QList<QPointF>) diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp index 868a61a1..17d447f6 100644 --- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp +++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <qstackedbarseries.h> -#include <qbarset.h> -#include <qchartview.h> -#include <qchart.h> +#include <QtCharts/QStackedBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QChartView> +#include <QtCharts/QChart> #include "tst_definitions.h" QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp index 88848b5f..df86c988 100644 --- a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp +++ b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "../qabstractaxis/tst_qabstractaxis.h" -#include "qvalueaxis.h" -#include <qlineseries.h> +#include <QtCharts/QValueAxis> +#include <QtCharts/QLineSeries> class tst_QValueAxis: public tst_QAbstractAxis { diff --git a/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp b/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp index 5431d5cf..6538da68 100644 --- a/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp +++ b/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp @@ -21,13 +21,13 @@ #include <QtCore/QString> #include <QtTest/QtTest> -#include <qchart.h> -#include <qchartview.h> -#include <qxyseries.h> -#include <qlineseries.h> -#include <qvxymodelmapper.h> -#include <qhxymodelmapper.h> -#include <QStandardItemModel> +#include <QtCharts/QChart> +#include <QtCharts/QChartView> +#include <QtCharts/QXYSeries> +#include <QtCharts/QLineSeries> +#include <QtCharts/QVXYModelMapper> +#include <QtCharts/QHXYModelMapper> +#include <QtGui/QStandardItemModel> #include "tst_definitions.h" QT_CHARTS_USE_NAMESPACE diff --git a/tests/auto/qxyseries/tst_qxyseries.h b/tests/auto/qxyseries/tst_qxyseries.h index 58d6a5c6..4b9ab8fb 100644 --- a/tests/auto/qxyseries/tst_qxyseries.h +++ b/tests/auto/qxyseries/tst_qxyseries.h @@ -22,9 +22,9 @@ #define TST_QXYSERIES_H #include <QtTest/QtTest> -#include <qxyseries.h> -#include <qchartview.h> -#include <QStandardItemModel> +#include <QtCharts/QXYSeries> +#include <QtCharts/QChartView> +#include <QtGui/QStandardItemModel> #include <tst_definitions.h> QT_CHARTS_USE_NAMESPACE diff --git a/tests/boxplottester/boxplottester.pro b/tests/boxplottester/boxplottester.pro index 1cad76ce..575ae45a 100644 --- a/tests/boxplottester/boxplottester.pro +++ b/tests/boxplottester/boxplottester.pro @@ -4,6 +4,7 @@ TEMPLATE = app +QT += charts QT += core gui contains(QT_MAJOR_VERSION, 5) { QT += widgets diff --git a/tests/boxplottester/customtablemodel.cpp b/tests/boxplottester/customtablemodel.cpp index c91c0779..162dfa28 100644 --- a/tests/boxplottester/customtablemodel.cpp +++ b/tests/boxplottester/customtablemodel.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "customtablemodel.h" -#include <QVector> -#include <QTime> -#include <QRect> -#include <QColor> +#include <QtCore/QVector> +#include <QtCore/QTime> +#include <QtCore/QRect> +#include <QtGui/QColor> const QString categories[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Nov", "Dec"}; diff --git a/tests/boxplottester/customtablemodel.h b/tests/boxplottester/customtablemodel.h index daa6b392..f5207618 100644 --- a/tests/boxplottester/customtablemodel.h +++ b/tests/boxplottester/customtablemodel.h @@ -21,9 +21,9 @@ #ifndef CUSTOMTABLEMODEL_H #define CUSTOMTABLEMODEL_H -#include <QAbstractTableModel> -#include <QHash> -#include <QRect> +#include <QtCore/QAbstractTableModel> +#include <QtCore/QHash> +#include <QtCore/QRect> class CustomTableModel : public QAbstractTableModel { diff --git a/tests/boxplottester/mainwidget.cpp b/tests/boxplottester/mainwidget.cpp index 3421de05..792cdae5 100644 --- a/tests/boxplottester/mainwidget.cpp +++ b/tests/boxplottester/mainwidget.cpp @@ -21,30 +21,30 @@ #include "mainwidget.h" #include "customtablemodel.h" #include "pentool.h" -#include <QVBoxPlotModelMapper> -#include <QTableView> -#include <QHeaderView> -#include <QChartView> -#include <QBoxPlotSeries> -#include <QBoxSet> -#include <QLegend> -#include <QBarCategoryAxis> -#include <QBrush> -#include <QColor> -#include <QPushButton> -#include <QComboBox> -#include <QSpinBox> -#include <QCheckBox> -#include <QGridLayout> -#include <QHBoxLayout> -#include <QLabel> -#include <QSpacerItem> -#include <QMessageBox> +#include <QtCharts/QVBoxPlotModelMapper> +#include <QtWidgets/QTableView> +#include <QtWidgets/QHeaderView> +#include <QtCharts/QChartView> +#include <QtCharts/QBoxPlotSeries> +#include <QtCharts/QBoxSet> +#include <QtCharts/QLegend> +#include <QtCharts/QBarCategoryAxis> +#include <QtGui/QBrush> +#include <QtGui/QColor> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QSpinBox> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QSpacerItem> +#include <QtWidgets/QMessageBox> #include <cmath> -#include <QDebug> -#include <QStandardItemModel> -#include <QBarCategoryAxis> -#include <QLogValueAxis> +#include <QtCore/QDebug> +#include <QtGui/QStandardItemModel> +#include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QLogValueAxis> QT_CHARTS_USE_NAMESPACE diff --git a/tests/boxplottester/mainwidget.h b/tests/boxplottester/mainwidget.h index 3c78ffd2..cbb2cd38 100644 --- a/tests/boxplottester/mainwidget.h +++ b/tests/boxplottester/mainwidget.h @@ -21,19 +21,19 @@ #ifndef MAINWIDGET_H #define MAINWIDGET_H -#include "qchartglobal.h" -#include "qchart.h" -#include "qchartview.h" -#include "customtablemodel.h" -#include "pentool.h" -#include <QWidget> -#include <QBoxPlotSeries> -#include <QBarCategoryAxis> -#include <QBoxSet> -#include <QCheckBox> -#include <QDoubleSpinBox> +#include <QtCharts/QChartGlobal> +#include <QtCharts/QChart> +#include <QtCharts/QChartView> +#include <QtWidgets/QWidget> +#include <QtCharts/QBoxPlotSeries> +#include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QBoxSet> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QDoubleSpinBox> class QGridLayout; +class CustomTableModel; +class PenTool; QT_CHARTS_USE_NAMESPACE diff --git a/tests/boxplottester/pentool.cpp b/tests/boxplottester/pentool.cpp index 104231ee..b827039f 100644 --- a/tests/boxplottester/pentool.cpp +++ b/tests/boxplottester/pentool.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "pentool.h" -#include <QPushButton> -#include <QDoubleSpinBox> -#include <QComboBox> -#include <QFormLayout> -#include <QColorDialog> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QDoubleSpinBox> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QColorDialog> PenTool::PenTool(QString title, QWidget *parent) : QWidget(parent) diff --git a/tests/boxplottester/pentool.h b/tests/boxplottester/pentool.h index 66e7ab10..13b4064d 100644 --- a/tests/boxplottester/pentool.h +++ b/tests/boxplottester/pentool.h @@ -20,8 +20,8 @@ #ifndef PENTOOL_H #define PENTOOL_H -#include <QWidget> -#include <QPen> +#include <QtWidgets/QWidget> +#include <QtGui/QPen> class QPushButton; class QDoubleSpinBox; diff --git a/tests/chartdesigner/brushwidget.h b/tests/chartdesigner/brushwidget.h index 985493ec..7f570cb5 100644 --- a/tests/chartdesigner/brushwidget.h +++ b/tests/chartdesigner/brushwidget.h @@ -21,7 +21,7 @@ #ifndef BRUSHWIDGET_H #define BRUSHWIDGET_H -#include <QWidget> +#include <QtWidgets/QWidget> class BrushWidget: public QWidget { diff --git a/tests/chartdesigner/engine.cpp b/tests/chartdesigner/engine.cpp index ac113ed5..b7ea9e93 100644 --- a/tests/chartdesigner/engine.cpp +++ b/tests/chartdesigner/engine.cpp @@ -19,21 +19,21 @@ ****************************************************************************/ #include "engine.h" -#include <QItemSelectionModel> -#include <QStandardItemModel> -#include <QVXYModelMapper> -#include <QHBarModelMapper> -#include <QVPieModelMapper> -#include <QLineSeries> -#include <QSplineSeries> -#include <QScatterSeries> -#include <QBarSeries> -#include <QPercentBarSeries> -#include <QStackedBarSeries> -#include <QAreaSeries> -#include <QPieSeries> -#include <QChart> -#include <QBarSet> +#include <QtCore/QItemSelectionModel> +#include <QtGui/QStandardItemModel> +#include <QtCharts/QVXYModelMapper> +#include <QtCharts/QHBarModelMapper> +#include <QtCharts/QVPieModelMapper> +#include <QtCharts/QLineSeries> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QBarSeries> +#include <QtCharts/QPercentBarSeries> +#include <QtCharts/QStackedBarSeries> +#include <QtCharts/QAreaSeries> +#include <QtCharts/QPieSeries> +#include <QtCharts/QChart> +#include <QtCharts/QBarSet> const qint32 MAGIC_NUMBER = 0x66666666; diff --git a/tests/chartdesigner/engine.h b/tests/chartdesigner/engine.h index 96323592..eef15dcf 100644 --- a/tests/chartdesigner/engine.h +++ b/tests/chartdesigner/engine.h @@ -21,9 +21,9 @@ #ifndef ENGINE_H #define ENGINE_H -#include <QObject> -#include <QAbstractSeries> -#include <QModelIndex> +#include <QtCore/QObject> +#include <QtCharts/QAbstractSeries> +#include <QtCore/QModelIndex> class QStandardItemModel; class QItemSelectionModel; diff --git a/tests/chartdesigner/main.cpp b/tests/chartdesigner/main.cpp index a2f146fc..6b47caf5 100644 --- a/tests/chartdesigner/main.cpp +++ b/tests/chartdesigner/main.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "mainwindow.h" -#include <QApplication> +#include <QtWidgets/QApplication> int main(int argc, char *argv[]) { diff --git a/tests/chartdesigner/mainwindow.cpp b/tests/chartdesigner/mainwindow.cpp index 0527bdd1..70588459 100644 --- a/tests/chartdesigner/mainwindow.cpp +++ b/tests/chartdesigner/mainwindow.cpp @@ -23,17 +23,17 @@ #include "penwidget.h" #include "brushwidget.h" #include "engine.h" -#include <QSettings> -#include <QChartView> -#include <QDockWidget> -#include <QMenuBar> -#include <QTableWidget> -#include <QSplitter> -#include <QMetaEnum> -#include <QStandardItemModel> -#include <QHeaderView> -#include <QDebug> -#include <QMessageBox> +#include <QtCore/QSettings> +#include <QtCharts/QChartView> +#include <QtWidgets/QDockWidget> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QTableWidget> +#include <QtWidgets/QSplitter> +#include <QtCore/QMetaEnum> +#include <QtGui/QStandardItemModel> +#include <QtWidgets/QHeaderView> +#include <QtCore/QDebug> +#include <QtWidgets/QMessageBox> static const QString FILENAME_SETTING("filename"); static const QString GEOMETRY_SETTING("geometry"); diff --git a/tests/chartdesigner/mainwindow.h b/tests/chartdesigner/mainwindow.h index 6f21b166..d5ce5418 100644 --- a/tests/chartdesigner/mainwindow.h +++ b/tests/chartdesigner/mainwindow.h @@ -21,9 +21,9 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QMainWindow> -#include <QChartGlobal> -#include <QMap> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartGlobal> +#include <QtCore/QMap> QT_CHARTS_BEGIN_NAMESPACE diff --git a/tests/chartdesigner/objectinspectorwidget.cpp b/tests/chartdesigner/objectinspectorwidget.cpp index acf9cb3f..64a89854 100644 --- a/tests/chartdesigner/objectinspectorwidget.cpp +++ b/tests/chartdesigner/objectinspectorwidget.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "objectinspectorwidget.h" -#include <QIcon> -#include <QPainter> -#include <QPixmapCache> +#include <QtGui/QIcon> +#include <QtGui/QPainter> +#include <QtGui/QPixmapCache> InspectorWidget::InspectorWidget() { diff --git a/tests/chartdesigner/objectinspectorwidget.h b/tests/chartdesigner/objectinspectorwidget.h index 59015658..ba9deed4 100644 --- a/tests/chartdesigner/objectinspectorwidget.h +++ b/tests/chartdesigner/objectinspectorwidget.h @@ -21,7 +21,7 @@ #ifndef INSPECTORWIDGET_H #define INSPECTORWIDGET_H -#include <QWidget> +#include <QtWidgets/QWidget> class InspectorWidget : public QWidget { diff --git a/tests/chartdesigner/penwidget.cpp b/tests/chartdesigner/penwidget.cpp index 51bffd8e..e2b22f64 100644 --- a/tests/chartdesigner/penwidget.cpp +++ b/tests/chartdesigner/penwidget.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "penwidget.h" -#include <QFormLayout> -#include <QComboBox> -#include <QSpinBox> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QSpinBox> PenWidget::PenWidget(QWidget *parent):QWidget(parent), m_colorComboBox(0), diff --git a/tests/chartdesigner/penwidget.h b/tests/chartdesigner/penwidget.h index b96864dc..fe9998c0 100644 --- a/tests/chartdesigner/penwidget.h +++ b/tests/chartdesigner/penwidget.h @@ -21,8 +21,8 @@ #ifndef PENWIDGET_H #define PENWIDGET_H -#include <QWidget> -#include <QPen> +#include <QtWidgets/QWidget> +#include <QtWidgets/QPen> class QComboBox; class QSpinBox; diff --git a/tests/chartviewer/charts.h b/tests/chartviewer/charts.h index ab25467f..131354e8 100644 --- a/tests/chartviewer/charts.h +++ b/tests/chartviewer/charts.h @@ -22,9 +22,9 @@ #ifndef CHARTS_H #define CHARTS_H #include "model.h" -#include <QList> -#include <QString> -#include <qchartglobal.h> +#include <QtCore/QList> +#include <QtCore/QString> +#include <QtCharts/QChartGlobal> QT_CHARTS_BEGIN_NAMESPACE class QChart; diff --git a/tests/chartviewer/charts/axis/barcategoryaxisx.cpp b/tests/chartviewer/charts/axis/barcategoryaxisx.cpp index 69540027..250576bb 100644 --- a/tests/chartviewer/charts/axis/barcategoryaxisx.cpp +++ b/tests/chartviewer/charts/axis/barcategoryaxisx.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qbarseries.h" -#include "qbarset.h" -#include "qvalueaxis.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QValueAxis> +#include <QtCharts/QBarCategoryAxis> class BarCategoryAxisX: public Chart { diff --git a/tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp b/tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp index 5a0caa76..516d0f49 100644 --- a/tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp +++ b/tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qbarseries.h" -#include "qbarset.h" -#include "qlogvalueaxis.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QBarCategoryAxis> class BarCategoryAxisXLogY: public Chart { diff --git a/tests/chartviewer/charts/axis/barcategoryaxisy.cpp b/tests/chartviewer/charts/axis/barcategoryaxisy.cpp index 122ae086..d20442b2 100644 --- a/tests/chartviewer/charts/axis/barcategoryaxisy.cpp +++ b/tests/chartviewer/charts/axis/barcategoryaxisy.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qhorizontalbarseries.h" -#include "qbarset.h" -#include "qvalueaxis.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QHorizontalBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QValueAxis> +#include <QtCharts/QBarCategoryAxis> class BarCategoryAxisY: public Chart { diff --git a/tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp b/tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp index 1f1c72ab..f38cf931 100644 --- a/tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp +++ b/tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qhorizontalbarseries.h" -#include "qbarset.h" -#include "qlogvalueaxis.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QHorizontalBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QBarCategoryAxis> class BarCategoryAxisYLogX: public Chart { diff --git a/tests/chartviewer/charts/axis/categoryaxis.cpp b/tests/chartviewer/charts/axis/categoryaxis.cpp index ab32638e..dc025f6d 100644 --- a/tests/chartviewer/charts/axis/categoryaxis.cpp +++ b/tests/chartviewer/charts/axis/categoryaxis.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include <QCategoryAxis> +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QCategoryAxis> class CategoryLineChart: public Chart { diff --git a/tests/chartviewer/charts/axis/datetimeaxisx.cpp b/tests/chartviewer/charts/axis/datetimeaxisx.cpp index 3d2083e4..99154bbc 100644 --- a/tests/chartviewer/charts/axis/datetimeaxisx.cpp +++ b/tests/chartviewer/charts/axis/datetimeaxisx.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qvalueaxis.h" -#include "qdatetimeaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QValueAxis> +#include <QtCharts/QDateTimeAxis> class DateTimeAxisX: public Chart { diff --git a/tests/chartviewer/charts/axis/datetimeaxisy.cpp b/tests/chartviewer/charts/axis/datetimeaxisy.cpp index 3336e4cc..0234eb6a 100644 --- a/tests/chartviewer/charts/axis/datetimeaxisy.cpp +++ b/tests/chartviewer/charts/axis/datetimeaxisy.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qvalueaxis.h" -#include "qdatetimeaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QValueAxis> +#include <QtCharts/QDateTimeAxis> class DateTimeAxisY: public Chart { diff --git a/tests/chartviewer/charts/axis/logvalueaxisx.cpp b/tests/chartviewer/charts/axis/logvalueaxisx.cpp index 0efd9c11..d60a1f18 100644 --- a/tests/chartviewer/charts/axis/logvalueaxisx.cpp +++ b/tests/chartviewer/charts/axis/logvalueaxisx.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qlogvalueaxis.h" -#include "qcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QCategoryAxis> class LogValueAxisX: public Chart { diff --git a/tests/chartviewer/charts/axis/logvalueaxisy.cpp b/tests/chartviewer/charts/axis/logvalueaxisy.cpp index be48969e..cc631515 100644 --- a/tests/chartviewer/charts/axis/logvalueaxisy.cpp +++ b/tests/chartviewer/charts/axis/logvalueaxisy.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qlogvalueaxis.h" -#include "qcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QCategoryAxis> class LogValueAxisY: public Chart { diff --git a/tests/chartviewer/charts/axis/valueaxis.cpp b/tests/chartviewer/charts/axis/valueaxis.cpp index 3d696432..9bbfb0c9 100644 --- a/tests/chartviewer/charts/axis/valueaxis.cpp +++ b/tests/chartviewer/charts/axis/valueaxis.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qvalueaxis.h" -#include "qcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QValueAxis> +#include <QtCharts/QCategoryAxis> class ValueAxis: public Chart { diff --git a/tests/chartviewer/charts/barseries/horizontalbarchart.cpp b/tests/chartviewer/charts/barseries/horizontalbarchart.cpp index b164e6a2..3cc1887e 100644 --- a/tests/chartviewer/charts/barseries/horizontalbarchart.cpp +++ b/tests/chartviewer/charts/barseries/horizontalbarchart.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qhorizontalbarseries.h" -#include "qbarset.h" +#include <QtCharts/QChart> +#include <QtCharts/QHorizontalBarSeries> +#include <QtCharts/QBarSet> class HorizontalBarChart: public Chart { diff --git a/tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp b/tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp index 750e123a..71cd14f0 100644 --- a/tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp +++ b/tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qhorizontalpercentbarseries.h" -#include "qbarset.h" +#include <QtCharts/QChart> +#include <QtCharts/QHorizontalPercentBarSeries> +#include <QtCharts/QBarSet> class HorizontalPercentBarChart: public Chart { diff --git a/tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp b/tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp index 25da32bb..7dab6791 100644 --- a/tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp +++ b/tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qhorizontalstackedbarseries.h" -#include "qbarset.h" +#include <QtCharts/QChart> +#include <QtCharts/QHorizontalStackedBarSeries> +#include <QtCharts/QBarSet> class HorizontalStackedBarChart: public Chart { diff --git a/tests/chartviewer/charts/barseries/verticalbarchart.cpp b/tests/chartviewer/charts/barseries/verticalbarchart.cpp index 5dd16449..d7dbbaa0 100644 --- a/tests/chartviewer/charts/barseries/verticalbarchart.cpp +++ b/tests/chartviewer/charts/barseries/verticalbarchart.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qbarseries.h" -#include "qbarset.h" +#include <QtCharts/QChart> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> class VerticalBarChart: public Chart { diff --git a/tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp b/tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp index 4888c9b0..e219ebc0 100644 --- a/tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp +++ b/tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qpercentbarseries.h" -#include "qbarset.h" +#include <QtCharts/QChart> +#include <QtCharts/QPercentBarSeries> +#include <QtCharts/QBarSet> class VerticalPercentBarChart: public Chart { diff --git a/tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp b/tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp index bb5b1540..84986acc 100644 --- a/tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp +++ b/tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qstackedbarseries.h" -#include "qbarset.h" +#include <QtCharts/QChart> +#include <QtCharts/QStackedBarSeries> +#include <QtCharts/QBarSet> class VerticalStackedBarChart: public Chart { diff --git a/tests/chartviewer/charts/domain/barlogx.cpp b/tests/chartviewer/charts/domain/barlogx.cpp index 3ffc3f0f..32a36755 100644 --- a/tests/chartviewer/charts/domain/barlogx.cpp +++ b/tests/chartviewer/charts/domain/barlogx.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qhorizontalbarseries.h" -#include "qbarset.h" -#include "qlogvalueaxis.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QHorizontalBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QBarCategoryAxis> class BarLogX: public Chart { diff --git a/tests/chartviewer/charts/domain/barlogy.cpp b/tests/chartviewer/charts/domain/barlogy.cpp index 8503f806..e8c36acd 100644 --- a/tests/chartviewer/charts/domain/barlogy.cpp +++ b/tests/chartviewer/charts/domain/barlogy.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qbarseries.h" -#include "qbarset.h" -#include "qlogvalueaxis.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QBarCategoryAxis> class BarLogY: public Chart { diff --git a/tests/chartviewer/charts/domain/barpercentlogx.cpp b/tests/chartviewer/charts/domain/barpercentlogx.cpp index b2b84732..ce61c5cc 100644 --- a/tests/chartviewer/charts/domain/barpercentlogx.cpp +++ b/tests/chartviewer/charts/domain/barpercentlogx.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qhorizontalpercentbarseries.h" -#include "qbarset.h" -#include "qlogvalueaxis.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QHorizontalPercentBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QBarCategoryAxis> class BarPercentLogX: public Chart { diff --git a/tests/chartviewer/charts/domain/barpercentlogy.cpp b/tests/chartviewer/charts/domain/barpercentlogy.cpp index f55cf886..cf10e76c 100644 --- a/tests/chartviewer/charts/domain/barpercentlogy.cpp +++ b/tests/chartviewer/charts/domain/barpercentlogy.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qpercentbarseries.h" -#include "qbarset.h" -#include "qlogvalueaxis.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QPercentBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QBarCategoryAxis> class BarPercentLogY: public Chart { diff --git a/tests/chartviewer/charts/domain/barstackedlogx.cpp b/tests/chartviewer/charts/domain/barstackedlogx.cpp index 448bdd9c..e10445f1 100644 --- a/tests/chartviewer/charts/domain/barstackedlogx.cpp +++ b/tests/chartviewer/charts/domain/barstackedlogx.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qhorizontalstackedbarseries.h" -#include "qbarset.h" -#include "qlogvalueaxis.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QHorizontalStackedBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QBarCategoryAxis> class BarStackedLogX: public Chart { diff --git a/tests/chartviewer/charts/domain/barstackedlogy.cpp b/tests/chartviewer/charts/domain/barstackedlogy.cpp index bdf81248..114252d9 100644 --- a/tests/chartviewer/charts/domain/barstackedlogy.cpp +++ b/tests/chartviewer/charts/domain/barstackedlogy.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qstackedbarseries.h" -#include "qbarset.h" -#include "qlogvalueaxis.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QStackedBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QBarCategoryAxis> class BarStackedLogY: public Chart { diff --git a/tests/chartviewer/charts/domain/linelogxlogy.cpp b/tests/chartviewer/charts/domain/linelogxlogy.cpp index dbeeb5d5..dea1ef04 100644 --- a/tests/chartviewer/charts/domain/linelogxlogy.cpp +++ b/tests/chartviewer/charts/domain/linelogxlogy.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qlogvalueaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QLogValueAxis> class LineLogXLogY: public Chart { diff --git a/tests/chartviewer/charts/domain/linelogxy.cpp b/tests/chartviewer/charts/domain/linelogxy.cpp index a465d7bd..ca0d7cf1 100644 --- a/tests/chartviewer/charts/domain/linelogxy.cpp +++ b/tests/chartviewer/charts/domain/linelogxy.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qlogvalueaxis.h" -#include "qvalueaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QValueAxis> class LineLogXY: public Chart { diff --git a/tests/chartviewer/charts/domain/linexlogy.cpp b/tests/chartviewer/charts/domain/linexlogy.cpp index 2f20a0f6..16ec254d 100644 --- a/tests/chartviewer/charts/domain/linexlogy.cpp +++ b/tests/chartviewer/charts/domain/linexlogy.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qlogvalueaxis.h" -#include "qvalueaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QValueAxis> class LineXLogY: public Chart { diff --git a/tests/chartviewer/charts/domain/scatterlogxlogy.cpp b/tests/chartviewer/charts/domain/scatterlogxlogy.cpp index 7c01409e..c87def5c 100644 --- a/tests/chartviewer/charts/domain/scatterlogxlogy.cpp +++ b/tests/chartviewer/charts/domain/scatterlogxlogy.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qscatterseries.h" -#include "qlogvalueaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QLogValueAxis> class ScatterLogXLogY: public Chart { diff --git a/tests/chartviewer/charts/domain/scatterlogxy.cpp b/tests/chartviewer/charts/domain/scatterlogxy.cpp index 11138431..d7603616 100644 --- a/tests/chartviewer/charts/domain/scatterlogxy.cpp +++ b/tests/chartviewer/charts/domain/scatterlogxy.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qscatterseries.h" -#include "qlogvalueaxis.h" -#include "qvalueaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QValueAxis> class ScatterLogXY: public Chart { diff --git a/tests/chartviewer/charts/domain/scatterxlogy.cpp b/tests/chartviewer/charts/domain/scatterxlogy.cpp index c2813299..bc09bf66 100644 --- a/tests/chartviewer/charts/domain/scatterxlogy.cpp +++ b/tests/chartviewer/charts/domain/scatterxlogy.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qscatterseries.h" -#include "qlogvalueaxis.h" -#include "qvalueaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QValueAxis> class ScatterXLogY: public Chart { diff --git a/tests/chartviewer/charts/domain/splinelogxlogy.cpp b/tests/chartviewer/charts/domain/splinelogxlogy.cpp index cf103a07..b87a4bb7 100644 --- a/tests/chartviewer/charts/domain/splinelogxlogy.cpp +++ b/tests/chartviewer/charts/domain/splinelogxlogy.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qsplineseries.h" -#include "qlogvalueaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QLogValueAxis> class SplineLogXLogY: public Chart { diff --git a/tests/chartviewer/charts/domain/splinelogxy.cpp b/tests/chartviewer/charts/domain/splinelogxy.cpp index 7feb5806..0354aadf 100644 --- a/tests/chartviewer/charts/domain/splinelogxy.cpp +++ b/tests/chartviewer/charts/domain/splinelogxy.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qsplineseries.h" -#include "qlogvalueaxis.h" -#include "qvalueaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QValueAxis> class SplineLogXY: public Chart { diff --git a/tests/chartviewer/charts/domain/splinexlogy.cpp b/tests/chartviewer/charts/domain/splinexlogy.cpp index e0a36d01..6a6d8210 100644 --- a/tests/chartviewer/charts/domain/splinexlogy.cpp +++ b/tests/chartviewer/charts/domain/splinexlogy.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qsplineseries.h" -#include "qlogvalueaxis.h" -#include "qvalueaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QValueAxis> class SplineXLogY: public Chart { diff --git a/tests/chartviewer/charts/font/font.cpp b/tests/chartviewer/charts/font/font.cpp index 82c36b6a..b544ca94 100644 --- a/tests/chartviewer/charts/font/font.cpp +++ b/tests/chartviewer/charts/font/font.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> class FontChart: public Chart { diff --git a/tests/chartviewer/charts/multiaxis/multivalueaxis.cpp b/tests/chartviewer/charts/multiaxis/multivalueaxis.cpp index d44eacd5..960b9c6a 100644 --- a/tests/chartviewer/charts/multiaxis/multivalueaxis.cpp +++ b/tests/chartviewer/charts/multiaxis/multivalueaxis.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qvalueaxis.h" -#include "qcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QValueAxis> +#include <QtCharts/QCategoryAxis> class MultiValueAxis: public Chart { diff --git a/tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp b/tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp index 63a776f0..91e1d7a3 100644 --- a/tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp +++ b/tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qvalueaxis.h" -#include "qcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QValueAxis> +#include <QtCharts/QCategoryAxis> class MultiValueAxis2: public Chart { diff --git a/tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp b/tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp index 0ecb6bcd..3d25169e 100644 --- a/tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp +++ b/tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qvalueaxis.h" -#include "qcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QValueAxis> +#include <QtCharts/QCategoryAxis> class MultiValueAxis3: public Chart { diff --git a/tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp b/tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp index 2f40f827..5a69ec74 100644 --- a/tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp +++ b/tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp @@ -19,10 +19,10 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qvalueaxis.h" -#include "qcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QValueAxis> +#include <QtCharts/QCategoryAxis> class MultiValueAxis4: public Chart { diff --git a/tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp b/tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp index e26e2a36..300a0f4b 100644 --- a/tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp +++ b/tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp @@ -19,13 +19,13 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qvalueaxis.h" -#include "qcategoryaxis.h" -#include "qbarseries.h" -#include "qbarset.h" -#include "qbarcategoryaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QValueAxis> +#include <QtCharts/QCategoryAxis> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QBarCategoryAxis> class MultiValueBarAxis: public Chart { diff --git a/tests/chartviewer/charts/pieseries/donutchart.cpp b/tests/chartviewer/charts/pieseries/donutchart.cpp index 1231de57..50026ecf 100644 --- a/tests/chartviewer/charts/pieseries/donutchart.cpp +++ b/tests/chartviewer/charts/pieseries/donutchart.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qpieseries.h" +#include <QtCharts/QChart> +#include <QtCharts/QPieSeries> class DonutChart: public Chart { diff --git a/tests/chartviewer/charts/pieseries/piechart.cpp b/tests/chartviewer/charts/pieseries/piechart.cpp index cae98ac0..f88e4657 100644 --- a/tests/chartviewer/charts/pieseries/piechart.cpp +++ b/tests/chartviewer/charts/pieseries/piechart.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qpieseries.h" +#include <QtCharts/QChart> +#include <QtCharts/QPieSeries> class PieChart: public Chart { diff --git a/tests/chartviewer/charts/size/sizecharts.cpp b/tests/chartviewer/charts/size/sizecharts.cpp index 2f22930e..6be59159 100644 --- a/tests/chartviewer/charts/size/sizecharts.cpp +++ b/tests/chartviewer/charts/size/sizecharts.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" -#include "qvalueaxis.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> +#include <QtCharts/QValueAxis> class SizeChart: public Chart { diff --git a/tests/chartviewer/charts/xyseries/areachart.cpp b/tests/chartviewer/charts/xyseries/areachart.cpp index 8af95079..dc869c3b 100644 --- a/tests/chartviewer/charts/xyseries/areachart.cpp +++ b/tests/chartviewer/charts/xyseries/areachart.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qareaseries.h" -#include "qlineseries.h" +#include <QtCharts/QChart> +#include <QtCharts/QAreaSeries> +#include <QtCharts/QLineSeries> class AreaChart: public Chart { diff --git a/tests/chartviewer/charts/xyseries/linechart.cpp b/tests/chartviewer/charts/xyseries/linechart.cpp index 5cf6cbff..4ef39e4c 100644 --- a/tests/chartviewer/charts/xyseries/linechart.cpp +++ b/tests/chartviewer/charts/xyseries/linechart.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qlineseries.h" +#include <QtCharts/QChart> +#include <QtCharts/QLineSeries> class LineChart: public Chart { diff --git a/tests/chartviewer/charts/xyseries/scatterchart.cpp b/tests/chartviewer/charts/xyseries/scatterchart.cpp index cac7640d..d49e7f49 100644 --- a/tests/chartviewer/charts/xyseries/scatterchart.cpp +++ b/tests/chartviewer/charts/xyseries/scatterchart.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qscatterseries.h" +#include <QtCharts/QChart> +#include <QtCharts/QScatterSeries> class ScatterChart: public Chart { diff --git a/tests/chartviewer/charts/xyseries/splinechart.cpp b/tests/chartviewer/charts/xyseries/splinechart.cpp index 555165bb..38ffe340 100644 --- a/tests/chartviewer/charts/xyseries/splinechart.cpp +++ b/tests/chartviewer/charts/xyseries/splinechart.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "charts.h" -#include "qchart.h" -#include "qsplineseries.h" +#include <QtCharts/QChart> +#include <QtCharts/QSplineSeries> class SplineChart: public Chart { diff --git a/tests/chartviewer/grid.cpp b/tests/chartviewer/grid.cpp index 3620b9f6..f1619ab0 100644 --- a/tests/chartviewer/grid.cpp +++ b/tests/chartviewer/grid.cpp @@ -20,10 +20,10 @@ #include "grid.h" #include "charts.h" -#include <qchart.h> -#include <QGraphicsGridLayout> -#include <QGraphicsSceneMouseEvent> -#include <QDebug> +#include <QtCharts/QChart> +#include <QtWidgets/QGraphicsGridLayout> +#include <QtWidgets/QGraphicsSceneMouseEvent> +#include <QtCore/QDebug> Grid::Grid(int size, QGraphicsItem *parent) : QGraphicsWidget(parent), diff --git a/tests/chartviewer/grid.h b/tests/chartviewer/grid.h index 276fcceb..a519503d 100644 --- a/tests/chartviewer/grid.h +++ b/tests/chartviewer/grid.h @@ -22,8 +22,8 @@ #define GRID_H_ #include "model.h" -#include <QGraphicsWidget> -#include <QChartGlobal> +#include <QtWidgets/QGraphicsWidget> +#include <QtCharts/QChartGlobal> class QGraphicsGridLayout; class Chart; diff --git a/tests/chartviewer/main.cpp b/tests/chartviewer/main.cpp index 2745f575..6a267632 100644 --- a/tests/chartviewer/main.cpp +++ b/tests/chartviewer/main.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "window.h" -#include <QApplication> -#include <QMainWindow> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> #include <iostream> QVariantHash parseArgs(QStringList args) diff --git a/tests/chartviewer/model.h b/tests/chartviewer/model.h index f3e80a22..0400a631 100644 --- a/tests/chartviewer/model.h +++ b/tests/chartviewer/model.h @@ -21,10 +21,10 @@ #ifndef MODEL_H #define MODEL_H -#include <QList> -#include <QPair> -#include <QPointF> -#include <QTime> +#include <QtCore/QList> +#include <QtCore/QPair> +#include <QtCore/QPointF> +#include <QtCore/QTime> #include <stdlib.h> typedef QPair<QPointF, QString> Data; diff --git a/tests/chartviewer/view.cpp b/tests/chartviewer/view.cpp index 870efe29..67ef7918 100644 --- a/tests/chartviewer/view.cpp +++ b/tests/chartviewer/view.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "view.h" -#include <QGraphicsWidget> -#include <QResizeEvent> -#include <QDebug> +#include <QtWidgets/QGraphicsWidget> +#include <QtGui/QResizeEvent> +#include <QtCore/QDebug> View::View(QGraphicsScene *scene, QGraphicsWidget *form , QWidget *parent) : QGraphicsView(scene, parent), diff --git a/tests/chartviewer/view.h b/tests/chartviewer/view.h index 4206cad0..c9c80860 100644 --- a/tests/chartviewer/view.h +++ b/tests/chartviewer/view.h @@ -20,7 +20,7 @@ #ifndef VIEW_H #define VIEW_H -#include <QGraphicsView> +#include <QtWidgets/QGraphicsView> class QGraphicsScene; class QResizeEvent; diff --git a/tests/chartviewer/window.cpp b/tests/chartviewer/window.cpp index d59202d4..d535adf6 100644 --- a/tests/chartviewer/window.cpp +++ b/tests/chartviewer/window.cpp @@ -22,24 +22,24 @@ #include "view.h" #include "grid.h" #include "charts.h" -#include <QChartView> -#include <QAreaSeries> -#include <QLegend> -#include <QGridLayout> -#include <QFormLayout> -#include <QComboBox> -#include <QSpinBox> -#include <QCheckBox> -#include <QGroupBox> -#include <QLabel> -#include <QGraphicsScene> -#include <QGraphicsLinearLayout> -#include <QGraphicsProxyWidget> -#include <QGLWidget> -#include <QApplication> -#include <QDebug> -#include <QMenu> -#include <QPushButton> +#include <QtCharts/QChartView> +#include <QtCharts/QAreaSeries> +#include <QtCharts/QLegend> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QSpinBox> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QLabel> +#include <QtWidgets/QGraphicsScene> +#include <QtWidgets/QGraphicsLinearLayout> +#include <QtWidgets/QGraphicsProxyWidget> +#include <QtOpenGL/QGLWidget> +#include <QtWidgets/QApplication> +#include <QtCore/QDebug> +#include <QtWidgets/QMenu> +#include <QtWidgets/QPushButton> Window::Window(const QVariantHash ¶meters, QWidget *parent) : QMainWindow(parent), diff --git a/tests/chartviewer/window.h b/tests/chartviewer/window.h index 53fa7171..94d954ee 100644 --- a/tests/chartviewer/window.h +++ b/tests/chartviewer/window.h @@ -20,10 +20,10 @@ #ifndef WINDOW_H #define WINDOW_H -#include <QMainWindow> -#include <QChartGlobal> -#include <QHash> -#include <QComboBox> +#include <QtWidgets/QMainWindow> +#include <QtCharts/QChartGlobal> +#include <QtCore/QHash> +#include <QtWidgets/QComboBox> class QCheckBox; class QGraphicsRectItem; diff --git a/tests/chartwidgettest/dataseriedialog.cpp b/tests/chartwidgettest/dataseriedialog.cpp index cca419d5..622e975c 100644 --- a/tests/chartwidgettest/dataseriedialog.cpp +++ b/tests/chartwidgettest/dataseriedialog.cpp @@ -19,14 +19,14 @@ ****************************************************************************/
#include "dataseriedialog.h"
-#include <QDialogButtonBox>
-#include <QGridLayout>
-#include <QCheckBox>
-#include <QPushButton>
-#include <QGroupBox>
-#include <QRadioButton>
-#include <QLabel>
-#include <QDebug>
+#include <QtWidgets/QDialogButtonBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QLabel>
+#include <QtCore/QDebug>
DataSerieDialog::DataSerieDialog(QWidget *parent) :
QDialog(parent)
diff --git a/tests/chartwidgettest/dataseriedialog.h b/tests/chartwidgettest/dataseriedialog.h index aad3bfd6..9fc8cf7c 100644 --- a/tests/chartwidgettest/dataseriedialog.h +++ b/tests/chartwidgettest/dataseriedialog.h @@ -21,7 +21,7 @@ #ifndef DATASERIEDIALOG_H
#define DATASERIEDIALOG_H
-#include <QDialog>
+#include <QtWidgets/QDialog>
class QGroupBox;
class QCheckBox;
diff --git a/tests/chartwidgettest/mainwidget.cpp b/tests/chartwidgettest/mainwidget.cpp index 76676a93..eb263f90 100644 --- a/tests/chartwidgettest/mainwidget.cpp +++ b/tests/chartwidgettest/mainwidget.cpp @@ -20,30 +20,30 @@ #include "mainwidget.h"
#include "dataseriedialog.h"
-#include "qchartview.h"
-#include "qpieseries.h"
-#include "qscatterseries.h"
-#include "qlineseries.h"
-#include <qareaseries.h>
-#include <qsplineseries.h>
-#include <qbarset.h>
-#include <qbarseries.h>
-#include <qstackedbarseries.h>
-#include <qpercentbarseries.h>
-#include <QPushButton>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QCheckBox>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSpacerItem>
-#include <QMessageBox>
+#include <QtCharts/QChartView>
+#include <QtCharts/QPieSeries>
+#include <QtCharts/QScatterSeries>
+#include <QtCharts/QLineSeries>
+#include <QtCharts/QAreaSeries>
+#include <QtCharts/QSplineSeries>
+#include <QtCharts/QBarSet>
+#include <QtCharts/QBarSeries>
+#include <QtCharts/QStackedBarSeries>
+#include <QtCharts/QPercentBarSeries>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QSpacerItem>
+#include <QtWidgets/QMessageBox>
#include <cmath>
-#include <QDebug>
-#include <QStandardItemModel>
-#include <QBarCategoryAxis>
-#include <QGLWidget>
+#include <QtCore/QDebug>
+#include <QtGui/QStandardItemModel>
+#include <QtCharts/QBarCategoryAxis>
+#include <QtOpenGL/QGLWidget>
QT_CHARTS_USE_NAMESPACE
diff --git a/tests/chartwidgettest/mainwidget.h b/tests/chartwidgettest/mainwidget.h index 49d36518..4549c0d4 100644 --- a/tests/chartwidgettest/mainwidget.h +++ b/tests/chartwidgettest/mainwidget.h @@ -21,10 +21,10 @@ #ifndef MAINWIDGET_H
#define MAINWIDGET_H
-#include "qchartglobal.h"
-#include "qchart.h"
-#include "qchartview.h"
-#include <QWidget>
+#include <QtCharts/QChartGlobal>
+#include <QtCharts/QChart>
+#include <QtCharts/QChartView>
+#include <QtWidgets/QWidget>
class QSpinBox;
class QCheckBox;
diff --git a/tests/polarcharttest/chartview.cpp b/tests/polarcharttest/chartview.cpp index f0d72994..37a25f8f 100644 --- a/tests/polarcharttest/chartview.cpp +++ b/tests/polarcharttest/chartview.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "chartview.h" -#include <QMouseEvent> -#include <QDebug> -#include <QAbstractAxis> +#include <QtGui/QMouseEvent> +#include <QtCore/QDebug> +#include <QtCharts/QAbstractAxis> QT_CHARTS_USE_NAMESPACE diff --git a/tests/polarcharttest/chartview.h b/tests/polarcharttest/chartview.h index 550e8d83..fb8b4ff9 100644 --- a/tests/polarcharttest/chartview.h +++ b/tests/polarcharttest/chartview.h @@ -21,8 +21,8 @@ #ifndef CHARTVIEW_H #define CHARTVIEW_H -#include <QChartView> -#include <QPolarChart> +#include <QtCharts/QChartView> +#include <QtCharts/QPolarChart> QT_CHARTS_USE_NAMESPACE diff --git a/tests/polarcharttest/main.cpp b/tests/polarcharttest/main.cpp index 6d74893a..28203655 100644 --- a/tests/polarcharttest/main.cpp +++ b/tests/polarcharttest/main.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "mainwindow.h" -#include <QApplication> +#include <QtWidgets/QApplication> int main(int argc, char *argv[]) { diff --git a/tests/polarcharttest/mainwindow.cpp b/tests/polarcharttest/mainwindow.cpp index e1dddcc9..79c8918f 100644 --- a/tests/polarcharttest/mainwindow.cpp +++ b/tests/polarcharttest/mainwindow.cpp @@ -20,20 +20,20 @@ #include "mainwindow.h" #include "chartview.h" -#include <QScatterSeries> -#include <QLineSeries> -#include <QSplineSeries> -#include <QAreaSeries> -#include <QBarSeries> -#include <QBarSet> -#include <QValueAxis> -#include <QLogValueAxis> -#include <QDateTimeAxis> -#include <QCategoryAxis> -#include <QPolarChart> -#include <QDebug> -#include <qmath.h> -#include <QDateTime> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QLineSeries> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QAreaSeries> +#include <QtCharts/QBarSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QValueAxis> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QDateTimeAxis> +#include <QtCharts/QCategoryAxis> +#include <QtCharts/QPolarChart> +#include <QtCore/QDebug> +#include <QtCore/QtMath> +#include <QtCore/QDateTime> QT_CHARTS_USE_NAMESPACE #include "ui_mainwindow.h" diff --git a/tests/polarcharttest/mainwindow.h b/tests/polarcharttest/mainwindow.h index c16a292e..2257ef04 100644 --- a/tests/polarcharttest/mainwindow.h +++ b/tests/polarcharttest/mainwindow.h @@ -21,14 +21,14 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QPolarChart> -#include <QMainWindow> -#include <QFont> -#include <QChart> -#include <QScatterSeries> -#include <QLineSeries> -#include <QSplineSeries> -#include <QAreaSeries> +#include <QtCharts/QPolarChart> +#include <QtWidgets/QMainWindow> +#include <QtGui/QFont> +#include <QtCharts/QChart> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QLineSeries> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QAreaSeries> namespace Ui { class MainWindow; diff --git a/tests/presenterchart/chartview.cpp b/tests/presenterchart/chartview.cpp index efebadc0..be01933c 100644 --- a/tests/presenterchart/chartview.cpp +++ b/tests/presenterchart/chartview.cpp @@ -19,11 +19,11 @@ ****************************************************************************/ #include "chartview.h" -#include <QLineSeries> -#include <QScatterSeries> -#include <QSplineSeries> -#include <QAreaSeries> -#include <QTime> +#include <QtCharts/QLineSeries> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QAreaSeries> +#include <QtCore/QTime> ChartView::ChartView(QChart *chart, QWidget *parent) : QChartView(chart, parent), diff --git a/tests/presenterchart/chartview.h b/tests/presenterchart/chartview.h index 8753a11b..99d8c65a 100644 --- a/tests/presenterchart/chartview.h +++ b/tests/presenterchart/chartview.h @@ -21,8 +21,8 @@ #ifndef CHARTVIEW_H #define CHARTVIEW_H -#include <QChartView> -#include <QTimer> +#include <QtCharts/QChartView> +#include <QtCore/QTimer> QT_CHARTS_USE_NAMESPACE diff --git a/tests/presenterchart/main.cpp b/tests/presenterchart/main.cpp index 12a48faa..22a45025 100644 --- a/tests/presenterchart/main.cpp +++ b/tests/presenterchart/main.cpp @@ -19,8 +19,8 @@ ****************************************************************************/ #include "chartview.h" -#include <QApplication> -#include <QMainWindow> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> int main(int argc, char *argv[]) { diff --git a/tests/qmlchartaxis/main.cpp b/tests/qmlchartaxis/main.cpp index fb4d56f8..5c5923c7 100644 --- a/tests/qmlchartaxis/main.cpp +++ b/tests/qmlchartaxis/main.cpp @@ -18,7 +18,7 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QtWidgets/QApplication> #include <QtCore/QDir> #include <QtQuick/QQuickView> #include <QtQml/QQmlEngine> diff --git a/tests/qmlchartproperties/main.cpp b/tests/qmlchartproperties/main.cpp index 6eb3c801..752724be 100644 --- a/tests/qmlchartproperties/main.cpp +++ b/tests/qmlchartproperties/main.cpp @@ -18,7 +18,7 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QtWidgets/QApplication> #include <QtCore/QDir> #include <QtQuick/QQuickView> #include <QtQml/QQmlEngine> diff --git a/tests/tests.pri b/tests/tests.pri index 1a723c59..8748acf1 100644 --- a/tests/tests.pri +++ b/tests/tests.pri @@ -1,6 +1,3 @@ -INCLUDEPATH += ../../include - -LIBS += -L$$OUT_PWD/../../lib TEMPLATE = app QT += charts diff --git a/tests/wavechart/main.cpp b/tests/wavechart/main.cpp index 2d7a4f21..58423319 100644 --- a/tests/wavechart/main.cpp +++ b/tests/wavechart/main.cpp @@ -19,9 +19,9 @@ ****************************************************************************/ #include "wavechart.h" -#include <QApplication> -#include <QMainWindow> -#include <QGLWidget> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtOpenGL/QGLWidget> int main(int argc, char *argv[]) { diff --git a/tests/wavechart/wavechart.h b/tests/wavechart/wavechart.h index 336fa151..95978861 100644 --- a/tests/wavechart/wavechart.h +++ b/tests/wavechart/wavechart.h @@ -21,11 +21,11 @@ #ifndef WAVECHART_H #define WAVECHART_H -#include <QTimer> -#include <QTime> -#include <QObject> -#include <QLineSeries> -#include <QChartView> +#include <QtCore/QTimer> +#include <QtCore/QTime> +#include <QtCore/QObject> +#include <QtCharts/QLineSeries> +#include <QtCharts/QChartView> QT_CHARTS_USE_NAMESPACE |