diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-08-27 17:23:33 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-28 23:50:10 +0200 |
| commit | a65a98399bf45924eb4d9394cf1e905b489639cc (patch) | |
| tree | dab81fdde3c50e9b160936a9527b7172a85e4ad3 /src/concurrent/qfutureinterface.h | |
| parent | 3a29976eac1ff95e663d49886dc82611a175fed9 (diff) | |
Move QtConcurrent::ResultStore as QtPrivate::ResultStore to QtCore
No compatibility header needed. While this wasn't marked as private API,
it wasn't documented, either.
This is a prerequisite for moving QFuture to QtCore.
Change-Id: I8e986e6e2a22fbe5cf08d0600ec39ae9ae993e20
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/concurrent/qfutureinterface.h')
| -rw-r--r-- | src/concurrent/qfutureinterface.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/concurrent/qfutureinterface.h b/src/concurrent/qfutureinterface.h index 615b9fbe6a..e9d8d37b67 100644 --- a/src/concurrent/qfutureinterface.h +++ b/src/concurrent/qfutureinterface.h @@ -50,7 +50,7 @@ #include <QtCore/qmutex.h> #include <QtCore/qexception.h> -#include <QtConcurrent/qtconcurrentresultstore.h> +#include <QtCore/qresultstore.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -123,8 +123,8 @@ public: QMutex *mutex() const; QtPrivate::ExceptionStore &exceptionStore(); - QtConcurrent::ResultStoreBase &resultStoreBase(); - const QtConcurrent::ResultStoreBase &resultStoreBase() const; + QtPrivate::ResultStoreBase &resultStoreBase(); + const QtPrivate::ResultStoreBase &resultStoreBase() const; inline bool operator==(const QFutureInterfaceBase &other) const { return d == other.d; } inline bool operator!=(const QFutureInterfaceBase &other) const { return d != other.d; } @@ -182,10 +182,10 @@ public: inline const T *resultPointer(int index) const; inline QList<T> results(); private: - QtConcurrent::ResultStore<T> &resultStore() - { return static_cast<QtConcurrent::ResultStore<T> &>(resultStoreBase()); } - const QtConcurrent::ResultStore<T> &resultStore() const - { return static_cast<const QtConcurrent::ResultStore<T> &>(resultStoreBase()); } + QtPrivate::ResultStore<T> &resultStore() + { return static_cast<QtPrivate::ResultStore<T> &>(resultStoreBase()); } + const QtPrivate::ResultStore<T> &resultStore() const + { return static_cast<const QtPrivate::ResultStore<T> &>(resultStoreBase()); } }; template <typename T> @@ -196,7 +196,7 @@ inline void QFutureInterface<T>::reportResult(const T *result, int index) return; } - QtConcurrent::ResultStore<T> &store = resultStore(); + QtPrivate::ResultStore<T> &store = resultStore(); if (store.filterMode()) { @@ -223,7 +223,7 @@ inline void QFutureInterface<T>::reportResults(const QVector<T> &_results, int b return; } - QtConcurrent::ResultStore<T> &store = resultStore(); + QtPrivate::ResultStore<T> &store = resultStore(); if (store.filterMode()) { const int resultCountBefore = store.count(); @@ -269,7 +269,7 @@ inline QList<T> QFutureInterface<T>::results() QList<T> res; QMutexLocker lock(mutex()); - QtConcurrent::ResultIterator<T> it = resultStore().begin(); + QtPrivate::ResultIterator<T> it = resultStore().begin(); while (it != resultStore().end()) { res.append(it.value()); ++it; |