From 227020b118fa38ada1d8bd579593dae61f6e3881 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 28 Jul 2020 17:19:47 +0200 Subject: 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 --- examples/charts/areachart/main.cpp | 2 +- examples/charts/audio/widget.cpp | 2 +- examples/charts/audio/widget.h | 6 +++--- examples/charts/audio/xyseriesiodevice.h | 6 +++--- examples/charts/barchart/main.cpp | 2 +- examples/charts/barmodelmapper/tablewidget.cpp | 2 +- examples/charts/boxplotchart/boxdatareader.h | 2 +- examples/charts/boxplotchart/main.cpp | 2 +- examples/charts/callout/callout.h | 6 +++--- examples/charts/callout/view.h | 6 +++--- examples/charts/candlestickchart/candlestickdatareader.h | 2 +- examples/charts/candlestickchart/main.cpp | 2 +- examples/charts/chartinteractions/chart.h | 2 +- examples/charts/chartinteractions/chartview.h | 2 +- examples/charts/chartinteractions/main.cpp | 2 +- examples/charts/chartthemes/themewidget.h | 6 +++--- examples/charts/customchart/main.cpp | 2 +- examples/charts/datetimeaxis/main.cpp | 2 +- examples/charts/donutbreakdown/donutbreakdownchart.cpp | 2 +- examples/charts/donutbreakdown/donutbreakdownchart.h | 2 +- examples/charts/donutbreakdown/main.cpp | 2 +- examples/charts/donutbreakdown/mainslice.cpp | 2 +- examples/charts/donutbreakdown/mainslice.h | 2 +- examples/charts/donutchart/main.cpp | 2 +- examples/charts/dynamicspline/chart.h | 6 +++--- examples/charts/dynamicspline/main.cpp | 2 +- examples/charts/horizontalbarchart/main.cpp | 2 +- examples/charts/horizontalpercentbarchart/main.cpp | 2 +- examples/charts/horizontalstackedbarchart/main.cpp | 2 +- examples/charts/legend/main.cpp | 2 +- examples/charts/legend/mainwidget.cpp | 2 +- examples/charts/legend/mainwidget.h | 2 +- examples/charts/legendmarkers/mainwidget.cpp | 2 +- examples/charts/legendmarkers/mainwidget.h | 2 +- examples/charts/lineandbar/main.cpp | 2 +- examples/charts/linechart/main.cpp | 2 +- examples/charts/logvalueaxis/main.cpp | 2 +- examples/charts/modeldata/tablewidget.cpp | 2 +- examples/charts/multiaxis/main.cpp | 2 +- examples/charts/nesteddonuts/widget.cpp | 2 +- examples/charts/nesteddonuts/widget.h | 2 +- examples/charts/openglseries/datasource.cpp | 2 +- examples/charts/openglseries/datasource.h | 2 +- examples/charts/openglseries/main.cpp | 2 +- examples/charts/percentbarchart/main.cpp | 2 +- examples/charts/piechart/main.cpp | 2 +- examples/charts/piechartcustomization/customslice.cpp | 2 +- examples/charts/piechartcustomization/customslice.h | 2 +- examples/charts/piechartcustomization/mainwidget.cpp | 2 +- examples/charts/piechartcustomization/mainwidget.h | 6 +++--- examples/charts/piechartdrilldown/drilldownchart.cpp | 2 +- examples/charts/piechartdrilldown/drilldownchart.h | 6 +++--- examples/charts/piechartdrilldown/drilldownslice.cpp | 2 +- examples/charts/piechartdrilldown/drilldownslice.h | 6 +++--- examples/charts/piechartdrilldown/main.cpp | 2 +- examples/charts/polarchart/chartview.cpp | 2 +- examples/charts/polarchart/chartview.h | 2 +- examples/charts/polarchart/main.cpp | 2 +- examples/charts/qmloscilloscope/datasource.cpp | 2 +- examples/charts/qmloscilloscope/datasource.h | 2 +- examples/charts/scatterchart/chartview.h | 2 +- examples/charts/scatterchart/main.cpp | 2 +- examples/charts/scatterinteractions/chartview.cpp | 2 +- examples/charts/scatterinteractions/chartview.h | 2 +- examples/charts/splinechart/main.cpp | 2 +- examples/charts/stackedbarchart/main.cpp | 2 +- examples/charts/stackedbarchartdrilldown/drilldownchart.cpp | 2 +- examples/charts/stackedbarchartdrilldown/drilldownchart.h | 6 +++--- examples/charts/stackedbarchartdrilldown/drilldownseries.cpp | 2 +- examples/charts/stackedbarchartdrilldown/drilldownseries.h | 2 +- examples/charts/stackedbarchartdrilldown/main.cpp | 2 +- examples/charts/temperaturerecords/main.cpp | 2 +- examples/charts/zoomlinechart/chart.h | 2 +- examples/charts/zoomlinechart/chartview.h | 2 +- examples/charts/zoomlinechart/main.cpp | 2 +- 75 files changed, 95 insertions(+), 95 deletions(-) (limited to 'examples') diff --git a/examples/charts/areachart/main.cpp b/examples/charts/areachart/main.cpp index 1bed9770..dbd1ed9f 100644 --- a/examples/charts/areachart/main.cpp +++ b/examples/charts/areachart/main.cpp @@ -33,7 +33,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/audio/widget.cpp b/examples/charts/audio/widget.cpp index 70d2387c..c4945067 100644 --- a/examples/charts/audio/widget.cpp +++ b/examples/charts/audio/widget.cpp @@ -40,7 +40,7 @@ #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Widget::Widget(const QAudioDeviceInfo &deviceInfo, QWidget *parent) : QWidget(parent), diff --git a/examples/charts/audio/widget.h b/examples/charts/audio/widget.h index 82072b92..f4c3f049 100644 --- a/examples/charts/audio/widget.h +++ b/examples/charts/audio/widget.h @@ -33,12 +33,12 @@ #include #include -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLineSeries; class QChart; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class XYSeriesIODevice; diff --git a/examples/charts/audio/xyseriesiodevice.h b/examples/charts/audio/xyseriesiodevice.h index 52f4bf05..f2b058c8 100644 --- a/examples/charts/audio/xyseriesiodevice.h +++ b/examples/charts/audio/xyseriesiodevice.h @@ -35,11 +35,11 @@ #include #include -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QXYSeries; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class XYSeriesIODevice : public QIODevice { diff --git a/examples/charts/barchart/main.cpp b/examples/charts/barchart/main.cpp index adf5a8d8..934a8255 100644 --- a/examples/charts/barchart/main.cpp +++ b/examples/charts/barchart/main.cpp @@ -36,7 +36,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/barmodelmapper/tablewidget.cpp b/examples/charts/barmodelmapper/tablewidget.cpp index 89680d2e..d18c0ce5 100644 --- a/examples/charts/barmodelmapper/tablewidget.cpp +++ b/examples/charts/barmodelmapper/tablewidget.cpp @@ -41,7 +41,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE TableWidget::TableWidget(QWidget *parent) : QWidget(parent) diff --git a/examples/charts/boxplotchart/boxdatareader.h b/examples/charts/boxplotchart/boxdatareader.h index cca2799e..ef1e1c65 100644 --- a/examples/charts/boxplotchart/boxdatareader.h +++ b/examples/charts/boxplotchart/boxdatareader.h @@ -33,7 +33,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class BoxDataReader : public QTextStream { diff --git a/examples/charts/boxplotchart/main.cpp b/examples/charts/boxplotchart/main.cpp index 671b34cc..e57ad151 100644 --- a/examples/charts/boxplotchart/main.cpp +++ b/examples/charts/boxplotchart/main.cpp @@ -38,7 +38,7 @@ #include "boxdatareader.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/callout/callout.h b/examples/charts/callout/callout.h index 67cc76ff..db8b4824 100644 --- a/examples/charts/callout/callout.h +++ b/examples/charts/callout/callout.h @@ -38,11 +38,11 @@ QT_BEGIN_NAMESPACE class QGraphicsSceneMouseEvent; QT_END_NAMESPACE -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QChart; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class Callout : public QGraphicsItem { diff --git a/examples/charts/callout/view.h b/examples/charts/callout/view.h index 4d17461b..195a8685 100644 --- a/examples/charts/callout/view.h +++ b/examples/charts/callout/view.h @@ -38,13 +38,13 @@ class QMouseEvent; class QResizeEvent; QT_END_NAMESPACE -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QChart; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE class Callout; -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class View: public QGraphicsView { diff --git a/examples/charts/candlestickchart/candlestickdatareader.h b/examples/charts/candlestickchart/candlestickdatareader.h index aaa83bf2..cfc5bb0d 100644 --- a/examples/charts/candlestickchart/candlestickdatareader.h +++ b/examples/charts/candlestickchart/candlestickdatareader.h @@ -33,7 +33,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class CandlestickDataReader : public QTextStream { diff --git a/examples/charts/candlestickchart/main.cpp b/examples/charts/candlestickchart/main.cpp index 26a26a37..ba37695b 100644 --- a/examples/charts/candlestickchart/main.cpp +++ b/examples/charts/candlestickchart/main.cpp @@ -38,7 +38,7 @@ #include "candlestickdatareader.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/chartinteractions/chart.h b/examples/charts/chartinteractions/chart.h index 2ab2430b..8298724b 100644 --- a/examples/charts/chartinteractions/chart.h +++ b/examples/charts/chartinteractions/chart.h @@ -33,7 +33,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class Chart : public QChart { diff --git a/examples/charts/chartinteractions/chartview.h b/examples/charts/chartinteractions/chartview.h index ee5b4e76..88267bd4 100644 --- a/examples/charts/chartinteractions/chartview.h +++ b/examples/charts/chartinteractions/chartview.h @@ -34,7 +34,7 @@ class Chart; -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class ChartView : public QChartView { diff --git a/examples/charts/chartinteractions/main.cpp b/examples/charts/chartinteractions/main.cpp index 558be4b7..2f19a631 100644 --- a/examples/charts/chartinteractions/main.cpp +++ b/examples/charts/chartinteractions/main.cpp @@ -36,7 +36,7 @@ #include "chart.h" #include "chartview.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/chartthemes/themewidget.h b/examples/charts/chartthemes/themewidget.h index e2e093ab..4d7e1b2a 100644 --- a/examples/charts/chartthemes/themewidget.h +++ b/examples/charts/chartthemes/themewidget.h @@ -39,16 +39,16 @@ class QCheckBox; class Ui_ThemeWidgetForm; QT_END_NAMESPACE -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QChartView; class QChart; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE typedef QPair Data; typedef QList DataList; typedef QList DataTable; -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class ThemeWidget: public QWidget { diff --git a/examples/charts/customchart/main.cpp b/examples/charts/customchart/main.cpp index 2ddc45c4..3371430e 100644 --- a/examples/charts/customchart/main.cpp +++ b/examples/charts/customchart/main.cpp @@ -33,7 +33,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/datetimeaxis/main.cpp b/examples/charts/datetimeaxis/main.cpp index 134d39da..4fd96eff 100644 --- a/examples/charts/datetimeaxis/main.cpp +++ b/examples/charts/datetimeaxis/main.cpp @@ -38,7 +38,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/donutbreakdown/donutbreakdownchart.cpp b/examples/charts/donutbreakdown/donutbreakdownchart.cpp index 9bf7f71a..5ef09d05 100644 --- a/examples/charts/donutbreakdown/donutbreakdownchart.cpp +++ b/examples/charts/donutbreakdown/donutbreakdownchart.cpp @@ -31,7 +31,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE //![1] DonutBreakdownChart::DonutBreakdownChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) diff --git a/examples/charts/donutbreakdown/donutbreakdownchart.h b/examples/charts/donutbreakdown/donutbreakdownchart.h index 1ce22f51..370fdc28 100644 --- a/examples/charts/donutbreakdown/donutbreakdownchart.h +++ b/examples/charts/donutbreakdown/donutbreakdownchart.h @@ -32,7 +32,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class DonutBreakdownChart : public QChart { diff --git a/examples/charts/donutbreakdown/main.cpp b/examples/charts/donutbreakdown/main.cpp index 8cbdb450..2eff496e 100644 --- a/examples/charts/donutbreakdown/main.cpp +++ b/examples/charts/donutbreakdown/main.cpp @@ -32,7 +32,7 @@ #include #include "donutbreakdownchart.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/donutbreakdown/mainslice.cpp b/examples/charts/donutbreakdown/mainslice.cpp index 49746de0..4093791c 100644 --- a/examples/charts/donutbreakdown/mainslice.cpp +++ b/examples/charts/donutbreakdown/mainslice.cpp @@ -29,7 +29,7 @@ #include "mainslice.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE //![1] MainSlice::MainSlice(QPieSeries *breakdownSeries, QObject *parent) diff --git a/examples/charts/donutbreakdown/mainslice.h b/examples/charts/donutbreakdown/mainslice.h index 052b39a8..83b9740b 100644 --- a/examples/charts/donutbreakdown/mainslice.h +++ b/examples/charts/donutbreakdown/mainslice.h @@ -33,7 +33,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class MainSlice : public QPieSlice { diff --git a/examples/charts/donutchart/main.cpp b/examples/charts/donutchart/main.cpp index 3ef2bbef..ac799f7a 100644 --- a/examples/charts/donutchart/main.cpp +++ b/examples/charts/donutchart/main.cpp @@ -33,7 +33,7 @@ #include #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/dynamicspline/chart.h b/examples/charts/dynamicspline/chart.h index c6cd12f0..f6dbdb96 100644 --- a/examples/charts/dynamicspline/chart.h +++ b/examples/charts/dynamicspline/chart.h @@ -33,12 +33,12 @@ #include #include -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QSplineSeries; class QValueAxis; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE //![1] class Chart: public QChart diff --git a/examples/charts/dynamicspline/main.cpp b/examples/charts/dynamicspline/main.cpp index 5f3c5ffa..237f7630 100644 --- a/examples/charts/dynamicspline/main.cpp +++ b/examples/charts/dynamicspline/main.cpp @@ -32,7 +32,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/horizontalbarchart/main.cpp b/examples/charts/horizontalbarchart/main.cpp index 98198758..3b8e58ac 100644 --- a/examples/charts/horizontalbarchart/main.cpp +++ b/examples/charts/horizontalbarchart/main.cpp @@ -37,7 +37,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/horizontalpercentbarchart/main.cpp b/examples/charts/horizontalpercentbarchart/main.cpp index da636c1a..56ba6738 100644 --- a/examples/charts/horizontalpercentbarchart/main.cpp +++ b/examples/charts/horizontalpercentbarchart/main.cpp @@ -37,7 +37,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/horizontalstackedbarchart/main.cpp b/examples/charts/horizontalstackedbarchart/main.cpp index dd0f7578..0c6b6639 100644 --- a/examples/charts/horizontalstackedbarchart/main.cpp +++ b/examples/charts/horizontalstackedbarchart/main.cpp @@ -37,7 +37,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/legend/main.cpp b/examples/charts/legend/main.cpp index 428b933f..3ad33a3e 100644 --- a/examples/charts/legend/main.cpp +++ b/examples/charts/legend/main.cpp @@ -32,7 +32,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/legend/mainwidget.cpp b/examples/charts/legend/mainwidget.cpp index 047526a8..e44d8304 100644 --- a/examples/charts/legend/mainwidget.cpp +++ b/examples/charts/legend/mainwidget.cpp @@ -38,7 +38,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE MainWidget::MainWidget(QWidget *parent) : QWidget(parent) diff --git a/examples/charts/legend/mainwidget.h b/examples/charts/legend/mainwidget.h index 6dab7e21..29c8864c 100644 --- a/examples/charts/legend/mainwidget.h +++ b/examples/charts/legend/mainwidget.h @@ -41,7 +41,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class MainWidget : public QWidget { diff --git a/examples/charts/legendmarkers/mainwidget.cpp b/examples/charts/legendmarkers/mainwidget.cpp index a48a6384..e02c4908 100644 --- a/examples/charts/legendmarkers/mainwidget.cpp +++ b/examples/charts/legendmarkers/mainwidget.cpp @@ -40,7 +40,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE MainWidget::MainWidget(QWidget *parent) : QWidget(parent) diff --git a/examples/charts/legendmarkers/mainwidget.h b/examples/charts/legendmarkers/mainwidget.h index 21afa17c..ba790800 100644 --- a/examples/charts/legendmarkers/mainwidget.h +++ b/examples/charts/legendmarkers/mainwidget.h @@ -41,7 +41,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class MainWidget : public QWidget { diff --git a/examples/charts/lineandbar/main.cpp b/examples/charts/lineandbar/main.cpp index f2370997..f5229887 100644 --- a/examples/charts/lineandbar/main.cpp +++ b/examples/charts/lineandbar/main.cpp @@ -37,7 +37,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/linechart/main.cpp b/examples/charts/linechart/main.cpp index 17390437..c72d361d 100644 --- a/examples/charts/linechart/main.cpp +++ b/examples/charts/linechart/main.cpp @@ -32,7 +32,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/logvalueaxis/main.cpp b/examples/charts/logvalueaxis/main.cpp index ae5d92fc..d727ab53 100644 --- a/examples/charts/logvalueaxis/main.cpp +++ b/examples/charts/logvalueaxis/main.cpp @@ -34,7 +34,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/modeldata/tablewidget.cpp b/examples/charts/modeldata/tablewidget.cpp index b91bcf43..5d9a8494 100644 --- a/examples/charts/modeldata/tablewidget.cpp +++ b/examples/charts/modeldata/tablewidget.cpp @@ -37,7 +37,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE TableWidget::TableWidget(QWidget *parent) : QWidget(parent) diff --git a/examples/charts/multiaxis/main.cpp b/examples/charts/multiaxis/main.cpp index 1c49f73a..7c01405e 100644 --- a/examples/charts/multiaxis/main.cpp +++ b/examples/charts/multiaxis/main.cpp @@ -35,7 +35,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/nesteddonuts/widget.cpp b/examples/charts/nesteddonuts/widget.cpp index 92c6415c..33f344bf 100644 --- a/examples/charts/nesteddonuts/widget.cpp +++ b/examples/charts/nesteddonuts/widget.cpp @@ -36,7 +36,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Widget::Widget(QWidget *parent) : QWidget(parent) diff --git a/examples/charts/nesteddonuts/widget.h b/examples/charts/nesteddonuts/widget.h index 7fa55658..9fe97781 100644 --- a/examples/charts/nesteddonuts/widget.h +++ b/examples/charts/nesteddonuts/widget.h @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE class QTimer; QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class Widget : public QWidget { diff --git a/examples/charts/openglseries/datasource.cpp b/examples/charts/openglseries/datasource.cpp index 6969ba95..008d76d9 100644 --- a/examples/charts/openglseries/datasource.cpp +++ b/examples/charts/openglseries/datasource.cpp @@ -31,7 +31,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE DataSource::DataSource(QObject *parent) : QObject(parent), diff --git a/examples/charts/openglseries/datasource.h b/examples/charts/openglseries/datasource.h index 652981ea..511a1a88 100644 --- a/examples/charts/openglseries/datasource.h +++ b/examples/charts/openglseries/datasource.h @@ -36,7 +36,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class DataSource : public QObject { diff --git a/examples/charts/openglseries/main.cpp b/examples/charts/openglseries/main.cpp index f347ce5b..567bc2b3 100644 --- a/examples/charts/openglseries/main.cpp +++ b/examples/charts/openglseries/main.cpp @@ -47,7 +47,7 @@ // to verify the series have same visible geometry. //#define ADD_SIMPLE_SERIES -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/percentbarchart/main.cpp b/examples/charts/percentbarchart/main.cpp index 38ef3f3f..f125b028 100644 --- a/examples/charts/percentbarchart/main.cpp +++ b/examples/charts/percentbarchart/main.cpp @@ -36,7 +36,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/piechart/main.cpp b/examples/charts/piechart/main.cpp index 3b2a085b..d54fc82c 100644 --- a/examples/charts/piechart/main.cpp +++ b/examples/charts/piechart/main.cpp @@ -33,7 +33,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/piechartcustomization/customslice.cpp b/examples/charts/piechartcustomization/customslice.cpp index 12402d60..94c9e67e 100644 --- a/examples/charts/piechartcustomization/customslice.cpp +++ b/examples/charts/piechartcustomization/customslice.cpp @@ -29,7 +29,7 @@ #include "customslice.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE CustomSlice::CustomSlice(QString label, qreal value) : QPieSlice(label, value) diff --git a/examples/charts/piechartcustomization/customslice.h b/examples/charts/piechartcustomization/customslice.h index 39cf6460..b372f369 100644 --- a/examples/charts/piechartcustomization/customslice.h +++ b/examples/charts/piechartcustomization/customslice.h @@ -31,7 +31,7 @@ #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class CustomSlice : public QPieSlice { diff --git a/examples/charts/piechartcustomization/mainwidget.cpp b/examples/charts/piechartcustomization/mainwidget.cpp index 482ff9b9..5d2ac832 100644 --- a/examples/charts/piechartcustomization/mainwidget.cpp +++ b/examples/charts/piechartcustomization/mainwidget.cpp @@ -41,7 +41,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE MainWidget::MainWidget(QWidget *parent) : QWidget(parent), diff --git a/examples/charts/piechartcustomization/mainwidget.h b/examples/charts/piechartcustomization/mainwidget.h index 5fed8dd3..d3c1e724 100644 --- a/examples/charts/piechartcustomization/mainwidget.h +++ b/examples/charts/piechartcustomization/mainwidget.h @@ -44,13 +44,13 @@ class PenTool; class BrushTool; class CustomSlice; -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QChartView; class QPieSeries; class QPieSlice; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class MainWidget : public QWidget { diff --git a/examples/charts/piechartdrilldown/drilldownchart.cpp b/examples/charts/piechartdrilldown/drilldownchart.cpp index 690d7715..195fb5f9 100644 --- a/examples/charts/piechartdrilldown/drilldownchart.cpp +++ b/examples/charts/piechartdrilldown/drilldownchart.cpp @@ -29,7 +29,7 @@ #include "drilldownchart.h" #include "drilldownslice.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE DrilldownChart::DrilldownChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QChart(QChart::ChartTypeCartesian, parent, wFlags), diff --git a/examples/charts/piechartdrilldown/drilldownchart.h b/examples/charts/piechartdrilldown/drilldownchart.h index 53748b21..7c5da394 100644 --- a/examples/charts/piechartdrilldown/drilldownchart.h +++ b/examples/charts/piechartdrilldown/drilldownchart.h @@ -31,12 +31,12 @@ #include -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QAbstractSeries; class QPieSlice; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class DrilldownChart : public QChart { diff --git a/examples/charts/piechartdrilldown/drilldownslice.cpp b/examples/charts/piechartdrilldown/drilldownslice.cpp index 1fc6bd81..7c0af7f0 100644 --- a/examples/charts/piechartdrilldown/drilldownslice.cpp +++ b/examples/charts/piechartdrilldown/drilldownslice.cpp @@ -29,7 +29,7 @@ #include "drilldownslice.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE DrilldownSlice::DrilldownSlice(qreal value, QString prefix, QAbstractSeries *drilldownSeries) : m_drilldownSeries(drilldownSeries), diff --git a/examples/charts/piechartdrilldown/drilldownslice.h b/examples/charts/piechartdrilldown/drilldownslice.h index 2735c3f6..bcdc1805 100644 --- a/examples/charts/piechartdrilldown/drilldownslice.h +++ b/examples/charts/piechartdrilldown/drilldownslice.h @@ -31,11 +31,11 @@ #include -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QAbstractSeries; -QT_CHARTS_END_NAMESPACE +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class DrilldownSlice : public QPieSlice { diff --git a/examples/charts/piechartdrilldown/main.cpp b/examples/charts/piechartdrilldown/main.cpp index e18f07f3..2701ef30 100644 --- a/examples/charts/piechartdrilldown/main.cpp +++ b/examples/charts/piechartdrilldown/main.cpp @@ -36,7 +36,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/polarchart/chartview.cpp b/examples/charts/polarchart/chartview.cpp index 1dc5cc00..4cfb17cc 100644 --- a/examples/charts/polarchart/chartview.cpp +++ b/examples/charts/polarchart/chartview.cpp @@ -33,7 +33,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE ChartView::ChartView(QWidget *parent) : QChartView(parent) diff --git a/examples/charts/polarchart/chartview.h b/examples/charts/polarchart/chartview.h index ba87d226..953e827e 100644 --- a/examples/charts/polarchart/chartview.h +++ b/examples/charts/polarchart/chartview.h @@ -33,7 +33,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class ChartView : public QChartView { diff --git a/examples/charts/polarchart/main.cpp b/examples/charts/polarchart/main.cpp index b4dfc2b1..46f1accf 100644 --- a/examples/charts/polarchart/main.cpp +++ b/examples/charts/polarchart/main.cpp @@ -38,7 +38,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/qmloscilloscope/datasource.cpp b/examples/charts/qmloscilloscope/datasource.cpp index d01fa421..c822db5e 100644 --- a/examples/charts/qmloscilloscope/datasource.cpp +++ b/examples/charts/qmloscilloscope/datasource.cpp @@ -36,7 +36,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE Q_DECLARE_METATYPE(QAbstractSeries *) Q_DECLARE_METATYPE(QAbstractAxis *) diff --git a/examples/charts/qmloscilloscope/datasource.h b/examples/charts/qmloscilloscope/datasource.h index 3fd61614..ad708372 100644 --- a/examples/charts/qmloscilloscope/datasource.h +++ b/examples/charts/qmloscilloscope/datasource.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE class QQuickView; QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class DataSource : public QObject { diff --git a/examples/charts/scatterchart/chartview.h b/examples/charts/scatterchart/chartview.h index 6779665d..5673008d 100644 --- a/examples/charts/scatterchart/chartview.h +++ b/examples/charts/scatterchart/chartview.h @@ -32,7 +32,7 @@ #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class ChartView : public QChartView { diff --git a/examples/charts/scatterchart/main.cpp b/examples/charts/scatterchart/main.cpp index 9d0dea00..bd4ed240 100644 --- a/examples/charts/scatterchart/main.cpp +++ b/examples/charts/scatterchart/main.cpp @@ -31,7 +31,7 @@ #include #include "chartview.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/scatterinteractions/chartview.cpp b/examples/charts/scatterinteractions/chartview.cpp index 85c859a2..b7a571de 100644 --- a/examples/charts/scatterinteractions/chartview.cpp +++ b/examples/charts/scatterinteractions/chartview.cpp @@ -31,7 +31,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE ChartView::ChartView(QWidget *parent) : QChartView(new QChart(), parent), diff --git a/examples/charts/scatterinteractions/chartview.h b/examples/charts/scatterinteractions/chartview.h index 8fc50377..5c0fdf54 100644 --- a/examples/charts/scatterinteractions/chartview.h +++ b/examples/charts/scatterinteractions/chartview.h @@ -34,7 +34,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE class ChartView : public QChartView { diff --git a/examples/charts/splinechart/main.cpp b/examples/charts/splinechart/main.cpp index b1fbb232..8dad78f9 100644 --- a/examples/charts/splinechart/main.cpp +++ b/examples/charts/splinechart/main.cpp @@ -32,7 +32,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/stackedbarchart/main.cpp b/examples/charts/stackedbarchart/main.cpp index 6294f844..cf4ead77 100644 --- a/examples/charts/stackedbarchart/main.cpp +++ b/examples/charts/stackedbarchart/main.cpp @@ -36,7 +36,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp b/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp index 397dad8c..591828d8 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp +++ b/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp @@ -31,7 +31,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE DrilldownChart::DrilldownChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QChart(QChart::ChartTypeCartesian, parent, wFlags), diff --git a/examples/charts/stackedbarchartdrilldown/drilldownchart.h b/examples/charts/stackedbarchartdrilldown/drilldownchart.h index 61fdbc6e..0e081bdb 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownchart.h +++ b/examples/charts/stackedbarchartdrilldown/drilldownchart.h @@ -33,12 +33,12 @@ #include #include "drilldownseries.h" -namespace QtCharts { +QT_BEGIN_NAMESPACE class QBarCategoryAxis; class QValueAxis; -} +QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE //! [1] class DrilldownChart : public QChart diff --git a/examples/charts/stackedbarchartdrilldown/drilldownseries.cpp b/examples/charts/stackedbarchartdrilldown/drilldownseries.cpp index e5c143c9..ef9a97f1 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownseries.cpp +++ b/examples/charts/stackedbarchartdrilldown/drilldownseries.cpp @@ -29,7 +29,7 @@ #include "drilldownseries.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE DrilldownBarSeries::DrilldownBarSeries(QStringList categories, int maxValue, QObject *parent) : QStackedBarSeries(parent), diff --git a/examples/charts/stackedbarchartdrilldown/drilldownseries.h b/examples/charts/stackedbarchartdrilldown/drilldownseries.h index 7cd28f0a..420305b7 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownseries.h +++ b/examples/charts/stackedbarchartdrilldown/drilldownseries.h @@ -33,7 +33,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE //! [1] class DrilldownBarSeries : public QStackedBarSeries diff --git a/examples/charts/stackedbarchartdrilldown/main.cpp b/examples/charts/stackedbarchartdrilldown/main.cpp index c86bd0c3..aa8e447e 100644 --- a/examples/charts/stackedbarchartdrilldown/main.cpp +++ b/examples/charts/stackedbarchartdrilldown/main.cpp @@ -36,7 +36,7 @@ #include "drilldownseries.h" #include "drilldownchart.h" -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/temperaturerecords/main.cpp b/examples/charts/temperaturerecords/main.cpp index 92508b58..cfed5511 100644 --- a/examples/charts/temperaturerecords/main.cpp +++ b/examples/charts/temperaturerecords/main.cpp @@ -37,7 +37,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { diff --git a/examples/charts/zoomlinechart/chart.h b/examples/charts/zoomlinechart/chart.h index 3ea75938..a1fbf079 100644 --- a/examples/charts/zoomlinechart/chart.h +++ b/examples/charts/zoomlinechart/chart.h @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE class QGestureEvent; QT_END_NAMESPACE -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE //![1] class Chart : public QChart diff --git a/examples/charts/zoomlinechart/chartview.h b/examples/charts/zoomlinechart/chartview.h index 502b946f..724f02cd 100644 --- a/examples/charts/zoomlinechart/chartview.h +++ b/examples/charts/zoomlinechart/chartview.h @@ -33,7 +33,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE //![1] class ChartView : public QChartView diff --git a/examples/charts/zoomlinechart/main.cpp b/examples/charts/zoomlinechart/main.cpp index 28a3d913..5e28598c 100644 --- a/examples/charts/zoomlinechart/main.cpp +++ b/examples/charts/zoomlinechart/main.cpp @@ -36,7 +36,7 @@ #include #include -QT_CHARTS_USE_NAMESPACE +QT_USE_NAMESPACE int main(int argc, char *argv[]) { -- cgit v1.2.3