diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2012-08-27 12:24:48 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-28 23:50:10 +0200 |
commit | 3a29976eac1ff95e663d49886dc82611a175fed9 (patch) | |
tree | 31d70d25501a0f95e17b65e4c029c5c40b75610f /src/concurrent/qfutureinterface.h | |
parent | 5414a9a03bec65fd180f3c29811397df14130881 (diff) |
Move QtConcurrent::Exception as QException back to QtCore
Leave the old name as a deprecated typedef; adapt users.
This is a prerequisite for moving QFuture back to QtCore.
Change-Id: I81dcee2c7e6eb234c16f3f42e2415ca0da3dc4f8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/concurrent/qfutureinterface.h')
-rw-r--r-- | src/concurrent/qfutureinterface.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/concurrent/qfutureinterface.h b/src/concurrent/qfutureinterface.h index 55112ab68d..615b9fbe6a 100644 --- a/src/concurrent/qfutureinterface.h +++ b/src/concurrent/qfutureinterface.h @@ -49,7 +49,7 @@ #ifndef QT_NO_QFUTURE #include <QtCore/qmutex.h> -#include <QtConcurrent/qtconcurrentexception.h> +#include <QtCore/qexception.h> #include <QtConcurrent/qtconcurrentresultstore.h> QT_BEGIN_HEADER @@ -83,7 +83,7 @@ public: void reportFinished(); void reportCanceled(); #ifndef QT_NO_EXCEPTIONS - void reportException(const QtConcurrent::Exception &e); + void reportException(const QException &e); #endif void reportResultsReady(int beginIndex, int endIndex); @@ -122,7 +122,7 @@ public: void waitForResume(); QMutex *mutex() const; - QtConcurrent::internal::ExceptionStore &exceptionStore(); + QtPrivate::ExceptionStore &exceptionStore(); QtConcurrent::ResultStoreBase &resultStoreBase(); const QtConcurrent::ResultStoreBase &resultStoreBase() const; |