diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2014-11-16 17:30:51 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-11-19 08:59:11 +0100 |
| commit | 0eb4792685539fb0f8417a8004101ec41acac3df (patch) | |
| tree | 9caa961d61633d0b65bb53aac605c612124c0dac /src/core/qchangearbiter.cpp | |
| parent | 12b7d45bc60bd413e74c5ec7cdf0f1e097088875 (diff) | |
Rename QNodeUuid to QNodeId
Change-Id: I0450a4d4708af1ccd3d4c8f2ddc5c9a5c9deca27
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core/qchangearbiter.cpp')
| -rw-r--r-- | src/core/qchangearbiter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp index e8f0a1f04..355aa1a1f 100644 --- a/src/core/qchangearbiter.cpp +++ b/src/core/qchangearbiter.cpp @@ -131,7 +131,7 @@ void QChangeArbiter::distributeQueueChanges(ChangeQueue *changeQueue) case QSceneChange::Observable: { QObservableInterface *subject = change->subject().m_observable; - QNodeUuid nodeId = m_scene->nodeIdFromObservable(subject); + QNodeId nodeId = m_scene->nodeIdFromObservable(subject); if (m_nodeObservations.contains(nodeId)) { QObserverList &observers = m_nodeObservations[nodeId]; Q_FOREACH (const QObserverPair&observer, observers) { @@ -216,7 +216,7 @@ QSceneInterface *QChangeArbiter::scene() const } void QChangeArbiter::registerObserver(QObserverInterface *observer, - const QNodeUuid &nodeId, + const QNodeId &nodeId, ChangeFlags changeFlags) { QMutexLocker locker(&m_mutex); @@ -231,7 +231,7 @@ void QChangeArbiter::registerSceneObserver(QSceneObserverInterface *observer) m_sceneObservers << observer; } -void QChangeArbiter::unregisterObserver(QObserverInterface *observer, const QNodeUuid &nodeId) +void QChangeArbiter::unregisterObserver(QObserverInterface *observer, const QNodeId &nodeId) { QMutexLocker locker(&m_mutex); if (m_nodeObservations.contains(nodeId)) { |