diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2020-02-05 13:43:22 +0300 |
---|---|---|
committer | Olivier Goffart <olivier@woboq.com> | 2020-02-10 18:41:07 +0300 |
commit | 1622615d5f89dcd08ea38701231f1a4ed4559c27 (patch) | |
tree | 187557878392363156fd2202e9e25ee402f4c6b5 /src/3rdparty | |
parent | c6981fc82435c45fe14f2197aed7d749c2176880 (diff) |
Run clang-tidy with modernize-use-override
And also replace all remaining Q_DECL_OVERRIDE to just override
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/QProgressIndicator/QProgressIndicator.h | 8 | ||||
-rw-r--r-- | src/3rdparty/qtlockedfile/qtlockedfile.h | 2 | ||||
-rw-r--r-- | src/3rdparty/qtsingleapplication/qtsingleapplication.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/3rdparty/QProgressIndicator/QProgressIndicator.h b/src/3rdparty/QProgressIndicator/QProgressIndicator.h index a6178080e..449d89bd3 100644 --- a/src/3rdparty/QProgressIndicator/QProgressIndicator.h +++ b/src/3rdparty/QProgressIndicator/QProgressIndicator.h @@ -67,8 +67,8 @@ public: */ const QColor & color() const { return m_color; } - virtual QSize sizeHint() const; - int heightForWidth(int w) const; + QSize sizeHint() const override; + int heightForWidth(int w) const override; public slots: /*! Starts the spin animation. \sa stopAnimation isAnimated @@ -98,8 +98,8 @@ public slots: */ void setColor(const QColor & color); protected: - virtual void timerEvent(QTimerEvent * event); - virtual void paintEvent(QPaintEvent * event); + void timerEvent(QTimerEvent * event) override; + void paintEvent(QPaintEvent * event) override; private: int m_angle; int m_timerId; diff --git a/src/3rdparty/qtlockedfile/qtlockedfile.h b/src/3rdparty/qtlockedfile/qtlockedfile.h index fcfb8cc24..128cbf0ff 100644 --- a/src/3rdparty/qtlockedfile/qtlockedfile.h +++ b/src/3rdparty/qtlockedfile/qtlockedfile.h @@ -57,7 +57,7 @@ public: QtLockedFile(); QtLockedFile(const QString &name); - ~QtLockedFile(); + ~QtLockedFile() override; bool lock(LockMode mode, bool block = true); bool unlock(); diff --git a/src/3rdparty/qtsingleapplication/qtsingleapplication.h b/src/3rdparty/qtsingleapplication/qtsingleapplication.h index 384a71ce8..674649e4c 100644 --- a/src/3rdparty/qtsingleapplication/qtsingleapplication.h +++ b/src/3rdparty/qtsingleapplication/qtsingleapplication.h @@ -44,13 +44,13 @@ class QtSingleApplication : public QApplication public: QtSingleApplication(const QString &id, int &argc, char **argv); - ~QtSingleApplication(); + ~QtSingleApplication() override; bool isRunning(qint64 pid = -1); void setActivationWindow(QWidget* aw, bool activateOnMessage = true); QWidget* activationWindow() const; - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; QString applicationId() const; void setBlock(bool value); |