aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmakeprojectmanager/makefileparse.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2021-05-06 13:07:36 +0200
committerhjk <[email protected]>2021-05-11 09:45:24 +0000
commitf2f40efa03f5303df732310d12efec50251fd075 (patch)
treec464c4dec218bad87efd7182140629fa927bb184 /src/plugins/qmakeprojectmanager/makefileparse.cpp
parent8aafe36d01eba496e3cb6664a5eed9c863152468 (diff)
Utils: Move process arguments class out of QtcProcess
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 <[email protected]>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/makefileparse.cpp')
-rw-r--r--src/plugins/qmakeprojectmanager/makefileparse.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp
index 2beb5d899f4..04048801b21 100644
--- a/src/plugins/qmakeprojectmanager/makefileparse.cpp
+++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp
@@ -76,7 +76,7 @@ void MakeFileParse::parseArgs(const QString &args, const QString &project,
bool after = false;
bool ignoreNext = false;
m_unparsedArguments = args;
- QtcProcess::ArgIterator ait(&m_unparsedArguments);
+ ProcessArgs::ArgIterator ait(&m_unparsedArguments);
while (ait.next()) {
if (ignoreNext) {
// Ignoring
@@ -391,11 +391,11 @@ void MakeFileParse::parseCommandLine(const QString &command, const QString &proj
const QList<QMakeAssignment> &assignmentsToUse = m_mode == Mode::FilterKnownConfigValues
? filteredAssignments : assignments;
foreach (const QMakeAssignment &qa, assignmentsToUse)
- QtcProcess::addArg(&m_unparsedArguments, qa.variable + qa.op + qa.value);
+ ProcessArgs::addArg(&m_unparsedArguments, qa.variable + qa.op + qa.value);
if (!afterAssignments.isEmpty()) {
- QtcProcess::addArg(&m_unparsedArguments, QLatin1String("-after"));
+ ProcessArgs::addArg(&m_unparsedArguments, QLatin1String("-after"));
foreach (const QMakeAssignment &qa, afterAssignments)
- QtcProcess::addArg(&m_unparsedArguments, qa.variable + qa.op + qa.value);
+ ProcessArgs::addArg(&m_unparsedArguments, qa.variable + qa.op + qa.value);
}
}
@@ -527,8 +527,8 @@ void QmakeProjectManagerPlugin::testMakefileParser()
MakeFileParse parser("/tmp/something", MakeFileParse::Mode::FilterKnownConfigValues);
parser.parseCommandLine(command, project);
- QCOMPARE(Utils::QtcProcess::splitArgs(parser.unparsedArguments()),
- Utils::QtcProcess::splitArgs(unparsedArguments));
+ QCOMPARE(Utils::ProcessArgs::splitArgs(parser.unparsedArguments()),
+ Utils::ProcessArgs::splitArgs(unparsedArguments));
QCOMPARE(parser.effectiveBuildConfig({}), effectiveBuildConfig);
const QMakeStepConfig qmsc = parser.config();