From 587d44e8077196ed4aa3df1484e69adcba2dc268 Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Thu, 28 Jan 2021 12:16:28 +0200 Subject: Remove custom namespace Fixes: QTBUG-90400 Change-Id: Ia2f1974a21112bad97724717d073d367c4413a7f Reviewed-by: Miikka Heikkinen --- examples/datavisualization/audiolevels/audiolevels.cpp | 2 -- examples/datavisualization/audiolevels/audiolevels.h | 2 -- examples/datavisualization/audiolevels/audiolevelsiodevice.cpp | 2 -- examples/datavisualization/audiolevels/audiolevelsiodevice.h | 2 -- examples/datavisualization/audiolevels/main.cpp | 2 -- examples/datavisualization/bars/graphmodifier.cpp | 2 -- examples/datavisualization/bars/graphmodifier.h | 2 -- examples/datavisualization/custominput/custominputhandler.h | 2 -- examples/datavisualization/custominput/scatterdatamodifier.cpp | 2 -- examples/datavisualization/custominput/scatterdatamodifier.h | 2 -- examples/datavisualization/customitems/customitemgraph.cpp | 2 -- examples/datavisualization/customitems/customitemgraph.h | 2 -- examples/datavisualization/customproxy/main.cpp | 2 -- examples/datavisualization/customproxy/rainfallgraph.cpp | 2 -- examples/datavisualization/customproxy/rainfallgraph.h | 2 -- examples/datavisualization/customproxy/variantbardataproxy.cpp | 2 -- examples/datavisualization/customproxy/variantbardataproxy.h | 2 -- examples/datavisualization/draggableaxes/axesinputhandler.h | 2 -- examples/datavisualization/draggableaxes/data.cpp | 2 -- examples/datavisualization/draggableaxes/data.h | 2 -- examples/datavisualization/itemmodel/main.cpp | 2 -- examples/datavisualization/qmlaxisformatter/customformatter.cpp | 2 -- examples/datavisualization/qmlaxisformatter/customformatter.h | 2 -- examples/datavisualization/qmloscilloscope/datasource.cpp | 2 -- examples/datavisualization/qmloscilloscope/datasource.h | 2 -- examples/datavisualization/rotations/scatterdatamodifier.cpp | 2 -- examples/datavisualization/rotations/scatterdatamodifier.h | 2 -- examples/datavisualization/scatter/scatterdatamodifier.cpp | 2 -- examples/datavisualization/scatter/scatterdatamodifier.h | 2 -- examples/datavisualization/surface/surfacegraph.cpp | 2 -- examples/datavisualization/surface/surfacegraph.h | 2 -- examples/datavisualization/texturesurface/custominputhandler.h | 2 -- examples/datavisualization/texturesurface/highlightseries.cpp | 2 -- examples/datavisualization/texturesurface/highlightseries.h | 2 -- examples/datavisualization/texturesurface/surfacegraph.cpp | 2 -- examples/datavisualization/texturesurface/surfacegraph.h | 2 -- examples/datavisualization/texturesurface/topographicseries.cpp | 2 -- examples/datavisualization/texturesurface/topographicseries.h | 2 -- examples/datavisualization/volumetric/volumetric.cpp | 2 -- examples/datavisualization/volumetric/volumetric.h | 2 -- 40 files changed, 80 deletions(-) (limited to 'examples') diff --git a/examples/datavisualization/audiolevels/audiolevels.cpp b/examples/datavisualization/audiolevels/audiolevels.cpp index 65635fd2..39ef44c7 100644 --- a/examples/datavisualization/audiolevels/audiolevels.cpp +++ b/examples/datavisualization/audiolevels/audiolevels.cpp @@ -41,8 +41,6 @@ #include #include -using namespace QtDataVisualization; - AudioLevels::AudioLevels(Q3DBars *graph, QObject *parent) : QObject(parent), m_graph(graph), diff --git a/examples/datavisualization/audiolevels/audiolevels.h b/examples/datavisualization/audiolevels/audiolevels.h index f9a7d9e5..6d417100 100644 --- a/examples/datavisualization/audiolevels/audiolevels.h +++ b/examples/datavisualization/audiolevels/audiolevels.h @@ -32,8 +32,6 @@ #include -using namespace QtDataVisualization; - class AudioLevelsIODevice; QT_BEGIN_NAMESPACE diff --git a/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp b/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp index 7cd2bbb3..60d2de3d 100644 --- a/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp +++ b/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp @@ -30,8 +30,6 @@ #include "audiolevelsiodevice.h" #include -using namespace QtDataVisualization; - //! [1] static const int resolution = 8; static const int rowSize = 800; diff --git a/examples/datavisualization/audiolevels/audiolevelsiodevice.h b/examples/datavisualization/audiolevels/audiolevelsiodevice.h index 1a9f57b3..5046c531 100644 --- a/examples/datavisualization/audiolevels/audiolevelsiodevice.h +++ b/examples/datavisualization/audiolevels/audiolevelsiodevice.h @@ -33,8 +33,6 @@ #include #include -using namespace QtDataVisualization; - class AudioLevelsIODevice : public QIODevice { Q_OBJECT diff --git a/examples/datavisualization/audiolevels/main.cpp b/examples/datavisualization/audiolevels/main.cpp index 3ecf1387..c6f373c6 100644 --- a/examples/datavisualization/audiolevels/main.cpp +++ b/examples/datavisualization/audiolevels/main.cpp @@ -32,8 +32,6 @@ #include #include -using namespace QtDataVisualization; - int main(int argc, char *argv[]) { qputenv("QSG_RHI_BACKEND", "opengl"); diff --git a/examples/datavisualization/bars/graphmodifier.cpp b/examples/datavisualization/bars/graphmodifier.cpp index a130b0ff..9a187620 100644 --- a/examples/datavisualization/bars/graphmodifier.cpp +++ b/examples/datavisualization/bars/graphmodifier.cpp @@ -39,8 +39,6 @@ #include #include -using namespace QtDataVisualization; - const QString celsiusString = QString(QChar(0xB0)) + "C"; //! [0] diff --git a/examples/datavisualization/bars/graphmodifier.h b/examples/datavisualization/bars/graphmodifier.h index bc223a75..b1420e33 100644 --- a/examples/datavisualization/bars/graphmodifier.h +++ b/examples/datavisualization/bars/graphmodifier.h @@ -40,8 +40,6 @@ #include #include -using namespace QtDataVisualization; - class GraphModifier : public QObject { Q_OBJECT diff --git a/examples/datavisualization/custominput/custominputhandler.h b/examples/datavisualization/custominput/custominputhandler.h index ef07d5ec..ce864335 100644 --- a/examples/datavisualization/custominput/custominputhandler.h +++ b/examples/datavisualization/custominput/custominputhandler.h @@ -32,8 +32,6 @@ #include -using namespace QtDataVisualization; - class CustomInputHandler : public QAbstract3DInputHandler { Q_OBJECT diff --git a/examples/datavisualization/custominput/scatterdatamodifier.cpp b/examples/datavisualization/custominput/scatterdatamodifier.cpp index 3c6abd76..051efe73 100644 --- a/examples/datavisualization/custominput/scatterdatamodifier.cpp +++ b/examples/datavisualization/custominput/scatterdatamodifier.cpp @@ -40,8 +40,6 @@ #include #include -using namespace QtDataVisualization; - ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) : m_graph(scatter), m_inputHandler(new CustomInputHandler()) diff --git a/examples/datavisualization/custominput/scatterdatamodifier.h b/examples/datavisualization/custominput/scatterdatamodifier.h index 41f09f94..114eda7e 100644 --- a/examples/datavisualization/custominput/scatterdatamodifier.h +++ b/examples/datavisualization/custominput/scatterdatamodifier.h @@ -39,8 +39,6 @@ #include #include -using namespace QtDataVisualization; - class ScatterDataModifier : public QObject { Q_OBJECT diff --git a/examples/datavisualization/customitems/customitemgraph.cpp b/examples/datavisualization/customitems/customitemgraph.cpp index 512f059e..f1fef0b3 100644 --- a/examples/datavisualization/customitems/customitemgraph.cpp +++ b/examples/datavisualization/customitems/customitemgraph.cpp @@ -34,8 +34,6 @@ #include #include -using namespace QtDataVisualization; - CustomItemGraph::CustomItemGraph(Q3DSurface *surface, QLabel *label) : m_graph(surface), m_textField(label), diff --git a/examples/datavisualization/customitems/customitemgraph.h b/examples/datavisualization/customitems/customitemgraph.h index 2b977817..1b2af81f 100644 --- a/examples/datavisualization/customitems/customitemgraph.h +++ b/examples/datavisualization/customitems/customitemgraph.h @@ -38,8 +38,6 @@ #include #include -using namespace QtDataVisualization; - class CustomItemGraph : public QObject { Q_OBJECT diff --git a/examples/datavisualization/customproxy/main.cpp b/examples/datavisualization/customproxy/main.cpp index 47b85850..00a5f550 100644 --- a/examples/datavisualization/customproxy/main.cpp +++ b/examples/datavisualization/customproxy/main.cpp @@ -30,8 +30,6 @@ #include "rainfallgraph.h" #include -using namespace QtDataVisualization; - int main(int argc, char **argv) { qputenv("QSG_RHI_BACKEND", "opengl"); diff --git a/examples/datavisualization/customproxy/rainfallgraph.cpp b/examples/datavisualization/customproxy/rainfallgraph.cpp index 73cb5bee..91733c0c 100644 --- a/examples/datavisualization/customproxy/rainfallgraph.cpp +++ b/examples/datavisualization/customproxy/rainfallgraph.cpp @@ -40,8 +40,6 @@ #include #include -using namespace QtDataVisualization; - RainfallGraph::RainfallGraph(Q3DBars *rainfall) : m_graph(rainfall) { diff --git a/examples/datavisualization/customproxy/rainfallgraph.h b/examples/datavisualization/customproxy/rainfallgraph.h index 425dcef6..a9a8770c 100644 --- a/examples/datavisualization/customproxy/rainfallgraph.h +++ b/examples/datavisualization/customproxy/rainfallgraph.h @@ -33,8 +33,6 @@ #include "variantbardataproxy.h" #include -using namespace QtDataVisualization; - class RainfallGraph : public QObject { Q_OBJECT diff --git a/examples/datavisualization/customproxy/variantbardataproxy.cpp b/examples/datavisualization/customproxy/variantbardataproxy.cpp index 587ef0c9..beb337d1 100644 --- a/examples/datavisualization/customproxy/variantbardataproxy.cpp +++ b/examples/datavisualization/customproxy/variantbardataproxy.cpp @@ -29,8 +29,6 @@ #include "variantbardataproxy.h" -using namespace QtDataVisualization; - VariantBarDataProxy::VariantBarDataProxy() : QBarDataProxy() { diff --git a/examples/datavisualization/customproxy/variantbardataproxy.h b/examples/datavisualization/customproxy/variantbardataproxy.h index 7cbb85a1..1638eab5 100644 --- a/examples/datavisualization/customproxy/variantbardataproxy.h +++ b/examples/datavisualization/customproxy/variantbardataproxy.h @@ -37,8 +37,6 @@ #include #include -using namespace QtDataVisualization; - //! [0] class VariantBarDataProxy : public QBarDataProxy //! [0] diff --git a/examples/datavisualization/draggableaxes/axesinputhandler.h b/examples/datavisualization/draggableaxes/axesinputhandler.h index 8d43c478..1802b0a5 100644 --- a/examples/datavisualization/draggableaxes/axesinputhandler.h +++ b/examples/datavisualization/draggableaxes/axesinputhandler.h @@ -34,8 +34,6 @@ #include #include -using namespace QtDataVisualization; - //! [0] class AxesInputHandler : public Q3DInputHandler //! [0] diff --git a/examples/datavisualization/draggableaxes/data.cpp b/examples/datavisualization/draggableaxes/data.cpp index f7f4a31e..e145a87c 100644 --- a/examples/datavisualization/draggableaxes/data.cpp +++ b/examples/datavisualization/draggableaxes/data.cpp @@ -36,8 +36,6 @@ #include #include -using namespace QtDataVisualization; - const int itemCount = 500; Data::Data(Q3DScatter *scatter) diff --git a/examples/datavisualization/draggableaxes/data.h b/examples/datavisualization/draggableaxes/data.h index 3fb8969e..92118514 100644 --- a/examples/datavisualization/draggableaxes/data.h +++ b/examples/datavisualization/draggableaxes/data.h @@ -35,8 +35,6 @@ #include #include -using namespace QtDataVisualization; - class Data : public QObject { Q_OBJECT diff --git a/examples/datavisualization/itemmodel/main.cpp b/examples/datavisualization/itemmodel/main.cpp index 6cccacae..2470c5b3 100644 --- a/examples/datavisualization/itemmodel/main.cpp +++ b/examples/datavisualization/itemmodel/main.cpp @@ -49,8 +49,6 @@ #define USE_STATIC_DATA -using namespace QtDataVisualization; - class GraphDataGenerator : public QObject { public: diff --git a/examples/datavisualization/qmlaxisformatter/customformatter.cpp b/examples/datavisualization/qmlaxisformatter/customformatter.cpp index fb469065..8fbf6eb5 100644 --- a/examples/datavisualization/qmlaxisformatter/customformatter.cpp +++ b/examples/datavisualization/qmlaxisformatter/customformatter.cpp @@ -32,8 +32,6 @@ #include #include -using namespace QtDataVisualization; - Q_DECLARE_METATYPE(QValue3DAxisFormatter *) static const qreal oneDayMs = 60.0 * 60.0 * 24.0 * 1000.0; diff --git a/examples/datavisualization/qmlaxisformatter/customformatter.h b/examples/datavisualization/qmlaxisformatter/customformatter.h index aa9db422..855ddb31 100644 --- a/examples/datavisualization/qmlaxisformatter/customformatter.h +++ b/examples/datavisualization/qmlaxisformatter/customformatter.h @@ -33,8 +33,6 @@ #include #include -using namespace QtDataVisualization; - //! [2] class CustomFormatter : public QValue3DAxisFormatter { diff --git a/examples/datavisualization/qmloscilloscope/datasource.cpp b/examples/datavisualization/qmloscilloscope/datasource.cpp index 19580e03..336458a8 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.cpp +++ b/examples/datavisualization/qmloscilloscope/datasource.cpp @@ -31,8 +31,6 @@ #include #include -using namespace QtDataVisualization; - //! [3] Q_DECLARE_METATYPE(QSurface3DSeries *) //! [3] diff --git a/examples/datavisualization/qmloscilloscope/datasource.h b/examples/datavisualization/qmloscilloscope/datasource.h index 39a7f830..dc3ea568 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.h +++ b/examples/datavisualization/qmloscilloscope/datasource.h @@ -32,8 +32,6 @@ #include -using namespace QtDataVisualization; - class DataSource : public QObject { Q_OBJECT diff --git a/examples/datavisualization/rotations/scatterdatamodifier.cpp b/examples/datavisualization/rotations/scatterdatamodifier.cpp index d3c383b6..571761e8 100644 --- a/examples/datavisualization/rotations/scatterdatamodifier.cpp +++ b/examples/datavisualization/rotations/scatterdatamodifier.cpp @@ -37,8 +37,6 @@ #include #include -using namespace QtDataVisualization; - static const float verticalRange = 8.0f; static const float horizontalRange = verticalRange; static const float ellipse_a = horizontalRange / 3.0f; diff --git a/examples/datavisualization/rotations/scatterdatamodifier.h b/examples/datavisualization/rotations/scatterdatamodifier.h index 42472b48..4d11b147 100644 --- a/examples/datavisualization/rotations/scatterdatamodifier.h +++ b/examples/datavisualization/rotations/scatterdatamodifier.h @@ -34,8 +34,6 @@ #include #include -using namespace QtDataVisualization; - class ScatterDataModifier : public QObject { Q_OBJECT diff --git a/examples/datavisualization/scatter/scatterdatamodifier.cpp b/examples/datavisualization/scatter/scatterdatamodifier.cpp index 504645da..d9e3c86b 100644 --- a/examples/datavisualization/scatter/scatterdatamodifier.cpp +++ b/examples/datavisualization/scatter/scatterdatamodifier.cpp @@ -38,8 +38,6 @@ #include #include -using namespace QtDataVisualization; - //#define RANDOM_SCATTER // Uncomment this to switch to random scatter const int numberOfItems = 3600; diff --git a/examples/datavisualization/scatter/scatterdatamodifier.h b/examples/datavisualization/scatter/scatterdatamodifier.h index 8b777bc8..cbb14995 100644 --- a/examples/datavisualization/scatter/scatterdatamodifier.h +++ b/examples/datavisualization/scatter/scatterdatamodifier.h @@ -34,8 +34,6 @@ #include #include -using namespace QtDataVisualization; - class ScatterDataModifier : public QObject { Q_OBJECT diff --git a/examples/datavisualization/surface/surfacegraph.cpp b/examples/datavisualization/surface/surfacegraph.cpp index a8c5731c..08c35be7 100644 --- a/examples/datavisualization/surface/surfacegraph.cpp +++ b/examples/datavisualization/surface/surfacegraph.cpp @@ -34,8 +34,6 @@ #include #include -using namespace QtDataVisualization; - const int sampleCountX = 50; const int sampleCountZ = 50; const int heightMapGridStepX = 6; diff --git a/examples/datavisualization/surface/surfacegraph.h b/examples/datavisualization/surface/surfacegraph.h index ad87d134..3684fc9a 100644 --- a/examples/datavisualization/surface/surfacegraph.h +++ b/examples/datavisualization/surface/surfacegraph.h @@ -36,8 +36,6 @@ #include #include -using namespace QtDataVisualization; - class SurfaceGraph : public QObject { Q_OBJECT diff --git a/examples/datavisualization/texturesurface/custominputhandler.h b/examples/datavisualization/texturesurface/custominputhandler.h index 52f6fced..0cb53102 100644 --- a/examples/datavisualization/texturesurface/custominputhandler.h +++ b/examples/datavisualization/texturesurface/custominputhandler.h @@ -35,8 +35,6 @@ #include #include "highlightseries.h" -using namespace QtDataVisualization; - class CustomInputHandler : public Q3DInputHandler { Q_OBJECT diff --git a/examples/datavisualization/texturesurface/highlightseries.cpp b/examples/datavisualization/texturesurface/highlightseries.cpp index 7807c7ea..ef6da1b4 100644 --- a/examples/datavisualization/texturesurface/highlightseries.cpp +++ b/examples/datavisualization/texturesurface/highlightseries.cpp @@ -29,8 +29,6 @@ #include "highlightseries.h" -using namespace QtDataVisualization; - //! [2] const float darkRedPos = 1.0f; const float redPos = 0.8f; diff --git a/examples/datavisualization/texturesurface/highlightseries.h b/examples/datavisualization/texturesurface/highlightseries.h index 9fcfbe6d..c489e50c 100644 --- a/examples/datavisualization/texturesurface/highlightseries.h +++ b/examples/datavisualization/texturesurface/highlightseries.h @@ -34,8 +34,6 @@ #include "topographicseries.h" -using namespace QtDataVisualization; - class HighlightSeries : public QSurface3DSeries { Q_OBJECT diff --git a/examples/datavisualization/texturesurface/surfacegraph.cpp b/examples/datavisualization/texturesurface/surfacegraph.cpp index c34214c6..84999bc6 100644 --- a/examples/datavisualization/texturesurface/surfacegraph.cpp +++ b/examples/datavisualization/texturesurface/surfacegraph.cpp @@ -33,8 +33,6 @@ #include #include -using namespace QtDataVisualization; - const float areaWidth = 8000.0f; const float areaHeight = 8000.0f; const float aspectRatio = 0.1389f; diff --git a/examples/datavisualization/texturesurface/surfacegraph.h b/examples/datavisualization/texturesurface/surfacegraph.h index 47eea71b..20a39f81 100644 --- a/examples/datavisualization/texturesurface/surfacegraph.h +++ b/examples/datavisualization/texturesurface/surfacegraph.h @@ -38,8 +38,6 @@ #include "custominputhandler.h" -using namespace QtDataVisualization; - class SurfaceGraph : public QObject { Q_OBJECT diff --git a/examples/datavisualization/texturesurface/topographicseries.cpp b/examples/datavisualization/texturesurface/topographicseries.cpp index 0495756e..01b6625b 100644 --- a/examples/datavisualization/texturesurface/topographicseries.cpp +++ b/examples/datavisualization/texturesurface/topographicseries.cpp @@ -29,8 +29,6 @@ #include "topographicseries.h" -using namespace QtDataVisualization; - //! [0] // Value used to encode height data as RGB value on PNG file const float packingFactor = 11983.0f; diff --git a/examples/datavisualization/texturesurface/topographicseries.h b/examples/datavisualization/texturesurface/topographicseries.h index f794213a..7137a858 100644 --- a/examples/datavisualization/texturesurface/topographicseries.h +++ b/examples/datavisualization/texturesurface/topographicseries.h @@ -32,8 +32,6 @@ #include -using namespace QtDataVisualization; - class TopographicSeries : public QSurface3DSeries { Q_OBJECT diff --git a/examples/datavisualization/volumetric/volumetric.cpp b/examples/datavisualization/volumetric/volumetric.cpp index f9d457f1..a379be3e 100644 --- a/examples/datavisualization/volumetric/volumetric.cpp +++ b/examples/datavisualization/volumetric/volumetric.cpp @@ -42,8 +42,6 @@ #include #include -using namespace QtDataVisualization; - const int lowDetailSize(128); const int mediumDetailSize(256); const int highDetailSize(512); diff --git a/examples/datavisualization/volumetric/volumetric.h b/examples/datavisualization/volumetric/volumetric.h index f76884d6..f57a8394 100644 --- a/examples/datavisualization/volumetric/volumetric.h +++ b/examples/datavisualization/volumetric/volumetric.h @@ -38,8 +38,6 @@ #include #include -using namespace QtDataVisualization; - class VolumetricModifier : public QObject { Q_OBJECT -- cgit v1.2.3