summaryrefslogtreecommitdiffstats
path: root/src/core/qchangearbiter.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2014-06-08 13:40:28 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-08 15:00:31 +0200
commitaef81b5f38efdb5f26f91b9edfd3c9381818b2af (patch)
tree7e589ccd26515a97e45812fae64a97234bd7e7fd /src/core/qchangearbiter.cpp
parent3265daf76eea2c35a9fca66d33338f2b955b136d (diff)
Rename QChangeArbiter::m_componentObservations -> m_nodeObservations
Change-Id: I9ad961d7c354514d2b59b3b1650302980863f9bc Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core/qchangearbiter.cpp')
-rw-r--r--src/core/qchangearbiter.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp
index 1eb535818..0970ad1db 100644
--- a/src/core/qchangearbiter.cpp
+++ b/src/core/qchangearbiter.cpp
@@ -98,8 +98,8 @@ void QChangeArbiter::distributeQueueChanges(ChangeQueue *changeQueue)
case QSceneChange::NodeType: {
Node *subject = change->m_subject.m_node;
- if (m_componentObservations.contains(subject)) {
- QObserverList &observers = m_componentObservations[subject];
+ if (m_nodeObservations.contains(subject)) {
+ QObserverList &observers = m_nodeObservations[subject];
Q_FOREACH (const QObserverPair&observer, observers) {
if ((change->m_type & observer.first))
observer.second->sceneChangeEvent(change);
@@ -139,7 +139,7 @@ void QChangeArbiter::registerObserver(QObserverInterface *observer,
ChangeFlags changeFlags)
{
QMutexLocker locker(&m_mutex);
- QObserverList &observerList = m_componentObservations[observable];
+ QObserverList &observerList = m_nodeObservations[observable];
registerObserverHelper(observerList, observer, observable, changeFlags);
}
@@ -176,8 +176,8 @@ void QChangeArbiter::unregisterObserver(QObserverInterface *observer,
void QChangeArbiter::unregisterObserver(QObserverInterface *observer, Node *subject)
{
QMutexLocker locker(&m_mutex);
- if (m_componentObservations.contains(subject)) {
- QObserverList &observers = m_componentObservations[subject];
+ if (m_nodeObservations.contains(subject)) {
+ QObserverList &observers = m_nodeObservations[subject];
for (int i = observers.count() - 1; i >= 0; i--) {
if (observers[i].second == observer)
observers.removeAt(i);