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>

5 files changed, 2 insertions, 169 deletions

diff --git a/src/datavisualization/global/datavisualizationglobal_p.h b/src/datavisualization/global/datavisualizationglobal_p.h
index 8ff36a90..6ceb9658 100644
--- a/src/datavisualization/global/datavisualizationglobal_p.h
+++ b/src/datavisualization/global/datavisualizationglobal_p.h
@@ -30,12 +30,11 @@
 #define DATAVISUALIZATIONGLOBAL_P_H
 
 #include "qdatavisualizationglobal.h"
-#include "qdatavisualizationenums.h"
 #include <QOpenGLFunctions>
 #include <QVector3D>
 #include <QDebug>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 // Constants used in several files
 // Distance from camera to origin
@@ -57,6 +56,6 @@ static const QVector3D invalidColorVector = QVector3D(-1.0f, -1.0f, -1.0f);
 static const GLfloat gradientTextureHeight = 1024.0f;
 static const GLfloat gradientTextureWidth = 2.0f;
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/global/global.pri b/src/datavisualization/global/global.pri
index 0fd7c576..00a3eb65 100644
--- a/src/datavisualization/global/global.pri
+++ b/src/datavisualization/global/global.pri
@@ -1,4 +1,3 @@
 HEADERS += \
     $$PWD/qdatavisualizationglobal.h \
-    $$PWD/qdatavisualizationenums.h \
     $$PWD/datavisualizationglobal_p.h
diff --git a/src/datavisualization/global/qdatavisualizationenums.h b/src/datavisualization/global/qdatavisualizationenums.h
deleted file mode 100644
index fcbf63a9..00000000
--- a/src/datavisualization/global/qdatavisualizationenums.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtDataVisualization module.
-**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-**
-****************************************************************************/
-
-#ifndef QDATAVISUALIZATIONENUMS_H
-#define QDATAVISUALIZATIONENUMS_H
-
-#include <QtDataVisualization/qdatavisualizationglobal.h>
-#include <QObject>
-
-// namespace must be declared without using macros for qdoc
-namespace QtDataVisualization {
-
-class QT_DATAVISUALIZATION_EXPORT QDataVis : public QObject
-{
-    Q_OBJECT
-    Q_ENUMS(ShadowQuality)
-    Q_FLAGS(SelectionFlag SelectionFlags)
-
-public:
-    enum SelectionFlag {
-        SelectionNone              = 0,
-        SelectionItem              = 1,
-        SelectionRow               = 2,
-        SelectionItemAndRow        = SelectionItem | SelectionRow,
-        SelectionColumn            = 4,
-        SelectionItemAndColumn     = SelectionItem | SelectionColumn,
-        SelectionRowAndColumn      = SelectionRow | SelectionColumn,
-        SelectionItemRowAndColumn  = SelectionItem | SelectionRow | SelectionColumn,
-        SelectionSlice             = 8,
-        SelectionMultiSeries       = 16
-    };
-    Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag)
-
-    enum ShadowQuality {
-        ShadowQualityNone = 0,
-        ShadowQualityLow,
-        ShadowQualityMedium,
-        ShadowQualityHigh,
-        ShadowQualitySoftLow,
-        ShadowQualitySoftMedium,
-        ShadowQualitySoftHigh
-    };
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QDataVis::SelectionFlags)
-}
-
-#endif
diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h
index a125e4b2..e17cc7ea 100644
--- a/src/datavisualization/global/qdatavisualizationglobal.h
+++ b/src/datavisualization/global/qdatavisualizationglobal.h
@@ -52,16 +52,4 @@
 #  define QT_DATAVISUALIZATION_AUTOTEST_EXPORT
 #endif
 
-#define QT_DATAVISUALIZATION_NAMESPACE QtDataVisualization
-
-#ifdef QT_DATAVISUALIZATION_NAMESPACE
-#  define QT_DATAVISUALIZATION_BEGIN_NAMESPACE namespace QT_DATAVISUALIZATION_NAMESPACE {
-#  define QT_DATAVISUALIZATION_END_NAMESPACE }
-#  define QT_DATAVISUALIZATION_USE_NAMESPACE using namespace QT_DATAVISUALIZATION_NAMESPACE;
-#else
-#  define QT_DATAVISUALIZATION_BEGIN_NAMESPACE
-#  define QT_DATAVISUALIZATION_END_NAMESPACE
-#  define QT_DATAVISUALIZATION_USE_NAMESPACE
-#endif
-
 #endif
diff --git a/src/datavisualization/global/qtdatavisualizationenums.qdoc b/src/datavisualization/global/qtdatavisualizationenums.qdoc
deleted file mode 100644
index f3fa406c..00000000
--- a/src/datavisualization/global/qtdatavisualizationenums.qdoc
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtDataVisualization module.
-**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-**
-****************************************************************************/
-
-/*!
-    \namespace QtDataVisualization
-    \inmodule QtDataVisualization
-    \target QtDataVisualization Enums
-
-    QtDataVisualization namespace holds all the classes and enumerations in the QtDataVisualization
-    module.
-
-    \generatelist{classesbymodule QtDataVisualization}
-*/
-
-/*!
- * \class QtDataVisualization::QDataVis
- * \inmodule QtDataVisualization
- * \brief Container class for Qt Data Visualization enums.
- * \since Qt Data Visualization 1.0
- *
- * QDataVis acts as a container for Qt Data Visualization enums. It has no other functionality.
- */
-
-/*!
-    \enum QtDataVisualization::QDataVis::SelectionFlag
-
-    Item selection modes. Values of this enumeration can be combined with OR operator.
-
-    \value SelectionNone
-           Selection mode disabled.
-    \value SelectionItem
-           Selection highlights a single item.
-    \value SelectionRow
-           Selection highlights a single row.
-    \value SelectionItemAndRow
-           Combination flag for highlighting both item and row with different colors.
-    \value SelectionColumn
-           Selection highlights a single column.
-    \value SelectionItemAndColumn
-           Combination flag for highlighting both item and column with different colors.
-    \value SelectionRowAndColumn
-           Combination flag for highlighting both row and column.
-    \value SelectionItemRowAndColumn
-           Combination flag for highlighting item, row, and column.
-    \value SelectionSlice
-           Setting this mode flag indicates that the graph should take care of the slice view handling
-           automatically. If you wish to control the slice view yourself via Q3DScene, do not set this
-           flag. When setting this mode flag, either \c SelectionRow or \c SelectionColumn must also
-           be set, but not both. Slicing is supported by Q3DBars and Q3DSurface only.
-    \value SelectionMultiSeries
-           Setting this mode means that items for all series at same position are highlighted, instead
-           of just the selected item. The actual selection in the other series doesn't change.
-           Multi-series selection is only supported for Q3DBars.
-*/
-
-/*!
-    \enum QtDataVisualization::QDataVis::ShadowQuality
-
-    Quality of shadows.
-
-    \value ShadowQualityNone
-           Shadows are disabled.
-    \value ShadowQualityLow
-           Shadows are rendered in low quality.
-    \value ShadowQualityMedium
-           Shadows are rendered in medium quality.
-    \value ShadowQualityHigh
-           Shadows are rendered in high quality.
-    \value ShadowQualitySoftLow
-           Shadows are rendered in low quality with softened edges.
-    \value ShadowQualitySoftMedium
-           Shadows are rendered in medium quality with softened edges.
-    \value ShadowQualitySoftHigh
-           Shadows are rendered in high quality with softened edges.
-*/