diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2014-11-16 13:09:01 +0100 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2014-12-03 09:57:11 +0100 |
commit | 5180f32c5abe01acd65cde68c2c16aedda4028ec (patch) | |
tree | a8ed3b4af80751cdc0442c750f2915bfa9c8af40 /src/corelib/thread/qfuturewatcher.h | |
parent | 2e271795e7c460254a27ea617846ff7b598a7b9b (diff) |
Add Q_DECL_OVERRIDE in the src subdirectory
Done automatically with clang-modernize on linux
(But does not add Q_DECL_OVERRIDE to the function that are marked
as inline because it a compilation error with MSVC2010)
Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread/qfuturewatcher.h')
-rw-r--r-- | src/corelib/thread/qfuturewatcher.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/thread/qfuturewatcher.h b/src/corelib/thread/qfuturewatcher.h index 3ea4c4df4f..f84af0507a 100644 --- a/src/corelib/thread/qfuturewatcher.h +++ b/src/corelib/thread/qfuturewatcher.h @@ -70,7 +70,7 @@ public: void setPendingResultsLimit(int limit); - bool event(QEvent *event); + bool event(QEvent *event) Q_DECL_OVERRIDE; Q_SIGNALS: void started(); @@ -92,8 +92,8 @@ public Q_SLOTS: void togglePaused(); protected: - void connectNotify (const QMetaMethod &signal); - void disconnectNotify (const QMetaMethod &signal); + void connectNotify (const QMetaMethod &signal) Q_DECL_OVERRIDE; + void disconnectNotify (const QMetaMethod &signal) Q_DECL_OVERRIDE; // called from setFuture() implemented in template sub-classes void connectOutputInterface(); @@ -160,8 +160,8 @@ public Q_SLOTS: private: QFuture<T> m_future; - const QFutureInterfaceBase &futureInterface() const { return m_future.d; } - QFutureInterfaceBase &futureInterface() { return m_future.d; } + const QFutureInterfaceBase &futureInterface() const Q_DECL_OVERRIDE { return m_future.d; } + QFutureInterfaceBase &futureInterface() Q_DECL_OVERRIDE { return m_future.d; } }; template <typename T> @@ -191,8 +191,8 @@ public: private: QFuture<void> m_future; - const QFutureInterfaceBase &futureInterface() const { return m_future.d; } - QFutureInterfaceBase &futureInterface() { return m_future.d; } + const QFutureInterfaceBase &futureInterface() const Q_DECL_OVERRIDE { return m_future.d; } + QFutureInterfaceBase &futureInterface() Q_DECL_OVERRIDE { return m_future.d; } }; Q_INLINE_TEMPLATE void QFutureWatcher<void>::setFuture(const QFuture<void> &_future) |