Bazaar: Modernize

override, auto, nullptr

Change-Id: I052bc2759f61129c0185e3ae196de73bf22024c5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

11 files changed, 29 insertions, 27 deletions

diff --git a/src/plugins/bazaar/annotationhighlighter.h b/src/plugins/bazaar/annotationhighlighter.h
index bd89f0fc39..442f3defa9 100644
--- a/src/plugins/bazaar/annotationhighlighter.h
+++ b/src/plugins/bazaar/annotationhighlighter.h
@@ -38,7 +38,7 @@ public:
                                          QTextDocument *document = nullptr);
 
 private:
-    QString changeNumber(const QString &block) const;
+    QString changeNumber(const QString &block) const override;
     mutable QRegExp m_changeset;
 };
 
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index d8d13cd27a..f9941b2966 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -60,7 +60,7 @@ public:
                    settings.boolPointer(BazaarSettings::diffIgnoreBlankLinesKey));
     }
 
-    QStringList arguments() const
+    QStringList arguments() const override
     {
         QStringList args;
         // Bazaar wants "--diff-options=-w -B.."
diff --git a/src/plugins/bazaar/bazaarclient.h b/src/plugins/bazaar/bazaarclient.h
index aa18bcc8a3..21750daf22 100644
--- a/src/plugins/bazaar/bazaarclient.h
+++ b/src/plugins/bazaar/bazaarclient.h
@@ -48,22 +48,22 @@ public:
                              const QString& revision = QString(),
                              const QStringList &extraOptions = QStringList());
     void commit(const QString &repositoryRoot, const QStringList &files,
-                const QString &commitMessageFile, const QStringList &extraOptions = QStringList());
+                const QString &commitMessageFile, const QStringList &extraOptions = QStringList()) override;
     VcsBase::VcsBaseEditorWidget *annotate(
             const QString &workingDir, const QString &file, const QString &revision = QString(),
-            int lineNumber = -1, const QStringList &extraOptions = QStringList());
+            int lineNumber = -1, const QStringList &extraOptions = QStringList()) override;
     bool isVcsDirectory(const Utils::FileName &fileName) const;
-    QString findTopLevelForFile(const QFileInfo &file) const;
+    QString findTopLevelForFile(const QFileInfo &file) const override;
     bool managesFile(const QString &workingDirectory, const QString &fileName) const;
     void view(const QString &source, const QString &id,
-              const QStringList &extraOptions = QStringList());
+              const QStringList &extraOptions = QStringList()) override;
 
 protected:
-    Core::Id vcsEditorKind(VcsCommandTag cmd) const;
-    QString vcsCommandString(VcsCommandTag cmd) const;
-    Utils::ExitCodeInterpreter exitCodeInterpreter(VcsCommandTag cmd) const;
-    QStringList revisionSpec(const QString &revision) const;
-    StatusItem parseStatusLine(const QString &line) const;
+    Core::Id vcsEditorKind(VcsCommandTag cmd) const override;
+    QString vcsCommandString(VcsCommandTag cmd) const override;
+    Utils::ExitCodeInterpreter exitCodeInterpreter(VcsCommandTag cmd) const override;
+    QStringList revisionSpec(const QString &revision) const override;
+    StatusItem parseStatusLine(const QString &line) const override;
 
 private:
     friend class CloneWizard;
diff --git a/src/plugins/bazaar/bazaarcommitwidget.cpp b/src/plugins/bazaar/bazaarcommitwidget.cpp
index ad426d5f54..23861568ce 100644
--- a/src/plugins/bazaar/bazaarcommitwidget.cpp
+++ b/src/plugins/bazaar/bazaarcommitwidget.cpp
@@ -57,7 +57,7 @@ class BazaarSubmitHighlighter : QSyntaxHighlighter
 {
 public:
     explicit BazaarSubmitHighlighter(QTextEdit *parent);
-    void highlightBlock(const QString &text);
+    void highlightBlock(const QString &text) override;
 
 private:
     enum State { Header, Comment, Other };
diff --git a/src/plugins/bazaar/bazaarcontrol.h b/src/plugins/bazaar/bazaarcontrol.h
index 020e15d37b..ced12c9a79 100644
--- a/src/plugins/bazaar/bazaarcontrol.h
+++ b/src/plugins/bazaar/bazaarcontrol.h
@@ -50,7 +50,7 @@ public:
 
     bool isVcsFileOrDirectory(const Utils::FileName &fileName) const final;
 
-    bool managesDirectory(const QString &filename, QString *topLevel = 0) const final;
+    bool managesDirectory(const QString &filename, QString *topLevel = nullptr) const final;
     bool managesFile(const QString &workingDirectory, const QString &fileName) const final;
     bool isConfigured() const final;
     bool supportsOperation(Operation operation) const final;
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 707ad88c2e..8048fa739f 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -129,7 +129,7 @@ const VcsBaseSubmitEditorParameters submitEditorParameters = {
 };
 
 
-BazaarPlugin *BazaarPlugin::m_instance = 0;
+BazaarPlugin *BazaarPlugin::m_instance = nullptr;
 
 BazaarPlugin::BazaarPlugin()
 {
@@ -139,8 +139,8 @@ BazaarPlugin::BazaarPlugin()
 BazaarPlugin::~BazaarPlugin()
 {
     delete m_client;
-    m_client = 0;
-    m_instance = 0;
+    m_client = nullptr;
+    m_instance = nullptr;
 }
 
 bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessage)
@@ -526,7 +526,7 @@ void BazaarPlugin::showCommitWidget(const QList<VcsBaseClient::StatusItem> &stat
         return;
     }
 
-    CommitEditor *commitEditor = qobject_cast<CommitEditor *>(editor);
+    auto commitEditor = qobject_cast<CommitEditor *>(editor);
 
     if (!commitEditor) {
         VcsOutputWindow::appendError(tr("Unable to create a commit editor."));
@@ -630,7 +630,7 @@ void BazaarPlugin::uncommit()
 
 bool BazaarPlugin::submitEditorAboutToClose()
 {
-    CommitEditor *commitEditor = qobject_cast<CommitEditor *>(submitEditor());
+    auto commitEditor = qobject_cast<CommitEditor *>(submitEditor());
     QTC_ASSERT(commitEditor, return true);
     IDocument *editorDocument = commitEditor->document();
     QTC_ASSERT(editorDocument, return true);
diff --git a/src/plugins/bazaar/bazaarplugin.h b/src/plugins/bazaar/bazaarplugin.h
index 54184f5598..51d2d921b1 100644
--- a/src/plugins/bazaar/bazaarplugin.h
+++ b/src/plugins/bazaar/bazaarplugin.h
@@ -58,15 +58,15 @@ class BazaarPlugin : public VcsBase::VcsBasePlugin
 
 public:
     BazaarPlugin();
-    ~BazaarPlugin();
-    bool initialize(const QStringList &arguments, QString *errorMessage);
+    ~BazaarPlugin() override;
+    bool initialize(const QStringList &arguments, QString *errorMessage) override;
 
     static BazaarPlugin *instance();
     BazaarClient *client() const;
 
 protected:
-    void updateActions(VcsBase::VcsBasePlugin::ActionState);
-    bool submitEditorAboutToClose();
+    void updateActions(VcsBase::VcsBasePlugin::ActionState) override;
+    bool submitEditorAboutToClose() override;
 
 #ifdef WITH_TESTS
 private slots:
diff --git a/src/plugins/bazaar/constants.h b/src/plugins/bazaar/constants.h
index fad825097e..f64c0eb27f 100644
--- a/src/plugins/bazaar/constants.h
+++ b/src/plugins/bazaar/constants.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include <QtGlobal>
+
 namespace Bazaar {
 namespace Constants {
 
diff --git a/src/plugins/bazaar/optionspage.h b/src/plugins/bazaar/optionspage.h
index 6d981e8df2..8a2cd5010f 100644
--- a/src/plugins/bazaar/optionspage.h
+++ b/src/plugins/bazaar/optionspage.h
@@ -39,10 +39,10 @@ class OptionsPageWidget : public VcsBase::VcsClientOptionsPageWidget
     Q_OBJECT
 
 public:
-    explicit OptionsPageWidget(QWidget *parent = 0);
+    explicit OptionsPageWidget(QWidget *parent = nullptr);
 
-    VcsBase::VcsBaseClientSettings settings() const;
-    void setSettings(const VcsBase::VcsBaseClientSettings &s);
+    VcsBase::VcsBaseClientSettings settings() const override;
+    void setSettings(const VcsBase::VcsBaseClientSettings &s) override;
 
 private:
     Ui::OptionsPage m_ui;
diff --git a/src/plugins/bazaar/pullorpushdialog.h b/src/plugins/bazaar/pullorpushdialog.h
index 380139c2d3..508a14d14d 100644
--- a/src/plugins/bazaar/pullorpushdialog.h
+++ b/src/plugins/bazaar/pullorpushdialog.h
@@ -42,7 +42,7 @@ public:
         PushMode
     };
 
-    explicit PullOrPushDialog(Mode mode, QWidget *parent = 0);
+    explicit PullOrPushDialog(Mode mode, QWidget *parent = nullptr);
     ~PullOrPushDialog() override;
 
     // Common parameters and options
diff --git a/src/plugins/bazaar/uncommitdialog.h b/src/plugins/bazaar/uncommitdialog.h
index f8c23f9e12..e535b996b0 100644
--- a/src/plugins/bazaar/uncommitdialog.h
+++ b/src/plugins/bazaar/uncommitdialog.h
@@ -37,7 +37,7 @@ class UnCommitDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit UnCommitDialog(QWidget *parent = 0);
+    explicit UnCommitDialog(QWidget *parent = nullptr);
     ~UnCommitDialog() override;
 
     QStringList extraOptions() const;