diff options
| author | Paul Lemire <paul.lemire.ecortex.kdab.com> | 2014-10-29 09:32:18 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-11-02 12:43:28 +0100 |
| commit | 8bd7ea0ec2f67679d046d35af5785d99b31620a3 (patch) | |
| tree | ce8b1290edc55a27f867cc6a044d69596e113b1f /src/core/qchangearbiter_p.h | |
| parent | 22aae0f06bf90ece7435e9dfa4059f1615046eff (diff) | |
QNodeUuid: typedef for QUuid
Should allow to easily replace QUuid by a custom quint64 based struct
Change-Id: Ib4ba57efd2e070317aa3417b37ce091f2b4779a0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/qchangearbiter_p.h')
| -rw-r--r-- | src/core/qchangearbiter_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h index a3d93ca27..2a1ae30f1 100644 --- a/src/core/qchangearbiter_p.h +++ b/src/core/qchangearbiter_p.h @@ -50,7 +50,7 @@ #include <QPair> #include <QThreadStorage> #include <QMutex> - +#include <Qt3DCore/qnodeuuid.h> #include <Qt3DCore/qscenechange.h> #include <Qt3DCore/private/qobserverinterface_p.h> @@ -83,10 +83,10 @@ public: void syncChanges(); void registerObserver(QObserverInterface *observer, - const QUuid &nodeId, + const QNodeUuid &nodeId, ChangeFlags changeFlags = AllChanges); void unregisterObserver(QObserverInterface *observer, - const QUuid &nodeId); + const QNodeUuid &nodeId); void registerSceneObserver(QSceneObserverInterface *observer); void unregisterSceneObserver(QSceneObserverInterface *observer); @@ -129,7 +129,7 @@ private: // // We keep these distinct because we do not manage the main thread which means // the mechanisms for working with objects there is different. - QHash<QUuid, QObserverList> m_nodeObservations; + QHash<QNodeUuid, QObserverList> m_nodeObservations; QList<QSceneObserverInterface *> m_sceneObservers; // Each thread has a TLS ChangeQueue so we never need to lock whilst |