Mercurial: Modernize

modernize-*

Change-Id: Ide38fa487e39e9363a48762d94b9ed3abed83337
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

10 files changed, 18 insertions, 18 deletions

diff --git a/src/plugins/mercurial/annotationhighlighter.h b/src/plugins/mercurial/annotationhighlighter.h
index b2a34a4872..329a4d84ac 100644
--- a/src/plugins/mercurial/annotationhighlighter.h
+++ b/src/plugins/mercurial/annotationhighlighter.h
@@ -35,7 +35,7 @@ class MercurialAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
 {
 public:
     explicit MercurialAnnotationHighlighter(const ChangeNumbers &changeNumbers,
-                                            QTextDocument *document = 0);
+                                            QTextDocument *document = nullptr);
 
 private:
     QString changeNumber(const QString &block) const override;
diff --git a/src/plugins/mercurial/authenticationdialog.h b/src/plugins/mercurial/authenticationdialog.h
index 1cfe5bfa35..207315263f 100644
--- a/src/plugins/mercurial/authenticationdialog.h
+++ b/src/plugins/mercurial/authenticationdialog.h
@@ -37,7 +37,8 @@ class AuthenticationDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit AuthenticationDialog(const QString &username, const QString &password, QWidget *parent = 0);
+    explicit AuthenticationDialog(const QString &username, const QString &password,
+                                  QWidget *parent = nullptr);
     ~AuthenticationDialog() override;
     void setPasswordEnabled(bool enabled);
     QString getUserName();
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index 3efc8a3352..3998f06411 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -158,7 +158,7 @@ bool MercurialClient::synchronousPull(const QString &workingDir, const QString &
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
     env.insert(QLatin1String("LANGUAGE"), QLatin1String("C"));
     const SynchronousProcessResponse resp = VcsBasePlugin::runVcs(
-                workingDir, vcsBinary(), args, vcsTimeoutS(), flags, 0, env);
+                workingDir, vcsBinary(), args, vcsTimeoutS(), flags, nullptr, env);
     const bool ok = resp.result == SynchronousProcessResponse::Finished;
 
     parsePullOutput(resp.stdOut().trimmed());
diff --git a/src/plugins/mercurial/mercurialcommitwidget.cpp b/src/plugins/mercurial/mercurialcommitwidget.cpp
index 231badd04a..f1e690e016 100644
--- a/src/plugins/mercurial/mercurialcommitwidget.cpp
+++ b/src/plugins/mercurial/mercurialcommitwidget.cpp
@@ -48,7 +48,7 @@ class MercurialSubmitHighlighter : TextEditor::SyntaxHighlighter
 {
 public:
     explicit MercurialSubmitHighlighter(QTextEdit *parent);
-    void highlightBlock(const QString &text);
+    void highlightBlock(const QString &text) override;
 
 private:
     enum State { None = -1, Header, Other };
@@ -66,7 +66,7 @@ MercurialSubmitHighlighter::MercurialSubmitHighlighter(QTextEdit *parent) :
 void MercurialSubmitHighlighter::highlightBlock(const QString &text)
 {
     // figure out current state
-    State state = static_cast<State>(previousBlockState());
+    auto state = static_cast<State>(previousBlockState());
     if (text.startsWith(QLatin1String("HG:"))) {
         setFormat(0, text.size(), formatForCategory(TextEditor::C_COMMENT));
         setCurrentBlockState(state);
diff --git a/src/plugins/mercurial/mercurialcontrol.cpp b/src/plugins/mercurial/mercurialcontrol.cpp
index b60fd3e419..d244b8ff8f 100644
--- a/src/plugins/mercurial/mercurialcontrol.cpp
+++ b/src/plugins/mercurial/mercurialcontrol.cpp
@@ -49,12 +49,12 @@ public:
     MercurialTopicCache(MercurialClient *client) : m_client(client) {}
 
 protected:
-    QString trackFile(const QString &repository)
+    QString trackFile(const QString &repository) override
     {
         return repository + QLatin1String("/.hg/branch");
     }
 
-    QString refreshTopic(const QString &repository)
+    QString refreshTopic(const QString &repository) override
     {
         return m_client->branchQuerySync(repository);
     }
@@ -75,7 +75,7 @@ QString MercurialControl::displayName() const
 
 Core::Id MercurialControl::id() const
 {
-    return Core::Id(VcsBase::Constants::VCS_ID_MERCURIAL);
+    return {VcsBase::Constants::VCS_ID_MERCURIAL};
 }
 
 bool MercurialControl::isVcsFileOrDirectory(const Utils::FileName &fileName) const
diff --git a/src/plugins/mercurial/mercurialcontrol.h b/src/plugins/mercurial/mercurialcontrol.h
index 0c395fb059..f96979e0c8 100644
--- a/src/plugins/mercurial/mercurialcontrol.h
+++ b/src/plugins/mercurial/mercurialcontrol.h
@@ -49,7 +49,7 @@ public:
     Core::Id id() const final;
     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/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 80ff8907f5..9e24422d18 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -100,7 +100,7 @@ static const VcsBaseSubmitEditorParameters submitEditorParameters = {
     VcsBaseSubmitEditorParameters::DiffFiles
 };
 
-MercurialPlugin *MercurialPlugin::m_instance = 0;
+MercurialPlugin *MercurialPlugin::m_instance = nullptr;
 
 MercurialPlugin::MercurialPlugin()
 {
@@ -132,10 +132,9 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
     const auto describeFunc = [this](const QString &source, const QString &id) {
         m_client->view(source, id);
     };
-    const int editorCount = sizeof(editorParameters)/sizeof(editorParameters[0]);
     const auto widgetCreator = []() { return new MercurialEditorWidget; };
-    for (int i = 0; i < editorCount; i++)
-        new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc, this);
+    for (auto editor : editorParameters)
+        new VcsEditorFactory(&editor, widgetCreator, describeFunc, this);
 
     new VcsSubmitEditorFactory(&submitEditorParameters,
         []() { return new CommitEditor(&submitEditorParameters); }, this);
@@ -514,7 +513,7 @@ void MercurialPlugin::showCommitWidget(const QList<VcsBaseClient::StatusItem> &s
     }
 
     QTC_ASSERT(qobject_cast<CommitEditor *>(editor), return);
-    CommitEditor *commitEditor = static_cast<CommitEditor *>(editor);
+    auto commitEditor = static_cast<CommitEditor *>(editor);
     setSubmitEditor(commitEditor);
 
     connect(commitEditor, &VcsBaseSubmitEditor::diffSelectedFiles,
@@ -546,7 +545,7 @@ void MercurialPlugin::commitFromEditor()
 
 bool MercurialPlugin::submitEditorAboutToClose()
 {
-    CommitEditor *commitEditor = qobject_cast<CommitEditor *>(submitEditor());
+    auto commitEditor = qobject_cast<CommitEditor *>(submitEditor());
     QTC_ASSERT(commitEditor, return true);
     Core::IDocument *editorFile = commitEditor->document();
     QTC_ASSERT(editorFile, return true);
diff --git a/src/plugins/mercurial/optionspage.h b/src/plugins/mercurial/optionspage.h
index 625eeb30f5..1e70b2771c 100644
--- a/src/plugins/mercurial/optionspage.h
+++ b/src/plugins/mercurial/optionspage.h
@@ -39,7 +39,7 @@ class OptionsPageWidget : public VcsBase::VcsClientOptionsPageWidget
     Q_OBJECT
 
 public:
-    explicit OptionsPageWidget(QWidget *parent = 0);
+    explicit OptionsPageWidget(QWidget *parent = nullptr);
 
     VcsBase::VcsBaseClientSettings settings() const override;
     void setSettings(const VcsBase::VcsBaseClientSettings &s) override;
diff --git a/src/plugins/mercurial/revertdialog.h b/src/plugins/mercurial/revertdialog.h
index 1b89cdfe02..55d2109911 100644
--- a/src/plugins/mercurial/revertdialog.h
+++ b/src/plugins/mercurial/revertdialog.h
@@ -37,7 +37,7 @@ class RevertDialog : public QDialog
     Q_OBJECT
 
 public:
-    RevertDialog(QWidget *parent = 0);
+    RevertDialog(QWidget *parent = nullptr);
     ~RevertDialog() override;
 
     QString revision() const;
diff --git a/src/plugins/mercurial/srcdestdialog.h b/src/plugins/mercurial/srcdestdialog.h
index 2a60d1c1c3..253e383c64 100644
--- a/src/plugins/mercurial/srcdestdialog.h
+++ b/src/plugins/mercurial/srcdestdialog.h
@@ -39,7 +39,7 @@ class SrcDestDialog : public QDialog
 
 public:
     enum Direction { outgoing, incoming };
-    explicit SrcDestDialog(Direction dir, QWidget *parent = 0);
+    explicit SrcDestDialog(Direction dir, QWidget *parent = nullptr);
     ~SrcDestDialog() override;
 
     void setPathChooserKind(Utils::PathChooser::Kind kind);