summaryrefslogtreecommitdiff
path: root/src/plugins/subversion/subversionplugin.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2023-05-15 18:32:01 +0200
committerhjk <hjk@qt.io>2023-05-17 05:51:17 +0000
commit337497d990bbfb52f27b5ba7019cdd0fb9c6d5fe (patch)
treefa66540f59633f787adba6aa07c8b03d7a6fca55 /src/plugins/subversion/subversionplugin.cpp
parent6c5fb656d63efddcdc7e98e58aae04f2ae718c50 (diff)
downloadqt-creator-337497d990bbfb52f27b5ba7019cdd0fb9c6d5fe.tar.gz
Vcs: Use new FilePathAspect in a few places
Change-Id: Idc23616dd3b7bc21301471cb48e2893116b83f0d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/subversion/subversionplugin.cpp')
-rw-r--r--src/plugins/subversion/subversionplugin.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 957947a89a..5cb7475edb 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -638,7 +638,7 @@ void SubversionPluginPrivate::revertAll()
QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
return;
// NoteL: Svn "revert ." doesn not work.
- CommandLine args{settings().binaryPath.filePath(), {"revert"}};
+ CommandLine args{settings().binaryPath(), {"revert"}};
args << SubversionClient::AddAuthOptions();
args << QLatin1String("--recursive") << state.topLevel().toString();
const auto revertResponse = runSvn(state.topLevel(), args, RunFlags::ShowStdOut);
@@ -655,7 +655,7 @@ void SubversionPluginPrivate::revertCurrentFile()
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
- CommandLine diffArgs{settings().binaryPath.filePath(), {"diff"}};
+ CommandLine diffArgs{settings().binaryPath(), {"diff"}};
diffArgs << SubversionClient::AddAuthOptions();
diffArgs << SubversionClient::escapeFile(state.relativeCurrentFile());
@@ -673,7 +673,7 @@ void SubversionPluginPrivate::revertCurrentFile()
FileChangeBlocker fcb(state.currentFile());
// revert
- CommandLine args{settings().binaryPath.filePath(), {"revert"}};
+ CommandLine args{settings().binaryPath(), {"revert"}};
args << SubversionClient::AddAuthOptions();
args << SubversionClient::escapeFile(state.relativeCurrentFile());
@@ -734,7 +734,7 @@ void SubversionPluginPrivate::startCommit(const FilePath &workingDir, const QStr
return;
}
- CommandLine args{settings().binaryPath.filePath(), {"status"}};
+ CommandLine args{settings().binaryPath(), {"status"}};
args << SubversionClient::AddAuthOptions();
args << SubversionClient::escapeFiles(files);
@@ -813,7 +813,7 @@ void SubversionPluginPrivate::svnStatus(const FilePath &workingDir, const QStrin
{
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
- CommandLine args{settings().binaryPath.filePath(), {"status"}};
+ CommandLine args{settings().binaryPath(), {"status"}};
args << SubversionClient::AddAuthOptions();
if (!relativePath.isEmpty())
args << SubversionClient::escapeFile(relativePath);
@@ -839,7 +839,7 @@ void SubversionPluginPrivate::updateProject()
void SubversionPluginPrivate::svnUpdate(const FilePath &workingDir, const QString &relativePath)
{
- CommandLine args{settings().binaryPath.filePath(), {"update"}};
+ CommandLine args{settings().binaryPath(), {"update"}};
args << SubversionClient::AddAuthOptions();
args << Constants::NON_INTERACTIVE_OPTION;
if (!relativePath.isEmpty())