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

Git: Change some functions in GitClient to const

Browse Source 
Change-Id: Iefd3e0345c7a507d1d5c225ea81677e7a93df295
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2020-04-10 08:16:45 +03:00
committed by Orgad Shaneh
parent c86c4d54e2
commit 9e3bbf36f2
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) const QString documentId = QLatin1String(Constants::GIT_PLUGIN)
+ QLatin1String(".DiffRepository.") + workingDirectory; + QLatin1String(".DiffRepository.") + workingDirectory;
@@ -1018,7 +1018,7 @@ void GitClient::merge(const QString &workingDirectory,
delete mergeTool; delete mergeTool;
} }
void GitClient::status(const QString &workingDirectory) void GitClient::status(const QString &workingDirectory) const
{ {
VcsOutputWindow::setRepository(workingDirectory); VcsOutputWindow::setRepository(workingDirectory);
VcsCommand *command = vcsExec(workingDirectory, {"status", "-u"}, nullptr, true); VcsCommand *command = vcsExec(workingDirectory, {"status", "-u"}, nullptr, true);
@@ -2433,7 +2433,7 @@ QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryUR
return branches; 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(); const QFileInfo binaryInfo = vcsBinary().toFileInfo();
QDir foundBinDir(binaryInfo.dir()); QDir foundBinDir(binaryInfo.dir());
@@ -2469,7 +2469,7 @@ void GitClient::launchGitK(const QString &workingDirectory, const QString &fileN
VcsOutputWindow::appendError(msgCannotLaunch("gitk")); VcsOutputWindow::appendError(msgCannotLaunch("gitk"));
} }
void GitClient::launchRepositoryBrowser(const QString &workingDirectory) void GitClient::launchRepositoryBrowser(const QString &workingDirectory) const
{ {
const QString repBrowserBinary = settings().stringValue(GitSettings::repositoryBrowserCmd); const QString repBrowserBinary = settings().stringValue(GitSettings::repositoryBrowserCmd);
if (!repBrowserBinary.isEmpty()) if (!repBrowserBinary.isEmpty())
@@ -2479,7 +2479,7 @@ void GitClient::launchRepositoryBrowser(const QString &workingDirectory)
bool GitClient::tryLauchingGitK(const QProcessEnvironment &env, bool GitClient::tryLauchingGitK(const QProcessEnvironment &env,
const QString &workingDirectory, const QString &workingDirectory,
const QString &fileName, const QString &fileName,
const QString &gitBinDirectory) const QString &gitBinDirectory) const
{ {
QString binary = gitBinDirectory + "/gitk"; QString binary = gitBinDirectory + "/gitk";
QStringList arguments; QStringList arguments;
@@ -2501,7 +2501,7 @@ bool GitClient::tryLauchingGitK(const QProcessEnvironment &env,
// the child), but that does not have an environment parameter. // the child), but that does not have an environment parameter.
bool success = false; bool success = false;
if (!settings().stringValue(GitSettings::pathKey).isEmpty()) { if (!settings().stringValue(GitSettings::pathKey).isEmpty()) {
auto process = new QProcess(this); auto process = new QProcess;
process->setWorkingDirectory(workingDirectory); process->setWorkingDirectory(workingDirectory);
process->setProcessEnvironment(env); process->setProcessEnvironment(env);
process->start(binary, arguments); process->start(binary, arguments);
@@ -3118,7 +3118,7 @@ void GitClient::addFuture(const QFuture<void> &future)
} }
// Subversion: git svn // Subversion: git svn
void GitClient::synchronousSubversionFetch(const QString &workingDirectory) void GitClient::synchronousSubversionFetch(const QString &workingDirectory) const
{ {
// Disable UNIX terminals to suppress SSH prompting. // Disable UNIX terminals to suppress SSH prompting.
const unsigned flags = VcsCommand::SshPasswordPrompt const unsigned flags = VcsCommand::SshPasswordPrompt
@@ -3127,7 +3127,7 @@ void GitClient::synchronousSubversionFetch(const QString &workingDirectory)
vcsSynchronousExec(workingDirectory, {"svn", "fetch"}, flags); vcsSynchronousExec(workingDirectory, {"svn", "fetch"}, flags);
} }
void GitClient::subversionLog(const QString &workingDirectory) void GitClient::subversionLog(const QString &workingDirectory) const
{ {
QStringList arguments = {"svn", "log"}; QStringList arguments = {"svn", "log"};
int logCount = settings().intValue(GitSettings::logCountKey); int logCount = settings().intValue(GitSettings::logCountKey);
@@ -3144,7 +3144,7 @@ void GitClient::subversionLog(const QString &workingDirectory)
vcsExec(workingDirectory, arguments, editor); vcsExec(workingDirectory, arguments, editor);
} }
void GitClient::subversionDeltaCommit(const QString &workingDirectory) void GitClient::subversionDeltaCommit(const QString &workingDirectory) const
{ {
vcsExec(workingDirectory, {"svn", "dcommit"}, nullptr, true, vcsExec(workingDirectory, {"svn", "dcommit"}, nullptr, true,
VcsCommand::ShowSuccessMessage); VcsCommand::ShowSuccessMessage);

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

@@ -160,12 +160,12 @@ public:
const QStringList &stagedFileNames) const; const QStringList &stagedFileNames) const;
void diffProject(const QString &workingDirectory, void diffProject(const QString &workingDirectory,
const QString &projectDirectory) const; const QString &projectDirectory) const;
void diffRepository(const QString &workingDirectory); void diffRepository(const QString &workingDirectory) const;
void diffBranch(const QString &workingDirectory, void diffBranch(const QString &workingDirectory,
const QString &branchName) const; const QString &branchName) const;
void merge(const QString &workingDirectory, const QStringList &unmergedFileNames = QStringList()); 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(), void log(const QString &workingDirectory, const QString &fileName = QString(),
bool enableAnnotationContextMenu = false, const QStringList &args = QStringList()); bool enableAnnotationContextMenu = false, const QStringList &args = QStringList());
void reflog(const QString &workingDirectory, const QString &branch = {}); void reflog(const QString &workingDirectory, const QString &branch = {});
@@ -284,9 +284,9 @@ public:
const QString &tracking); const QString &tracking);
// git svn support (asynchronous). // git svn support (asynchronous).
void synchronousSubversionFetch(const QString &workingDirectory); void synchronousSubversionFetch(const QString &workingDirectory) const;
void subversionLog(const QString &workingDirectory); void subversionLog(const QString &workingDirectory) const;
void subversionDeltaCommit(const QString &workingDirectory); void subversionDeltaCommit(const QString &workingDirectory) const;
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);
@@ -326,12 +326,12 @@ public:
QString extendedShowDescription(const QString &workingDirectory, const QString &text) const; QString extendedShowDescription(const QString &workingDirectory, const QString &text) const;
void launchGitK(const QString &workingDirectory, const QString &fileName); void launchGitK(const QString &workingDirectory, const QString &fileName) const;
void launchGitK(const QString &workingDirectory) { launchGitK(workingDirectory, QString()); } void launchGitK(const QString &workingDirectory) const { launchGitK(workingDirectory, QString()); }
bool launchGitGui(const QString &workingDirectory); bool launchGitGui(const QString &workingDirectory);
Utils::FilePath gitBinDirectory() const; Utils::FilePath gitBinDirectory() const;
void launchRepositoryBrowser(const QString &workingDirectory); void launchRepositoryBrowser(const QString &workingDirectory) const;
QStringList synchronousRepositoryBranches(const QString &repositoryURL, QStringList synchronousRepositoryBranches(const QString &repositoryURL,
const QString &workingDirectory = QString()) const; const QString &workingDirectory = QString()) const;
@@ -388,7 +388,7 @@ private:
bool tryLauchingGitK(const QProcessEnvironment &env, bool tryLauchingGitK(const QProcessEnvironment &env,
const QString &workingDirectory, const QString &workingDirectory,
const QString &fileName, 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); bool cleanList(const QString &workingDirectory, const QString &modulePath, const QString &flag, QStringList *files, QString *errorMessage);
enum ContinueCommandMode { enum ContinueCommandMode {

2
src/plugins/git/gitplugin.cpp
View File

@@ -103,7 +103,7 @@ using namespace std::placeholders;
namespace Git { namespace Git {
namespace Internal { namespace Internal {
using GitClientMemberFunc = void (GitClient::*)(const QString &); using GitClientMemberFunc = void (GitClient::*)(const QString &) const;
class GitTopicCache : public Core::IVersionControl::TopicCache class GitTopicCache : public Core::IVersionControl::TopicCache
{ {