summaryrefslogtreecommitdiffstats
path: root/tests/multigraphs
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-01-15 11:34:59 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-01-15 11:36:17 +0200
commit64d6b482bfb9dbacd548b72cb9c073513f6aa56f (patch)
tree6adea7f584f31d2b650379a4dba9ff6d7de527e3 /tests/multigraphs
parentca8eb71e320d08071f0f43393da3bb3fabf56da7 (diff)
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>
Diffstat (limited to 'tests/multigraphs')
-rw-r--r--tests/multigraphs/data.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp
index e70a01df..9df5e668 100644
--- a/tests/multigraphs/data.cpp
+++ b/tests/multigraphs/data.cpp
@@ -29,7 +29,7 @@
#include <QSize>
#include <QImage>
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars,
QTextEdit *statusArea, QWidget *widget) :
@@ -53,7 +53,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars,
gradient.setColorAt(0.33, Qt::blue);
gradient.setColorAt(0.67, Qt::red);
gradient.setColorAt(1.0, Qt::yellow);
- m_surface->setSelectionMode(QDataVis::SelectionNone);
+ m_surface->setSelectionMode(QAbstract3DGraph::SelectionNone);
m_surface->activeTheme()->setGridEnabled(false);
m_surface->activeTheme()->setBackgroundEnabled(false);
m_surface->scene()->activeCamera()->setCameraPosition(0.0, 90.0, 150);
@@ -66,9 +66,9 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars,
// Initialize scatter
m_scatter->activeTheme()->setType(Q3DTheme::ThemeStoneMoss);
- m_scatter->setSelectionMode(QDataVis::SelectionNone);
+ m_scatter->setSelectionMode(QAbstract3DGraph::SelectionNone);
m_scatter->activeTheme()->setGridEnabled(false);
- m_scatter->setShadowQuality(QDataVis::ShadowQualitySoftLow);
+ m_scatter->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftLow);
m_scatter->scene()->activeCamera()->setCameraPosition(0.0, 85.0, 150);
QScatter3DSeries *series2 = new QScatter3DSeries;
series2->setMesh(QAbstract3DSeries::MeshPoint);
@@ -76,9 +76,9 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars,
// Initialize bars
m_bars->activeTheme()->setType(Q3DTheme::ThemeQt);
- m_bars->setSelectionMode(QDataVis::SelectionItemAndRow | QDataVis::SelectionSlice);
+ m_bars->setSelectionMode(QAbstract3DGraph::SelectionItemAndRow | QAbstract3DGraph::SelectionSlice);
m_bars->activeTheme()->setGridEnabled(false);
- m_bars->setShadowQuality(QDataVis::ShadowQualityLow);
+ m_bars->setShadowQuality(QAbstract3DGraph::ShadowQualityLow);
m_bars->setBarSpacing(QSizeF(0.0, 0.0));
m_bars->scene()->activeCamera()->setCameraPosition(0.0, 75.0, 150);
QBar3DSeries *series3 = new QBar3DSeries;