From 0eb4792685539fb0f8417a8004101ec41acac3df Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Sun, 16 Nov 2014 17:30:51 +0000 Subject: Rename QNodeUuid to QNodeId Change-Id: I0450a4d4708af1ccd3d4c8f2ddc5c9a5c9deca27 Reviewed-by: Paul Lemire --- src/input/assignkeyboardfocusjob.cpp | 2 +- src/input/assignkeyboardfocusjob_p.h | 6 +++--- src/input/inputmanagers_p.h | 4 ++-- src/input/keyboardcontroller.cpp | 8 ++++---- src/input/keyboardcontroller_p.h | 22 +++++++++++----------- src/input/keyboardinput.cpp | 6 +++--- src/input/keyboardinput_p.h | 8 ++++---- src/input/keyeventdispatcherjob.cpp | 2 +- src/input/keyeventdispatcherjob_p.h | 6 +++--- src/input/qkeyboardcontroller.cpp | 2 +- 10 files changed, 33 insertions(+), 33 deletions(-) (limited to 'src/input') diff --git a/src/input/assignkeyboardfocusjob.cpp b/src/input/assignkeyboardfocusjob.cpp index 8d7614dcd..4d356cbd6 100644 --- a/src/input/assignkeyboardfocusjob.cpp +++ b/src/input/assignkeyboardfocusjob.cpp @@ -51,7 +51,7 @@ namespace Qt3D { namespace Input { -AssignKeyboardFocusJob::AssignKeyboardFocusJob(const QNodeUuid &controller) +AssignKeyboardFocusJob::AssignKeyboardFocusJob(const 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 094d9c7a5..f4807c9e8 100644 --- a/src/input/assignkeyboardfocusjob_p.h +++ b/src/input/assignkeyboardfocusjob_p.h @@ -43,7 +43,7 @@ #define QT3D_INPUT_ASSIGNKEYBOARDFOCUSJOB_P_H #include -#include +#include QT_BEGIN_NAMESPACE @@ -56,13 +56,13 @@ class InputHandler; class AssignKeyboardFocusJob : public QAspectJob { public: - explicit AssignKeyboardFocusJob(const QNodeUuid &controller); + explicit AssignKeyboardFocusJob(const QNodeId &controller); void setInputHandler(InputHandler *handler); void run() Q_DECL_OVERRIDE; private: InputHandler *m_inputHandler; - const QNodeUuid m_keyboardController; + const QNodeId m_keyboardController; }; } // Input diff --git a/src/input/inputmanagers_p.h b/src/input/inputmanagers_p.h index 923fb3c04..6f0584c94 100644 --- a/src/input/inputmanagers_p.h +++ b/src/input/inputmanagers_p.h @@ -56,7 +56,7 @@ namespace Input { class KeyboardInputManager : public QResourceManager< KeyboardInput, - QNodeUuid, + QNodeId, 16, Qt3D::ArrayAllocatingPolicy> { @@ -66,7 +66,7 @@ public: class KeyboardControllerManager : public QResourceManager< KeyboardController, - QNodeUuid, + QNodeId, 8, Qt3D::ArrayAllocatingPolicy> { diff --git a/src/input/keyboardcontroller.cpp b/src/input/keyboardcontroller.cpp index c4d6a4511..57a242028 100644 --- a/src/input/keyboardcontroller.cpp +++ b/src/input/keyboardcontroller.cpp @@ -62,7 +62,7 @@ void KeyboardController::updateFromPeer(QNode *) { } -void KeyboardController::requestFocusForInput(const QNodeUuid &inputId) +void KeyboardController::requestFocusForInput(const 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 @@ -75,7 +75,7 @@ void KeyboardController::setInputHandler(InputHandler *handler) m_inputHandler = handler; } -void KeyboardController::addKeyboardInput(const QNodeUuid &input) +void KeyboardController::addKeyboardInput(const QNodeId &input) { if (!m_keyboardInputs.contains(input)) { m_keyboardInputs.append(input); @@ -83,13 +83,13 @@ void KeyboardController::addKeyboardInput(const QNodeUuid &input) } } -void KeyboardController::removeKeyboardInput(const QNodeUuid &input) +void KeyboardController::removeKeyboardInput(const QNodeId &input) { m_keyboardInputs.removeAll(input); m_keyboardInputHandles.removeAll(m_inputHandler->keyboardInputManager()->lookupHandle(input)); } -void KeyboardController::setCurrentFocusItem(const QNodeUuid &input) +void KeyboardController::setCurrentFocusItem(const QNodeId &input) { m_currentFocusItem = input; } diff --git a/src/input/keyboardcontroller_p.h b/src/input/keyboardcontroller_p.h index 92717964a..1ba9cf393 100644 --- a/src/input/keyboardcontroller_p.h +++ b/src/input/keyboardcontroller_p.h @@ -43,7 +43,7 @@ #define QT3D_INPUT_KEYBOARDCONTROLLER_P_H #include -#include +#include #include QT_BEGIN_NAMESPACE @@ -59,17 +59,17 @@ class KeyboardController : public QBackendNode public: KeyboardController(); void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void requestFocusForInput(const QNodeUuid &inputId); + void requestFocusForInput(const QNodeId &inputId); void setInputHandler(InputHandler *handler); - void addKeyboardInput(const QNodeUuid &input); - void removeKeyboardInput(const QNodeUuid &input); + void addKeyboardInput(const QNodeId &input); + void removeKeyboardInput(const QNodeId &input); - void setCurrentFocusItem(const QNodeUuid &input); + void setCurrentFocusItem(const QNodeId &input); - inline QNodeUuid currentFocusItem() const { return m_currentFocusItem; } - inline QNodeUuid lastKeyboardInputRequester() const { return m_lastRequester; } - inline QVector keyboardInputs() const { return m_keyboardInputs; } + inline QNodeId currentFocusItem() const { return m_currentFocusItem; } + inline QNodeId lastKeyboardInputRequester() const { return m_lastRequester; } + inline QVector keyboardInputs() const { return m_keyboardInputs; } inline QVector keyboardInputsHandles() const { return m_keyboardInputHandles; } protected: @@ -77,10 +77,10 @@ protected: private: InputHandler *m_inputHandler; - QVector m_keyboardInputs; + QVector m_keyboardInputs; QVector m_keyboardInputHandles; - QNodeUuid m_lastRequester; - QNodeUuid m_currentFocusItem; + QNodeId m_lastRequester; + QNodeId m_currentFocusItem; }; class KeyboardControllerFunctor : public QBackendNodeFunctor diff --git a/src/input/keyboardinput.cpp b/src/input/keyboardinput.cpp index e15b3986c..28d4ee6c5 100644 --- a/src/input/keyboardinput.cpp +++ b/src/input/keyboardinput.cpp @@ -71,7 +71,7 @@ void KeyboardInput::updateFromPeer(QNode *peer) requestFocus(); } -QNodeUuid KeyboardInput::keyboardController() const +QNodeId KeyboardInput::keyboardController() const { return m_keyboardController; } @@ -110,7 +110,7 @@ void KeyboardInput::sceneChangeEvent(const QSceneChangePtr &e) if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast(e); if (propertyChange->propertyName() == QByteArrayLiteral("controller")) { - const QNodeUuid newId = propertyChange->value().value(); + const QNodeId newId = propertyChange->value().value(); if (m_keyboardController != newId) { setController(newId); focusRequest = m_focus; @@ -130,7 +130,7 @@ void KeyboardInput::requestFocus() controller->requestFocusForInput(peerUuid()); } -void KeyboardInput::setController(const QNodeUuid &controller) +void KeyboardInput::setController(const QNodeId &controller) { if (!m_keyboardController.isNull()) m_inputHandler->keyboardControllerManager()->lookupResource(m_keyboardController)->removeKeyboardInput(peerUuid()); diff --git a/src/input/keyboardinput_p.h b/src/input/keyboardinput_p.h index 00f8186d7..82c5b5578 100644 --- a/src/input/keyboardinput_p.h +++ b/src/input/keyboardinput_p.h @@ -43,7 +43,7 @@ #define QT3D_INPUT_KEYBOARDINPUT_P_H #include -#include +#include #include QT_BEGIN_NAMESPACE @@ -61,7 +61,7 @@ class KeyboardInput : public QBackendNode public: KeyboardInput(); void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - QNodeUuid keyboardController() const; + QNodeId keyboardController() const; void setInputHandler(InputHandler *handler); void setFocus(bool focus); void keyEvent(const Q3DKeyEventPtr &event); @@ -69,11 +69,11 @@ public: protected: void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; void requestFocus(); - void setController(const QNodeUuid &controller); + void setController(const QNodeId &controller); private: InputHandler *m_inputHandler; - QNodeUuid m_keyboardController; + QNodeId m_keyboardController; bool m_focus; }; diff --git a/src/input/keyeventdispatcherjob.cpp b/src/input/keyeventdispatcherjob.cpp index 6d672ba96..e43978b30 100644 --- a/src/input/keyeventdispatcherjob.cpp +++ b/src/input/keyeventdispatcherjob.cpp @@ -50,7 +50,7 @@ namespace Qt3D { namespace Input { -KeyEventDispatcherJob::KeyEventDispatcherJob(const QNodeUuid &input, const QList &events) +KeyEventDispatcherJob::KeyEventDispatcherJob(const QNodeId &input, const QList &events) : QAspectJob() , m_inputHandler(Q_NULLPTR) , m_keyboardInput(input) diff --git a/src/input/keyeventdispatcherjob_p.h b/src/input/keyeventdispatcherjob_p.h index 8dcf37c56..af6d52623 100644 --- a/src/input/keyeventdispatcherjob_p.h +++ b/src/input/keyeventdispatcherjob_p.h @@ -43,7 +43,7 @@ #define QT3D_INPUT_KEYEVENTDISPATCHERJOB_P_H #include -#include +#include #include QT_BEGIN_NAMESPACE @@ -57,13 +57,13 @@ class InputHandler; class KeyEventDispatcherJob : public QAspectJob { public: - explicit KeyEventDispatcherJob(const QNodeUuid &input, const QList &events); + explicit KeyEventDispatcherJob(const QNodeId &input, const QList &events); void setInputHandler(InputHandler *handler); void run() Q_DECL_OVERRIDE; private: InputHandler *m_inputHandler; - const QNodeUuid m_keyboardInput; + const QNodeId m_keyboardInput; const QList m_events; }; diff --git a/src/input/qkeyboardcontroller.cpp b/src/input/qkeyboardcontroller.cpp index d221bf7df..237517108 100644 --- a/src/input/qkeyboardcontroller.cpp +++ b/src/input/qkeyboardcontroller.cpp @@ -74,7 +74,7 @@ void QKeyboardController::sceneChangeEvent(const QSceneChangePtr &change) { QBackendScenePropertyChangePtr e = qSharedPointerCast(change); if (e->type() == NodeUpdated && e->propertyName() == QByteArrayLiteral("activeInput")) { - QNodeUuid activeInputId = e->value().value(); + QNodeId activeInputId = e->value().value(); setActiveInput(qobject_cast(scene()->lookupNode(activeInputId))); } } -- cgit v1.2.3