summaryrefslogtreecommitdiffstats
path: root/src/concurrent/qfutureinterface.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2012-08-27 17:23:33 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-28 23:50:10 +0200
commita65a98399bf45924eb4d9394cf1e905b489639cc (patch)
treedab81fdde3c50e9b160936a9527b7172a85e4ad3 /src/concurrent/qfutureinterface.cpp
parent3a29976eac1ff95e663d49886dc82611a175fed9 (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.cpp')
-rw-r--r--src/concurrent/qfutureinterface.cpp6
1 files changed, 3 insertions, 3 deletions
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();