From d468bd990787a50899438202b86389462b825993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Tue, 21 Jan 2014 13:56:29 +0200 Subject: InputState enum moved to private Task-number: QTRD-2784 Change-Id: Ibda5445cc9872e2a5bf234914f11d4c380447cf4 Change-Id: Ibda5445cc9872e2a5bf234914f11d4c380447cf4 Reviewed-by: Miikka Heikkinen --- src/datavisualization/input/qabstract3dinputhandler.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/datavisualization/input/qabstract3dinputhandler.h') diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 47ae9e1c..94a34475 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -29,21 +29,12 @@ class QAbstract3DInputHandlerPrivate; class QT_DATAVISUALIZATION_EXPORT QAbstract3DInputHandler : public QObject { Q_OBJECT - Q_ENUMS(InputState) Q_ENUMS(InputView) - Q_PROPERTY(InputState inputState READ inputState WRITE setInputState NOTIFY inputStateChanged) Q_PROPERTY(InputView inputView READ inputView WRITE setInputView NOTIFY inputViewChanged) Q_PROPERTY(QPoint inputPosition READ inputPosition WRITE setInputPosition NOTIFY positionChanged) Q_PROPERTY(Q3DScene *scene READ scene WRITE setScene NOTIFY sceneChanged) public: - enum InputState { - InputStateNone = 0, - InputStateSelecting, - InputStateRotating, - InputStatePinching - }; - enum InputView { InputViewNone = 0, InputViewOnPrimary, @@ -63,11 +54,6 @@ public: virtual void wheelEvent(QWheelEvent *event); public: - // TODO: Check if the inputState needs to be visible outside of subclasses in the final architecture - InputState inputState(); - void setInputState(InputState inputState); - - // TODO: Check if the inputView needs to be visible outside of subclasses in the final architecture InputView inputView(); void setInputView(InputView inputView); @@ -79,7 +65,6 @@ public: signals: void positionChanged(QPoint position); - void inputStateChanged(InputState state); void inputViewChanged(InputView view); void sceneChanged(const Q3DScene *scene); -- cgit v1.2.3