diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2014-06-08 12:01:46 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-08 15:00:00 +0200 |
commit | 364e9616b70ae3464fca64f541cdc7e666396e3b (patch) | |
tree | 8cf505d0ee7b6d728c5d87b0fb5041342ff1e2fb /src/core/qchangearbiter.cpp | |
parent | 6d608c1050f225408532c105e3da5757f76ac066 (diff) |
Rename QChangeArbiter::m_observations -> m_aspectObservations
Change-Id: I71ec74ea2cfa93feb294cf765efcc63aa7b037bc
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core/qchangearbiter.cpp')
-rw-r--r-- | src/core/qchangearbiter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp index 984d4ae21..5bb349a21 100644 --- a/src/core/qchangearbiter.cpp +++ b/src/core/qchangearbiter.cpp @@ -86,8 +86,8 @@ void QChangeArbiter::distributeQueueChanges(ChangeQueue *changeQueue) switch (change->m_subjectType) { case QSceneChange::ObservableType: { QObservableInterface *subject = change->m_subject.m_observable; - if (m_observations.contains(subject)) { - QObserverList &observers = m_observations[subject]; + if (m_aspectObservations.contains(subject)) { + QObserverList &observers = m_aspectObservations[subject]; Q_FOREACH (const QObserverPair &observer, observers) { if ((change->m_type & observer.first)) observer.second->sceneChangeEvent(change); @@ -136,7 +136,7 @@ void QChangeArbiter::registerObserver(QObserverInterface *observer, // Store info about which observers are watching which observables. // Protect access as this could be called from any thread QMutexLocker locker(&m_mutex); - QObserverList &observers = m_observations[subject]; + QObserverList &observers = m_aspectObservations[subject]; observers.append(QObserverPair(changeFlags, observer)); // Register ourselves with the observable as the intermediary @@ -165,8 +165,8 @@ void QChangeArbiter::unregisterObserver(QObserverInterface *observer, QObservableInterface *subject) { QMutexLocker locker(&m_mutex); - if (m_observations.contains(subject)) { - QObserverList &observers = m_observations[subject]; + if (m_aspectObservations.contains(subject)) { + QObserverList &observers = m_aspectObservations[subject]; for (int i = observers.count() - 1; i >= 0; i--) { if (observers[i].second == observer) observers.removeAt(i); |