diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-17 16:18:27 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-18 12:53:13 +0200 |
| commit | d91e065526fe084374b206b6e7c9f0d628abb93d (patch) | |
| tree | f4f9df5a31865e25ee97517c9b732eada1d2c8fe /src/datavisualization/input | |
| parent | 7eb24d68115619d8d78e6a427d5c723e5ffc15a5 (diff) | |
Clean up public API and includes usage
Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/input')
6 files changed, 17 insertions, 11 deletions
diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h index 49471d72..118bd829 100644 --- a/src/datavisualization/input/q3dinputhandler.h +++ b/src/datavisualization/input/q3dinputhandler.h @@ -16,8 +16,8 @@ ** ****************************************************************************/ -#ifndef QDEFAULT3DINPUTHANDLER_H -#define QDEFAULT3DINPUTHANDLER_H +#ifndef Q3DINPUTHANDLER_H +#define Q3DINPUTHANDLER_H #include <QtDataVisualization/qabstract3dinputhandler.h> diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index f786d466..5360eb38 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -17,6 +17,7 @@ ****************************************************************************/ #include "qabstract3dinputhandler_p.h" +#include "q3dscene.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 803517ed..75ec8c1b 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -19,8 +19,13 @@ #ifndef QABSTRACT3DINPUTHANDLER_H #define QABSTRACT3DINPUTHANDLER_H +#include <QtDataVisualization/qdatavisualizationglobal.h> #include <QtDataVisualization/q3dscene.h> -#include <QMouseEvent> +#include <QtCore/QObject> +#include <QtCore/QPoint> +#include <QtGui/QWheelEvent> +#include <QtGui/QMouseEvent> +#include <QtGui/QTouchEvent> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -41,8 +46,9 @@ public: InputViewOnSecondary }; -public: +protected: explicit QAbstract3DInputHandler(QObject *parent = 0); +public: virtual ~QAbstract3DInputHandler(); // Input event listeners @@ -53,7 +59,6 @@ public: virtual void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos); virtual void wheelEvent(QWheelEvent *event); -public: InputView inputView() const; void setInputView(InputView inputView); @@ -64,9 +69,9 @@ public: void setScene(Q3DScene *scene); signals: - void positionChanged(QPoint position); + void positionChanged(const QPoint &position); void inputViewChanged(InputView view); - void sceneChanged(const Q3DScene *scene); + void sceneChanged(Q3DScene *scene); protected: void setPrevDistance(int distance); diff --git a/src/datavisualization/input/qabstract3dinputhandler_p.h b/src/datavisualization/input/qabstract3dinputhandler_p.h index 52b1a5f6..fa5a2315 100644 --- a/src/datavisualization/input/qabstract3dinputhandler_p.h +++ b/src/datavisualization/input/qabstract3dinputhandler_p.h @@ -31,7 +31,6 @@ #include "datavisualizationglobal_p.h" #include "qabstract3dinputhandler.h" -#include <QRect> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -62,7 +61,6 @@ public: private: QAbstract3DInputHandler::InputView m_inputView; QPoint m_inputPosition; - QRect m_mainViewPort; Q3DScene *m_scene; bool m_isDefaultHandler; diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp index 76b5721b..da84b33f 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.cpp +++ b/src/datavisualization/input/qtouch3dinputhandler.cpp @@ -18,8 +18,8 @@ #include "qtouch3dinputhandler_p.h" #include "q3dcamera_p.h" -#include <QTimer> -#include <qmath.h> +#include <QtCore/QTimer> +#include <QtCore/qmath.h> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/input/qtouch3dinputhandler_p.h b/src/datavisualization/input/qtouch3dinputhandler_p.h index 19c30142..613b5f28 100644 --- a/src/datavisualization/input/qtouch3dinputhandler_p.h +++ b/src/datavisualization/input/qtouch3dinputhandler_p.h @@ -22,6 +22,8 @@ #include "qabstract3dinputhandler_p.h" #include "qtouch3dinputhandler.h" +class QTimer; + QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QAbstract3DInputHandler; |