summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-12-05 11:26:25 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-12-05 12:00:39 +0200
commita665bdb2010c3833f47d364945007cccc00aed2b (patch)
treeb364646695ccf068d409c785a10531e04f3c261d /examples
parente57ed8602ac02ff86e3c08362ca4fbe23fe05bfb (diff)
QML docs + enum moving
Task-number: QTRD-2670 Task-number: QTRD-2505 Change-Id: I51a870f9a57b093e8216759a5577e161ff3afd60 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/bars/graphmodifier.cpp8
-rw-r--r--examples/custominput/scatterdatamodifier.cpp2
-rw-r--r--examples/customproxy/rainfallgraph.cpp2
-rw-r--r--examples/itemmodel/main.cpp2
-rw-r--r--examples/scatter/scatterdatamodifier.cpp10
5 files changed, 12 insertions, 12 deletions
diff --git a/examples/bars/graphmodifier.cpp b/examples/bars/graphmodifier.cpp
index 09c45c6f..ff7a8032 100644
--- a/examples/bars/graphmodifier.cpp
+++ b/examples/bars/graphmodifier.cpp
@@ -175,12 +175,12 @@ void GraphModifier::changeStyle(int style)
void GraphModifier::changePresetCamera()
{
- static int preset = QDataVis::CameraPresetFront;
+ static int preset = Q3DCamera::CameraPresetFront;
- m_graph->scene()->activeCamera()->setCameraPreset((QDataVis::CameraPreset)preset);
+ m_graph->scene()->activeCamera()->setCameraPreset((Q3DCamera::CameraPreset)preset);
- if (++preset > QDataVis::CameraPresetDirectlyBelow)
- preset = QDataVis::CameraPresetFrontLow;
+ if (++preset > Q3DCamera::CameraPresetDirectlyBelow)
+ preset = Q3DCamera::CameraPresetFrontLow;
}
void GraphModifier::changeTheme(int theme)
diff --git a/examples/custominput/scatterdatamodifier.cpp b/examples/custominput/scatterdatamodifier.cpp
index a712be17..623f065d 100644
--- a/examples/custominput/scatterdatamodifier.cpp
+++ b/examples/custominput/scatterdatamodifier.cpp
@@ -34,7 +34,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
{
m_graph->setTheme(new Q3DTheme(Q3DTheme::ThemeDigia));
m_graph->setShadowQuality(QDataVis::ShadowQualitySoftLow);
- m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetFront);
+ m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront);
m_graph->setAxisX(new Q3DValueAxis);
m_graph->setAxisY(new Q3DValueAxis);
diff --git a/examples/customproxy/rainfallgraph.cpp b/examples/customproxy/rainfallgraph.cpp
index 64c90017..ad45d016 100644
--- a/examples/customproxy/rainfallgraph.cpp
+++ b/examples/customproxy/rainfallgraph.cpp
@@ -78,7 +78,7 @@ RainfallGraph::RainfallGraph(Q3DBars *rainfall)
m_graph->theme()->setFont(QFont("Century Gothic", 30));
// Set camera position and zoom
- m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetIsometricRightHigh);
+ m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetIsometricRightHigh);
m_graph->scene()->activeCamera()->setZoomLevel(75);
// Set window title
diff --git a/examples/itemmodel/main.cpp b/examples/itemmodel/main.cpp
index 3d06f5c1..533264d8 100644
--- a/examples/itemmodel/main.cpp
+++ b/examples/itemmodel/main.cpp
@@ -113,7 +113,7 @@ GraphDataGenerator::GraphDataGenerator(Q3DBars *bargraph, QTableWidget *tableWid
m_graph->theme()->setFont(QFont("Impact", 20));
// Set preset camera position
- m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetFront);
+ m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront);
//! [7]
}
diff --git a/examples/scatter/scatterdatamodifier.cpp b/examples/scatter/scatterdatamodifier.cpp
index db1b408a..0e21ea23 100644
--- a/examples/scatter/scatterdatamodifier.cpp
+++ b/examples/scatter/scatterdatamodifier.cpp
@@ -44,7 +44,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
font.setPointSize(m_fontSize);
m_graph->theme()->setFont(font);
m_graph->setShadowQuality(QDataVis::ShadowQualitySoftLow);
- m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetFront);
+ m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront);
//! [0]
//! [1]
@@ -144,12 +144,12 @@ void ScatterDataModifier::changeTheme(int theme)
void ScatterDataModifier::changePresetCamera()
{
- static int preset = QDataVis::CameraPresetFrontLow;
+ static int preset = Q3DCamera::CameraPresetFrontLow;
- m_graph->scene()->activeCamera()->setCameraPreset((QDataVis::CameraPreset)preset);
+ m_graph->scene()->activeCamera()->setCameraPreset((Q3DCamera::CameraPreset)preset);
- if (++preset > QDataVis::CameraPresetDirectlyBelow)
- preset = QDataVis::CameraPresetFrontLow;
+ if (++preset > Q3DCamera::CameraPresetDirectlyBelow)
+ preset = Q3DCamera::CameraPresetFrontLow;
}
void ScatterDataModifier::changeLabelStyle()