summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qfutureinterface.h
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-06-22 11:06:12 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-06-25 22:30:59 +0200
commit0475460102411979ab51c365cb2bec2c05b69cb4 (patch)
tree73b7dbe85249da2bd339cd19b0c584894d3901c7 /src/corelib/thread/qfutureinterface.h
parente114e580e751b5deb19ab489a8b11f830ff6356f (diff)
Use QList instead of QVector in corelib
Applied to headers only. Source file to be changed separately. Omitted statemachine for now to avoid conflicts. Omitted qmetatype.h for now - to be handled later. Task-number: QTBUG-84469 Change-Id: I317376037a62467c313467d92955ad0b7473aa97 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/thread/qfutureinterface.h')
-rw-r--r--src/corelib/thread/qfutureinterface.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h
index 75c4cae0ca..2e15cbb013 100644
--- a/src/corelib/thread/qfutureinterface.h
+++ b/src/corelib/thread/qfutureinterface.h
@@ -237,7 +237,7 @@ public:
inline void reportAndMoveResult(T &&result, int index = -1);
inline void reportResult(T &&result, int index = -1);
inline void reportResult(const T &result, int index = -1);
- inline void reportResults(const QVector<T> &results, int beginIndex = -1, int count = -1);
+ inline void reportResults(const QList<T> &results, int beginIndex = -1, int count = -1);
inline void reportFinished(const T *result);
void reportFinished()
{
@@ -300,8 +300,8 @@ inline void QFutureInterface<T>::reportResult(const T &result, int index)
reportResult(&result, index);
}
-template <typename T>
-inline void QFutureInterface<T>::reportResults(const QVector<T> &_results, int beginIndex, int count)
+template<typename T>
+inline void QFutureInterface<T>::reportResults(const QList<T> &_results, int beginIndex, int count)
{
std::lock_guard<QMutex> locker{mutex()};
if (this->queryState(Canceled) || this->queryState(Finished)) {
@@ -418,7 +418,7 @@ public:
inline QFuture<void> future(); // implemented in qfuture.h
void reportResult(const void *, int) { }
- void reportResults(const QVector<void> &, int) { }
+ void reportResults(const QList<void> &, int) { }
void reportFinished(const void * = nullptr)
{
QFutureInterfaceBase::reportFinished();