diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2018-06-22 15:08:09 +0200 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@qt.io> | 2018-06-27 07:13:21 +0000 |
commit | caff9f9aacd5190b1e067a2ca0a56a14f2fe6996 (patch) | |
tree | ee59ad0eb8f0b0d444c6ca08f11f9dd007435fcc /src/libs/utils | |
parent | cd45ce5f391cd3006d35b6dbeccebd808514f493 (diff) |
Use C++11’s override and remove virtual where applicable
Fixes warning: prefer using 'override' or (rarely) 'final' instead of
'virtual' [modernize-use-override]
Change-Id: I4b8b8ecce028dfd051fe14984b40115e92057a40
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/libs/utils')
-rw-r--r-- | src/libs/utils/fancylineedit.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/pathchooser.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/pathlisteditor.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/synchronousprocess.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp index 07de1d799c6..93d9830d152 100644 --- a/src/libs/utils/fancylineedit.cpp +++ b/src/libs/utils/fancylineedit.cpp @@ -85,7 +85,7 @@ class FancyLineEditPrivate : public QObject public: explicit FancyLineEditPrivate(FancyLineEdit *parent); - virtual bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; FancyLineEdit *m_lineEdit; IconButton *m_iconbutton[2]; diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index 4bcd45767e7..7fde56993e4 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -147,7 +147,7 @@ public: BinaryVersionToolTipEventFilter(pe->lineEdit()), m_pathChooser(pe) {} private: - virtual QString defaultToolTip() const + QString defaultToolTip() const override { return m_pathChooser->errorMessage(); } const PathChooser *m_pathChooser = nullptr; diff --git a/src/libs/utils/pathlisteditor.cpp b/src/libs/utils/pathlisteditor.cpp index bdafb43edc3..c4691d8585f 100644 --- a/src/libs/utils/pathlisteditor.cpp +++ b/src/libs/utils/pathlisteditor.cpp @@ -70,7 +70,7 @@ class PathListPlainTextEdit : public QPlainTextEdit { public: explicit PathListPlainTextEdit(QWidget *parent = 0); protected: - virtual void insertFromMimeData (const QMimeData *source); + void insertFromMimeData (const QMimeData *source) override; }; PathListPlainTextEdit::PathListPlainTextEdit(QWidget *parent) : diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp index b4b2cfc2b36..732a8e2a30c 100644 --- a/src/libs/utils/synchronousprocess.cpp +++ b/src/libs/utils/synchronousprocess.cpp @@ -90,7 +90,7 @@ public: void setFlags(unsigned tc) { m_flags = tc; } protected: - virtual void setupChildProcess(); + void setupChildProcess() override; private: unsigned m_flags; |