diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2018-05-07 15:08:20 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-05-07 15:44:48 +0000 |
commit | 3f578757fffb0900959a2cd994891adb2de77ce7 (patch) | |
tree | 1c0dfc7ee2e6b1494c172b4f34cf62497568d693 | |
parent | a0d560387e306f3bce5f41b0d82ea5d340a45132 (diff) |
Help: Use override consistently
clang-tidy fixes from modernize-use-override check.
Change-Id: I3aec6d7ab1e8f088b745d2d9730e3d49ced42031
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r-- | src/plugins/help/centralwidget.h | 2 | ||||
-rw-r--r-- | src/plugins/help/docsettingspage.h | 8 | ||||
-rw-r--r-- | src/plugins/help/filtersettingspage.h | 6 | ||||
-rw-r--r-- | src/plugins/help/generalsettingspage.h | 6 | ||||
-rw-r--r-- | src/plugins/help/helpfindsupport.h | 18 | ||||
-rw-r--r-- | src/plugins/help/helpviewer.h | 2 | ||||
-rw-r--r-- | src/plugins/help/helpwidget.h | 4 | ||||
-rw-r--r-- | src/plugins/help/localhelpmanager.h | 2 | ||||
-rw-r--r-- | src/plugins/help/openpagesmanager.h | 2 | ||||
-rw-r--r-- | src/plugins/help/openpagesmodel.h | 6 | ||||
-rw-r--r-- | src/plugins/help/openpagesswitcher.h | 8 | ||||
-rw-r--r-- | src/plugins/help/openpageswidget.h | 2 | ||||
-rw-r--r-- | src/plugins/help/searchwidget.h | 10 | ||||
-rw-r--r-- | src/plugins/help/textbrowserhelpviewer.h | 60 |
14 files changed, 68 insertions, 68 deletions
diff --git a/src/plugins/help/centralwidget.h b/src/plugins/help/centralwidget.h index 47343f8c31..b7ead61edc 100644 --- a/src/plugins/help/centralwidget.h +++ b/src/plugins/help/centralwidget.h @@ -39,7 +39,7 @@ class CentralWidget : public HelpWidget public: CentralWidget(const Core::Context &context, QWidget *parent = nullptr); - ~CentralWidget(); + ~CentralWidget() override; static CentralWidget *instance(); }; diff --git a/src/plugins/help/docsettingspage.h b/src/plugins/help/docsettingspage.h index ffc2c27f5a..dfe80b6966 100644 --- a/src/plugins/help/docsettingspage.h +++ b/src/plugins/help/docsettingspage.h @@ -46,14 +46,14 @@ class DocSettingsPage : public Core::IOptionsPage public: DocSettingsPage(); - QWidget *widget(); - void apply(); - void finish(); + QWidget *widget() override; + void apply() override; + void finish() override; private: void addDocumentation(); - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; void removeDocumentation(const QList<QModelIndex> &items); QList<QModelIndex> currentSelection() const; diff --git a/src/plugins/help/filtersettingspage.h b/src/plugins/help/filtersettingspage.h index b93f59c052..1cf43474d7 100644 --- a/src/plugins/help/filtersettingspage.h +++ b/src/plugins/help/filtersettingspage.h @@ -40,9 +40,9 @@ class FilterSettingsPage : public Core::IOptionsPage public: FilterSettingsPage(); - QWidget *widget(); - void apply(); - void finish(); + QWidget *widget() override; + void apply() override; + void finish() override; signals: void filtersChanged(); diff --git a/src/plugins/help/generalsettingspage.h b/src/plugins/help/generalsettingspage.h index c77378fbf8..3804039027 100644 --- a/src/plugins/help/generalsettingspage.h +++ b/src/plugins/help/generalsettingspage.h @@ -41,9 +41,9 @@ class GeneralSettingsPage : public Core::IOptionsPage public: GeneralSettingsPage(); - QWidget *widget(); - void apply(); - void finish(); + QWidget *widget() override; + void apply() override; + void finish() override; signals: void fontChanged(); diff --git a/src/plugins/help/helpfindsupport.h b/src/plugins/help/helpfindsupport.h index 3c5cd393a0..daf63fe2a5 100644 --- a/src/plugins/help/helpfindsupport.h +++ b/src/plugins/help/helpfindsupport.h @@ -40,15 +40,15 @@ class HelpViewerFindSupport : public Core::IFindSupport public: HelpViewerFindSupport(HelpViewer *viewer); - bool supportsReplace() const { return false; } - Core::FindFlags supportedFindFlags() const; - void resetIncrementalSearch() {} - void clearHighlights() {} - QString currentFindString() const; - QString completedFindString() const { return QString(); } - - Result findIncremental(const QString &txt, Core::FindFlags findFlags); - Result findStep(const QString &txt, Core::FindFlags findFlags); + bool supportsReplace() const override { return false; } + Core::FindFlags supportedFindFlags() const override; + void resetIncrementalSearch() override {} + void clearHighlights() override {} + QString currentFindString() const override; + QString completedFindString() const override { return QString(); } + + Result findIncremental(const QString &txt, Core::FindFlags findFlags) override; + Result findStep(const QString &txt, Core::FindFlags findFlags) override; private: bool find(const QString &ttf, Core::FindFlags findFlags, bool incremental); diff --git a/src/plugins/help/helpviewer.h b/src/plugins/help/helpviewer.h index 28a2312e46..d26c1a9f51 100644 --- a/src/plugins/help/helpviewer.h +++ b/src/plugins/help/helpviewer.h @@ -49,7 +49,7 @@ public: Q_DECLARE_FLAGS(Actions, Action) explicit HelpViewer(QWidget *parent = nullptr); - ~HelpViewer(); + ~HelpViewer() override; virtual QFont viewerFont() const = 0; virtual void setViewerFont(const QFont &font) = 0; diff --git a/src/plugins/help/helpwidget.h b/src/plugins/help/helpwidget.h index 7afd555f96..fb084c99f3 100644 --- a/src/plugins/help/helpwidget.h +++ b/src/plugins/help/helpwidget.h @@ -59,7 +59,7 @@ public: }; HelpWidget(const Core::Context &context, WidgetStyle style, QWidget *parent = nullptr); - ~HelpWidget(); + ~HelpWidget() override; HelpViewer *currentViewer() const; void setCurrentViewer(HelpViewer *viewer); @@ -82,7 +82,7 @@ public: void updateCloseButton(); protected: - void closeEvent(QCloseEvent *); + void closeEvent(QCloseEvent *) override; signals: void openHelpMode(const QUrl &url); diff --git a/src/plugins/help/localhelpmanager.h b/src/plugins/help/localhelpmanager.h index 4846c74231..fdb4f7874a 100644 --- a/src/plugins/help/localhelpmanager.h +++ b/src/plugins/help/localhelpmanager.h @@ -58,7 +58,7 @@ public: }; LocalHelpManager(QObject *parent = nullptr); - ~LocalHelpManager(); + ~LocalHelpManager() override; static LocalHelpManager *instance(); diff --git a/src/plugins/help/openpagesmanager.h b/src/plugins/help/openpagesmanager.h index 6c85e08675..cc2d0d17a2 100644 --- a/src/plugins/help/openpagesmanager.h +++ b/src/plugins/help/openpagesmanager.h @@ -48,7 +48,7 @@ class OpenPagesManager : public QObject public: OpenPagesManager(QObject *parent = nullptr); - ~OpenPagesManager(); + ~OpenPagesManager() override; static OpenPagesManager &instance(); diff --git a/src/plugins/help/openpagesmodel.h b/src/plugins/help/openpagesmodel.h index feac6040de..4d990ef791 100644 --- a/src/plugins/help/openpagesmodel.h +++ b/src/plugins/help/openpagesmodel.h @@ -42,9 +42,9 @@ class OpenPagesModel : public QAbstractTableModel public: OpenPagesModel(QObject *parent); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; void addPage(const QUrl &url, qreal zoom = 0); void removePage(int index); diff --git a/src/plugins/help/openpagesswitcher.h b/src/plugins/help/openpagesswitcher.h index 350b352d78..1f3d7b24b1 100644 --- a/src/plugins/help/openpagesswitcher.h +++ b/src/plugins/help/openpagesswitcher.h @@ -41,7 +41,7 @@ class OpenPagesSwitcher : public QFrame public: OpenPagesSwitcher(OpenPagesModel *model); - ~OpenPagesSwitcher(); + ~OpenPagesSwitcher() override; void gotoNextPage(); void gotoPreviousPage(); @@ -49,9 +49,9 @@ public: void selectAndHide(); void selectCurrentPage(); - void setVisible(bool visible); - void focusInEvent(QFocusEvent *event); - bool eventFilter(QObject *object, QEvent *event); + void setVisible(bool visible) override; + void focusInEvent(QFocusEvent *event) override; + bool eventFilter(QObject *object, QEvent *event) override; signals: void closePage(const QModelIndex &index); diff --git a/src/plugins/help/openpageswidget.h b/src/plugins/help/openpageswidget.h index 80b957bd2c..c06cc2bb44 100644 --- a/src/plugins/help/openpageswidget.h +++ b/src/plugins/help/openpageswidget.h @@ -38,7 +38,7 @@ class OpenPagesWidget : public Core::OpenDocumentsTreeView public: explicit OpenPagesWidget(OpenPagesModel *model, QWidget *parent = nullptr); - ~OpenPagesWidget(); + ~OpenPagesWidget() override; void selectCurrentPage(); void allowContextMenu(bool ok); diff --git a/src/plugins/help/searchwidget.h b/src/plugins/help/searchwidget.h index 5f4e5c4fc6..f77ee6c378 100644 --- a/src/plugins/help/searchwidget.h +++ b/src/plugins/help/searchwidget.h @@ -50,7 +50,7 @@ class SearchSideBarItem : public Core::SideBarItem public: SearchSideBarItem(); - QList<QToolButton *> createToolBarWidgets(); + QList<QToolButton *> createToolBarWidgets() override; signals: void linkActivated(const QUrl &url, const QStringList &searchTerms, bool newPage); @@ -62,7 +62,7 @@ class SearchWidget : public QWidget public: SearchWidget(); - ~SearchWidget(); + ~SearchWidget() override; void zoomIn(); void zoomOut(); @@ -74,7 +74,7 @@ signals: void linkActivated(const QUrl &link, const QStringList &searchTerms, bool newPage); protected: - void showEvent(QShowEvent *event); + void showEvent(QShowEvent *event) override; private: void search() const; @@ -85,8 +85,8 @@ private: void indexingStarted(); void indexingFinished(); - bool eventFilter(QObject* o, QEvent *e); - void contextMenuEvent(QContextMenuEvent *contextMenuEvent); + bool eventFilter(QObject* o, QEvent *e) override; + void contextMenuEvent(QContextMenuEvent *contextMenuEvent) override; QStringList currentSearchTerms() const; int zoomCount = 0; diff --git a/src/plugins/help/textbrowserhelpviewer.h b/src/plugins/help/textbrowserhelpviewer.h index 38b3180983..3e046a8771 100644 --- a/src/plugins/help/textbrowserhelpviewer.h +++ b/src/plugins/help/textbrowserhelpviewer.h @@ -42,38 +42,38 @@ class TextBrowserHelpViewer : public HelpViewer public: explicit TextBrowserHelpViewer(QWidget *parent = nullptr); - ~TextBrowserHelpViewer(); + ~TextBrowserHelpViewer() override; - QFont viewerFont() const; - void setViewerFont(const QFont &font); + QFont viewerFont() const override; + void setViewerFont(const QFont &font) override; - qreal scale() const; - void setScale(qreal scale); + qreal scale() const override; + void setScale(qreal scale) override; - QString title() const; + QString title() const override; - QUrl source() const; - void setSource(const QUrl &url); + QUrl source() const override; + void setSource(const QUrl &url) override; - void setHtml(const QString &html); + void setHtml(const QString &html) override; - QString selectedText() const; - bool isForwardAvailable() const; - bool isBackwardAvailable() const; - void addBackHistoryItems(QMenu *backMenu); - void addForwardHistoryItems(QMenu *forwardMenu); + QString selectedText() const override; + bool isForwardAvailable() const override; + bool isBackwardAvailable() const override; + void addBackHistoryItems(QMenu *backMenu) override; + void addForwardHistoryItems(QMenu *forwardMenu) override; bool findText(const QString &text, Core::FindFlags flags, - bool incremental, bool fromSearch, bool *wrapped = nullptr); + bool incremental, bool fromSearch, bool *wrapped = nullptr) override; - void scaleUp(); - void scaleDown(); - void resetScale(); - void copy(); - void stop(); - void forward(); - void backward(); - void print(QPrinter *printer); + void scaleUp() override; + void scaleDown() override; + void resetScale() override; + void copy() override; + void stop() override; + void forward() override; + void backward() override; + void print(QPrinter *printer) override; private: void goToHistoryItem(); @@ -88,19 +88,19 @@ class TextBrowserHelpWidget : public QTextBrowser public: TextBrowserHelpWidget(TextBrowserHelpViewer *parent); - QVariant loadResource(int type, const QUrl &name); + QVariant loadResource(int type, const QUrl &name) override; void scaleUp(); void scaleDown(); - void setSource(const QUrl &name); + void setSource(const QUrl &name) override; protected: - void contextMenuEvent(QContextMenuEvent *event); - bool eventFilter(QObject *obj, QEvent *event); - void wheelEvent(QWheelEvent *e); - void mousePressEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); + void contextMenuEvent(QContextMenuEvent *event) override; + bool eventFilter(QObject *obj, QEvent *event) override; + void wheelEvent(QWheelEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; private: QString linkAt(const QPoint& pos); |