6 files changed, 21 insertions, 18 deletions

diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp
index e48a4b58..7c9d8b01 100644
--- a/tests/kinectsurface/surfacedata.cpp
+++ b/tests/kinectsurface/surfacedata.cpp
@@ -51,7 +51,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars
     m_surface->axisY()->setMax(255);
     m_surface->setSurfaceGridEnabled(false);
     m_surface->setBackgroundVisible(false);
-    m_surface->setSmoothSurfaceEnabled(false);
+    m_surface->setFlatShadingEnabled(true);
     m_surface->setActiveDataProxy(new QHeightMapSurfaceDataProxy());
     m_surface->setCameraPosition(0.0, 90.0, 105);
 
diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp
index 27f5f449..fac341d8 100644
--- a/tests/multigraphs/data.cpp
+++ b/tests/multigraphs/data.cpp
@@ -54,30 +54,33 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars,
     m_surface->setSelectionMode(QDataVis::SelectionNone);
     m_surface->theme()->setGridEnabled(false);
     m_surface->setGradient(gradient);
-    m_surface->setSurfaceGridEnabled(false);
     m_surface->theme()->setBackgroundEnabled(false);
-    m_surface->setSmoothSurfaceEnabled(false);
     m_surface->scene()->activeCamera()->setCameraPosition(0.0, 90.0, 150);
-    m_surface->addSeries(new QSurface3DSeries(new QHeightMapSurfaceDataProxy()));
+    QSurface3DSeries *series1 = new QSurface3DSeries(new QHeightMapSurfaceDataProxy());
+    series1->setFlatShadingEnabled(true);
+    series1->setSurfaceGridEnabled(false);
+    m_surface->addSeries(series1);
 
     // Initialize scatter
     m_scatter->setTheme(new Q3DTheme(Q3DTheme::ThemeStoneMoss));
     m_scatter->setSelectionMode(QDataVis::SelectionNone);
     m_scatter->theme()->setGridEnabled(false);
-    m_scatter->setObjectType(QDataVis::MeshPoint);
     m_scatter->setShadowQuality(QDataVis::ShadowQualitySoftLow);
     m_scatter->scene()->activeCamera()->setCameraPosition(0.0, 85.0, 150);
-    m_scatter->addSeries(new QScatter3DSeries);
+    QScatter3DSeries *series2 = new QScatter3DSeries;
+    series2->setMesh(QAbstract3DSeries::MeshPoint);
+    m_scatter->addSeries(series2);
 
     // Initialize bars
     m_bars->setTheme(new Q3DTheme(Q3DTheme::ThemeQt));
     m_bars->setSelectionMode(QDataVis::SelectionItemAndRow | QDataVis::SelectionSlice);
     m_bars->theme()->setGridEnabled(false);
-    m_bars->setBarType(QDataVis::MeshBar, false);
     m_bars->setShadowQuality(QDataVis::ShadowQualityLow);
     m_bars->setBarSpacing(QSizeF(0.0, 0.0));
     m_bars->scene()->activeCamera()->setCameraPosition(0.0, 75.0, 150);
-    m_bars->addSeries(new QBar3DSeries);
+    QBar3DSeries *series3 = new QBar3DSeries;
+    series3->setMesh(QAbstract3DSeries::MeshBar);
+    m_bars->addSeries(series3);
 
     // Hide scroll bar
     m_statusArea->verticalScrollBar()->setVisible(false);
diff --git a/tests/qmlcamera/qml/qmlcamera/main.qml b/tests/qmlcamera/qml/qmlcamera/main.qml
index 929330c8..3aa0991a 100644
--- a/tests/qmlcamera/qml/qmlcamera/main.qml
+++ b/tests/qmlcamera/qml/qmlcamera/main.qml
@@ -138,11 +138,11 @@ Item {
         width: camControlArea.width
         text: "Hide Shadows"
         onClicked: {
-            if (testChart.shadowQuality == Bars3D.ShadowQualityNone) {
-                testChart.shadowQuality = Bars3D.ShadowQualityMedium;
+            if (testChart.shadowQuality == AbstractGraph3D.ShadowQualityNone) {
+                testChart.shadowQuality = AbstractGraph3D.ShadowQualityMedium;
                 text = "Hide Shadows"
             } else {
-                testChart.shadowQuality = Bars3D.ShadowQualityNone;
+                testChart.shadowQuality = AbstractGraph3D.ShadowQualityNone;
                 text = "Show Shadows"
             }
         }
diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp
index 8d954dc9..65c658d8 100644
--- a/tests/spectrum/spectrumapp/main.cpp
+++ b/tests/spectrum/spectrumapp/main.cpp
@@ -94,7 +94,6 @@ MainApp::MainApp(Q3DBars *window)
     m_chart->setBarThickness(2.0f);
     m_chart->setBarSpacing(QSizeF(0.0, 0.0));
     // Set bar type, flat bars
-    m_chart->setBarType(QDataVis::MeshBar, false);
     // Adjust camera position
     m_chart->scene()->activeCamera()->setCameraPosition(10.0f, 7.5f, 75.0f);
 #endif
@@ -107,8 +106,9 @@ MainApp::MainApp(Q3DBars *window)
     m_restartTimer->setSingleShot(true);
     QObject::connect(m_restartTimer, &QTimer::timeout, this, &MainApp::restart);
 
-    QBarDataProxy *proxy = new QBarDataProxy;
-    m_chart->addSeries(new QBar3DSeries(proxy));
+    QBar3DSeries *series = new QBar3DSeries();
+    series->setMesh(QAbstract3DSeries::MeshBar);
+    m_chart->addSeries(series);
 }
 
 MainApp::~MainApp()
diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp
index fb9e9ec2..68f83f01 100644
--- a/tests/surfacetest/graphmodifier.cpp
+++ b/tests/surfacetest/graphmodifier.cpp
@@ -71,13 +71,13 @@ GraphModifier::~GraphModifier()
 void GraphModifier::toggleSmooth(bool enabled)
 {
     qDebug() << "GraphModifier::toggleSmooth " << enabled;
-    m_graph->setSmoothSurfaceEnabled(enabled);
+    m_theSeries->setFlatShadingEnabled(enabled);
 }
 
 void GraphModifier::toggleSurfaceGrid(bool enable)
 {
     qDebug() << "GraphModifier::toggleSurfaceGrid" << enable;
-    m_graph->setSurfaceGridEnabled(enable);
+    m_theSeries->setSurfaceGridEnabled(enable);
 }
 
 void GraphModifier::toggleSurface(bool enable)
diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp
index f05de5e9..621557fb 100644
--- a/tests/surfacetest/main.cpp
+++ b/tests/surfacetest/main.cpp
@@ -64,8 +64,8 @@ int main(int argc, char *argv[])
     hLayout->addLayout(vLayout);
 
     QCheckBox *smoothCB = new QCheckBox(widget);
-    smoothCB->setText(QStringLiteral("Smooth "));
-    smoothCB->setChecked(surfaceGraph->isSmoothSurfaceEnabled());
+    smoothCB->setText(QStringLiteral("Flat Surface"));
+    smoothCB->setChecked(true);
 
     QCheckBox *surfaceGridCB = new QCheckBox(widget);
     surfaceGridCB->setText(QStringLiteral("Surface Grid"));