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

Utils: Drop OsType parameter from CommandLine functions

Browse Source 
The type is implicitly given by the command's executble FilePath.

Also, rename the rarely used addArgs(const CommandLine &) overload
to addCommandLineAsArgs() and make it strip scheme and host from
the wrapped executable as there are no uses expected where keeping
them would be the right thing.

Change-Id: Id0b76778e7e01ac16e477f36bf30bb28d96bb177
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-08-12 13:04:22 +02:00
parent d735d3238f
commit 20a63d6c7e
7 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/utils/commandline.cpp
View File

@@ -1434,23 +1434,23 @@ CommandLine::CommandLine(const FilePath &exe, const QString &args, RawType)
addArgs(args, Raw);
}
void CommandLine::addArg(const QString &arg, OsType osType)
void CommandLine::addArg(const QString &arg)
{
ProcessArgs::addArg(&m_arguments, arg, osType);
ProcessArgs::addArg(&m_arguments, arg, m_executable.osType());
}
void CommandLine::addArgs(const QStringList &inArgs, OsType osType)
void CommandLine::addArgs(const QStringList &inArgs)
{
for (const QString &arg : inArgs)
addArg(arg, osType);
addArg(arg);
}
// Adds cmd's executable and arguments one by one to this commandline.
// Useful for 'sudo', 'nice', etc
void CommandLine::addArgs(const CommandLine &cmd, OsType osType)
void CommandLine::addCommandLineAsArgs(const CommandLine &cmd)
{
addArg(cmd.executable().toString());
addArgs(cmd.splitArguments(osType));
addArg(cmd.executable().path());
addArgs(cmd.splitArguments());
}
void CommandLine::addArgs(const QString &inArgs, RawType)
@@ -1466,9 +1466,9 @@ QString CommandLine::toUserOutput() const
return res;
}
QStringList CommandLine::splitArguments(OsType osType) const
QStringList CommandLine::splitArguments() const
{
return ProcessArgs::splitArgs(m_arguments, osType);
return ProcessArgs::splitArgs(m_arguments, m_executable.osType());
}
} // namespace Utils