diff options
Diffstat (limited to 'src/input')
37 files changed, 198 insertions, 198 deletions
diff --git a/src/input/assignkeyboardfocusjob.cpp b/src/input/assignkeyboardfocusjob.cpp index e816a4820..095732d22 100644 --- a/src/input/assignkeyboardfocusjob.cpp +++ b/src/input/assignkeyboardfocusjob.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { namespace Input { -AssignKeyboardFocusJob::AssignKeyboardFocusJob(const Qt3D::QNodeId &controller) +AssignKeyboardFocusJob::AssignKeyboardFocusJob(const Qt3DCore::QNodeId &controller) : QAspectJob() , m_inputHandler(Q_NULLPTR) , m_keyboardController(controller) diff --git a/src/input/assignkeyboardfocusjob_p.h b/src/input/assignkeyboardfocusjob_p.h index 4204744f9..fcb251c5a 100644 --- a/src/input/assignkeyboardfocusjob_p.h +++ b/src/input/assignkeyboardfocusjob_p.h @@ -58,16 +58,16 @@ namespace Input { class InputHandler; -class AssignKeyboardFocusJob : public Qt3D::QAspectJob +class AssignKeyboardFocusJob : public Qt3DCore::QAspectJob { public: - explicit AssignKeyboardFocusJob(const Qt3D::QNodeId &controller); + explicit AssignKeyboardFocusJob(const Qt3DCore::QNodeId &controller); void setInputHandler(InputHandler *handler); void run() Q_DECL_OVERRIDE; private: InputHandler *m_inputHandler; - const Qt3D::QNodeId m_keyboardController; + const Qt3DCore::QNodeId m_keyboardController; }; } // namespace Input diff --git a/src/input/cameracontroller.cpp b/src/input/cameracontroller.cpp index 6b616d3b1..d9af1d06f 100644 --- a/src/input/cameracontroller.cpp +++ b/src/input/cameracontroller.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DInput { namespace Input { @@ -81,7 +81,7 @@ CameraController::CameraController(QObject *parent) : * an Entity, a CameraLens and a Transform instead of using the * ready made Camera element, it won't work. */ -void CameraController::setCamera( Qt3D::QCamera* cam ) +void CameraController::setCamera( Qt3DCore::QCamera* cam ) { m_camera = cam; m_cameraEntity = cam; @@ -92,7 +92,7 @@ void CameraController::setCamera( Qt3D::QCamera* cam ) m_updateTimer->stop(); } -Qt3D::QCamera *CameraController::camera() const +Qt3DCore::QCamera *CameraController::camera() const { return m_camera; } diff --git a/src/input/cameracontroller_p.h b/src/input/cameracontroller_p.h index 63d7bdb68..2fc5b7d0e 100644 --- a/src/input/cameracontroller_p.h +++ b/src/input/cameracontroller_p.h @@ -59,7 +59,7 @@ class QWheelEvent; class QKeyEvent; class QTimer; -namespace Qt3D { +namespace Qt3DCore { class QCamera; class QEntity; } @@ -79,8 +79,8 @@ class CameraController : public QObject public: explicit CameraController(QObject *parent = 0); - void setCamera( Qt3D::QCamera* cam ); - Qt3D::QCamera *camera() const; + void setCamera( Qt3DCore::QCamera* cam ); + Qt3DCore::QCamera *camera() const; void setLinearSpeed( float speed ); float linearSpeed() const; @@ -118,8 +118,8 @@ private Q_SLOTS: void onUpdate(); private: - Qt3D::QCamera* m_camera; - Qt3D::QEntity* m_cameraEntity; + Qt3DCore::QCamera* m_camera; + Qt3DCore::QEntity* m_cameraEntity; float m_vx; float m_vy; diff --git a/src/input/handle_types_p.h b/src/input/handle_types_p.h index 1a62e7572..e478405d4 100644 --- a/src/input/handle_types_p.h +++ b/src/input/handle_types_p.h @@ -60,10 +60,10 @@ class KeyboardInput; class MouseController; class MouseInput; -typedef Qt3D::QHandle<KeyboardController, 8> HKeyboardController; -typedef Qt3D::QHandle<KeyboardInput, 16> HKeyboardInput; -typedef Qt3D::QHandle<MouseController, 8> HMouseController; -typedef Qt3D::QHandle<MouseInput, 16> HMouseInput; +typedef Qt3DCore::QHandle<KeyboardController, 8> HKeyboardController; +typedef Qt3DCore::QHandle<KeyboardInput, 16> HKeyboardInput; +typedef Qt3DCore::QHandle<MouseController, 8> HMouseController; +typedef Qt3DCore::QHandle<MouseInput, 16> HMouseInput; } // namespace Input } // namespace Qt3DInput diff --git a/src/input/inputhandler.cpp b/src/input/inputhandler.cpp index ce2f09c00..fd83a16df 100644 --- a/src/input/inputhandler.cpp +++ b/src/input/inputhandler.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DInput { namespace Input { @@ -147,7 +147,7 @@ void InputHandler::removeMouseController(HMouseController controller) // Return a vector of jobs to be performed for keyboard events // Handles all dependencies between jobs -QVector<Qt3D::QAspectJobPtr> InputHandler::keyboardJobs() +QVector<Qt3DCore::QAspectJobPtr> InputHandler::keyboardJobs() { // One job for Keyboard focus change event per Keyboard Controller QVector<QAspectJobPtr> jobs; @@ -177,7 +177,7 @@ QVector<Qt3D::QAspectJobPtr> InputHandler::keyboardJobs() return jobs; } -QVector<Qt3D::QAspectJobPtr> InputHandler::mouseJobs() +QVector<Qt3DCore::QAspectJobPtr> InputHandler::mouseJobs() { QVector<QAspectJobPtr> jobs; const QList<QMouseEvent> events = pendingMouseEvents(); diff --git a/src/input/inputhandler_p.h b/src/input/inputhandler_p.h index ec44c4ac8..c23ea3894 100644 --- a/src/input/inputhandler_p.h +++ b/src/input/inputhandler_p.h @@ -93,8 +93,8 @@ public: void appendMouseController(HMouseController controller); void removeMouseController(HMouseController controller); - QVector<Qt3D::QAspectJobPtr> keyboardJobs(); - QVector<Qt3D::QAspectJobPtr> mouseJobs(); + QVector<Qt3DCore::QAspectJobPtr> keyboardJobs(); + QVector<Qt3DCore::QAspectJobPtr> mouseJobs(); private: KeyboardControllerManager *m_keyboardControllerManager; diff --git a/src/input/inputmanagers_p.h b/src/input/inputmanagers_p.h index cc12c2461..1a0447080 100644 --- a/src/input/inputmanagers_p.h +++ b/src/input/inputmanagers_p.h @@ -61,41 +61,41 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { namespace Input { -class KeyboardInputManager : public Qt3D::QResourceManager< +class KeyboardInputManager : public Qt3DCore::QResourceManager< KeyboardInput, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy> + Qt3DCore::ArrayAllocatingPolicy> { public: KeyboardInputManager() {} }; -class KeyboardControllerManager : public Qt3D::QResourceManager< +class KeyboardControllerManager : public Qt3DCore::QResourceManager< KeyboardController, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 8, - Qt3D::ArrayAllocatingPolicy> + Qt3DCore::ArrayAllocatingPolicy> { public: KeyboardControllerManager() {} }; -class MouseControllerManager : public Qt3D::QResourceManager< +class MouseControllerManager : public Qt3DCore::QResourceManager< MouseController, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 8, - Qt3D::ArrayAllocatingPolicy> + Qt3DCore::ArrayAllocatingPolicy> { public: MouseControllerManager() {} }; -class MouseInputManager : public Qt3D::QResourceManager< +class MouseInputManager : public Qt3DCore::QResourceManager< MouseInput, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy> + Qt3DCore::ArrayAllocatingPolicy> { public: MouseInputManager() {} diff --git a/src/input/keyboardcontroller.cpp b/src/input/keyboardcontroller.cpp index 9e62633a5..359f52ee7 100644 --- a/src/input/keyboardcontroller.cpp +++ b/src/input/keyboardcontroller.cpp @@ -52,11 +52,11 @@ KeyboardController::KeyboardController() { } -void KeyboardController::updateFromPeer(Qt3D::QNode *) +void KeyboardController::updateFromPeer(Qt3DCore::QNode *) { } -void KeyboardController::requestFocusForInput(const Qt3D::QNodeId &inputId) +void KeyboardController::requestFocusForInput(const Qt3DCore::QNodeId &inputId) { // Saves the last inputId, this will then be used in an Aspect Job to determine which // input will have the focus. This in turn will call KeyboardInput::setFocus which will @@ -69,7 +69,7 @@ void KeyboardController::setInputHandler(InputHandler *handler) m_inputHandler = handler; } -void KeyboardController::addKeyboardInput(const Qt3D::QNodeId &input) +void KeyboardController::addKeyboardInput(const Qt3DCore::QNodeId &input) { if (!m_keyboardInputs.contains(input)) { m_keyboardInputs.append(input); @@ -77,18 +77,18 @@ void KeyboardController::addKeyboardInput(const Qt3D::QNodeId &input) } } -void KeyboardController::removeKeyboardInput(const Qt3D::QNodeId &input) +void KeyboardController::removeKeyboardInput(const Qt3DCore::QNodeId &input) { m_keyboardInputs.removeAll(input); m_keyboardInputHandles.removeAll(m_inputHandler->keyboardInputManager()->lookupHandle(input)); } -void KeyboardController::setCurrentFocusItem(const Qt3D::QNodeId &input) +void KeyboardController::setCurrentFocusItem(const Qt3DCore::QNodeId &input) { m_currentFocusItem = input; } -void KeyboardController::sceneChangeEvent(const Qt3D::QSceneChangePtr &) +void KeyboardController::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) { } @@ -97,7 +97,7 @@ KeyboardControllerFunctor::KeyboardControllerFunctor(InputHandler *handler) { } -Qt3D::QBackendNode *KeyboardControllerFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const +Qt3DCore::QBackendNode *KeyboardControllerFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const { KeyboardController *controller = m_handler->keyboardControllerManager()->getOrCreateResource(frontend->id()); controller->setFactory(factory); @@ -107,12 +107,12 @@ Qt3D::QBackendNode *KeyboardControllerFunctor::create(Qt3D::QNode *frontend, con return controller; } -Qt3D::QBackendNode *KeyboardControllerFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *KeyboardControllerFunctor::get(const Qt3DCore::QNodeId &id) const { return m_handler->keyboardControllerManager()->lookupResource(id); } -void KeyboardControllerFunctor::destroy(const Qt3D::QNodeId &id) const +void KeyboardControllerFunctor::destroy(const Qt3DCore::QNodeId &id) const { m_handler->removeKeyboardController(m_handler->keyboardControllerManager()->lookupHandle(id)); m_handler->keyboardControllerManager()->releaseResource(id); 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; diff --git a/src/input/keyboardinput.cpp b/src/input/keyboardinput.cpp index f824220a8..730142282 100644 --- a/src/input/keyboardinput.cpp +++ b/src/input/keyboardinput.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DInput { namespace Input { @@ -57,7 +57,7 @@ KeyboardInput::KeyboardInput() { } -void KeyboardInput::updateFromPeer(Qt3D::QNode *peer) +void KeyboardInput::updateFromPeer(Qt3DCore::QNode *peer) { QKeyboardInput *input = static_cast<QKeyboardInput *>(peer); if (input->controller() != Q_NULLPTR) @@ -68,7 +68,7 @@ void KeyboardInput::updateFromPeer(Qt3D::QNode *peer) requestFocus(); } -Qt3D::QNodeId KeyboardInput::keyboardController() const +Qt3DCore::QNodeId KeyboardInput::keyboardController() const { return m_keyboardController; } diff --git a/src/input/keyboardinput_p.h b/src/input/keyboardinput_p.h index 3a4d27c87..64eb4f759 100644 --- a/src/input/keyboardinput_p.h +++ b/src/input/keyboardinput_p.h @@ -62,12 +62,12 @@ namespace Input { class InputHandler; -class KeyboardInput : public Qt3D::QBackendNode +class KeyboardInput : public Qt3DCore::QBackendNode { public: KeyboardInput(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - Qt3D::QNodeId keyboardController() const; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + Qt3DCore::QNodeId keyboardController() const; void setInputHandler(InputHandler *handler); void setFocus(bool focus); void keyEvent(const Q3DKeyEventPtr &event); @@ -75,25 +75,25 @@ public: inline bool isEnabled() const { return m_enabled; } protected: - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; void requestFocus(); - void setController(const Qt3D::QNodeId &controller); + void setController(const Qt3DCore::QNodeId &controller); private: InputHandler *m_inputHandler; - Qt3D::QNodeId m_keyboardController; + Qt3DCore::QNodeId m_keyboardController; bool m_focus; bool m_enabled; }; -class KeyboardInputFunctor : public Qt3D::QBackendNodeFunctor +class KeyboardInputFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit KeyboardInputFunctor(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; diff --git a/src/input/keyeventdispatcherjob.cpp b/src/input/keyeventdispatcherjob.cpp index 2eea7b2b7..ebfddc163 100644 --- a/src/input/keyeventdispatcherjob.cpp +++ b/src/input/keyeventdispatcherjob.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { namespace Input { -KeyEventDispatcherJob::KeyEventDispatcherJob(const Qt3D::QNodeId &input, const QList<QKeyEvent> &events) +KeyEventDispatcherJob::KeyEventDispatcherJob(const Qt3DCore::QNodeId &input, const QList<QKeyEvent> &events) : QAspectJob() , m_inputHandler(Q_NULLPTR) , m_keyboardInput(input) diff --git a/src/input/keyeventdispatcherjob_p.h b/src/input/keyeventdispatcherjob_p.h index 59717cf3b..1ced85881 100644 --- a/src/input/keyeventdispatcherjob_p.h +++ b/src/input/keyeventdispatcherjob_p.h @@ -59,16 +59,16 @@ namespace Input { class InputHandler; -class KeyEventDispatcherJob : public Qt3D::QAspectJob +class KeyEventDispatcherJob : public Qt3DCore::QAspectJob { public: - explicit KeyEventDispatcherJob(const Qt3D::QNodeId &input, const QList<QKeyEvent> &events); + explicit KeyEventDispatcherJob(const Qt3DCore::QNodeId &input, const QList<QKeyEvent> &events); void setInputHandler(InputHandler *handler); void run() Q_DECL_OVERRIDE; private: InputHandler *m_inputHandler; - const Qt3D::QNodeId m_keyboardInput; + const Qt3DCore::QNodeId m_keyboardInput; const QList<QKeyEvent> m_events; }; diff --git a/src/input/mousecontroller.cpp b/src/input/mousecontroller.cpp index 9b7e77c2e..da61f7241 100644 --- a/src/input/mousecontroller.cpp +++ b/src/input/mousecontroller.cpp @@ -57,7 +57,7 @@ MouseController::~MouseController() { } -void MouseController::updateFromPeer(Qt3D::QNode *peer) +void MouseController::updateFromPeer(Qt3DCore::QNode *peer) { Q_UNUSED(peer); } @@ -67,23 +67,23 @@ void MouseController::setInputHandler(InputHandler *handler) m_inputHandler = handler; } -void MouseController::addMouseInput(const Qt3D::QNodeId &input) +void MouseController::addMouseInput(const Qt3DCore::QNodeId &input) { if (!m_mouseInputs.contains(input)) m_mouseInputs.append(input); } -void MouseController::removeMouseInput(const Qt3D::QNodeId &input) +void MouseController::removeMouseInput(const Qt3DCore::QNodeId &input) { m_mouseInputs.removeOne(input); } -QVector<Qt3D::QNodeId> MouseController::mouseInputs() const +QVector<Qt3DCore::QNodeId> MouseController::mouseInputs() const { return m_mouseInputs; } -void MouseController::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void MouseController::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { Q_UNUSED(e); } @@ -93,7 +93,7 @@ MouseControllerFunctor::MouseControllerFunctor(InputHandler *handler) { } -Qt3D::QBackendNode *MouseControllerFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const +Qt3DCore::QBackendNode *MouseControllerFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const { MouseController *controller = m_handler->mouseControllerManager()->getOrCreateResource(frontend->id()); controller->setFactory(factory); @@ -103,12 +103,12 @@ Qt3D::QBackendNode *MouseControllerFunctor::create(Qt3D::QNode *frontend, const return controller; } -Qt3D::QBackendNode *MouseControllerFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *MouseControllerFunctor::get(const Qt3DCore::QNodeId &id) const { return m_handler->mouseControllerManager()->lookupResource(id); } -void MouseControllerFunctor::destroy(const Qt3D::QNodeId &id) const +void MouseControllerFunctor::destroy(const Qt3DCore::QNodeId &id) const { m_handler->removeMouseController(m_handler->mouseControllerManager()->lookupHandle(id)); m_handler->mouseControllerManager()->releaseResource(id); diff --git a/src/input/mousecontroller_p.h b/src/input/mousecontroller_p.h index 5c08be2d6..69adc78ee 100644 --- a/src/input/mousecontroller_p.h +++ b/src/input/mousecontroller_p.h @@ -57,36 +57,36 @@ namespace Input { class InputHandler; -class MouseController : public Qt3D::QBackendNode +class MouseController : public Qt3DCore::QBackendNode { public: MouseController(); ~MouseController(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; void setInputHandler(InputHandler *handler); - void addMouseInput(const Qt3D::QNodeId &input); - void removeMouseInput(const Qt3D::QNodeId &input); + void addMouseInput(const Qt3DCore::QNodeId &input); + void removeMouseInput(const Qt3DCore::QNodeId &input); - QVector<Qt3D::QNodeId> mouseInputs() const; + QVector<Qt3DCore::QNodeId> mouseInputs() const; protected: - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: - QVector<Qt3D::QNodeId> m_mouseInputs; + QVector<Qt3DCore::QNodeId> m_mouseInputs; InputHandler *m_inputHandler; }; -class MouseControllerFunctor : public Qt3D::QBackendNodeFunctor +class MouseControllerFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit MouseControllerFunctor(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; diff --git a/src/input/mouseeventdispatcherjob.cpp b/src/input/mouseeventdispatcherjob.cpp index 0792fcb44..2fe4ffb14 100644 --- a/src/input/mouseeventdispatcherjob.cpp +++ b/src/input/mouseeventdispatcherjob.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { namespace Input { -MouseEventDispatcherJob::MouseEventDispatcherJob(const Qt3D::QNodeId &input, const QList<QMouseEvent> &events) +MouseEventDispatcherJob::MouseEventDispatcherJob(const Qt3DCore::QNodeId &input, const QList<QMouseEvent> &events) : QAspectJob() , m_inputHandler(Q_NULLPTR) , m_mouseInput(input) diff --git a/src/input/mouseeventdispatcherjob_p.h b/src/input/mouseeventdispatcherjob_p.h index fd5d625a1..eb37dbc4d 100644 --- a/src/input/mouseeventdispatcherjob_p.h +++ b/src/input/mouseeventdispatcherjob_p.h @@ -59,16 +59,16 @@ namespace Input { class InputHandler; -class MouseEventDispatcherJob : public Qt3D::QAspectJob +class MouseEventDispatcherJob : public Qt3DCore::QAspectJob { public: - explicit MouseEventDispatcherJob(const Qt3D::QNodeId &input, const QList<QMouseEvent> &events); + explicit MouseEventDispatcherJob(const Qt3DCore::QNodeId &input, const QList<QMouseEvent> &events); void setInputHandler(InputHandler *handler); void run() Q_DECL_FINAL; private: InputHandler *m_inputHandler; - const Qt3D::QNodeId m_mouseInput; + const Qt3DCore::QNodeId m_mouseInput; const QList<QMouseEvent> m_events; }; diff --git a/src/input/mouseinput.cpp b/src/input/mouseinput.cpp index f2239aada..158e32d19 100644 --- a/src/input/mouseinput.cpp +++ b/src/input/mouseinput.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DInput { namespace Input { @@ -62,7 +62,7 @@ MouseInput::~MouseInput() { } -void MouseInput::updateFromPeer(Qt3D::QNode *peer) +void MouseInput::updateFromPeer(Qt3DCore::QNode *peer) { QMouseInput *input = static_cast<QMouseInput *>(peer); if (input->controller() != Q_NULLPTR) @@ -70,7 +70,7 @@ void MouseInput::updateFromPeer(Qt3D::QNode *peer) m_enabled = input->isEnabled(); } -Qt3D::QNodeId MouseInput::mouseController() const +Qt3DCore::QNodeId MouseInput::mouseController() const { return m_mouseController; } @@ -98,7 +98,7 @@ void MouseInput::wheelEvent(const Q3DWheelEventPtr &event) notifyObservers(e); } -void MouseInput::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void MouseInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -111,7 +111,7 @@ void MouseInput::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -void MouseInput::setController(const Qt3D::QNodeId &controller) +void MouseInput::setController(const Qt3DCore::QNodeId &controller) { if (!m_mouseController.isNull()) { MouseController *controller = m_inputHandler->mouseControllerManager()->lookupResource(m_mouseController); @@ -131,7 +131,7 @@ MouseInputFunctor::MouseInputFunctor(InputHandler *handler) { } -Qt3D::QBackendNode *MouseInputFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const +Qt3DCore::QBackendNode *MouseInputFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const { MouseInput *input = m_handler->mouseInputManager()->getOrCreateResource(frontend->id()); input->setFactory(factory); @@ -140,12 +140,12 @@ Qt3D::QBackendNode *MouseInputFunctor::create(Qt3D::QNode *frontend, const Qt3D: return input; } -Qt3D::QBackendNode *MouseInputFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *MouseInputFunctor::get(const Qt3DCore::QNodeId &id) const { return m_handler->mouseInputManager()->lookupResource(id); } -void MouseInputFunctor::destroy(const Qt3D::QNodeId &id) const +void MouseInputFunctor::destroy(const Qt3DCore::QNodeId &id) const { m_handler->mouseInputManager()->releaseResource(id); } diff --git a/src/input/mouseinput_p.h b/src/input/mouseinput_p.h index c87071a24..c1e4c02ac 100644 --- a/src/input/mouseinput_p.h +++ b/src/input/mouseinput_p.h @@ -58,14 +58,14 @@ namespace Input { class InputHandler; -class MouseInput : public Qt3D::QBackendNode +class MouseInput : public Qt3DCore::QBackendNode { public: MouseInput(); ~MouseInput(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - Qt3D::QNodeId mouseController() const; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + Qt3DCore::QNodeId mouseController() const; void setInputHandler(InputHandler *handler); void mouseEvent(const Q3DMouseEventPtr &event); void wheelEvent(const Q3DWheelEventPtr &event); @@ -73,23 +73,23 @@ public: inline bool isEnabled() const { return m_enabled; } protected: - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void setController(const Qt3D::QNodeId &controller); + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void setController(const Qt3DCore::QNodeId &controller); private: bool m_enabled; - Qt3D::QNodeId m_mouseController; + Qt3DCore::QNodeId m_mouseController; InputHandler *m_inputHandler; }; -class MouseInputFunctor : public Qt3D::QBackendNodeFunctor +class MouseInputFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit MouseInputFunctor(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; diff --git a/src/input/q3dkeyevent.cpp b/src/input/q3dkeyevent.cpp index 3633618f6..dced98fc0 100644 --- a/src/input/q3dkeyevent.cpp +++ b/src/input/q3dkeyevent.cpp @@ -43,7 +43,7 @@ namespace Qt3DInput { //Qt6: Move this into a QtQmlGui module and merge it with QQuickKeyEvent /*! - \class Qt3D::Q3DKeyEvent + \class Qt3DCore::Q3DKeyEvent \inmodule Qt3DInput \since 5.5 */ @@ -51,7 +51,7 @@ namespace Qt3DInput { /*! \qmltype KeyEvent \inqmlmodule Qt3D.Input - \instantiates Qt3D::Q3DKeyEvent + \instantiates Qt3DCore::Q3DKeyEvent \since 5.5 The KeyEvent QML type cannot be directly created. Objects of this type diff --git a/src/input/q3dmouseevent.cpp b/src/input/q3dmouseevent.cpp index 5367428eb..60f8b0784 100644 --- a/src/input/q3dmouseevent.cpp +++ b/src/input/q3dmouseevent.cpp @@ -48,10 +48,10 @@ namespace Qt3DInput { // These can always be added in follow up commits once the input API takes shape /*! - * \class Qt3D::Q3DMouseEvent + * \class Qt3DCore::Q3DMouseEvent * \inmodule Qt3DInput * - * \brief The Qt3D::Q3DMouseEvent contains parameters that describe a mouse event. + * \brief The Qt3DCore::Q3DMouseEvent contains parameters that describe a mouse event. * * Mouse events occur when a mouse button is pressed and the ray * traversing the view, originating from the mouse position intersects with one @@ -59,30 +59,30 @@ namespace Qt3DInput { * * \since 5.5 * - * \sa Qt3D::Q3DKeyEvent, Qt3D::Q3DWheelEvent, Qt3D::QMouseInput + * \sa Qt3DCore::Q3DKeyEvent, Qt3DCore::Q3DWheelEvent, Qt3DCore::QMouseInput * */ /*! - * \fn int Qt3D::Q3DMouseEvent::x() const + * \fn int Qt3DCore::Q3DMouseEvent::x() const * * Returns the x position of the mouse event. */ /*! - * \fn int Qt3D::Q3DMouseEvent::y() const + * \fn int Qt3DCore::Q3DMouseEvent::y() const * * Returns the y position of the mouse event. */ /*! - * \fn bool Qt3D::Q3DMouseEvent::isAccepted() const + * \fn bool Qt3DCore::Q3DMouseEvent::isAccepted() const * * Returns whether the event was accepted. */ /*! - * \fn void Qt3D::Q3DMouseEvent::setAccepted(bool accepted) + * \fn void Qt3DCore::Q3DMouseEvent::setAccepted(bool accepted) * * Sets the event as accepted if \a accepted is true. * @@ -91,13 +91,13 @@ namespace Qt3DInput { */ /*! - * \fn QEvent::Type Qt3D::Q3DMouseEvent::type() const + * \fn QEvent::Type Qt3DCore::Q3DMouseEvent::type() const * * Returns the QEvent::Type of the event. */ /*! - * Constructs a new Qt3D::Q3DMouseEvent instance for the QMouseEvent \a e. + * Constructs a new Qt3DCore::Q3DMouseEvent instance for the QMouseEvent \a e. */ Q3DMouseEvent::Q3DMouseEvent(const QMouseEvent &e) : QObject() @@ -160,33 +160,33 @@ Q3DMouseEvent::Modifiers Q3DMouseEvent::modifier() const /*! - * \class Qt3D::Q3DWheelEvent + * \class Qt3DCore::Q3DWheelEvent * \inmodule Qt3DInput * - * \brief The Qt3D::Q3DWheelEvent contains parameters that describe a mouse wheel event. + * \brief The Qt3DCore::Q3DWheelEvent contains parameters that describe a mouse wheel event. * * Mouse wheel events occur when the mouse is rotated. * * \since 5.5 * - * \sa Qt3D::Q3DKeyEvent, Qt3D::Q3DMouseEvent, Qt3D::QMouseInput + * \sa Qt3DCore::Q3DKeyEvent, Qt3DCore::Q3DMouseEvent, Qt3DCore::QMouseInput * */ /*! - * \fn int Qt3D::Q3DWheelEvent::x() const + * \fn int Qt3DCore::Q3DWheelEvent::x() const * * Returns the x position of the mouse event. */ /*! - * \fn int Qt3D::Q3DWheelEvent::y() const + * \fn int Qt3DCore::Q3DWheelEvent::y() const * * Returns the x position of the mouse event. */ /*! - * \fn QPoint Qt3D::Q3DWheelEvent::angleDelta() const + * \fn QPoint Qt3DCore::Q3DWheelEvent::angleDelta() const * * Returns the distance that the wheel is rotated, in eighths of a degree. A * positive value indicates that the wheel was rotated forward (away from the @@ -195,13 +195,13 @@ Q3DMouseEvent::Modifiers Q3DMouseEvent::modifier() const */ /*! - * \fn bool Qt3D::Q3DWheelEvent::isAccepted() const + * \fn bool Qt3DCore::Q3DWheelEvent::isAccepted() const * * Returns whether the event was accepted. */ /*! - * \fn void Qt3D::Q3DWheelEvent::setAccepted(bool accepted) + * \fn void Qt3DCore::Q3DWheelEvent::setAccepted(bool accepted) * * Sets the event as accepted if \a accepted is true. * @@ -210,13 +210,13 @@ Q3DMouseEvent::Modifiers Q3DMouseEvent::modifier() const */ /*! - * \fn QEvent::Type Qt3D::Q3DWheelEvent::type() const + * \fn QEvent::Type Qt3DCore::Q3DWheelEvent::type() const * * Returns the QEvent::Type of the event. */ /*! - * Constructs a new Qt3D::Q3DWheelEvent instance from the QWheelEvent \a e. + * Constructs a new Qt3DCore::Q3DWheelEvent instance from the QWheelEvent \a e. */ Q3DWheelEvent::Q3DWheelEvent(const QWheelEvent &e) : QObject() diff --git a/src/input/qinputaspect.cpp b/src/input/qinputaspect.cpp index 676ca9a80..12ad16c1a 100644 --- a/src/input/qinputaspect.cpp +++ b/src/input/qinputaspect.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DInput { @@ -83,13 +83,13 @@ QInputAspect::QInputAspect(QObject *parent) registerBackendType<QMouseInput>(QBackendNodeFunctorPtr(new Input::MouseInputFunctor(d_func()->m_inputHandler.data()))); } -Qt3D::QCamera *QInputAspect::camera() const +Qt3DCore::QCamera *QInputAspect::camera() const { Q_D(const QInputAspect); return d->m_cameraController->camera(); } -void QInputAspect::setCamera(Qt3D::QCamera *camera) +void QInputAspect::setCamera(Qt3DCore::QCamera *camera) { Q_D(QInputAspect); d->m_cameraController->setCamera(camera); @@ -107,7 +107,7 @@ QVector<QAspectJobPtr> QInputAspect::jobsToExecute(qint64 time) return jobs; } -void QInputAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e) +void QInputAspect::sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); @@ -116,7 +116,7 @@ void QInputAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e) visitor.traverse(n, this, &QInputAspect::visitNode); } -void QInputAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e) +void QInputAspect::sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); @@ -124,7 +124,7 @@ void QInputAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e) QAbstractAspect::clearBackendNode(n); } -void QInputAspect::setRootEntity(Qt3D::QEntity *rootObject) +void QInputAspect::setRootEntity(Qt3DCore::QEntity *rootObject) { QNodeVisitor visitor; visitor.traverse(rootObject, this, &QInputAspect::visitNode); @@ -158,7 +158,7 @@ void QInputAspect::onCleanup() d->m_inputHandler.reset(Q_NULLPTR); } -void QInputAspect::visitNode(Qt3D::QNode *node) +void QInputAspect::visitNode(Qt3DCore::QNode *node) { QAbstractAspect::createBackendNode(node); } diff --git a/src/input/qinputaspect.h b/src/input/qinputaspect.h index e76712e83..c7ef94d5d 100644 --- a/src/input/qinputaspect.h +++ b/src/input/qinputaspect.h @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QCamera; } @@ -50,32 +50,32 @@ namespace Qt3DInput { class QInputAspectPrivate; -class QT3DINPUTSHARED_EXPORT QInputAspect : public Qt3D::QAbstractAspect +class QT3DINPUTSHARED_EXPORT QInputAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT - Q_PROPERTY(Qt3D::QCamera* camera READ camera WRITE setCamera) + Q_PROPERTY(Qt3DCore::QCamera* camera READ camera WRITE setCamera) public: explicit QInputAspect(QObject *parent = 0); - Qt3D::QCamera *camera() const; + Qt3DCore::QCamera *camera() const; public Q_SLOTS: - void setCamera(Qt3D::QCamera *camera); + void setCamera(Qt3DCore::QCamera *camera); public: - QVector<Qt3D::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; + QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; - void sceneNodeAdded(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void sceneNodeRemoved(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: - void setRootEntity(Qt3D::QEntity *rootObject) Q_DECL_OVERRIDE; + void setRootEntity(Qt3DCore::QEntity *rootObject) Q_DECL_OVERRIDE; void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE; void onStartup() Q_DECL_OVERRIDE; void onShutdown() Q_DECL_OVERRIDE; void onCleanup() Q_DECL_OVERRIDE; - void visitNode(Qt3D::QNode *node); + void visitNode(Qt3DCore::QNode *node); Q_DECLARE_PRIVATE(QInputAspect) }; diff --git a/src/input/qinputaspect_p.h b/src/input/qinputaspect_p.h index f2a5ae21a..f1de52144 100644 --- a/src/input/qinputaspect_p.h +++ b/src/input/qinputaspect_p.h @@ -61,7 +61,7 @@ class CameraController; class InputHandler; } -class QInputAspectPrivate : public Qt3D::QAbstractAspectPrivate +class QInputAspectPrivate : public Qt3DCore::QAbstractAspectPrivate { public: QInputAspectPrivate(); diff --git a/src/input/qkeyboardcontroller.cpp b/src/input/qkeyboardcontroller.cpp index 23578ef03..fc069edc3 100644 --- a/src/input/qkeyboardcontroller.cpp +++ b/src/input/qkeyboardcontroller.cpp @@ -42,12 +42,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DInput { /*! - \class Qt3D::QKeyboardControllerPrivate + \class Qt3DCore::QKeyboardControllerPrivate \internal */ QKeyboardControllerPrivate::QKeyboardControllerPrivate() @@ -56,7 +56,7 @@ QKeyboardControllerPrivate::QKeyboardControllerPrivate() } /*! - \class Qt3D::QKeyboardController + \class Qt3DCore::QKeyboardController \inmodule Qt3DInput \since 5.5 */ @@ -65,7 +65,7 @@ QKeyboardControllerPrivate::QKeyboardControllerPrivate() \qmltype KeyboardController \inqmlmodule Qt3D.Input \since 5.5 - \instantiates Qt3D::QKeyboardController + \instantiates Qt3DCore::QKeyboardController \inherits Node */ @@ -95,7 +95,7 @@ QKeyboardController::QKeyboardController(QKeyboardControllerPrivate &dd, QNode * { } -void QKeyboardController::sceneChangeEvent(const Qt3D::QSceneChangePtr &change) +void QKeyboardController::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { Q_D(QKeyboardController); QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change); diff --git a/src/input/qkeyboardcontroller.h b/src/input/qkeyboardcontroller.h index b68faa830..1f57b856c 100644 --- a/src/input/qkeyboardcontroller.h +++ b/src/input/qkeyboardcontroller.h @@ -47,7 +47,7 @@ namespace Qt3DInput { class QKeyboardControllerPrivate; class QKeyboardInput; -class QT3DINPUTSHARED_EXPORT QKeyboardController : public Qt3D::QNode +class QT3DINPUTSHARED_EXPORT QKeyboardController : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DInput::QKeyboardInput *activeInput READ activeInput NOTIFY activeInputChanged) @@ -60,7 +60,7 @@ public: protected: QKeyboardController(QKeyboardControllerPrivate &dd, QNode *parent = 0); - void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; Q_SIGNALS: void activeInputChanged(); diff --git a/src/input/qkeyboardcontroller_p.h b/src/input/qkeyboardcontroller_p.h index 9148e5613..8d1ce7bb1 100644 --- a/src/input/qkeyboardcontroller_p.h +++ b/src/input/qkeyboardcontroller_p.h @@ -57,7 +57,7 @@ namespace Qt3DInput { class QKeyboardController; class QKeyboardInput; -class QKeyboardControllerPrivate : public Qt3D::QNodePrivate +class QKeyboardControllerPrivate : public Qt3DCore::QNodePrivate { public: QKeyboardControllerPrivate(); diff --git a/src/input/qkeyboardinput.cpp b/src/input/qkeyboardinput.cpp index 5ecba9962..332799457 100644 --- a/src/input/qkeyboardinput.cpp +++ b/src/input/qkeyboardinput.cpp @@ -41,12 +41,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DInput { /*! - \class Qt3D::QKeyboardInputPrivate + \class Qt3DCore::QKeyboardInputPrivate \internal */ QKeyboardInputPrivate::QKeyboardInputPrivate() @@ -58,7 +58,7 @@ QKeyboardInputPrivate::QKeyboardInputPrivate() } /*! - \class Qt3D::QKeyboardInput + \class Qt3DCore::QKeyboardInput \inmodule Qt3DInput \since 5.5 */ @@ -66,7 +66,7 @@ QKeyboardInputPrivate::QKeyboardInputPrivate() /*! \qmltype KeyboardInput \inqmlmodule Qt3D.Input - \instantiates Qt3D::QKeyboardInput + \instantiates Qt3DCore::QKeyboardInput \inherits Component3D \since 5.5 */ @@ -154,7 +154,7 @@ const QByteArray keyToSignal(int key) return keySignal; } -void QKeyboardInput::sceneChangeEvent(const Qt3D::QSceneChangePtr &change) +void QKeyboardInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change); if (e->type() == NodeUpdated) { diff --git a/src/input/qkeyboardinput.h b/src/input/qkeyboardinput.h index 629aac2a9..592361a4a 100644 --- a/src/input/qkeyboardinput.h +++ b/src/input/qkeyboardinput.h @@ -48,7 +48,7 @@ namespace Qt3DInput { class QKeyboardController; class QKeyboardInputPrivate; -class QT3DINPUTSHARED_EXPORT QKeyboardInput : public Qt3D::QComponent +class QT3DINPUTSHARED_EXPORT QKeyboardInput : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(Qt3DInput::QKeyboardController *controller READ controller WRITE setController NOTIFY controllerChanged) @@ -112,8 +112,8 @@ Q_SIGNALS: protected: QKeyboardInput(QKeyboardInputPrivate &dd, QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; void keyEvent(Q3DKeyEvent *event); private: diff --git a/src/input/qkeyboardinput_p.h b/src/input/qkeyboardinput_p.h index 756ef88b0..7ee0560b6 100644 --- a/src/input/qkeyboardinput_p.h +++ b/src/input/qkeyboardinput_p.h @@ -57,7 +57,7 @@ namespace Qt3DInput { class QKeyboardInput; class QKeyboardController; -class QKeyboardInputPrivate : public Qt3D::QComponentPrivate +class QKeyboardInputPrivate : public Qt3DCore::QComponentPrivate { public: QKeyboardInputPrivate(); diff --git a/src/input/qmousecontroller.cpp b/src/input/qmousecontroller.cpp index 90590e214..a31f598be 100644 --- a/src/input/qmousecontroller.cpp +++ b/src/input/qmousecontroller.cpp @@ -50,14 +50,14 @@ QMouseControllerPrivate::QMouseControllerPrivate() } /*! - * \class Qt3D::QMouseController + * \class Qt3DCore::QMouseController * \inmodule Qt3DInput * - * \brief Qt3D::QMouseController is in charge of dispatching mouse events to - * attached Qt3D::QMouseInput objects. + * \brief Qt3DCore::QMouseController is in charge of dispatching mouse events to + * attached Qt3DCore::QMouseInput objects. * * \since 5.5 - * \sa Qt3D::QMouseInput + * \sa Qt3DCore::QMouseInput */ QMouseController::QMouseController(QNode *parent) : QNode(*new QMouseControllerPrivate, parent) @@ -80,7 +80,7 @@ QMouseController::~QMouseController() QNode::cleanup(); } -void QMouseController::sceneChangeEvent(const Qt3D::QSceneChangePtr &change) +void QMouseController::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { Q_UNUSED(change); // TODO: To be completed as the mouse input aspect takes shape diff --git a/src/input/qmousecontroller.h b/src/input/qmousecontroller.h index 67af9a8e9..a0de94db1 100644 --- a/src/input/qmousecontroller.h +++ b/src/input/qmousecontroller.h @@ -47,18 +47,18 @@ namespace Qt3DInput { class QMouseControllerPrivate; class QMouseInput; -class QT3DINPUTSHARED_EXPORT QMouseController : public Qt3D::QNode +class QT3DINPUTSHARED_EXPORT QMouseController : public Qt3DCore::QNode { Q_OBJECT public: - explicit QMouseController(Qt3D::QNode *parent = 0); + explicit QMouseController(Qt3DCore::QNode *parent = 0); protected: - QMouseController(QMouseControllerPrivate &dd, Qt3D::QNode *parent = 0); + QMouseController(QMouseControllerPrivate &dd, Qt3DCore::QNode *parent = 0); ~QMouseController(); - void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QMouseController) diff --git a/src/input/qmousecontroller_p.h b/src/input/qmousecontroller_p.h index 3b6c7a7ac..c04971af3 100644 --- a/src/input/qmousecontroller_p.h +++ b/src/input/qmousecontroller_p.h @@ -56,7 +56,7 @@ namespace Qt3DInput { class QMouseController; -class QMouseControllerPrivate : public Qt3D::QNodePrivate +class QMouseControllerPrivate : public Qt3DCore::QNodePrivate { public: QMouseControllerPrivate(); diff --git a/src/input/qmouseinput.cpp b/src/input/qmouseinput.cpp index 3f3f6dcca..a56e229f4 100644 --- a/src/input/qmouseinput.cpp +++ b/src/input/qmouseinput.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DInput { @@ -55,22 +55,22 @@ QMouseInputPrivate::QMouseInputPrivate() } /*! - * \class Qt3D::QMouseInput + * \class Qt3DCore::QMouseInput * \inmodule Qt3DInput * * \brief Provides a mean of being notified about mouse events when attached to - * a Qt3D::QMouseController instance. + * a Qt3DCore::QMouseController instance. * * \since 5.5 * - * \note Qt3D::QMouseInput components shouldn't be shared, not respecting that + * \note Qt3DCore::QMouseInput components shouldn't be shared, not respecting that * condition will most likely result in undefined behaviors. * - * \sa Qt3D::QMouseController + * \sa Qt3DCore::QMouseController */ /*! - * Constructs a new Qt3D::QMouseInput instance with parent \a parent. + * Constructs a new Qt3DCore::QMouseInput instance with parent \a parent. */ QMouseInput::QMouseInput(QNode *parent) : QComponent(*new QMouseInputPrivate, parent) @@ -94,7 +94,7 @@ QMouseInput::~QMouseInput() } /*! - * Sets the mouse controller of the Qt3D::QMouseInput instance to \a controller. + * Sets the mouse controller of the Qt3DCore::QMouseInput instance to \a controller. */ void QMouseInput::setController(QMouseController *controller) { @@ -118,8 +118,8 @@ QMouseController *QMouseInput::controller() const * Returns true if the QMouseInput currently contains the mouse. * * \note: In this context, contains mean that the ray originating from the - * mouse is intersecting with the Qt3D::QEntity that aggregates the current - * Qt3D::QMouseInput instance component. + * mouse is intersecting with the Qt3DCore::QEntity that aggregates the current + * Qt3DCore::QMouseInput instance component. */ bool QMouseInput::containsMouse() const { @@ -141,7 +141,7 @@ void QMouseInput::copy(const QNode *ref) d->m_controller = static_cast<QMouseController *>(QNode::clone(refInput->controller())); } -void QMouseInput::sceneChangeEvent(const Qt3D::QSceneChangePtr &change) +void QMouseInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change); if (e->type() == NodeUpdated) { diff --git a/src/input/qmouseinput.h b/src/input/qmouseinput.h index 949b824e8..5eca4dd4f 100644 --- a/src/input/qmouseinput.h +++ b/src/input/qmouseinput.h @@ -48,7 +48,7 @@ namespace Qt3DInput { class QMouseController; class QMouseInputPrivate; -class QT3DINPUTSHARED_EXPORT QMouseInput : public Qt3D::QComponent +class QT3DINPUTSHARED_EXPORT QMouseInput : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(Qt3DInput::QMouseController *controller READ controller WRITE setController NOTIFY controllerChanged) @@ -81,9 +81,9 @@ Q_SIGNALS: void wheel(Qt3DInput::Q3DWheelEvent *wheel); protected: - QMouseInput(QMouseInputPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; + QMouseInput(QMouseInputPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; void mouseEvent(Q3DMouseEvent *event); void setContainsMouse(bool contains); diff --git a/src/input/qmouseinput_p.h b/src/input/qmouseinput_p.h index e1444acd1..d8f7c3fff 100644 --- a/src/input/qmouseinput_p.h +++ b/src/input/qmouseinput_p.h @@ -57,7 +57,7 @@ namespace Qt3DInput { class QMouseInput; class QMouseController; -class QMouseInputPrivate : public Qt3D::QComponentPrivate +class QMouseInputPrivate : public Qt3DCore::QComponentPrivate { public: QMouseInputPrivate(); |