summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2012-08-27 23:15:40 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-28 23:50:10 +0200
commit08c50599f149b7a8d448845dcb0b171e96342784 (patch)
treef2fa89af503e02892f4998f624606bcc0977b641 /src
parent727f25214e870bc5d947a2f89ada9a4a4bd07365 (diff)
Move QFutureWatcher back to QtCore
This belongs with QFuture. Change-Id: I555cd01c1d3890fbbaca4fd8a9170292ea4eb0fb Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/concurrent/concurrent.pro3
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_thread_qfuturewatcher.cpp (renamed from src/concurrent/doc/snippets/code/src_concurrent_qfuturewatcher.cpp)0
-rw-r--r--src/corelib/thread/qfutureinterface_p.h2
-rw-r--r--src/corelib/thread/qfuturewatcher.cpp (renamed from src/concurrent/qfuturewatcher.cpp)4
-rw-r--r--src/corelib/thread/qfuturewatcher.h (renamed from src/concurrent/qfuturewatcher.h)7
-rw-r--r--src/corelib/thread/qfuturewatcher_p.h (renamed from src/concurrent/qfuturewatcher_p.h)4
-rw-r--r--src/corelib/thread/thread.pri3
7 files changed, 10 insertions, 13 deletions
diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro
index 8fdd6d8cd2..20a9356e53 100644
--- a/src/concurrent/concurrent.pro
+++ b/src/concurrent/concurrent.pro
@@ -13,7 +13,6 @@ PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
SOURCES += \
qfuturesynchronizer.cpp \
- qfuturewatcher.cpp \
qtconcurrentfilter.cpp \
qtconcurrentmap.cpp \
qtconcurrentthreadengine.cpp \
@@ -22,7 +21,6 @@ SOURCES += \
HEADERS += \
qtconcurrent_global.h \
qfuturesynchronizer.h \
- qfuturewatcher.h \
qtconcurrentcompilertest.h \
qtconcurrentexception.h \
qtconcurrentfilter.h \
@@ -40,7 +38,6 @@ HEADERS += \
# private headers
HEADERS += \
- qfuturewatcher_p.h
QMAKE_DOCS = $$PWD/doc/qtconcurrent.qdocconf
QMAKE_DOCS_INDEX = ../../doc
diff --git a/src/concurrent/doc/snippets/code/src_concurrent_qfuturewatcher.cpp b/src/corelib/doc/snippets/code/src_corelib_thread_qfuturewatcher.cpp
index 3b7c58c9eb..3b7c58c9eb 100644
--- a/src/concurrent/doc/snippets/code/src_concurrent_qfuturewatcher.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_thread_qfuturewatcher.cpp
diff --git a/src/corelib/thread/qfutureinterface_p.h b/src/corelib/thread/qfutureinterface_p.h
index 4498cdfc4b..a9081d4c89 100644
--- a/src/corelib/thread/qfutureinterface_p.h
+++ b/src/corelib/thread/qfutureinterface_p.h
@@ -124,7 +124,7 @@ public:
virtual void callOutInterfaceDisconnected() = 0;
};
-class Q_CORE_EXPORT QFutureInterfaceBasePrivate // ### temporary
+class QFutureInterfaceBasePrivate
{
public:
QFutureInterfaceBasePrivate(QFutureInterfaceBase::State initialState);
diff --git a/src/concurrent/qfuturewatcher.cpp b/src/corelib/thread/qfuturewatcher.cpp
index 128a3b53a9..e7009ab854 100644
--- a/src/concurrent/qfuturewatcher.cpp
+++ b/src/corelib/thread/qfuturewatcher.cpp
@@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE
Example: Starting a computation and getting a slot callback when it's
finished:
- \snippet code/src_concurrent_qfuturewatcher.cpp 0
+ \snippet code/src_corelib_thread_qfuturewatcher.cpp 0
Be aware that not all asynchronous computations can be canceled or paused.
For example, the future returned by QtConcurrent::run() cannot be
@@ -593,4 +593,4 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
QT_END_NAMESPACE
-#endif // QT_NO_CONCURRENT
+#endif // QT_NO_QFUTURE
diff --git a/src/concurrent/qfuturewatcher.h b/src/corelib/thread/qfuturewatcher.h
index a08f418d01..005a0b10e5 100644
--- a/src/concurrent/qfuturewatcher.h
+++ b/src/corelib/thread/qfuturewatcher.h
@@ -42,8 +42,6 @@
#ifndef QFUTUREWATCHER_H
#define QFUTUREWATCHER_H
-#include <QtConcurrent/qtconcurrent_global.h>
-
#include <QtCore/qfuture.h>
#ifndef QT_NO_QFUTURE
@@ -57,13 +55,14 @@ QT_BEGIN_NAMESPACE
class QEvent;
class QFutureWatcherBasePrivate;
-class Q_CONCURRENT_EXPORT QFutureWatcherBase : public QObject
+class Q_CORE_EXPORT QFutureWatcherBase : public QObject
{
Q_OBJECT
Q_DECLARE_PRIVATE(QFutureWatcherBase)
public:
explicit QFutureWatcherBase(QObject *parent = 0);
+ // de-inline dtor
int progressValue() const;
int progressMinimum() const;
@@ -218,6 +217,6 @@ Q_INLINE_TEMPLATE void QFutureWatcher<void>::setFuture(const QFuture<void> &_fut
QT_END_NAMESPACE
QT_END_HEADER
-#endif // QT_NO_CONCURRENT
+#endif // QT_NO_QFUTURE
#endif // QFUTUREWATCHER_H
diff --git a/src/concurrent/qfuturewatcher_p.h b/src/corelib/thread/qfuturewatcher_p.h
index 23d9472cd7..5dc805b58b 100644
--- a/src/concurrent/qfuturewatcher_p.h
+++ b/src/corelib/thread/qfuturewatcher_p.h
@@ -53,9 +53,7 @@
// We mean it.
//
-#include <QtConcurrent/qtconcurrent_global.h>
-
-#include <private/qfutureinterface_p.h>
+#include "qfutureinterface_p.h"
#include <qlist.h>
#ifndef QT_NO_QFUTURE
diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri
index 1accffcdfe..6e341beb75 100644
--- a/src/corelib/thread/thread.pri
+++ b/src/corelib/thread/thread.pri
@@ -14,6 +14,7 @@ HEADERS += thread/qmutex.h \
thread/qresultstore.h \
thread/qfuture.h \
thread/qfutureinterface.h \
+ thread/qfuturewatcher.h \
thread/qbasicatomic.h \
thread/qgenericatomic.h \
thread/qoldbasicatomic.h
@@ -22,6 +23,7 @@ HEADERS += thread/qmutex.h \
HEADERS += thread/qmutex_p.h \
thread/qmutexpool_p.h \
thread/qfutureinterface_p.h \
+ thread/qfuturewatcher_p.h \
thread/qorderedmutexlocker_p.h \
thread/qreadwritelock_p.h \
thread/qthread_p.h \
@@ -31,6 +33,7 @@ SOURCES += thread/qatomic.cpp \
thread/qexception.cpp \
thread/qresultstore.cpp \
thread/qfutureinterface.cpp \
+ thread/qfuturewatcher.cpp \
thread/qmutex.cpp \
thread/qreadwritelock.cpp \
thread/qrunnable.cpp \