diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2018-05-07 15:00:03 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-05-07 15:43:44 +0000 |
commit | 60d94ee7b5f6235b56f3e75970ebc26cc23e8c8c (patch) | |
tree | adc39ccda83dc7e620222687a9ab18ddf15aab95 /src/plugins/coreplugin/find | |
parent | 0e71ed1bfcdcc02927f6fba9dc49ada73a4b973b (diff) | |
download | qt-creator-60d94ee7b5f6235b56f3e75970ebc26cc23e8c8c.tar.gz |
Core: Use override consistently
clang-tidy fixes from modernize-use-override check.
Change-Id: If33399d60e96cae766bbedbe30044ada411e862f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/coreplugin/find')
-rw-r--r-- | src/plugins/coreplugin/find/basetextfind.h | 30 | ||||
-rw-r--r-- | src/plugins/coreplugin/find/ifindfilter.h | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/find/ifindsupport.h | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/find/itemviewfind.h | 20 | ||||
-rw-r--r-- | src/plugins/coreplugin/find/searchresultwindow.h | 30 |
5 files changed, 42 insertions, 42 deletions
diff --git a/src/plugins/coreplugin/find/basetextfind.h b/src/plugins/coreplugin/find/basetextfind.h index abff5a204a..ff178c59f4 100644 --- a/src/plugins/coreplugin/find/basetextfind.h +++ b/src/plugins/coreplugin/find/basetextfind.h @@ -43,25 +43,25 @@ class CORE_EXPORT BaseTextFind : public IFindSupport public: explicit BaseTextFind(QPlainTextEdit *editor); explicit BaseTextFind(QTextEdit *editor); - virtual ~BaseTextFind(); + ~BaseTextFind() override; - bool supportsReplace() const; - FindFlags supportedFindFlags() const; - void resetIncrementalSearch(); - void clearHighlights(); - QString currentFindString() const; - QString completedFindString() const; + bool supportsReplace() const override; + FindFlags supportedFindFlags() const override; + void resetIncrementalSearch() override; + void clearHighlights() override; + QString currentFindString() const override; + QString completedFindString() const override; - Result findIncremental(const QString &txt, FindFlags findFlags); - Result findStep(const QString &txt, FindFlags findFlags); - void replace(const QString &before, const QString &after, FindFlags findFlags); - bool replaceStep(const QString &before, const QString &after, FindFlags findFlags); - int replaceAll(const QString &before, const QString &after, FindFlags findFlags); + Result findIncremental(const QString &txt, FindFlags findFlags) override; + Result findStep(const QString &txt, FindFlags findFlags) override; + void replace(const QString &before, const QString &after, FindFlags findFlags) override; + bool replaceStep(const QString &before, const QString &after, FindFlags findFlags) override; + int replaceAll(const QString &before, const QString &after, FindFlags findFlags) override; - void defineFindScope(); - void clearFindScope(); + void defineFindScope() override; + void clearFindScope() override; - void highlightAll(const QString &txt, FindFlags findFlags); + void highlightAll(const QString &txt, FindFlags findFlags) override; signals: void highlightAllRequested(const QString &txt, Core::FindFlags findFlags); diff --git a/src/plugins/coreplugin/find/ifindfilter.h b/src/plugins/coreplugin/find/ifindfilter.h index efedbf44f9..26c6adfbb3 100644 --- a/src/plugins/coreplugin/find/ifindfilter.h +++ b/src/plugins/coreplugin/find/ifindfilter.h @@ -42,7 +42,7 @@ class CORE_EXPORT IFindFilter : public QObject public: IFindFilter(); - virtual ~IFindFilter(); + ~IFindFilter() override; static const QList<IFindFilter *> allFindFilters(); diff --git a/src/plugins/coreplugin/find/ifindsupport.h b/src/plugins/coreplugin/find/ifindsupport.h index 18a2762784..eff2f777af 100644 --- a/src/plugins/coreplugin/find/ifindsupport.h +++ b/src/plugins/coreplugin/find/ifindsupport.h @@ -40,7 +40,7 @@ public: enum Result { Found, NotFound, NotYetFound }; IFindSupport() : QObject(0) {} - virtual ~IFindSupport() {} + ~IFindSupport() override {} virtual bool supportsReplace() const = 0; virtual FindFlags supportedFindFlags() const = 0; diff --git a/src/plugins/coreplugin/find/itemviewfind.h b/src/plugins/coreplugin/find/itemviewfind.h index 026ed4d557..d6d7fd8944 100644 --- a/src/plugins/coreplugin/find/itemviewfind.h +++ b/src/plugins/coreplugin/find/itemviewfind.h @@ -52,18 +52,18 @@ public: explicit ItemViewFind(QAbstractItemView *view, int role = Qt::DisplayRole, FetchOption option = DoNotFetchMoreWhileSearching); - virtual ~ItemViewFind(); + ~ItemViewFind() override; - bool supportsReplace() const; - FindFlags supportedFindFlags() const; - void resetIncrementalSearch(); - void clearHighlights(); - QString currentFindString() const; - QString completedFindString() const; + bool supportsReplace() const override; + FindFlags supportedFindFlags() const override; + void resetIncrementalSearch() override; + void clearHighlights() override; + QString currentFindString() const override; + QString completedFindString() const override; - virtual void highlightAll(const QString &txt, FindFlags findFlags); - Result findIncremental(const QString &txt, FindFlags findFlags); - Result findStep(const QString &txt, FindFlags findFlags); + void highlightAll(const QString &txt, FindFlags findFlags) override; + Result findIncremental(const QString &txt, FindFlags findFlags) override; + Result findStep(const QString &txt, FindFlags findFlags) override; static QFrame *createSearchableWrapper(QAbstractItemView *treeView, ColorOption colorOption = DarkColored, FetchOption option = DoNotFetchMoreWhileSearching); diff --git a/src/plugins/coreplugin/find/searchresultwindow.h b/src/plugins/coreplugin/find/searchresultwindow.h index a22f6ad0a2..90f20b47b3 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.h +++ b/src/plugins/coreplugin/find/searchresultwindow.h @@ -115,24 +115,24 @@ public: SearchResultWindow(QWidget *newSearchPanel); - virtual ~SearchResultWindow(); + ~SearchResultWindow() override; static SearchResultWindow *instance(); - QWidget *outputWidget(QWidget *); - QList<QWidget*> toolBarWidgets() const; + QWidget *outputWidget(QWidget *) override; + QList<QWidget*> toolBarWidgets() const override; - QString displayName() const { return tr("Search Results"); } - int priorityInStatusBar() const; - void visibilityChanged(bool visible); - bool hasFocus() const; - bool canFocus() const; - void setFocus(); + QString displayName() const override { return tr("Search Results"); } + int priorityInStatusBar() const override; + void visibilityChanged(bool visible) override; + bool hasFocus() const override; + bool canFocus() const override; + void setFocus() override; - bool canNext() const; - bool canPrevious() const; - void goToNext(); - void goToPrev(); - bool canNavigate() const; + bool canNext() const override; + bool canPrevious() const override; + void goToNext() override; + void goToPrev() override; + bool canNavigate() const override; void setTextEditorFont(const QFont &font, const QColor &textForegroundColor, @@ -154,7 +154,7 @@ public: const QString &cfgGroup = QString()); public slots: - void clearContents(); + void clearContents() override; public: // Used by plugin, do not use void writeSettings(); |