diff options
author | Michal Klocek <michal.klocek@qt.io> | 2020-07-28 17:19:47 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2020-11-06 12:17:54 +0100 |
commit | 227020b118fa38ada1d8bd579593dae61f6e3881 (patch) | |
tree | eae709325afacfd9f63ef52d643ec20f1d926534 /tests/auto | |
parent | 71cb91cfba5ab7db2b2415a48881aeba37d71438 (diff) |
Remove charts namespace for Qt6
This auto refactor to remove charts namespace, just use qt one.
[ChangeLog] Use QT_NAMESPACE as other modules.
Change-Id: I7722ed2ff5cd84c594ea96db15e5df50a24f06b4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'tests/auto')
24 files changed, 27 insertions, 27 deletions
diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp index d9b3dbe1..fa3cbf78 100644 --- a/tests/auto/chartdataset/tst_chartdataset.cpp +++ b/tests/auto/chartdataset/tst_chartdataset.cpp @@ -48,7 +48,7 @@ #include <private/abstractdomain_p.h> #include <tst_definitions.h> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Q_DECLARE_METATYPE(AbstractDomain *) Q_DECLARE_METATYPE(QAbstractAxis *) diff --git a/tests/auto/domain/tst_domain.cpp b/tests/auto/domain/tst_domain.cpp index 14c769f1..5aabc888 100644 --- a/tests/auto/domain/tst_domain.cpp +++ b/tests/auto/domain/tst_domain.cpp @@ -31,7 +31,7 @@ #include <QtCharts/private/qabstractaxis_p.h> #include <tst_definitions.h> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Q_DECLARE_METATYPE(XYDomain*) Q_DECLARE_METATYPE(QSizeF) diff --git a/tests/auto/inc/tst_definitions.h b/tests/auto/inc/tst_definitions.h index ce5bb75d..16d6afd2 100644 --- a/tests/auto/inc/tst_definitions.h +++ b/tests/auto/inc/tst_definitions.h @@ -93,12 +93,12 @@ static inline bool isPolarTest() return isPolar; } -static inline QtCharts::QChart *newQChartOrQPolarChart() +static inline QChart *newQChartOrQPolarChart() { if (isPolarTest()) - return new QtCharts::QPolarChart(); + return new QPolarChart(); else - return new QtCharts::QChart(); + return new QChart(); } diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.h b/tests/auto/qabstractaxis/tst_qabstractaxis.h index 31d06f0d..bbb8664f 100644 --- a/tests/auto/qabstractaxis/tst_qabstractaxis.h +++ b/tests/auto/qabstractaxis/tst_qabstractaxis.h @@ -35,7 +35,7 @@ #include <QtCharts/QAbstractAxis> #include <QtCharts/QChartView> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class tst_QAbstractAxis : public QObject { diff --git a/tests/auto/qareaseries/tst_qareaseries.cpp b/tests/auto/qareaseries/tst_qareaseries.cpp index d2dc2a15..6e19f25c 100644 --- a/tests/auto/qareaseries/tst_qareaseries.cpp +++ b/tests/auto/qareaseries/tst_qareaseries.cpp @@ -36,7 +36,7 @@ #include <QtCharts/QValueAxis> #include <tst_definitions.h> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class tst_QAreaSeries : public QObject { diff --git a/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp b/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp index badbd67d..1fc900aa 100644 --- a/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp +++ b/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp @@ -38,7 +38,7 @@ #include <QtCharts/QHBarModelMapper> #include <QtGui/QStandardItemModel> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class tst_qbarmodelmapper : public QObject { diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index d96e59f9..d2c0cdc2 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -34,7 +34,7 @@ #include <QtCharts/QChart> #include "tst_definitions.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QBarSet*) Q_DECLARE_METATYPE(QList<QBarSet*>) diff --git a/tests/auto/qbarset/tst_qbarset.cpp b/tests/auto/qbarset/tst_qbarset.cpp index 63611002..8e9f7d03 100644 --- a/tests/auto/qbarset/tst_qbarset.cpp +++ b/tests/auto/qbarset/tst_qbarset.cpp @@ -33,7 +33,7 @@ #include <QtCharts/QChartView> #include "tst_definitions.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class tst_QBarSet : public QObject { diff --git a/tests/auto/qcandlestickmodelmapper/tst_qcandlestickmodelmapper.cpp b/tests/auto/qcandlestickmodelmapper/tst_qcandlestickmodelmapper.cpp index a9ac4837..caf7a8d3 100644 --- a/tests/auto/qcandlestickmodelmapper/tst_qcandlestickmodelmapper.cpp +++ b/tests/auto/qcandlestickmodelmapper/tst_qcandlestickmodelmapper.cpp @@ -36,7 +36,7 @@ #include <QtGui/QStandardItemModel> #include <QtTest/QtTest> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class tst_qcandlestickmodelmapper : public QObject { diff --git a/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp b/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp index 1775e354..6dca26d2 100644 --- a/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp +++ b/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp @@ -33,7 +33,7 @@ #include <QtTest/QtTest> #include "tst_definitions.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QCandlestickSet *) Q_DECLARE_METATYPE(QList<QCandlestickSet *>) @@ -322,7 +322,7 @@ void tst_QCandlestickSeries::clear() void tst_QCandlestickSeries::sets() { m_series->append(m_sets); - QCOMPARE(m_series->sets(), (QList<QtCharts::QCandlestickSet *>)m_sets); + QCOMPARE(m_series->sets(), (QList<QCandlestickSet *>)m_sets); for (int i = 0; i < m_sets.count(); ++i) QCOMPARE(m_series->sets().at(i), m_sets.at(i)); diff --git a/tests/auto/qcandlestickset/tst_qcandlestickset.cpp b/tests/auto/qcandlestickset/tst_qcandlestickset.cpp index 5e94d4c9..8315db46 100644 --- a/tests/auto/qcandlestickset/tst_qcandlestickset.cpp +++ b/tests/auto/qcandlestickset/tst_qcandlestickset.cpp @@ -31,7 +31,7 @@ #include <QtCore/QDateTime> #include <QtTest/QtTest> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class tst_QCandlestickSet : public QObject { diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp index 49313db8..c44f6398 100644 --- a/tests/auto/qchart/tst_qchart.cpp +++ b/tests/auto/qchart/tst_qchart.cpp @@ -43,7 +43,7 @@ #include <QtCharts/QDateTimeAxis> #include "tst_definitions.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QAbstractAxis *) Q_DECLARE_METATYPE(QValueAxis *) diff --git a/tests/auto/qchartview/tst_qchartview.cpp b/tests/auto/qchartview/tst_qchartview.cpp index f93e50d6..783d8bba 100644 --- a/tests/auto/qchartview/tst_qchartview.cpp +++ b/tests/auto/qchartview/tst_qchartview.cpp @@ -34,7 +34,7 @@ #include <tst_definitions.h> #include <QtCharts/QValueAxis> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QChart*) diff --git a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp index 7fcf62c0..648f5692 100644 --- a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp +++ b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp @@ -34,7 +34,7 @@ #include <QtCharts/QChart> #include "tst_definitions.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QBarSet*) Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition) diff --git a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp index a4b1f542..f7675076 100644 --- a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp +++ b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp @@ -34,7 +34,7 @@ #include <QtCharts/QChart> #include "tst_definitions.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QBarSet*) Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition) diff --git a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp index 65f5718b..69e1ad01 100644 --- a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp +++ b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp @@ -34,7 +34,7 @@ #include <QtCharts/QChart> #include "tst_definitions.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QBarSet*) Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition) diff --git a/tests/auto/qlegend/tst_qlegend.cpp b/tests/auto/qlegend/tst_qlegend.cpp index 8d7ead2c..953abd77 100644 --- a/tests/auto/qlegend/tst_qlegend.cpp +++ b/tests/auto/qlegend/tst_qlegend.cpp @@ -42,7 +42,7 @@ #include <QtCharts/QBarLegendMarker> #include "tst_definitions.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class tst_QLegend : public QObject { diff --git a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp index fdfe39ab..465c2e9f 100644 --- a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp +++ b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp @@ -34,7 +34,7 @@ #include <QtCharts/QChart> #include "tst_definitions.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QBarSet*) Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition) diff --git a/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp b/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp index e7b50795..ea83d928 100644 --- a/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp +++ b/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp @@ -38,7 +38,7 @@ #include <QtCharts/QHPieModelMapper> #include <QtGui/QStandardItemModel> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class tst_qpiemodelmapper : public QObject { diff --git a/tests/auto/qpieseries/tst_qpieseries.cpp b/tests/auto/qpieseries/tst_qpieseries.cpp index e8542272..e4eddd71 100644 --- a/tests/auto/qpieseries/tst_qpieseries.cpp +++ b/tests/auto/qpieseries/tst_qpieseries.cpp @@ -36,7 +36,7 @@ #include <QtGui/QStandardItemModel> #include <tst_definitions.h> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QPieSlice*) Q_DECLARE_METATYPE(QList<QPieSlice*>) diff --git a/tests/auto/qpieslice/tst_qpieslice.cpp b/tests/auto/qpieslice/tst_qpieslice.cpp index 668b660e..fdccd426 100644 --- a/tests/auto/qpieslice/tst_qpieslice.cpp +++ b/tests/auto/qpieslice/tst_qpieslice.cpp @@ -36,7 +36,7 @@ #include <QtCharts/QPieSlice> #include <QtCharts/QPieSeries> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class tst_qpieslice : public QObject { diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp index 89d7c723..dbd739f3 100644 --- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp +++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp @@ -34,7 +34,7 @@ #include <QtCharts/QChart> #include "tst_definitions.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QBarSet*) Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition) diff --git a/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp b/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp index d990926d..93e5773b 100644 --- a/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp +++ b/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp @@ -39,7 +39,7 @@ #include <QtGui/QStandardItemModel> #include "tst_definitions.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class tst_qxymodelmapper : public QObject { diff --git a/tests/auto/qxyseries/tst_qxyseries.h b/tests/auto/qxyseries/tst_qxyseries.h index 0f82e06b..5548167a 100644 --- a/tests/auto/qxyseries/tst_qxyseries.h +++ b/tests/auto/qxyseries/tst_qxyseries.h @@ -36,7 +36,7 @@ #include <QtGui/QStandardItemModel> #include <tst_definitions.h> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class tst_QXYSeries : public QObject { |