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

Utils: Move process arguments class out of QtcProcess

Browse Source 
The main QtcProcess interface is nowadays a CommandLine, with no
explicit references left to QtcProcess::Arguments and related static
helper functions, so it only clutters the QtcProcess class interface

So move these items out of QtcProcess, later potentially to a separate
file pair.

Change-Id: I45c300b656f5b30e2e2717232c855fdd97c2d1d7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-06 13:07:36 +02:00
parent 8aafe36d01
commit f2f40efa03
62 changed files with 437 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -448,12 +448,12 @@ static inline QString formatArguments(const QStringList &args)
if (i)
str << ' ';
if (arg.startsWith(QString::fromLatin1(passwordOptionC) + '=')) {
str << QtcProcess::quoteArg("--password=********");
str << ProcessArgs::quoteArg("--password=********");
continue;
}
str << QtcProcess::quoteArg(arg);
str << ProcessArgs::quoteArg(arg);
if (arg == passwordOptionC) {
str << ' ' << QtcProcess::quoteArg("********");
str << ' ' << ProcessArgs::quoteArg("********");
i++;
}
}
@@ -463,7 +463,7 @@ static inline QString formatArguments(const QStringList &args)
QString VcsOutputWindow::msgExecutionLogEntry(const QString &workingDir, const CommandLine &command)
{
const QString args = formatArguments(command.splitArguments());
const QString nativeExecutable = QtcProcess::quoteArg(command.executable().toUserOutput());
const QString nativeExecutable = ProcessArgs::quoteArg(command.executable().toUserOutput());
if (workingDir.isEmpty())
return tr("Running: %1 %2").arg(nativeExecutable, args) + '\n';
return tr("Running in %1: %2 %3").