summaryrefslogtreecommitdiffstats
path: root/src/core/qchangearbiter_p.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2014-12-30 16:45:09 +0000
committerSean Harmer <sean.harmer@kdab.com>2014-12-31 11:24:11 +0100
commit4a71f2fa455c4b79f44b82e17d76f20411cbac4c (patch)
treed14c88674aaca4f589ecdaaa02251482fe1574bd /src/core/qchangearbiter_p.h
parent7ddfde36b5e33ee633e1c430a507866a9d6c6545 (diff)
Rename ChangeQueue -> QChangeQueue
Change-Id: I2f53dfb314e3e4b12bf763dc4b7c43608374bc1c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core/qchangearbiter_p.h')
-rw-r--r--src/core/qchangearbiter_p.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h
index 5b8d57662..33d81d8af 100644
--- a/src/core/qchangearbiter_p.h
+++ b/src/core/qchangearbiter_p.h
@@ -102,17 +102,17 @@ public:
static void destroyThreadLocalChangeQueue(void *changeArbiter);
protected:
- typedef std::vector<QSceneChangePtr> ChangeQueue;
+ typedef std::vector<QSceneChangePtr> QChangeQueue;
typedef QPair<ChangeFlags, QObserverInterface *> QObserverPair;
typedef QVector<QObserverPair> QObserverList;
- void distributeQueueChanges(ChangeQueue *queue);
+ void distributeQueueChanges(QChangeQueue *queue);
- QThreadStorage<ChangeQueue *> *tlsChangeQueue();
- void appendChangeQueue(ChangeQueue *queue);
- void removeChangeQueue(ChangeQueue *queue);
- void appendLockingChangeQueue(ChangeQueue *queue);
- void removeLockingChangeQueue(ChangeQueue *queue);
+ QThreadStorage<QChangeQueue *> *tlsChangeQueue();
+ void appendChangeQueue(QChangeQueue *queue);
+ void removeChangeQueue(QChangeQueue *queue);
+ void appendLockingChangeQueue(QChangeQueue *queue);
+ void removeLockingChangeQueue(QChangeQueue *queue);
private:
QMutex m_mutex;
@@ -131,12 +131,12 @@ private:
// Each thread has a TLS ChangeQueue so we never need to lock whilst
// receiving a QSceneChange.
- QThreadStorage<ChangeQueue *> m_tlsChangeQueue;
+ QThreadStorage<QChangeQueue *> m_tlsChangeQueue;
// We store a list of the ChangeQueue's from each thread. This will only
// be accessed from the aspect thread during the syncChanges() phase.
- QList<ChangeQueue *> m_changeQueues;
- QList<ChangeQueue *> m_lockingChangeQueues;
+ QList<QChangeQueue *> m_changeQueues;
+ QList<QChangeQueue *> m_lockingChangeQueues;
QObserverInterface *m_postman;
QSceneInterface *m_scene;
};