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

10
src/plugins/ios/iosbuildstep.cpp
View File

@@ -95,7 +95,7 @@ QWidget *IosBuildStep::createConfigWidget()
auto buildArgumentsLabel = new QLabel(tr("Base arguments:"), widget);
auto buildArgumentsTextEdit = new QPlainTextEdit(widget);
buildArgumentsTextEdit->setPlainText(QtcProcess::joinArgs(baseArguments()));
buildArgumentsTextEdit->setPlainText(ProcessArgs::joinArgs(baseArguments()));
auto resetDefaultsButton = new QPushButton(widget);
resetDefaultsButton->setLayoutDirection(Qt::RightToLeft);
@@ -105,7 +105,7 @@ QWidget *IosBuildStep::createConfigWidget()
auto extraArgumentsLabel = new QLabel(tr("Extra arguments:"), widget);
auto extraArgumentsLineEdit = new QLineEdit(widget);
extraArgumentsLineEdit->setText(QtcProcess::joinArgs(m_extraArguments));
extraArgumentsLineEdit->setText(ProcessArgs::joinArgs(m_extraArguments));
auto gridLayout = new QGridLayout(widget);
gridLayout->addWidget(buildArgumentsLabel, 0, 0, 1, 1);
@@ -125,19 +125,19 @@ QWidget *IosBuildStep::createConfigWidget()
updateDetails();
connect(buildArgumentsTextEdit, &QPlainTextEdit::textChanged, this, [=] {
setBaseArguments(QtcProcess::splitArgs(buildArgumentsTextEdit->toPlainText()));
setBaseArguments(ProcessArgs::splitArgs(buildArgumentsTextEdit->toPlainText()));
resetDefaultsButton->setEnabled(!m_useDefaultArguments);
updateDetails();
});
connect(resetDefaultsButton, &QAbstractButton::clicked, this, [=] {
setBaseArguments(defaultArguments());
buildArgumentsTextEdit->setPlainText(QtcProcess::joinArgs(baseArguments()));
buildArgumentsTextEdit->setPlainText(ProcessArgs::joinArgs(baseArguments()));
resetDefaultsButton->setEnabled(!m_useDefaultArguments);
});
connect(extraArgumentsLineEdit, &QLineEdit::editingFinished, [=] {
setExtraArguments(QtcProcess::splitArgs(extraArgumentsLineEdit->text()));
setExtraArguments(ProcessArgs::splitArgs(extraArgumentsLineEdit->text()));
});
connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::settingsChanged,

6
src/plugins/ios/iosdsymbuildstep.cpp
View File

@@ -213,7 +213,7 @@ QWidget *IosDsymBuildStep::createConfigWidget()
commandLineEdit->setText(command().toString());
auto argumentsTextEdit = new QPlainTextEdit(widget);
argumentsTextEdit->setPlainText(Utils::QtcProcess::joinArgs(arguments()));
argumentsTextEdit->setPlainText(Utils::ProcessArgs::joinArgs(arguments()));
auto argumentsLabel = new QLabel(tr("Arguments:"), widget);
@@ -238,7 +238,7 @@ QWidget *IosDsymBuildStep::createConfigWidget()
connect(argumentsTextEdit, &QPlainTextEdit::textChanged, this,
[this, argumentsTextEdit, resetDefaultsButton, updateDetails] {
setArguments(Utils::QtcProcess::splitArgs(argumentsTextEdit->toPlainText()));
setArguments(Utils::ProcessArgs::splitArgs(argumentsTextEdit->toPlainText()));
resetDefaultsButton->setEnabled(!isDefault());
updateDetails();
});
@@ -255,7 +255,7 @@ QWidget *IosDsymBuildStep::createConfigWidget()
setCommand(defaultCommand());
setArguments(defaultArguments());
commandLineEdit->setText(command().toString());
argumentsTextEdit->setPlainText(Utils::QtcProcess::joinArgs(arguments()));
argumentsTextEdit->setPlainText(Utils::ProcessArgs::joinArgs(arguments()));
resetDefaultsButton->setEnabled(!isDefault());
updateDetails();
});

2
src/plugins/ios/iosrunner.cpp
View File

@@ -197,7 +197,7 @@ void IosRunner::start()
this, &IosRunner::handleFinished);
const Runnable runnable = runControl()->runnable();
QStringList args = QtcProcess::splitArgs(runnable.commandLineArguments, OsTypeMac);
QStringList args = ProcessArgs::splitArgs(runnable.commandLineArguments, OsTypeMac);
if (m_qmlServerPort.isValid()) {
QUrl qmlServer;
qmlServer.setPort(m_qmlServerPort.number());