4 files changed, 15 insertions, 20 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index e853ff9c..d4b5c7b7 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -47,12 +47,12 @@ QDataVis::Theme AbstractDeclarative::theme() const
     return m_controller->theme().theme();
 }
 
-void AbstractDeclarative::setSelectionMode(QDataVis::SelectionMode mode)
+void AbstractDeclarative::setSelectionMode(QDataVis::SelectionFlags mode)
 {
     m_controller->setSelectionMode(mode);
 }
 
-QDataVis::SelectionMode AbstractDeclarative::selectionMode() const
+QDataVis::SelectionFlags AbstractDeclarative::selectionMode() const
 {
     return m_controller->selectionMode();
 }
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index 41d4a4da..842dbf4b 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -42,7 +42,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 class AbstractDeclarative : public QQuickItem
 {
     Q_OBJECT
-    Q_PROPERTY(QtDataVisualization::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
+    Q_PROPERTY(QtDataVisualization::QDataVis::SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode)
     Q_PROPERTY(QtDataVisualization::QDataVis::LabelStyle labelStyle READ labelStyle WRITE setLabelStyle)
     Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
     Q_PROPERTY(Q3DScene* scene READ scene NOTIFY sceneChanged)
@@ -52,11 +52,6 @@ class AbstractDeclarative : public QQuickItem
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
     Q_PROPERTY(QString itemLabelFormat READ itemLabelFormat WRITE setItemLabelFormat)
-    Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode)
-    Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality)
-    Q_ENUMS(QtDataVisualization::QDataVis::LabelStyle)
-    Q_ENUMS(QtDataVisualization::QDataVis::CameraPreset)
-    Q_ENUMS(QtDataVisualization::QDataVis::Theme)
 
 public:
     explicit AbstractDeclarative(QQuickItem *parent = 0);
@@ -70,8 +65,8 @@ public:
     virtual void setTheme(QDataVis::Theme theme);
     virtual QDataVis::Theme theme() const;
 
-    virtual void setSelectionMode(QDataVis::SelectionMode mode);
-    virtual QDataVis::SelectionMode selectionMode() const;
+    virtual void setSelectionMode(QDataVis::SelectionFlags mode);
+    virtual QDataVis::SelectionFlags selectionMode() const;
 
     virtual void setFont(const QFont &font);
     virtual QFont font() const;
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index 9ed80106..52b19807 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -41,8 +41,8 @@ DeclarativeBars::DeclarativeBars(QQuickItem *parent)
     // Create the shared component on the main GUI thread.
     m_shared = new Bars3DController(boundingRect().toRect());
     AbstractDeclarative::setSharedController(m_shared);
-    QObject::connect(m_shared, &Bars3DController::selectedBarPosChanged, this,
-                     &DeclarativeBars::selectedBarPosChanged);
+    QObject::connect(m_shared, &Bars3DController::selectedBarChanged, this,
+                     &DeclarativeBars::selectedBarChanged);
 
     QItemModelBarDataProxy *proxy = new QItemModelBarDataProxy;
     m_shared->setActiveDataProxy(proxy);
@@ -201,14 +201,14 @@ QString DeclarativeBars::meshFileName() const
     return m_shared->meshFileName();
 }
 
-void DeclarativeBars::setSelectedBarPos(const QPointF &position)
+void DeclarativeBars::setSelectedBar(const QPointF &position)
 {
-    m_shared->setSelectedBarPos(position.toPoint());
+    m_shared->setSelectedBar(position.toPoint());
 }
 
-QPointF DeclarativeBars::selectedBarPos() const
+QPointF DeclarativeBars::selectedBar() const
 {
-    return QPointF(m_shared->selectedBarPos());
+    return QPointF(m_shared->selectedBar());
 }
 
 QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h
index dfbf9934..f71d9ad3 100644
--- a/src/datavisualizationqml2/declarativebars_p.h
+++ b/src/datavisualizationqml2/declarativebars_p.h
@@ -57,7 +57,7 @@ class DeclarativeBars : public AbstractDeclarative
     Q_PROPERTY(bool barSpacingRelative READ isBarSpacingRelative WRITE setBarSpacingRelative)
     Q_PROPERTY(bool barSmoothingEnabled READ isBarSmoothingEnabled WRITE setBarSmoothingEnabled)
     Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName)
-    Q_PROPERTY(QPointF selectedBarPos READ selectedBarPos WRITE setSelectedBarPos NOTIFY selectedBarPosChanged)
+    Q_PROPERTY(QPointF selectedBar READ selectedBar WRITE setSelectedBar NOTIFY selectedBarChanged)
     Q_ENUMS(QtDataVisualization::QDataVis::MeshStyle)
 
 public:
@@ -94,11 +94,11 @@ public:
     void setMeshFileName(const QString &objFileName);
     QString meshFileName() const;
 
-    void setSelectedBarPos(const QPointF &position);
-    QPointF selectedBarPos() const;
+    void setSelectedBar(const QPointF &position);
+    QPointF selectedBar() const;
 
 signals:
-    void selectedBarPosChanged(const QPointF &position);
+    void selectedBarChanged(const QPointF &position);
 
 protected:
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *);