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 | |
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')
64 files changed, 218 insertions, 218 deletions
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h index 048f0854a6..da64a97fb8 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h +++ b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h @@ -46,24 +46,24 @@ class ActionContainerPrivate : public ActionContainer public: ActionContainerPrivate(Id id); - ~ActionContainerPrivate() {} + ~ActionContainerPrivate() override {} - void setOnAllDisabledBehavior(OnAllDisabledBehavior behavior); - ActionContainer::OnAllDisabledBehavior onAllDisabledBehavior() const; + void setOnAllDisabledBehavior(OnAllDisabledBehavior behavior) override; + ActionContainer::OnAllDisabledBehavior onAllDisabledBehavior() const override; - QAction *insertLocation(Id groupId) const; - void appendGroup(Id id); - void insertGroup(Id before, Id groupId); - void addAction(Command *action, Id group = Id()); - void addMenu(ActionContainer *menu, Id group = Id()); - void addMenu(ActionContainer *before, ActionContainer *menu, Id group = Id()); - Command *addSeparator(const Context &context, Id group = Id(), QAction **outSeparator = 0); - virtual void clear(); + QAction *insertLocation(Id groupId) const override; + void appendGroup(Id id) override; + void insertGroup(Id before, Id groupId) override; + void addAction(Command *action, Id group = Id()) override; + void addMenu(ActionContainer *menu, Id group = Id()) override; + void addMenu(ActionContainer *before, ActionContainer *menu, Id group = Id()) override; + Command *addSeparator(const Context &context, Id group = Id(), QAction **outSeparator = 0) override; + void clear() override; - Id id() const; + Id id() const override; - QMenu *menu() const; - QMenuBar *menuBar() const; + QMenu *menu() const override; + QMenuBar *menuBar() const override; virtual void insertAction(QAction *before, QAction *action) = 0; virtual void insertMenu(QAction *before, QMenu *menu) = 0; @@ -98,19 +98,19 @@ class MenuActionContainer : public ActionContainerPrivate { public: explicit MenuActionContainer(Id id); - ~MenuActionContainer(); + ~MenuActionContainer() override; - QMenu *menu() const; + QMenu *menu() const override; - void insertAction(QAction *before, QAction *action); - void insertMenu(QAction *before, QMenu *menu); + void insertAction(QAction *before, QAction *action) override; + void insertMenu(QAction *before, QMenu *menu) override; - void removeAction(QAction *action); - void removeMenu(QMenu *menu); + void removeAction(QAction *action) override; + void removeMenu(QMenu *menu) override; protected: - bool canBeAddedToMenu() const; - bool updateInternal(); + bool canBeAddedToMenu() const override; + bool updateInternal() override; private: QPointer<QMenu> m_menu; @@ -122,17 +122,17 @@ public: explicit MenuBarActionContainer(Id id); void setMenuBar(QMenuBar *menuBar); - QMenuBar *menuBar() const; + QMenuBar *menuBar() const override; - void insertAction(QAction *before, QAction *action); - void insertMenu(QAction *before, QMenu *menu); + void insertAction(QAction *before, QAction *action) override; + void insertMenu(QAction *before, QMenu *menu) override; - void removeAction(QAction *action); - void removeMenu(QMenu *menu); + void removeAction(QAction *action) override; + void removeMenu(QMenu *menu) override; protected: - bool canBeAddedToMenu() const; - bool updateInternal(); + bool canBeAddedToMenu() const override; + bool updateInternal() override; private: QMenuBar *m_menuBar; diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h index e8c661b989..59adc46779 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager.h @@ -80,7 +80,7 @@ signals: private: ActionManager(QObject *parent = 0); - ~ActionManager(); + ~ActionManager() override; static void saveSettings(); static void setContext(const Context &context); diff --git a/src/plugins/coreplugin/actionmanager/actionmanager_p.h b/src/plugins/coreplugin/actionmanager/actionmanager_p.h index 5ac100ba78..0573bbe675 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager_p.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h @@ -49,7 +49,7 @@ public: typedef QHash<Id, Action *> IdCmdMap; typedef QHash<Id, ActionContainerPrivate *> IdContainerMap; - ~ActionManagerPrivate(); + ~ActionManagerPrivate() override; void setContext(const Context &context); bool hasContext(int context) const; diff --git a/src/plugins/coreplugin/actionmanager/command_p.h b/src/plugins/coreplugin/actionmanager/command_p.h index eebb826aab..046f6041cf 100644 --- a/src/plugins/coreplugin/actionmanager/command_p.h +++ b/src/plugins/coreplugin/actionmanager/command_p.h @@ -47,35 +47,35 @@ class Action : public Command public: Action(Id id); - Id id() const; + Id id() const override; - void setDefaultKeySequence(const QKeySequence &key); - QKeySequence defaultKeySequence() const; + void setDefaultKeySequence(const QKeySequence &key) override; + QKeySequence defaultKeySequence() const override; - void setKeySequence(const QKeySequence &key); - QKeySequence keySequence() const; + void setKeySequence(const QKeySequence &key) override; + QKeySequence keySequence() const override; - void setDescription(const QString &text); - QString description() const; + void setDescription(const QString &text) override; + QString description() const override; - QAction *action() const; + QAction *action() const override; - QString stringWithAppendedShortcut(const QString &str) const; + QString stringWithAppendedShortcut(const QString &str) const override; - Context context() const; + Context context() const override; void setCurrentContext(const Context &context); - bool isActive() const; + bool isActive() const override; void addOverrideAction(QAction *action, const Context &context, bool scriptable); void removeOverrideAction(QAction *action); bool isEmpty() const; - bool isScriptable() const; - bool isScriptable(const Context &context) const; + bool isScriptable() const override; + bool isScriptable(const Context &context) const override; - void setAttribute(CommandAttribute attr); - void removeAttribute(CommandAttribute attr); - bool hasAttribute(CommandAttribute attr) const; + void setAttribute(CommandAttribute attr) override; + void removeAttribute(CommandAttribute attr) override; + bool hasAttribute(CommandAttribute attr) const override; private: void updateActiveState(); diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.h b/src/plugins/coreplugin/actionmanager/commandmappings.h index ddfd7ff280..5b0aece9a0 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.h +++ b/src/plugins/coreplugin/actionmanager/commandmappings.h @@ -46,7 +46,7 @@ class CORE_EXPORT CommandMappings : public QWidget public: CommandMappings(QWidget *parent = 0); - ~CommandMappings(); + ~CommandMappings() override; signals: void currentCommandChanged(QTreeWidgetItem *current); diff --git a/src/plugins/coreplugin/basefilewizard.h b/src/plugins/coreplugin/basefilewizard.h index 860056a040..43f7dd53c4 100644 --- a/src/plugins/coreplugin/basefilewizard.h +++ b/src/plugins/coreplugin/basefilewizard.h @@ -45,12 +45,12 @@ public: explicit BaseFileWizard(const BaseFileWizardFactory *factory, const QVariantMap &extraValues, QWidget *parent = 0); - void initializePage(int id); + void initializePage(int id) override; QList<QWizardPage *> extensionPages(); - void accept(); - void reject(); + void accept() override; + void reject() override; private: void generateFileList(); diff --git a/src/plugins/coreplugin/coreplugin.h b/src/plugins/coreplugin/coreplugin.h index 32c3f94f2b..1341a749c0 100644 --- a/src/plugins/coreplugin/coreplugin.h +++ b/src/plugins/coreplugin/coreplugin.h @@ -51,15 +51,15 @@ class CorePlugin : public ExtensionSystem::IPlugin public: CorePlugin(); - ~CorePlugin(); + ~CorePlugin() override; - bool initialize(const QStringList &arguments, QString *errorMessage = 0); - void extensionsInitialized(); - bool delayedInitialize(); - ShutdownFlag aboutToShutdown(); + bool initialize(const QStringList &arguments, QString *errorMessage = 0) override; + void extensionsInitialized() override; + bool delayedInitialize() override; + ShutdownFlag aboutToShutdown() override; QObject *remoteCommand(const QStringList & /* options */, const QString &workingDirectory, - const QStringList &args); + const QStringList &args) override; public slots: void fileOpenRequest(const QString&); diff --git a/src/plugins/coreplugin/dialogs/addtovcsdialog.h b/src/plugins/coreplugin/dialogs/addtovcsdialog.h index 2aabc530c2..c9c03ef6f9 100644 --- a/src/plugins/coreplugin/dialogs/addtovcsdialog.h +++ b/src/plugins/coreplugin/dialogs/addtovcsdialog.h @@ -39,7 +39,7 @@ class AddToVcsDialog : public QDialog public: explicit AddToVcsDialog(QWidget *parent, const QString &title, const QStringList &files, const QString &vcsDisplayName); - ~AddToVcsDialog(); + ~AddToVcsDialog() override; private: Ui::AddToVcsDialog *ui; diff --git a/src/plugins/coreplugin/dialogs/filepropertiesdialog.h b/src/plugins/coreplugin/dialogs/filepropertiesdialog.h index 906e26aa23..db55abeb0e 100644 --- a/src/plugins/coreplugin/dialogs/filepropertiesdialog.h +++ b/src/plugins/coreplugin/dialogs/filepropertiesdialog.h @@ -42,7 +42,7 @@ class FilePropertiesDialog : public QDialog public: explicit FilePropertiesDialog(const Utils::FileName &fileName, QWidget *parent = nullptr); - ~FilePropertiesDialog(); + ~FilePropertiesDialog() override; private: void refresh(); diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h index be4010dcd5..9d7b831078 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.h +++ b/src/plugins/coreplugin/dialogs/ioptionspage.h @@ -45,7 +45,7 @@ class CORE_EXPORT IOptionsPage : public QObject public: IOptionsPage(QObject *parent = nullptr, bool registerGlobally = true); - virtual ~IOptionsPage(); + ~IOptionsPage() override; static const QList<IOptionsPage *> allOptionsPages(); @@ -91,7 +91,7 @@ class CORE_EXPORT IOptionsPageProvider : public QObject public: IOptionsPageProvider(QObject *parent = nullptr); - ~IOptionsPageProvider(); + ~IOptionsPageProvider() override; static const QList<IOptionsPageProvider *> allOptionsPagesProviders(); diff --git a/src/plugins/coreplugin/dialogs/newdialog.h b/src/plugins/coreplugin/dialogs/newdialog.h index f5ab0d6324..df0c9c777b 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.h +++ b/src/plugins/coreplugin/dialogs/newdialog.h @@ -53,7 +53,7 @@ class NewDialog : public QDialog public: explicit NewDialog(QWidget *parent); - ~NewDialog(); + ~NewDialog() override; void setWizardFactories(QList<IWizardFactory*> factories, const QString &defaultLocation, const QVariantMap &extraVariables); @@ -63,13 +63,13 @@ public: static QWidget *currentDialog(); protected: - bool event(QEvent *); + bool event(QEvent *) override; private: void currentCategoryChanged(const QModelIndex &); void currentItemChanged(const QModelIndex &); - void accept(); - void reject(); + void accept() override; + void reject() override; void updateOkButton(); void setSelectedPlatform(const QString &platform); diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h index b0498aaa8e..74699baab3 100644 --- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h +++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h @@ -67,12 +67,12 @@ public: explicit ReadOnlyFilesDialog(const QList<IDocument *> &documents, QWidget * parent = 0); - ~ReadOnlyFilesDialog(); + ~ReadOnlyFilesDialog() override; void setMessage(const QString &message); void setShowFailWarning(bool show, const QString &warning = QString()); - int exec(); + int exec() override; private: friend class Internal::ReadOnlyFilesDialogPrivate; diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h index c3359f0064..578c6bc7b1 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.h +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h @@ -60,13 +60,13 @@ class ShortcutButton : public QPushButton public: ShortcutButton(QWidget *parent = 0); - QSize sizeHint() const; + QSize sizeHint() const override; signals: void keySequenceChanged(const QKeySequence &sequence); protected: - bool eventFilter(QObject *obj, QEvent *evt); + bool eventFilter(QObject *obj, QEvent *evt) override; private: void updateText(); diff --git a/src/plugins/coreplugin/documentmanager.h b/src/plugins/coreplugin/documentmanager.h index d42077f32a..b76e65d962 100644 --- a/src/plugins/coreplugin/documentmanager.h +++ b/src/plugins/coreplugin/documentmanager.h @@ -157,11 +157,11 @@ signals: void projectsDirectoryChanged(const Utils::FileName &directory); protected: - bool eventFilter(QObject *obj, QEvent *e); + bool eventFilter(QObject *obj, QEvent *e) override; private: explicit DocumentManager(QObject *parent); - ~DocumentManager(); + ~DocumentManager() override; void documentDestroyed(QObject *obj); void checkForNewFileName(); diff --git a/src/plugins/coreplugin/editormanager/editorarea.h b/src/plugins/coreplugin/editormanager/editorarea.h index 2cbece9065..9891e314f5 100644 --- a/src/plugins/coreplugin/editormanager/editorarea.h +++ b/src/plugins/coreplugin/editormanager/editorarea.h @@ -41,7 +41,7 @@ class EditorArea : public SplitterOrView public: EditorArea(); - ~EditorArea(); + ~EditorArea() override; IDocument *currentDocument() const; diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h index a0f44723e6..17d84431e3 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.h +++ b/src/plugins/coreplugin/editormanager/editormanager.h @@ -202,7 +202,7 @@ public slots: private: explicit EditorManager(QObject *parent); - ~EditorManager(); + ~EditorManager() override; friend class Core::Internal::MainWindow; }; diff --git a/src/plugins/coreplugin/editormanager/editormanager_p.h b/src/plugins/coreplugin/editormanager/editormanager_p.h index 94f0b26b8d..ac798222ea 100644 --- a/src/plugins/coreplugin/editormanager/editormanager_p.h +++ b/src/plugins/coreplugin/editormanager/editormanager_p.h @@ -203,7 +203,7 @@ private: private: explicit EditorManagerPrivate(QObject *parent); - ~EditorManagerPrivate(); + ~EditorManagerPrivate() override; void init(); QList<EditLocation> m_globalHistory; diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h index b76f184ed4..3d0c95e6a6 100644 --- a/src/plugins/coreplugin/editormanager/editorview.h +++ b/src/plugins/coreplugin/editormanager/editorview.h @@ -73,7 +73,7 @@ class EditorView : public QWidget public: explicit EditorView(SplitterOrView *parentSplitterOrView, QWidget *parent = nullptr); - virtual ~EditorView(); + ~EditorView() override; SplitterOrView *parentSplitterOrView() const; EditorView *findNextView(); @@ -104,9 +104,9 @@ signals: void currentEditorChanged(Core::IEditor *editor); protected: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *e); - void focusInEvent(QFocusEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *e) override; + void focusInEvent(QFocusEvent *) override; private: friend class SplitterOrView; // for setParentSplitterOrView @@ -169,7 +169,7 @@ class SplitterOrView : public QWidget public: explicit SplitterOrView(IEditor *editor = nullptr); explicit SplitterOrView(EditorView *view); - ~SplitterOrView(); + ~SplitterOrView() override; void split(Qt::Orientation orientation); void unsplit(); @@ -193,8 +193,8 @@ public: EditorView *findLastView(); SplitterOrView *findParentSplitter() const; - QSize sizeHint() const { return minimumSizeHint(); } - QSize minimumSizeHint() const; + QSize sizeHint() const override { return minimumSizeHint(); } + QSize minimumSizeHint() const override; void unsplitAll(); diff --git a/src/plugins/coreplugin/editormanager/ieditorfactory.h b/src/plugins/coreplugin/editormanager/ieditorfactory.h index 5ed1a83eda..d7600adf71 100644 --- a/src/plugins/coreplugin/editormanager/ieditorfactory.h +++ b/src/plugins/coreplugin/editormanager/ieditorfactory.h @@ -41,7 +41,7 @@ class CORE_EXPORT IEditorFactory : public QObject public: IEditorFactory(QObject *parent = nullptr); - ~IEditorFactory(); + ~IEditorFactory() override; static const QList<IEditorFactory *> allEditorFactories(); diff --git a/src/plugins/coreplugin/editormanager/iexternaleditor.h b/src/plugins/coreplugin/editormanager/iexternaleditor.h index 84d99bcef0..712af48eb8 100644 --- a/src/plugins/coreplugin/editormanager/iexternaleditor.h +++ b/src/plugins/coreplugin/editormanager/iexternaleditor.h @@ -39,7 +39,7 @@ class CORE_EXPORT IExternalEditor : public QObject public: explicit IExternalEditor(QObject *parent = nullptr); - ~IExternalEditor(); + ~IExternalEditor() override; static const QList<IExternalEditor *> allExternalEditors(); diff --git a/src/plugins/coreplugin/editortoolbar.h b/src/plugins/coreplugin/editortoolbar.h index 13f50a0943..b3c9fe30da 100644 --- a/src/plugins/coreplugin/editortoolbar.h +++ b/src/plugins/coreplugin/editortoolbar.h @@ -51,7 +51,7 @@ class CORE_EXPORT EditorToolBar : public Utils::StyledBar public: explicit EditorToolBar(QWidget *parent = 0); - virtual ~EditorToolBar(); + ~EditorToolBar() override; typedef std::function<void(QMenu*)> MenuProvider; enum ToolbarCreationFlags { FlagsNone = 0, FlagsStandalone = 1 }; @@ -94,7 +94,7 @@ signals: void currentDocumentMoved(); protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; private: void changeActiveEditor(int row); diff --git a/src/plugins/coreplugin/externaltool.h b/src/plugins/coreplugin/externaltool.h index 2bd86bd9d9..319d8fa335 100644 --- a/src/plugins/coreplugin/externaltool.h +++ b/src/plugins/coreplugin/externaltool.h @@ -52,7 +52,7 @@ public: ExternalTool(); explicit ExternalTool(const ExternalTool *other); - ~ExternalTool(); + ~ExternalTool() override; QString id() const; QString description() const; @@ -123,7 +123,7 @@ class ExternalToolRunner : public QObject Q_OBJECT public: ExternalToolRunner(const ExternalTool *tool); - ~ExternalToolRunner(); + ~ExternalToolRunner() override; bool hasError() const; QString errorString() const; diff --git a/src/plugins/coreplugin/externaltoolmanager.h b/src/plugins/coreplugin/externaltoolmanager.h index 6e1ca666ff..23ec6adc8a 100644 --- a/src/plugins/coreplugin/externaltoolmanager.h +++ b/src/plugins/coreplugin/externaltoolmanager.h @@ -42,7 +42,7 @@ class CORE_EXPORT ExternalToolManager : public QObject public: ExternalToolManager(); - ~ExternalToolManager(); + ~ExternalToolManager() override; static ExternalToolManager *instance(); static QMap<QString, QList<Internal::ExternalTool *> > toolsByCategory(); 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(); diff --git a/src/plugins/coreplugin/findplaceholder.h b/src/plugins/coreplugin/findplaceholder.h index 4029d3e3ab..7858565671 100644 --- a/src/plugins/coreplugin/findplaceholder.h +++ b/src/plugins/coreplugin/findplaceholder.h @@ -38,7 +38,7 @@ class CORE_EXPORT FindToolBarPlaceHolder : public QWidget Q_OBJECT public: explicit FindToolBarPlaceHolder(QWidget *owner, QWidget *parent = 0); - ~FindToolBarPlaceHolder(); + ~FindToolBarPlaceHolder() override; static const QList<FindToolBarPlaceHolder *> allFindToolbarPlaceHolders(); diff --git a/src/plugins/coreplugin/helpmanager.h b/src/plugins/coreplugin/helpmanager.h index 036c58d632..466f0feff3 100644 --- a/src/plugins/coreplugin/helpmanager.h +++ b/src/plugins/coreplugin/helpmanager.h @@ -103,7 +103,7 @@ signals: private: explicit HelpManager(QObject *parent = nullptr); - ~HelpManager(); + ~HelpManager() override; static void setupHelpManager(); static void registerDocumentationNow(QFutureInterface<bool> &futureInterface, diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index fb50484d4e..ca7f4f96c9 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -58,7 +58,7 @@ class CORE_EXPORT ICore : public QObject friend class IWizardFactory; explicit ICore(Internal::MainWindow *mw); - ~ICore(); + ~ICore() override; public: enum class ContextPriority { diff --git a/src/plugins/coreplugin/idocumentfactory.h b/src/plugins/coreplugin/idocumentfactory.h index 461f8aeb4b..9e203870f6 100644 --- a/src/plugins/coreplugin/idocumentfactory.h +++ b/src/plugins/coreplugin/idocumentfactory.h @@ -42,7 +42,7 @@ class CORE_EXPORT IDocumentFactory : public QObject public: IDocumentFactory(QObject *parent = nullptr); - ~IDocumentFactory(); + ~IDocumentFactory() override; static const QList<IDocumentFactory *> allDocumentFactories(); diff --git a/src/plugins/coreplugin/ifilewizardextension.h b/src/plugins/coreplugin/ifilewizardextension.h index 494680a87a..76b8fc7659 100644 --- a/src/plugins/coreplugin/ifilewizardextension.h +++ b/src/plugins/coreplugin/ifilewizardextension.h @@ -49,7 +49,7 @@ class CORE_EXPORT IFileWizardExtension : public QObject Q_OBJECT public: IFileWizardExtension(); - ~IFileWizardExtension(); + ~IFileWizardExtension() override; static QList<IFileWizardExtension *> allFileWizardExtensions(); /* Return a list of pages to be added to the Wizard (empty list if not diff --git a/src/plugins/coreplugin/imode.h b/src/plugins/coreplugin/imode.h index 8d40050791..63901ba768 100644 --- a/src/plugins/coreplugin/imode.h +++ b/src/plugins/coreplugin/imode.h @@ -40,7 +40,7 @@ class CORE_EXPORT IMode : public IContext public: IMode(QObject *parent = 0); - ~IMode(); + ~IMode() override; QString displayName() const { return m_displayName; } QIcon icon() const { return m_icon; } diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.h b/src/plugins/coreplugin/inavigationwidgetfactory.h index e569b4b366..12608a80bc 100644 --- a/src/plugins/coreplugin/inavigationwidgetfactory.h +++ b/src/plugins/coreplugin/inavigationwidgetfactory.h @@ -53,7 +53,7 @@ class CORE_EXPORT INavigationWidgetFactory : public QObject public: INavigationWidgetFactory(); - ~INavigationWidgetFactory(); + ~INavigationWidgetFactory() override; static const QList<INavigationWidgetFactory *> allNavigationFactories(); diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h index d4cd8cc4a9..9ca6b1ef80 100644 --- a/src/plugins/coreplugin/ioutputpane.h +++ b/src/plugins/coreplugin/ioutputpane.h @@ -43,7 +43,7 @@ class CORE_EXPORT IOutputPane : public QObject public: IOutputPane(QObject *parent = nullptr); - ~IOutputPane(); + ~IOutputPane() override; virtual QWidget *outputWidget(QWidget *parent) = 0; virtual QList<QWidget *> toolBarWidgets() const = 0; diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h index eddcee4ff3..8e256c3fff 100644 --- a/src/plugins/coreplugin/iversioncontrol.h +++ b/src/plugins/coreplugin/iversioncontrol.h @@ -87,7 +87,7 @@ public: }; explicit IVersionControl(TopicCache *topicCache = 0) : m_topicCache(topicCache) {} - virtual ~IVersionControl(); + ~IVersionControl() override; virtual QString displayName() const = 0; virtual Id id() const = 0; @@ -243,7 +243,7 @@ public: TestVersionControl(Id id, const QString &name) : m_id(id), m_displayName(name), m_dirCount(0), m_fileCount(0) { } - ~TestVersionControl(); + ~TestVersionControl() override; bool isVcsFileOrDirectory(const Utils::FileName &fileName) const final { Q_UNUSED(fileName); return false; } diff --git a/src/plugins/coreplugin/iwelcomepage.h b/src/plugins/coreplugin/iwelcomepage.h index 7fa43653eb..a25039c406 100644 --- a/src/plugins/coreplugin/iwelcomepage.h +++ b/src/plugins/coreplugin/iwelcomepage.h @@ -49,7 +49,7 @@ class CORE_EXPORT IWelcomePage : public QObject public: IWelcomePage(); - virtual ~IWelcomePage(); + ~IWelcomePage() override; virtual QString title() const = 0; virtual int priority() const { return 0; } @@ -73,7 +73,7 @@ class CORE_EXPORT WelcomePageButton : public WelcomePageFrame { public: WelcomePageButton(QWidget *parent); - ~WelcomePageButton(); + ~WelcomePageButton() override; void mousePressEvent(QMouseEvent *) override; void enterEvent(QEvent *) override; diff --git a/src/plugins/coreplugin/locator/basefilefilter.h b/src/plugins/coreplugin/locator/basefilefilter.h index f843ec3666..1f98cd4a5e 100644 --- a/src/plugins/coreplugin/locator/basefilefilter.h +++ b/src/plugins/coreplugin/locator/basefilefilter.h @@ -54,11 +54,11 @@ public: ListIterator(const QStringList &filePaths); ListIterator(const QStringList &filePaths, const QStringList &fileNames); - void toFront(); - bool hasNext() const; - QString next(); - QString filePath() const; - QString fileName() const; + void toFront() override; + bool hasNext() const override; + QString next() override; + QString filePath() const override; + QString fileName() const override; private: QStringList m_filePaths; @@ -68,7 +68,7 @@ public: }; BaseFileFilter(); - ~BaseFileFilter(); + ~BaseFileFilter() override; void prepareSearch(const QString &entry) override; QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry) override; diff --git a/src/plugins/coreplugin/locator/commandlocator.h b/src/plugins/coreplugin/locator/commandlocator.h index b16b1b6308..db86bb94ab 100644 --- a/src/plugins/coreplugin/locator/commandlocator.h +++ b/src/plugins/coreplugin/locator/commandlocator.h @@ -41,7 +41,7 @@ class CORE_EXPORT CommandLocator : public ILocatorFilter public: CommandLocator(Id id, const QString &displayName, const QString &shortCutString, QObject *parent = nullptr); - ~CommandLocator(); + ~CommandLocator() override; void appendCommand(Command *cmd); diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.h b/src/plugins/coreplugin/locator/ilocatorfilter.h index c6adae975e..ecb47eaae2 100644 --- a/src/plugins/coreplugin/locator/ilocatorfilter.h +++ b/src/plugins/coreplugin/locator/ilocatorfilter.h @@ -108,7 +108,7 @@ public: enum Priority {Highest = 0, High = 1, Medium = 2, Low = 3}; ILocatorFilter(QObject *parent = nullptr); - virtual ~ILocatorFilter(); + ~ILocatorFilter() override; static const QList<ILocatorFilter *> allLocatorFilters(); diff --git a/src/plugins/coreplugin/locator/locator.h b/src/plugins/coreplugin/locator/locator.h index 25627a339a..10b2dc256a 100644 --- a/src/plugins/coreplugin/locator/locator.h +++ b/src/plugins/coreplugin/locator/locator.h @@ -45,7 +45,7 @@ class Locator : public QObject public: Locator(); - ~Locator(); + ~Locator() override; static Locator *instance(); diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index be3af9958b..4d70d7e3ae 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -76,7 +76,7 @@ class MainWindow : public Utils::AppMainWindow public: MainWindow(); - ~MainWindow(); + ~MainWindow() override; void init(); void extensionsInitialized(); @@ -112,7 +112,7 @@ public slots: void exit(); protected: - virtual void closeEvent(QCloseEvent *event); + void closeEvent(QCloseEvent *event) override; private: void openFile(); diff --git a/src/plugins/coreplugin/manhattanstyle.h b/src/plugins/coreplugin/manhattanstyle.h index 752aa08369..70c83dcfe9 100644 --- a/src/plugins/coreplugin/manhattanstyle.h +++ b/src/plugins/coreplugin/manhattanstyle.h @@ -38,33 +38,33 @@ class CORE_EXPORT ManhattanStyle : public QProxyStyle public: explicit ManhattanStyle(const QString &baseStyleName); - ~ManhattanStyle(); + ~ManhattanStyle() override; - void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const; - void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const; - void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget = 0) const; + void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const override; + void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const override; + void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget = 0) const override; - QSize sizeFromContents(ContentsType type, const QStyleOption *option, const QSize &size, const QWidget *widget) const; - QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const; - QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const; + QSize sizeFromContents(ContentsType type, const QStyleOption *option, const QSize &size, const QWidget *widget) const override; + QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const override; + QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const override; - SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, const QPoint &pos, const QWidget *widget = 0) const; - QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget = 0) const; - QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0, const QWidget *widget = 0) const; - int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const; + SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, const QPoint &pos, const QWidget *widget = 0) const override; + QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget = 0) const override; + QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0, const QWidget *widget = 0) const override; + int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const override; QRect itemRect(QPainter *p, const QRect &r, int flags, bool enabled, const QPixmap *pixmap, const QString &text, int len = -1) const; - QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const; + QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const override; - int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const; + int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override; - QPalette standardPalette() const; + QPalette standardPalette() const override; - void polish(QWidget *widget); - void polish(QPalette &pal); - void polish(QApplication *app); + void polish(QWidget *widget) override; + void polish(QPalette &pal) override; + void polish(QApplication *app) override; - void unpolish(QWidget *widget); - void unpolish(QApplication *app); + void unpolish(QWidget *widget) override; + void unpolish(QApplication *app) override; private: void drawButtonSeparator(QPainter *painter, const QRect &rect, bool reverse) const; diff --git a/src/plugins/coreplugin/messagemanager.h b/src/plugins/coreplugin/messagemanager.h index 485807d76e..d530db8603 100644 --- a/src/plugins/coreplugin/messagemanager.h +++ b/src/plugins/coreplugin/messagemanager.h @@ -61,7 +61,7 @@ public slots: private: MessageManager(); - ~MessageManager(); + ~MessageManager() override; static void init(); friend class Core::Internal::MainWindow; }; diff --git a/src/plugins/coreplugin/minisplitter.h b/src/plugins/coreplugin/minisplitter.h index 52f4667887..7329b1a109 100644 --- a/src/plugins/coreplugin/minisplitter.h +++ b/src/plugins/coreplugin/minisplitter.h @@ -45,7 +45,7 @@ public: MiniSplitter(Qt::Orientation orientation, SplitterStyle style = Dark); protected: - QSplitterHandle *createHandle(); + QSplitterHandle *createHandle() override; private: SplitterStyle m_style; @@ -57,7 +57,7 @@ public: explicit NonResizingSplitter(QWidget *parent, SplitterStyle style = Light); protected: - void resizeEvent(QResizeEvent *ev); + void resizeEvent(QResizeEvent *ev) override; }; diff --git a/src/plugins/coreplugin/modemanager.h b/src/plugins/coreplugin/modemanager.h index 1aaf723f00..4922a0b51b 100644 --- a/src/plugins/coreplugin/modemanager.h +++ b/src/plugins/coreplugin/modemanager.h @@ -68,7 +68,7 @@ signals: private: explicit ModeManager(Internal::MainWindow *mainWindow, Internal::FancyTabWidget *modeStack); - ~ModeManager(); + ~ModeManager() override; static void extensionsInitialized(); diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h index 0f43e4ce04..37d5cffc64 100644 --- a/src/plugins/coreplugin/navigationwidget.h +++ b/src/plugins/coreplugin/navigationwidget.h @@ -54,7 +54,7 @@ class CORE_EXPORT NavigationWidgetPlaceHolder : public QWidget public: explicit NavigationWidgetPlaceHolder(Id mode, Side side, QWidget *parent = 0); - virtual ~NavigationWidgetPlaceHolder(); + ~NavigationWidgetPlaceHolder() override; static NavigationWidgetPlaceHolder *current(Side side); static void setCurrent(Side side, NavigationWidgetPlaceHolder *navWidget); void applyStoredSize(); @@ -81,7 +81,7 @@ public: }; explicit NavigationWidget(QAction *toggleSideBarAction, Side side); - virtual ~NavigationWidget(); + ~NavigationWidget() override; void setFactories(const QList<INavigationWidgetFactory*> &factories); @@ -107,7 +107,7 @@ public: QAbstractItemModel *factoryModel() const; protected: - void resizeEvent(QResizeEvent *); + void resizeEvent(QResizeEvent *) override; private: void splitSubWidget(int factoryIndex); diff --git a/src/plugins/coreplugin/opendocumentstreeview.h b/src/plugins/coreplugin/opendocumentstreeview.h index 50286b63d4..0390058f0c 100644 --- a/src/plugins/coreplugin/opendocumentstreeview.h +++ b/src/plugins/coreplugin/opendocumentstreeview.h @@ -38,14 +38,14 @@ class CORE_EXPORT OpenDocumentsTreeView : public Utils::TreeView public: explicit OpenDocumentsTreeView(QWidget *parent = 0); - void setModel(QAbstractItemModel *model); + void setModel(QAbstractItemModel *model) override; void setCloseButtonVisible(bool visible); signals: void closeActivated(const QModelIndex &index); protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; private: Internal::OpenDocumentsDelegate *m_delegate; diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h index 072cda75ab..a9dbafc01a 100644 --- a/src/plugins/coreplugin/outputpane.h +++ b/src/plugins/coreplugin/outputpane.h @@ -43,7 +43,7 @@ class CORE_EXPORT OutputPanePlaceHolder : public QWidget public: explicit OutputPanePlaceHolder(Id mode, QSplitter *parent = 0); - ~OutputPanePlaceHolder(); + ~OutputPanePlaceHolder() override; static OutputPanePlaceHolder *getCurrent(); static bool isCurrentVisible(); @@ -54,8 +54,8 @@ public: int nonMaximizedSize() const; protected: - void resizeEvent(QResizeEvent *event); - void showEvent(QShowEvent *); + void resizeEvent(QResizeEvent *event) override; + void showEvent(QShowEvent *) override; private: void setHeight(int height); diff --git a/src/plugins/coreplugin/outputpanemanager.h b/src/plugins/coreplugin/outputpanemanager.h index f5b7827dac..1520a65043 100644 --- a/src/plugins/coreplugin/outputpanemanager.h +++ b/src/plugins/coreplugin/outputpanemanager.h @@ -65,7 +65,7 @@ public slots: void toggleMaximized(); protected: - void focusInEvent(QFocusEvent *e); + void focusInEvent(QFocusEvent *e) override; private: // the only class that is allowed to create and destroy @@ -76,7 +76,7 @@ private: static void destroy(); explicit OutputPaneManager(QWidget *parent = 0); - ~OutputPaneManager(); + ~OutputPaneManager() override; void shortcutTriggered(int idx); void clearPage(); @@ -137,14 +137,14 @@ class OutputPaneToggleButton : public QToolButton public: OutputPaneToggleButton(int number, const QString &text, QAction *action, QWidget *parent = 0); - QSize sizeHint() const; - void paintEvent(QPaintEvent*); + QSize sizeHint() const override; + void paintEvent(QPaintEvent*) override; void flash(int count = 3); void setIconBadgeNumber(int number); private: void updateToolTip(); - void checkStateSet(); + void checkStateSet() override; QString m_number; QString m_text; @@ -158,8 +158,8 @@ class OutputPaneManageButton : public QToolButton Q_OBJECT public: OutputPaneManageButton(); - QSize sizeHint() const; - void paintEvent(QPaintEvent*); + QSize sizeHint() const override; + void paintEvent(QPaintEvent*) override; }; } // namespace Internal diff --git a/src/plugins/coreplugin/outputwindow.h b/src/plugins/coreplugin/outputwindow.h index 405634477d..82c56b5553 100644 --- a/src/plugins/coreplugin/outputwindow.h +++ b/src/plugins/coreplugin/outputwindow.h @@ -46,7 +46,7 @@ class CORE_EXPORT OutputWindow : public QPlainTextEdit public: OutputWindow(Context context, QWidget *parent = 0); - ~OutputWindow(); + ~OutputWindow() override; Utils::OutputFormatter *formatter() const; void setFormatter(Utils::OutputFormatter *formatter); diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.h b/src/plugins/coreplugin/progressmanager/futureprogress.h index e079b7e9e4..a3a186c2e3 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.h +++ b/src/plugins/coreplugin/progressmanager/futureprogress.h @@ -46,9 +46,9 @@ public: KeepOnFinish = 2 }; explicit FutureProgress(QWidget *parent = 0); - virtual ~FutureProgress(); + ~FutureProgress() override; - virtual bool eventFilter(QObject *object, QEvent *); + bool eventFilter(QObject *object, QEvent *) override; void setFuture(const QFuture<void> &future); QFuture<void> future() const; @@ -72,7 +72,7 @@ public: bool isFading() const; - QSize sizeHint() const; + QSize sizeHint() const override; signals: void clicked(); @@ -85,8 +85,8 @@ signals: void statusBarWidgetChanged(); protected: - void mousePressEvent(QMouseEvent *event); - void paintEvent(QPaintEvent *); + void mousePressEvent(QMouseEvent *event) override; + void paintEvent(QPaintEvent *) override; private: void updateToolTip(const QString &); diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h index 4d006a45a7..5f827d7e43 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager.h @@ -66,7 +66,7 @@ signals: private: ProgressManager(); - ~ProgressManager(); + ~ProgressManager() override; friend class Core::Internal::ProgressManagerPrivate; }; diff --git a/src/plugins/coreplugin/progressmanager/progressmanager_p.h b/src/plugins/coreplugin/progressmanager/progressmanager_p.h index 47e5c4334a..7680b81a35 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager_p.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager_p.h @@ -49,7 +49,7 @@ class ProgressManagerPrivate : public Core::ProgressManager Q_OBJECT public: ProgressManagerPrivate(); - ~ProgressManagerPrivate(); + ~ProgressManagerPrivate() override; void init(); void cleanup(); @@ -63,7 +63,7 @@ public slots: void doCancelTasks(Core::Id type); protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; private: void taskFinished(); @@ -115,8 +115,8 @@ class ToggleButton : public QToolButton Q_OBJECT public: ToggleButton(QWidget *parent); - QSize sizeHint() const; - void paintEvent(QPaintEvent *event); + QSize sizeHint() const override; + void paintEvent(QPaintEvent *event) override; }; } // namespace Internal diff --git a/src/plugins/coreplugin/progressmanager/progressview.h b/src/plugins/coreplugin/progressmanager/progressview.h index 93a030793a..2748ed5ff5 100644 --- a/src/plugins/coreplugin/progressmanager/progressview.h +++ b/src/plugins/coreplugin/progressmanager/progressview.h @@ -44,7 +44,7 @@ class ProgressView : public QWidget public: ProgressView(QWidget *parent = 0); - ~ProgressView(); + ~ProgressView() override; void addProgressWidget(QWidget *widget); void removeProgressWidget(QWidget *widget); @@ -54,8 +54,8 @@ public: void setReferenceWidget(QWidget *widget); protected: - bool event(QEvent *event); - bool eventFilter(QObject *obj, QEvent *event); + bool event(QEvent *event) override; + bool eventFilter(QObject *obj, QEvent *event) override; signals: void hoveredChanged(bool hovered); diff --git a/src/plugins/coreplugin/reaper_p.h b/src/plugins/coreplugin/reaper_p.h index 474dbc6e0c..f4f1007134 100644 --- a/src/plugins/coreplugin/reaper_p.h +++ b/src/plugins/coreplugin/reaper_p.h @@ -41,7 +41,7 @@ class ProcessReaper : public QObject public: ProcessReaper(QProcess *p, int timeoutMs); - ~ProcessReaper(); + ~ProcessReaper() override; int timeoutMs() const; bool isFinished() const; diff --git a/src/plugins/coreplugin/rightpane.h b/src/plugins/coreplugin/rightpane.h index ab3aab18e7..a50f7ddce8 100644 --- a/src/plugins/coreplugin/rightpane.h +++ b/src/plugins/coreplugin/rightpane.h @@ -45,7 +45,7 @@ class CORE_EXPORT RightPanePlaceHolder : public QWidget public: explicit RightPanePlaceHolder(Id mode, QWidget *parent = 0); - ~RightPanePlaceHolder(); + ~RightPanePlaceHolder() override; static RightPanePlaceHolder *current(); private: @@ -61,7 +61,7 @@ class CORE_EXPORT RightPaneWidget : public QWidget public: RightPaneWidget(); - ~RightPaneWidget(); + ~RightPaneWidget() override; void saveSettings(QSettings *settings); void readSettings(QSettings *settings); @@ -76,7 +76,7 @@ public: int storedWidth(); protected: - void resizeEvent(QResizeEvent *); + void resizeEvent(QResizeEvent *) override; private: void clearWidget(); diff --git a/src/plugins/coreplugin/settingsdatabase.h b/src/plugins/coreplugin/settingsdatabase.h index 382618552c..95b745dc8a 100644 --- a/src/plugins/coreplugin/settingsdatabase.h +++ b/src/plugins/coreplugin/settingsdatabase.h @@ -40,7 +40,7 @@ class CORE_EXPORT SettingsDatabase : public QObject { public: SettingsDatabase(const QString &path, const QString &application, QObject *parent = 0); - ~SettingsDatabase(); + ~SettingsDatabase() override; void setValue(const QString &key, const QVariant &value); QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const; diff --git a/src/plugins/coreplugin/shellcommand.h b/src/plugins/coreplugin/shellcommand.h index 7de7246d3d..a5cd59bfa6 100644 --- a/src/plugins/coreplugin/shellcommand.h +++ b/src/plugins/coreplugin/shellcommand.h @@ -39,7 +39,7 @@ public: ShellCommand(const QString &workingDirectory, const QProcessEnvironment &environment); protected: - void addTask(QFuture<void> &future); + void addTask(QFuture<void> &future) override; virtual void coreAboutToClose(); }; diff --git a/src/plugins/coreplugin/sidebar.h b/src/plugins/coreplugin/sidebar.h index 2a09357573..b2fe7a9658 100644 --- a/src/plugins/coreplugin/sidebar.h +++ b/src/plugins/coreplugin/sidebar.h @@ -56,7 +56,7 @@ class CORE_EXPORT SideBarItem : public QObject public: // id is non-localized string of the item that's used to store the settings. explicit SideBarItem(QWidget *widget, const QString &id); - virtual ~SideBarItem(); + ~SideBarItem() override; QWidget *widget() const; QString id() const; @@ -86,7 +86,7 @@ public: * of multiple SideBars. */ SideBar(QList<SideBarItem *> widgetList, QList<SideBarItem *> defaultVisible); - virtual ~SideBar(); + ~SideBar() override; QStringList availableItemIds() const; QStringList availableItemTitles() const; diff --git a/src/plugins/coreplugin/themechooser.h b/src/plugins/coreplugin/themechooser.h index 5193034760..f823ad00e0 100644 --- a/src/plugins/coreplugin/themechooser.h +++ b/src/plugins/coreplugin/themechooser.h @@ -63,7 +63,7 @@ class ThemeChooser : public QWidget public: ThemeChooser(QWidget *parent = 0); - ~ThemeChooser(); + ~ThemeChooser() override; void apply(); diff --git a/src/plugins/coreplugin/variablechooser.h b/src/plugins/coreplugin/variablechooser.h index 00f79defeb..5d2f413f47 100644 --- a/src/plugins/coreplugin/variablechooser.h +++ b/src/plugins/coreplugin/variablechooser.h @@ -42,7 +42,7 @@ class CORE_EXPORT VariableChooser : public QWidget public: explicit VariableChooser(QWidget *parent = 0); - ~VariableChooser(); + ~VariableChooser() override; void addMacroExpanderProvider(const Utils::MacroExpanderProvider &provider); void addSupportedWidget(QWidget *textcontrol, const QByteArray &ownName = QByteArray()); @@ -50,8 +50,8 @@ public: static void addSupportForChildWidgets(QWidget *parent, Utils::MacroExpander *expander); protected: - bool event(QEvent *ev); - bool eventFilter(QObject *, QEvent *event); + bool event(QEvent *ev) override; + bool eventFilter(QObject *, QEvent *event) override; private: Internal::VariableChooserPrivate *d; diff --git a/src/plugins/coreplugin/vcsmanager.h b/src/plugins/coreplugin/vcsmanager.h index 147d7a4aee..c648a58471 100644 --- a/src/plugins/coreplugin/vcsmanager.h +++ b/src/plugins/coreplugin/vcsmanager.h @@ -108,7 +108,7 @@ signals: private: explicit VcsManager(QObject *parent = 0); - ~VcsManager(); + ~VcsManager() override; static void addVersionControl(IVersionControl *vc); |