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/manual | |
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/manual')
26 files changed, 40 insertions, 40 deletions
diff --git a/tests/manual/barcharttester/chart-widget.h b/tests/manual/barcharttester/chart-widget.h index 8f8fe0d8..53164b87 100644 --- a/tests/manual/barcharttester/chart-widget.h +++ b/tests/manual/barcharttester/chart-widget.h @@ -39,7 +39,7 @@ #include <QtCore/QTimer> #include <QtCore/QElapsedTimer> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class ChartWidget : public QWidget diff --git a/tests/manual/boxplottester/mainwidget.cpp b/tests/manual/boxplottester/mainwidget.cpp index 2e79e3e0..a983f831 100644 --- a/tests/manual/boxplottester/mainwidget.cpp +++ b/tests/manual/boxplottester/mainwidget.cpp @@ -55,7 +55,7 @@ #include <QtCharts/QBarCategoryAxis> #include <QtCharts/QLogValueAxis> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE static const QString allCategories[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; static const int maxCategories = 12; diff --git a/tests/manual/boxplottester/mainwidget.h b/tests/manual/boxplottester/mainwidget.h index 5f1c92de..68b84653 100644 --- a/tests/manual/boxplottester/mainwidget.h +++ b/tests/manual/boxplottester/mainwidget.h @@ -47,7 +47,7 @@ QT_END_NAMESPACE class CustomTableModel; class PenTool; -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class MainWidget : public QWidget { diff --git a/tests/manual/candlesticktester/customtablemodel.h b/tests/manual/candlesticktester/customtablemodel.h index ebff4d53..2d1b4522 100644 --- a/tests/manual/candlesticktester/customtablemodel.h +++ b/tests/manual/candlesticktester/customtablemodel.h @@ -35,11 +35,11 @@ #include <QtCore/QHash> #include <QtCore/QRect> -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QCandlestickSet; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class CustomTableModel : public QAbstractTableModel { diff --git a/tests/manual/candlesticktester/mainwidget.cpp b/tests/manual/candlesticktester/mainwidget.cpp index ec2d5bd8..27e91f6b 100644 --- a/tests/manual/candlesticktester/mainwidget.cpp +++ b/tests/manual/candlesticktester/mainwidget.cpp @@ -47,7 +47,7 @@ #include "customtablemodel.h" #include "mainwidget.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE MainWidget::MainWidget(QWidget *parent) : QWidget(parent), diff --git a/tests/manual/candlesticktester/mainwidget.h b/tests/manual/candlesticktester/mainwidget.h index 4044515a..912a5a24 100644 --- a/tests/manual/candlesticktester/mainwidget.h +++ b/tests/manual/candlesticktester/mainwidget.h @@ -37,12 +37,12 @@ QT_BEGIN_NAMESPACE class QGridLayout; QT_END_NAMESPACE -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QCandlestickSet; class QHCandlestickModelMapper; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class MainWidget : public QWidget { diff --git a/tests/manual/chartdesigner/engine.h b/tests/manual/chartdesigner/engine.h index a534fd1d..a5eab211 100644 --- a/tests/manual/chartdesigner/engine.h +++ b/tests/manual/chartdesigner/engine.h @@ -38,15 +38,15 @@ class QStandardItemModel; class QItemSelectionModel; -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QChart; class QXYSeries; class QAbstractBarSeries; class QPieSeries; class QAreaSeries; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class Engine : public QObject { diff --git a/tests/manual/chartdesigner/mainwindow.h b/tests/manual/chartdesigner/mainwindow.h index 22711f94..b461e337 100644 --- a/tests/manual/chartdesigner/mainwindow.h +++ b/tests/manual/chartdesigner/mainwindow.h @@ -35,10 +35,10 @@ #include <QtCore/QMap> -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QChartView; class QAbstractSeries; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE class QGraphicsScene; class InspectorWidget; @@ -47,7 +47,7 @@ class PenWidget; class QTableView; class Engine; -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class MainWindow : public QMainWindow { diff --git a/tests/manual/chartviewer/charts.h b/tests/manual/chartviewer/charts.h index fcdd0262..7cf8fe94 100644 --- a/tests/manual/chartviewer/charts.h +++ b/tests/manual/chartviewer/charts.h @@ -36,11 +36,11 @@ #include <QtCore/QSharedPointer> #include <QtCharts/QChartGlobal> -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QChart; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class Chart { diff --git a/tests/manual/chartviewer/grid.h b/tests/manual/chartviewer/grid.h index 396b08fd..26cffb6c 100644 --- a/tests/manual/chartviewer/grid.h +++ b/tests/manual/chartviewer/grid.h @@ -40,11 +40,11 @@ QT_END_NAMESPACE class Chart; -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QChart; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class Grid : public QGraphicsWidget { diff --git a/tests/manual/chartviewer/window.h b/tests/manual/chartviewer/window.h index 8c9de07e..e21c205a 100644 --- a/tests/manual/chartviewer/window.h +++ b/tests/manual/chartviewer/window.h @@ -47,11 +47,11 @@ class View; class Chart; class Grid; -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QChart; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class Window: public QMainWindow diff --git a/tests/manual/chartwidgettest/mainwidget.cpp b/tests/manual/chartwidgettest/mainwidget.cpp index 4216fc07..471cddfb 100644 --- a/tests/manual/chartwidgettest/mainwidget.cpp +++ b/tests/manual/chartwidgettest/mainwidget.cpp @@ -56,7 +56,7 @@ #include <qmath.h> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE MainWidget::MainWidget(QWidget *parent) : QWidget(parent), diff --git a/tests/manual/chartwidgettest/mainwidget.h b/tests/manual/chartwidgettest/mainwidget.h index f5868620..78bfb9c9 100644 --- a/tests/manual/chartwidgettest/mainwidget.h +++ b/tests/manual/chartwidgettest/mainwidget.h @@ -41,7 +41,7 @@ class QCheckBox; class QGridLayout; QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE #define RealList QList<qreal> class DataSerieDialog; diff --git a/tests/manual/openglseriestest/chartview.cpp b/tests/manual/openglseriestest/chartview.cpp index dc0e4f32..922ed21a 100644 --- a/tests/manual/openglseriestest/chartview.cpp +++ b/tests/manual/openglseriestest/chartview.cpp @@ -30,7 +30,7 @@ #include "chartview.h" #include <QtGui/QMouseEvent> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE ChartView::ChartView(QWidget *parent) : QChartView(parent) diff --git a/tests/manual/openglseriestest/chartview.h b/tests/manual/openglseriestest/chartview.h index 07b6f6ed..fd4524a5 100644 --- a/tests/manual/openglseriestest/chartview.h +++ b/tests/manual/openglseriestest/chartview.h @@ -32,7 +32,7 @@ #include <QtCharts/QChartView> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class ChartView : public QChartView { diff --git a/tests/manual/openglseriestest/datasource.cpp b/tests/manual/openglseriestest/datasource.cpp index 4d29fd3d..566259d0 100644 --- a/tests/manual/openglseriestest/datasource.cpp +++ b/tests/manual/openglseriestest/datasource.cpp @@ -31,7 +31,7 @@ #include <QtCore/QtMath> #include <QtCore/QRandomGenerator> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE DataSource::DataSource(QObject *parent) : QObject(parent), diff --git a/tests/manual/openglseriestest/datasource.h b/tests/manual/openglseriestest/datasource.h index 932c9289..50cb0412 100644 --- a/tests/manual/openglseriestest/datasource.h +++ b/tests/manual/openglseriestest/datasource.h @@ -36,7 +36,7 @@ #include <QtCore/QElapsedTimer> #include <QtCore/QTimer> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE const int maxSeriesCount = 10; diff --git a/tests/manual/openglseriestest/mainwindow.cpp b/tests/manual/openglseriestest/mainwindow.cpp index 1497dad8..f9e1f6ff 100644 --- a/tests/manual/openglseriestest/mainwindow.cpp +++ b/tests/manual/openglseriestest/mainwindow.cpp @@ -40,7 +40,7 @@ #include <QtCore/QDebug> #include <QtCore/QDateTime> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE #include "ui_mainwindow.h" MainWindow::MainWindow(QWidget *parent) : diff --git a/tests/manual/openglseriestest/mainwindow.h b/tests/manual/openglseriestest/mainwindow.h index b7e84136..11548348 100644 --- a/tests/manual/openglseriestest/mainwindow.h +++ b/tests/manual/openglseriestest/mainwindow.h @@ -44,7 +44,7 @@ class MainWindow; QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class MainWindow : public QMainWindow { diff --git a/tests/manual/polarcharttest/chartview.cpp b/tests/manual/polarcharttest/chartview.cpp index 8f0913de..a167b233 100644 --- a/tests/manual/polarcharttest/chartview.cpp +++ b/tests/manual/polarcharttest/chartview.cpp @@ -32,7 +32,7 @@ #include <QtCore/QDebug> #include <QtCharts/QAbstractAxis> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE ChartView::ChartView(QWidget *parent) : QChartView(parent) diff --git a/tests/manual/polarcharttest/chartview.h b/tests/manual/polarcharttest/chartview.h index 08ab16b5..0be63919 100644 --- a/tests/manual/polarcharttest/chartview.h +++ b/tests/manual/polarcharttest/chartview.h @@ -33,7 +33,7 @@ #include <QtCharts/QChartView> #include <QtCharts/QPolarChart> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class ChartView : public QChartView { diff --git a/tests/manual/polarcharttest/mainwindow.cpp b/tests/manual/polarcharttest/mainwindow.cpp index 94036604..78af8c44 100644 --- a/tests/manual/polarcharttest/mainwindow.cpp +++ b/tests/manual/polarcharttest/mainwindow.cpp @@ -44,7 +44,7 @@ #include <QtCore/QtMath> #include <QtCore/QDateTime> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE #include "ui_mainwindow.h" MainWindow::MainWindow(QWidget *parent) : diff --git a/tests/manual/polarcharttest/mainwindow.h b/tests/manual/polarcharttest/mainwindow.h index 5dc4d6c6..b999aba0 100644 --- a/tests/manual/polarcharttest/mainwindow.h +++ b/tests/manual/polarcharttest/mainwindow.h @@ -49,7 +49,7 @@ class MainWindow; QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class MainWindow : public QMainWindow { diff --git a/tests/manual/presenterchart/chartview.h b/tests/manual/presenterchart/chartview.h index 745c69e7..b17f4870 100644 --- a/tests/manual/presenterchart/chartview.h +++ b/tests/manual/presenterchart/chartview.h @@ -33,7 +33,7 @@ #include <QtCharts/QChartView> #include <QtCore/QTimer> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE //![1] class ChartView: public QChartView diff --git a/tests/manual/wavechart/wavechart.cpp b/tests/manual/wavechart/wavechart.cpp index 695ddc72..ebaba7e7 100644 --- a/tests/manual/wavechart/wavechart.cpp +++ b/tests/manual/wavechart/wavechart.cpp @@ -31,7 +31,7 @@ #include <qmath.h> #include <qrandom.h> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE static const int numPoints =100; diff --git a/tests/manual/wavechart/wavechart.h b/tests/manual/wavechart/wavechart.h index ffadd81e..79dc5711 100644 --- a/tests/manual/wavechart/wavechart.h +++ b/tests/manual/wavechart/wavechart.h @@ -36,7 +36,7 @@ #include <QtCharts/QLineSeries> #include <QtCharts/QChartView> -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class WaveChart: public QChartView { |