From 9e3bbf36f2373f8cd05c739e016fe2d9a8dac1ff Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 10 Apr 2020 08:16:45 +0300 Subject: [PATCH] Git: Change some functions in GitClient to const Change-Id: Iefd3e0345c7a507d1d5c225ea81677e7a93df295 Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 18 +++++++++--------- src/plugins/git/gitclient.h | 18 +++++++++--------- src/plugins/git/gitplugin.cpp | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 503a0a5ba09..67902690332 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -982,7 +982,7 @@ void GitClient::diffProject(const QString &workingDirectory, const QString &proj }); } -void GitClient::diffRepository(const QString &workingDirectory) +void GitClient::diffRepository(const QString &workingDirectory) const { const QString documentId = QLatin1String(Constants::GIT_PLUGIN) + QLatin1String(".DiffRepository.") + workingDirectory; @@ -1018,7 +1018,7 @@ void GitClient::merge(const QString &workingDirectory, delete mergeTool; } -void GitClient::status(const QString &workingDirectory) +void GitClient::status(const QString &workingDirectory) const { VcsOutputWindow::setRepository(workingDirectory); VcsCommand *command = vcsExec(workingDirectory, {"status", "-u"}, nullptr, true); @@ -2433,7 +2433,7 @@ QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryUR return branches; } -void GitClient::launchGitK(const QString &workingDirectory, const QString &fileName) +void GitClient::launchGitK(const QString &workingDirectory, const QString &fileName) const { const QFileInfo binaryInfo = vcsBinary().toFileInfo(); QDir foundBinDir(binaryInfo.dir()); @@ -2469,7 +2469,7 @@ void GitClient::launchGitK(const QString &workingDirectory, const QString &fileN VcsOutputWindow::appendError(msgCannotLaunch("gitk")); } -void GitClient::launchRepositoryBrowser(const QString &workingDirectory) +void GitClient::launchRepositoryBrowser(const QString &workingDirectory) const { const QString repBrowserBinary = settings().stringValue(GitSettings::repositoryBrowserCmd); if (!repBrowserBinary.isEmpty()) @@ -2479,7 +2479,7 @@ void GitClient::launchRepositoryBrowser(const QString &workingDirectory) bool GitClient::tryLauchingGitK(const QProcessEnvironment &env, const QString &workingDirectory, const QString &fileName, - const QString &gitBinDirectory) + const QString &gitBinDirectory) const { QString binary = gitBinDirectory + "/gitk"; QStringList arguments; @@ -2501,7 +2501,7 @@ bool GitClient::tryLauchingGitK(const QProcessEnvironment &env, // the child), but that does not have an environment parameter. bool success = false; if (!settings().stringValue(GitSettings::pathKey).isEmpty()) { - auto process = new QProcess(this); + auto process = new QProcess; process->setWorkingDirectory(workingDirectory); process->setProcessEnvironment(env); process->start(binary, arguments); @@ -3118,7 +3118,7 @@ void GitClient::addFuture(const QFuture &future) } // Subversion: git svn -void GitClient::synchronousSubversionFetch(const QString &workingDirectory) +void GitClient::synchronousSubversionFetch(const QString &workingDirectory) const { // Disable UNIX terminals to suppress SSH prompting. const unsigned flags = VcsCommand::SshPasswordPrompt @@ -3127,7 +3127,7 @@ void GitClient::synchronousSubversionFetch(const QString &workingDirectory) vcsSynchronousExec(workingDirectory, {"svn", "fetch"}, flags); } -void GitClient::subversionLog(const QString &workingDirectory) +void GitClient::subversionLog(const QString &workingDirectory) const { QStringList arguments = {"svn", "log"}; int logCount = settings().intValue(GitSettings::logCountKey); @@ -3144,7 +3144,7 @@ void GitClient::subversionLog(const QString &workingDirectory) vcsExec(workingDirectory, arguments, editor); } -void GitClient::subversionDeltaCommit(const QString &workingDirectory) +void GitClient::subversionDeltaCommit(const QString &workingDirectory) const { vcsExec(workingDirectory, {"svn", "dcommit"}, nullptr, true, VcsCommand::ShowSuccessMessage); diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index defe117d514..e1646249f53 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -160,12 +160,12 @@ public: const QStringList &stagedFileNames) const; void diffProject(const QString &workingDirectory, const QString &projectDirectory) const; - void diffRepository(const QString &workingDirectory); + void diffRepository(const QString &workingDirectory) const; void diffBranch(const QString &workingDirectory, const QString &branchName) const; void merge(const QString &workingDirectory, const QStringList &unmergedFileNames = QStringList()); - void status(const QString &workingDirectory); + void status(const QString &workingDirectory) const; void log(const QString &workingDirectory, const QString &fileName = QString(), bool enableAnnotationContextMenu = false, const QStringList &args = QStringList()); void reflog(const QString &workingDirectory, const QString &branch = {}); @@ -284,9 +284,9 @@ public: const QString &tracking); // git svn support (asynchronous). - void synchronousSubversionFetch(const QString &workingDirectory); - void subversionLog(const QString &workingDirectory); - void subversionDeltaCommit(const QString &workingDirectory); + void synchronousSubversionFetch(const QString &workingDirectory) const; + void subversionLog(const QString &workingDirectory) const; + void subversionDeltaCommit(const QString &workingDirectory) const; void stashPop(const QString &workingDirectory, const QString &stash = QString()); void revert(const QStringList &files, bool revertStaging); @@ -326,12 +326,12 @@ public: QString extendedShowDescription(const QString &workingDirectory, const QString &text) const; - void launchGitK(const QString &workingDirectory, const QString &fileName); - void launchGitK(const QString &workingDirectory) { launchGitK(workingDirectory, QString()); } + void launchGitK(const QString &workingDirectory, const QString &fileName) const; + void launchGitK(const QString &workingDirectory) const { launchGitK(workingDirectory, QString()); } bool launchGitGui(const QString &workingDirectory); Utils::FilePath gitBinDirectory() const; - void launchRepositoryBrowser(const QString &workingDirectory); + void launchRepositoryBrowser(const QString &workingDirectory) const; QStringList synchronousRepositoryBranches(const QString &repositoryURL, const QString &workingDirectory = QString()) const; @@ -388,7 +388,7 @@ private: bool tryLauchingGitK(const QProcessEnvironment &env, const QString &workingDirectory, const QString &fileName, - const QString &gitBinDirectory); + const QString &gitBinDirectory) const; bool cleanList(const QString &workingDirectory, const QString &modulePath, const QString &flag, QStringList *files, QString *errorMessage); enum ContinueCommandMode { diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index dfaeb44f453..6505485699e 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -103,7 +103,7 @@ using namespace std::placeholders; namespace Git { namespace Internal { -using GitClientMemberFunc = void (GitClient::*)(const QString &); +using GitClientMemberFunc = void (GitClient::*)(const QString &) const; class GitTopicCache : public Core::IVersionControl::TopicCache {