diff options
Diffstat (limited to 'src/input/mouseinput.cpp')
-rw-r--r-- | src/input/mouseinput.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/input/mouseinput.cpp b/src/input/mouseinput.cpp index e58c28192..f2239aada 100644 --- a/src/input/mouseinput.cpp +++ b/src/input/mouseinput.cpp @@ -46,8 +46,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DInput { namespace Input { MouseInput::MouseInput() @@ -61,7 +62,7 @@ MouseInput::~MouseInput() { } -void MouseInput::updateFromPeer(QNode *peer) +void MouseInput::updateFromPeer(Qt3D::QNode *peer) { QMouseInput *input = static_cast<QMouseInput *>(peer); if (input->controller() != Q_NULLPTR) @@ -69,7 +70,7 @@ void MouseInput::updateFromPeer(QNode *peer) m_enabled = input->isEnabled(); } -QNodeId MouseInput::mouseController() const +Qt3D::QNodeId MouseInput::mouseController() const { return m_mouseController; } @@ -97,7 +98,7 @@ void MouseInput::wheelEvent(const Q3DWheelEventPtr &event) notifyObservers(e); } -void MouseInput::sceneChangeEvent(const QSceneChangePtr &e) +void MouseInput::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -110,7 +111,7 @@ void MouseInput::sceneChangeEvent(const QSceneChangePtr &e) } } -void MouseInput::setController(const QNodeId &controller) +void MouseInput::setController(const Qt3D::QNodeId &controller) { if (!m_mouseController.isNull()) { MouseController *controller = m_inputHandler->mouseControllerManager()->lookupResource(m_mouseController); @@ -130,7 +131,7 @@ MouseInputFunctor::MouseInputFunctor(InputHandler *handler) { } -QBackendNode *MouseInputFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const +Qt3D::QBackendNode *MouseInputFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const { MouseInput *input = m_handler->mouseInputManager()->getOrCreateResource(frontend->id()); input->setFactory(factory); @@ -139,18 +140,17 @@ QBackendNode *MouseInputFunctor::create(QNode *frontend, const QBackendNodeFacto return input; } -QBackendNode *MouseInputFunctor::get(const QNodeId &id) const +Qt3D::QBackendNode *MouseInputFunctor::get(const Qt3D::QNodeId &id) const { return m_handler->mouseInputManager()->lookupResource(id); } -void MouseInputFunctor::destroy(const QNodeId &id) const +void MouseInputFunctor::destroy(const Qt3D::QNodeId &id) const { m_handler->mouseInputManager()->releaseResource(id); } -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE |