summaryrefslogtreecommitdiffstats
path: root/src/core/qscheduler.cpp
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2014-10-17 11:47:49 +0200
committerSean Harmer <sean.harmer@kdab.com>2014-10-18 13:50:57 +0200
commitb8c40b5507e328160f62a3527888ef0916028945 (patch)
tree9344f757413e50fe1c1d42e328bb9733620feb06 /src/core/qscheduler.cpp
parentadaa9c6e1e069d2f521d7b255cd5fd007a6857ad (diff)
QJob: refactored
*dpointer *renamed to QAspectJob *return QVector of dependencies instead of const QVector & Change-Id: I8324952102cba8407e63b78353ffbc23642e63a5 Task-number: QTBUG-41526 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/qscheduler.cpp')
-rw-r--r--src/core/qscheduler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/qscheduler.cpp b/src/core/qscheduler.cpp
index 005e5d271..6c24aac4b 100644
--- a/src/core/qscheduler.cpp
+++ b/src/core/qscheduler.cpp
@@ -70,15 +70,15 @@ void QScheduler::update(qint64 time)
// Get tasks for this frame from each aspect
const QList<QAbstractAspect *> &aspects = m_aspectManager->aspects();
- QHash<QAbstractAspect::AspectType, QVector<QJobPtr> > jobs;
+ QHash<QAbstractAspect::AspectType, QVector<QAspectJobPtr> > jobs;
Q_FOREACH (QAbstractAspect *aspect, aspects) {
- QVector<QJobPtr> aspectJobs = aspect->jobsToExecute();
+ QVector<QAspectJobPtr> aspectJobs = aspect->jobsToExecute();
jobs.insert(aspect->aspectType(), aspectJobs);
}
// TODO: Set up dependencies between jobs as needed
// For now just queue them up as they are with render tasks first
- QVector<QJobPtr> jobQueue;
+ QVector<QAspectJobPtr> jobQueue;
for (int i = QAbstractAspect::AspectRenderer; i <= QAbstractAspect::AspectOther; ++i) {
QAbstractAspect::AspectType aspectType = static_cast<QAbstractAspect::AspectType>(i);
if (jobs.contains(aspectType))