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

Utils: Use CommandLine in ShellCommand

Browse Source 
... and adapt users.

Change-Id: I218523ffe34720d5fe199aa0ca6892a8dc2985fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2019-06-07 15:27:50 +02:00
parent 749eaaad81
commit 00b692e67e
29 changed files with 78 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/vcsbase/vcsoutputwindow.cpp
View File

@@ -456,12 +456,10 @@ static inline QString formatArguments(const QStringList &args)
return rc;
}
QString VcsOutputWindow::msgExecutionLogEntry(const QString &workingDir,
const FilePath &executable,
const QStringList &arguments)
QString VcsOutputWindow::msgExecutionLogEntry(const QString &workingDir, const CommandLine &command)
{
const QString args = formatArguments(arguments);
const QString nativeExecutable = QtcProcess::quoteArg(executable.toUserOutput());
const QString args = formatArguments(command.splitArguments());
const QString nativeExecutable = QtcProcess::quoteArg(command.executable().toUserOutput());
if (workingDir.isEmpty())
return tr("Running: %1 %2").arg(nativeExecutable, args) + '\n';
return tr("Running in %1: %2 %3").
@@ -473,11 +471,9 @@ void VcsOutputWindow::appendShellCommandLine(const QString &text)
append(filterPasswordFromUrls(text), Command, true);
}
void VcsOutputWindow::appendCommand(const QString &workingDirectory,
const FilePath &binary,
const QStringList &args)
void VcsOutputWindow::appendCommand(const QString &workingDirectory, const CommandLine &command)
{
appendShellCommandLine(msgExecutionLogEntry(workingDirectory, binary, args));
appendShellCommandLine(msgExecutionLogEntry(workingDirectory, command));
}
void VcsOutputWindow::appendMessage(const QString &text)