diff options
Diffstat (limited to 'src/concurrent/qtconcurrentthreadengine.h')
-rw-r--r-- | src/concurrent/qtconcurrentthreadengine.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h index f915e9adfd..450e7b8d50 100644 --- a/src/concurrent/qtconcurrentthreadengine.h +++ b/src/concurrent/qtconcurrentthreadengine.h @@ -113,7 +113,7 @@ private: void startThreads(); void threadExit(); bool threadThrottleExit(); - void run() Q_DECL_OVERRIDE; + void run() override; virtual void asynchronousFinish() = 0; #ifndef QT_NO_EXCEPTIONS void handleException(const QException &exception); @@ -132,7 +132,7 @@ class ThreadEngine : public virtual ThreadEngineBase public: typedef T ResultType; - virtual T *result() { return Q_NULLPTR; } + virtual T *result() { return nullptr; } QFutureInterface<T> *futureInterfaceTyped() { @@ -173,7 +173,7 @@ public: return future; } - void asynchronousFinish() Q_DECL_OVERRIDE + void asynchronousFinish() override { finish(); futureInterfaceTyped()->reportFinished(result()); |