From 64d6b482bfb9dbacd548b72cb9c073513f6aa56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 15 Jan 2014 11:34:59 +0200 Subject: 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 --- src/datavisualization/input/qabstract3dinputhandler.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/datavisualization/input/qabstract3dinputhandler.h') diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 313abef3..2ad1514b 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -19,11 +19,10 @@ #ifndef QABSTRACT3DINPUTHANDLER_H #define QABSTRACT3DINPUTHANDLER_H -#include #include #include -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class QAbstract3DInputHandlerPrivate; @@ -88,6 +87,6 @@ private: friend class QTouch3DInputHandlerPrivate; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif // QABSTRACT3DINPUTHANDLER_H -- cgit v1.2.3 From 8674307d6bafabfcaedfe175b883313f0e7d88b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 16 Jan 2014 13:33:57 +0200 Subject: Reintroduced namespace macros Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen --- src/datavisualization/input/qabstract3dinputhandler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/input/qabstract3dinputhandler.h') diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 2ad1514b..f8b8ba88 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -22,7 +22,7 @@ #include #include -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QAbstract3DInputHandlerPrivate; @@ -87,6 +87,6 @@ private: friend class QTouch3DInputHandlerPrivate; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // QABSTRACT3DINPUTHANDLER_H -- cgit v1.2.3 From 1b1dfcaadf83c73d3f7c1c1cd893894a3aea0ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Tue, 21 Jan 2014 12:01:27 +0200 Subject: InputState enum divided Task-number: QTRD-2683 Change-Id: Ib05469ac1bf8c8ed828974a3adb91ecb5f8f1fc9 Reviewed-by: Miikka Heikkinen --- src/datavisualization/input/qabstract3dinputhandler.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'src/datavisualization/input/qabstract3dinputhandler.h') diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index f8b8ba88..47ae9e1c 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -30,20 +30,26 @@ 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, - InputStateOnScene, - InputStateOnPrimaryView, - InputStateOnSecondaryView, + InputStateSelecting, InputStateRotating, InputStatePinching }; + enum InputView { + InputViewNone = 0, + InputViewOnPrimary, + InputViewOnSecondary + }; + public: explicit QAbstract3DInputHandler(QObject *parent = 0); virtual ~QAbstract3DInputHandler(); @@ -61,6 +67,10 @@ public: 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); + QPoint inputPosition() const; void setInputPosition(const QPoint &position); @@ -70,6 +80,7 @@ public: signals: void positionChanged(QPoint position); void inputStateChanged(InputState state); + void inputViewChanged(InputView view); void sceneChanged(const Q3DScene *scene); protected: -- cgit v1.2.3 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 From 892bd7976b2980947adf216b8afc5c6f2a63ce65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 22 Jan 2014 10:00:08 +0200 Subject: Made jira tasks of TODOs, part 2 + commented-out code and qDebugs removed Task-number: QTRD-2398 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Reviewed-by: Miikka Heikkinen --- src/datavisualization/input/qabstract3dinputhandler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/input/qabstract3dinputhandler.h') diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 94a34475..4824d78a 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -85,4 +85,4 @@ private: QT_END_NAMESPACE_DATAVISUALIZATION -#endif // QABSTRACT3DINPUTHANDLER_H +#endif -- cgit v1.2.3 From 5e172211056437521ebbe6135661edaa486bee83 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 24 Jan 2014 14:16:12 +0200 Subject: Add missing consts to public apis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-2807 Change-Id: I74a6735ab37a8b3d97548adba99ca79ce2c7975c Reviewed-by: Tomi Korpipää --- src/datavisualization/input/qabstract3dinputhandler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/input/qabstract3dinputhandler.h') diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 4824d78a..13ea56e5 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -54,7 +54,7 @@ public: virtual void wheelEvent(QWheelEvent *event); public: - InputView inputView(); + InputView inputView() const; void setInputView(InputView inputView); QPoint inputPosition() const; -- cgit v1.2.3 From 3b57eb8aaef9886a9975b7b861f31bdf8ed15fdb Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 27 Jan 2014 08:18:03 +0200 Subject: Fix copyright year Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen --- src/datavisualization/input/qabstract3dinputhandler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/input/qabstract3dinputhandler.h') diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 13ea56e5..803517ed 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -- cgit v1.2.3