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/qtconcurrentrunbase.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/qtconcurrentrunbase.h')
| -rw-r--r-- | src/concurrent/qtconcurrentrunbase.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/concurrent/qtconcurrentrunbase.h b/src/concurrent/qtconcurrentrunbase.h index 02ce30a7f5..897345f239 100644 --- a/src/concurrent/qtconcurrentrunbase.h +++ b/src/concurrent/qtconcurrentrunbase.h @@ -104,10 +104,10 @@ public: #endif this->runFunctor(); #ifndef QT_NO_EXCEPTIONS - } catch (QtConcurrent::Exception &e) { + } catch (QException &e) { QFutureInterface<T>::reportException(e); } catch (...) { - QFutureInterface<T>::reportException(QtConcurrent::UnhandledException()); + QFutureInterface<T>::reportException(QUnhandledException()); } #endif @@ -132,10 +132,10 @@ public: #endif this->runFunctor(); #ifndef QT_NO_EXCEPTIONS - } catch (QtConcurrent::Exception &e) { + } catch (QException &e) { QFutureInterface<void>::reportException(e); } catch (...) { - QFutureInterface<void>::reportException(QtConcurrent::UnhandledException()); + QFutureInterface<void>::reportException(QUnhandledException()); } #endif this->reportFinished(); |