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

Vcs: Use FilePath for working directory in DiffEditorController

Browse Source 
Change-Id: I7b5e1349bc679bd90b7781fbe0b40485ec653473
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2021-08-17 12:26:10 +02:00
parent 6d3659bef4
commit 4bf6008158
13 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
View File

@@ -95,9 +95,9 @@ public:
void commandFinished(bool success);
VcsBaseDiffEditorController *q;
QString m_directory;
FilePath m_directory;
Environment m_processEnvironment;
Utils::FilePath m_vcsBinary;
FilePath m_vcsBinary;
int m_vscTimeoutS;
QString m_startupFile;
QString m_output;
@@ -241,7 +241,7 @@ void VcsBaseDiffEditorController::runCommand(const QList<QStringList> &args, uns
// and "Waiting for data..." will be shown.
d->cancelReload();
d->m_command = new VcsCommand(FilePath::fromString(workingDirectory()), d->m_processEnvironment);
d->m_command = new VcsCommand(workingDirectory(), d->m_processEnvironment);
d->m_command->setDisplayName(d->m_displayName);
d->m_command->setCodec(codec ? codec : EditorManager::defaultTextCodec());
d->m_commandResultProxy = new VcsCommandResultProxy(d->m_command.data(), d);
@@ -261,7 +261,7 @@ void VcsBaseDiffEditorController::processCommandOutput(const QString &output)
d->processDiff(output);
}
QString VcsBaseDiffEditorController::workingDirectory() const
FilePath VcsBaseDiffEditorController::workingDirectory() const
{
return d->m_directory;
}
@@ -281,7 +281,7 @@ void VcsBaseDiffEditorController::setDisplayName(const QString &displayName)
d->m_displayName = displayName;
}
void VcsBase::VcsBaseDiffEditorController::setWorkingDirectory(const QString &workingDir)
void VcsBase::VcsBaseDiffEditorController::setWorkingDirectory(const FilePath &workingDir)
{
d->m_directory = workingDir;
setBaseDirectory(workingDir);