diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-12 20:45:19 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 13:19:50 +0000 |
commit | 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch) | |
tree | 53197a9e5eb7501d6f5b497f70c25dad9c265a6f /src/input/keyboardcontroller_p.h | |
parent | 0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff) |
Move Qt3DCore into Qt3DCore namespace
Update other aspects, tests and examples accordingly.
Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input/keyboardcontroller_p.h')
-rw-r--r-- | src/input/keyboardcontroller_p.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/input/keyboardcontroller_p.h b/src/input/keyboardcontroller_p.h index 36d3c18da..d127fdd8c 100644 --- a/src/input/keyboardcontroller_p.h +++ b/src/input/keyboardcontroller_p.h @@ -59,43 +59,43 @@ namespace Input { class InputHandler; -class KeyboardController : public Qt3D::QBackendNode +class KeyboardController : public Qt3DCore::QBackendNode { public: KeyboardController(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void requestFocusForInput(const Qt3D::QNodeId &inputId); + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void requestFocusForInput(const Qt3DCore::QNodeId &inputId); void setInputHandler(InputHandler *handler); - void addKeyboardInput(const Qt3D::QNodeId &input); - void removeKeyboardInput(const Qt3D::QNodeId &input); + void addKeyboardInput(const Qt3DCore::QNodeId &input); + void removeKeyboardInput(const Qt3DCore::QNodeId &input); - void setCurrentFocusItem(const Qt3D::QNodeId &input); + void setCurrentFocusItem(const Qt3DCore::QNodeId &input); - inline Qt3D::QNodeId currentFocusItem() const { return m_currentFocusItem; } - inline Qt3D::QNodeId lastKeyboardInputRequester() const { return m_lastRequester; } - inline QVector<Qt3D::QNodeId> keyboardInputs() const { return m_keyboardInputs; } + inline Qt3DCore::QNodeId currentFocusItem() const { return m_currentFocusItem; } + inline Qt3DCore::QNodeId lastKeyboardInputRequester() const { return m_lastRequester; } + inline QVector<Qt3DCore::QNodeId> keyboardInputs() const { return m_keyboardInputs; } inline QVector<HKeyboardInput> keyboardInputsHandles() const { return m_keyboardInputHandles; } protected: - void sceneChangeEvent(const Qt3D::QSceneChangePtr &) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_OVERRIDE; private: InputHandler *m_inputHandler; - QVector<Qt3D::QNodeId> m_keyboardInputs; + QVector<Qt3DCore::QNodeId> m_keyboardInputs; QVector<HKeyboardInput> m_keyboardInputHandles; - Qt3D::QNodeId m_lastRequester; - Qt3D::QNodeId m_currentFocusItem; + Qt3DCore::QNodeId m_lastRequester; + Qt3DCore::QNodeId m_currentFocusItem; }; -class KeyboardControllerFunctor : public Qt3D::QBackendNodeFunctor +class KeyboardControllerFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit KeyboardControllerFunctor(InputHandler *handler); - Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; + void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; private: InputHandler *m_handler; |