4 files changed, 2 insertions, 70 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index 06c68cb0..a22caf9f 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -55,46 +55,6 @@ QDataVis::SelectionFlags AbstractDeclarative::selectionMode() const
     return m_controller->selectionMode();
 }
 
-void AbstractDeclarative::setFont(const QFont &font)
-{
-    m_controller->setFont(font);
-}
-
-QFont AbstractDeclarative::font() const
-{
-    return m_controller->font();
-}
-
-void AbstractDeclarative::setLabelStyle(QDataVis::LabelStyle style)
-{
-    m_controller->setLabelStyle(style);
-}
-
-QDataVis::LabelStyle AbstractDeclarative::labelStyle() const
-{
-    return m_controller->labelStyle();
-}
-
-void AbstractDeclarative::setGridVisible(bool visible)
-{
-    m_controller->setGridEnabled(visible);
-}
-
-bool AbstractDeclarative::isGridVisible() const
-{
-    return m_controller->gridEnabled();
-}
-
-void AbstractDeclarative::setBackgroundVisible(bool visible)
-{
-    m_controller->setBackgroundEnabled(visible);
-}
-
-bool AbstractDeclarative::isBackgroundVisible() const
-{
-    return m_controller->backgroundEnabled();
-}
-
 void AbstractDeclarative::setShadowQuality(QDataVis::ShadowQuality quality)
 {
     m_controller->setShadowQuality(quality);
@@ -115,16 +75,8 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller)
                      &AbstractDeclarative::inputHandlerChanged);
     QObject::connect(m_controller, &Abstract3DController::themeChanged, this,
                      &AbstractDeclarative::themeChanged);
-    QObject::connect(m_controller, &Abstract3DController::fontChanged, this,
-                     &AbstractDeclarative::fontChanged);
     QObject::connect(m_controller, &Abstract3DController::selectionModeChanged, this,
                      &AbstractDeclarative::selectionModeChanged);
-    QObject::connect(m_controller, &Abstract3DController::labelStyleChanged, this,
-                     &AbstractDeclarative::labelStyleChanged);
-    QObject::connect(m_controller, &Abstract3DController::backgroundVisibleChanged, this,
-                     &AbstractDeclarative::backgroundVisibleChanged);
-    QObject::connect(m_controller, &Abstract3DController::gridVisibleChanged, this,
-                     &AbstractDeclarative::gridVisibleChanged);
 }
 
 QAbstract3DInputHandler* AbstractDeclarative::inputHandler() const
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index 27572f7b..7811a44e 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -43,14 +43,10 @@ class AbstractDeclarative : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QtDataVisualization::QDataVis::SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged)
-    Q_PROPERTY(QtDataVisualization::QDataVis::LabelStyle labelStyle READ labelStyle WRITE setLabelStyle NOTIFY labelStyleChanged)
     Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged)
     Q_PROPERTY(Q3DScene* scene READ scene)
     Q_PROPERTY(QAbstract3DInputHandler* inputHandler READ inputHandler WRITE setInputHandler NOTIFY inputHandlerChanged)
     Q_PROPERTY(Q3DTheme* theme READ theme WRITE setTheme NOTIFY themeChanged)
-    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
-    Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible NOTIFY gridVisibleChanged)
-    Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible NOTIFY backgroundVisibleChanged)
 
 public:
     explicit AbstractDeclarative(QQuickItem *parent = 0);
@@ -67,18 +63,6 @@ public:
     virtual void setSelectionMode(QDataVis::SelectionFlags mode);
     virtual QDataVis::SelectionFlags selectionMode() const;
 
-    virtual void setFont(const QFont &font);
-    virtual QFont font() const;
-
-    virtual void setLabelStyle(QDataVis::LabelStyle style);
-    virtual QDataVis::LabelStyle labelStyle() const;
-
-    virtual void setGridVisible(bool visible);
-    virtual bool isGridVisible() const;
-
-    virtual void setBackgroundVisible(bool visible);
-    virtual bool isBackgroundVisible() const;
-
     virtual void setShadowQuality(QDataVis::ShadowQuality quality);
     virtual QDataVis::ShadowQuality shadowQuality() const;
 
@@ -97,11 +81,7 @@ signals:
     void shadowQualityChanged(QDataVis::ShadowQuality quality);
     void inputHandlerChanged(QAbstract3DInputHandler *inputHandler);
     void themeChanged(Q3DTheme *theme);
-    void fontChanged(QFont font);
     void selectionModeChanged(QDataVis::SelectionFlags mode);
-    void labelStyleChanged(QDataVis::LabelStyle style);
-    void backgroundVisibleChanged(bool visible);
-    void gridVisibleChanged(bool visible);
     void itemLabelFormatChanged(QString format);
 
 private:
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index e7bb2683..ab08765e 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -74,7 +74,7 @@ QSGNode *DeclarativeBars::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
 
 void DeclarativeBars::setBarColor(const QColor &baseColor)
 {
-    m_shared->setObjectColor(baseColor);
+    m_shared->setBaseColor(baseColor);
 }
 
 Q3DCategoryAxis *DeclarativeBars::rowAxis() const
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index 52c75962..7efcf8a6 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -74,7 +74,7 @@ QSGNode *DeclarativeScatter::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDa
 
 void DeclarativeScatter::setObjectColor(const QColor &baseColor)
 {
-    m_shared->setObjectColor(baseColor);
+    m_shared->setBaseColor(baseColor);
 }
 
 Q3DValueAxis *DeclarativeScatter::axisX() const