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>

7 files changed, 28 insertions, 28 deletions

diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro
index 772146f682..d21dff91dd 100644
--- a/src/concurrent/concurrent.pro
+++ b/src/concurrent/concurrent.pro
@@ -18,7 +18,6 @@ SOURCES += \
         qfuturewatcher.cpp \
         qtconcurrentfilter.cpp \
         qtconcurrentmap.cpp \
-        qtconcurrentresultstore.cpp \
         qtconcurrentthreadengine.cpp \
         qtconcurrentiteratekernel.cpp \
 
@@ -38,7 +37,6 @@ HEADERS += \
         qtconcurrentmapkernel.h \
         qtconcurrentmedian.h \
         qtconcurrentreducekernel.h \
-        qtconcurrentresultstore.h \
         qtconcurrentrun.h \
         qtconcurrentrunbase.h \
         qtconcurrentstoredfunctioncall.h \
diff --git a/src/concurrent/qfutureinterface.cpp b/src/concurrent/qfutureinterface.cpp
index 1f675525a5..2c33418ee9 100644
--- a/src/concurrent/qfutureinterface.cpp
+++ b/src/concurrent/qfutureinterface.cpp
@@ -395,12 +395,12 @@ QtPrivate::ExceptionStore &QFutureInterfaceBase::exceptionStore()
     return d->m_exceptionStore;
 }
 
-QtConcurrent::ResultStoreBase &QFutureInterfaceBase::resultStoreBase()
+QtPrivate::ResultStoreBase &QFutureInterfaceBase::resultStoreBase()
 {
     return d->m_results;
 }
 
-const QtConcurrent::ResultStoreBase &QFutureInterfaceBase::resultStoreBase() const
+const QtPrivate::ResultStoreBase &QFutureInterfaceBase::resultStoreBase() const
 {
     return d->m_results;
 }
@@ -522,7 +522,7 @@ void QFutureInterfaceBasePrivate::connectOutputInterface(QFutureCallOutInterface
                                                         m_progressText));
     }
 
-    QtConcurrent::ResultIteratorBase it = m_results.begin();
+    QtPrivate::ResultIteratorBase it = m_results.begin();
     while (it != m_results.end()) {
         const int begin = it.resultIndex();
         const int end = begin + it.batchSize();
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;
diff --git a/src/concurrent/qfutureinterface_p.h b/src/concurrent/qfutureinterface_p.h
index 734584adad..7fd2ea4d99 100644
--- a/src/concurrent/qfutureinterface_p.h
+++ b/src/concurrent/qfutureinterface_p.h
@@ -142,7 +142,7 @@ public:
     QElapsedTimer progressTime;
     QWaitCondition pausedWaitCondition;
     int pendingResults;
-    QtConcurrent::ResultStoreBase m_results;
+    QtPrivate::ResultStoreBase m_results;
     bool manualProgress;
     int m_expectedResultCount;
     QtPrivate::ExceptionStore m_exceptionStore;
diff --git a/src/concurrent/qtconcurrentresultstore.cpp b/src/corelib/thread/qresultstore.cpp
index 14a1d0f5e1..93a8d456b8 100644
--- a/src/concurrent/qtconcurrentresultstore.cpp
+++ b/src/corelib/thread/qresultstore.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "qtconcurrentresultstore.h"
+#include "qresultstore.h"
 
 #ifndef QT_NO_QFUTURE
 
 QT_BEGIN_NAMESPACE
 
-namespace QtConcurrent {
+namespace QtPrivate {
 
 ResultIteratorBase::ResultIteratorBase()
  : mapIterator(QMap<int, ResultItem>::const_iterator()), m_vectorIndex(0) { }
@@ -249,8 +249,8 @@ int ResultStoreBase::updateInsertIndex(int index, int _count)
     return index;
 }
 
-} // namespace QtConcurrent
+} // namespace QtPrivate
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_CONCURRENT
+#endif // QT_NO_QFUTURE
diff --git a/src/concurrent/qtconcurrentresultstore.h b/src/corelib/thread/qresultstore.h
index bc02dbf0d4..3314cd7aaf 100644
--- a/src/concurrent/qtconcurrentresultstore.h
+++ b/src/corelib/thread/qresultstore.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QTCONCURRENT_RESULTSTORE_H
-#define QTCONCURRENT_RESULTSTORE_H
+#ifndef QTCORE_RESULTSTORE_H
+#define QTCORE_RESULTSTORE_H
 
-#include <QtConcurrent/qtconcurrent_global.h>
+#include <QtCore/qglobal.h>
 
 #ifndef QT_NO_QFUTURE
 
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 
 #ifndef qdoc
 
-namespace QtConcurrent {
+namespace QtPrivate {
 
 class ResultItem
 {
@@ -78,7 +78,7 @@ public:
     const void *result; // if count is 0 it's a result, otherwise it's a vector.
 };
 
-class Q_CONCURRENT_EXPORT ResultIteratorBase
+class Q_CORE_EXPORT ResultIteratorBase
 {
 public:
     ResultIteratorBase();
@@ -119,7 +119,7 @@ public:
     }
 };
 
-class Q_CONCURRENT_EXPORT ResultStoreBase
+class Q_CORE_EXPORT ResultStoreBase
 {
 public:
     ResultStoreBase();
@@ -226,13 +226,13 @@ public:
 
 };
 
-} // namespace QtConcurrent
+} // namespace QtPrivate
 
 #endif //qdoc
 
 QT_END_NAMESPACE
 QT_END_HEADER
 
-#endif // QT_NO_CONCURRENT
+#endif // QT_NO_QFUTURE
 
 #endif
diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri
index 215e56628c..d9468cc3a4 100644
--- a/src/corelib/thread/thread.pri
+++ b/src/corelib/thread/thread.pri
@@ -11,6 +11,7 @@ HEADERS += thread/qmutex.h \
            thread/qwaitcondition.h \
            thread/qatomic.h \
            thread/qexception.h \
+           thread/qresultstore.h \
            thread/qbasicatomic.h \
            thread/qgenericatomic.h \
            thread/qoldbasicatomic.h
@@ -25,6 +26,7 @@ HEADERS += thread/qmutex_p.h \
 
 SOURCES += thread/qatomic.cpp \
            thread/qexception.cpp \
+           thread/qresultstore.cpp \
            thread/qmutex.cpp \
            thread/qreadwritelock.cpp \
            thread/qrunnable.cpp \