Git: Sprinkle C++11 goodness over the code

Just initializer lists for QStringLists (mostly arguments) and nullptr.

Remove lots of QLatin1* while at it.

Change-Id: I0d8354bcbdb759db65da6153bb356fb4b8ed0e8d
Reviewed-by: Orgad Shaneh <[email protected]>
Reviewed-by: Tobias Hunger <[email protected]>

1 files changed, 34 insertions, 39 deletions

diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index df12bc74523..250ce4c220f 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -126,7 +126,7 @@ public:
     explicit GitClient();
 
     Utils::FileName vcsBinary() const override;
-    unsigned gitVersion(QString *errorMessage = 0) const;
+    unsigned gitVersion(QString *errorMessage = nullptr) const;
 
     VcsBase::VcsCommand *vcsExecAbortable(const QString &workingDirectory, const QStringList &arguments);
 
@@ -154,10 +154,8 @@ public:
             int lineNumber = -1, const QStringList &extraOptions = QStringList()) override;
     void reset(const QString &workingDirectory, const QString &argument, const QString &commit = QString());
     void addFile(const QString &workingDirectory, const QString &fileName);
-    bool synchronousLog(const QString &workingDirectory,
-                        const QStringList &arguments,
-                        QString *output,
-                        QString *errorMessage = 0,
+    bool synchronousLog(const QString &workingDirectory, const QStringList &arguments,
+                        QString *output, QString *errorMessage = nullptr,
                         unsigned flags = 0);
     bool synchronousAdd(const QString &workingDirectory, const QStringList &files);
     bool synchronousDelete(const QString &workingDirectory,
@@ -166,20 +164,20 @@ public:
     bool synchronousMove(const QString &workingDirectory,
                          const QString &from,
                          const QString &to);
-    bool synchronousReset(const QString &workingDirectory,
-                          const QStringList &files = QStringList(),
-                          QString *errorMessage = 0);
-    bool synchronousCleanList(const QString &workingDirectory, const QString &modulePath, QStringList *files, QStringList *ignoredFiles, QString *errorMessage);
-    bool synchronousApplyPatch(const QString &workingDirectory, const QString &file, QString *errorMessage, const QStringList &arguments = QStringList());
+    bool synchronousReset(const QString &workingDirectory, const QStringList &files = QStringList(),
+                          QString *errorMessage = nullptr);
+    bool synchronousCleanList(const QString &workingDirectory, const QString &modulePath,
+                              QStringList *files, QStringList *ignoredFiles, QString *errorMessage);
+    bool synchronousApplyPatch(const QString &workingDirectory, const QString &file,
+                               QString *errorMessage, const QStringList &extraArguments = QStringList());
     bool synchronousInit(const QString &workingDirectory);
-    bool synchronousCheckoutFiles(const QString &workingDirectory,
-                                  QStringList files = QStringList(),
-                                  QString revision = QString(), QString *errorMessage = 0,
+    bool synchronousCheckoutFiles(const QString &workingDirectory, QStringList files = QStringList(),
+                                  QString revision = QString(), QString *errorMessage = nullptr,
                                   bool revertStaging = true);
     // Checkout ref
     bool stashAndCheckout(const QString &workingDirectory, const QString &ref);
     bool synchronousCheckout(const QString &workingDirectory, const QString &ref,
-                             QString *errorMessage = 0);
+                             QString *errorMessage = nullptr);
 
     QStringList setupCheckoutArguments(const QString &workingDirectory, const QString &ref);
     void updateSubmodulesIfNeeded(const QString &workingDirectory, bool prompt);
@@ -188,39 +186,40 @@ public:
     enum { StashPromptDescription = 0x1, StashImmediateRestore = 0x2, StashIgnoreUnchanged = 0x4 };
     QString synchronousStash(const QString &workingDirectory,
                              const QString &messageKeyword = QString(),
-                             unsigned flags = 0, bool *unchanged = 0) const;
+                             unsigned flags = 0, bool *unchanged = nullptr) const;
 
     bool executeSynchronousStash(const QString &workingDirectory,
                                  const QString &message = QString(),
                                  bool unstagedOnly = false,
-                                 QString *errorMessage = 0) const;
+                                 QString *errorMessage = nullptr) const;
     bool synchronousStashRestore(const QString &workingDirectory,
                                  const QString &stash,
                                  bool pop = false,
                                  const QString &branch = QString()) const;
     bool synchronousStashRemove(const QString &workingDirectory,
                                 const QString &stash = QString(),
-                                QString *errorMessage = 0) const;
+                                QString *errorMessage = nullptr) const;
     bool synchronousBranchCmd(const QString &workingDirectory, QStringList branchArgs,
                               QString *output, QString *errorMessage) const;
     bool synchronousTagCmd(const QString &workingDirectory, QStringList tagArgs,
                            QString *output, QString *errorMessage) const;
     bool synchronousForEachRefCmd(const QString &workingDirectory, QStringList args,
-                               QString *output, QString *errorMessage = 0) const;
+                               QString *output, QString *errorMessage = nullptr) const;
     VcsBase::VcsCommand *asyncForEachRefCmd(const QString &workingDirectory, QStringList args) const;
     bool synchronousRemoteCmd(const QString &workingDirectory, QStringList remoteArgs,
-                              QString *output = 0, QString *errorMessage = 0, bool silent = false) const;
+                              QString *output = nullptr, QString *errorMessage = nullptr,
+                              bool silent = false) const;
 
     QMap<QString,QString> synchronousRemotesList(const QString &workingDirectory,
-                                                 QString *errorMessage = 0) const;
+                                                 QString *errorMessage = nullptr) const;
     QStringList synchronousSubmoduleStatus(const QString &workingDirectory,
-                                           QString *errorMessage = 0) const;
+                                           QString *errorMessage = nullptr) const;
     SubmoduleDataMap submoduleList(const QString &workingDirectory) const;
     bool synchronousShow(const QString &workingDirectory, const QString &id,
                          QByteArray *output, QString *errorMessage) const;
 
-    bool synchronousRevListCmd(const QString &workingDirectory, const QStringList &arguments,
-                               QString *output, QString *errorMessage = 0) const;
+    bool synchronousRevListCmd(const QString &workingDirectory, const QStringList &extraArguments,
+                               QString *output, QString *errorMessage = nullptr) const;
 
     bool synchronousParentRevisions(const QString &workingDirectory,
                                     const QString &revision,
@@ -233,11 +232,11 @@ public:
     QString synchronousCurrentLocalBranch(const QString &workingDirectory) const;
 
     bool synchronousHeadRefs(const QString &workingDirectory, QStringList *output,
-                             QString *errorMessage = 0) const;
+                             QString *errorMessage = nullptr) const;
     QString synchronousTopic(const QString &workingDirectory) const;
     bool synchronousRevParseCmd(const QString &workingDirectory, const QString &ref,
-                                QString *output, QString *errorMessage = 0) const;
-    QString synchronousTopRevision(const QString &workingDirectory, QString *errorMessage = 0);
+                                QString *output, QString *errorMessage = nullptr) const;
+    QString synchronousTopRevision(const QString &workingDirectory, QString *errorMessage = nullptr);
     void synchronousTagsForCommit(const QString &workingDirectory, const QString &revision,
                                   QString &precedes, QString &follows) const;
     bool isRemoteCommit(const QString &workingDirectory, const QString &commit);
@@ -270,21 +269,19 @@ public:
 
     void stashPop(const QString &workingDirectory, const QString &stash = QString());
     void revert(const QStringList &files, bool revertStaging);
-    bool synchronousStashList(const QString &workingDirectory,
-                              QList<Stash> *stashes,
-                              QString *errorMessage = 0) const;
+    bool synchronousStashList(const QString &workingDirectory, QList<Stash> *stashes,
+                              QString *errorMessage = nullptr) const;
     // Resolve a stash name from message (for IVersionControl's names).
-    bool stashNameFromMessage(const QString &workingDirectory,
-                              const QString &messge, QString *name,
-                              QString *errorMessage = 0) const;
+    bool stashNameFromMessage(const QString &workingDirectory, const QString &messge, QString *name,
+                              QString *errorMessage = nullptr) const;
 
     QString readGitVar(const QString &workingDirectory, const QString &configVar) const;
     QString readConfigValue(const QString &workingDirectory, const QString &configVar) const;
 
     QTextCodec *encoding(const QString &workingDirectory, const QByteArray &configVar) const;
     bool readDataFromCommit(const QString &repoDirectory, const QString &commit,
-                            CommitData &commitData, QString *errorMessage = 0,
-                            QString *commitTemplate = 0);
+                            CommitData &commitData, QString *errorMessage = nullptr,
+                            QString *commitTemplate = nullptr);
     bool getCommitData(const QString &workingDirectory, QString *commitTemplate,
                        CommitData &commitData, QString *errorMessage);
 
@@ -296,10 +293,8 @@ public:
                       VcsBase::SubmitFileModel *model);
 
     enum StatusResult { StatusChanged, StatusUnchanged, StatusFailed };
-    StatusResult gitStatus(const QString &workingDirectory,
-                           StatusMode mode,
-                           QString *output = 0,
-                           QString *errorMessage = 0) const;
+    StatusResult gitStatus(const QString &workingDirectory, StatusMode mode,
+                           QString *output = nullptr, QString *errorMessage = nullptr) const;
 
     CommandInProgress checkCommandInProgress(const QString &workingDirectory) const;
     QString commandInProgressDescription(const QString &workingDirectory) const;
@@ -350,7 +345,7 @@ private:
                        std::function<DiffEditor::DiffEditorController *(Core::IDocument *)> factory) const;
 
     // determine version as '(major << 16) + (minor << 8) + patch' or 0.
-    unsigned synchronousGitVersion(QString *errorMessage = 0) const;
+    unsigned synchronousGitVersion(QString *errorMessage = nullptr) const;
 
     QString readOneLine(const QString &workingDirectory, const QStringList &arguments) const;