feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Sprinkle C++11 goodness over the code

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

Remove lots of QLatin1* while at it.

Change-Id: I0d8354bcbdb759db65da6153bb356fb4b8ed0e8d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2016-07-05 14:43:14 +02:00
parent 08dc992aef
commit bdff47afd5
2 changed files with 384 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

824
src/plugins/git/gitclient.cpp
View File

File diff suppressed because it is too large Load Diff

73
src/plugins/git/gitclient.h
View File

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