diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-10-06 20:52:09 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-10-10 18:59:50 +0200 |
| commit | 2da85dc68673aacb8f9d015699c8b2b188117562 (patch) | |
| tree | 130fdd44672854a7bc01e9f9f600d26c4efe7084 /src/plugins/git/gitclient.cpp | |
| parent | 7b08d993bff0951428d6a7cb2d402e9571df0550 (diff) | |
| download | qt-creator-2da85dc68673aacb8f9d015699c8b2b188117562.tar.gz | |
VCS: Rename diffBaseDirectory -> workingDirectory
Can have other usages than diff
Change-Id: Ieb01a88eb95503ac89b2f2c1120eddf404cdce5a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index bd6327ec92..834a41295d 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1122,7 +1122,7 @@ void GitClient::diff(const QString &workingDirectory, vcsEditor->configurationWidget()); argWidget->setFileNames(unstagedFileNames, stagedFileNames); QStringList userDiffArgs = argWidget->arguments(); - vcsEditor->setDiffBaseDirectory(workingDirectory); + vcsEditor->setWorkingDirectory(workingDirectory); // Create a batch of 2 commands to be run after each other in case // we have a mixture of staged/unstaged files as is the case @@ -1220,7 +1220,7 @@ void GitClient::diff(const QString &workingDirectory, const QString &fileName) connect(vcsEditor, SIGNAL(diffChunkReverted(VcsBase::DiffChunk)), argWidget, SLOT(executeCommand())); } - vcsEditor->setDiffBaseDirectory(workingDirectory); + vcsEditor->setWorkingDirectory(workingDirectory); QStringList cmdArgs; cmdArgs << QLatin1String("diff") @@ -1280,7 +1280,7 @@ void GitClient::diffBranch(const QString &workingDirectory, branchName)); newEditor = vcsEditor->editor(); } - vcsEditor->setDiffBaseDirectory(workingDirectory); + vcsEditor->setWorkingDirectory(workingDirectory); QStringList cmdArgs; cmdArgs << QLatin1String("diff") @@ -1331,7 +1331,7 @@ void GitClient::log(const QString &workingDirectory, const QString &fileName, enableAnnotationContextMenu, args, fileName)); editor->setFileLogAnnotateEnabled(enableAnnotationContextMenu); - editor->setDiffBaseDirectory(workingDirectory); + editor->setWorkingDirectory(workingDirectory); QStringList arguments; arguments << QLatin1String("log") << QLatin1String(noColorOption) @@ -1444,7 +1444,7 @@ void GitClient::show(const QString &source, const QString &id, << vcsEditor->configurationWidget()->arguments() << id; - vcsEditor->setDiffBaseDirectory(workingDirectory); + vcsEditor->setWorkingDirectory(workingDirectory); executeGit(workingDirectory, arguments, vcsEditor); } if (newEditor) { |