summaryrefslogtreecommitdiffstats
path: root/src/datavisualization
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualization')
-rw-r--r--src/datavisualization/axis/qabstract3daxis.h2
-rw-r--r--src/datavisualization/data/qabstract3dseries.h2
-rw-r--r--src/datavisualization/engine/q3dcamera.h2
-rw-r--r--src/datavisualization/engine/qabstract3dgraph.h4
-rw-r--r--src/datavisualization/input/qabstract3dinputhandler.h2
-rw-r--r--src/datavisualization/theme/q3dtheme.h4
6 files changed, 8 insertions, 8 deletions
diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h
index 0d63615a..2b2be229 100644
--- a/src/datavisualization/axis/qabstract3daxis.h
+++ b/src/datavisualization/axis/qabstract3daxis.h
@@ -84,7 +84,7 @@ public:
signals:
void titleChanged(const QString &newTitle);
void labelsChanged();
- void orientationChanged(AxisOrientation orientation);
+ void orientationChanged(QAbstract3DAxis::AxisOrientation orientation);
void minChanged(float value);
void maxChanged(float value);
void rangeChanged(float min, float max);
diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h
index 9f82901d..bf56422f 100644
--- a/src/datavisualization/data/qabstract3dseries.h
+++ b/src/datavisualization/data/qabstract3dseries.h
@@ -122,7 +122,7 @@ public:
signals:
void itemLabelFormatChanged(const QString &format);
void visibilityChanged(bool visible);
- void meshChanged(Mesh mesh);
+ void meshChanged(QAbstract3DSeries::Mesh mesh);
void meshSmoothChanged(bool enabled);
void meshRotationChanged(const QQuaternion &rotation);
void userDefinedMeshChanged(const QString &fileName);
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h
index 277035f4..e9ad6dd2 100644
--- a/src/datavisualization/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -93,7 +93,7 @@ signals:
void xRotationChanged(float rotation);
void yRotationChanged(float rotation);
void zoomLevelChanged(float zoomLevel);
- void cameraPresetChanged(CameraPreset preset);
+ void cameraPresetChanged(Q3DCamera::CameraPreset preset);
void wrapXRotationChanged(bool isEnabled);
void wrapYRotationChanged(bool isEnabled);
diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h
index f11bbd90..18eda7df 100644
--- a/src/datavisualization/engine/qabstract3dgraph.h
+++ b/src/datavisualization/engine/qabstract3dgraph.h
@@ -111,8 +111,8 @@ protected:
signals:
void activeInputHandlerChanged(QAbstract3DInputHandler *inputHandler);
void activeThemeChanged(Q3DTheme *theme);
- void selectionModeChanged(SelectionFlags mode);
- void shadowQualityChanged(ShadowQuality quality);
+ void selectionModeChanged(QAbstract3DGraph::SelectionFlags mode);
+ void shadowQualityChanged(QAbstract3DGraph::ShadowQuality quality);
private:
Q_DISABLE_COPY(QAbstract3DGraph)
diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h
index 75ec8c1b..475b6928 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.h
+++ b/src/datavisualization/input/qabstract3dinputhandler.h
@@ -70,7 +70,7 @@ public:
signals:
void positionChanged(const QPoint &position);
- void inputViewChanged(InputView view);
+ void inputViewChanged(QAbstract3DInputHandler::InputView view);
void sceneChanged(Q3DScene *scene);
protected:
diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h
index 43278c79..3a82afea 100644
--- a/src/datavisualization/theme/q3dtheme.h
+++ b/src/datavisualization/theme/q3dtheme.h
@@ -148,7 +148,7 @@ public:
ColorStyle colorStyle() const;
signals:
- void typeChanged(Theme themeType);
+ void typeChanged(Q3DTheme::Theme themeType);
void baseColorsChanged(const QList<QColor> &colors);
void backgroundColorChanged(const QColor &color);
void windowColorChanged(const QColor &color);
@@ -169,7 +169,7 @@ signals:
void backgroundEnabledChanged(bool enabled);
void gridEnabledChanged(bool enabled);
void labelBackgroundEnabledChanged(bool enabled);
- void colorStyleChanged(ColorStyle style);
+ void colorStyleChanged(Q3DTheme::ColorStyle style);
protected:
explicit Q3DTheme(Q3DThemePrivate *d, Theme themeType, QObject *parent = 0);