diff options
author | hjk <[email protected]> | 2021-05-06 13:07:36 +0200 |
---|---|---|
committer | hjk <[email protected]> | 2021-05-11 09:45:24 +0000 |
commit | f2f40efa03f5303df732310d12efec50251fd075 (patch) | |
tree | c464c4dec218bad87efd7182140629fa927bb184 /src/plugins/baremetal/keiltoolchain.cpp | |
parent | 8aafe36d01eba496e3cb6664a5eed9c863152468 (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/baremetal/keiltoolchain.cpp')
-rw-r--r-- | src/plugins/baremetal/keiltoolchain.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index 77da384443a..9fc8643a0c0 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -727,7 +727,7 @@ KeilToolChainConfigWidget::KeilToolChainConfigWidget(KeilToolChain *tc) : m_compilerCommand->setHistoryCompleter("PE.KEIL.Command.History"); m_mainLayout->addRow(tr("&Compiler path:"), m_compilerCommand); m_platformCodeGenFlagsLineEdit = new QLineEdit(this); - m_platformCodeGenFlagsLineEdit->setText(QtcProcess::joinArgs(tc->extraCodeModelFlags())); + m_platformCodeGenFlagsLineEdit->setText(ProcessArgs::joinArgs(tc->extraCodeModelFlags())); m_mainLayout->addRow(tr("Platform codegen flags:"), m_platformCodeGenFlagsLineEdit); m_mainLayout->addRow(tr("&ABI:"), m_abiWidget); @@ -769,7 +769,7 @@ bool KeilToolChainConfigWidget::isDirtyImpl() const { const auto tc = static_cast<KeilToolChain *>(toolChain()); return m_compilerCommand->filePath() != tc->compilerCommand() - || m_platformCodeGenFlagsLineEdit->text() != QtcProcess::joinArgs(tc->extraCodeModelFlags()) + || m_platformCodeGenFlagsLineEdit->text() != ProcessArgs::joinArgs(tc->extraCodeModelFlags()) || m_abiWidget->currentAbi() != tc->targetAbi() ; } @@ -786,7 +786,7 @@ void KeilToolChainConfigWidget::setFromToolChain() const QSignalBlocker blocker(this); const auto tc = static_cast<KeilToolChain *>(toolChain()); m_compilerCommand->setFilePath(tc->compilerCommand()); - m_platformCodeGenFlagsLineEdit->setText(QtcProcess::joinArgs(tc->extraCodeModelFlags())); + m_platformCodeGenFlagsLineEdit->setText(ProcessArgs::joinArgs(tc->extraCodeModelFlags())); m_abiWidget->setAbis({}, tc->targetAbi()); const bool haveCompiler = compilerExists(m_compilerCommand->filePath()); m_abiWidget->setEnabled(haveCompiler && !tc->isAutoDetected()); @@ -802,7 +802,7 @@ void KeilToolChainConfigWidget::handleCompilerCommandChange() QStringList newExtraArgs = prevExtraArgs; addDefaultCpuArgs(compilerPath, newExtraArgs); if (prevExtraArgs != newExtraArgs) - m_platformCodeGenFlagsLineEdit->setText(QtcProcess::joinArgs(newExtraArgs)); + m_platformCodeGenFlagsLineEdit->setText(ProcessArgs::joinArgs(newExtraArgs)); m_macros = dumpPredefinedMacros(compilerPath, newExtraArgs, env); const Abi guessed = guessAbi(m_macros); m_abiWidget->setAbis({}, guessed); @@ -815,7 +815,7 @@ void KeilToolChainConfigWidget::handleCompilerCommandChange() void KeilToolChainConfigWidget::handlePlatformCodeGenFlagsChange() { const QString str1 = m_platformCodeGenFlagsLineEdit->text(); - const QString str2 = QtcProcess::joinArgs(splitString(str1)); + const QString str2 = ProcessArgs::joinArgs(splitString(str1)); if (str1 != str2) m_platformCodeGenFlagsLineEdit->setText(str2); else |