Removed QDataVis and namespace macros

- docs will be fixed in QTRD-2594

Task-number: QTRD-2699
Task-number: QTRD-2700
Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

16 files changed, 48 insertions, 54 deletions

diff --git a/examples/audiolevels/audiolevels.cpp b/examples/audiolevels/audiolevels.cpp
index ec63e555..a6e775ff 100644
--- a/examples/audiolevels/audiolevels.cpp
+++ b/examples/audiolevels/audiolevels.cpp
@@ -29,7 +29,7 @@
 #include <QAudioDeviceInfo>
 #include <QAudioInput>
 
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
 
 AudioLevels::AudioLevels(Q3DBars *graph, QObject *parent)
     : QObject(parent),
@@ -43,8 +43,8 @@ AudioLevels::AudioLevels(Q3DBars *graph, QObject *parent)
     m_graph->valueAxis()->setRange(-100.0f, 100.0f);
     m_graph->valueAxis()->setSegmentCount(20);
     m_graph->valueAxis()->setLabelFormat(QStringLiteral("%d%%"));
-    m_graph->setShadowQuality(QDataVis::ShadowQualityNone);
-    m_graph->setSelectionMode(QDataVis::SelectionNone);
+    m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualityNone);
+    m_graph->setSelectionMode(QAbstract3DGraph::SelectionNone);
     m_graph->scene()->activeCamera()->setCameraPosition(-25.0f, 10.0f, 190.0f);
     m_graph->activeTheme()->setType(Q3DTheme::ThemeIsabelle);
     m_graph->activeTheme()->setGridEnabled(true);
diff --git a/examples/audiolevels/audiolevels.h b/examples/audiolevels/audiolevels.h
index db1d8936..b039a1d9 100644
--- a/examples/audiolevels/audiolevels.h
+++ b/examples/audiolevels/audiolevels.h
@@ -21,7 +21,7 @@
 
 #include <QtDataVisualization/q3dbars.h>
 
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
 
 class AudioLevelsIODevice;
 class QAudioInput;
diff --git a/examples/audiolevels/audiolevelsiodevice.cpp b/examples/audiolevels/audiolevelsiodevice.cpp
index e4576638..6ea11bbe 100644
--- a/examples/audiolevels/audiolevelsiodevice.cpp
+++ b/examples/audiolevels/audiolevelsiodevice.cpp
@@ -19,7 +19,7 @@
 #include "audiolevelsiodevice.h"
 #include <QDebug>
 
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
 
 //! [1]
 static const int resolution = 8;
diff --git a/examples/audiolevels/audiolevelsiodevice.h b/examples/audiolevels/audiolevelsiodevice.h
index 8d665fe8..0346b45d 100644
--- a/examples/audiolevels/audiolevelsiodevice.h
+++ b/examples/audiolevels/audiolevelsiodevice.h
@@ -22,7 +22,7 @@
 #include <QtDataVisualization/qbardataproxy.h>
 #include <QIODevice>
 
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
 
 class AudioLevelsIODevice : public QIODevice
 {
diff --git a/examples/bars/graphmodifier.cpp b/examples/bars/graphmodifier.cpp
index cd0ecd77..1b84ae7b 100644
--- a/examples/bars/graphmodifier.cpp
+++ b/examples/bars/graphmodifier.cpp
@@ -27,7 +27,7 @@
 #include <QTime>
 #include <QComboBox>
 
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
 
 const QString celsiusString = QString(QChar(0xB0)) + "C";
 
@@ -52,7 +52,7 @@ GraphModifier::GraphModifier(Q3DBars *bargraph)
       m_smooth(false)
 {
     //! [2]
-    m_graph->setShadowQuality(QDataVis::ShadowQualitySoftMedium);
+    m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftMedium);
     m_graph->activeTheme()->setBackgroundEnabled(false);
     m_graph->activeTheme()->setFont(QFont("Times New Roman", m_fontSize));
     m_graph->activeTheme()->setLabelBackgroundEnabled(true);
@@ -200,7 +200,7 @@ void GraphModifier::changeSelectionMode(int selectionMode)
     QComboBox *comboBox = qobject_cast<QComboBox *>(sender());
     if (comboBox) {
         int flags = comboBox->itemData(selectionMode).toInt();
-        m_graph->setSelectionMode(QDataVis::SelectionFlags(flags));
+        m_graph->setSelectionMode(QAbstract3DGraph::SelectionFlags(flags));
     }
 }
 
@@ -218,7 +218,7 @@ void GraphModifier::changeFontSize(int fontsize)
     m_graph->activeTheme()->setFont(font);
 }
 
-void GraphModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
+void GraphModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq)
 {
     int quality = int(sq);
     // Updates the UI component to show correct shadow quality
@@ -227,7 +227,7 @@ void GraphModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
 
 void GraphModifier::changeShadowQuality(int quality)
 {
-    QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
+    QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality);
     m_graph->setShadowQuality(sq);
     emit shadowQualityChanged(quality);
 }
diff --git a/examples/bars/graphmodifier.h b/examples/bars/graphmodifier.h
index f4b238b7..5bbb937f 100644
--- a/examples/bars/graphmodifier.h
+++ b/examples/bars/graphmodifier.h
@@ -54,7 +54,7 @@ public slots:
     void changeSelectionMode(int selectionMode);
     void changeTheme(int theme);
     void changeShadowQuality(int quality);
-    void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
+    void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality);
 
 signals:
     void shadowQualityChanged(int quality);
diff --git a/examples/bars/main.cpp b/examples/bars/main.cpp
index 21a4e0e6..6ae0e2ab 100644
--- a/examples/bars/main.cpp
+++ b/examples/bars/main.cpp
@@ -86,38 +86,38 @@ int main(int argc, char **argv)
 
     QComboBox *selectionModeList = new QComboBox(widget);
     selectionModeList->addItem(QStringLiteral("None"),
-                               int(QDataVis::SelectionNone));
+                               int(QAbstract3DGraph::SelectionNone));
     selectionModeList->addItem(QStringLiteral("Bar"),
-                               int(QDataVis::SelectionItem));
+                               int(QAbstract3DGraph::SelectionItem));
     selectionModeList->addItem(QStringLiteral("Row"),
-                               int(QDataVis::SelectionRow));
+                               int(QAbstract3DGraph::SelectionRow));
     selectionModeList->addItem(QStringLiteral("Bar and Row"),
-                               int(QDataVis::SelectionItemAndRow));
+                               int(QAbstract3DGraph::SelectionItemAndRow));
     selectionModeList->addItem(QStringLiteral("Column"),
-                               int(QDataVis::SelectionColumn));
+                               int(QAbstract3DGraph::SelectionColumn));
     selectionModeList->addItem(QStringLiteral("Bar and Column"),
-                               int(QDataVis::SelectionItemAndColumn));
+                               int(QAbstract3DGraph::SelectionItemAndColumn));
     selectionModeList->addItem(QStringLiteral("Row and Column"),
-                               int(QDataVis::SelectionRowAndColumn));
+                               int(QAbstract3DGraph::SelectionRowAndColumn));
     selectionModeList->addItem(QStringLiteral("Bar, Row and Column"),
-                               int(QDataVis::SelectionItemRowAndColumn));
+                               int(QAbstract3DGraph::SelectionItemRowAndColumn));
     selectionModeList->addItem(QStringLiteral("Slice into Row"),
-                               int(QDataVis::SelectionSlice | QDataVis::SelectionRow));
+                               int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionRow));
     selectionModeList->addItem(QStringLiteral("Slice into Row and Item"),
-                               int(QDataVis::SelectionSlice | QDataVis::SelectionItemAndRow));
+                               int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionItemAndRow));
     selectionModeList->addItem(QStringLiteral("Slice into Column"),
-                               int(QDataVis::SelectionSlice | QDataVis::SelectionColumn));
+                               int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionColumn));
     selectionModeList->addItem(QStringLiteral("Slice into Column and Item"),
-                               int(QDataVis::SelectionSlice | QDataVis::SelectionItemAndColumn));
+                               int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionItemAndColumn));
     selectionModeList->addItem(QStringLiteral("Multi: Bar, Row, Col"),
-                               int(QDataVis::SelectionItemRowAndColumn
-                                   | QDataVis::SelectionMultiSeries));
+                               int(QAbstract3DGraph::SelectionItemRowAndColumn
+                                   | QAbstract3DGraph::SelectionMultiSeries));
     selectionModeList->addItem(QStringLiteral("Multi, Slice: Row, Item"),
-                               int(QDataVis::SelectionSlice | QDataVis::SelectionItemAndRow
-                                   | QDataVis::SelectionMultiSeries));
+                               int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionItemAndRow
+                                   | QAbstract3DGraph::SelectionMultiSeries));
     selectionModeList->addItem(QStringLiteral("Multi, Slice: Col, Item"),
-                               int(QDataVis::SelectionSlice | QDataVis::SelectionItemAndColumn
-                                   | QDataVis::SelectionMultiSeries));
+                               int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionItemAndColumn
+                                   | QAbstract3DGraph::SelectionMultiSeries));
     selectionModeList->setCurrentIndex(1);
 
     QCheckBox *backgroundCheckBox = new QCheckBox(widget);
diff --git a/examples/custominput/scatterdatamodifier.cpp b/examples/custominput/scatterdatamodifier.cpp
index 2729316b..54f5571c 100644
--- a/examples/custominput/scatterdatamodifier.cpp
+++ b/examples/custominput/scatterdatamodifier.cpp
@@ -33,7 +33,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
       m_inputHandler(new CustomInputHandler())
 {
     m_graph->activeTheme()->setType(Q3DTheme::ThemeDigia);
-    m_graph->setShadowQuality(QDataVis::ShadowQualityMedium);
+    m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualityMedium);
     m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront);
 
     m_graph->setAxisX(new QValue3DAxis);
@@ -159,7 +159,7 @@ void ScatterDataModifier::triggerSelection()
     m_graph->scene()->setSelectionQueryPosition(m_inputHandler->inputPosition());
 }
 
-void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
+void ScatterDataModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq)
 {
     int quality = int(sq);
     emit shadowQualityChanged(quality); // connected to a checkbox in main.cpp
@@ -167,6 +167,6 @@ void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality s
 
 void ScatterDataModifier::changeShadowQuality(int quality)
 {
-    QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
+    QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality);
     m_graph->setShadowQuality(sq);
 }
diff --git a/examples/custominput/scatterdatamodifier.h b/examples/custominput/scatterdatamodifier.h
index fc0bc789..32f43474 100644
--- a/examples/custominput/scatterdatamodifier.h
+++ b/examples/custominput/scatterdatamodifier.h
@@ -43,7 +43,7 @@ public:
 
 public slots:
     void changeShadowQuality(int quality);
-    void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
+    void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality);
     void triggerSelection();
 
 signals:
diff --git a/examples/customproxy/rainfallgraph.cpp b/examples/customproxy/rainfallgraph.cpp
index 2e36a865..a9113643 100644
--- a/examples/customproxy/rainfallgraph.cpp
+++ b/examples/customproxy/rainfallgraph.cpp
@@ -66,10 +66,10 @@ RainfallGraph::RainfallGraph(Q3DBars *rainfall)
     series->setMesh(QAbstract3DSeries::MeshCylinder);
 
     // Set shadows to medium
-    m_graph->setShadowQuality(QDataVis::ShadowQualityMedium);
+    m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualityMedium);
 
     // Set selection mode to bar and column
-    m_graph->setSelectionMode(QDataVis::SelectionItemAndColumn | QDataVis::SelectionSlice);
+    m_graph->setSelectionMode(QAbstract3DGraph::SelectionItemAndColumn | QAbstract3DGraph::SelectionSlice);
 
     // Set theme
     m_graph->activeTheme()->setType(Q3DTheme::ThemeArmyBlue);
diff --git a/examples/customproxy/variantbardatamapping.h b/examples/customproxy/variantbardatamapping.h
index 9ccf1610..99bcee7f 100644
--- a/examples/customproxy/variantbardatamapping.h
+++ b/examples/customproxy/variantbardatamapping.h
@@ -19,11 +19,8 @@
 #ifndef VARIANTBARDATAMAPPING_H
 #define VARIANTBARDATAMAPPING_H
 
-#include "qdatavisualizationenums.h"
 #include <QStringList>
 
-using namespace QtDataVisualization;
-
 class VariantBarDataMapping : public QObject
 {
     Q_OBJECT
diff --git a/examples/customproxy/variantdataset.h b/examples/customproxy/variantdataset.h
index 6beb852f..9802d976 100644
--- a/examples/customproxy/variantdataset.h
+++ b/examples/customproxy/variantdataset.h
@@ -19,12 +19,9 @@
 #ifndef VARIANTDATASET_H
 #define VARIANTDATASET_H
 
-#include "qdatavisualizationenums.h"
 #include <QScopedPointer>
 #include <QVariantList>
 
-using namespace QtDataVisualization;
-
 //! [1]
 typedef QVariantList VariantDataItem;
 typedef QList<VariantDataItem *> VariantDataItemList;
diff --git a/examples/itemmodel/main.cpp b/examples/itemmodel/main.cpp
index f7a4b737..46824993 100644
--- a/examples/itemmodel/main.cpp
+++ b/examples/itemmodel/main.cpp
@@ -88,7 +88,7 @@ GraphDataGenerator::GraphDataGenerator(Q3DBars *bargraph, QTableWidget *tableWid
     m_tableWidget->setColumnCount(m_columnCount);
 
     // Set selection mode to full
-    m_graph->setSelectionMode(QDataVis::SelectionItemRowAndColumn);
+    m_graph->setSelectionMode(QAbstract3DGraph::SelectionItemRowAndColumn);
 
     // Hide axis labels by explicitly setting one empty string as label list
     m_graph->rowAxis()->setCategoryLabels(QStringList(QString()));
@@ -99,7 +99,7 @@ GraphDataGenerator::GraphDataGenerator(Q3DBars *bargraph, QTableWidget *tableWid
     //! [6]
 
     // Set selection mode to slice row
-    m_graph->setSelectionMode(QDataVis::SelectionItemAndRow | QDataVis::SelectionSlice);
+    m_graph->setSelectionMode(QAbstract3DGraph::SelectionItemAndRow | QAbstract3DGraph::SelectionSlice);
 
     //! [6]
 #endif
diff --git a/examples/scatter/scatterdatamodifier.cpp b/examples/scatter/scatterdatamodifier.cpp
index 15bbbb94..2a269d22 100644
--- a/examples/scatter/scatterdatamodifier.cpp
+++ b/examples/scatter/scatterdatamodifier.cpp
@@ -43,7 +43,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     QFont font = m_graph->activeTheme()->font();
     font.setPointSize(m_fontSize);
     m_graph->activeTheme()->setFont(font);
-    m_graph->setShadowQuality(QDataVis::ShadowQualitySoftLow);
+    m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftLow);
     m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront);
     //! [0]
 
@@ -160,7 +160,7 @@ void ScatterDataModifier::changeFont(const QFont &font)
     m_graph->activeTheme()->setFont(newFont);
 }
 
-void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
+void ScatterDataModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq)
 {
     int quality = int(sq);
     emit shadowQualityChanged(quality); // connected to a checkbox in main.cpp
@@ -168,7 +168,7 @@ void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality s
 
 void ScatterDataModifier::changeShadowQuality(int quality)
 {
-    QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
+    QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality);
     m_graph->setShadowQuality(sq);
 }
 
diff --git a/examples/scatter/scatterdatamodifier.h b/examples/scatter/scatterdatamodifier.h
index 78dd45e3..5d6e8b9f 100644
--- a/examples/scatter/scatterdatamodifier.h
+++ b/examples/scatter/scatterdatamodifier.h
@@ -47,7 +47,7 @@ public slots:
     void changeStyle(int style);
     void changeTheme(int theme);
     void changeShadowQuality(int quality);
-    void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
+    void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality);
 
 signals:
     void backgroundEnabledChanged(bool enabled);
diff --git a/examples/surface/surfacegraph.h b/examples/surface/surfacegraph.h
index ecdec672..4a214876 100644
--- a/examples/surface/surfacegraph.h
+++ b/examples/surface/surfacegraph.h
@@ -38,12 +38,12 @@ public:
     void enableSqrtSinModel(bool enable);
 
     //! [0]
-    void toggleModeNone() { m_graph->setSelectionMode(QDataVis::SelectionNone); }
-    void toggleModeItem() { m_graph->setSelectionMode(QDataVis::SelectionItem); }
-    void toggleModeSliceRow() { m_graph->setSelectionMode(QDataVis::SelectionItemAndRow
-                                                          | QDataVis::SelectionSlice); }
-    void toggleModeSliceColumn() { m_graph->setSelectionMode(QDataVis::SelectionItemAndColumn
-                                                             | QDataVis::SelectionSlice); }
+    void toggleModeNone() { m_graph->setSelectionMode(QAbstract3DGraph::SelectionNone); }
+    void toggleModeItem() { m_graph->setSelectionMode(QAbstract3DGraph::SelectionItem); }
+    void toggleModeSliceRow() { m_graph->setSelectionMode(QAbstract3DGraph::SelectionItemAndRow
+                                                          | QAbstract3DGraph::SelectionSlice); }
+    void toggleModeSliceColumn() { m_graph->setSelectionMode(QAbstract3DGraph::SelectionItemAndColumn
+                                                             | QAbstract3DGraph::SelectionSlice); }
     //! [0]
 
     void setBlackToYellowGradient();