summaryrefslogtreecommitdiffstats
path: root/src/core/aspects/qabstractaspect.cpp
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2020-06-29 11:57:36 +0200
committerPaul Lemire <paul.lemire@kdab.com>2020-07-02 13:03:44 +0200
commitb70f7af20550f55e9546ff5a2192f53d6ccb62cb (patch)
treec16156ad6b57a24e72dbcf491e680f95e73bce14 /src/core/aspects/qabstractaspect.cpp
parentabb02d0aae5a114b77ad2edc07568fb0bcf4c6e5 (diff)
QAspectJob: switch to using std::vector
Change-Id: I1314bd4d37ad17442ebd6287f571e41bc5d25490 Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/core/aspects/qabstractaspect.cpp')
-rw-r--r--src/core/aspects/qabstractaspect.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index 5eb5b5b1e..6822c938f 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -189,10 +189,10 @@ QVariant QAbstractAspect::executeCommand(const QStringList &args)
return QVariant();
}
-QVector<QAspectJobPtr> QAbstractAspect::jobsToExecute(qint64 time)
+std::vector<QAspectJobPtr> QAbstractAspect::jobsToExecute(qint64 time)
{
Q_UNUSED(time);
- return QVector<QAspectJobPtr>();
+ return {};
}
QBackendNodeMapperPtr QAbstractAspectPrivate::mapperForNode(const QMetaObject *metaObj) const
@@ -332,14 +332,16 @@ QAbstractAspectJobManager *QAbstractAspectPrivate::jobManager() const
return m_jobManager;
}
-QVector<QAspectJobPtr> QAbstractAspectPrivate::jobsToExecute(qint64 time)
+std::vector<QAspectJobPtr> QAbstractAspectPrivate::jobsToExecute(qint64 time)
{
Q_Q(QAbstractAspect);
auto res = q->jobsToExecute(time);
{
QMutexLocker lock(&m_singleShotMutex);
- res << m_singleShotJobs;
+ res.insert(res.end(),
+ std::make_move_iterator(m_singleShotJobs.begin()),
+ std::make_move_iterator(m_singleShotJobs.end()));
m_singleShotJobs.clear();
}