summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-10-02 13:14:16 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-10-02 13:14:35 +0300
commit50da1dc9f6cc6a276c603508868dd7f9d4c7913d (patch)
treeba5b78cc2187709f33ccc6da9d7581c7f63729f6 /src/datavisualizationqml2
parent0b1c5c06a188a9dc22820e289b3ef9d6589a0df9 (diff)
Refactored MeshStyle and InputState
Task-number: QTRD-2362 Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9 Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
-rw-r--r--src/datavisualizationqml2/declarativebars.cpp4
-rw-r--r--src/datavisualizationqml2/declarativescatter.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index c15ca495..9ed80106 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -163,9 +163,9 @@ QDataVis::MeshStyle DeclarativeBars::barType() const
{
QString objFile = m_shared->meshFileName();
if (objFile.contains("/sphere"))
- return QDataVis::Spheres;
+ return QDataVis::MeshStyleSpheres;
else
- return QDataVis::Dots;
+ return QDataVis::MeshStyleDots;
}
void DeclarativeBars::setBarSmoothingEnabled(bool enabled)
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index 6447c781..346abec2 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -127,9 +127,9 @@ QDataVis::MeshStyle DeclarativeScatter::objectType() const
{
QString objFile = m_shared->meshFileName();
if (objFile.contains("/sphere"))
- return QDataVis::Spheres;
+ return QDataVis::MeshStyleSpheres;
else
- return QDataVis::Dots;
+ return QDataVis::MeshStyleDots;
}
void DeclarativeScatter::setObjectSmoothingEnabled(bool enabled)