diff options
Diffstat (limited to 'tests/chartviewer')
53 files changed, 206 insertions, 206 deletions
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; |