diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-02-22 20:04:59 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-02-22 21:17:52 +0000 |
commit | 382a79d92be025056ded362571b17ece9965edff (patch) | |
tree | ebbd0a9f089f89df924879827b70549e4c581a42 | |
parent | 799bd03f73815a67ab6c394ff49e523731fe2c86 (diff) |
const QNodeId & -> QNodeId
Change-Id: Ia672918cbae3b950e20e68bfbfd6982676a5981e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
108 files changed, 248 insertions, 248 deletions
diff --git a/src/core/nodes/qbackendnode.h b/src/core/nodes/qbackendnode.h index 989fbf966..7849e51bc 100644 --- a/src/core/nodes/qbackendnode.h +++ b/src/core/nodes/qbackendnode.h @@ -57,8 +57,8 @@ class QT3DCORESHARED_EXPORT QBackendNodeFunctor public: virtual ~QBackendNodeFunctor() {} virtual QBackendNode *create(QNode *frontend) const = 0; - virtual QBackendNode *get(const QNodeId &id) const = 0; - virtual void destroy(const QNodeId &id) const = 0; + virtual QBackendNode *get(QNodeId id) const = 0; + virtual void destroy(QNodeId id) const = 0; }; typedef QSharedPointer<QBackendNodeFunctor> QBackendNodeFunctorPtr; diff --git a/src/core/nodes/qnodeid.cpp b/src/core/nodes/qnodeid.cpp index c62127315..0e4e7d491 100644 --- a/src/core/nodes/qnodeid.cpp +++ b/src/core/nodes/qnodeid.cpp @@ -56,7 +56,7 @@ QNodeId QNodeId::createId() } #ifndef QT_NO_DEBUG_STREAM -QDebug operator<<(QDebug d, const QNodeId &id) +QDebug operator<<(QDebug d, QNodeId id) { d << id.id(); return d; diff --git a/src/core/nodes/qnodeid.h b/src/core/nodes/qnodeid.h index 35775aa2f..a83593a54 100644 --- a/src/core/nodes/qnodeid.h +++ b/src/core/nodes/qnodeid.h @@ -97,7 +97,7 @@ private: #ifndef QT_NO_DEBUG_STREAM -QT3DCORESHARED_EXPORT QDebug operator<<(QDebug d, const QNodeId &id); +QT3DCORESHARED_EXPORT QDebug operator<<(QDebug d, QNodeId id); #endif inline uint qHash(QNodeId id, uint seed = 0) Q_DECL_NOTHROW diff --git a/src/core/qbackendscenepropertychange.cpp b/src/core/qbackendscenepropertychange.cpp index 67ebd1a06..19de2aaca 100644 --- a/src/core/qbackendscenepropertychange.cpp +++ b/src/core/qbackendscenepropertychange.cpp @@ -60,7 +60,7 @@ QBackendScenePropertyChangePrivate::~QBackendScenePropertyChangePrivate() { } -QBackendScenePropertyChange::QBackendScenePropertyChange(ChangeFlag type, const QNodeId &subjectId, QSceneChange::Priority priority) +QBackendScenePropertyChange::QBackendScenePropertyChange(ChangeFlag type, QNodeId subjectId, QSceneChange::Priority priority) : QScenePropertyChange(*new QBackendScenePropertyChangePrivate, type, Observable, subjectId, priority) { } @@ -70,7 +70,7 @@ QBackendScenePropertyChange::~QBackendScenePropertyChange() } // TO DO get rid off setTargetNode, use the subject instead ?? -void QBackendScenePropertyChange::setTargetNode(const QNodeId &id) +void QBackendScenePropertyChange::setTargetNode(QNodeId id) { Q_D(QBackendScenePropertyChange); d->m_targetUuid = id; @@ -96,7 +96,7 @@ QBackendScenePropertyChange::QBackendScenePropertyChange(QBackendScenePropertyCh } /*! \internal */ -QBackendScenePropertyChange::QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd, ChangeFlag type, const QNodeId &subjectId, QSceneChange::Priority priority) +QBackendScenePropertyChange::QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd, ChangeFlag type, QNodeId subjectId, QSceneChange::Priority priority) : QScenePropertyChange(dd, type, Observable, subjectId, priority) { } diff --git a/src/core/qbackendscenepropertychange.h b/src/core/qbackendscenepropertychange.h index 4e2218a61..2b6ad71ef 100644 --- a/src/core/qbackendscenepropertychange.h +++ b/src/core/qbackendscenepropertychange.h @@ -53,17 +53,17 @@ class QBackendNode; class QT3DCORESHARED_EXPORT QBackendScenePropertyChange : public QScenePropertyChange { public: - QBackendScenePropertyChange(ChangeFlag type, const QNodeId &subjectId, + QBackendScenePropertyChange(ChangeFlag type, QNodeId subjectId, Priority priority = Standard); virtual ~QBackendScenePropertyChange(); - void setTargetNode(const QNodeId &id); + void setTargetNode(QNodeId id); QNodeId targetNode() const; protected: Q_DECLARE_PRIVATE(QBackendScenePropertyChange) QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd); - QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd, ChangeFlag type, const QNodeId &subjectId, Priority priority = Standard); + QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd, ChangeFlag type, QNodeId subjectId, Priority priority = Standard); }; typedef QSharedPointer<QBackendScenePropertyChange> QBackendScenePropertyChangePtr; diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp index 0085a32ec..511e72357 100644 --- a/src/core/qchangearbiter.cpp +++ b/src/core/qchangearbiter.cpp @@ -212,7 +212,7 @@ QScene *QChangeArbiter::scene() const } void QChangeArbiter::registerObserver(QObserverInterface *observer, - const QNodeId &nodeId, + QNodeId nodeId, ChangeFlags changeFlags) { QMutexLocker locker(&m_mutex); @@ -227,7 +227,7 @@ void QChangeArbiter::registerSceneObserver(QSceneObserverInterface *observer) m_sceneObservers << observer; } -void QChangeArbiter::unregisterObserver(QObserverInterface *observer, const QNodeId &nodeId) +void QChangeArbiter::unregisterObserver(QObserverInterface *observer, QNodeId nodeId) { QMutexLocker locker(&m_mutex); if (m_nodeObservations.contains(nodeId)) { diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h index 735067737..e3fdcad9b 100644 --- a/src/core/qchangearbiter_p.h +++ b/src/core/qchangearbiter_p.h @@ -96,10 +96,10 @@ public: void syncChanges(); void registerObserver(QObserverInterface *observer, - const QNodeId &nodeId, + QNodeId nodeId, ChangeFlags changeFlags = AllChanges); void unregisterObserver(QObserverInterface *observer, - const QNodeId &nodeId); + QNodeId nodeId); void registerSceneObserver(QSceneObserverInterface *observer); void unregisterSceneObserver(QSceneObserverInterface *observer); diff --git a/src/core/qscene.cpp b/src/core/qscene.cpp index 098182261..9d2eb7f02 100644 --- a/src/core/qscene.cpp +++ b/src/core/qscene.cpp @@ -85,7 +85,7 @@ QAspectEngine *QScene::engine() const } // Called by any thread -void QScene::addObservable(QObservableInterface *observable, const QNodeId &id) +void QScene::addObservable(QObservableInterface *observable, QNodeId id) { Q_D(QScene); QWriteLocker lock(&d->m_lock); @@ -108,7 +108,7 @@ void QScene::addObservable(QNode *observable) } // Called by any thread -void QScene::removeObservable(QObservableInterface *observable, const QNodeId &id) +void QScene::removeObservable(QObservableInterface *observable, QNodeId id) { Q_D(QScene); QWriteLocker lock(&d->m_lock); @@ -136,7 +136,7 @@ void QScene::removeObservable(QNode *observable) } // Called by any thread -QObservableList QScene::lookupObservables(const QNodeId &id) const +QObservableList QScene::lookupObservables(QNodeId id) const { Q_D(const QScene); QReadLocker lock(&d->m_lock); @@ -144,7 +144,7 @@ QObservableList QScene::lookupObservables(const QNodeId &id) const } // Called by any thread -QNode *QScene::lookupNode(const QNodeId &id) const +QNode *QScene::lookupNode(QNodeId id) const { Q_D(const QScene); QReadLocker lock(&d->m_lock); @@ -157,7 +157,7 @@ QVector<QNode *> QScene::lookupNodes(const QVector<QNodeId> &ids) const QReadLocker lock(&d->m_lock); QVector<QNode *> nodes(ids.size()); int index = 0; - Q_FOREACH (const QNodeId &id, ids) + Q_FOREACH (QNodeId id, ids) nodes[index++] = d->m_nodeLookupTable.value(id); return nodes; } @@ -181,28 +181,28 @@ QLockableObserverInterface *QScene::arbiter() const return d->m_arbiter; } -QList<QNodeId> QScene::entitiesForComponent(const QNodeId &id) const +QList<QNodeId> QScene::entitiesForComponent(QNodeId id) const { Q_D(const QScene); QReadLocker lock(&d->m_lock); return d->m_componentToEntities.values(id); } -void QScene::addEntityForComponent(const QNodeId &componentUuid, const QNodeId &entityUuid) +void QScene::addEntityForComponent(QNodeId componentUuid, QNodeId entityUuid) { Q_D(QScene); QWriteLocker lock(&d->m_lock); d->m_componentToEntities.insert(componentUuid, entityUuid); } -void QScene::removeEntityForComponent(const QNodeId &componentUuid, const QNodeId &entityUuid) +void QScene::removeEntityForComponent(QNodeId componentUuid, QNodeId entityUuid) { Q_D(QScene); QWriteLocker lock(&d->m_lock); d->m_componentToEntities.remove(componentUuid, entityUuid); } -bool QScene::hasEntityForComponent(const QNodeId &componentUuid, const QNodeId &entityUuid) +bool QScene::hasEntityForComponent(QNodeId componentUuid, QNodeId entityUuid) { Q_D(QScene); QReadLocker lock(&d->m_lock); diff --git a/src/core/qscene_p.h b/src/core/qscene_p.h index 4fd98c377..e0b500ce5 100644 --- a/src/core/qscene_p.h +++ b/src/core/qscene_p.h @@ -73,13 +73,13 @@ public: QAspectEngine *engine() const; - void addObservable(QObservableInterface *observable, const QNodeId &id); + void addObservable(QObservableInterface *observable, QNodeId id); void addObservable(QNode *observable); - void removeObservable(QObservableInterface *observable, const QNodeId &id); + void removeObservable(QObservableInterface *observable, QNodeId id); void removeObservable(QNode *observable); - QObservableList lookupObservables(const QNodeId &id) const; + QObservableList lookupObservables(QNodeId id) const; - QNode *lookupNode(const QNodeId &id) const; + QNode *lookupNode(QNodeId id) const; QVector<QNode *> lookupNodes(const QVector<QNodeId> &ids) const; QNodeId nodeIdFromObservable(QObservableInterface *observable) const; @@ -87,10 +87,10 @@ public: Qt3DCore::QLockableObserverInterface *arbiter() const; // Component -> Entities - QList<QNodeId> entitiesForComponent(const QNodeId &id) const; - void addEntityForComponent(const QNodeId &componentUuid, const QNodeId &entityUuid); - void removeEntityForComponent(const QNodeId &componentUuid, const QNodeId &entityUuid); - bool hasEntityForComponent(const QNodeId &componentUuid, const QNodeId &entityUuid); + QList<QNodeId> entitiesForComponent(QNodeId id) const; + void addEntityForComponent(QNodeId componentUuid, QNodeId entityUuid); + void removeEntityForComponent(QNodeId componentUuid, QNodeId entityUuid); + bool hasEntityForComponent(QNodeId componentUuid, QNodeId entityUuid); private: Q_DECLARE_PRIVATE(QScene) diff --git a/src/core/qscenechange.cpp b/src/core/qscenechange.cpp index 0637953f2..108a3409a 100644 --- a/src/core/qscenechange.cpp +++ b/src/core/qscenechange.cpp @@ -70,7 +70,7 @@ QSceneChangePrivate::~QSceneChangePrivate() { } -QSceneChange::QSceneChange(ChangeFlag type, ObservableType observableType, const QNodeId &subjectId, QSceneChange::Priority priority) +QSceneChange::QSceneChange(ChangeFlag type, ObservableType observableType, QNodeId subjectId, QSceneChange::Priority priority) : d_ptr(new QSceneChangePrivate) { d_ptr->q_ptr = this; @@ -95,7 +95,7 @@ QSceneChange::QSceneChange(QSceneChangePrivate &dd) } /*! \internal */ -QSceneChange::QSceneChange(QSceneChangePrivate &dd, ChangeFlag type, ObservableType observableType, const QNodeId &subjectId, QSceneChange::Priority priority) +QSceneChange::QSceneChange(QSceneChangePrivate &dd, ChangeFlag type, ObservableType observableType, QNodeId subjectId, QSceneChange::Priority priority) : d_ptr(&dd) { d_ptr->q_ptr = this; diff --git a/src/core/qscenechange.h b/src/core/qscenechange.h index fb85c9222..a9ff9a13f 100644 --- a/src/core/qscenechange.h +++ b/src/core/qscenechange.h @@ -80,7 +80,7 @@ public: Node }; - QSceneChange(ChangeFlag type, ObservableType observableType, const QNodeId &subjectId, Priority priority = Standard); + QSceneChange(ChangeFlag type, ObservableType observableType, QNodeId subjectId, Priority priority = Standard); virtual ~QSceneChange(); ChangeFlag type() const; @@ -93,7 +93,7 @@ protected: Q_DECLARE_PRIVATE(QSceneChange) QSceneChangePrivate *d_ptr; QSceneChange(QSceneChangePrivate &dd); - QSceneChange(QSceneChangePrivate &dd, ChangeFlag type, ObservableType observableType, const QNodeId &subjectId, Priority priority = Standard); + QSceneChange(QSceneChangePrivate &dd, ChangeFlag type, ObservableType observableType, QNodeId subjectId, Priority priority = Standard); // TODO: add timestamp from central clock and priority level // These can be used to resolve any conflicts between events diff --git a/src/core/qscenepropertychange.cpp b/src/core/qscenepropertychange.cpp index ef84d988f..d4cb63f10 100644 --- a/src/core/qscenepropertychange.cpp +++ b/src/core/qscenepropertychange.cpp @@ -75,7 +75,7 @@ void QScenePropertyChangePrivate::operator delete(void *ptr, size_t size) QScenePropertyChangePrivate::m_allocator->deallocateRawMemory(ptr, size); } -QScenePropertyChange::QScenePropertyChange(ChangeFlag type, ObservableType observableType, const QNodeId &subjectId, QSceneChange::Priority priority) +QScenePropertyChange::QScenePropertyChange(ChangeFlag type, ObservableType observableType, QNodeId subjectId, QSceneChange::Priority priority) : QSceneChange(*new QScenePropertyChangePrivate, type, observableType, subjectId, priority) { } @@ -87,7 +87,7 @@ QScenePropertyChange::QScenePropertyChange(QScenePropertyChangePrivate &dd) } /*! \internal */ -QScenePropertyChange::QScenePropertyChange(QScenePropertyChangePrivate &dd, ChangeFlag type, ObservableType observableType, const QNodeId &subjectId, QSceneChange::Priority priority) +QScenePropertyChange::QScenePropertyChange(QScenePropertyChangePrivate &dd, ChangeFlag type, ObservableType observableType, QNodeId subjectId, QSceneChange::Priority priority) : QSceneChange(dd, type, observableType, subjectId, priority) { } diff --git a/src/core/qscenepropertychange.h b/src/core/qscenepropertychange.h index ffcc346ac..82400f6ba 100644 --- a/src/core/qscenepropertychange.h +++ b/src/core/qscenepropertychange.h @@ -51,7 +51,7 @@ class QScenePropertyChangePrivate; class QT3DCORESHARED_EXPORT QScenePropertyChange : public QSceneChange { public: - QScenePropertyChange(ChangeFlag type, ObservableType observableType, const QNodeId &subjectId, Priority priority = Standard); + QScenePropertyChange(ChangeFlag type, ObservableType observableType, QNodeId subjectId, Priority priority = Standard); virtual ~QScenePropertyChange(); const char *propertyName() const; @@ -66,7 +66,7 @@ public: protected: Q_DECLARE_PRIVATE(QScenePropertyChange) QScenePropertyChange(QScenePropertyChangePrivate &dd); - QScenePropertyChange(QScenePropertyChangePrivate &dd, ChangeFlag type, ObservableType observableType, const QNodeId &subjectId, Priority priority = Standard); + QScenePropertyChange(QScenePropertyChangePrivate &dd, ChangeFlag type, ObservableType observableType, QNodeId subjectId, Priority priority = Standard); }; typedef QSharedPointer<QScenePropertyChange> QScenePropertyChangePtr; diff --git a/src/input/backend/assignkeyboardfocusjob.cpp b/src/input/backend/assignkeyboardfocusjob.cpp index fb6fb3a7d..b7e946039 100644 --- a/src/input/backend/assignkeyboardfocusjob.cpp +++ b/src/input/backend/assignkeyboardfocusjob.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { namespace Input { -AssignKeyboardFocusJob::AssignKeyboardFocusJob(const Qt3DCore::QNodeId &controller) +AssignKeyboardFocusJob::AssignKeyboardFocusJob(Qt3DCore::QNodeId controller) : QAspectJob() , m_inputHandler(Q_NULLPTR) , m_keyboardController(controller) diff --git a/src/input/backend/assignkeyboardfocusjob_p.h b/src/input/backend/assignkeyboardfocusjob_p.h index 69588d0bc..d593a0bba 100644 --- a/src/input/backend/assignkeyboardfocusjob_p.h +++ b/src/input/backend/assignkeyboardfocusjob_p.h @@ -64,7 +64,7 @@ class InputHandler; class AssignKeyboardFocusJob : public Qt3DCore::QAspectJob { public: - explicit AssignKeyboardFocusJob(const Qt3DCore::QNodeId &controller); + explicit AssignKeyboardFocusJob(Qt3DCore::QNodeId controller); void setInputHandler(InputHandler *handler); void run() Q_DECL_OVERRIDE; diff --git a/src/input/backend/axisactionhandler.cpp b/src/input/backend/axisactionhandler.cpp index 9e78a3a9c..9efeb1acc 100644 --- a/src/input/backend/axisactionhandler.cpp +++ b/src/input/backend/axisactionhandler.cpp @@ -120,12 +120,12 @@ Qt3DCore::QBackendNode *AxisActionHandlerNodeFunctor::create(Qt3DCore::QNode *fr return backend; } -Qt3DCore::QBackendNode *AxisActionHandlerNodeFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *AxisActionHandlerNodeFunctor::get(Qt3DCore::QNodeId id) const { return m_manager->lookupResource(id); } -void AxisActionHandlerNodeFunctor::destroy(const Qt3DCore::QNodeId &id) const +void AxisActionHandlerNodeFunctor::destroy(Qt3DCore::QNodeId id) const { HAxisActionHandler handle = m_manager->lookupHandle(id); m_manager->releaseResource(id); diff --git a/src/input/backend/axisactionhandler_p.h b/src/input/backend/axisactionhandler_p.h index 56cec078a..74f3055cd 100644 --- a/src/input/backend/axisactionhandler_p.h +++ b/src/input/backend/axisactionhandler_p.h @@ -89,8 +89,8 @@ public: explicit AxisActionHandlerNodeFunctor(AxisActionHandlerManager *manager); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL; - Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; - void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL; private: AxisActionHandlerManager *m_manager; diff --git a/src/input/backend/genericdevicebackendnode.cpp b/src/input/backend/genericdevicebackendnode.cpp index ad15dedc5..de310b789 100644 --- a/src/input/backend/genericdevicebackendnode.cpp +++ b/src/input/backend/genericdevicebackendnode.cpp @@ -110,12 +110,12 @@ Qt3DCore::QBackendNode *GenericDeviceBackendFunctor::create(Qt3DCore::QNode *fro return backendNode; } -Qt3DCore::QBackendNode *GenericDeviceBackendFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *GenericDeviceBackendFunctor::get(Qt3DCore::QNodeId id) const { return m_handler->genericDeviceBackendNodeManager()->lookupResource(id); } -void GenericDeviceBackendFunctor::destroy(const Qt3DCore::QNodeId &id) const +void GenericDeviceBackendFunctor::destroy(Qt3DCore::QNodeId id) const { m_handler->removeGenericDevice(m_handler->genericDeviceBackendNodeManager()->lookupHandle(id)); m_handler->genericDeviceBackendNodeManager()->releaseResource(id); diff --git a/src/input/backend/genericdevicebackendnode_p.h b/src/input/backend/genericdevicebackendnode_p.h index a29927f42..9a685ad10 100644 --- a/src/input/backend/genericdevicebackendnode_p.h +++ b/src/input/backend/genericdevicebackendnode_p.h @@ -89,8 +89,8 @@ public: explicit GenericDeviceBackendFunctor(QInputAspect *inputaspect, InputHandler *handler); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) 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; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: QInputAspect *m_inputAspect; diff --git a/src/input/backend/inputbackendnodefunctor_p.h b/src/input/backend/inputbackendnodefunctor_p.h index 5dd93c01f..6500d5ed0 100644 --- a/src/input/backend/inputbackendnodefunctor_p.h +++ b/src/input/backend/inputbackendnodefunctor_p.h @@ -76,12 +76,12 @@ public: return backend; } - Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL { return m_manager->lookupResource(id); } - void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL + void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL { m_manager->releaseResource(id); } diff --git a/src/input/backend/inputhandler.cpp b/src/input/backend/inputhandler.cpp index 7cc64bbeb..834ec19d1 100644 --- a/src/input/backend/inputhandler.cpp +++ b/src/input/backend/inputhandler.cpp @@ -213,7 +213,7 @@ QVector<Qt3DCore::QAspectJobPtr> InputHandler::mouseJobs() controller->updateMouseEvents(events); // Event dispacthing job if (!events.isEmpty()) { - Q_FOREACH (const QNodeId &input, controller->mouseInputs()) { + Q_FOREACH (QNodeId input, controller->mouseInputs()) { MouseEventDispatcherJob *job = new MouseEventDispatcherJob(input, events); job->setInputHandler(this); jobs.append(QAspectJobPtr(job)); diff --git a/src/input/backend/inputsettings.cpp b/src/input/backend/inputsettings.cpp index 6fac4e1a9..868a27fd0 100644 --- a/src/input/backend/inputsettings.cpp +++ b/src/input/backend/inputsettings.cpp @@ -88,7 +88,7 @@ Qt3DCore::QBackendNode *InputSettingsFunctor::create(Qt3DCore::QNode *frontend) return settings; } -Qt3DCore::QBackendNode *InputSettingsFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *InputSettingsFunctor::get(Qt3DCore::QNodeId id) const { InputSettings *settings = m_handler->inputSettings(); if (settings != Q_NULLPTR && settings->peerUuid() == id) @@ -96,7 +96,7 @@ Qt3DCore::QBackendNode *InputSettingsFunctor::get(const Qt3DCore::QNodeId &id) c return Q_NULLPTR; } -void InputSettingsFunctor::destroy(const Qt3DCore::QNodeId &id) const +void InputSettingsFunctor::destroy(Qt3DCore::QNodeId id) const { InputSettings *settings = m_handler->inputSettings(); if (settings != Q_NULLPTR && settings->peerUuid() == id) { diff --git a/src/input/backend/inputsettings_p.h b/src/input/backend/inputsettings_p.h index 5ed021562..abcb7a290 100644 --- a/src/input/backend/inputsettings_p.h +++ b/src/input/backend/inputsettings_p.h @@ -82,8 +82,8 @@ public: explicit InputSettingsFunctor(InputHandler *handler); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) 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; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: InputHandler *m_handler; diff --git a/src/input/backend/keyboardcontroller.cpp b/src/input/backend/keyboardcontroller.cpp index 6d878edae..294a3d15b 100644 --- a/src/input/backend/keyboardcontroller.cpp +++ b/src/input/backend/keyboardcontroller.cpp @@ -381,7 +381,7 @@ void KeyboardController::cleanup() m_keyStates.keys[4] = 0; } -void KeyboardController::requestFocusForInput(const Qt3DCore::QNodeId &inputId) +void KeyboardController::requestFocusForInput(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 @@ -394,7 +394,7 @@ void KeyboardController::setInputHandler(InputHandler *handler) m_inputHandler = handler; } -void KeyboardController::addKeyboardInput(const Qt3DCore::QNodeId &input) +void KeyboardController::addKeyboardInput(Qt3DCore::QNodeId input) { if (!m_keyboardInputs.contains(input)) { m_keyboardInputs.append(input); @@ -402,13 +402,13 @@ void KeyboardController::addKeyboardInput(const Qt3DCore::QNodeId &input) } } -void KeyboardController::removeKeyboardInput(const Qt3DCore::QNodeId &input) +void KeyboardController::removeKeyboardInput(Qt3DCore::QNodeId input) { m_keyboardInputs.removeAll(input); m_keyboardInputHandles.removeAll(m_inputHandler->keyboardInputManager()->lookupHandle(input)); } -void KeyboardController::setCurrentFocusItem(const Qt3DCore::QNodeId &input) +void KeyboardController::setCurrentFocusItem(Qt3DCore::QNodeId input) { m_currentFocusItem = input; } @@ -465,12 +465,12 @@ Qt3DCore::QBackendNode *KeyboardControllerFunctor::create(Qt3DCore::QNode *front return controller; } -Qt3DCore::QBackendNode *KeyboardControllerFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *KeyboardControllerFunctor::get(Qt3DCore::QNodeId id) const { return m_handler->keyboardControllerManager()->lookupResource(id); } -void KeyboardControllerFunctor::destroy(const Qt3DCore::QNodeId &id) const +void KeyboardControllerFunctor::destroy(Qt3DCore::QNodeId id) const { m_handler->removeKeyboardController(m_handler->keyboardControllerManager()->lookupHandle(id)); m_handler->keyboardControllerManager()->releaseResource(id); diff --git a/src/input/backend/keyboardcontroller_p.h b/src/input/backend/keyboardcontroller_p.h index 859f4c8aa..70dfcb734 100644 --- a/src/input/backend/keyboardcontroller_p.h +++ b/src/input/backend/keyboardcontroller_p.h @@ -74,13 +74,13 @@ public: void cleanup() Q_DECL_OVERRIDE; - void requestFocusForInput(const Qt3DCore::QNodeId &inputId); + void requestFocusForInput(Qt3DCore::QNodeId inputId); void setInputHandler(InputHandler *handler); - void addKeyboardInput(const Qt3DCore::QNodeId &input); - void removeKeyboardInput(const Qt3DCore::QNodeId &input); + void addKeyboardInput(Qt3DCore::QNodeId input); + void removeKeyboardInput(Qt3DCore::QNodeId input); - void setCurrentFocusItem(const Qt3DCore::QNodeId &input); + void setCurrentFocusItem(Qt3DCore::QNodeId input); float axisValue(int axisIdentifier) const Q_DECL_OVERRIDE; bool isButtonPressed(int buttonIdentifier) const Q_DECL_OVERRIDE; @@ -276,8 +276,8 @@ public: explicit KeyboardControllerFunctor(QInputAspect *inputaspect, InputHandler *handler); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) 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; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: QInputAspect *m_inputAspect; diff --git a/src/input/backend/keyboardinput.cpp b/src/input/backend/keyboardinput.cpp index cc8d957c9..6bcfca901 100644 --- a/src/input/backend/keyboardinput.cpp +++ b/src/input/backend/keyboardinput.cpp @@ -132,7 +132,7 @@ void KeyboardInput::requestFocus() controller->requestFocusForInput(peerUuid()); } -void KeyboardInput::setController(const QNodeId &controller) +void KeyboardInput::setController(QNodeId controller) { if (!m_keyboardController.isNull()) { KeyboardController *controller = m_inputHandler->keyboardControllerManager()->lookupResource(m_keyboardController); @@ -160,12 +160,12 @@ QBackendNode *KeyboardInputFunctor::create(QNode *frontend) const return input; } -QBackendNode *KeyboardInputFunctor::get(const QNodeId &id) const +QBackendNode *KeyboardInputFunctor::get(QNodeId id) const { return m_handler->keyboardInputManager()->lookupResource(id); } -void KeyboardInputFunctor::destroy(const QNodeId &id) const +void KeyboardInputFunctor::destroy(QNodeId id) const { m_handler->keyboardInputManager()->releaseResource(id); } diff --git a/src/input/backend/keyboardinput_p.h b/src/input/backend/keyboardinput_p.h index b6aaa4cd7..fe2757cf8 100644 --- a/src/input/backend/keyboardinput_p.h +++ b/src/input/backend/keyboardinput_p.h @@ -78,7 +78,7 @@ public: protected: void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; void requestFocus(); - void setController(const Qt3DCore::QNodeId &controller); + void setController(Qt3DCore::QNodeId controller); private: InputHandler *m_inputHandler; @@ -93,8 +93,8 @@ public: explicit KeyboardInputFunctor(InputHandler *handler); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) 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; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: InputHandler *m_handler; diff --git a/src/input/backend/keyeventdispatcherjob.cpp b/src/input/backend/keyeventdispatcherjob.cpp index dfae9f476..b877e0fd6 100644 --- a/src/input/backend/keyeventdispatcherjob.cpp +++ b/src/input/backend/keyeventdispatcherjob.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { namespace Input { -KeyEventDispatcherJob::KeyEventDispatcherJob(const Qt3DCore::QNodeId &input, const QList<QT_PREPEND_NAMESPACE(QKeyEvent)> &events) +KeyEventDispatcherJob::KeyEventDispatcherJob(Qt3DCore::QNodeId input, const QList<QT_PREPEND_NAMESPACE(QKeyEvent)> &events) : QAspectJob() , m_inputHandler(Q_NULLPTR) , m_keyboardInput(input) diff --git a/src/input/backend/keyeventdispatcherjob_p.h b/src/input/backend/keyeventdispatcherjob_p.h index ca70201b6..366183d83 100644 --- a/src/input/backend/keyeventdispatcherjob_p.h +++ b/src/input/backend/keyeventdispatcherjob_p.h @@ -65,7 +65,7 @@ class InputHandler; class KeyEventDispatcherJob : public Qt3DCore::QAspectJob { public: - explicit KeyEventDispatcherJob(const Qt3DCore::QNodeId &input, const QList<QT_PREPEND_NAMESPACE(QKeyEvent)> &events); + explicit KeyEventDispatcherJob(Qt3DCore::QNodeId input, const QList<QT_PREPEND_NAMESPACE(QKeyEvent)> &events); void setInputHandler(InputHandler *handler); void run() Q_DECL_OVERRIDE; diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp index f8469fb68..c9cf2b818 100644 --- a/src/input/backend/logicaldevice.cpp +++ b/src/input/backend/logicaldevice.cpp @@ -107,12 +107,12 @@ Qt3DCore::QBackendNode *LogicalDeviceNodeFunctor::create(Qt3DCore::QNode *fronte return backend; } -Qt3DCore::QBackendNode *LogicalDeviceNodeFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *LogicalDeviceNodeFunctor::get(Qt3DCore::QNodeId id) const { return m_manager->lookupResource(id); } -void LogicalDeviceNodeFunctor::destroy(const Qt3DCore::QNodeId &id) const +void LogicalDeviceNodeFunctor::destroy(Qt3DCore::QNodeId id) const { HLogicalDevice handle = m_manager->lookupHandle(id); m_manager->releaseResource(id); diff --git a/src/input/backend/logicaldevice_p.h b/src/input/backend/logicaldevice_p.h index 5e56793c6..6091b1c35 100644 --- a/src/input/backend/logicaldevice_p.h +++ b/src/input/backend/logicaldevice_p.h @@ -88,8 +88,8 @@ public: explicit LogicalDeviceNodeFunctor(LogicalDeviceManager *manager); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL; - Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; - void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL; private: LogicalDeviceManager *m_manager; diff --git a/src/input/backend/mousecontroller.cpp b/src/input/backend/mousecontroller.cpp index d35dd0480..b3763b191 100644 --- a/src/input/backend/mousecontroller.cpp +++ b/src/input/backend/mousecontroller.cpp @@ -73,13 +73,13 @@ void MouseController::setInputHandler(InputHandler *handler) m_inputHandler = handler; } -void MouseController::addMouseInput(const Qt3DCore::QNodeId &input) +void MouseController::addMouseInput(Qt3DCore::QNodeId input) { if (!m_mouseInputs.contains(input)) m_mouseInputs.append(input); } -void MouseController::removeMouseInput(const Qt3DCore::QNodeId &input) +void MouseController::removeMouseInput(Qt3DCore::QNodeId input) { m_mouseInputs.removeOne(input); } @@ -159,12 +159,12 @@ Qt3DCore::QBackendNode *MouseControllerFunctor::create(Qt3DCore::QNode *frontend return controller; } -Qt3DCore::QBackendNode *MouseControllerFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *MouseControllerFunctor::get(Qt3DCore::QNodeId id) const { return m_handler->mouseControllerManager()->lookupResource(id); } -void MouseControllerFunctor::destroy(const Qt3DCore::QNodeId &id) const +void MouseControllerFunctor::destroy(Qt3DCore::QNodeId id) const { m_handler->removeMouseController(m_handler->mouseControllerManager()->lookupHandle(id)); m_handler->mouseControllerManager()->releaseResource(id); diff --git a/src/input/backend/mousecontroller_p.h b/src/input/backend/mousecontroller_p.h index 720a57628..e935febaf 100644 --- a/src/input/backend/mousecontroller_p.h +++ b/src/input/backend/mousecontroller_p.h @@ -73,8 +73,8 @@ public: void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; void setInputHandler(InputHandler *handler); - void addMouseInput(const Qt3DCore::QNodeId &input); - void removeMouseInput(const Qt3DCore::QNodeId &input); + void addMouseInput(Qt3DCore::QNodeId input); + void removeMouseInput(Qt3DCore::QNodeId input); float axisValue(int axisIdentifier) const Q_DECL_OVERRIDE; bool isButtonPressed(int buttonIdentifier) const Q_DECL_OVERRIDE; @@ -118,8 +118,8 @@ public: explicit MouseControllerFunctor(Qt3DInput::QInputAspect *inputAspect, InputHandler *handler); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) 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; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: QInputAspect *m_inputAspect; diff --git a/src/input/backend/mouseeventdispatcherjob.cpp b/src/input/backend/mouseeventdispatcherjob.cpp index c75ce38d0..797e5d7db 100644 --- a/src/input/backend/mouseeventdispatcherjob.cpp +++ b/src/input/backend/mouseeventdispatcherjob.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { namespace Input { -MouseEventDispatcherJob::MouseEventDispatcherJob(const Qt3DCore::QNodeId &input, const QList<QT_PREPEND_NAMESPACE(QMouseEvent)> &events) +MouseEventDispatcherJob::MouseEventDispatcherJob(Qt3DCore::QNodeId input, const QList<QT_PREPEND_NAMESPACE(QMouseEvent)> &events) : QAspectJob() , m_inputHandler(Q_NULLPTR) , m_mouseInput(input) diff --git a/src/input/backend/mouseeventdispatcherjob_p.h b/src/input/backend/mouseeventdispatcherjob_p.h index 83cfcac92..7db1b1304 100644 --- a/src/input/backend/mouseeventdispatcherjob_p.h +++ b/src/input/backend/mouseeventdispatcherjob_p.h @@ -65,7 +65,7 @@ class InputHandler; class MouseEventDispatcherJob : public Qt3DCore::QAspectJob { public: - explicit MouseEventDispatcherJob(const Qt3DCore::QNodeId &input, const QList<QT_PREPEND_NAMESPACE(QMouseEvent)> &events); + explicit MouseEventDispatcherJob(Qt3DCore::QNodeId input, const QList<QT_PREPEND_NAMESPACE(QMouseEvent)> &events); void setInputHandler(InputHandler *handler); void run() Q_DECL_FINAL; diff --git a/src/input/backend/mouseinput.cpp b/src/input/backend/mouseinput.cpp index 0ffbb9f07..2b651fae6 100644 --- a/src/input/backend/mouseinput.cpp +++ b/src/input/backend/mouseinput.cpp @@ -114,7 +114,7 @@ void MouseInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } } -void MouseInput::setController(const Qt3DCore::QNodeId &controller) +void MouseInput::setController(Qt3DCore::QNodeId controller) { if (!m_mouseController.isNull()) { MouseController *controller = m_inputHandler->mouseControllerManager()->lookupResource(m_mouseController); @@ -142,12 +142,12 @@ Qt3DCore::QBackendNode *MouseInputFunctor::create(Qt3DCore::QNode *frontend) con return input; } -Qt3DCore::QBackendNode *MouseInputFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *MouseInputFunctor::get(Qt3DCore::QNodeId id) const { return m_handler->mouseInputManager()->lookupResource(id); } -void MouseInputFunctor::destroy(const Qt3DCore::QNodeId &id) const +void MouseInputFunctor::destroy(Qt3DCore::QNodeId id) const { m_handler->mouseInputManager()->releaseResource(id); } diff --git a/src/input/backend/mouseinput_p.h b/src/input/backend/mouseinput_p.h index 7f47d4560..1f53a349f 100644 --- a/src/input/backend/mouseinput_p.h +++ b/src/input/backend/mouseinput_p.h @@ -77,7 +77,7 @@ public: protected: void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void setController(const Qt3DCore::QNodeId &controller); + void setController(Qt3DCore::QNodeId controller); private: bool m_enabled; @@ -91,8 +91,8 @@ public: explicit MouseInputFunctor(InputHandler *handler); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) 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; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: InputHandler *m_handler; diff --git a/src/logic/handler.cpp b/src/logic/handler.cpp index bdd0ca612..ed693e7d4 100644 --- a/src/logic/handler.cpp +++ b/src/logic/handler.cpp @@ -76,12 +76,12 @@ Qt3DCore::QBackendNode *HandlerFunctor::create(Qt3DCore::QNode *frontend) const return handler; } -Qt3DCore::QBackendNode *HandlerFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *HandlerFunctor::get(Qt3DCore::QNodeId id) const { return m_manager->logicHandlerManager()->lookupResource(id); } -void HandlerFunctor::destroy(const Qt3DCore::QNodeId &id) const +void HandlerFunctor::destroy(Qt3DCore::QNodeId id) const { m_manager->removeHandler(id); } diff --git a/src/logic/handler_p.h b/src/logic/handler_p.h index c94d588e8..54d5cf0db 100644 --- a/src/logic/handler_p.h +++ b/src/logic/handler_p.h @@ -86,8 +86,8 @@ public: explicit HandlerFunctor(Manager *handler); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) 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; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: Manager *m_manager; diff --git a/src/logic/manager.cpp b/src/logic/manager.cpp index 9fbc7e9bc..13acd1dcc 100644 --- a/src/logic/manager.cpp +++ b/src/logic/manager.cpp @@ -79,7 +79,7 @@ void Manager::appendHandler(Handler *handler) m_logicComponentIds.append(handler->peerUuid()); } -void Manager::removeHandler(const Qt3DCore::QNodeId &id) +void Manager::removeHandler(Qt3DCore::QNodeId id) { HHandler handle = m_logicHandlerManager->lookupHandle(id); m_logicComponentIds.removeAll(id); diff --git a/src/logic/manager_p.h b/src/logic/manager_p.h index f7b8675e7..58e6e655b 100644 --- a/src/logic/manager_p.h +++ b/src/logic/manager_p.h @@ -81,7 +81,7 @@ public: HandlerManager *logicHandlerManager() const { return m_logicHandlerManager.data(); } void appendHandler(Handler *handler); - void removeHandler(const Qt3DCore::QNodeId &id); + void removeHandler(Qt3DCore::QNodeId id); void triggerLogicFrameUpdates(); diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp index 4af409771..fe332ce44 100644 --- a/src/render/backend/entity.cpp +++ b/src/render/backend/entity.cpp @@ -291,7 +291,7 @@ void Entity::addComponent(Qt3DCore::QComponent *component) } } -void Entity::removeComponent(const Qt3DCore::QNodeId &nodeId) +void Entity::removeComponent(Qt3DCore::QNodeId nodeId) { if (m_transformComponent == nodeId) { m_transformComponent = QNodeId(); @@ -374,7 +374,7 @@ QList<HLayer> Entity::componentsHandle<Layer>() const { QList<HLayer> layerHandles; layerHandles.reserve(m_layerComponents.size()); - Q_FOREACH (const QNodeId &id, m_layerComponents) + Q_FOREACH (QNodeId id, m_layerComponents) layerHandles.append(m_nodeManagers->layerManager()->lookupHandle(id)); return layerHandles; } @@ -384,7 +384,7 @@ QList<HShaderData> Entity::componentsHandle<ShaderData>() const { QList<HShaderData> shaderDataHandles; shaderDataHandles.reserve(m_shaderDataComponents.size()); - Q_FOREACH (const QNodeId &id, m_shaderDataComponents) + Q_FOREACH (QNodeId id, m_shaderDataComponents) shaderDataHandles.append(m_nodeManagers->shaderDataManager()->lookupHandle(id)); return shaderDataHandles; } @@ -400,7 +400,7 @@ QList<HLight> Entity::componentsHandle<Light>() const { QList<HLight> lightHandles; lightHandles.reserve(m_lightComponents.size()); - Q_FOREACH (const QNodeId &id, m_lightComponents) + Q_FOREACH (QNodeId id, m_lightComponents) lightHandles.append(m_nodeManagers->lightManager()->lookupHandle(id)); return lightHandles; } @@ -448,7 +448,7 @@ QList<Layer *> Entity::renderComponents<Layer>() const { QList<Layer *> layers; layers.reserve(m_layerComponents.size()); - Q_FOREACH (const QNodeId &id, m_layerComponents) + Q_FOREACH (QNodeId id, m_layerComponents) layers.append(m_nodeManagers->layerManager()->lookupResource(id)); return layers; } @@ -458,7 +458,7 @@ QList<ShaderData *> Entity::renderComponents<ShaderData>() const { QList<ShaderData *> shaderDatas; shaderDatas.reserve(m_shaderDataComponents.size()); - Q_FOREACH (const QNodeId &id, m_shaderDataComponents) + Q_FOREACH (QNodeId id, m_shaderDataComponents) shaderDatas.append(m_nodeManagers->shaderDataManager()->lookupResource(id)); return shaderDatas; } @@ -468,7 +468,7 @@ QList<Light *> Entity::renderComponents<Light>() const { QList<Light *> lights; lights.reserve(m_lightComponents.size()); - Q_FOREACH (const QNodeId &id, m_lightComponents) + Q_FOREACH (QNodeId id, m_lightComponents) lights.append(m_nodeManagers->lightManager()->lookupResource(id)); return lights; } @@ -532,12 +532,12 @@ Qt3DCore::QBackendNode *RenderEntityFunctor::create(Qt3DCore::QNode *frontend) c return entity; } -Qt3DCore::QBackendNode *RenderEntityFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *RenderEntityFunctor::get(Qt3DCore::QNodeId id) const { return m_nodeManagers->renderNodesManager()->lookupResource(id); } -void RenderEntityFunctor::destroy(const Qt3DCore::QNodeId &id) const +void RenderEntityFunctor::destroy(Qt3DCore::QNodeId id) const { m_nodeManagers->renderNodesManager()->releaseResource(id); } diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h index ae88e3320..c5b4f00ee 100644 --- a/src/render/backend/entity_p.h +++ b/src/render/backend/entity_p.h @@ -111,7 +111,7 @@ public: Sphere *worldBoundingVolumeWithChildren() const { return m_worldBoundingVolumeWithChildren.data(); } void addComponent(Qt3DCore::QComponent *component); - void removeComponent(const Qt3DCore::QNodeId &nodeId); + void removeComponent(Qt3DCore::QNodeId nodeId); bool isEnabled() const; void setEnabled(bool isEnabled); @@ -281,8 +281,8 @@ class RenderEntityFunctor : public Qt3DCore::QBackendNodeFunctor public: explicit RenderEntityFunctor(NodeManagers *manager); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) 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; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: NodeManagers *m_nodeManagers; diff --git a/src/render/backend/managers.cpp b/src/render/backend/managers.cpp index 7c35c6ce5..9da270e05 100644 --- a/src/render/backend/managers.cpp +++ b/src/render/backend/managers.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { -bool FrameGraphManager::containsNode(const Qt3DCore::QNodeId &id) const +bool FrameGraphManager::containsNode(Qt3DCore::QNodeId id) const { return m_nodes.contains(id); } @@ -56,7 +56,7 @@ void FrameGraphManager::appendNode(FrameGraphNode *node) m_nodes.insert(node->peerUuid(), node); } -FrameGraphNode* FrameGraphManager::lookupNode(const Qt3DCore::QNodeId &id) const +FrameGraphNode* FrameGraphManager::lookupNode(Qt3DCore::QNodeId id) const { const QHash<Qt3DCore::QNodeId, FrameGraphNode*>::const_iterator it = m_nodes.find(id); if (it == m_nodes.end()) @@ -65,7 +65,7 @@ FrameGraphNode* FrameGraphManager::lookupNode(const Qt3DCore::QNodeId &id) const return *it; } -void FrameGraphManager::releaseNode(const Qt3DCore::QNodeId &id) +void FrameGraphManager::releaseNode(Qt3DCore::QNodeId id) { delete m_nodes.take(id); } diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index 90487099e..858847dda 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -146,10 +146,10 @@ class Q_AUTOTEST_EXPORT FrameGraphManager public: FrameGraphManager() {} - bool containsNode(const Qt3DCore::QNodeId &id) const; + bool containsNode(Qt3DCore::QNodeId id) const; void appendNode(FrameGraphNode *node); - FrameGraphNode* lookupNode(const Qt3DCore::QNodeId &id) const; - void releaseNode(const Qt3DCore::QNodeId &id); + FrameGraphNode* lookupNode(Qt3DCore::QNodeId id) const; + void releaseNode(Qt3DCore::QNodeId id); private: QHash<Qt3DCore::QNodeId, FrameGraphNode*> m_nodes; diff --git a/src/render/backend/nodefunctor_p.h b/src/render/backend/nodefunctor_p.h index 2456a68e1..47aa3d873 100644 --- a/src/render/backend/nodefunctor_p.h +++ b/src/render/backend/nodefunctor_p.h @@ -76,12 +76,12 @@ public: return backend; } - Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL { return m_manager->lookupResource(id); } - void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL + void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL { m_manager->releaseResource(id); } diff --git a/src/render/backend/parameterpack.cpp b/src/render/backend/parameterpack.cpp index d8306c5b1..c997c740e 100644 --- a/src/render/backend/parameterpack.cpp +++ b/src/render/backend/parameterpack.cpp @@ -57,14 +57,14 @@ void ParameterPack::clear() m_peers.clear(); } -void ParameterPack::appendParameter(const Qt3DCore::QNodeId ¶meterId) +void ParameterPack::appendParameter(Qt3DCore::QNodeId parameterId) { if (!m_peers.contains(parameterId)) { m_peers.append(parameterId); } } -void ParameterPack::removeParameter(const Qt3DCore::QNodeId ¶meterId) +void ParameterPack::removeParameter(Qt3DCore::QNodeId parameterId) { m_peers.removeOne(parameterId); } diff --git a/src/render/backend/parameterpack_p.h b/src/render/backend/parameterpack_p.h index c9e22a73b..31218e60d 100644 --- a/src/render/backend/parameterpack_p.h +++ b/src/render/backend/parameterpack_p.h @@ -66,8 +66,8 @@ public: ParameterPack(); ~ParameterPack(); void clear(); - void appendParameter(const Qt3DCore::QNodeId ¶meterId); - void removeParameter(const Qt3DCore::QNodeId ¶meterId); + void appendParameter(Qt3DCore::QNodeId parameterId); + void removeParameter(Qt3DCore::QNodeId parameterId); QList<Qt3DCore::QNodeId> parameters() const; private: diff --git a/src/render/backend/quniformvalue.cpp b/src/render/backend/quniformvalue.cpp index 624349eec..f2a9f0874 100644 --- a/src/render/backend/quniformvalue.cpp +++ b/src/render/backend/quniformvalue.cpp @@ -95,7 +95,7 @@ void ShaderParameterPack::setUniform(const int glslNameId, const QUniformValue & m_uniforms.insert(glslNameId, val); } -void ShaderParameterPack::setTexture(const int glslNameId, const Qt3DCore::QNodeId &texId) +void ShaderParameterPack::setTexture(const int glslNameId, Qt3DCore::QNodeId texId) { for (int t=0; t<m_textures.size(); ++t) { if (m_textures[t].glslNameId != glslNameId) diff --git a/src/render/backend/quniformvalue_p.h b/src/render/backend/quniformvalue_p.h index bcb8ef0e1..2140b3b5e 100644 --- a/src/render/backend/quniformvalue_p.h +++ b/src/render/backend/quniformvalue_p.h @@ -204,7 +204,7 @@ public: ~ShaderParameterPack(); void setUniform(const int glslNameId, const QUniformValue &val); - void setTexture(const int glslNameId, const Qt3DCore::QNodeId &id); + void setTexture(const int glslNameId, Qt3DCore::QNodeId id); void setUniformBuffer(const BlockToUBO &blockToUBO); void setShaderStorageBuffer(const BlockToSSBO &blockToSSBO); @@ -215,7 +215,7 @@ public: struct NamedTexture { NamedTexture() {} - NamedTexture(const int nm, const Qt3DCore::QNodeId &t) + NamedTexture(const int nm, Qt3DCore::QNodeId t) : glslNameId(nm) , texId(t) { } diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 3d8fe65fe..71e19ed95 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -975,7 +975,7 @@ Attribute *Renderer::updateBuffersAndAttributes(Geometry *geometry, RenderComman uint estimatedCount = 0; m_dirtyAttributes.reserve(m_dirtyAttributes.size() + geometry->attributes().size()); - Q_FOREACH (const QNodeId &attributeId, geometry->attributes()) { + Q_FOREACH (QNodeId attributeId, geometry->attributes()) { // TO DO: Improvement we could store handles and use the non locking policy on the attributeManager Attribute *attribute = m_nodesManager->attributeManager()->lookupResource(attributeId); diff --git a/src/render/backend/renderersettings.cpp b/src/render/backend/renderersettings.cpp index 75d0181bd..2dc34caa4 100644 --- a/src/render/backend/renderersettings.cpp +++ b/src/render/backend/renderersettings.cpp @@ -98,13 +98,13 @@ Qt3DCore::QBackendNode *RendererSettingsFunctor::create(Qt3DCore::QNode *fronten return settings; } -Qt3DCore::QBackendNode *RendererSettingsFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *RendererSettingsFunctor::get(Qt3DCore::QNodeId id) const { Q_UNUSED(id); return Q_NULLPTR; } -void RendererSettingsFunctor::destroy(const Qt3DCore::QNodeId &id) const +void RendererSettingsFunctor::destroy(Qt3DCore::QNodeId id) const { Q_UNUSED(id); // Deletes the old settings object diff --git a/src/render/backend/renderersettings_p.h b/src/render/backend/renderersettings_p.h index 10707000b..224688c69 100644 --- a/src/render/backend/renderersettings_p.h +++ b/src/render/backend/renderersettings_p.h @@ -80,8 +80,8 @@ class RendererSettingsFunctor : public Qt3DCore::QBackendNodeFunctor public: explicit RendererSettingsFunctor(AbstractRenderer *renderer); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) 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; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: AbstractRenderer *m_renderer; diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp index 9212f3a70..bc46bd657 100644 --- a/src/render/backend/rendertarget.cpp +++ b/src/render/backend/rendertarget.cpp @@ -67,13 +67,13 @@ void RenderTarget::cleanup() { } -void RenderTarget::appendRenderAttachment(const QNodeId &attachmentId) +void RenderTarget::appendRenderAttachment(QNodeId attachmentId) { if (!m_renderAttachments.contains(attachmentId)) m_renderAttachments.append(attachmentId); } -void RenderTarget::removeRenderAttachment(const QNodeId &attachmentId) +void RenderTarget::removeRenderAttachment(QNodeId attachmentId) { m_renderAttachments.removeOne(attachmentId); } diff --git a/src/render/backend/rendertarget_p.h b/src/render/backend/rendertarget_p.h index 0c7cf8683..036bae25a 100644 --- a/src/render/backend/rendertarget_p.h +++ b/src/render/backend/rendertarget_p.h @@ -74,8 +74,8 @@ public: void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; void cleanup(); - void appendRenderAttachment(const Qt3DCore::QNodeId &attachmentId); - void removeRenderAttachment(const Qt3DCore::QNodeId &attachmentId); + void appendRenderAttachment(Qt3DCore::QNodeId attachmentId); + void removeRenderAttachment(Qt3DCore::QNodeId attachmentId); QList<Qt3DCore::QNodeId> renderAttachments() const; diff --git a/src/render/backend/triangleboundingvolume.cpp b/src/render/backend/triangleboundingvolume.cpp index 9bb895915..7e5aa6e31 100644 --- a/src/render/backend/triangleboundingvolume.cpp +++ b/src/render/backend/triangleboundingvolume.cpp @@ -99,7 +99,7 @@ TriangleBoundingVolume::TriangleBoundingVolume() /*! The vertices a, b, c are assumed to be in counter clockwise order. */ -TriangleBoundingVolume::TriangleBoundingVolume(const Qt3DCore::QNodeId &id, const QVector3D &a, const QVector3D &b, const QVector3D &c) +TriangleBoundingVolume::TriangleBoundingVolume(Qt3DCore::QNodeId id, const QVector3D &a, const QVector3D &b, const QVector3D &c) : QBoundingVolume() , m_id(id) , m_a(a) diff --git a/src/render/backend/triangleboundingvolume_p.h b/src/render/backend/triangleboundingvolume_p.h index 7ee5c3627..4a36caacb 100644 --- a/src/render/backend/triangleboundingvolume_p.h +++ b/src/render/backend/triangleboundingvolume_p.h @@ -72,7 +72,7 @@ class Q_AUTOTEST_EXPORT TriangleBoundingVolume : public QBoundingVolume { public: TriangleBoundingVolume(); - explicit TriangleBoundingVolume(const Qt3DCore::QNodeId &id, + explicit TriangleBoundingVolume(Qt3DCore::QNodeId id, const QVector3D &a, const QVector3D &b, const QVector3D &c); diff --git a/src/render/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp index 7b76f29ce..f264021b6 100644 --- a/src/render/framegraph/framegraphnode.cpp +++ b/src/render/framegraph/framegraphnode.cpp @@ -77,7 +77,7 @@ FrameGraphManager *FrameGraphNode::manager() const return m_manager; } -void FrameGraphNode::setParentId(const Qt3DCore::QNodeId &parentId) +void FrameGraphNode::setParentId(Qt3DCore::QNodeId parentId) { if (m_parentId != parentId) { m_parentId = parentId; @@ -87,7 +87,7 @@ void FrameGraphNode::setParentId(const Qt3DCore::QNodeId &parentId) } } -void FrameGraphNode::appendChildId(const Qt3DCore::QNodeId &childId) +void FrameGraphNode::appendChildId(Qt3DCore::QNodeId childId) { if (!m_childrenIds.contains(childId)) { FrameGraphNode *child = m_manager->lookupNode(childId); @@ -98,7 +98,7 @@ void FrameGraphNode::appendChildId(const Qt3DCore::QNodeId &childId) } } -void FrameGraphNode::removeChildId(const Qt3DCore::QNodeId &childId) +void FrameGraphNode::removeChildId(Qt3DCore::QNodeId childId) { if (m_childrenIds.contains(childId)) { FrameGraphNode *child = m_manager->lookupNode(childId); @@ -129,7 +129,7 @@ QList<FrameGraphNode *> FrameGraphNode::children() const QList<FrameGraphNode *> children; children.reserve(m_childrenIds.size()); - Q_FOREACH (const Qt3DCore::QNodeId &id, m_childrenIds) { + Q_FOREACH (Qt3DCore::QNodeId id, m_childrenIds) { FrameGraphNode *child = m_manager->lookupNode(id); if (child != Q_NULLPTR) children << child; @@ -153,13 +153,13 @@ Qt3DCore::QBackendNode *FrameGraphComponentFunctor::create(Qt3DCore::QNode *fron return Q_NULLPTR; } -Qt3DCore::QBackendNode *FrameGraphComponentFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *FrameGraphComponentFunctor::get(Qt3DCore::QNodeId id) const { Q_UNUSED(id); return Q_NULLPTR; } -void FrameGraphComponentFunctor::destroy(const Qt3DCore::QNodeId &id) const +void FrameGraphComponentFunctor::destroy(Qt3DCore::QNodeId id) const { Q_UNUSED(id); } diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h index e6d35849a..d8b5e8b5b 100644 --- a/src/render/framegraph/framegraphnode_p.h +++ b/src/render/framegraph/framegraphnode_p.h @@ -99,9 +99,9 @@ public: void setFrameGraphManager(FrameGraphManager *manager); FrameGraphManager *manager() const; - void setParentId(const Qt3DCore::QNodeId &parentId); - void appendChildId(const Qt3DCore::QNodeId &childHandle); - void removeChildId(const Qt3DCore::QNodeId &childHandle); + void setParentId(Qt3DCore::QNodeId parentId); + void appendChildId(Qt3DCore::QNodeId childHandle); + void removeChildId(Qt3DCore::QNodeId childHandle); Qt3DCore::QNodeId parentId() const; QList<Qt3DCore::QNodeId> childrenIds() const; @@ -136,12 +136,12 @@ public: return createBackendFrameGraphNode(frontend); } - Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE { return m_manager->lookupNode(id); } - void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE { m_manager->releaseNode(id); } @@ -175,8 +175,8 @@ class FrameGraphComponentFunctor : public Qt3DCore::QBackendNodeFunctor public: explicit FrameGraphComponentFunctor(AbstractRenderer *renderer); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) 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; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: AbstractRenderer *m_renderer; diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp index b83670417..21e05ac53 100644 --- a/src/render/framegraph/renderpassfilternode.cpp +++ b/src/render/framegraph/renderpassfilternode.cpp @@ -72,13 +72,13 @@ QList<Qt3DCore::QNodeId> RenderPassFilter::filters() const return m_filters; } -void RenderPassFilter::appendFilter(const Qt3DCore::QNodeId &criterionId) +void RenderPassFilter::appendFilter(Qt3DCore::QNodeId criterionId) { if (!m_filters.contains(criterionId)) m_filters.append(criterionId); } -void RenderPassFilter::removeFilter(const Qt3DCore::QNodeId &criterionId) +void RenderPassFilter::removeFilter(Qt3DCore::QNodeId criterionId) { m_filters.removeOne(criterionId); } diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h index 4dd3abbdd..762b3e756 100644 --- a/src/render/framegraph/renderpassfilternode_p.h +++ b/src/render/framegraph/renderpassfilternode_p.h @@ -76,8 +76,8 @@ public: void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; QList<Qt3DCore::QNodeId> filters() const; QList<Qt3DCore::QNodeId> parameters() const; - void appendFilter(const Qt3DCore::QNodeId &criterionId); - void removeFilter(const Qt3DCore::QNodeId &criterionId); + void appendFilter(Qt3DCore::QNodeId criterionId); + void removeFilter(Qt3DCore::QNodeId criterionId); void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp index 49df8a298..87eff80a6 100644 --- a/src/render/framegraph/techniquefilternode.cpp +++ b/src/render/framegraph/techniquefilternode.cpp @@ -78,13 +78,13 @@ QList<Qt3DCore::QNodeId> TechniqueFilter::filters() const return m_filters; } -void TechniqueFilter::appendFilter(const QNodeId &criterionId) +void TechniqueFilter::appendFilter(QNodeId criterionId) { if (!m_filters.contains(criterionId)) m_filters.append(criterionId); } -void TechniqueFilter::removeFilter(const Qt3DCore::QNodeId &criterionId) +void TechniqueFilter::removeFilter(Qt3DCore::QNodeId criterionId) { m_filters.removeOne(criterionId); } diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h index 7d15f8007..e88762e3d 100644 --- a/src/render/framegraph/techniquefilternode_p.h +++ b/src/render/framegraph/techniquefilternode_p.h @@ -83,8 +83,8 @@ public: void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: - void appendFilter(const Qt3DCore::QNodeId &criterionId); - void removeFilter(const Qt3DCore::QNodeId &criterionId); + void appendFilter(Qt3DCore::QNodeId criterionId); + void removeFilter(Qt3DCore::QNodeId criterionId); QList<Qt3DCore::QNodeId> m_filters; ParameterPack m_parameterPack; diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index ef8d6cd2a..9f8f3b423 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -346,7 +346,7 @@ QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) d->m_cleanupJob->setRoot(d->m_renderer->sceneRoot()); const QVector<QNodeId> texturesPending = manager->textureDataManager()->texturesPending(); - Q_FOREACH (const QNodeId &textureId, texturesPending) { + Q_FOREACH (QNodeId textureId, texturesPending) { Render::LoadTextureDataJobPtr loadTextureJob(new Render::LoadTextureDataJob(textureId)); loadTextureJob->setNodeManagers(manager); jobs.append(loadTextureJob); @@ -460,7 +460,7 @@ QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::createRenderBufferJobs() const QVector<QNodeId> dirtyBuffers = d->m_nodeManagers->bufferManager()->dirtyBuffers(); QVector<QAspectJobPtr> dirtyBuffersJobs; - Q_FOREACH (const QNodeId &bufId, dirtyBuffers) { + Q_FOREACH (QNodeId bufId, dirtyBuffers) { Render::HBuffer bufferHandle = d->m_nodeManagers->lookupHandle<Render::Buffer, Render::BufferManager, Render::HBuffer>(bufId); if (!bufferHandle.isNull()) { // Create new buffer job @@ -480,7 +480,7 @@ QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::createGeometryRendererJobs() const QVector<QNodeId> dirtyGeometryRenderers = geomRendererManager->dirtyGeometryRenderers(); QVector<QAspectJobPtr> dirtyGeometryRendererJobs; - Q_FOREACH (const QNodeId &geoRendererId, dirtyGeometryRenderers) { + Q_FOREACH (QNodeId geoRendererId, dirtyGeometryRenderers) { Render::HGeometryRenderer geometryRendererHandle = geomRendererManager->lookupHandle(geoRendererId); if (!geometryRendererHandle.isNull()) { Render::LoadGeometryJobPtr job(new Render::LoadGeometryJob(geometryRendererHandle)); diff --git a/src/render/frontend/sphere_p.h b/src/render/frontend/sphere_p.h index 5b74d1dc9..72be54ca7 100644 --- a/src/render/frontend/sphere_p.h +++ b/src/render/frontend/sphere_p.h @@ -67,13 +67,13 @@ namespace Render { class QT3DRENDERSHARED_PRIVATE_EXPORT Sphere : public QBoundingSphere { public: - inline Sphere(const Qt3DCore::QNodeId &i = Qt3DCore::QNodeId()) + inline Sphere(Qt3DCore::QNodeId i = Qt3DCore::QNodeId()) : m_center() , m_radius(0.0f) , m_id(i) {} - inline Sphere(const QVector3D &c, float r, const Qt3DCore::QNodeId &i = Qt3DCore::QNodeId()) + inline Sphere(const QVector3D &c, float r, Qt3DCore::QNodeId i = Qt3DCore::QNodeId()) : m_center(c) , m_radius(r) , m_id(i) diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp index 16772515e..108470947 100644 --- a/src/render/geometry/buffer.cpp +++ b/src/render/geometry/buffer.cpp @@ -157,12 +157,12 @@ Qt3DCore::QBackendNode *BufferFunctor::create(Qt3DCore::QNode *frontend) const return buffer; } -Qt3DCore::QBackendNode *BufferFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *BufferFunctor::get(Qt3DCore::QNodeId id) const { return m_manager->lookupResource(id); } -void BufferFunctor::destroy(const Qt3DCore::QNodeId &id) const +void BufferFunctor::destroy(Qt3DCore::QNodeId id) const { return m_manager->releaseResource(id); } diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h index d760afd63..ebaf60ad2 100644 --- a/src/render/geometry/buffer_p.h +++ b/src/render/geometry/buffer_p.h @@ -99,8 +99,8 @@ class BufferFunctor : public Qt3DCore::QBackendNodeFunctor public: explicit BufferFunctor(BufferManager *manager); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) 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; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: BufferManager *m_manager; }; diff --git a/src/render/geometry/buffermanager.cpp b/src/render/geometry/buffermanager.cpp index d8aa4518e..af9c83198 100644 --- a/src/render/geometry/buffermanager.cpp +++ b/src/render/geometry/buffermanager.cpp @@ -52,7 +52,7 @@ BufferManager::~BufferManager() { } -void BufferManager::addDirtyBuffer(const Qt3DCore::QNodeId &bufferId) +void BufferManager::addDirtyBuffer(Qt3DCore::QNodeId bufferId) { if (!m_dirtyBuffers.contains(bufferId)) m_dirtyBuffers.push_back(bufferId); diff --git a/src/render/geometry/buffermanager_p.h b/src/render/geometry/buffermanager_p.h index 6599fdac2..4851a1ff4 100644 --- a/src/render/geometry/buffermanager_p.h +++ b/src/render/geometry/buffermanager_p.h @@ -72,7 +72,7 @@ public: ~BufferManager(); // Aspect Thread - void addDirtyBuffer(const Qt3DCore::QNodeId &bufferId); + void addDirtyBuffer(Qt3DCore::QNodeId bufferId); QVector<Qt3DCore::QNodeId> dirtyBuffers(); private: diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index 5f9a486e5..072fa798b 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -222,12 +222,12 @@ Qt3DCore::QBackendNode *GeometryRendererFunctor::create(Qt3DCore::QNode *fronten return geometryRenderer; } -Qt3DCore::QBackendNode *GeometryRendererFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *GeometryRendererFunctor::get(Qt3DCore::QNodeId id) const { return m_manager->lookupResource(id); } -void GeometryRendererFunctor::destroy(const Qt3DCore::QNodeId &id) const +void GeometryRendererFunctor::destroy(Qt3DCore::QNodeId id) const { return m_manager->releaseResource(id); } diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h index d560ecefa..c12449903 100644 --- a/src/render/geometry/geometryrenderer_p.h +++ b/src/render/geometry/geometryrenderer_p.h @@ -116,8 +116,8 @@ class GeometryRendererFunctor : public Qt3DCore::QBackendNodeFunctor public: explicit GeometryRendererFunctor(GeometryRendererManager *manager); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) 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; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: GeometryRendererManager *m_manager; }; diff --git a/src/render/geometry/geometryrenderermanager.cpp b/src/render/geometry/geometryrenderermanager.cpp index 1de5908fb..be5cc2487 100644 --- a/src/render/geometry/geometryrenderermanager.cpp +++ b/src/render/geometry/geometryrenderermanager.cpp @@ -52,7 +52,7 @@ GeometryRendererManager::~GeometryRendererManager() { } -void GeometryRendererManager::addDirtyGeometryRenderer(const Qt3DCore::QNodeId &bufferId) +void GeometryRendererManager::addDirtyGeometryRenderer(Qt3DCore::QNodeId bufferId) { if (!m_dirtyGeometryRenderers.contains(bufferId)) m_dirtyGeometryRenderers.push_back(bufferId); diff --git a/src/render/geometry/geometryrenderermanager_p.h b/src/render/geometry/geometryrenderermanager_p.h index b450876fe..76c2c605f 100644 --- a/src/render/geometry/geometryrenderermanager_p.h +++ b/src/render/geometry/geometryrenderermanager_p.h @@ -72,7 +72,7 @@ public: ~GeometryRendererManager(); // Aspect Thread - void addDirtyGeometryRenderer(const Qt3DCore::QNodeId &bufferId); + void addDirtyGeometryRenderer(Qt3DCore::QNodeId bufferId); QVector<Qt3DCore::QNodeId> dirtyGeometryRenderers(); void requestTriangleDataRefreshForGeometryRenderer(const Qt3DCore::QNodeId geometryRenderer); diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp index 71879d7de..4abbebadf 100644 --- a/src/render/io/qsceneloader.cpp +++ b/src/render/io/qsceneloader.cpp @@ -75,7 +75,7 @@ void QSceneLoader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) QList<QNodeId> entities = d->m_scene->entitiesForComponent(d->m_id); if (entities.size() > 1) // TO DO: QComponent shareable property qCWarning(Render::Frontend) << "It is strongly discouraged to share SceneLoader component between entities"; - Q_FOREACH (const QNodeId &id, entities) { + Q_FOREACH (QNodeId id, entities) { QEntity *parentEntity = qobject_cast<QEntity *>(d->m_scene->lookupNode(id)); if (parentEntity != Q_NULLPTR) { QEntity *cloneScene = qobject_cast<QEntity *>(QNode::clone(scene)); diff --git a/src/render/io/scene.cpp b/src/render/io/scene.cpp index 19a196fbe..4c1999862 100644 --- a/src/render/io/scene.cpp +++ b/src/render/io/scene.cpp @@ -116,12 +116,12 @@ Qt3DCore::QBackendNode *RenderSceneFunctor::create(Qt3DCore::QNode *frontend) co return scene; } -Qt3DCore::QBackendNode *RenderSceneFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *RenderSceneFunctor::get(Qt3DCore::QNodeId id) const { return m_sceneManager->lookupResource(id); } -void RenderSceneFunctor::destroy(const Qt3DCore::QNodeId &id) const +void RenderSceneFunctor::destroy(Qt3DCore::QNodeId id) const { m_sceneManager->releaseResource(id); } diff --git a/src/render/io/scene_p.h b/src/render/io/scene_p.h index 98f1013dd..caea7912d 100644 --- a/src/render/io/scene_p.h +++ b/src/render/io/scene_p.h @@ -89,8 +89,8 @@ class RenderSceneFunctor : public Qt3DCore::QBackendNodeFunctor public: explicit RenderSceneFunctor(SceneManager *sceneManager); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) 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; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: SceneManager *m_sceneManager; diff --git a/src/render/io/scenemanager.cpp b/src/render/io/scenemanager.cpp index 988e30eb6..27419e471 100644 --- a/src/render/io/scenemanager.cpp +++ b/src/render/io/scenemanager.cpp @@ -52,7 +52,7 @@ SceneManager::SceneManager() : QResourceManager<Scene, { } -void SceneManager::addSceneData(const QUrl &source, const Qt3DCore::QNodeId &sceneUuid) +void SceneManager::addSceneData(const QUrl &source, Qt3DCore::QNodeId sceneUuid) { LoadSceneJobPtr newJob(new LoadSceneJob(source, sceneUuid)); diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h index b39ea45dc..27f1da66b 100644 --- a/src/render/io/scenemanager_p.h +++ b/src/render/io/scenemanager_p.h @@ -74,7 +74,7 @@ class SceneManager : public Qt3DCore::QResourceManager<Scene, public: SceneManager(); - void addSceneData(const QUrl &source, const Qt3DCore::QNodeId &sceneUuid); + void addSceneData(const QUrl &source, Qt3DCore::QNodeId sceneUuid); QVector<LoadSceneJobPtr> pendingSceneLoaderJobs(); void addLoadedSceneTree(const QUrl &source, Qt3DCore::QEntity *tree); diff --git a/src/render/jobs/loadscenejob.cpp b/src/render/jobs/loadscenejob.cpp index 933408246..610091953 100644 --- a/src/render/jobs/loadscenejob.cpp +++ b/src/render/jobs/loadscenejob.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { -LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3DCore::QNodeId &m_sceneComponent) +LoadSceneJob::LoadSceneJob(const QUrl &source, Qt3DCore::QNodeId m_sceneComponent) : QAspectJob() , m_source(source) , m_sceneComponent(m_sceneComponent) diff --git a/src/render/jobs/loadscenejob_p.h b/src/render/jobs/loadscenejob_p.h index 7483b1bd2..25cd02d83 100644 --- a/src/render/jobs/loadscenejob_p.h +++ b/src/render/jobs/loadscenejob_p.h @@ -69,7 +69,7 @@ class NodeManagers; class LoadSceneJob : public Qt3DCore::QAspectJob { public: - explicit LoadSceneJob(const QUrl &source, const Qt3DCore::QNodeId &sceneComponent); + explicit LoadSceneJob(const QUrl &source, Qt3DCore::QNodeId sceneComponent); void setNodeManagers(NodeManagers *managers) { m_managers = managers; } void setSceneParsers(const QList<QAbstractSceneParser *> sceneParsers) { m_parsers = sceneParsers; } diff --git a/src/render/jobs/loadtexturedatajob.cpp b/src/render/jobs/loadtexturedatajob.cpp index 3b104ebdc..3e7f6efac 100644 --- a/src/render/jobs/loadtexturedatajob.cpp +++ b/src/render/jobs/loadtexturedatajob.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { -LoadTextureDataJob::LoadTextureDataJob(const Qt3DCore::QNodeId &textureId) +LoadTextureDataJob::LoadTextureDataJob(Qt3DCore::QNodeId textureId) : m_textureId(textureId) { } diff --git a/src/render/jobs/loadtexturedatajob_p.h b/src/render/jobs/loadtexturedatajob_p.h index 5b0e387c0..2f2851239 100644 --- a/src/render/jobs/loadtexturedatajob_p.h +++ b/src/render/jobs/loadtexturedatajob_p.h @@ -66,7 +66,7 @@ class NodeManagers; class LoadTextureDataJob : public Qt3DCore::QAspectJob { public: - LoadTextureDataJob(const Qt3DCore::QNodeId &textureId); + LoadTextureDataJob(Qt3DCore::QNodeId textureId); ~LoadTextureDataJob(); inline void setNodeManagers(NodeManagers *manager) { m_manager = manager; } diff --git a/src/render/jobs/pickboundingvolumejob.cpp b/src/render/jobs/pickboundingvolumejob.cpp index 6c3ee5e39..1154d46ec 100644 --- a/src/render/jobs/pickboundingvolumejob.cpp +++ b/src/render/jobs/pickboundingvolumejob.cpp @@ -443,7 +443,7 @@ void PickBoundingVolumeJob::run() m_mouseEvents.clear(); } -void PickBoundingVolumeJob::viewMatrixForCamera(const Qt3DCore::QNodeId &cameraId, +void PickBoundingVolumeJob::viewMatrixForCamera(Qt3DCore::QNodeId cameraId, QMatrix4x4 &viewMatrix, QMatrix4x4 &projectionMatrix) const { @@ -475,7 +475,7 @@ QRect PickBoundingVolumeJob::windowViewport(const QRectF &relativeViewport) cons Qt3DCore::QRay3D PickBoundingVolumeJob::rayForViewportAndCamera(const QPoint &pos, const QRectF &relativeViewport, - const Qt3DCore::QNodeId &cameraId) const + Qt3DCore::QNodeId cameraId) const { QMatrix4x4 viewMatrix; QMatrix4x4 projectionMatrix; diff --git a/src/render/jobs/pickboundingvolumejob_p.h b/src/render/jobs/pickboundingvolumejob_p.h index fc36072ba..695e8e010 100644 --- a/src/render/jobs/pickboundingvolumejob_p.h +++ b/src/render/jobs/pickboundingvolumejob_p.h @@ -95,13 +95,13 @@ private: Entity *m_node; QList<QMouseEvent> m_mouseEvents; - void viewMatrixForCamera(const Qt3DCore::QNodeId &cameraId, + void viewMatrixForCamera(Qt3DCore::QNodeId cameraId, QMatrix4x4 &viewMatrix, QMatrix4x4 &projectionMatrix) const; QRect windowViewport(const QRectF &relativeViewport) const; Qt3DCore::QRay3D rayForViewportAndCamera(const QPoint &pos, const QRectF &relativeViewport, - const Qt3DCore::QNodeId &cameraId) const; + Qt3DCore::QNodeId cameraId) const; void clearPreviouslyHoveredPickers(); HObjectPicker m_currentPicker; QVector<HObjectPicker> m_hoveredPickers; diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp index fd63488cd..315f0bcfd 100644 --- a/src/render/jobs/renderviewjobutils.cpp +++ b/src/render/jobs/renderviewjobutils.cpp @@ -141,7 +141,7 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN rv->setDrawBuffers(targetSelector->drawBuffers()); // Copy attachments - Q_FOREACH (const QNodeId &attachmentId, renderTarget->renderAttachments()) { + Q_FOREACH (QNodeId attachmentId, renderTarget->renderAttachments()) { RenderAttachment *attachment = manager->attachmentManager()->lookupResource(attachmentId); if (attachment) rv->addRenderAttachment(attachment->attachment()); @@ -281,11 +281,11 @@ Technique *findTechniqueForEffect(Renderer *renderer, // Iterate through the filter criteria and for each one search for a criteria on the // technique that satisfies it - Q_FOREACH (const QNodeId &filterAnnotationId, techniqueFilter->filters()) { + Q_FOREACH (QNodeId filterAnnotationId, techniqueFilter->filters()) { foundMatch = false; Annotation *filterAnnotation = manager->criterionManager()->lookupResource(filterAnnotationId); - Q_FOREACH (const QNodeId &techniqueAnnotationId, technique->annotations()) { + Q_FOREACH (QNodeId techniqueAnnotationId, technique->annotations()) { Annotation *techniqueAnnotation = manager->criterionManager()->lookupResource(techniqueAnnotationId); if ((foundMatch = (*techniqueAnnotation == *filterAnnotation))) break; @@ -316,7 +316,7 @@ RenderRenderPassList findRenderPassesForTechnique(NodeManagers *manager, Q_ASSERT(technique); RenderRenderPassList passes; - Q_FOREACH (const QNodeId &passId, technique->renderPasses()) { + Q_FOREACH (QNodeId passId, technique->renderPasses()) { RenderPass *renderPass = manager->renderPassManager()->lookupResource(passId); if (renderPass) { @@ -327,11 +327,11 @@ RenderRenderPassList findRenderPassesForTechnique(NodeManagers *manager, if (!foundMatch && renderPass->annotations().size() >= passFilter->filters().size()) { // Iterate through the filter criteria and look for render passes with criteria that satisfy them - Q_FOREACH (const QNodeId &filterAnnotationId, passFilter->filters()) { + Q_FOREACH (QNodeId filterAnnotationId, passFilter->filters()) { foundMatch = false; Annotation *filterAnnotation = manager->criterionManager()->lookupResource(filterAnnotationId); - Q_FOREACH (const QNodeId &passAnnotationId, renderPass->annotations()) { + Q_FOREACH (QNodeId passAnnotationId, renderPass->annotations()) { Annotation *passAnnotation = manager->criterionManager()->lookupResource(passAnnotationId); if ((foundMatch = (*passAnnotation == *filterAnnotation))) break; diff --git a/src/render/lights/light.cpp b/src/render/lights/light.cpp index 36db98c93..3d8e6615b 100644 --- a/src/render/lights/light.cpp +++ b/src/render/lights/light.cpp @@ -65,12 +65,12 @@ Qt3DCore::QBackendNode *RenderLightFunctor::create(Qt3DCore::QNode *frontend) co return backend; } -Qt3DCore::QBackendNode *RenderLightFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *RenderLightFunctor::get(Qt3DCore::QNodeId id) const { return m_managers->lightManager()->lookupResource(id); } -void RenderLightFunctor::destroy(const Qt3DCore::QNodeId &id) const +void RenderLightFunctor::destroy(Qt3DCore::QNodeId id) const { m_managers->lightManager()->releaseResource(id); } diff --git a/src/render/lights/light_p.h b/src/render/lights/light_p.h index 4ab89a4a7..4012bbddc 100644 --- a/src/render/lights/light_p.h +++ b/src/render/lights/light_p.h @@ -73,8 +73,8 @@ public: explicit RenderLightFunctor(NodeManagers *managers); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL; - Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; - void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL; private: NodeManagers *m_managers; diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp index fdf7df016..262aa6484 100644 --- a/src/render/materialsystem/effect.cpp +++ b/src/render/materialsystem/effect.cpp @@ -106,7 +106,7 @@ void Effect::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } } -void Effect::appendRenderTechnique(const Qt3DCore::QNodeId &technique) +void Effect::appendRenderTechnique(Qt3DCore::QNodeId technique) { if (!m_techniques.contains(technique)) m_techniques.append(technique); diff --git a/src/render/materialsystem/effect_p.h b/src/render/materialsystem/effect_p.h index f7e21adcc..39cf98932 100644 --- a/src/render/materialsystem/effect_p.h +++ b/src/render/materialsystem/effect_p.h @@ -74,7 +74,7 @@ public: void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void appendRenderTechnique(const Qt3DCore::QNodeId &t); + void appendRenderTechnique(Qt3DCore::QNodeId t); QList<Qt3DCore::QNodeId> techniques() const; QList<Qt3DCore::QNodeId> parameters() const; diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp index 91b6789a5..85e71995b 100644 --- a/src/render/materialsystem/renderpass.cpp +++ b/src/render/materialsystem/renderpass.cpp @@ -151,13 +151,13 @@ QList<Qt3DCore::QNodeId> RenderPass::parameters() const return m_parameterPack.parameters(); } -void RenderPass::appendAnnotation(const Qt3DCore::QNodeId &annotationId) +void RenderPass::appendAnnotation(Qt3DCore::QNodeId annotationId) { if (!m_annotationList.contains(annotationId)) m_annotationList.append(annotationId); } -void RenderPass::removeAnnotation(const Qt3DCore::QNodeId &annotationId) +void RenderPass::removeAnnotation(Qt3DCore::QNodeId annotationId) { m_annotationList.removeOne(annotationId); } @@ -168,7 +168,7 @@ void RenderPass::appendBinding(const ParameterMapping &binding) m_bindings[binding.id()] = binding; } -void RenderPass::removeBinding(const Qt3DCore::QNodeId &bindingId) +void RenderPass::removeBinding(Qt3DCore::QNodeId bindingId) { m_bindings.remove(bindingId); } diff --git a/src/render/materialsystem/renderpass_p.h b/src/render/materialsystem/renderpass_p.h index be038e97d..0adf68c17 100644 --- a/src/render/materialsystem/renderpass_p.h +++ b/src/render/materialsystem/renderpass_p.h @@ -92,11 +92,11 @@ public: QList<Qt3DCore::QNodeId> parameters() const; private: - void appendAnnotation(const Qt3DCore::QNodeId &criterionId); - void removeAnnotation(const Qt3DCore::QNodeId &criterionId); + void appendAnnotation(Qt3DCore::QNodeId criterionId); + void removeAnnotation(Qt3DCore::QNodeId criterionId); void appendBinding(const ParameterMapping &binding); - void removeBinding(const Qt3DCore::QNodeId &bindingId); + void removeBinding(Qt3DCore::QNodeId bindingId); Qt3DCore::QNodeId m_shaderUuid; QHash<Qt3DCore::QNodeId, ParameterMapping> m_bindings; diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp index 21232b3bc..b4a226221 100644 --- a/src/render/materialsystem/shaderdata.cpp +++ b/src/render/materialsystem/shaderdata.cpp @@ -79,7 +79,7 @@ void ShaderData::setManagers(NodeManagers *managers) m_managers = managers; } -ShaderData *ShaderData::lookupResource(NodeManagers *managers, const QNodeId &id) +ShaderData *ShaderData::lookupResource(NodeManagers *managers, QNodeId id) { ShaderData *shaderData = managers->shaderDataManager()->lookupResource(id); if (!shaderData) @@ -88,7 +88,7 @@ ShaderData *ShaderData::lookupResource(NodeManagers *managers, const QNodeId &id return shaderData; } -ShaderData *ShaderData::lookupResource(const QNodeId &id) +ShaderData *ShaderData::lookupResource(QNodeId id) { return ShaderData::lookupResource(m_managers, id); } @@ -127,7 +127,7 @@ void ShaderData::clearUpdatedProperties() void ShaderData::cleanup(NodeManagers *managers) { - Q_FOREACH (const Qt3DCore::QNodeId &id, m_updatedShaderData) { + Q_FOREACH (Qt3DCore::QNodeId id, m_updatedShaderData) { ShaderData *shaderData = ShaderData::lookupResource(managers, id); if (shaderData) shaderData->clearUpdatedProperties(); @@ -338,12 +338,12 @@ Qt3DCore::QBackendNode *RenderShaderDataFunctor::create(Qt3DCore::QNode *fronten return backend; } -Qt3DCore::QBackendNode *RenderShaderDataFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *RenderShaderDataFunctor::get(Qt3DCore::QNodeId id) const { return m_managers->shaderDataManager()->lookupResource(id); } -void RenderShaderDataFunctor::destroy(const Qt3DCore::QNodeId &id) const +void RenderShaderDataFunctor::destroy(Qt3DCore::QNodeId id) const { m_managers->shaderDataManager()->releaseResource(id); } diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h index 60b082c9f..724bf6c32 100644 --- a/src/render/materialsystem/shaderdata_p.h +++ b/src/render/materialsystem/shaderdata_p.h @@ -111,8 +111,8 @@ protected: void readPeerProperties(QShaderData *peer); void clearUpdatedProperties(); - static ShaderData *lookupResource(NodeManagers *managers, const Qt3DCore::QNodeId &id); - ShaderData *lookupResource(const Qt3DCore::QNodeId &id); + static ShaderData *lookupResource(NodeManagers *managers, Qt3DCore::QNodeId id); + ShaderData *lookupResource(Qt3DCore::QNodeId id); friend class RenderShaderDataFunctor; }; @@ -123,8 +123,8 @@ public: explicit RenderShaderDataFunctor(NodeManagers *managers); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL; - Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; - void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL; private: NodeManagers *m_managers; diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp index 6f6b3b759..a464e68d6 100644 --- a/src/render/materialsystem/technique.cpp +++ b/src/render/materialsystem/technique.cpp @@ -156,13 +156,13 @@ QList<Qt3DCore::QNodeId> Technique::parameters() const return m_parameterPack.parameters(); } -void Technique::appendRenderPass(const Qt3DCore::QNodeId &renderPassId) +void Technique::appendRenderPass(Qt3DCore::QNodeId renderPassId) { if (!m_renderPasses.contains(renderPassId)) m_renderPasses.append(renderPassId); } -void Technique::removeRenderPass(const Qt3DCore::QNodeId &renderPassId) +void Technique::removeRenderPass(Qt3DCore::QNodeId renderPassId) { m_renderPasses.removeOne(renderPassId); } @@ -182,13 +182,13 @@ QGraphicsApiFilter *Technique::graphicsApiFilter() const return m_graphicsApiFilter; } -void Technique::appendAnnotation(const Qt3DCore::QNodeId &criterionId) +void Technique::appendAnnotation(Qt3DCore::QNodeId criterionId) { if (!m_annotationList.contains(criterionId)) m_annotationList.append(criterionId); } -void Technique::removeAnnotation(const Qt3DCore::QNodeId &criterionId) +void Technique::removeAnnotation(Qt3DCore::QNodeId criterionId) { m_annotationList.removeOne(criterionId); } diff --git a/src/render/materialsystem/technique_p.h b/src/render/materialsystem/technique_p.h index 7768895a0..3cfcdd3f7 100644 --- a/src/render/materialsystem/technique_p.h +++ b/src/render/materialsystem/technique_p.h @@ -84,11 +84,11 @@ public: void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; QList<Qt3DCore::QNodeId> parameters() const; - void appendRenderPass(const Qt3DCore::QNodeId &renderPassId); - void removeRenderPass(const Qt3DCore::QNodeId &renderPassId); + void appendRenderPass(Qt3DCore::QNodeId renderPassId); + void removeRenderPass(Qt3DCore::QNodeId renderPassId); - void appendAnnotation(const Qt3DCore::QNodeId &criterionId); - void removeAnnotation(const Qt3DCore::QNodeId &criterionId); + void appendAnnotation(Qt3DCore::QNodeId criterionId); + void removeAnnotation(Qt3DCore::QNodeId criterionId); QList<Qt3DCore::QNodeId> annotations() const; QList<Qt3DCore::QNodeId> renderPasses() const; diff --git a/src/render/raycasting/qabstractcollisionqueryservice.cpp b/src/render/raycasting/qabstractcollisionqueryservice.cpp index 2f48d6540..4c59b6aab 100644 --- a/src/render/raycasting/qabstractcollisionqueryservice.cpp +++ b/src/render/raycasting/qabstractcollisionqueryservice.cpp @@ -60,7 +60,7 @@ void QAbstractCollisionQueryService::setResultHandle(QCollisionQueryResult &resu result.d_func()->setHandle(handle); } -void QAbstractCollisionQueryService::addEntityHit(QCollisionQueryResult &result, const Qt3DCore::QNodeId &entity, const QVector3D& intersection, float distance) +void QAbstractCollisionQueryService::addEntityHit(QCollisionQueryResult &result, Qt3DCore::QNodeId entity, const QVector3D& intersection, float distance) { result.d_func()->addEntityHit(entity, intersection, distance); } diff --git a/src/render/raycasting/qabstractcollisionqueryservice_p.h b/src/render/raycasting/qabstractcollisionqueryservice_p.h index e0b278299..9121ab019 100644 --- a/src/render/raycasting/qabstractcollisionqueryservice_p.h +++ b/src/render/raycasting/qabstractcollisionqueryservice_p.h @@ -98,7 +98,7 @@ protected: QAbstractCollisionQueryService(QAbstractCollisionQueryServicePrivate &dd); void setResultHandle(QCollisionQueryResult &result, const QQueryHandle &handle); - void addEntityHit(QCollisionQueryResult &result, const Qt3DCore::QNodeId &entity, const QVector3D &intersection, float distance); + void addEntityHit(QCollisionQueryResult &result, Qt3DCore::QNodeId entity, const QVector3D &intersection, float distance); private: Q_DECLARE_PRIVATE(QAbstractCollisionQueryService) diff --git a/src/render/raycasting/qcollisionqueryresult.cpp b/src/render/raycasting/qcollisionqueryresult.cpp index c264d493d..e1416dc29 100644 --- a/src/render/raycasting/qcollisionqueryresult.cpp +++ b/src/render/raycasting/qcollisionqueryresult.cpp @@ -55,7 +55,7 @@ QCollisionQueryResultPrivate::QCollisionQueryResultPrivate(const QCollisionQuery { } -void QCollisionQueryResultPrivate::addEntityHit(const Qt3DCore::QNodeId &entity, const QVector3D& intersection, float distance) +void QCollisionQueryResultPrivate::addEntityHit(Qt3DCore::QNodeId entity, const QVector3D& intersection, float distance) { m_hits.append(QCollisionQueryResult::Hit(entity, intersection, distance)); } diff --git a/src/render/raycasting/qcollisionqueryresult_p.h b/src/render/raycasting/qcollisionqueryresult_p.h index 0c455b6b8..ab71e7920 100644 --- a/src/render/raycasting/qcollisionqueryresult_p.h +++ b/src/render/raycasting/qcollisionqueryresult_p.h @@ -69,7 +69,7 @@ class QT3DRENDERSHARED_EXPORT QCollisionQueryResult public: struct Hit { Hit() : m_distance(-1.f) { } - Hit(const Qt3DCore::QNodeId &entity, const QVector3D &intersection, float distance) : m_entityId(entity), m_intersection(intersection), m_distance(distance) { } + Hit(Qt3DCore::QNodeId entity, const QVector3D &intersection, float distance) : m_entityId(entity), m_intersection(intersection), m_distance(distance) { } Qt3DCore::QNodeId m_entityId; QVector3D m_intersection; float m_distance; @@ -120,7 +120,7 @@ public: explicit QCollisionQueryResultPrivate(const QCollisionQueryResultPrivate ©); void setHandle(const QQueryHandle &handle); - void addEntityHit(const Qt3DCore::QNodeId &entity, const QVector3D& intersection, float distance); + void addEntityHit(Qt3DCore::QNodeId entity, const QVector3D& intersection, float distance); QQueryHandle m_handle; QVector<QCollisionQueryResult::Hit> m_hits; diff --git a/src/render/renderstates/renderstatecollection.cpp b/src/render/renderstates/renderstatecollection.cpp index f7228fd1e..d7659285b 100644 --- a/src/render/renderstates/renderstatecollection.cpp +++ b/src/render/renderstates/renderstatecollection.cpp @@ -74,7 +74,7 @@ bool RenderStateCollection::hasRenderStates() const return !m_renderStateIds.empty(); } -void RenderStateCollection::appendRenderState(const Qt3DCore::QNodeId &renderStateId) +void RenderStateCollection::appendRenderState(Qt3DCore::QNodeId renderStateId) { if (!m_renderStateIds.contains(renderStateId)) { m_renderStateIds.append(renderStateId); @@ -82,7 +82,7 @@ void RenderStateCollection::appendRenderState(const Qt3DCore::QNodeId &renderSta } } -void RenderStateCollection::removeRenderState(const Qt3DCore::QNodeId &renderStateId) +void RenderStateCollection::removeRenderState(Qt3DCore::QNodeId renderStateId) { if (m_renderStateIds.removeAll(renderStateId) > 0) { m_dirty = true; diff --git a/src/render/renderstates/renderstatecollection_p.h b/src/render/renderstates/renderstatecollection_p.h index 4e6c7502f..060f0011f 100644 --- a/src/render/renderstates/renderstatecollection_p.h +++ b/src/render/renderstates/renderstatecollection_p.h @@ -70,8 +70,8 @@ public: bool hasRenderStates() const; protected: - void appendRenderState(const Qt3DCore::QNodeId &renderStateId); - void removeRenderState(const Qt3DCore::QNodeId &renderStateId); + void appendRenderState(Qt3DCore::QNodeId renderStateId); + void removeRenderState(Qt3DCore::QNodeId renderStateId); private: QVector<Qt3DCore::QNodeId> m_renderStateIds; diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp index 2006c4e6c..cb75b102e 100644 --- a/src/render/texture/texture.cpp +++ b/src/render/texture/texture.cpp @@ -692,12 +692,12 @@ Qt3DCore::QBackendNode *TextureFunctor::create(Qt3DCore::QNode *frontend) const return backend; } -Qt3DCore::QBackendNode *TextureFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *TextureFunctor::get(Qt3DCore::QNodeId id) const { return m_textureManager->lookupResource(id); } -void TextureFunctor::destroy(const Qt3DCore::QNodeId &id) const +void TextureFunctor::destroy(Qt3DCore::QNodeId id) const { m_textureManager->releaseResource(id); } diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h index d9ea1ecfb..38ce82d0b 100644 --- a/src/render/texture/texture_p.h +++ b/src/render/texture/texture_p.h @@ -169,8 +169,8 @@ public: TextureDataManager *textureDataManager); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL; - Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; - void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL; private: TextureManager *m_textureManager; diff --git a/src/render/texture/texturedatamanager.cpp b/src/render/texture/texturedatamanager.cpp index 76f939fee..4f4e6e877 100644 --- a/src/render/texture/texturedatamanager.cpp +++ b/src/render/texture/texturedatamanager.cpp @@ -51,7 +51,7 @@ TextureDataManager::TextureDataManager() {} // Called from AspectThread sync -void TextureDataManager::addToPendingTextures(const Qt3DCore::QNodeId &textureId) +void TextureDataManager::addToPendingTextures(Qt3DCore::QNodeId textureId) { // This simple check ensures that we won't be having n jobs // for one mesh, in case n Materials are referencing the said diff --git a/src/render/texture/texturedatamanager_p.h b/src/render/texture/texturedatamanager_p.h index 2cd5022d5..8e151d50d 100644 --- a/src/render/texture/texturedatamanager_p.h +++ b/src/render/texture/texturedatamanager_p.h @@ -76,7 +76,7 @@ class TextureDataManager : public Qt3DCore::QResourceManager<QTexImageData, { public: TextureDataManager(); - void addToPendingTextures(const Qt3DCore::QNodeId &textureId); + void addToPendingTextures(Qt3DCore::QNodeId textureId); QVector<Qt3DCore::QNodeId> texturesPending(); diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp index c607025d0..8a500e9c5 100644 --- a/src/render/texture/textureimage.cpp +++ b/src/render/texture/textureimage.cpp @@ -177,12 +177,12 @@ Qt3DCore::QBackendNode *TextureImageFunctor::create(Qt3DCore::QNode *frontend) c return backend; } -Qt3DCore::QBackendNode *TextureImageFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *TextureImageFunctor::get(Qt3DCore::QNodeId id) const { return m_textureImageManager->lookupResource(id); } -void TextureImageFunctor::destroy(const Qt3DCore::QNodeId &id) const +void TextureImageFunctor::destroy(Qt3DCore::QNodeId id) const { m_textureImageManager->releaseResource(id); } diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h index b4ab2f432..01b0daffa 100644 --- a/src/render/texture/textureimage_p.h +++ b/src/render/texture/textureimage_p.h @@ -122,8 +122,8 @@ public: TextureDataManager *textureDataManager); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL; - Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; - void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL; private: TextureManager *m_textureManager; diff --git a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp index d88a24eda..944b148fc 100644 --- a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp +++ b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp @@ -51,7 +51,7 @@ public: ~tst_FrameGraphNode() {} - void setIdInternal(Qt3DRender::Render::FrameGraphNode *node, const Qt3DCore::QNodeId &id) + void setIdInternal(Qt3DRender::Render::FrameGraphNode *node, Qt3DCore::QNodeId id) { Qt3DCore::QBackendNodePrivate::get(node)->m_peerUuid = id; } |