diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-08-30 16:39:18 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-13 07:15:11 +0000 |
commit | 0269afd106da5d4d999585b3bdb1332a2c01af12 (patch) | |
tree | 693efc7490d3b2fc65f6d0ca7186e65e7b481521 /src/input/q3dmouseevent.h | |
parent | 4888c951fca43515aa49919a5405baa16f1cff3d (diff) |
Move Input aspect to Qt3DInput namespace
Also update examples accordingly.
Change-Id: I8d19c3165899e4b7b791deb33098af4fb439f44a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input/q3dmouseevent.h')
-rw-r--r-- | src/input/q3dmouseevent.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/input/q3dmouseevent.h b/src/input/q3dmouseevent.h index 517d016b8..ef1a74bb0 100644 --- a/src/input/q3dmouseevent.h +++ b/src/input/q3dmouseevent.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_Q3DMOUSEEVENT_H -#define QT3D_Q3DMOUSEEVENT_H +#ifndef QT3DINPUT_Q3DMOUSEEVENT_H +#define QT3DINPUT_Q3DMOUSEEVENT_H #include <Qt3DInput/qt3dinput_global.h> #include <QObject> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class QT3DINPUTSHARED_EXPORT Q3DMouseEvent : public QObject { @@ -52,9 +52,9 @@ class QT3DINPUTSHARED_EXPORT Q3DMouseEvent : public QObject Q_PROPERTY(int x READ x CONSTANT) Q_PROPERTY(int y READ y CONSTANT) Q_PROPERTY(bool wasHeld READ wasHeld CONSTANT) - Q_PROPERTY(Qt3D::Q3DMouseEvent::Buttons button READ button CONSTANT) + Q_PROPERTY(Qt3DInput::Q3DMouseEvent::Buttons button READ button CONSTANT) Q_PROPERTY(int buttons READ buttons CONSTANT) - Q_PROPERTY(Qt3D::Q3DMouseEvent::Modifiers modifier READ modifier CONSTANT) + Q_PROPERTY(Qt3DInput::Q3DMouseEvent::Modifiers modifier READ modifier CONSTANT) Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted) public: @@ -104,7 +104,7 @@ class QT3DINPUTSHARED_EXPORT Q3DWheelEvent : public QObject Q_PROPERTY(int y READ y CONSTANT) Q_PROPERTY(QPoint angleDelta READ angleDelta CONSTANT) Q_PROPERTY(int buttons READ buttons CONSTANT) - Q_PROPERTY(Qt3D::Q3DWheelEvent::Modifiers modifier READ modifier CONSTANT) + Q_PROPERTY(Qt3DInput::Q3DWheelEvent::Modifiers modifier READ modifier CONSTANT) Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted) public: @@ -146,11 +146,11 @@ private: typedef QSharedPointer<Q3DWheelEvent> Q3DWheelEventPtr; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::Q3DMouseEvent*) -Q_DECLARE_METATYPE(Qt3D::Q3DWheelEvent*) +Q_DECLARE_METATYPE(Qt3DInput::Q3DMouseEvent*) +Q_DECLARE_METATYPE(Qt3DInput::Q3DWheelEvent*) -#endif // QT3D_Q3DMOUSEEVENT_H +#endif // QT3DINPUT_Q3DMOUSEEVENT_H |