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>

1 files changed, 40 insertions, 10 deletions

diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index 1f16f44d..af66f3ca 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -39,27 +39,54 @@
 #include <QObject>
 #include <QQuickWindow>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class AbstractDeclarative : public QQuickItem
 {
     Q_OBJECT
-    Q_PROPERTY(QtDataVisualization::QDataVis::SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged)
-    Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged)
+    Q_ENUMS(ShadowQuality)
+    Q_FLAGS(SelectionFlag SelectionFlags)
+    Q_PROPERTY(SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged)
+    Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged)
     Q_PROPERTY(Declarative3DScene* scene READ scene NOTIFY sceneChanged)
     Q_PROPERTY(QAbstract3DInputHandler* inputHandler READ inputHandler WRITE setInputHandler NOTIFY inputHandlerChanged)
     Q_PROPERTY(Q3DTheme* theme READ theme WRITE setTheme NOTIFY themeChanged)
     Q_PROPERTY(bool clearWindowBeforeRendering READ clearWindowBeforeRendering WRITE setClearWindowBeforeRendering NOTIFY clearWindowBeforeRenderingChanged)
 
 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
+    };
+
+public:
     explicit AbstractDeclarative(QQuickItem *parent = 0);
     virtual ~AbstractDeclarative();
 
-    virtual void setSelectionMode(QDataVis::SelectionFlags mode);
-    virtual QDataVis::SelectionFlags selectionMode() const;
+    virtual void setSelectionMode(SelectionFlags mode);
+    virtual AbstractDeclarative::SelectionFlags selectionMode() const;
 
-    virtual void setShadowQuality(QDataVis::ShadowQuality quality);
-    virtual QDataVis::ShadowQuality shadowQuality() const;
+    virtual void setShadowQuality(ShadowQuality quality);
+    virtual AbstractDeclarative::ShadowQuality shadowQuality() const;
 
     virtual Declarative3DScene *scene() const;
 
@@ -94,11 +121,13 @@ protected:
     virtual void handleWindowChanged(QQuickWindow *win);
     virtual void itemChange(ItemChange change, const ItemChangeData &value);
     virtual void updateWindowParameters();
+    virtual void handleSelectionModeChange(QAbstract3DGraph::SelectionFlags mode);
+    virtual void handleShadowQualityChange(QAbstract3DGraph::ShadowQuality quality);
 
 signals:
     // Signals shadow quality changes.
-    void selectionModeChanged(QDataVis::SelectionFlags mode);
-    void shadowQualityChanged(QDataVis::ShadowQuality quality);
+    void selectionModeChanged(SelectionFlags mode);
+    void shadowQualityChanged(ShadowQuality quality);
     void sceneChanged(Q3DScene *scene);
     void inputHandlerChanged(QAbstract3DInputHandler *inputHandler);
     void themeChanged(Q3DTheme *theme);
@@ -109,7 +138,8 @@ private:
     QRectF m_cachedGeometry;
     bool m_clearWindowBeforeRendering;
 };
+Q_DECLARE_OPERATORS_FOR_FLAGS(AbstractDeclarative::SelectionFlags)
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // ABSTRACTDECLARATIVE_P_H