aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2018-05-07 15:02:41 +0200
committerTobias Hunger <tobias.hunger@qt.io>2018-05-08 07:37:17 +0000
commit5e2fe8aea28e4cd6039b1f31c4287f1b29839572 (patch)
tree3ec8397c5852e3fed096d931595c3432daf4d969 /src
parentb6f5ec35593fc534f4713d2de10aa03279769964 (diff)
TextEditor: Use override consistently
clang-tidy fixes from modernize-use-override check. Change-Id: Ie98c08279d7bf01f2705f631500dcabac5ba85d1 Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/texteditor/basefilefind.h12
-rw-r--r--src/plugins/texteditor/behaviorsettingspage.h8
-rw-r--r--src/plugins/texteditor/behaviorsettingswidget.h2
-rw-r--r--src/plugins/texteditor/codeassist/assistproposalitem.h2
-rw-r--r--src/plugins/texteditor/codeassist/codeassistant.h2
-rw-r--r--src/plugins/texteditor/codeassist/completionassistprovider.h2
-rw-r--r--src/plugins/texteditor/codeassist/functionhintproposal.h2
-rw-r--r--src/plugins/texteditor/codeassist/genericproposal.h2
-rw-r--r--src/plugins/texteditor/codeassist/genericproposalmodel.h2
-rw-r--r--src/plugins/texteditor/codeassist/genericproposalwidget.h2
-rw-r--r--src/plugins/texteditor/codeassist/iassistproposalwidget.h2
-rw-r--r--src/plugins/texteditor/codeassist/ifunctionhintproposalmodel.h2
-rw-r--r--src/plugins/texteditor/codecselector.h2
-rw-r--r--src/plugins/texteditor/codestylepool.h2
-rw-r--r--src/plugins/texteditor/codestyleselectorwidget.h2
-rw-r--r--src/plugins/texteditor/colorschemeedit.h2
-rw-r--r--src/plugins/texteditor/completionsettingspage.h8
-rw-r--r--src/plugins/texteditor/displaysettingspage.h8
-rw-r--r--src/plugins/texteditor/findincurrentfile.h18
-rw-r--r--src/plugins/texteditor/findinopenfiles.h18
-rw-r--r--src/plugins/texteditor/fontsettingspage.h8
-rw-r--r--src/plugins/texteditor/generichighlighter/highlighter.h4
-rw-r--r--src/plugins/texteditor/generichighlighter/highlightersettingspage.h8
-rw-r--r--src/plugins/texteditor/generichighlighter/manager.h2
-rw-r--r--src/plugins/texteditor/icodestylepreferences.h2
-rw-r--r--src/plugins/texteditor/outlinefactory.h8
-rw-r--r--src/plugins/texteditor/simplecodestylepreferences.h6
-rw-r--r--src/plugins/texteditor/snippets/snippeteditor.h4
-rw-r--r--src/plugins/texteditor/snippets/snippetssettingspage.h8
-rw-r--r--src/plugins/texteditor/syntaxhighlighter.h2
-rw-r--r--src/plugins/texteditor/tabsettingswidget.h2
-rw-r--r--src/plugins/texteditor/textdocumentlayout.h2
-rw-r--r--src/plugins/texteditor/texteditoractionhandler.h2
-rw-r--r--src/plugins/texteditor/texteditorsettings.h2
34 files changed, 80 insertions, 80 deletions
diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h
index 222dfd4e87..b204b023e5 100644
--- a/src/plugins/texteditor/basefilefind.h
+++ b/src/plugins/texteditor/basefilefind.h
@@ -66,7 +66,7 @@ class TEXTEDITOR_EXPORT SearchEngine : public QObject
Q_OBJECT
public:
SearchEngine(QObject *parent = nullptr);
- ~SearchEngine();
+ ~SearchEngine() override;
virtual QString title() const = 0;
virtual QString toolTip() const = 0; // add %1 placeholder where the find flags should be put
virtual QWidget *widget() const = 0;
@@ -93,12 +93,12 @@ class TEXTEDITOR_EXPORT BaseFileFind : public Core::IFindFilter
public:
BaseFileFind();
- ~BaseFileFind();
+ ~BaseFileFind() override;
- bool isEnabled() const;
- bool isReplaceSupported() const { return true; }
- void findAll(const QString &txt, Core::FindFlags findFlags);
- void replaceAll(const QString &txt, Core::FindFlags findFlags);
+ bool isEnabled() const override;
+ bool isReplaceSupported() const override { return true; }
+ void findAll(const QString &txt, Core::FindFlags findFlags) override;
+ void replaceAll(const QString &txt, Core::FindFlags findFlags) override;
void addSearchEngine(SearchEngine *searchEngine);
/* returns the list of unique files that were passed in items */
diff --git a/src/plugins/texteditor/behaviorsettingspage.h b/src/plugins/texteditor/behaviorsettingspage.h
index 42e70f6972..04b3250c3b 100644
--- a/src/plugins/texteditor/behaviorsettingspage.h
+++ b/src/plugins/texteditor/behaviorsettingspage.h
@@ -54,12 +54,12 @@ class BehaviorSettingsPage : public TextEditorOptionsPage
public:
BehaviorSettingsPage(const BehaviorSettingsPageParameters &p, QObject *parent);
- ~BehaviorSettingsPage();
+ ~BehaviorSettingsPage() override;
// IOptionsPage
- QWidget *widget();
- void apply();
- void finish();
+ QWidget *widget() override;
+ void apply() override;
+ void finish() override;
ICodeStylePreferences *codeStyle() const;
CodeStylePool *codeStylePool() const;
diff --git a/src/plugins/texteditor/behaviorsettingswidget.h b/src/plugins/texteditor/behaviorsettingswidget.h
index 12c4b7eedd..12d0b43518 100644
--- a/src/plugins/texteditor/behaviorsettingswidget.h
+++ b/src/plugins/texteditor/behaviorsettingswidget.h
@@ -50,7 +50,7 @@ class TEXTEDITOR_EXPORT BehaviorSettingsWidget : public QWidget
public:
explicit BehaviorSettingsWidget(QWidget *parent = 0);
- virtual ~BehaviorSettingsWidget();
+ ~BehaviorSettingsWidget() override;
void setActive(bool active);
diff --git a/src/plugins/texteditor/codeassist/assistproposalitem.h b/src/plugins/texteditor/codeassist/assistproposalitem.h
index 286eef67dc..a98c9a6072 100644
--- a/src/plugins/texteditor/codeassist/assistproposalitem.h
+++ b/src/plugins/texteditor/codeassist/assistproposalitem.h
@@ -39,7 +39,7 @@ namespace TextEditor {
class TEXTEDITOR_EXPORT AssistProposalItem : public AssistProposalItemInterface
{
public:
- ~AssistProposalItem() Q_DECL_NOEXCEPT {}
+ ~AssistProposalItem() Q_DECL_NOEXCEPT override {}
QString text() const override;
bool implicitlyApplies() const override;
bool prematurelyApplies(const QChar &c) const override;
diff --git a/src/plugins/texteditor/codeassist/codeassistant.h b/src/plugins/texteditor/codeassist/codeassistant.h
index 06e3387c1f..5f66442a9f 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.h
+++ b/src/plugins/texteditor/codeassist/codeassistant.h
@@ -43,7 +43,7 @@ class CodeAssistant : public QObject
public:
CodeAssistant();
- ~CodeAssistant();
+ ~CodeAssistant() override;
void configure(TextEditorWidget *editorWidget);
diff --git a/src/plugins/texteditor/codeassist/completionassistprovider.h b/src/plugins/texteditor/codeassist/completionassistprovider.h
index 8411820577..a42c47e7dc 100644
--- a/src/plugins/texteditor/codeassist/completionassistprovider.h
+++ b/src/plugins/texteditor/codeassist/completionassistprovider.h
@@ -36,7 +36,7 @@ class TEXTEDITOR_EXPORT CompletionAssistProvider : public IAssistProvider
public:
CompletionAssistProvider(QObject *parent = 0);
- ~CompletionAssistProvider();
+ ~CompletionAssistProvider() override;
IAssistProvider::RunType runType() const override;
virtual int activationCharSequenceLength() const;
diff --git a/src/plugins/texteditor/codeassist/functionhintproposal.h b/src/plugins/texteditor/codeassist/functionhintproposal.h
index a4fd7ebe6a..2f2788aa4a 100644
--- a/src/plugins/texteditor/codeassist/functionhintproposal.h
+++ b/src/plugins/texteditor/codeassist/functionhintproposal.h
@@ -36,7 +36,7 @@ class TEXTEDITOR_EXPORT FunctionHintProposal : public IAssistProposal
{
public:
FunctionHintProposal(int cursorPos, FunctionHintProposalModelPtr model);
- ~FunctionHintProposal();
+ ~FunctionHintProposal() override;
ProposalModelPtr model() const override;
IAssistProposalWidget *createWidget() const override;
diff --git a/src/plugins/texteditor/codeassist/genericproposal.h b/src/plugins/texteditor/codeassist/genericproposal.h
index eafa6ce6f9..f9a30e947d 100644
--- a/src/plugins/texteditor/codeassist/genericproposal.h
+++ b/src/plugins/texteditor/codeassist/genericproposal.h
@@ -40,7 +40,7 @@ public:
GenericProposal(int cursorPos, GenericProposalModelPtr model);
GenericProposal(int cursorPos, const QList<AssistProposalItemInterface *> &items);
- ~GenericProposal();
+ ~GenericProposal() override;
static GenericProposal *createProposal(const AssistInterface *interface,
const QuickFixOperations &quickFixes);
diff --git a/src/plugins/texteditor/codeassist/genericproposalmodel.h b/src/plugins/texteditor/codeassist/genericproposalmodel.h
index 25de296f7b..47e4f716fc 100644
--- a/src/plugins/texteditor/codeassist/genericproposalmodel.h
+++ b/src/plugins/texteditor/codeassist/genericproposalmodel.h
@@ -45,7 +45,7 @@ class TEXTEDITOR_EXPORT GenericProposalModel : public IAssistProposalModel
{
public:
GenericProposalModel();
- ~GenericProposalModel();
+ ~GenericProposalModel() override;
void reset() override;
int size() const override;
diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.h b/src/plugins/texteditor/codeassist/genericproposalwidget.h
index 86ce6be873..7a75c6ab64 100644
--- a/src/plugins/texteditor/codeassist/genericproposalwidget.h
+++ b/src/plugins/texteditor/codeassist/genericproposalwidget.h
@@ -43,7 +43,7 @@ class TEXTEDITOR_EXPORT GenericProposalWidget : public IAssistProposalWidget
public:
GenericProposalWidget();
- ~GenericProposalWidget();
+ ~GenericProposalWidget() override;
void setAssistant(CodeAssistant *assistant) override;
void setReason(AssistReason reason) override;
diff --git a/src/plugins/texteditor/codeassist/iassistproposalwidget.h b/src/plugins/texteditor/codeassist/iassistproposalwidget.h
index 98411ddeb6..0b7fdc0ddd 100644
--- a/src/plugins/texteditor/codeassist/iassistproposalwidget.h
+++ b/src/plugins/texteditor/codeassist/iassistproposalwidget.h
@@ -43,7 +43,7 @@ class TEXTEDITOR_EXPORT IAssistProposalWidget : public QFrame
public:
IAssistProposalWidget();
- virtual ~IAssistProposalWidget();
+ ~IAssistProposalWidget() override;
virtual void setAssistant(CodeAssistant *assistant) = 0;
virtual void setReason(AssistReason reason) = 0;
diff --git a/src/plugins/texteditor/codeassist/ifunctionhintproposalmodel.h b/src/plugins/texteditor/codeassist/ifunctionhintproposalmodel.h
index 7649a6398e..0b91af9daa 100644
--- a/src/plugins/texteditor/codeassist/ifunctionhintproposalmodel.h
+++ b/src/plugins/texteditor/codeassist/ifunctionhintproposalmodel.h
@@ -37,7 +37,7 @@ class TEXTEDITOR_EXPORT IFunctionHintProposalModel : public IAssistProposalModel
{
public:
IFunctionHintProposalModel();
- ~IFunctionHintProposalModel();
+ ~IFunctionHintProposalModel() override;
virtual int activeArgument(const QString &prefix) const = 0;
virtual QString id(int index) const;
diff --git a/src/plugins/texteditor/codecselector.h b/src/plugins/texteditor/codecselector.h
index 4bd84eb4c4..64081ca349 100644
--- a/src/plugins/texteditor/codecselector.h
+++ b/src/plugins/texteditor/codecselector.h
@@ -45,7 +45,7 @@ class CodecSelector : public QDialog
public:
CodecSelector(QWidget *parent, TextDocument *doc);
- ~CodecSelector();
+ ~CodecSelector() override;
QTextCodec *selectedCodec() const;
diff --git a/src/plugins/texteditor/codestylepool.h b/src/plugins/texteditor/codestylepool.h
index 4c8727ab05..c40e5df535 100644
--- a/src/plugins/texteditor/codestylepool.h
+++ b/src/plugins/texteditor/codestylepool.h
@@ -43,7 +43,7 @@ class TEXTEDITOR_EXPORT CodeStylePool : public QObject
Q_OBJECT
public:
explicit CodeStylePool(ICodeStylePreferencesFactory *factory, QObject *parent = 0);
- virtual ~CodeStylePool();
+ ~CodeStylePool() override;
QList<ICodeStylePreferences *> codeStyles() const;
QList<ICodeStylePreferences *> builtInCodeStyles() const;
diff --git a/src/plugins/texteditor/codestyleselectorwidget.h b/src/plugins/texteditor/codestyleselectorwidget.h
index f498ecacd7..5c5590ce2f 100644
--- a/src/plugins/texteditor/codestyleselectorwidget.h
+++ b/src/plugins/texteditor/codestyleselectorwidget.h
@@ -41,7 +41,7 @@ class TEXTEDITOR_EXPORT CodeStyleSelectorWidget : public QWidget
Q_OBJECT
public:
explicit CodeStyleSelectorWidget(ICodeStylePreferencesFactory *factory, QWidget *parent = 0);
- ~CodeStyleSelectorWidget();
+ ~CodeStyleSelectorWidget() override;
void setCodeStyle(TextEditor::ICodeStylePreferences *codeStyle);
diff --git a/src/plugins/texteditor/colorschemeedit.h b/src/plugins/texteditor/colorschemeedit.h
index e3875cffd9..c12f76d177 100644
--- a/src/plugins/texteditor/colorschemeedit.h
+++ b/src/plugins/texteditor/colorschemeedit.h
@@ -50,7 +50,7 @@ class ColorSchemeEdit : public QWidget
public:
ColorSchemeEdit(QWidget *parent = 0);
- ~ColorSchemeEdit();
+ ~ColorSchemeEdit() override;
void setFormatDescriptions(const FormatDescriptions &descriptions);
void setBaseFont(const QFont &font);
diff --git a/src/plugins/texteditor/completionsettingspage.h b/src/plugins/texteditor/completionsettingspage.h
index f6b773c775..9258e67a31 100644
--- a/src/plugins/texteditor/completionsettingspage.h
+++ b/src/plugins/texteditor/completionsettingspage.h
@@ -43,11 +43,11 @@ class CompletionSettingsPage : public TextEditorOptionsPage
public:
CompletionSettingsPage(QObject *parent);
- ~CompletionSettingsPage();
+ ~CompletionSettingsPage() override;
- QWidget *widget();
- void apply();
- void finish();
+ QWidget *widget() override;
+ void apply() override;
+ void finish() override;
const CompletionSettings & completionSettings();
const CommentsSettings & commentsSettings();
diff --git a/src/plugins/texteditor/displaysettingspage.h b/src/plugins/texteditor/displaysettingspage.h
index 8370f840cc..8f937c0236 100644
--- a/src/plugins/texteditor/displaysettingspage.h
+++ b/src/plugins/texteditor/displaysettingspage.h
@@ -48,12 +48,12 @@ class DisplaySettingsPage : public TextEditorOptionsPage
public:
DisplaySettingsPage(const DisplaySettingsPageParameters &p, QObject *parent);
- ~DisplaySettingsPage();
+ ~DisplaySettingsPage() override;
// IOptionsPage
- QWidget *widget();
- void apply();
- void finish();
+ QWidget *widget() override;
+ void apply() override;
+ void finish() override;
const DisplaySettings &displaySettings() const;
const MarginSettings &marginSettings() const;
diff --git a/src/plugins/texteditor/findincurrentfile.h b/src/plugins/texteditor/findincurrentfile.h
index 4f1295d818..59015a9cfe 100644
--- a/src/plugins/texteditor/findincurrentfile.h
+++ b/src/plugins/texteditor/findincurrentfile.h
@@ -44,19 +44,19 @@ class FindInCurrentFile : public BaseFileFind
public:
FindInCurrentFile();
- QString id() const;
- QString displayName() const;
- bool isEnabled() const;
- void writeSettings(QSettings *settings);
- void readSettings(QSettings *settings);
+ QString id() const override;
+ QString displayName() const override;
+ bool isEnabled() const override;
+ void writeSettings(QSettings *settings) override;
+ void readSettings(QSettings *settings) override;
protected:
Utils::FileIterator *files(const QStringList &nameFilters,
const QStringList &exclusionFilters,
- const QVariant &additionalParameters) const;
- QVariant additionalParameters() const;
- QString label() const;
- QString toolTip() const;
+ const QVariant &additionalParameters) const override;
+ QVariant additionalParameters() const override;
+ QString label() const override;
+ QString toolTip() const override;
private:
void handleFileChange(Core::IEditor *editor);
diff --git a/src/plugins/texteditor/findinopenfiles.h b/src/plugins/texteditor/findinopenfiles.h
index 6caf7936af..8d9c208b3e 100644
--- a/src/plugins/texteditor/findinopenfiles.h
+++ b/src/plugins/texteditor/findinopenfiles.h
@@ -37,19 +37,19 @@ class FindInOpenFiles : public BaseFileFind
public:
FindInOpenFiles();
- QString id() const;
- QString displayName() const;
- bool isEnabled() const;
- void writeSettings(QSettings *settings);
- void readSettings(QSettings *settings);
+ QString id() const override;
+ QString displayName() const override;
+ bool isEnabled() const override;
+ void writeSettings(QSettings *settings) override;
+ void readSettings(QSettings *settings) override;
protected:
Utils::FileIterator *files(const QStringList &nameFilters,
const QStringList &exclusionFilters,
- const QVariant &additionalParameters) const;
- QVariant additionalParameters() const;
- QString label() const;
- QString toolTip() const;
+ const QVariant &additionalParameters) const override;
+ QVariant additionalParameters() const override;
+ QString label() const override;
+ QString toolTip() const override;
private:
void updateEnabledState();
diff --git a/src/plugins/texteditor/fontsettingspage.h b/src/plugins/texteditor/fontsettingspage.h
index 2def49a2a8..a68e3293b0 100644
--- a/src/plugins/texteditor/fontsettingspage.h
+++ b/src/plugins/texteditor/fontsettingspage.h
@@ -122,11 +122,11 @@ class TEXTEDITOR_EXPORT FontSettingsPage : public TextEditorOptionsPage
public:
FontSettingsPage(const FormatDescriptions &fd, Core::Id id, QObject *parent = 0);
- ~FontSettingsPage();
+ ~FontSettingsPage() override;
- QWidget *widget();
- void apply();
- void finish();
+ QWidget *widget() override;
+ void apply() override;
+ void finish() override;
void saveSettings();
diff --git a/src/plugins/texteditor/generichighlighter/highlighter.h b/src/plugins/texteditor/generichighlighter/highlighter.h
index 4c69d9977b..9152ce85d7 100644
--- a/src/plugins/texteditor/generichighlighter/highlighter.h
+++ b/src/plugins/texteditor/generichighlighter/highlighter.h
@@ -61,7 +61,7 @@ class Highlighter : public TextEditor::SyntaxHighlighter
public:
Highlighter(QTextDocument *parent = 0);
- virtual ~Highlighter();
+ ~Highlighter() override;
enum TextFormatId {
Normal,
@@ -103,7 +103,7 @@ public:
void setDefaultContext(const QSharedPointer<Internal::Context> &defaultContext);
protected:
- virtual void highlightBlock(const QString &text);
+ void highlightBlock(const QString &text) override;
private:
diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h
index ca7b62aaf2..86831876f9 100644
--- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h
+++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h
@@ -42,11 +42,11 @@ class HighlighterSettingsPage : public TextEditorOptionsPage
public:
HighlighterSettingsPage(Core::Id id, QObject *parent);
- ~HighlighterSettingsPage();
+ ~HighlighterSettingsPage() override;
- QWidget *widget();
- void apply();
- void finish();
+ QWidget *widget() override;
+ void apply() override;
+ void finish() override;
const HighlighterSettings &highlighterSettings() const;
diff --git a/src/plugins/texteditor/generichighlighter/manager.h b/src/plugins/texteditor/generichighlighter/manager.h
index 080e649e3a..133c612efc 100644
--- a/src/plugins/texteditor/generichighlighter/manager.h
+++ b/src/plugins/texteditor/generichighlighter/manager.h
@@ -57,7 +57,7 @@ class Manager : public QObject
{
Q_OBJECT
public:
- virtual ~Manager();
+ ~Manager() override;
static Manager *instance();
QString definitionIdByName(const QString &name) const;
diff --git a/src/plugins/texteditor/icodestylepreferences.h b/src/plugins/texteditor/icodestylepreferences.h
index 91dd72d9e3..36c93ae85c 100644
--- a/src/plugins/texteditor/icodestylepreferences.h
+++ b/src/plugins/texteditor/icodestylepreferences.h
@@ -48,7 +48,7 @@ class TEXTEDITOR_EXPORT ICodeStylePreferences : public QObject
public:
// pool is a pool which will be used by this preferences for setting delegates
explicit ICodeStylePreferences(QObject *parentObject = 0);
- virtual ~ICodeStylePreferences();
+ ~ICodeStylePreferences() override;
QByteArray id() const;
void setId(const QByteArray &name);
diff --git a/src/plugins/texteditor/outlinefactory.h b/src/plugins/texteditor/outlinefactory.h
index 940aab969e..00a5732c83 100644
--- a/src/plugins/texteditor/outlinefactory.h
+++ b/src/plugins/texteditor/outlinefactory.h
@@ -42,7 +42,7 @@ class OutlineWidgetStack : public QStackedWidget
Q_OBJECT
public:
OutlineWidgetStack(OutlineFactory *factory);
- ~OutlineWidgetStack();
+ ~OutlineWidgetStack() override;
QToolButton *toggleSyncButton();
QToolButton *filterButton();
@@ -73,9 +73,9 @@ public:
OutlineFactory();
// from INavigationWidgetFactory
- virtual Core::NavigationView createWidget();
- virtual void saveSettings(QSettings *settings, int position, QWidget *widget);
- virtual void restoreSettings(QSettings *settings, int position, QWidget *widget);
+ Core::NavigationView createWidget() override;
+ void saveSettings(QSettings *settings, int position, QWidget *widget) override;
+ void restoreSettings(QSettings *settings, int position, QWidget *widget) override;
};
} // namespace Internal
diff --git a/src/plugins/texteditor/simplecodestylepreferences.h b/src/plugins/texteditor/simplecodestylepreferences.h
index 2f4c5680d0..19ab3d0a2d 100644
--- a/src/plugins/texteditor/simplecodestylepreferences.h
+++ b/src/plugins/texteditor/simplecodestylepreferences.h
@@ -35,11 +35,11 @@ class TEXTEDITOR_EXPORT SimpleCodeStylePreferences : public ICodeStylePreference
public:
explicit SimpleCodeStylePreferences(QObject *parentObject = 0);
- virtual QVariant value() const;
- virtual void setValue(const QVariant &);
+ QVariant value() const override;
+ void setValue(const QVariant &) override;
protected:
- virtual QString settingsSuffix() const;
+ QString settingsSuffix() const override;
};
diff --git a/src/plugins/texteditor/snippets/snippeteditor.h b/src/plugins/texteditor/snippets/snippeteditor.h
index d27a38baa1..75b2c56ea9 100644
--- a/src/plugins/texteditor/snippets/snippeteditor.h
+++ b/src/plugins/texteditor/snippets/snippeteditor.h
@@ -41,9 +41,9 @@ signals:
void snippetContentChanged();
protected:
- virtual void focusOutEvent(QFocusEvent *event) override;
+ void focusOutEvent(QFocusEvent *event) override;
- virtual int extraAreaWidth(int * /* markWidthPtr */ = 0) const override { return 0; }
+ int extraAreaWidth(int * /* markWidthPtr */ = 0) const override { return 0; }
};
} // namespace TextEditor
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.h b/src/plugins/texteditor/snippets/snippetssettingspage.h
index 10e480bdad..9c2df195fd 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.h
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.h
@@ -38,11 +38,11 @@ class SnippetsSettingsPage : public TextEditorOptionsPage
public:
SnippetsSettingsPage(Core::Id id, QObject *parent);
- ~SnippetsSettingsPage();
+ ~SnippetsSettingsPage() override;
- QWidget *widget();
- void apply();
- void finish();
+ QWidget *widget() override;
+ void apply() override;
+ void finish() override;
private:
SnippetsSettingsPagePrivate *d;
diff --git a/src/plugins/texteditor/syntaxhighlighter.h b/src/plugins/texteditor/syntaxhighlighter.h
index 629fe29b99..b0d5d10170 100644
--- a/src/plugins/texteditor/syntaxhighlighter.h
+++ b/src/plugins/texteditor/syntaxhighlighter.h
@@ -58,7 +58,7 @@ public:
SyntaxHighlighter(QObject *parent = 0);
SyntaxHighlighter(QTextDocument *parent);
SyntaxHighlighter(QTextEdit *parent);
- virtual ~SyntaxHighlighter();
+ ~SyntaxHighlighter() override;
void setDocument(QTextDocument *doc);
QTextDocument *document() const;
diff --git a/src/plugins/texteditor/tabsettingswidget.h b/src/plugins/texteditor/tabsettingswidget.h
index 99ed5f0cc2..c930877dc1 100644
--- a/src/plugins/texteditor/tabsettingswidget.h
+++ b/src/plugins/texteditor/tabsettingswidget.h
@@ -46,7 +46,7 @@ public:
};
explicit TabSettingsWidget(QWidget *parent = 0);
- ~TabSettingsWidget();
+ ~TabSettingsWidget() override;
TabSettings tabSettings() const;
diff --git a/src/plugins/texteditor/textdocumentlayout.h b/src/plugins/texteditor/textdocumentlayout.h
index 8bb9b2e30b..640f8f34a6 100644
--- a/src/plugins/texteditor/textdocumentlayout.h
+++ b/src/plugins/texteditor/textdocumentlayout.h
@@ -68,7 +68,7 @@ public:
, m_foldingEndIncluded(false)
, m_codeFormatterData(nullptr)
{}
- ~TextBlockUserData();
+ ~TextBlockUserData() override;
inline TextMarks marks() const { return m_marks; }
void addMark(TextMark *mark);
diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h
index 77d06c86b0..f542b5d7ce 100644
--- a/src/plugins/texteditor/texteditoractionhandler.h
+++ b/src/plugins/texteditor/texteditoractionhandler.h
@@ -60,7 +60,7 @@ public:
explicit TextEditorActionHandler(QObject *parent, Core::Id editorId, Core::Id contextId,
uint optionalActions = None);
- ~TextEditorActionHandler();
+ ~TextEditorActionHandler() override;
void setTextEditorWidgetResolver(const TextEditorWidgetResolver &resolver);
diff --git a/src/plugins/texteditor/texteditorsettings.h b/src/plugins/texteditor/texteditorsettings.h
index 36a2d86e45..013ed790ae 100644
--- a/src/plugins/texteditor/texteditorsettings.h
+++ b/src/plugins/texteditor/texteditorsettings.h
@@ -63,7 +63,7 @@ class TEXTEDITOR_EXPORT TextEditorSettings : public QObject
public:
TextEditorSettings();
- ~TextEditorSettings();
+ ~TextEditorSettings() override;
static TextEditorSettings *instance();