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 /examples/charts | |
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>
Diffstat (limited to 'examples/charts')
97 files changed, 397 insertions, 396 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 |