summaryrefslogtreecommitdiff
path: root/src/plugins/vcsbase
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2018-05-07 15:02:04 +0200
committerTobias Hunger <tobias.hunger@qt.io>2018-05-07 13:39:03 +0000
commit5451413c2d53a7da60943336bbdabd54ec014d8f (patch)
treed751dd2f2c17b4896f444af968f1116b21204f85 /src/plugins/vcsbase
parente7d13245a422a4456553f215016ad396ad586ceb (diff)
downloadqt-creator-5451413c2d53a7da60943336bbdabd54ec014d8f.tar.gz
VcsBase: Use override consistently
clang-tidy fixes from modernize-use-override check. Change-Id: I4775c493dbeefaf832b862f8740f216a3aacbfc6 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/vcsbase')
-rw-r--r--src/plugins/vcsbase/baseannotationhighlighter.h4
-rw-r--r--src/plugins/vcsbase/diffandloghighlighter.h2
-rw-r--r--src/plugins/vcsbase/vcsbasediffeditorcontroller.h2
-rw-r--r--src/plugins/vcsbase/vcsbaseoptionspage.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/vcsbase/baseannotationhighlighter.h b/src/plugins/vcsbase/baseannotationhighlighter.h
index 52f6033223..d91a68d6d6 100644
--- a/src/plugins/vcsbase/baseannotationhighlighter.h
+++ b/src/plugins/vcsbase/baseannotationhighlighter.h
@@ -45,9 +45,9 @@ public:
void setChangeNumbers(const ChangeNumbers &changeNumbers);
- virtual void highlightBlock(const QString &text) override;
+ void highlightBlock(const QString &text) override;
- virtual void setFontSettings(const TextEditor::FontSettings &fontSettings) override;
+ void setFontSettings(const TextEditor::FontSettings &fontSettings) override;
private:
// Implement this to return the change number of a line
diff --git a/src/plugins/vcsbase/diffandloghighlighter.h b/src/plugins/vcsbase/diffandloghighlighter.h
index 29257f1197..40c2d62b56 100644
--- a/src/plugins/vcsbase/diffandloghighlighter.h
+++ b/src/plugins/vcsbase/diffandloghighlighter.h
@@ -51,7 +51,7 @@ public:
void highlightBlock(const QString &text) override;
- virtual void setFontSettings(const TextEditor::FontSettings &fontSettings) override;
+ void setFontSettings(const TextEditor::FontSettings &fontSettings) override;
private:
friend class DiffAndLogHighlighterPrivate;
diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
index 97a7dbeff2..eb6e97157f 100644
--- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
+++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
@@ -43,7 +43,7 @@ public:
VcsBaseDiffEditorController(Core::IDocument *document,
VcsBaseClientImpl *client,
const QString &workingDirectory);
- ~VcsBaseDiffEditorController();
+ ~VcsBaseDiffEditorController() override;
protected:
void runCommand(const QList<QStringList> &args, unsigned flags, QTextCodec *codec = nullptr);
diff --git a/src/plugins/vcsbase/vcsbaseoptionspage.h b/src/plugins/vcsbase/vcsbaseoptionspage.h
index a2d29cd5cf..a8d6f767ac 100644
--- a/src/plugins/vcsbase/vcsbaseoptionspage.h
+++ b/src/plugins/vcsbase/vcsbaseoptionspage.h
@@ -69,8 +69,8 @@ public:
explicit VcsClientOptionsPage(Core::IVersionControl *control, VcsBaseClientImpl *client, QObject *parent = 0);
VcsClientOptionsPageWidget *widget() override;
- virtual void apply() override;
- virtual void finish() override;
+ void apply() override;
+ void finish() override;
signals:
void settingsChanged();