aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2023-05-03 16:00:22 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2023-05-04 05:52:16 +0000
commit470c95c94be58905bc3202d3b58175add5f576fa (patch)
tree992c0eea5e7e88f4599a533d2bcbf4bfac472cd9 /src
parente5051bbfdef896ece974a949a392de7337284bf0 (diff)
Utils: Rename QtcProcess -> Process
Task-number: QTCREATORBUG-29102 Change-Id: Ibc264f9db6a32206e4097766ee3f7d0b35225a5c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/libs/extensionsystem/pluginmanager.cpp2
-rw-r--r--src/libs/qmljs/qmljsplugindumper.cpp8
-rw-r--r--src/libs/qmljs/qmljsplugindumper.h6
-rw-r--r--src/libs/utils/archive.cpp6
-rw-r--r--src/libs/utils/archive.h4
-rw-r--r--src/libs/utils/buildablehelperlibrary.cpp4
-rw-r--r--src/libs/utils/clangutils.cpp2
-rw-r--r--src/libs/utils/devicefileaccess.cpp8
-rw-r--r--src/libs/utils/deviceshell.cpp14
-rw-r--r--src/libs/utils/deviceshell.h6
-rw-r--r--src/libs/utils/filestreamer.cpp18
-rw-r--r--src/libs/utils/pathchooser.cpp2
-rw-r--r--src/libs/utils/processinfo.cpp6
-rw-r--r--src/libs/utils/processinterface.h2
-rw-r--r--src/libs/utils/qtcprocess.cpp204
-rw-r--r--src/libs/utils/qtcprocess.h10
-rw-r--r--src/libs/utils/terminalhooks.cpp4
-rw-r--r--src/plugins/android/androidavdmanager.cpp14
-rw-r--r--src/plugins/android/androidbuildapkstep.cpp2
-rw-r--r--src/plugins/android/androidconfigurations.cpp10
-rw-r--r--src/plugins/android/androidcreatekeystorecertificate.cpp2
-rw-r--r--src/plugins/android/androiddeployqtstep.cpp4
-rw-r--r--src/plugins/android/androiddevice.cpp6
-rw-r--r--src/plugins/android/androiddevice.h4
-rw-r--r--src/plugins/android/androidmanager.cpp8
-rw-r--r--src/plugins/android/androidqmlpreviewworker.cpp6
-rw-r--r--src/plugins/android/androidrunnerworker.cpp4
-rw-r--r--src/plugins/android/androidsdkmanager.cpp6
-rw-r--r--src/plugins/android/androidsettingswidget.cpp4
-rw-r--r--src/plugins/android/androidsignaloperation.cpp4
-rw-r--r--src/plugins/android/androidsignaloperation.h2
-rw-r--r--src/plugins/autotest/boost/boosttestconfiguration.cpp2
-rw-r--r--src/plugins/autotest/boost/boosttestconfiguration.h2
-rw-r--r--src/plugins/autotest/boost/boosttestoutputreader.cpp4
-rw-r--r--src/plugins/autotest/boost/boosttestoutputreader.h2
-rw-r--r--src/plugins/autotest/catch/catchconfiguration.cpp2
-rw-r--r--src/plugins/autotest/catch/catchconfiguration.h2
-rw-r--r--src/plugins/autotest/catch/catchoutputreader.cpp2
-rw-r--r--src/plugins/autotest/catch/catchoutputreader.h2
-rw-r--r--src/plugins/autotest/ctest/ctestconfiguration.cpp2
-rw-r--r--src/plugins/autotest/ctest/ctestconfiguration.h2
-rw-r--r--src/plugins/autotest/ctest/ctestoutputreader.cpp2
-rw-r--r--src/plugins/autotest/ctest/ctestoutputreader.h4
-rw-r--r--src/plugins/autotest/gtest/gtestconfiguration.cpp2
-rw-r--r--src/plugins/autotest/gtest/gtestconfiguration.h2
-rw-r--r--src/plugins/autotest/gtest/gtestoutputreader.cpp4
-rw-r--r--src/plugins/autotest/gtest/gtestoutputreader.h2
-rw-r--r--src/plugins/autotest/qtest/qttestconfiguration.cpp2
-rw-r--r--src/plugins/autotest/qtest/qttestconfiguration.h2
-rw-r--r--src/plugins/autotest/qtest/qttestoutputreader.cpp2
-rw-r--r--src/plugins/autotest/qtest/qttestoutputreader.h2
-rw-r--r--src/plugins/autotest/quick/quicktestconfiguration.cpp2
-rw-r--r--src/plugins/autotest/quick/quicktestconfiguration.h2
-rw-r--r--src/plugins/autotest/testconfiguration.h4
-rw-r--r--src/plugins/autotest/testoutputreader.cpp4
-rw-r--r--src/plugins/autotest/testoutputreader.h4
-rw-r--r--src/plugins/autotest/testrunner.cpp6
-rw-r--r--src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp4
-rw-r--r--src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h2
-rw-r--r--src/plugins/baremetal/iarewtoolchain.cpp4
-rw-r--r--src/plugins/baremetal/keiltoolchain.cpp6
-rw-r--r--src/plugins/baremetal/sdcctoolchain.cpp4
-rw-r--r--src/plugins/beautifier/abstractsettings.cpp4
-rw-r--r--src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp2
-rw-r--r--src/plugins/beautifier/uncrustify/uncrustifysettings.cpp2
-rw-r--r--src/plugins/boot2qt/device-detection/qdbwatcher.cpp2
-rw-r--r--src/plugins/boot2qt/qdbdevice.cpp4
-rw-r--r--src/plugins/boot2qt/qdbdevicedebugsupport.cpp10
-rw-r--r--src/plugins/boot2qt/qdbmakedefaultappstep.cpp10
-rw-r--r--src/plugins/boot2qt/qdbplugin.cpp4
-rw-r--r--src/plugins/boot2qt/qdbstopapplicationstep.cpp10
-rw-r--r--src/plugins/clangtools/clangtoolrunner.cpp6
-rw-r--r--src/plugins/clangtools/clangtoolsutils.cpp2
-rw-r--r--src/plugins/clangtools/executableinfo.cpp2
-rw-r--r--src/plugins/clearcase/clearcaseplugin.cpp6
-rw-r--r--src/plugins/clearcase/clearcasesync.cpp2
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp12
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildsystem.h4
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprocess.cpp4
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprocess.h4
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp4
-rw-r--r--src/plugins/cmakeprojectmanager/cmaketool.cpp6
-rw-r--r--src/plugins/cmakeprojectmanager/cmaketool.h4
-rw-r--r--src/plugins/coreplugin/externaltool.cpp8
-rw-r--r--src/plugins/coreplugin/externaltool.h4
-rw-r--r--src/plugins/coreplugin/fileutils.cpp4
-rw-r--r--src/plugins/coreplugin/locator/executefilter.cpp8
-rw-r--r--src/plugins/coreplugin/locator/executefilter.h4
-rw-r--r--src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp14
-rw-r--r--src/plugins/coreplugin/patchtool.cpp2
-rw-r--r--src/plugins/coreplugin/plugininstallwizard.cpp2
-rw-r--r--src/plugins/coreplugin/progressmanager/processprogress.cpp20
-rw-r--r--src/plugins/coreplugin/progressmanager/processprogress.h4
-rw-r--r--src/plugins/cppcheck/cppcheckrunner.cpp6
-rw-r--r--src/plugins/cppcheck/cppcheckrunner.h2
-rw-r--r--src/plugins/cppeditor/cppcodemodelsettings.cpp2
-rw-r--r--src/plugins/cppeditor/cppmodelmanager.cpp4
-rw-r--r--src/plugins/debugger/cdb/cdbengine.cpp4
-rw-r--r--src/plugins/debugger/cdb/cdbengine.h2
-rw-r--r--src/plugins/debugger/dap/dapengine.cpp8
-rw-r--r--src/plugins/debugger/dap/dapengine.h2
-rw-r--r--src/plugins/debugger/debuggeritem.cpp4
-rw-r--r--src/plugins/debugger/debuggeritemmanager.cpp2
-rw-r--r--src/plugins/debugger/debuggerruncontrol.cpp6
-rw-r--r--src/plugins/debugger/debuggersourcepathmappingwidget.cpp2
-rw-r--r--src/plugins/debugger/gdb/gdbengine.cpp12
-rw-r--r--src/plugins/debugger/gdb/gdbengine.h2
-rw-r--r--src/plugins/debugger/lldb/lldbengine.cpp10
-rw-r--r--src/plugins/debugger/lldb/lldbengine.h2
-rw-r--r--src/plugins/debugger/moduleshandler.cpp2
-rw-r--r--src/plugins/debugger/pdb/pdbengine.cpp8
-rw-r--r--src/plugins/debugger/pdb/pdbengine.h2
-rw-r--r--src/plugins/debugger/qml/qmlengine.cpp10
-rw-r--r--src/plugins/debugger/terminal.cpp6
-rw-r--r--src/plugins/debugger/terminal.h4
-rw-r--r--src/plugins/docker/dockerapi.cpp4
-rw-r--r--src/plugins/docker/dockerdevice.cpp34
-rw-r--r--src/plugins/fakevim/fakevimplugin.cpp2
-rw-r--r--src/plugins/git/branchmodel.cpp10
-rw-r--r--src/plugins/git/branchview.cpp4
-rw-r--r--src/plugins/git/changeselectiondialog.cpp8
-rw-r--r--src/plugins/git/changeselectiondialog.h4
-rw-r--r--src/plugins/git/gerrit/gerritmodel.cpp10
-rw-r--r--src/plugins/git/gerrit/gerritplugin.cpp8
-rw-r--r--src/plugins/git/gitclient.cpp56
-rw-r--r--src/plugins/git/gitgrep.cpp2
-rw-r--r--src/plugins/git/mergetool.cpp4
-rw-r--r--src/plugins/git/mergetool.h2
-rw-r--r--src/plugins/gitlab/queryrunner.cpp2
-rw-r--r--src/plugins/gitlab/queryrunner.h2
-rw-r--r--src/plugins/haskell/haskellmanager.cpp4
-rw-r--r--src/plugins/ios/iosconfigurations.cpp2
-rw-r--r--src/plugins/ios/iosprobe.cpp2
-rw-r--r--src/plugins/ios/iossimulator.cpp2
-rw-r--r--src/plugins/ios/simulatorcontrol.cpp4
-rw-r--r--src/plugins/languageclient/languageclientinterface.cpp10
-rw-r--r--src/plugins/languageclient/languageclientinterface.h2
-rw-r--r--src/plugins/mcusupport/mcusupportversiondetection.cpp2
-rw-r--r--src/plugins/mercurial/mercurialclient.cpp4
-rw-r--r--src/plugins/mesonprojectmanager/mesonprocess.cpp8
-rw-r--r--src/plugins/mesonprojectmanager/mesonprocess.h4
-rw-r--r--src/plugins/mesonprojectmanager/mesonwrapper.h2
-rw-r--r--src/plugins/mesonprojectmanager/toolwrapper.cpp2
-rw-r--r--src/plugins/nim/project/nimblebuildsystem.cpp6
-rw-r--r--src/plugins/nim/project/nimtoolchain.cpp2
-rw-r--r--src/plugins/nim/suggest/server.cpp4
-rw-r--r--src/plugins/nim/suggest/server.h2
-rw-r--r--src/plugins/perforce/perforcechecker.cpp2
-rw-r--r--src/plugins/perforce/perforcechecker.h2
-rw-r--r--src/plugins/perforce/perforceplugin.cpp4
-rw-r--r--src/plugins/perfprofiler/perfconfigwidget.cpp4
-rw-r--r--src/plugins/perfprofiler/perfconfigwidget.h4
-rw-r--r--src/plugins/perfprofiler/perfprofilerruncontrol.cpp16
-rw-r--r--src/plugins/perfprofiler/perftracepointdialog.cpp4
-rw-r--r--src/plugins/perfprofiler/perftracepointdialog.h4
-rw-r--r--src/plugins/projectexplorer/abstractprocessstep.cpp14
-rw-r--r--src/plugins/projectexplorer/abstractprocessstep.h4
-rw-r--r--src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp2
-rw-r--r--src/plugins/projectexplorer/devicesupport/desktopdevice.cpp4
-rw-r--r--src/plugins/projectexplorer/devicesupport/devicemanager.cpp2
-rw-r--r--src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp6
-rw-r--r--src/plugins/projectexplorer/devicesupport/idevice.h2
-rw-r--r--src/plugins/projectexplorer/devicesupport/sshparameters.cpp2
-rw-r--r--src/plugins/projectexplorer/devicesupport/sshparameters.h4
-rw-r--r--src/plugins/projectexplorer/extracompiler.cpp2
-rw-r--r--src/plugins/projectexplorer/extracompiler.h4
-rw-r--r--src/plugins/projectexplorer/gcctoolchain.cpp4
-rw-r--r--src/plugins/projectexplorer/msvctoolchain.cpp10
-rw-r--r--src/plugins/projectexplorer/runcontrol.cpp10
-rw-r--r--src/plugins/python/pipsupport.cpp8
-rw-r--r--src/plugins/python/pipsupport.h2
-rw-r--r--src/plugins/python/pyside.cpp2
-rw-r--r--src/plugins/python/pysideuicextracompiler.cpp2
-rw-r--r--src/plugins/python/pysideuicextracompiler.h2
-rw-r--r--src/plugins/python/pythonlanguageclient.cpp4
-rw-r--r--src/plugins/python/pythonsettings.cpp2
-rw-r--r--src/plugins/python/pythonutils.cpp10
-rw-r--r--src/plugins/qbsprojectmanager/qbsprofilemanager.cpp2
-rw-r--r--src/plugins/qbsprojectmanager/qbssession.cpp10
-rw-r--r--src/plugins/qbsprojectmanager/qbssettings.cpp2
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeproject.cpp8
-rw-r--r--src/plugins/qmakeprojectmanager/qmakestep.cpp8
-rw-r--r--src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h2
-rw-r--r--src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp4
-rw-r--r--src/plugins/qmldesigner/designercore/include/nodeinstanceview.h4
-rw-r--r--src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp6
-rw-r--r--src/plugins/qmldesigner/generateresource.cpp2
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectplugin.cpp4
-rw-r--r--src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp14
-rw-r--r--src/plugins/qnx/qnxdevicetester.cpp6
-rw-r--r--src/plugins/qnx/qnxutils.cpp2
-rw-r--r--src/plugins/qnx/slog2inforunner.cpp18
-rw-r--r--src/plugins/qtsupport/baseqtversion.cpp2
-rw-r--r--src/plugins/qtsupport/externaleditors.cpp2
-rw-r--r--src/plugins/qtsupport/qscxmlcgenerator.cpp2
-rw-r--r--src/plugins/qtsupport/qscxmlcgenerator.h2
-rw-r--r--src/plugins/qtsupport/qtsupportplugin.cpp2
-rw-r--r--src/plugins/qtsupport/qtversionmanager.cpp2
-rw-r--r--src/plugins/qtsupport/uicgenerator.cpp2
-rw-r--r--src/plugins/qtsupport/uicgenerator.h2
-rw-r--r--src/plugins/remotelinux/customcommanddeploystep.cpp12
-rw-r--r--src/plugins/remotelinux/filesystemaccess_test.cpp2
-rw-r--r--src/plugins/remotelinux/genericdirectuploadstep.cpp14
-rw-r--r--src/plugins/remotelinux/linuxdevice.cpp38
-rw-r--r--src/plugins/remotelinux/linuxdevicetester.cpp18
-rw-r--r--src/plugins/remotelinux/publickeydeploymentdialog.cpp4
-rw-r--r--src/plugins/remotelinux/remotelinuxsignaloperation.cpp4
-rw-r--r--src/plugins/remotelinux/remotelinuxsignaloperation.h2
-rw-r--r--src/plugins/remotelinux/rsyncdeploystep.cpp6
-rw-r--r--src/plugins/remotelinux/sshkeycreationdialog.cpp2
-rw-r--r--src/plugins/remotelinux/tarpackagedeploystep.cpp12
-rw-r--r--src/plugins/silversearcher/findinfilessilversearcher.cpp4
-rw-r--r--src/plugins/squish/objectsmapdocument.cpp4
-rw-r--r--src/plugins/squish/squishprocessbase.cpp4
-rw-r--r--src/plugins/squish/squishprocessbase.h2
-rw-r--r--src/plugins/squish/squishserverprocess.cpp4
-rw-r--r--src/plugins/squish/squishtools.cpp4
-rw-r--r--src/plugins/subversion/subversionclient.cpp10
-rw-r--r--src/plugins/terminal/shellintegration.cpp2
-rw-r--r--src/plugins/terminal/shellintegration.h2
-rw-r--r--src/plugins/terminal/terminalwidget.cpp8
-rw-r--r--src/plugins/terminal/terminalwidget.h2
-rw-r--r--src/plugins/texteditor/formattexteditor.cpp4
-rw-r--r--src/plugins/updateinfo/updateinfoplugin.cpp12
-rw-r--r--src/plugins/valgrind/callgrindengine.cpp4
-rw-r--r--src/plugins/valgrind/callgrindengine.h2
-rw-r--r--src/plugins/valgrind/callgrindtool.cpp2
-rw-r--r--src/plugins/valgrind/memchecktool.cpp6
-rw-r--r--src/plugins/valgrind/valgrindrunner.cpp10
-rw-r--r--src/plugins/vcsbase/vcsbaseclient.cpp2
-rw-r--r--src/plugins/vcsbase/vcsbaseclient.h4
-rw-r--r--src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp2
-rw-r--r--src/plugins/vcsbase/vcsbasediffeditorcontroller.h4
-rw-r--r--src/plugins/vcsbase/vcsbasesubmiteditor.cpp2
-rw-r--r--src/plugins/vcsbase/vcscommand.cpp26
-rw-r--r--src/plugins/vcsbase/vcscommand.h4
-rw-r--r--src/plugins/webassembly/webassemblyemsdk.cpp4
-rw-r--r--src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp2
238 files changed, 730 insertions, 730 deletions
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index 6ca6ef114c..c22cdfdca0 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -401,7 +401,7 @@ QString PluginManager::systemInformation()
QString result;
CommandLine qtDiag(FilePath::fromString(QLibraryInfo::location(QLibraryInfo::BinariesPath))
.pathAppended("qtdiag").withExecutableSuffix());
- QtcProcess qtDiagProc;
+ Process qtDiagProc;
qtDiagProc.setCommand(qtDiag);
qtDiagProc.runBlocking();
if (qtDiagProc.result() == ProcessResult::FinishedWithSuccess)
diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp
index 3de270923b..b566905735 100644
--- a/src/libs/qmljs/qmljsplugindumper.cpp
+++ b/src/libs/qmljs/qmljsplugindumper.cpp
@@ -203,7 +203,7 @@ static void printParseWarnings(const FilePath &libraryPath, const QString &warni
"%2").arg(libraryPath.toUserOutput(), warning));
}
-static QString qmlPluginDumpErrorMessage(QtcProcess *process)
+static QString qmlPluginDumpErrorMessage(Process *process)
{
QString errorMessage;
const QString binary = process->commandLine().executable().toUserOutput();
@@ -237,7 +237,7 @@ static QString qmlPluginDumpErrorMessage(QtcProcess *process)
return errorMessage;
}
-void PluginDumper::qmlPluginTypeDumpDone(QtcProcess *process)
+void PluginDumper::qmlPluginTypeDumpDone(Process *process)
{
process->deleteLater();
@@ -597,11 +597,11 @@ void PluginDumper::loadQmltypesFile(const FilePaths &qmltypesFilePaths,
void PluginDumper::runQmlDump(const ModelManagerInterface::ProjectInfo &info,
const QStringList &arguments, const FilePath &importPath)
{
- auto process = new QtcProcess(this);
+ auto process = new Process(this);
process->setEnvironment(info.qmlDumpEnvironment);
process->setWorkingDirectory(importPath);
process->setCommand({info.qmlDumpPath, arguments});
- connect(process, &QtcProcess::done, this, [this, process] { qmlPluginTypeDumpDone(process); });
+ connect(process, &Process::done, this, [this, process] { qmlPluginTypeDumpDone(process); });
process->start();
m_runningQmldumps.insert(process, importPath);
}
diff --git a/src/libs/qmljs/qmljsplugindumper.h b/src/libs/qmljs/qmljsplugindumper.h
index 1b672cefdc..e27bfeba96 100644
--- a/src/libs/qmljs/qmljsplugindumper.h
+++ b/src/libs/qmljs/qmljsplugindumper.h
@@ -14,7 +14,7 @@ QT_END_NAMESPACE
namespace Utils {
class FileSystemWatcher;
-class QtcProcess;
+class Process;
}
namespace QmlJS {
@@ -41,7 +41,7 @@ private:
const QString &importUri,
const QString &importVersion);
Q_INVOKABLE void dumpAllPlugins();
- void qmlPluginTypeDumpDone(Utils::QtcProcess *process);
+ void qmlPluginTypeDumpDone(Utils::Process *process);
void pluginChanged(const QString &pluginLibrary);
private:
@@ -102,7 +102,7 @@ private:
ModelManagerInterface *m_modelManager;
Utils::FileSystemWatcher *m_pluginWatcher;
- QHash<Utils::QtcProcess *, Utils::FilePath> m_runningQmldumps;
+ QHash<Utils::Process *, Utils::FilePath> m_runningQmldumps;
QList<Plugin> m_plugins;
QHash<Utils::FilePath, int> m_libraryToPluginIndex;
QHash<QString, QmlJS::ModelManagerInterface::ProjectInfo> m_qtToInfo;
diff --git a/src/libs/utils/archive.cpp b/src/libs/utils/archive.cpp
index 408c75d7c5..db541293e3 100644
--- a/src/libs/utils/archive.cpp
+++ b/src/libs/utils/archive.cpp
@@ -160,12 +160,12 @@ void Archive::unarchive()
m_workingDirectory.ensureWritableDir();
- m_process.reset(new QtcProcess);
+ m_process.reset(new Process);
m_process->setProcessChannelMode(QProcess::MergedChannels);
- QObject::connect(m_process.get(), &QtcProcess::readyReadStandardOutput, this, [this] {
+ QObject::connect(m_process.get(), &Process::readyReadStandardOutput, this, [this] {
emit outputReceived(m_process->readAllStandardOutput());
});
- QObject::connect(m_process.get(), &QtcProcess::done, this, [this] {
+ QObject::connect(m_process.get(), &Process::done, this, [this] {
const bool successfulFinish = m_process->result() == ProcessResult::FinishedWithSuccess;
if (!successfulFinish)
emit outputReceived(Tr::tr("Command failed."));
diff --git a/src/libs/utils/archive.h b/src/libs/utils/archive.h
index 30f58585e3..ccf62d3885 100644
--- a/src/libs/utils/archive.h
+++ b/src/libs/utils/archive.h
@@ -12,7 +12,7 @@
namespace Utils {
class FilePath;
-class QtcProcess;
+class Process;
class QTCREATOR_UTILS_EXPORT Archive : public QObject
{
@@ -33,7 +33,7 @@ signals:
private:
CommandLine m_commandLine;
FilePath m_workingDirectory;
- std::unique_ptr<QtcProcess> m_process;
+ std::unique_ptr<Process> m_process;
};
} // namespace Utils
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp
index eac24cfdba..f4cb50b454 100644
--- a/src/libs/utils/buildablehelperlibrary.cpp
+++ b/src/libs/utils/buildablehelperlibrary.cpp
@@ -21,7 +21,7 @@ bool BuildableHelperLibrary::isQtChooser(const FilePath &filePath)
FilePath BuildableHelperLibrary::qtChooserToQmakePath(const FilePath &qtChooser)
{
const QString toolDir = QLatin1String("QTTOOLDIR=\"");
- QtcProcess proc;
+ Process proc;
proc.setTimeoutS(1);
proc.setCommand({qtChooser, {"-print-env"}});
proc.runBlocking();
@@ -103,7 +103,7 @@ QString BuildableHelperLibrary::qtVersionForQMake(const FilePath &qmakePath)
if (qmakePath.isEmpty())
return QString();
- QtcProcess qmake;
+ Process qmake;
qmake.setTimeoutS(5);
qmake.setCommand({qmakePath, {"--version"}});
qmake.runBlocking();
diff --git a/src/libs/utils/clangutils.cpp b/src/libs/utils/clangutils.cpp
index ee4868f94b..4c8c7d801d 100644
--- a/src/libs/utils/clangutils.cpp
+++ b/src/libs/utils/clangutils.cpp
@@ -13,7 +13,7 @@ namespace Utils {
static QVersionNumber getClangdVersion(const FilePath &clangdFilePath)
{
- QtcProcess clangdProc;
+ Process clangdProc;
clangdProc.setCommand({clangdFilePath, {"--version"}});
clangdProc.runBlocking();
if (clangdProc.result() != ProcessResult::FinishedWithSuccess)
diff --git a/src/libs/utils/devicefileaccess.cpp b/src/libs/utils/devicefileaccess.cpp
index 76f90efb69..6b07fbdeb4 100644
--- a/src/libs/utils/devicefileaccess.cpp
+++ b/src/libs/utils/devicefileaccess.cpp
@@ -220,13 +220,13 @@ expected_str<void> DeviceFileAccess::copyRecursively(const FilePath &src,
if (isSrcOrTargetQrc || !targetTar.isExecutableFile() || !sourceTar.isExecutableFile())
return copyRecursively_fallback(src, target);
- QtcProcess srcProcess;
- QtcProcess targetProcess;
+ Process srcProcess;
+ Process targetProcess;
targetProcess.setProcessMode(ProcessMode::Writer);
QObject::connect(&srcProcess,
- &QtcProcess::readyReadStandardOutput,
+ &Process::readyReadStandardOutput,
&targetProcess,
[&srcProcess, &targetProcess]() {
targetProcess.writeRaw(srcProcess.readAllRawStandardOutput());
@@ -960,7 +960,7 @@ expected_str<QByteArray> UnixDeviceFileAccess::fileContents(const FilePath &file
#ifndef UTILS_STATIC_LIBRARY
const FilePath dd = filePath.withNewPath("dd");
- QtcProcess p;
+ Process p;
p.setCommand({dd, args, OsType::OsTypeLinux});
p.runBlocking();
if (p.exitCode() != 0) {
diff --git a/src/libs/utils/deviceshell.cpp b/src/libs/utils/deviceshell.cpp
index 35b2a9ad82..0641c10c38 100644
--- a/src/libs/utils/deviceshell.cpp
+++ b/src/libs/utils/deviceshell.cpp
@@ -81,7 +81,7 @@ RunResult DeviceShell::run(const CommandLine &cmd, const QByteArray &stdInData)
useProcess |= stdInData.size() > (1024 * 100);
if (useProcess) {
- QtcProcess proc;
+ Process proc;
const CommandLine fallbackCmd = createFallbackCommand(cmd);
qCDebug(deviceShellLog) << "Running fallback:" << fallbackCmd;
proc.setCommand(fallbackCmd);
@@ -136,7 +136,7 @@ void DeviceShell::close()
* Override this function to setup the shell process.
* The default implementation just sets the command line to "bash"
*/
-void DeviceShell::setupShellProcess(QtcProcess *shellProcess)
+void DeviceShell::setupShellProcess(Process *shellProcess)
{
shellProcess->setCommand(CommandLine{"bash"});
}
@@ -171,8 +171,8 @@ void DeviceShell::startupFailed(const CommandLine &cmdLine)
*/
bool DeviceShell::start()
{
- m_shellProcess = std::make_unique<QtcProcess>();
- connect(m_shellProcess.get(), &QtcProcess::done, m_shellProcess.get(),
+ m_shellProcess = std::make_unique<Process>();
+ connect(m_shellProcess.get(), &Process::done, m_shellProcess.get(),
[this] { emit done(m_shellProcess->resultData()); });
connect(&m_thread, &QThread::finished, m_shellProcess.get(), [this] { closeShellProcess(); }, Qt::DirectConnection);
@@ -199,11 +199,11 @@ bool DeviceShell::start()
if (installShellScript()) {
connect(m_shellProcess.get(),
- &QtcProcess::readyReadStandardOutput,
+ &Process::readyReadStandardOutput,
m_shellProcess.get(),
[this] { onReadyRead(); });
connect(m_shellProcess.get(),
- &QtcProcess::readyReadStandardError,
+ &Process::readyReadStandardError,
m_shellProcess.get(),
[this] {
const QByteArray stdErr = m_shellProcess->readAllRawStandardError();
@@ -216,7 +216,7 @@ bool DeviceShell::start()
return false;
}
- connect(m_shellProcess.get(), &QtcProcess::done, m_shellProcess.get(), [this] {
+ connect(m_shellProcess.get(), &Process::done, m_shellProcess.get(), [this] {
if (m_shellProcess->resultData().m_exitCode != EXIT_SUCCESS
|| m_shellProcess->resultData().m_exitStatus != QProcess::NormalExit) {
qCWarning(deviceShellLog) << "Shell exited with error code:"
diff --git a/src/libs/utils/deviceshell.h b/src/libs/utils/deviceshell.h
index 83af1db365..052aac1838 100644
--- a/src/libs/utils/deviceshell.h
+++ b/src/libs/utils/deviceshell.h
@@ -19,7 +19,7 @@ namespace Utils {
class CommandLine;
class ProcessResultData;
-class QtcProcess;
+class Process;
class DeviceShellImpl;
@@ -57,7 +57,7 @@ protected:
void close();
private:
- virtual void setupShellProcess(QtcProcess *shellProcess);
+ virtual void setupShellProcess(Process *shellProcess);
virtual CommandLine createFallbackCommand(const CommandLine &cmdLine);
bool installShellScript();
@@ -73,7 +73,7 @@ private:
QWaitCondition *waiter;
};
- std::unique_ptr<QtcProcess> m_shellProcess;
+ std::unique_ptr<Process> m_shellProcess;
QThread m_thread;
int m_currentId{0};
diff --git a/src/libs/utils/filestreamer.cpp b/src/libs/utils/filestreamer.cpp
index 744f682617..e4dea9887d 100644
--- a/src/libs/utils/filestreamer.cpp
+++ b/src/libs/utils/filestreamer.cpp
@@ -84,12 +84,12 @@ signals:
private:
TaskItem remoteTask() final {
- const auto setup = [this](QtcProcess &process) {
+ const auto setup = [this](Process &process) {
const QStringList args = {"if=" + m_filePath.path()};
const FilePath dd = m_filePath.withNewPath("dd");
process.setCommand({dd, args, OsType::OsTypeLinux});
- QtcProcess *processPtr = &process;
- connect(processPtr, &QtcProcess::readyReadStandardOutput, this, [this, processPtr] {
+ Process *processPtr = &process;
+ connect(processPtr, &Process::readyReadStandardOutput, this, [this, processPtr] {
emit readyRead(processPtr->readAllRawStandardOutput());
});
};
@@ -246,11 +246,11 @@ signals:
private:
TaskItem remoteTask() final {
- const auto setup = [this](QtcProcess &process) {
+ const auto setup = [this](Process &process) {
m_writeBuffer = new WriteBuffer(false, &process);
- connect(m_writeBuffer, &WriteBuffer::writeRequested, &process, &QtcProcess::writeRaw);
+ connect(m_writeBuffer, &WriteBuffer::writeRequested, &process, &Process::writeRaw);
connect(m_writeBuffer, &WriteBuffer::closeWriteChannelRequested,
- &process, &QtcProcess::closeWriteChannel);
+ &process, &Process::closeWriteChannel);
const QStringList args = {"of=" + m_filePath.path()};
const FilePath dd = m_filePath.withNewPath("dd");
process.setCommand({dd, args, OsType::OsTypeLinux});
@@ -258,9 +258,9 @@ private:
process.setProcessMode(ProcessMode::Writer);
else
process.setWriteData(m_writeData);
- connect(&process, &QtcProcess::started, this, [this] { emit started(); });
+ connect(&process, &Process::started, this, [this] { emit started(); });
};
- const auto finalize = [this](const QtcProcess &) {
+ const auto finalize = [this](const Process &) {
delete m_writeBuffer;
m_writeBuffer = nullptr;
};
@@ -311,7 +311,7 @@ static Group sameRemoteDeviceTransferTask(const FilePath &source, const FilePath
QTC_CHECK(destination.needsDevice());
QTC_CHECK(source.isSameDevice(destination));
- const auto setup = [source, destination](QtcProcess &process) {
+ const auto setup = [source, destination](Process &process) {
const QStringList args = {source.path(), destination.path()};
const FilePath cp = source.withNewPath("cp");
process.setCommand({cp, args, OsType::OsTypeLinux});
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 124fdc4cef..0c43e8f527 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -130,7 +130,7 @@ QString BinaryVersionToolTipEventFilter::toolVersion(const CommandLine &cmd)
{
if (cmd.executable().isEmpty())
return QString();
- QtcProcess proc;
+ Process proc;
proc.setTimeoutS(1);
proc.setCommand(cmd);
proc.runBlocking();
diff --git a/src/libs/utils/processinfo.cpp b/src/libs/utils/processinfo.cpp
index d6ecd4d234..dc41a8f63e 100644
--- a/src/libs/utils/processinfo.cpp
+++ b/src/libs/utils/processinfo.cpp
@@ -50,7 +50,7 @@ static QList<ProcessInfo> getLocalProcessesUsingProc(const FilePath &procDir)
cmd.addArgs(execs, CommandLine::Raw);
- QtcProcess procProcess;
+ Process procProcess;
procProcess.setCommand(cmd);
procProcess.runBlocking();
@@ -83,7 +83,7 @@ static QList<ProcessInfo> getLocalProcessesUsingProc(const FilePath &procDir)
static QMap<qint64, QString> getLocalProcessDataUsingPs(const FilePath &deviceRoot,
const QString &column)
{
- QtcProcess process;
+ Process process;
process.setCommand({deviceRoot.withNewPath("ps"), {"-e", "-o", "pid," + column}});
process.runBlocking();
@@ -129,7 +129,7 @@ static QList<ProcessInfo> getLocalProcessesUsingPs(const FilePath &deviceRoot)
static QList<ProcessInfo> getProcessesUsingPidin(const FilePath &pidin)
{
- QtcProcess process;
+ Process process;
process.setCommand({pidin, {"-F", "%a %A {/%n}"}});
process.runBlocking();
diff --git a/src/libs/utils/processinterface.h b/src/libs/utils/processinterface.h
index bd02428ef9..e06076d60b 100644
--- a/src/libs/utils/processinterface.h
+++ b/src/libs/utils/processinterface.h
@@ -142,7 +142,7 @@ private:
virtual ProcessBlockingInterface *processBlockingInterface() const { return nullptr; }
- friend class QtcProcess;
+ friend class Process;
friend class Internal::QtcProcessPrivate;
};
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 593c445648..1fe97b3d2f 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -717,7 +717,7 @@ private:
class QtcProcessPrivate : public QObject
{
public:
- explicit QtcProcessPrivate(QtcProcess *parent)
+ explicit QtcProcessPrivate(Process *parent)
: QObject(parent)
, q(parent)
, m_killTimer(this)
@@ -775,7 +775,7 @@ public:
return rootCommand;
}
- QtcProcess *q;
+ Process *q;
std::unique_ptr<ProcessBlockingInterface> m_blockingInterface;
std::unique_ptr<ProcessInterface> m_process;
ProcessSetupData m_setup;
@@ -786,7 +786,7 @@ public:
void handleDone(const ProcessResultData &data);
void clearForRun();
- void emitGuardedSignal(void (QtcProcess::* signalName)()) {
+ void emitGuardedSignal(void (Process::* signalName)()) {
GuardLocker locker(m_guard);
emit (q->*signalName)();
}
@@ -1092,7 +1092,7 @@ ProcessResult QtcProcessPrivate::interpretExitCode(int exitCode)
\sa Utils::ProcessArgs
*/
-QtcProcess::QtcProcess(QObject *parent)
+Process::Process(QObject *parent)
: QObject(parent),
d(new QtcProcessPrivate(this))
{
@@ -1103,7 +1103,7 @@ QtcProcess::QtcProcess(QObject *parent)
Q_UNUSED(qProcessProcessErrorMeta)
}
-QtcProcess::~QtcProcess()
+Process::~Process()
{
QTC_ASSERT(!d->m_guard.isLocked(), qWarning("Deleting QtcProcess instance directly from "
"one of its signal handlers will lead to crash!"));
@@ -1112,62 +1112,62 @@ QtcProcess::~QtcProcess()
delete d;
}
-void QtcProcess::setProcessImpl(ProcessImpl processImpl)
+void Process::setProcessImpl(ProcessImpl processImpl)
{
d->m_setup.m_processImpl = processImpl;
}
-void QtcProcess::setPtyData(const std::optional<Pty::Data> &data)
+void Process::setPtyData(const std::optional<Pty::Data> &data)
{
d->m_setup.m_ptyData = data;
}
-std::optional<Pty::Data> QtcProcess::ptyData() const
+std::optional<Pty::Data> Process::ptyData() const
{
return d->m_setup.m_ptyData;
}
-ProcessMode QtcProcess::processMode() const
+ProcessMode Process::processMode() const
{
return d->m_setup.m_processMode;
}
-void QtcProcess::setTerminalMode(TerminalMode mode)
+void Process::setTerminalMode(TerminalMode mode)
{
d->m_setup.m_terminalMode = mode;
}
-TerminalMode QtcProcess::terminalMode() const
+TerminalMode Process::terminalMode() const
{
return d->m_setup.m_terminalMode;
}
-void QtcProcess::setProcessMode(ProcessMode processMode)
+void Process::setProcessMode(ProcessMode processMode)
{
d->m_setup.m_processMode = processMode;
}
-void QtcProcess::setEnvironment(const Environment &env)
+void Process::setEnvironment(const Environment &env)
{
d->m_setup.m_environment = env;
}
-const Environment &QtcProcess::environment() const
+const Environment &Process::environment() const
{
return d->m_setup.m_environment;
}
-void QtcProcess::setControlEnvironment(const Environment &environment)
+void Process::setControlEnvironment(const Environment &environment)
{
d->m_setup.m_controlEnvironment = environment;
}
-const Environment &QtcProcess::controlEnvironment() const
+const Environment &Process::controlEnvironment() const
{
return d->m_setup.m_controlEnvironment;
}
-void QtcProcess::setCommand(const CommandLine &cmdLine)
+void Process::setCommand(const CommandLine &cmdLine)
{
if (d->m_setup.m_workingDirectory.needsDevice() && cmdLine.executable().needsDevice()) {
QTC_CHECK(d->m_setup.m_workingDirectory.host() == cmdLine.executable().host());
@@ -1175,17 +1175,17 @@ void QtcProcess::setCommand(const CommandLine &cmdLine)
d->m_setup.m_commandLine = cmdLine;
}
-const CommandLine &QtcProcess::commandLine() const
+const CommandLine &Process::commandLine() const
{
return d->m_setup.m_commandLine;
}
-FilePath QtcProcess::workingDirectory() const
+FilePath Process::workingDirectory() const
{
return d->m_setup.m_workingDirectory;
}
-void QtcProcess::setWorkingDirectory(const FilePath &dir)
+void Process::setWorkingDirectory(const FilePath &dir)
{
if (dir.needsDevice() && d->m_setup.m_commandLine.executable().needsDevice()) {
QTC_CHECK(dir.host() == d->m_setup.m_commandLine.executable().host());
@@ -1193,12 +1193,12 @@ void QtcProcess::setWorkingDirectory(const FilePath &dir)
d->m_setup.m_workingDirectory = dir;
}
-void QtcProcess::setUseCtrlCStub(bool enabled)
+void Process::setUseCtrlCStub(bool enabled)
{
d->m_setup.m_useCtrlCStub = enabled;
}
-void QtcProcess::start()
+void Process::start()
{
QTC_ASSERT(state() == QProcess::NotRunning, return);
QTC_ASSERT(!(d->m_process && d->m_guard.isLocked()),
@@ -1217,36 +1217,36 @@ void QtcProcess::start()
d->m_state = QProcess::Starting;
d->m_process->m_setup = d->m_setup;
d->m_process->m_setup.m_commandLine = d->fullCommandLine();
- d->emitGuardedSignal(&QtcProcess::starting);
+ d->emitGuardedSignal(&Process::starting);
d->m_process->start();
}
-void QtcProcess::terminate()
+void Process::terminate()
{
d->sendControlSignal(ControlSignal::Terminate);
}
-void QtcProcess::kill()
+void Process::kill()
{
d->sendControlSignal(ControlSignal::Kill);
}
-void QtcProcess::interrupt()
+void Process::interrupt()
{
d->sendControlSignal(ControlSignal::Interrupt);
}
-void QtcProcess::kickoffProcess()
+void Process::kickoffProcess()
{
d->sendControlSignal(ControlSignal::KickOff);
}
-void QtcProcess::closeWriteChannel()
+void Process::closeWriteChannel()
{
d->sendControlSignal(ControlSignal::CloseWriteChannel);
}
-bool QtcProcess::startDetached(const CommandLine &cmd, const FilePath &workingDirectory, qint64 *pid)
+bool Process::startDetached(const CommandLine &cmd, const FilePath &workingDirectory, qint64 *pid)
{
return QProcess::startDetached(cmd.executable().toUserOutput(),
cmd.splitArguments(),
@@ -1254,37 +1254,37 @@ bool QtcProcess::startDetached(const CommandLine &cmd, const FilePath &workingDi
pid);
}
-void QtcProcess::setLowPriority()
+void Process::setLowPriority()
{
d->m_setup.m_lowPriority = true;
}
-void QtcProcess::setDisableUnixTerminal()
+void Process::setDisableUnixTerminal()
{
d->m_setup.m_unixTerminalDisabled = true;
}
-void QtcProcess::setAbortOnMetaChars(bool abort)
+void Process::setAbortOnMetaChars(bool abort)
{
d->m_setup.m_abortOnMetaChars = abort;
}
-void QtcProcess::setRunAsRoot(bool on)
+void Process::setRunAsRoot(bool on)
{
d->m_setup.m_runAsRoot = on;
}
-bool QtcProcess::isRunAsRoot() const
+bool Process::isRunAsRoot() const
{
return d->m_setup.m_runAsRoot;
}
-void QtcProcess::setStandardInputFile(const QString &inputFile)
+void Process::setStandardInputFile(const QString &inputFile)
{
d->m_setup.m_standardInputFile = inputFile;
}
-QString QtcProcess::toStandaloneCommandLine() const
+QString Process::toStandaloneCommandLine() const
{
QStringList parts;
parts.append("/usr/bin/env");
@@ -1303,47 +1303,47 @@ QString QtcProcess::toStandaloneCommandLine() const
return parts.join(" ");
}
-void QtcProcess::setCreateConsoleOnWindows(bool create)
+void Process::setCreateConsoleOnWindows(bool create)
{
d->m_setup.m_createConsoleOnWindows = create;
}
-bool QtcProcess::createConsoleOnWindows() const
+bool Process::createConsoleOnWindows() const
{
return d->m_setup.m_createConsoleOnWindows;
}
-void QtcProcess::setExtraData(const QString &key, const QVariant &value)
+void Process::setExtraData(const QString &key, const QVariant &value)
{
d->m_setup.m_extraData.insert(key, value);
}
-QVariant QtcProcess::extraData(const QString &key) const
+QVariant Process::extraData(const QString &key) const
{
return d->m_setup.m_extraData.value(key);
}
-void QtcProcess::setExtraData(const QVariantHash &extraData)
+void Process::setExtraData(const QVariantHash &extraData)
{
d->m_setup.m_extraData = extraData;
}
-QVariantHash QtcProcess::extraData() const
+QVariantHash Process::extraData() const
{
return d->m_setup.m_extraData;
}
-void QtcProcess::setReaperTimeout(int msecs)
+void Process::setReaperTimeout(int msecs)
{
d->m_setup.m_reaperTimeout = msecs;
}
-int QtcProcess::reaperTimeout() const
+int Process::reaperTimeout() const
{
return d->m_setup.m_reaperTimeout;
}
-void QtcProcess::setRemoteProcessHooks(const DeviceProcessHooks &hooks)
+void Process::setRemoteProcessHooks(const DeviceProcessHooks &hooks)
{
s_deviceHooks = hooks;
}
@@ -1378,7 +1378,7 @@ static bool askToKill(const CommandLine &command)
// occurs on stderr/stdout as opposed to waitForFinished()). Returns false if a timeout
// occurs. Checking of the process' exit state/code still has to be done.
-bool QtcProcess::readDataFromProcess(QByteArray *stdOut, QByteArray *stdErr, int timeoutS)
+bool Process::readDataFromProcess(QByteArray *stdOut, QByteArray *stdErr, int timeoutS)
{
enum { syncDebug = 0 };
if (syncDebug)
@@ -1418,39 +1418,39 @@ bool QtcProcess::readDataFromProcess(QByteArray *stdOut, QByteArray *stdErr, int
return finished;
}
-ProcessResult QtcProcess::result() const
+ProcessResult Process::result() const
{
return d->m_result;
}
-ProcessResultData QtcProcess::resultData() const
+ProcessResultData Process::resultData() const
{
return d->m_resultData;
}
-int QtcProcess::exitCode() const
+int Process::exitCode() const
{
return resultData().m_exitCode;
}
-QProcess::ExitStatus QtcProcess::exitStatus() const
+QProcess::ExitStatus Process::exitStatus() const
{
return resultData().m_exitStatus;
}
-QProcess::ProcessError QtcProcess::error() const
+QProcess::ProcessError Process::error() const
{
return resultData().m_error;
}
-QString QtcProcess::errorString() const
+QString Process::errorString() const
{
return resultData().m_errorString;
}
// Path utilities
-Environment QtcProcess::systemEnvironmentForBinary(const FilePath &filePath)
+Environment Process::systemEnvironmentForBinary(const FilePath &filePath)
{
if (filePath.needsDevice()) {
QTC_ASSERT(s_deviceHooks.systemEnvironmentForBinary, return {});
@@ -1460,37 +1460,37 @@ Environment QtcProcess::systemEnvironmentForBinary(const FilePath &filePath)
return Environment::systemEnvironment();
}
-qint64 QtcProcess::applicationMainThreadId() const
+qint64 Process::applicationMainThreadId() const
{
return d->m_applicationMainThreadId;
}
-QProcess::ProcessChannelMode QtcProcess::processChannelMode() const
+QProcess::ProcessChannelMode Process::processChannelMode() const
{
return d->m_setup.m_processChannelMode;
}
-void QtcProcess::setProcessChannelMode(QProcess::ProcessChannelMode mode)
+void Process::setProcessChannelMode(QProcess::ProcessChannelMode mode)
{
d->m_setup.m_processChannelMode = mode;
}
-QProcess::ProcessState QtcProcess::state() const
+QProcess::ProcessState Process::state() const
{
return d->m_state;
}
-bool QtcProcess::isRunning() const
+bool Process::isRunning() const
{
return state() == QProcess::Running;
}
-qint64 QtcProcess::processId() const
+qint64 Process::processId() const
{
return d->m_processId;
}
-bool QtcProcess::waitForStarted(int msecs)
+bool Process::waitForStarted(int msecs)
{
QTC_ASSERT(d->m_process, return false);
if (d->m_state == QProcess::Running)
@@ -1501,7 +1501,7 @@ bool QtcProcess::waitForStarted(int msecs)
ProcessSignalType::Started, msecs);
}
-bool QtcProcess::waitForReadyRead(int msecs)
+bool Process::waitForReadyRead(int msecs)
{
QTC_ASSERT(d->m_process, return false);
if (d->m_state == QProcess::NotRunning)
@@ -1509,7 +1509,7 @@ bool QtcProcess::waitForReadyRead(int msecs)
return d->waitForSignal(ProcessSignalType::ReadyRead, msecs);
}
-bool QtcProcess::waitForFinished(int msecs)
+bool Process::waitForFinished(int msecs)
{
QTC_ASSERT(d->m_process, return false);
if (d->m_state == QProcess::NotRunning)
@@ -1517,17 +1517,17 @@ bool QtcProcess::waitForFinished(int msecs)
return d->waitForSignal(ProcessSignalType::Done, msecs);
}
-QByteArray QtcProcess::readAllRawStandardOutput()
+QByteArray Process::readAllRawStandardOutput()
{
return d->m_stdOut.readAllData();
}
-QByteArray QtcProcess::readAllRawStandardError()
+QByteArray Process::readAllRawStandardError()
{
return d->m_stdErr.readAllData();
}
-qint64 QtcProcess::write(const QString &input)
+qint64 Process::write(const QString &input)
{
// Non-windows is assumed to be UTF-8
if (commandLine().executable().osType() != OsTypeWindows)
@@ -1542,7 +1542,7 @@ qint64 QtcProcess::write(const QString &input)
return writeRaw(input.toUtf8());
}
-qint64 QtcProcess::writeRaw(const QByteArray &input)
+qint64 Process::writeRaw(const QByteArray &input)
{
QTC_ASSERT(processMode() == ProcessMode::Writer, return -1);
QTC_ASSERT(d->m_process, return -1);
@@ -1555,7 +1555,7 @@ qint64 QtcProcess::writeRaw(const QByteArray &input)
return result;
}
-void QtcProcess::close()
+void Process::close()
{
QTC_ASSERT(QThread::currentThread() == thread(), return);
if (d->m_process) {
@@ -1575,7 +1575,7 @@ void QtcProcess::close()
Calls terminate() directly and after a delay of reaperTimeout() it calls kill()
if the process is still running.
*/
-void QtcProcess::stop()
+void Process::stop()
{
if (state() == QProcess::NotRunning)
return;
@@ -1584,12 +1584,12 @@ void QtcProcess::stop()
d->m_killTimer.start(d->m_process->m_setup.m_reaperTimeout);
}
-QString QtcProcess::readAllStandardOutput()
+QString Process::readAllStandardOutput()
{
return QString::fromUtf8(readAllRawStandardOutput());
}
-QString QtcProcess::readAllStandardError()
+QString Process::readAllStandardError()
{
return QString::fromUtf8(readAllRawStandardError());
}
@@ -1624,7 +1624,7 @@ QString QtcProcess::readAllStandardError()
as this will cause event loop problems.
*/
-QString QtcProcess::exitMessage() const
+QString Process::exitMessage() const
{
const QString fullCmd = commandLine().toUserOutput();
switch (result()) {
@@ -1644,7 +1644,7 @@ QString QtcProcess::exitMessage() const
return {};
}
-QByteArray QtcProcess::allRawOutput() const
+QByteArray Process::allRawOutput() const
{
QTC_CHECK(d->m_stdOut.keepRawData);
QTC_CHECK(d->m_stdErr.keepRawData);
@@ -1658,7 +1658,7 @@ QByteArray QtcProcess::allRawOutput() const
return !d->m_stdOut.rawData.isEmpty() ? d->m_stdOut.rawData : d->m_stdErr.rawData;
}
-QString QtcProcess::allOutput() const
+QString Process::allOutput() const
{
QTC_CHECK(d->m_stdOut.keepRawData);
QTC_CHECK(d->m_stdErr.keepRawData);
@@ -1675,30 +1675,30 @@ QString QtcProcess::allOutput() const
return !out.isEmpty() ? out : err;
}
-QByteArray QtcProcess::rawStdOut() const
+QByteArray Process::rawStdOut() const
{
QTC_CHECK(d->m_stdOut.keepRawData);
return d->m_stdOut.rawData;
}
-QString QtcProcess::stdOut() const
+QString Process::stdOut() const
{
QTC_CHECK(d->m_stdOut.keepRawData);
return d->m_codec->toUnicode(d->m_stdOut.rawData);
}
-QString QtcProcess::stdErr() const
+QString Process::stdErr() const
{
QTC_CHECK(d->m_stdErr.keepRawData);
return d->m_codec->toUnicode(d->m_stdErr.rawData);
}
-QString QtcProcess::cleanedStdOut() const
+QString Process::cleanedStdOut() const
{
return Utils::normalizeNewlines(stdOut());
}
-QString QtcProcess::cleanedStdErr() const
+QString Process::cleanedStdErr() const
{
return Utils::normalizeNewlines(stdErr());
}
@@ -1713,17 +1713,17 @@ static QStringList splitLines(const QString &text)
return result;
}
-const QStringList QtcProcess::stdOutLines() const
+const QStringList Process::stdOutLines() const
{
return splitLines(cleanedStdOut());
}
-const QStringList QtcProcess::stdErrLines() const
+const QStringList Process::stdErrLines() const
{
return splitLines(cleanedStdErr());
}
-QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug str, const QtcProcess &r)
+QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug str, const Process &r)
{
QDebug nsp = str.nospace();
nsp << "QtcProcess: result="
@@ -1802,7 +1802,7 @@ void ChannelBuffer::handleRest()
}
}
-void QtcProcess::setTimeoutS(int timeoutS)
+void Process::setTimeoutS(int timeoutS)
{
if (timeoutS > 0)
d->m_maxHangTimerCount = qMax(2, timeoutS);
@@ -1810,33 +1810,33 @@ void QtcProcess::setTimeoutS(int timeoutS)
d->m_maxHangTimerCount = INT_MAX / 1000;
}
-int QtcProcess::timeoutS() const
+int Process::timeoutS() const
{
return d->m_maxHangTimerCount;
}
-void QtcProcess::setCodec(QTextCodec *c)
+void Process::setCodec(QTextCodec *c)
{
QTC_ASSERT(c, return);
d->m_codec = c;
}
-void QtcProcess::setTimeOutMessageBoxEnabled(bool v)
+void Process::setTimeOutMessageBoxEnabled(bool v)
{
d->m_timeOutMessageBoxEnabled = v;
}
-void QtcProcess::setExitCodeInterpreter(const ExitCodeInterpreter &interpreter)
+void Process::setExitCodeInterpreter(const ExitCodeInterpreter &interpreter)
{
d->m_exitCodeInterpreter = interpreter;
}
-void QtcProcess::setWriteData(const QByteArray &writeData)
+void Process::setWriteData(const QByteArray &writeData)
{
d->m_setup.m_writeData = writeData;
}
-void QtcProcess::runBlocking(EventLoopMode eventLoopMode)
+void Process::runBlocking(EventLoopMode eventLoopMode)
{
// Attach a dynamic property with info about blocking type
d->storeEventLoopDebugInfo(int(eventLoopMode));
@@ -1845,7 +1845,7 @@ void QtcProcess::runBlocking(EventLoopMode eventLoopMode)
static const int blockingThresholdMs = qtcEnvironmentVariableIntValue("QTC_PROCESS_THRESHOLD");
if (blockingThresholdMs > 0 && isMainThread())
startTime = QDateTime::currentDateTime();
- QtcProcess::start();
+ Process::start();
// Remove the dynamic property so that it's not reused in subseqent start()
d->storeEventLoopDebugInfo({});
@@ -1897,33 +1897,33 @@ void QtcProcess::runBlocking(EventLoopMode eventLoopMode)
}
}
-void QtcProcess::setStdOutCallback(const TextChannelCallback &callback)
+void Process::setStdOutCallback(const TextChannelCallback &callback)
{
d->m_stdOut.outputCallback = callback;
d->m_stdOut.emitSingleLines = false;
}
-void QtcProcess::setStdOutLineCallback(const TextChannelCallback &callback)
+void Process::setStdOutLineCallback(const TextChannelCallback &callback)
{
d->m_stdOut.outputCallback = callback;
d->m_stdOut.emitSingleLines = true;
d->m_stdOut.keepRawData = false;
}
-void QtcProcess::setStdErrCallback(const TextChannelCallback &callback)
+void Process::setStdErrCallback(const TextChannelCallback &callback)
{
d->m_stdErr.outputCallback = callback;
d->m_stdErr.emitSingleLines = false;
}
-void QtcProcess::setStdErrLineCallback(const TextChannelCallback &callback)
+void Process::setStdErrLineCallback(const TextChannelCallback &callback)
{
d->m_stdErr.outputCallback = callback;
d->m_stdErr.emitSingleLines = true;
d->m_stdErr.keepRawData = false;
}
-void QtcProcess::setTextChannelMode(Channel channel, TextChannelMode mode)
+void Process::setTextChannelMode(Channel channel, TextChannelMode mode)
{
const TextChannelCallback outputCb = [this](const QString &text) {
GuardLocker locker(d->m_guard);
@@ -1959,7 +1959,7 @@ void QtcProcess::setTextChannelMode(Channel channel, TextChannelMode mode)
}
}
-TextChannelMode QtcProcess::textChannelMode(Channel channel) const
+TextChannelMode Process::textChannelMode(Channel channel) const
{
ChannelBuffer *buffer = channel == Channel::Output ? &d->m_stdOut : &d->m_stdErr;
return buffer->m_textChannelMode;
@@ -1993,7 +1993,7 @@ void QtcProcessPrivate::handleStarted(qint64 processId, qint64 applicationMainTh
m_processId = processId;
m_applicationMainThreadId = applicationMainThreadId;
- emitGuardedSignal(&QtcProcess::started);
+ emitGuardedSignal(&Process::started);
}
void QtcProcessPrivate::handleReadyRead(const QByteArray &outputData, const QByteArray &errorData)
@@ -2011,7 +2011,7 @@ void QtcProcessPrivate::handleReadyRead(const QByteArray &outputData, const QByt
std::cout << outputData.constData() << std::flush;
} else {
m_stdOut.append(outputData);
- emitGuardedSignal(&QtcProcess::readyReadStandardOutput);
+ emitGuardedSignal(&Process::readyReadStandardOutput);
}
}
if (!errorData.isEmpty()) {
@@ -2020,7 +2020,7 @@ void QtcProcessPrivate::handleReadyRead(const QByteArray &outputData, const QByt
std::cerr << errorData.constData() << std::flush;
} else {
m_stdErr.append(errorData);
- emitGuardedSignal(&QtcProcess::readyReadStandardError);
+ emitGuardedSignal(&Process::readyReadStandardError);
}
}
}
@@ -2077,7 +2077,7 @@ void QtcProcessPrivate::handleDone(const ProcessResultData &data)
m_stdOut.handleRest();
m_stdErr.handleRest();
- emitGuardedSignal(&QtcProcess::done);
+ emitGuardedSignal(&Process::done);
m_processId = 0;
m_applicationMainThreadId = 0;
}
@@ -2101,7 +2101,7 @@ void QtcProcessPrivate::setupDebugLog()
return duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
};
- connect(q, &QtcProcess::starting, this, [=] {
+ connect(q, &Process::starting, this, [=] {
const quint64 msNow = now();
setProperty(QTC_PROCESS_STARTTIME, msNow);
@@ -2114,7 +2114,7 @@ void QtcProcessPrivate::setupDebugLog()
setProperty(QTC_PROCESS_NUMBER, currentNumber);
});
- connect(q, &QtcProcess::done, this, [=] {
+ connect(q, &Process::done, this, [=] {
if (!m_process.get())
return;
const QVariant n = property(QTC_PROCESS_NUMBER);
@@ -2148,7 +2148,7 @@ void QtcProcessPrivate::storeEventLoopDebugInfo(const QVariant &value)
ProcessTaskAdapter::ProcessTaskAdapter()
{
- connect(task(), &QtcProcess::done, this, [this] {
+ connect(task(), &Process::done, this, [this] {
emit done(task()->result() == ProcessResult::FinishedWithSuccess);
});
}
diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h
index 5e39453e38..f89b6f9b22 100644
--- a/src/libs/utils/qtcprocess.h
+++ b/src/libs/utils/qtcprocess.h
@@ -28,13 +28,13 @@ class DeviceProcessHooks;
class ProcessInterface;
class ProcessResultData;
-class QTCREATOR_UTILS_EXPORT QtcProcess final : public QObject
+class QTCREATOR_UTILS_EXPORT Process final : public QObject
{
Q_OBJECT
public:
- explicit QtcProcess(QObject *parent = nullptr);
- ~QtcProcess();
+ explicit Process(QObject *parent = nullptr);
+ ~Process();
// ProcessInterface related
@@ -194,7 +194,7 @@ signals:
void textOnStandardError(const QString &text);
private:
- friend QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug str, const QtcProcess &r);
+ friend QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug str, const Process &r);
friend class Internal::QtcProcessPrivate;
Internal::QtcProcessPrivate *d = nullptr;
@@ -207,7 +207,7 @@ public:
std::function<Environment(const FilePath &)> systemEnvironmentForBinary;
};
-class QTCREATOR_UTILS_EXPORT ProcessTaskAdapter : public Tasking::TaskAdapter<QtcProcess>
+class QTCREATOR_UTILS_EXPORT ProcessTaskAdapter : public Tasking::TaskAdapter<Process>
{
public:
ProcessTaskAdapter();
diff --git a/src/libs/utils/terminalhooks.cpp b/src/libs/utils/terminalhooks.cpp
index d8e53010c3..c7cab04028 100644
--- a/src/libs/utils/terminalhooks.cpp
+++ b/src/libs/utils/terminalhooks.cpp
@@ -45,7 +45,7 @@ class ExternalTerminalProcessImpl final : public TerminalInterface
if (HostOsInfo::isWindowsHost()) {
m_terminalProcess.setCommand(cmd);
- QObject::connect(&m_terminalProcess, &QtcProcess::done, this, [this] {
+ QObject::connect(&m_terminalProcess, &Process::done, this, [this] {
m_interface->onStubExited();
});
m_terminalProcess.setCreateConsoleOnWindows(true);
@@ -82,7 +82,7 @@ class ExternalTerminalProcessImpl final : public TerminalInterface
}
ExternalTerminalProcessImpl *m_interface;
- QtcProcess m_terminalProcess;
+ Process m_terminalProcess;
};
public:
diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index 8637fb6465..a5f71a95cd 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -37,7 +37,7 @@ static Q_LOGGING_CATEGORY(avdManagerLog, "qtc.android.avdManager", QtWarningMsg)
bool AndroidAvdManager::avdManagerCommand(const AndroidConfig &config, const QStringList &args, QString *output)
{
CommandLine cmd(config.avdManagerToolPath(), args);
- QtcProcess proc;
+ Process proc;
Environment env = AndroidConfigurations::toolsEnvironment(config);
proc.setEnvironment(env);
qCDebug(avdManagerLog).noquote() << "Running AVD Manager command:" << cmd.toUserOutput();
@@ -85,7 +85,7 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateA
avdManager.addArg("-f");
qCDebug(avdManagerLog).noquote() << "Running AVD Manager command:" << avdManager.toUserOutput();
- QtcProcess proc;
+ Process proc;
proc.setProcessMode(ProcessMode::Writer);
proc.setEnvironment(AndroidConfigurations::toolsEnvironment(config));
proc.setCommand(avdManager);
@@ -146,7 +146,7 @@ bool AndroidAvdManager::removeAvd(const QString &name) const
{
const CommandLine command(m_config.avdManagerToolPath(), {"delete", "avd", "-n", name});
qCDebug(avdManagerLog).noquote() << "Running command (removeAvd):" << command.toUserOutput();
- QtcProcess proc;
+ Process proc;
proc.setTimeoutS(5);
proc.setEnvironment(AndroidConfigurations::toolsEnvironment(m_config));
proc.setCommand(command);
@@ -232,7 +232,7 @@ static bool is32BitUserSpace()
// Do a similar check as android's emulator is doing:
if (HostOsInfo::isLinuxHost()) {
if (QSysInfo::WordSize == 32) {
- QtcProcess proc;
+ Process proc;
proc.setTimeoutS(3);
proc.setCommand({"getconf", {"LONG_BIT"}});
proc.runBlocking();
@@ -262,9 +262,9 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
// after the avdProcess has started and before it has finished. Giving a parent object here
// should solve the issue. However, AndroidAvdManager is not a QObject, so no clue what parent
// would be the most appropriate. Preferably some object taken form android plugin...
- QtcProcess *avdProcess = new QtcProcess;
+ Process *avdProcess = new Process;
avdProcess->setProcessChannelMode(QProcess::MergedChannels);
- QObject::connect(avdProcess, &QtcProcess::done, avdProcess, [avdProcess] {
+ QObject::connect(avdProcess, &Process::done, avdProcess, [avdProcess] {
if (avdProcess->exitCode()) {
const QString errorOutput = QString::fromLatin1(avdProcess->readAllRawStandardOutput());
QMetaObject::invokeMethod(Core::ICore::mainWindow(), [errorOutput] {
@@ -324,7 +324,7 @@ bool AndroidAvdManager::isAvdBooted(const QString &device) const
const CommandLine command({m_config.adbToolPath(), arguments});
qCDebug(avdManagerLog).noquote() << "Running command (isAvdBooted):" << command.toUserOutput();
- QtcProcess adbProc;
+ Process adbProc;
adbProc.setTimeoutS(10);
adbProc.setCommand(command);
adbProc.runBlocking();
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index 25a7c4f6ec..c79282e536 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -1050,7 +1050,7 @@ QAbstractItemModel *AndroidBuildApkStep::keystoreCertificates()
const QStringList params = {"-list", "-v", "-keystore", m_keystorePath.toUserOutput(),
"-storepass", m_keystorePasswd, "-J-Duser.language=en"};
- QtcProcess keytoolProc;
+ Process keytoolProc;
keytoolProc.setTimeoutS(30);
keytoolProc.setCommand({AndroidConfigurations::currentConfig().keytoolPath(), params});
keytoolProc.runBlocking(EventLoopMode::On);
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 3c3b64062e..eccfb2041e 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -601,7 +601,7 @@ FilePath AndroidConfig::keytoolPath() const
QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
{
QVector<AndroidDeviceInfo> devices;
- QtcProcess adbProc;
+ Process adbProc;
adbProc.setTimeoutS(30);
CommandLine cmd{adbToolPath(), {"devices"}};
adbProc.setCommand(cmd);
@@ -670,7 +670,7 @@ QString AndroidConfig::getDeviceProperty(const QString &device, const QString &p
AndroidDeviceInfo::adbSelector(device));
cmd.addArgs({"shell", "getprop", property});
- QtcProcess adbProc;
+ Process adbProc;
adbProc.setTimeoutS(10);
adbProc.setCommand(cmd);
adbProc.runBlocking();
@@ -747,7 +747,7 @@ QStringList AndroidConfig::getAbis(const QString &device)
// First try via ro.product.cpu.abilist
QStringList arguments = AndroidDeviceInfo::adbSelector(device);
arguments << "shell" << "getprop" << "ro.product.cpu.abilist";
- QtcProcess adbProc;
+ Process adbProc;
adbProc.setTimeoutS(10);
adbProc.setCommand({adbTool, arguments});
adbProc.runBlocking();
@@ -770,7 +770,7 @@ QStringList AndroidConfig::getAbis(const QString &device)
else
arguments << QString::fromLatin1("ro.product.cpu.abi%1").arg(i);
- QtcProcess abiProc;
+ Process abiProc;
abiProc.setTimeoutS(10);
abiProc.setCommand({adbTool, arguments});
abiProc.runBlocking();
@@ -1530,7 +1530,7 @@ FilePath AndroidConfig::getJdkPath()
args << "-c"
<< "readlink -f $(which java)";
- QtcProcess findJdkPathProc;
+ Process findJdkPathProc;
findJdkPathProc.setCommand({"sh", args});
findJdkPathProc.start();
findJdkPathProc.waitForFinished();
diff --git a/src/plugins/android/androidcreatekeystorecertificate.cpp b/src/plugins/android/androidcreatekeystorecertificate.cpp
index e6537b8a27..09858e3603 100644
--- a/src/plugins/android/androidcreatekeystorecertificate.cpp
+++ b/src/plugins/android/androidcreatekeystorecertificate.cpp
@@ -272,7 +272,7 @@ void AndroidCreateKeystoreCertificate::buttonBoxAccepted()
"-keypass", certificatePassword(),
"-dname", distinguishedNames});
- QtcProcess genKeyCertProc;
+ Process genKeyCertProc;
genKeyCertProc.setTimeoutS(15);
genKeyCertProc.setCommand(command);
genKeyCertProc.runBlocking(EventLoopMode::On);
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 9d288fc5a0..2ba26ebc61 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -381,7 +381,7 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy()
cmd.addArgs({"install", "-r", m_apkPath.toString()});
}
- QtcProcess process;
+ Process process;
process.setCommand(cmd);
process.setWorkingDirectory(m_workingDirectory);
process.setEnvironment(m_environment);
@@ -576,7 +576,7 @@ void AndroidDeployQtStep::doCancel()
void AndroidDeployQtStep::runCommand(const CommandLine &command)
{
- QtcProcess buildProc;
+ Process buildProc;
buildProc.setTimeoutS(2 * 60);
emit addOutput(Tr::tr("Package deploy: Running command \"%1\".").arg(command.toUserOutput()),
OutputFormat::NormalMessage);
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index 4d729c786e..c1afae589b 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -614,20 +614,20 @@ void AndroidDeviceManager::setupDevicesWatcher()
}
if (!m_adbDeviceWatcherProcess)
- m_adbDeviceWatcherProcess.reset(new QtcProcess(this));
+ m_adbDeviceWatcherProcess.reset(new Process(this));
if (m_adbDeviceWatcherProcess->isRunning()) {
qCDebug(androidDeviceLog) << "ADB device watcher is already running.";
return;
}
- connect(m_adbDeviceWatcherProcess.get(), &QtcProcess::done, this, [this] {
+ connect(m_adbDeviceWatcherProcess.get(), &Process::done, this, [this] {
if (m_adbDeviceWatcherProcess->error() != QProcess::UnknownError) {
qCDebug(androidDeviceLog) << "ADB device watcher encountered an error:"
<< m_adbDeviceWatcherProcess->errorString();
if (!m_adbDeviceWatcherProcess->isRunning()) {
qCDebug(androidDeviceLog) << "Restarting the ADB device watcher now.";
- QTimer::singleShot(0, m_adbDeviceWatcherProcess.get(), &QtcProcess::start);
+ QTimer::singleShot(0, m_adbDeviceWatcherProcess.get(), &Process::start);
}
}
qCDebug(androidDeviceLog) << "ADB device watcher finished.";
diff --git a/src/plugins/android/androiddevice.h b/src/plugins/android/androiddevice.h
index 551d39b934..cf8046cfa9 100644
--- a/src/plugins/android/androiddevice.h
+++ b/src/plugins/android/androiddevice.h
@@ -15,7 +15,7 @@
#include <QFileSystemWatcher>
#include <QSettings>
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace Android {
namespace Internal {
@@ -108,7 +108,7 @@ private:
QFutureWatcher<AndroidDeviceInfoList> m_avdsFutureWatcher;
QFutureWatcher<QPair<ProjectExplorer::IDevice::ConstPtr, bool>> m_removeAvdFutureWatcher;
QFileSystemWatcher m_avdFileSystemWatcher;
- std::unique_ptr<Utils::QtcProcess> m_adbDeviceWatcherProcess;
+ std::unique_ptr<Utils::Process> m_adbDeviceWatcherProcess;
AndroidConfig &m_androidConfig;
AndroidAvdManager m_avdManager;
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 72a9e5c479..495f031be4 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -612,7 +612,7 @@ bool AndroidManager::checkKeystorePassword(const FilePath &keystorePath,
const CommandLine cmd(AndroidConfigurations::currentConfig().keytoolPath(),
{"-list", "-keystore", keystorePath.toUserOutput(),
"--storepass", keystorePasswd});
- QtcProcess proc;
+ Process proc;
proc.setTimeoutS(10);
proc.setCommand(cmd);
proc.runBlocking(EventLoopMode::On);
@@ -632,7 +632,7 @@ bool AndroidManager::checkCertificatePassword(const FilePath &keystorePath,
else
arguments << certificatePasswd;
- QtcProcess proc;
+ Process proc;
proc.setTimeoutS(10);
proc.setCommand({AndroidConfigurations::currentConfig().keytoolPath(), arguments});
proc.runBlocking(EventLoopMode::On);
@@ -646,7 +646,7 @@ bool AndroidManager::checkCertificateExists(const FilePath &keystorePath,
QStringList arguments = { "-list", "-keystore", keystorePath.toUserOutput(),
"--storepass", keystorePasswd, "-alias", alias };
- QtcProcess proc;
+ Process proc;
proc.setTimeoutS(10);
proc.setCommand({AndroidConfigurations::currentConfig().keytoolPath(), arguments});
proc.runBlocking(EventLoopMode::On);
@@ -681,7 +681,7 @@ SdkToolResult AndroidManager::runCommand(const CommandLine &command,
const QByteArray &writeData, int timeoutS)
{
Android::SdkToolResult cmdResult;
- QtcProcess cmdProc;
+ Process cmdProc;
cmdProc.setTimeoutS(timeoutS);
cmdProc.setWriteData(writeData);
qCDebug(androidManagerLog) << "Running command (sync):" << command.toUserOutput();
diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp
index 85a3b917d3..e489a1e1e7 100644
--- a/src/plugins/android/androidqmlpreviewworker.cpp
+++ b/src/plugins/android/androidqmlpreviewworker.cpp
@@ -117,7 +117,7 @@ private:
QStringList m_avdAbis;
int m_viewerPid = -1;
QFutureWatcher<void> m_pidFutureWatcher;
- Utils::QtcProcess m_logcatProcess;
+ Utils::Process m_logcatProcess;
QString m_logcatStartTimeStamp;
UploadInfo m_uploadInfo;
};
@@ -226,7 +226,7 @@ AndroidQmlPreviewWorker::AndroidQmlPreviewWorker(RunControl *runControl)
connect(this, &AndroidQmlPreviewWorker::previewPidChanged,
this, &AndroidQmlPreviewWorker::startLogcat);
- connect(this, &RunWorker::stopped, &m_logcatProcess, &QtcProcess::stop);
+ connect(this, &RunWorker::stopped, &m_logcatProcess, &Process::stop);
m_logcatProcess.setStdOutCallback([this](const QString &stdOut) {
filterLogcatAndAppendMessage(stdOut);
});
@@ -376,7 +376,7 @@ FilePath AndroidQmlPreviewWorker::createQmlrcFile(const FilePath &workFolder,
{
const QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(m_rc->kit());
const FilePath rccBinary = qtVersion->rccFilePath();
- QtcProcess rccProcess;
+ Process rccProcess;
FilePath qrcPath = FilePath::fromString(basename + ".qrc4viewer");
const FilePath qmlrcPath = FilePath::fromString(QDir::tempPath()) / (basename + packageSuffix);
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index e2cae79103..0e5f6c6f80 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -98,7 +98,7 @@ static void findProcessPIDAndUser(QPromise<PidUserPair> &promise,
chrono::high_resolution_clock::time_point start = chrono::high_resolution_clock::now();
do {
QThread::msleep(200);
- QtcProcess proc;
+ Process proc;
proc.setCommand({adbPath, args});
proc.runBlocking();
const QString out = proc.allOutput();
@@ -117,7 +117,7 @@ static void findProcessPIDAndUser(QPromise<PidUserPair> &promise,
args = {selector};
args.append({"shell", "ps", "-o", "user", "-p"});
args.append(QString::number(processPID));
- QtcProcess proc;
+ Process proc;
proc.setCommand({adbPath, args});
proc.runBlocking();
const QString out = proc.allOutput();
diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index 7a16756f22..61354888fd 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -93,7 +93,7 @@ static bool sdkManagerCommand(const AndroidConfig &config, const QStringList &ar
qCDebug(sdkManagerLog).noquote() << "Running SDK Manager command (sync):"
<< CommandLine(config.sdkManagerToolPath(), newArgs)
.toUserOutput();
- QtcProcess proc;
+ Process proc;
proc.setEnvironment(AndroidConfigurations::toolsEnvironment(config));
proc.setTimeoutS(timeout);
proc.setTimeOutMessageBoxEnabled(true);
@@ -121,7 +121,7 @@ static void sdkManagerCommand(const AndroidConfig &config, const QStringList &ar
<< CommandLine(config.sdkManagerToolPath(), newArgs)
.toUserOutput();
int offset = promise.future().progressValue();
- QtcProcess proc;
+ Process proc;
proc.setEnvironment(AndroidConfigurations::toolsEnvironment(config));
bool assertionFound = false;
proc.setTimeoutS(timeout);
@@ -521,7 +521,7 @@ void AndroidSdkManagerPrivate::getPendingLicense(SdkCmdPromise &fi)
AndroidSdkManager::OperationOutput result;
result.type = AndroidSdkManager::LicenseWorkflow;
- QtcProcess licenseCommand;
+ Process licenseCommand;
licenseCommand.setProcessMode(ProcessMode::Writer);
licenseCommand.setEnvironment(AndroidConfigurations::toolsEnvironment(m_config));
bool reviewingLicenses = false;
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 21fe13ad8b..62fed62a81 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -659,7 +659,7 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
openSslProgressDialog->setFixedSize(openSslProgressDialog->sizeHint());
const QString openSslRepo("https://github.com/KDAB/android_openssl.git");
- QtcProcess *gitCloner = new QtcProcess(this);
+ Process *gitCloner = new Process(this);
CommandLine gitCloneCommand("git", {"clone", "--depth=1", openSslRepo, openSslPath.toString()});
gitCloner->setCommand(gitCloneCommand);
@@ -684,7 +684,7 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
openButton->deleteLater();
};
- connect(gitCloner, &QtcProcess::done, this, [=] {
+ connect(gitCloner, &Process::done, this, [=] {
openSslProgressDialog->close();
if (gitCloner->error() != QProcess::UnknownError) {
if (gitCloner->error() == QProcess::FailedToStart) {
diff --git a/src/plugins/android/androidsignaloperation.cpp b/src/plugins/android/androidsignaloperation.cpp
index 426b63c144..a3fdfeeb83 100644
--- a/src/plugins/android/androidsignaloperation.cpp
+++ b/src/plugins/android/androidsignaloperation.cpp
@@ -90,8 +90,8 @@ void AndroidSignalOperation::startAdbProcess(State state, const Utils::CommandLi
{
m_state = state;
m_timeout->start();
- m_adbProcess.reset(new QtcProcess);
- connect(m_adbProcess.get(), &QtcProcess::done, this, handler);
+ m_adbProcess.reset(new Process);
+ connect(m_adbProcess.get(), &Process::done, this, handler);
m_adbProcess->setCommand(commandLine);
m_adbProcess->start();
}
diff --git a/src/plugins/android/androidsignaloperation.h b/src/plugins/android/androidsignaloperation.h
index 06a88b6705..1c3bb48454 100644
--- a/src/plugins/android/androidsignaloperation.h
+++ b/src/plugins/android/androidsignaloperation.h
@@ -42,7 +42,7 @@ private:
void startAdbProcess(State state, const Utils::CommandLine &commandLine, FinishHandler handler);
Utils::FilePath m_adbPath;
- std::unique_ptr<Utils::QtcProcess> m_adbProcess;
+ std::unique_ptr<Utils::Process> m_adbProcess;
QTimer *m_timeout;
State m_state = Idle;
diff --git a/src/plugins/autotest/boost/boosttestconfiguration.cpp b/src/plugins/autotest/boost/boosttestconfiguration.cpp
index d680699c36..1df0bd6776 100644
--- a/src/plugins/autotest/boost/boosttestconfiguration.cpp
+++ b/src/plugins/autotest/boost/boosttestconfiguration.cpp
@@ -17,7 +17,7 @@ using namespace Utils;
namespace Autotest {
namespace Internal {
-TestOutputReader *BoostTestConfiguration::createOutputReader(QtcProcess *app) const
+TestOutputReader *BoostTestConfiguration::createOutputReader(Process *app) const
{
auto settings = static_cast<BoostTestSettings *>(framework()->testSettings());
return new BoostTestOutputReader(app, buildDirectory(), projectFile(),
diff --git a/src/plugins/autotest/boost/boosttestconfiguration.h b/src/plugins/autotest/boost/boosttestconfiguration.h
index 5a764dd866..10e50004bc 100644
--- a/src/plugins/autotest/boost/boosttestconfiguration.h
+++ b/src/plugins/autotest/boost/boosttestconfiguration.h
@@ -13,7 +13,7 @@ class BoostTestConfiguration : public DebuggableTestConfiguration
public:
explicit BoostTestConfiguration(ITestFramework *framework)
: DebuggableTestConfiguration(framework) {}
- TestOutputReader *createOutputReader(Utils::QtcProcess *app) const override;
+ TestOutputReader *createOutputReader(Utils::Process *app) const override;
QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override;
Utils::Environment filteredEnvironment(const Utils::Environment &original) const override;
};
diff --git a/src/plugins/autotest/boost/boosttestoutputreader.cpp b/src/plugins/autotest/boost/boosttestoutputreader.cpp
index 3ac49d2aa4..f91dd25b21 100644
--- a/src/plugins/autotest/boost/boosttestoutputreader.cpp
+++ b/src/plugins/autotest/boost/boosttestoutputreader.cpp
@@ -22,7 +22,7 @@ namespace Internal {
static Q_LOGGING_CATEGORY(orLog, "qtc.autotest.boost.outputreader", QtWarningMsg)
-BoostTestOutputReader::BoostTestOutputReader(QtcProcess *testApplication,
+BoostTestOutputReader::BoostTestOutputReader(Process *testApplication,
const FilePath &buildDirectory,
const FilePath &projectFile,
LogLevel log, ReportLevel report)
@@ -34,7 +34,7 @@ BoostTestOutputReader::BoostTestOutputReader(QtcProcess *testApplication,
if (!testApplication)
return;
- connect(testApplication, &QtcProcess::done, this, [this, testApplication] {
+ connect(testApplication, &Process::done, this, [this, testApplication] {
onDone(testApplication->exitCode());
});
}
diff --git a/src/plugins/autotest/boost/boosttestoutputreader.h b/src/plugins/autotest/boost/boosttestoutputreader.h
index ff2066f7d4..648b55547f 100644
--- a/src/plugins/autotest/boost/boosttestoutputreader.h
+++ b/src/plugins/autotest/boost/boosttestoutputreader.h
@@ -15,7 +15,7 @@ class BoostTestOutputReader : public TestOutputReader
{
Q_OBJECT
public:
- BoostTestOutputReader(Utils::QtcProcess *testApplication, const Utils::FilePath &buildDirectory,
+ BoostTestOutputReader(Utils::Process *testApplication, const Utils::FilePath &buildDirectory,
const Utils::FilePath &projectFile, LogLevel log, ReportLevel report);
protected:
void processOutputLine(const QByteArray &outputLine) override;
diff --git a/src/plugins/autotest/catch/catchconfiguration.cpp b/src/plugins/autotest/catch/catchconfiguration.cpp
index 593acc589e..88f590d352 100644
--- a/src/plugins/autotest/catch/catchconfiguration.cpp
+++ b/src/plugins/autotest/catch/catchconfiguration.cpp
@@ -15,7 +15,7 @@ using namespace Utils;
namespace Autotest {
namespace Internal {
-TestOutputReader *CatchConfiguration::createOutputReader(QtcProcess *app) const
+TestOutputReader *CatchConfiguration::createOutputReader(Process *app) const
{
return new CatchOutputReader(app, buildDirectory(), projectFile());
}
diff --git a/src/plugins/autotest/catch/catchconfiguration.h b/src/plugins/autotest/catch/catchconfiguration.h
index 90b9b09dce..63ac84dba7 100644
--- a/src/plugins/autotest/catch/catchconfiguration.h
+++ b/src/plugins/autotest/catch/catchconfiguration.h
@@ -12,7 +12,7 @@ class CatchConfiguration : public DebuggableTestConfiguration
{
public:
CatchConfiguration(ITestFramework *framework) : DebuggableTestConfiguration(framework) {}
- TestOutputReader *createOutputReader(Utils::QtcProcess *app) const override;
+ TestOutputReader *createOutputReader(Utils::Process *app) const override;
QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override;
Utils::Environment filteredEnvironment(const Utils::Environment &original) const override;
};
diff --git a/src/plugins/autotest/catch/catchoutputreader.cpp b/src/plugins/autotest/catch/catchoutputreader.cpp
index 9bcb377805..7a3aa277d4 100644
--- a/src/plugins/autotest/catch/catchoutputreader.cpp
+++ b/src/plugins/autotest/catch/catchoutputreader.cpp
@@ -29,7 +29,7 @@ namespace CatchXml {
const char TestCaseResultElement[] = "OverallResult";
}
-CatchOutputReader::CatchOutputReader(QtcProcess *testApplication,
+CatchOutputReader::CatchOutputReader(Process *testApplication,
const FilePath &buildDirectory,
const FilePath &projectFile)
: TestOutputReader(testApplication, buildDirectory)
diff --git a/src/plugins/autotest/catch/catchoutputreader.h b/src/plugins/autotest/catch/catchoutputreader.h
index d65ebd7650..b46db333f8 100644
--- a/src/plugins/autotest/catch/catchoutputreader.h
+++ b/src/plugins/autotest/catch/catchoutputreader.h
@@ -14,7 +14,7 @@ namespace Internal {
class CatchOutputReader : public TestOutputReader
{
public:
- CatchOutputReader(Utils::QtcProcess *testApplication, const Utils::FilePath &buildDirectory,
+ CatchOutputReader(Utils::Process *testApplication, const Utils::FilePath &buildDirectory,
const Utils::FilePath &projectFile);
protected:
diff --git a/src/plugins/autotest/ctest/ctestconfiguration.cpp b/src/plugins/autotest/ctest/ctestconfiguration.cpp
index 183d7874e8..a2e2edfe0a 100644
--- a/src/plugins/autotest/ctest/ctestconfiguration.cpp
+++ b/src/plugins/autotest/ctest/ctestconfiguration.cpp
@@ -13,7 +13,7 @@ CTestConfiguration::CTestConfiguration(ITestBase *testBase)
setDisplayName("CTest");
}
-TestOutputReader *CTestConfiguration::createOutputReader(Utils::QtcProcess *app) const
+TestOutputReader *CTestConfiguration::createOutputReader(Utils::Process *app) const
{
return new CTestOutputReader(app, workingDirectory());
}
diff --git a/src/plugins/autotest/ctest/ctestconfiguration.h b/src/plugins/autotest/ctest/ctestconfiguration.h
index 4496fb4aaf..a298fec86d 100644
--- a/src/plugins/autotest/ctest/ctestconfiguration.h
+++ b/src/plugins/autotest/ctest/ctestconfiguration.h
@@ -13,7 +13,7 @@ class CTestConfiguration final : public Autotest::TestToolConfiguration
public:
explicit CTestConfiguration(ITestBase *testBase);
- TestOutputReader *createOutputReader(Utils::QtcProcess *app) const final;
+ TestOutputReader *createOutputReader(Utils::Process *app) const final;
};
} // namespace Internal
diff --git a/src/plugins/autotest/ctest/ctestoutputreader.cpp b/src/plugins/autotest/ctest/ctestoutputreader.cpp
index 9a6259d8c0..10f48d9d46 100644
--- a/src/plugins/autotest/ctest/ctestoutputreader.cpp
+++ b/src/plugins/autotest/ctest/ctestoutputreader.cpp
@@ -50,7 +50,7 @@ public:
{}
};
-CTestOutputReader::CTestOutputReader(QtcProcess *testApplication,
+CTestOutputReader::CTestOutputReader(Process *testApplication,
const FilePath &buildDirectory)
: TestOutputReader(testApplication, buildDirectory)
{
diff --git a/src/plugins/autotest/ctest/ctestoutputreader.h b/src/plugins/autotest/ctest/ctestoutputreader.h
index 896f17ba24..85785d44fc 100644
--- a/src/plugins/autotest/ctest/ctestoutputreader.h
+++ b/src/plugins/autotest/ctest/ctestoutputreader.h
@@ -5,7 +5,7 @@
#include "../testoutputreader.h"
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace Autotest {
namespace Internal {
@@ -13,7 +13,7 @@ namespace Internal {
class CTestOutputReader final : public Autotest::TestOutputReader
{
public:
- CTestOutputReader(Utils::QtcProcess *testApplication, const Utils::FilePath &buildDirectory);
+ CTestOutputReader(Utils::Process *testApplication, const Utils::FilePath &buildDirectory);
protected:
void processOutputLine(const QByteArray &outputLineWithNewLine) final;
diff --git a/src/plugins/autotest/gtest/gtestconfiguration.cpp b/src/plugins/autotest/gtest/gtestconfiguration.cpp
index 1da1d212e4..32e590ccb5 100644
--- a/src/plugins/autotest/gtest/gtestconfiguration.cpp
+++ b/src/plugins/autotest/gtest/gtestconfiguration.cpp
@@ -17,7 +17,7 @@ using namespace Utils;
namespace Autotest {
namespace Internal {
-TestOutputReader *GTestConfiguration::createOutputReader(QtcProcess *app) const
+TestOutputReader *GTestConfiguration::createOutputReader(Process *app) const
{
return new GTestOutputReader(app, buildDirectory(), projectFile());
}
diff --git a/src/plugins/autotest/gtest/gtestconfiguration.h b/src/plugins/autotest/gtest/gtestconfiguration.h
index a68a1f9674..0cbfc8b0d8 100644
--- a/src/plugins/autotest/gtest/gtestconfiguration.h
+++ b/src/plugins/autotest/gtest/gtestconfiguration.h
@@ -14,7 +14,7 @@ public:
explicit GTestConfiguration(ITestFramework *framework)
: DebuggableTestConfiguration(framework) {}
- TestOutputReader *createOutputReader(Utils::QtcProcess *app) const override;
+ TestOutputReader *createOutputReader(Utils::Process *app) const override;
QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override;
Utils::Environment filteredEnvironment(const Utils::Environment &original) const override;
};
diff --git a/src/plugins/autotest/gtest/gtestoutputreader.cpp b/src/plugins/autotest/gtest/gtestoutputreader.cpp
index 6ee766b28a..66a4935622 100644
--- a/src/plugins/autotest/gtest/gtestoutputreader.cpp
+++ b/src/plugins/autotest/gtest/gtestoutputreader.cpp
@@ -17,14 +17,14 @@ using namespace Utils;
namespace Autotest {
namespace Internal {
-GTestOutputReader::GTestOutputReader(QtcProcess *testApplication,
+GTestOutputReader::GTestOutputReader(Process *testApplication,
const FilePath &buildDirectory,
const FilePath &projectFile)
: TestOutputReader(testApplication, buildDirectory)
, m_projectFile(projectFile)
{
if (testApplication) {
- connect(testApplication, &QtcProcess::done, this, [this, testApplication] {
+ connect(testApplication, &Process::done, this, [this, testApplication] {
const int exitCode = testApplication->exitCode();
if (exitCode == 1 && !m_description.isEmpty()) {
createAndReportResult(Tr::tr("Running tests failed.\n %1\nExecutable: %2")
diff --git a/src/plugins/autotest/gtest/gtestoutputreader.h b/src/plugins/autotest/gtest/gtestoutputreader.h
index a8ced858dd..a63c566829 100644
--- a/src/plugins/autotest/gtest/gtestoutputreader.h
+++ b/src/plugins/autotest/gtest/gtestoutputreader.h
@@ -11,7 +11,7 @@ namespace Internal {
class GTestOutputReader : public TestOutputReader
{
public:
- GTestOutputReader(Utils::QtcProcess *testApplication, const Utils::FilePath &buildDirectory,
+ GTestOutputReader(Utils::Process *testApplication, const Utils::FilePath &buildDirectory,
const Utils::FilePath &projectFile);
protected:
void processOutputLine(const QByteArray &outputLine) override;
diff --git a/src/plugins/autotest/qtest/qttestconfiguration.cpp b/src/plugins/autotest/qtest/qttestconfiguration.cpp
index 9210a9685f..37da244cc9 100644
--- a/src/plugins/autotest/qtest/qttestconfiguration.cpp
+++ b/src/plugins/autotest/qtest/qttestconfiguration.cpp
@@ -28,7 +28,7 @@ static QStringList quoteIfNeeded(const QStringList &testCases, bool debugMode)
});
}
-TestOutputReader *QtTestConfiguration::createOutputReader(QtcProcess *app) const
+TestOutputReader *QtTestConfiguration::createOutputReader(Process *app) const
{
auto qtSettings = static_cast<QtTestSettings *>(framework()->testSettings());
const QtTestOutputReader::OutputMode mode = qtSettings && qtSettings->useXMLOutput.value()
diff --git a/src/plugins/autotest/qtest/qttestconfiguration.h b/src/plugins/autotest/qtest/qttestconfiguration.h
index f370f97c78..d41697090e 100644
--- a/src/plugins/autotest/qtest/qttestconfiguration.h
+++ b/src/plugins/autotest/qtest/qttestconfiguration.h
@@ -13,7 +13,7 @@ class QtTestConfiguration : public DebuggableTestConfiguration
public:
explicit QtTestConfiguration(ITestFramework *framework)
: DebuggableTestConfiguration(framework) {}
- TestOutputReader *createOutputReader(Utils::QtcProcess *app) const override;
+ TestOutputReader *createOutputReader(Utils::Process *app) const override;
QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override;
Utils::Environment filteredEnvironment(const Utils::Environment &original) const override;
};
diff --git a/src/plugins/autotest/qtest/qttestoutputreader.cpp b/src/plugins/autotest/qtest/qttestoutputreader.cpp
index 8916b8d981..70df35e663 100644
--- a/src/plugins/autotest/qtest/qttestoutputreader.cpp
+++ b/src/plugins/autotest/qtest/qttestoutputreader.cpp
@@ -101,7 +101,7 @@ static QString constructBenchmarkInformation(const QString &metric, double value
.arg(iterations);
}
-QtTestOutputReader::QtTestOutputReader(QtcProcess *testApplication,
+QtTestOutputReader::QtTestOutputReader(Process *testApplication,
const FilePath &buildDirectory,
const FilePath &projectFile,
OutputMode mode, TestType type)
diff --git a/src/plugins/autotest/qtest/qttestoutputreader.h b/src/plugins/autotest/qtest/qttestoutputreader.h
index a730d540dd..0962c8d684 100644
--- a/src/plugins/autotest/qtest/qttestoutputreader.h
+++ b/src/plugins/autotest/qtest/qttestoutputreader.h
@@ -23,7 +23,7 @@ public:
PlainText
};
- QtTestOutputReader(Utils::QtcProcess *testApplication, const Utils::FilePath &buildDirectory,
+ QtTestOutputReader(Utils::Process *testApplication, const Utils::FilePath &buildDirectory,
const Utils::FilePath &projectFile, OutputMode mode, TestType type);
protected:
void processOutputLine(const QByteArray &outputLine) override;
diff --git a/src/plugins/autotest/quick/quicktestconfiguration.cpp b/src/plugins/autotest/quick/quicktestconfiguration.cpp
index 1d00c48c20..cf316ca489 100644
--- a/src/plugins/autotest/quick/quicktestconfiguration.cpp
+++ b/src/plugins/autotest/quick/quicktestconfiguration.cpp
@@ -21,7 +21,7 @@ QuickTestConfiguration::QuickTestConfiguration(ITestFramework *framework)
setMixedDebugging(true);
}
-TestOutputReader *QuickTestConfiguration::createOutputReader(QtcProcess *app) const
+TestOutputReader *QuickTestConfiguration::createOutputReader(Process *app) const
{
auto qtSettings = static_cast<QtTestSettings *>(framework()->testSettings());
const QtTestOutputReader::OutputMode mode = qtSettings && qtSettings->useXMLOutput.value()
diff --git a/src/plugins/autotest/quick/quicktestconfiguration.h b/src/plugins/autotest/quick/quicktestconfiguration.h
index 6739f84825..33a07b0294 100644
--- a/src/plugins/autotest/quick/quicktestconfiguration.h
+++ b/src/plugins/autotest/quick/quicktestconfiguration.h
@@ -12,7 +12,7 @@ class QuickTestConfiguration : public DebuggableTestConfiguration
{
public:
explicit QuickTestConfiguration(ITestFramework *framework);
- TestOutputReader *createOutputReader(Utils::QtcProcess *app) const override;
+ TestOutputReader *createOutputReader(Utils::Process *app) const override;
QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override;
Utils::Environment filteredEnvironment(const Utils::Environment &original) const override;
};
diff --git a/src/plugins/autotest/testconfiguration.h b/src/plugins/autotest/testconfiguration.h
index 492509605c..6292ef8204 100644
--- a/src/plugins/autotest/testconfiguration.h
+++ b/src/plugins/autotest/testconfiguration.h
@@ -12,7 +12,7 @@
#include <QPointer>
#include <QStringList>
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace Autotest {
namespace Internal {
@@ -39,7 +39,7 @@ public:
Utils::FilePath executableFilePath() const;
virtual Utils::FilePath testExecutable() const { return executableFilePath(); };
- virtual TestOutputReader *createOutputReader(Utils::QtcProcess *app) const = 0;
+ virtual TestOutputReader *createOutputReader(Utils::Process *app) const = 0;
virtual Utils::Environment filteredEnvironment(const Utils::Environment &original) const;
ITestBase *testBase() const { return m_testBase; }
diff --git a/src/plugins/autotest/testoutputreader.cpp b/src/plugins/autotest/testoutputreader.cpp
index e05fe8fddd..48bab93066 100644
--- a/src/plugins/autotest/testoutputreader.cpp
+++ b/src/plugins/autotest/testoutputreader.cpp
@@ -21,7 +21,7 @@ FilePath TestOutputReader::constructSourceFilePath(const FilePath &path, const Q
return filePath.isReadableFile() ? filePath : FilePath();
}
-TestOutputReader::TestOutputReader(QtcProcess *testApplication, const FilePath &buildDirectory)
+TestOutputReader::TestOutputReader(Process *testApplication, const FilePath &buildDirectory)
: m_buildDir(buildDirectory)
{
auto chopLineBreak = [](QByteArray line) {
@@ -33,7 +33,7 @@ TestOutputReader::TestOutputReader(QtcProcess *testApplication, const FilePath &
};
if (testApplication) {
- connect(testApplication, &QtcProcess::started, this, [this, testApplication] {
+ connect(testApplication, &Process::started, this, [this, testApplication] {
m_id = testApplication->commandLine().executable().toUserOutput();
});
testApplication->setStdOutLineCallback([this, &chopLineBreak](const QString &line) {
diff --git a/src/plugins/autotest/testoutputreader.h b/src/plugins/autotest/testoutputreader.h
index 7011070b44..e87c463735 100644
--- a/src/plugins/autotest/testoutputreader.h
+++ b/src/plugins/autotest/testoutputreader.h
@@ -7,7 +7,7 @@
#include <QObject>
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace Autotest {
@@ -15,7 +15,7 @@ class TestOutputReader : public QObject
{
Q_OBJECT
public:
- TestOutputReader(Utils::QtcProcess *testApplication, const Utils::FilePath &buildDirectory);
+ TestOutputReader(Utils::Process *testApplication, const Utils::FilePath &buildDirectory);
virtual ~TestOutputReader();
void processStdOutput(const QByteArray &outputLine);
virtual void processStdError(const QByteArray &outputLine);
diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp
index 875549192f..c0ca216533 100644
--- a/src/plugins/autotest/testrunner.cpp
+++ b/src/plugins/autotest/testrunner.cpp
@@ -89,7 +89,7 @@ void TestRunner::runTest(TestRunMode mode, const ITestTreeItem *item)
runTests(mode, {configuration});
}
-static QString processInformation(const QtcProcess *proc)
+static QString processInformation(const Process *proc)
{
QTC_ASSERT(proc, return {});
const CommandLine command = proc->commandLine();
@@ -365,7 +365,7 @@ void TestRunner::runTestsHelper()
}
return TaskAction::Continue;
};
- const auto onSetup = [this, config, storage](QtcProcess &process) {
+ const auto onSetup = [this, config, storage](Process &process) {
TestStorage *testStorage = storage.activeStorage();
QTC_ASSERT(testStorage, return);
testStorage->m_outputReader.reset(config->createOutputReader(&process));
@@ -412,7 +412,7 @@ void TestRunner::runTestsHelper()
qCInfo(runnerLog) << "Working directory:" << process.workingDirectory();
qCDebug(runnerLog) << "Environment:" << process.environment().toStringList();
};
- const auto onDone = [this, config, storage](const QtcProcess &process) {
+ const auto onDone = [this, config, storage](const Process &process) {
TestStorage *testStorage = storage.activeStorage();
QTC_ASSERT(testStorage, return);
if (process.result() == ProcessResult::StartFailed) {
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
index 590c115886..a266ed7bfd 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
@@ -358,12 +358,12 @@ UvscServerProviderRunner::UvscServerProviderRunner(ProjectExplorer::RunControl *
m_process.setCommand(runnable.command);
- connect(&m_process, &QtcProcess::started, this, [this] {
+ connect(&m_process, &Process::started, this, [this] {
ProcessHandle pid(m_process.processId());
this->runControl()->setApplicationProcessHandle(pid);
reportStarted();
});
- connect(&m_process, &QtcProcess::done, this, [this] {
+ connect(&m_process, &Process::done, this, [this] {
appendMessage(m_process.exitMessage(), NormalMessageFormat);
reportStopped();
});
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h
index d7b3bcafba..6f4275769e 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h
+++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h
@@ -127,7 +127,7 @@ private:
void start() final;
void stop() final;
- Utils::QtcProcess m_process;
+ Utils::Process m_process;
};
} // namespace Internal
diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp
index 80b5491ddf..392d4e8234 100644
--- a/src/plugins/baremetal/iarewtoolchain.cpp
+++ b/src/plugins/baremetal/iarewtoolchain.cpp
@@ -78,7 +78,7 @@ static Macros dumpPredefinedMacros(const FilePath &compiler, const QStringList &
const QString outpath = fakeIn.fileName() + ".tmp";
- QtcProcess cpp;
+ Process cpp;
cpp.setEnvironment(env);
cpp.setTimeoutS(10);
@@ -130,7 +130,7 @@ static HeaderPaths dumpHeaderPaths(const FilePath &compiler, const Id languageId
cmd.addArg("--preinclude");
cmd.addArg(".");
- QtcProcess cpp;
+ Process cpp;
cpp.setEnvironment(env);
cpp.setTimeoutS(10);
cpp.setCommand(cmd);
diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp
index 4c023ce306..e9662ff031 100644
--- a/src/plugins/baremetal/keiltoolchain.cpp
+++ b/src/plugins/baremetal/keiltoolchain.cpp
@@ -113,7 +113,7 @@ static Macros dumpMcsPredefinedMacros(const FilePath &compiler, const Environmen
fakeIn.close();
- QtcProcess cpp;
+ Process cpp;
cpp.setEnvironment(env);
cpp.setTimeoutS(10);
cpp.setCommand({compiler, {fakeIn.fileName()}});
@@ -190,7 +190,7 @@ static Macros dumpC166PredefinedMacros(const FilePath &compiler, const Environme
fakeIn.close();
- QtcProcess cpp;
+ Process cpp;
cpp.setEnvironment(env);
cpp.setTimeoutS(10);
@@ -255,7 +255,7 @@ static Macros dumpC166PredefinedMacros(const FilePath &compiler, const Environme
static Macros dumpArmPredefinedMacros(const FilePath &compiler, const QStringList &extraArgs, const Environment &env)
{
- QtcProcess cpp;
+ Process cpp;
cpp.setEnvironment(env);
cpp.setTimeoutS(10);
diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp
index a16372eff9..14b20657de 100644
--- a/src/plugins/baremetal/sdcctoolchain.cpp
+++ b/src/plugins/baremetal/sdcctoolchain.cpp
@@ -65,7 +65,7 @@ static Macros dumpPredefinedMacros(const FilePath &compiler, const Environment &
return {};
fakeIn.close();
- QtcProcess cpp;
+ Process cpp;
cpp.setEnvironment(env);
cpp.setTimeoutS(10);
cpp.setCommand({compiler, {compilerTargetFlag(abi), "-dM", "-E", fakeIn.fileName()}});
@@ -86,7 +86,7 @@ static HeaderPaths dumpHeaderPaths(const FilePath &compiler, const Environment &
if (!compiler.exists())
return {};
- QtcProcess cpp;
+ Process cpp;
cpp.setEnvironment(env);
cpp.setTimeoutS(10);
cpp.setCommand({compiler, {compilerTargetFlag(abi), "--print-search-dirs"}});
diff --git a/src/plugins/beautifier/abstractsettings.cpp b/src/plugins/beautifier/abstractsettings.cpp
index 0b96e1579e..17e36d279c 100644
--- a/src/plugins/beautifier/abstractsettings.cpp
+++ b/src/plugins/beautifier/abstractsettings.cpp
@@ -34,7 +34,7 @@ class VersionUpdater
public:
VersionUpdater()
{
- QObject::connect(&m_process, &QtcProcess::done, &m_process, [this] {
+ QObject::connect(&m_process, &Process::done, &m_process, [this] {
if (m_process.result() != ProcessResult::FinishedWithSuccess)
return;
@@ -77,7 +77,7 @@ private:
}
QRegularExpression m_versionRegExp;
- mutable QtcProcess m_process;
+ mutable Process m_process;
QVersionNumber m_versionNumber;
};
diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
index 1cff800ed1..b7d54de96f 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
@@ -112,7 +112,7 @@ QString ArtisticStyleSettings::documentationFilePath() const
void ArtisticStyleSettings::createDocumentationFile() const
{
- QtcProcess process;
+ Process process;
process.setTimeoutS(2);
process.setCommand({command(), {"-h"}});
process.runBlocking();
diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp
index e827a8f791..243d63e049 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp
@@ -124,7 +124,7 @@ QString UncrustifySettings::documentationFilePath() const
void UncrustifySettings::createDocumentationFile() const
{
- QtcProcess process;
+ Process process;
process.setTimeoutS(2);
process.setCommand({command(), {"--show-config"}});
process.runBlocking();
diff --git a/src/plugins/boot2qt/device-detection/qdbwatcher.cpp b/src/plugins/boot2qt/device-detection/qdbwatcher.cpp
index 3375e10e02..8a18a3b5ac 100644
--- a/src/plugins/boot2qt/device-detection/qdbwatcher.cpp
+++ b/src/plugins/boot2qt/device-detection/qdbwatcher.cpp
@@ -118,7 +118,7 @@ void QdbWatcher::forkHostServer()
showMessage(message, true);
return;
}
- if (Utils::QtcProcess::startDetached({qdbFilePath, {"server"}}))
+ if (Utils::Process::startDetached({qdbFilePath, {"server"}}))
showMessage(Tr::tr("QDB host server started."), false);
else
showMessage(Tr::tr("Could not start QDB host server in %1").arg(qdbFilePath.toString()), true);
diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp
index c2c25b6537..dd767fbc7c 100644
--- a/src/plugins/boot2qt/qdbdevice.cpp
+++ b/src/plugins/boot2qt/qdbdevice.cpp
@@ -50,7 +50,7 @@ class DeviceApplicationObserver : public QObject
public:
DeviceApplicationObserver(const IDevice::ConstPtr &device, const CommandLine &command)
{
- connect(&m_appRunner, &QtcProcess::done, this, &DeviceApplicationObserver::handleDone);
+ connect(&m_appRunner, &Process::done, this, &DeviceApplicationObserver::handleDone);
QTC_ASSERT(device, return);
m_deviceName = device->displayName();
@@ -94,7 +94,7 @@ private:
deleteLater();
}
- QtcProcess m_appRunner;
+ Process m_appRunner;
QString m_deviceName;
};
diff --git a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
index 97529dfa9f..0aa4f74362 100644
--- a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
+++ b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
@@ -34,13 +34,13 @@ public:
{
setId("QdbDebuggeeRunner");
- connect(&m_launcher, &QtcProcess::started, this, &RunWorker::reportStarted);
- connect(&m_launcher, &QtcProcess::done, this, &RunWorker::reportStopped);
+ connect(&m_launcher, &Process::started, this, &RunWorker::reportStarted);
+ connect(&m_launcher, &Process::done, this, &RunWorker::reportStopped);
- connect(&m_launcher, &QtcProcess::readyReadStandardOutput, this, [this] {
+ connect(&m_launcher, &Process::readyReadStandardOutput, this, [this] {
appendMessage(m_launcher.readAllStandardOutput(), StdOutFormat);
});
- connect(&m_launcher, &QtcProcess::readyReadStandardError, this, [this] {
+ connect(&m_launcher, &Process::readyReadStandardError, this, [this] {
appendMessage(m_launcher.readAllStandardError(), StdErrFormat);
});
@@ -112,7 +112,7 @@ private:
bool m_useGdbServer;
bool m_useQmlServer;
QmlDebug::QmlDebugServicesPreset m_qmlServices;
- QtcProcess m_launcher;
+ Process m_launcher;
};
// QdbDeviceRunSupport
diff --git a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
index 8442fd0346..b99d264066 100644
--- a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
+++ b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
@@ -42,7 +42,7 @@ public:
private:
Group deployRecipe() final
{
- const auto setupHandler = [this](QtcProcess &process) {
+ const auto setupHandler = [this](Process &process) {
QString remoteExe;
if (RunConfiguration *rc = target()->activeRunConfiguration()) {
if (auto exeAspect = rc->aspect<ExecutableAspect>())
@@ -54,18 +54,18 @@ private:
else
cmd.addArg("--remove-default");
process.setCommand(cmd);
- QtcProcess *proc = &process;
- connect(proc, &QtcProcess::readyReadStandardError, this, [this, proc] {
+ Process *proc = &process;
+ connect(proc, &Process::readyReadStandardError, this, [this, proc] {
handleStdErrData(proc->readAllStandardError());
});
};
- const auto doneHandler = [this](const QtcProcess &) {
+ const auto doneHandler = [this](const Process &) {
if (m_makeDefault)
addProgressMessage(Tr::tr("Application set as the default one."));
else
addProgressMessage(Tr::tr("Reset the default application."));
};
- const auto errorHandler = [this](const QtcProcess &process) {
+ const auto errorHandler = [this](const Process &process) {
addErrorMessage(Tr::tr("Remote process failed: %1").arg(process.errorString()));
};
return Group { ProcessTask(setupHandler, doneHandler, errorHandler) };
diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index 66196e246b..6ce706e3c1 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -49,9 +49,9 @@ static void startFlashingWizard()
{
const FilePath filePath = flashWizardFilePath();
if (HostOsInfo::isWindowsHost()) {
- if (QtcProcess::startDetached({"explorer.exe", {filePath.toUserOutput()}}))
+ if (Process::startDetached({"explorer.exe", {filePath.toUserOutput()}}))
return;
- } else if (QtcProcess::startDetached({filePath, {}})) {
+ } else if (Process::startDetached({filePath, {}})) {
return;
}
const QString message = Tr::tr("Flash wizard \"%1\" failed to start.");
diff --git a/src/plugins/boot2qt/qdbstopapplicationstep.cpp b/src/plugins/boot2qt/qdbstopapplicationstep.cpp
index deeb535576..a9fd0fb220 100644
--- a/src/plugins/boot2qt/qdbstopapplicationstep.cpp
+++ b/src/plugins/boot2qt/qdbstopapplicationstep.cpp
@@ -39,7 +39,7 @@ public:
Group QdbStopApplicationStep::deployRecipe()
{
- const auto setupHandler = [this](QtcProcess &process) {
+ const auto setupHandler = [this](Process &process) {
const auto device = DeviceKitAspect::device(target()->kit());
if (!device) {
addErrorMessage(Tr::tr("No device to stop the application on."));
@@ -48,16 +48,16 @@ Group QdbStopApplicationStep::deployRecipe()
QTC_CHECK(device);
process.setCommand({device->filePath(Constants::AppcontrollerFilepath), {"--stop"}});
process.setWorkingDirectory("/usr/bin");
- QtcProcess *proc = &process;
- connect(proc, &QtcProcess::readyReadStandardOutput, this, [this, proc] {
+ Process *proc = &process;
+ connect(proc, &Process::readyReadStandardOutput, this, [this, proc] {
handleStdOutData(proc->readAllStandardOutput());
});
return TaskAction::Continue;
};
- const auto doneHandler = [this](const QtcProcess &) {
+ const auto doneHandler = [this](const Process &) {
addProgressMessage(Tr::tr("Stopped the running application."));
};
- const auto errorHandler = [this](const QtcProcess &process) {
+ const auto errorHandler = [this](const Process &process) {
const QString errorOutput = process.cleanedStdErr();
const QString failureMessage = Tr::tr("Could not check and possibly stop running application.");
if (process.exitStatus() == QProcess::CrashExit) {
diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp
index 5866bcae94..7c71acceb9 100644
--- a/src/plugins/clangtools/clangtoolrunner.cpp
+++ b/src/plugins/clangtools/clangtoolrunner.cpp
@@ -141,7 +141,7 @@ TaskItem clangToolTask(const AnalyzeInputData &input,
return TaskAction::Continue;
};
- const auto onProcessSetup = [=](QtcProcess &process) {
+ const auto onProcessSetup = [=](Process &process) {
process.setEnvironment(input.environment);
process.setUseCtrlCStub(true);
process.setLowPriority();
@@ -158,13 +158,13 @@ TaskItem clangToolTask(const AnalyzeInputData &input,
qCDebug(LOG).noquote() << "Starting" << commandLine.toUserOutput();
process.setCommand(commandLine);
};
- const auto onProcessDone = [=](const QtcProcess &process) {
+ const auto onProcessDone = [=](const Process &process) {
qCDebug(LOG).noquote() << "Output:\n" << process.cleanedStdOut();
if (!outputHandler)
return;
outputHandler({true, input.unit.file, storage->outputFilePath, input.tool});
};
- const auto onProcessError = [=](const QtcProcess &process) {
+ const auto onProcessError = [=](const Process &process) {
if (!outputHandler)
return;
const QString details = Tr::tr("Command line: %1\nProcess Error: %2\nOutput:\n%3")
diff --git a/src/plugins/clangtools/clangtoolsutils.cpp b/src/plugins/clangtools/clangtoolsutils.cpp
index 72f8086be1..6b5e373daa 100644
--- a/src/plugins/clangtools/clangtoolsutils.cpp
+++ b/src/plugins/clangtools/clangtoolsutils.cpp
@@ -211,7 +211,7 @@ bool isVFSOverlaySupported(const FilePath &executable)
static QMap<FilePath, bool> vfsCapabilities;
auto it = vfsCapabilities.find(executable);
if (it == vfsCapabilities.end()) {
- QtcProcess p;
+ Process p;
p.setCommand({executable, {"--help"}});
p.runBlocking();
it = vfsCapabilities.insert(executable, p.allOutput().contains("vfsoverlay"));
diff --git a/src/plugins/clangtools/executableinfo.cpp b/src/plugins/clangtools/executableinfo.cpp
index 1e280a6889..0b5d649cf5 100644
--- a/src/plugins/clangtools/executableinfo.cpp
+++ b/src/plugins/clangtools/executableinfo.cpp
@@ -26,7 +26,7 @@ static QString runExecutable(const Utils::CommandLine &commandLine, QueryFailMod
if (commandLine.executable().isEmpty() || !commandLine.executable().toFileInfo().isExecutable())
return {};
- QtcProcess cpp;
+ Process cpp;
Environment env = Environment::systemEnvironment();
env.setupEnglishOutput();
cpp.setEnvironment(env);
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index c269a59138..f32e502c1b 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -1575,7 +1575,7 @@ CommandResult ClearCasePluginPrivate::runCleartoolProc(const FilePath &workingDi
if (m_settings.ccBinaryPath.isEmpty())
return CommandResult(ProcessResult::StartFailed, Tr::tr("No ClearCase executable specified."));
- QtcProcess process;
+ Process process;
Environment env = Environment::systemEnvironment();
VcsBase::setProcessEnvironment(&env);
process.setEnvironment(env);
@@ -2233,7 +2233,7 @@ void ClearCasePluginPrivate::diffGraphical(const QString &file1, const QString &
args << file1;
if (!pred)
args << file2;
- QtcProcess::startDetached({m_settings.ccBinaryPath, args}, m_topLevel);
+ Process::startDetached({m_settings.ccBinaryPath, args}, m_topLevel);
}
QString ClearCasePluginPrivate::runExtDiff(const FilePath &workingDir, const QStringList &arguments,
@@ -2243,7 +2243,7 @@ QString ClearCasePluginPrivate::runExtDiff(const FilePath &workingDir, const QSt
diff.addArgs(m_settings.diffArgs.split(' ', Qt::SkipEmptyParts));
diff.addArgs(arguments);
- QtcProcess process;
+ Process process;
process.setTimeoutS(timeOutS);
process.setWorkingDirectory(workingDir);
process.setCodec(outputCodec ? outputCodec : QTextCodec::codecForName("UTF-8"));
diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp
index 90dad2b988..82e1b7571d 100644
--- a/src/plugins/clearcase/clearcasesync.cpp
+++ b/src/plugins/clearcase/clearcasesync.cpp
@@ -29,7 +29,7 @@ static void runProcess(QPromise<void> &promise, const ClearCaseSettings &setting
std::function<void(const QString &buffer, int processed)> processLine)
{
const QString viewRoot = ClearCasePlugin::viewData().root;
- QtcProcess process;
+ Process process;
process.setWorkingDirectory(FilePath::fromString(viewRoot));
process.setCommand({settings.ccBinaryPath, args});
process.start();
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 805f84f7c2..146c2f853c 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -1257,11 +1257,11 @@ void CMakeBuildSystem::runCTest()
QTC_ASSERT(parameters.isValid(), return);
ensureBuildDirectory(parameters);
- m_ctestProcess.reset(new QtcProcess);
+ m_ctestProcess.reset(new Process);
m_ctestProcess->setEnvironment(buildConfiguration()->environment());
m_ctestProcess->setWorkingDirectory(parameters.buildDirectory);
m_ctestProcess->setCommand({m_ctestPath, { "-N", "--show-only=json-v1"}});
- connect(m_ctestProcess.get(), &QtcProcess::done, this, [this] {
+ connect(m_ctestProcess.get(), &Process::done, this, [this] {
if (m_ctestProcess->result() == ProcessResult::FinishedWithSuccess) {
const QJsonDocument json
= QJsonDocument::fromJson(m_ctestProcess->readAllRawStandardOutput());
@@ -1735,12 +1735,12 @@ void CMakeBuildSystem::runGenerator(Id id)
optionsAspect && !optionsAspect->value().isEmpty()) {
cmdLine.addArgs(optionsAspect->value(), CommandLine::Raw);
}
- const auto proc = new QtcProcess(this);
- connect(proc, &QtcProcess::done, proc, &QtcProcess::deleteLater);
- connect(proc, &QtcProcess::readyReadStandardOutput, this, [proc] {
+ const auto proc = new Process(this);
+ connect(proc, &Process::done, proc, &Process::deleteLater);
+ connect(proc, &Process::readyReadStandardOutput, this, [proc] {
Core::MessageManager::writeFlashing(QString::fromLocal8Bit(proc->readAllRawStandardOutput()));
});
- connect(proc, &QtcProcess::readyReadStandardError, this, [proc] {
+ connect(proc, &Process::readyReadStandardError, this, [proc] {
Core::MessageManager::writeDisrupting(QString::fromLocal8Bit(proc->readAllRawStandardError()));
});
proc->setWorkingDirectory(outDir);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.h b/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
index b36b85d98f..4770b4d84b 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
@@ -18,7 +18,7 @@ namespace ProjectExplorer {
class ExtraCompiler;
class FolderNode;
}
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace CMakeProjectManager {
@@ -233,7 +233,7 @@ private:
// CTest integration
Utils::FilePath m_ctestPath;
- std::unique_ptr<Utils::QtcProcess> m_ctestProcess;
+ std::unique_ptr<Utils::Process> m_ctestProcess;
QList<ProjectExplorer::TestCaseInfo> m_testNames;
CMakeConfig m_configurationFromCMake;
diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
index 2e2e221ba4..6b8270db6c 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
@@ -106,7 +106,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
// Always use the sourceDir: If we are triggered because the build directory is getting deleted
// then we are racing against CMakeCache.txt also getting deleted.
- m_process.reset(new QtcProcess);
+ m_process.reset(new Process);
m_process->setWorkingDirectory(buildDirectory);
m_process->setEnvironment(parameters.environment);
@@ -120,7 +120,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
BuildSystem::appendBuildSystemOutput(stripTrailingNewline(s));
});
- connect(m_process.get(), &QtcProcess::done, this, [this] {
+ connect(m_process.get(), &Process::done, this, [this] {
handleProcessDone(m_process->resultData());
});
diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.h b/src/plugins/cmakeprojectmanager/cmakeprocess.h
index d13b0efabe..bb365d337c 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprocess.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprocess.h
@@ -13,7 +13,7 @@
namespace Utils {
class ProcessResultData;
-class QtcProcess;
+class Process;
}
namespace CMakeProjectManager::Internal {
@@ -37,7 +37,7 @@ signals:
private:
void handleProcessDone(const Utils::ProcessResultData &resultData);
- std::unique_ptr<Utils::QtcProcess> m_process;
+ std::unique_ptr<Utils::Process> m_process;
Utils::OutputFormatter m_parser;
QElapsedTimer m_elapsed;
};
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
index 8210eb2192..52da1adc8a 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
@@ -164,7 +164,7 @@ static CMakeConfig configurationFromPresetProbe(
"project(preset-probe)\n"
"\n"));
- QtcProcess cmake;
+ Process cmake;
cmake.setTimeoutS(30);
cmake.setDisableUnixTerminal();
@@ -341,7 +341,7 @@ static QMakeAndCMakePrefixPath qtInfoFromCMakeCache(const CMakeConfig &config,
file(WRITE "${CMAKE_SOURCE_DIR}/cmake-prefix-path.txt" "${CMAKE_PREFIX_PATH}")
)"));
- QtcProcess cmake;
+ Process cmake;
cmake.setTimeoutS(5);
cmake.setDisableUnixTerminal();
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp
index 184811884d..eae44c1563 100644
--- a/src/plugins/cmakeprojectmanager/cmaketool.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp
@@ -162,7 +162,7 @@ bool CMakeTool::isValid() const
return m_introspection->m_didRun && !m_introspection->m_fileApis.isEmpty();
}
-void CMakeTool::runCMake(QtcProcess &cmake, const QStringList &args, int timeoutS) const
+void CMakeTool::runCMake(Process &cmake, const QStringList &args, int timeoutS) const
{
const FilePath executable = cmakeExecutable();
cmake.setTimeoutS(timeoutS);
@@ -248,7 +248,7 @@ TextEditor::Keywords CMakeTool::keywords()
return {};
if (m_introspection->m_functions.isEmpty() && m_introspection->m_didRun) {
- QtcProcess proc;
+ Process proc;
runCMake(proc, {"--help-command-list"}, 5);
if (proc.result() == ProcessResult::FinishedWithSuccess)
m_introspection->m_functions = proc.cleanedStdOut().split('\n');
@@ -492,7 +492,7 @@ QStringList CMakeTool::parseVariableOutput(const QString &output)
void CMakeTool::fetchFromCapabilities() const
{
- QtcProcess cmake;
+ Process cmake;
runCMake(cmake, {"-E", "capabilities"});
if (cmake.result() == ProcessResult::FinishedWithSuccess) {
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.h b/src/plugins/cmakeprojectmanager/cmaketool.h
index 42fa7b8f62..9d704b5724 100644
--- a/src/plugins/cmakeprojectmanager/cmaketool.h
+++ b/src/plugins/cmakeprojectmanager/cmaketool.h
@@ -12,7 +12,7 @@
#include <optional>
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace CMakeProjectManager {
@@ -95,7 +95,7 @@ public:
private:
void readInformation() const;
- void runCMake(Utils::QtcProcess &proc, const QStringList &args, int timeoutS = 1) const;
+ void runCMake(Utils::Process &proc, const QStringList &args, int timeoutS = 1) const;
void parseFunctionDetailsOutput(const QString &output);
QStringList parseVariableOutput(const QString &output);
diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp
index 0c0b1d8926..14e4d51120 100644
--- a/src/plugins/coreplugin/externaltool.cpp
+++ b/src/plugins/coreplugin/externaltool.cpp
@@ -623,11 +623,11 @@ void ExternalToolRunner::run()
DocumentManager::expectFileChange(m_expectedFilePath);
}
}
- m_process = new QtcProcess(this);
- connect(m_process, &QtcProcess::done, this, &ExternalToolRunner::done);
- connect(m_process, &QtcProcess::readyReadStandardOutput,
+ m_process = new Process(this);
+ connect(m_process, &Process::done, this, &ExternalToolRunner::done);
+ connect(m_process, &Process::readyReadStandardOutput,
this, &ExternalToolRunner::readStandardOutput);
- connect(m_process, &QtcProcess::readyReadStandardError,
+ connect(m_process, &Process::readyReadStandardError,
this, &ExternalToolRunner::readStandardError);
if (!m_resolvedWorkingDirectory.isEmpty())
m_process->setWorkingDirectory(m_resolvedWorkingDirectory);
diff --git a/src/plugins/coreplugin/externaltool.h b/src/plugins/coreplugin/externaltool.h
index 8a32d24165..d92d6099bc 100644
--- a/src/plugins/coreplugin/externaltool.h
+++ b/src/plugins/coreplugin/externaltool.h
@@ -14,7 +14,7 @@
#include <QTextCodec>
#include <QMetaType>
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace Core {
@@ -127,7 +127,7 @@ private:
QString m_resolvedInput;
Utils::FilePath m_resolvedWorkingDirectory;
Utils::Environment m_resolvedEnvironment;
- Utils::QtcProcess *m_process;
+ Utils::Process *m_process;
QTextCodec *m_outputCodec;
QTextCodec::ConverterState m_outputCodecState;
QTextCodec::ConverterState m_errorCodecState;
diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp
index c98d5269f1..3297598620 100644
--- a/src/plugins/coreplugin/fileutils.cpp
+++ b/src/plugins/coreplugin/fileutils.cpp
@@ -68,9 +68,9 @@ void FileUtils::showInGraphicalShell(QWidget *parent, const FilePath &pathIn)
if (!pathIn.isDir())
param += QLatin1String("/select,");
param += QDir::toNativeSeparators(fileInfo.canonicalFilePath());
- QtcProcess::startDetached({explorer, param});
+ Process::startDetached({explorer, param});
} else if (HostOsInfo::isMacHost()) {
- QtcProcess::startDetached({"/usr/bin/open", {"-R", fileInfo.canonicalFilePath()}});
+ Process::startDetached({"/usr/bin/open", {"-R", fileInfo.canonicalFilePath()}});
} else {
// we cannot select a file here, because no file browser really supports it...
const QString folder = fileInfo.isDir() ? fileInfo.absoluteFilePath() : fileInfo.filePath();
diff --git a/src/plugins/coreplugin/locator/executefilter.cpp b/src/plugins/coreplugin/locator/executefilter.cpp
index 3419c117ad..43b4d9a378 100644
--- a/src/plugins/coreplugin/locator/executefilter.cpp
+++ b/src/plugins/coreplugin/locator/executefilter.cpp
@@ -196,11 +196,11 @@ void ExecuteFilter::createProcess()
if (m_process)
return;
- m_process = new QtcProcess;
+ m_process = new Process;
m_process->setEnvironment(Environment::systemEnvironment());
- connect(m_process, &QtcProcess::done, this, &ExecuteFilter::done);
- connect(m_process, &QtcProcess::readyReadStandardOutput, this, &ExecuteFilter::readStandardOutput);
- connect(m_process, &QtcProcess::readyReadStandardError, this, &ExecuteFilter::readStandardError);
+ connect(m_process, &Process::done, this, &ExecuteFilter::done);
+ connect(m_process, &Process::readyReadStandardOutput, this, &ExecuteFilter::readStandardOutput);
+ connect(m_process, &Process::readyReadStandardError, this, &ExecuteFilter::readStandardError);
}
void ExecuteFilter::removeProcess()
diff --git a/src/plugins/coreplugin/locator/executefilter.h b/src/plugins/coreplugin/locator/executefilter.h
index 525c725028..348a09c7fe 100644
--- a/src/plugins/coreplugin/locator/executefilter.h
+++ b/src/plugins/coreplugin/locator/executefilter.h
@@ -11,7 +11,7 @@
#include <QStringList>
#include <QTextCodec>
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace Core {
namespace Internal {
@@ -49,7 +49,7 @@ private:
QQueue<ExecuteData> m_taskQueue;
QStringList m_commandHistory;
- Utils::QtcProcess *m_process = nullptr;
+ Utils::Process *m_process = nullptr;
QTextCodec::ConverterState m_stdoutState;
QTextCodec::ConverterState m_stderrState;
};
diff --git a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp
index ac1d698a25..759b56fb26 100644
--- a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp
@@ -53,7 +53,7 @@ public:
private:
void ensureNext();
- std::unique_ptr<QtcProcess> m_process;
+ std::unique_ptr<Process> m_process;
QMutex m_mutex;
QWaitCondition m_waitForItems;
FilePaths m_queue;
@@ -67,10 +67,10 @@ SpotlightIterator::SpotlightIterator(const CommandLine &command)
, m_finished(false)
{
QTC_ASSERT(!command.isEmpty(), return );
- m_process.reset(new QtcProcess);
+ m_process.reset(new Process);
m_process->setCommand(command);
m_process->setEnvironment(Utils::Environment::systemEnvironment());
- QObject::connect(m_process.get(), &QtcProcess::done,
+ QObject::connect(m_process.get(), &Process::done,
m_process.get(), [this, exe = command.executable().toUserOutput()] {
if (m_process->result() != ProcessResult::FinishedWithSuccess) {
MessageManager::writeFlashing(Tr::tr(
@@ -78,7 +78,7 @@ SpotlightIterator::SpotlightIterator(const CommandLine &command)
}
scheduleKillProcess();
});
- QObject::connect(m_process.get(), &QtcProcess::readyReadStandardOutput,
+ QObject::connect(m_process.get(), &Process::readyReadStandardOutput,
m_process.get(), [this] {
QString output = m_process->readAllStandardOutput();
output.replace("\r\n", "\n");
@@ -250,11 +250,11 @@ static void matches(QPromise<void> &promise, const LocatorStorage &storage,
const bool hasPathSeparator = newInput.contains('/') || newInput.contains('*');
LocatorFileCache::MatchedEntries entries = {};
QEventLoop loop;
- QtcProcess process;
+ Process process;
process.setCommand(command);
process.setEnvironment(Environment::systemEnvironment()); // TODO: Is it needed?
- QObject::connect(&process, &QtcProcess::readyReadStandardOutput, &process,
+ QObject::connect(&process, &Process::readyReadStandardOutput, &process,
[&, entriesPtr = &entries] {
QString output = process.readAllStandardOutput();
output.replace("\r\n", "\n");
@@ -265,7 +265,7 @@ static void matches(QPromise<void> &promise, const LocatorStorage &storage,
if (promise.isCanceled())
loop.exit();
});
- QObject::connect(&process, &QtcProcess::done, &process, [&] {
+ QObject::connect(&process, &Process::done, &process, [&] {
if (process.result() != ProcessResult::FinishedWithSuccess) {
MessageManager::writeFlashing(Tr::tr("Locator: Error occurred when running \"%1\".")
.arg(command.executable().toUserOutput()));
diff --git a/src/plugins/coreplugin/patchtool.cpp b/src/plugins/coreplugin/patchtool.cpp
index 9af0835380..06b20610f1 100644
--- a/src/plugins/coreplugin/patchtool.cpp
+++ b/src/plugins/coreplugin/patchtool.cpp
@@ -76,7 +76,7 @@ static bool runPatchHelper(const QByteArray &input, const FilePath &workingDirec
return false;
}
- QtcProcess patchProcess;
+ Process patchProcess;
if (!workingDirectory.isEmpty())
patchProcess.setWorkingDirectory(workingDirectory);
Environment env = Environment::systemEnvironment();
diff --git a/src/plugins/coreplugin/plugininstallwizard.cpp b/src/plugins/coreplugin/plugininstallwizard.cpp
index 224f692329..503ab2d379 100644
--- a/src/plugins/coreplugin/plugininstallwizard.cpp
+++ b/src/plugins/coreplugin/plugininstallwizard.cpp
@@ -403,7 +403,7 @@ static std::function<void(FilePath)> postCopyOperation()
return;
// On macOS, downloaded files get a quarantine flag, remove it, otherwise it is a hassle
// to get it loaded as a plugin in Qt Creator.
- QtcProcess xattr;
+ Process xattr;
xattr.setTimeoutS(1);
xattr.setCommand({"/usr/bin/xattr", {"-d", "com.apple.quarantine", filePath.absoluteFilePath().toString()}});
xattr.runBlocking();
diff --git a/src/plugins/coreplugin/progressmanager/processprogress.cpp b/src/plugins/coreplugin/progressmanager/processprogress.cpp
index 9a545561a7..2895b402a5 100644
--- a/src/plugins/coreplugin/progressmanager/processprogress.cpp
+++ b/src/plugins/coreplugin/progressmanager/processprogress.cpp
@@ -18,13 +18,13 @@ namespace Core {
class ProcessProgressPrivate : public QObject
{
public:
- explicit ProcessProgressPrivate(ProcessProgress *progress, QtcProcess *process);
+ explicit ProcessProgressPrivate(ProcessProgress *progress, Process *process);
~ProcessProgressPrivate();
QString displayName() const;
void parseProgress(const QString &inputText);
- QtcProcess *m_process = nullptr;
+ Process *m_process = nullptr;
ProgressParser m_parser = {};
QFutureWatcher<void> m_watcher;
QFutureInterface<void> m_futureInterface;
@@ -33,7 +33,7 @@ public:
FutureProgress::KeepOnFinishType m_keep = FutureProgress::HideOnFinish;
};
-ProcessProgressPrivate::ProcessProgressPrivate(ProcessProgress *progress, QtcProcess *process)
+ProcessProgressPrivate::ProcessProgressPrivate(ProcessProgress *progress, Process *process)
: QObject(progress)
, m_process(process)
{
@@ -77,14 +77,14 @@ void ProcessProgressPrivate::parseProgress(const QString &inputText)
indicator on progress panel. In this case QtcProcess::stop() method is being called.
*/
-ProcessProgress::ProcessProgress(QtcProcess *process)
+ProcessProgress::ProcessProgress(Process *process)
: QObject(process)
, d(new ProcessProgressPrivate(this, process))
{
connect(&d->m_watcher, &QFutureWatcher<void>::canceled, this, [this] {
d->m_process->stop(); // TODO: See TaskProgress::setAutoStopOnCancel
});
- connect(d->m_process, &QtcProcess::starting, this, [this] {
+ connect(d->m_process, &Process::starting, this, [this] {
d->m_futureInterface = QFutureInterface<void>();
d->m_futureInterface.setProgressRange(0, 1);
d->m_watcher.setFuture(d->m_futureInterface.future());
@@ -100,7 +100,7 @@ ProcessProgress::ProcessProgress(QtcProcess *process)
}
d->m_futureProgress->setKeepOnFinish(d->m_keep);
});
- connect(d->m_process, &QtcProcess::done, this, [this] {
+ connect(d->m_process, &Process::done, this, [this] {
if (d->m_process->result() != ProcessResult::FinishedWithSuccess)
d->m_futureInterface.reportCanceled();
d->m_futureInterface.reportFinished();
@@ -124,9 +124,9 @@ void ProcessProgress::setKeepOnFinish(FutureProgress::KeepOnFinishType keepType)
void ProcessProgress::setProgressParser(const ProgressParser &parser)
{
if (d->m_parser) {
- disconnect(d->m_process, &QtcProcess::textOnStandardOutput,
+ disconnect(d->m_process, &Process::textOnStandardOutput,
d.get(), &ProcessProgressPrivate::parseProgress);
- disconnect(d->m_process, &QtcProcess::textOnStandardError,
+ disconnect(d->m_process, &Process::textOnStandardError,
d.get(), &ProcessProgressPrivate::parseProgress);
}
d->m_parser = parser;
@@ -137,9 +137,9 @@ void ProcessProgress::setProgressParser(const ProgressParser &parser)
qWarning() << "Setting progress parser on a process without changing process' "
"text channel mode is no-op.");
- connect(d->m_process, &QtcProcess::textOnStandardOutput,
+ connect(d->m_process, &Process::textOnStandardOutput,
d.get(), &ProcessProgressPrivate::parseProgress);
- connect(d->m_process, &QtcProcess::textOnStandardError,
+ connect(d->m_process, &Process::textOnStandardError,
d.get(), &ProcessProgressPrivate::parseProgress);
}
diff --git a/src/plugins/coreplugin/progressmanager/processprogress.h b/src/plugins/coreplugin/progressmanager/processprogress.h
index fd2f64caf0..e91c0b7b3c 100644
--- a/src/plugins/coreplugin/progressmanager/processprogress.h
+++ b/src/plugins/coreplugin/progressmanager/processprogress.h
@@ -9,7 +9,7 @@
#include <QObject>
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace Core {
@@ -20,7 +20,7 @@ class ProcessProgressPrivate;
class CORE_EXPORT ProcessProgress : public QObject
{
public:
- ProcessProgress(Utils::QtcProcess *process); // Makes ProcessProgress a child of process
+ ProcessProgress(Utils::Process *process); // Makes ProcessProgress a child of process
~ProcessProgress() override;
void setDisplayName(const QString &name);
diff --git a/src/plugins/cppcheck/cppcheckrunner.cpp b/src/plugins/cppcheck/cppcheckrunner.cpp
index 8595eac28b..436c8ab392 100644
--- a/src/plugins/cppcheck/cppcheckrunner.cpp
+++ b/src/plugins/cppcheck/cppcheckrunner.cpp
@@ -16,7 +16,7 @@ namespace Cppcheck::Internal {
CppcheckRunner::CppcheckRunner(CppcheckTool &tool) : m_tool(tool)
{
if (HostOsInfo::hostOs() == OsTypeLinux) {
- QtcProcess getConf;
+ Process getConf;
getConf.setCommand({"getconf", {"ARG_MAX"}});
getConf.start();
getConf.waitForFinished(2000);
@@ -31,8 +31,8 @@ CppcheckRunner::CppcheckRunner(CppcheckTool &tool) : m_tool(tool)
m_tool.parseErrorLine(line);
});
- connect(&m_process, &QtcProcess::started, &m_tool, &CppcheckTool::startParsing);
- connect(&m_process, &QtcProcess::done, this, &CppcheckRunner::handleDone);
+ connect(&m_process, &Process::started, &m_tool, &CppcheckTool::startParsing);
+ connect(&m_process, &Process::done, this, &CppcheckRunner::handleDone);
m_queueTimer.setSingleShot(true);
const int checkDelayInMs = 200;
diff --git a/src/plugins/cppcheck/cppcheckrunner.h b/src/plugins/cppcheck/cppcheckrunner.h
index 23689b2b05..0ec49aceb5 100644
--- a/src/plugins/cppcheck/cppcheckrunner.h
+++ b/src/plugins/cppcheck/cppcheckrunner.h
@@ -35,7 +35,7 @@ private:
void handleDone();
CppcheckTool &m_tool;
- Utils::QtcProcess m_process;
+ Utils::Process m_process;
Utils::FilePath m_binary;
QString m_arguments;
QHash<QString, Utils::FilePaths> m_queue;
diff --git a/src/plugins/cppeditor/cppcodemodelsettings.cpp b/src/plugins/cppeditor/cppcodemodelsettings.cpp
index d04d6c70eb..679b368494 100644
--- a/src/plugins/cppeditor/cppcodemodelsettings.cpp
+++ b/src/plugins/cppeditor/cppcodemodelsettings.cpp
@@ -340,7 +340,7 @@ static FilePath getClangHeadersPathFromClang(const FilePath &clangdFilePath)
.withExecutableSuffix();
if (!clangFilePath.exists())
return {};
- QtcProcess clang;
+ Process clang;
clang.setCommand({clangFilePath, {"-print-resource-dir"}});
clang.start();
if (!clang.waitForFinished())
diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp
index bc67f432f1..21c75b7cbc 100644
--- a/src/plugins/cppeditor/cppmodelmanager.cpp
+++ b/src/plugins/cppeditor/cppmodelmanager.cpp
@@ -449,10 +449,10 @@ void CppModelManager::showPreprocessedFile(bool inNextSplit)
compilerArgs.append("/E");
compilerArgs.append(filePath.toUserOutput());
const CommandLine compilerCommandLine(tc->compilerCommand(), compilerArgs);
- const auto compiler = new QtcProcess(instance());
+ const auto compiler = new Process(instance());
compiler->setCommand(compilerCommandLine);
compiler->setEnvironment(project->activeTarget()->activeBuildConfiguration()->environment());
- connect(compiler, &QtcProcess::done, instance(), [compiler, outFilePath, inNextSplit,
+ connect(compiler, &Process::done, instance(), [compiler, outFilePath, inNextSplit,
useBuiltinPreprocessor, isMsvc] {
compiler->deleteLater();
if (compiler->result() != ProcessResult::FinishedWithSuccess) {
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 5d5b828712..ade37ae8ec 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -182,8 +182,8 @@ CdbEngine::CdbEngine() :
DebuggerSettings *s = debuggerSettings();
connect(s->createFullBacktrace.action(), &QAction::triggered,
this, &CdbEngine::createFullBacktrace);
- connect(&m_process, &QtcProcess::started, this, &CdbEngine::processStarted);
- connect(&m_process, &QtcProcess::done, this, &CdbEngine::processDone);
+ connect(&m_process, &Process::started, this, &CdbEngine::processStarted);
+ connect(&m_process, &Process::done, this, &CdbEngine::processDone);
m_process.setStdOutLineCallback([this](const QString &line) { parseOutputLine(line); });
m_process.setStdErrLineCallback([this](const QString &line) { parseOutputLine(line); });
connect(&s->useDebuggingHelpers, &BaseAspect::changed,
diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h
index f0c098e415..0fba6708e9 100644
--- a/src/plugins/debugger/cdb/cdbengine.h
+++ b/src/plugins/debugger/cdb/cdbengine.h
@@ -174,7 +174,7 @@ private:
const QString m_tokenPrefix;
void handleSetupFailure(const QString &errorMessage);
- Utils::QtcProcess m_process;
+ Utils::Process m_process;
DebuggerStartMode m_effectiveStartMode = NoStartMode;
//! Debugger accessible (expecting commands)
bool m_accessible = false;
diff --git a/src/plugins/debugger/dap/dapengine.cpp b/src/plugins/debugger/dap/dapengine.cpp
index 4b1a119873..ed0933008e 100644
--- a/src/plugins/debugger/dap/dapengine.cpp
+++ b/src/plugins/debugger/dap/dapengine.cpp
@@ -112,10 +112,10 @@ void DapEngine::setupEngine()
{
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
- connect(&m_proc, &QtcProcess::started, this, &DapEngine::handleDabStarted);
- connect(&m_proc, &QtcProcess::done, this, &DapEngine::handleDapDone);
- connect(&m_proc, &QtcProcess::readyReadStandardOutput, this, &DapEngine::readDapStandardOutput);
- connect(&m_proc, &QtcProcess::readyReadStandardError, this, &DapEngine::readDapStandardError);
+ connect(&m_proc, &Process::started, this, &DapEngine::handleDabStarted);
+ connect(&m_proc, &Process::done, this, &DapEngine::handleDapDone);
+ connect(&m_proc, &Process::readyReadStandardOutput, this, &DapEngine::readDapStandardOutput);
+ connect(&m_proc, &Process::readyReadStandardError, this, &DapEngine::readDapStandardError);
const DebuggerRunParameters &rp = runParameters();
const CommandLine cmd{rp.debugger.command.executable(), {"-i", "dap"}};
diff --git a/src/plugins/debugger/dap/dapengine.h b/src/plugins/debugger/dap/dapengine.h
index d4dca0d2f7..9b554d668b 100644
--- a/src/plugins/debugger/dap/dapengine.h
+++ b/src/plugins/debugger/dap/dapengine.h
@@ -91,7 +91,7 @@ private:
void updateLocals() override;
QByteArray m_inbuffer;
- Utils::QtcProcess m_proc;
+ Utils::Process m_proc;
int m_nextBreakpointId = 1;
};
diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp
index a6daacd16d..76630f2e7d 100644
--- a/src/plugins/debugger/debuggeritem.cpp
+++ b/src/plugins/debugger/debuggeritem.cpp
@@ -43,7 +43,7 @@ const char DEBUGGER_INFORMATION_WORKINGDIRECTORY[] = "WorkingDirectory";
static QString getGdbConfiguration(const FilePath &command, const Environment &sysEnv)
{
// run gdb with the --configuration opion
- QtcProcess proc;
+ Process proc;
proc.setEnvironment(sysEnv);
proc.setCommand({command, {"--configuration"}});
proc.runBlocking();
@@ -162,7 +162,7 @@ void DebuggerItem::reinitializeFromFile(QString *error, Utils::Environment *cust
// hack below tricks it into giving us the information we want.
env.set("QNX_TARGET", QString());
- QtcProcess proc;
+ Process proc;
proc.setEnvironment(env);
proc.setCommand({m_command, {version}});
proc.runBlocking();
diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp
index ab1f53076d..f418ace88e 100644
--- a/src/plugins/debugger/debuggeritemmanager.cpp
+++ b/src/plugins/debugger/debuggeritemmanager.cpp
@@ -762,7 +762,7 @@ void DebuggerItemManagerPrivate::autoDetectGdbOrLldbDebuggers(const FilePaths &s
FilePaths suspects;
if (searchPaths.front().osType() == OsTypeMac) {
- QtcProcess proc;
+ Process proc;
proc.setTimeoutS(2);
proc.setCommand({"xcrun", {"--find", "lldb"}});
proc.runBlocking();
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 85b48880fe..5e5da91df6 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -109,7 +109,7 @@ private:
}
m_coreUnpackProcess.setWorkingDirectory(TemporaryDirectory::masterDirectoryFilePath());
- connect(&m_coreUnpackProcess, &QtcProcess::done, this, [this] {
+ connect(&m_coreUnpackProcess, &Process::done, this, [this] {
if (m_coreUnpackProcess.error() == QProcess::UnknownError) {
reportStopped();
return;
@@ -132,7 +132,7 @@ private:
appendMessage(msg.arg(m_tempCoreFilePath.toUserOutput()), LogMessageFormat);
m_tempCoreFile.setFileName(m_tempCoreFilePath.path());
m_tempCoreFile.open(QFile::WriteOnly);
- connect(&m_coreUnpackProcess, &QtcProcess::readyReadStandardOutput, this, [this] {
+ connect(&m_coreUnpackProcess, &Process::readyReadStandardOutput, this, [this] {
m_tempCoreFile.write(m_coreUnpackProcess.readAllRawStandardOutput());
});
m_coreUnpackProcess.setCommand({"gzip", {"-c", "-d", m_coreFilePath.path()}});
@@ -148,7 +148,7 @@ private:
QFile m_tempCoreFile;
FilePath m_coreFilePath;
FilePath m_tempCoreFilePath;
- QtcProcess m_coreUnpackProcess;
+ Process m_coreUnpackProcess;
};
class DebuggerRunToolPrivate
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
index 276d0c685f..db5d8698de 100644
--- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
+++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
@@ -420,7 +420,7 @@ static QString findQtInstallPath(const FilePath &qmakePath)
{
if (qmakePath.isEmpty())
return QString();
- QtcProcess proc;
+ Process proc;
proc.setCommand({qmakePath, {"-query", "QT_INSTALL_HEADERS"}});
proc.start();
if (!proc.waitForFinished()) {
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index d02b356a95..6068294e40 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -146,13 +146,13 @@ GdbEngine::GdbEngine()
connect(&s.useDynamicType, &BaseAspect::changed,
this, &GdbEngine::reloadLocals);
- connect(&m_gdbProc, &QtcProcess::started,
+ connect(&m_gdbProc, &Process::started,
this, &GdbEngine::handleGdbStarted);
- connect(&m_gdbProc, &QtcProcess::done,
+ connect(&m_gdbProc, &Process::done,
this, &GdbEngine::handleGdbDone);
- connect(&m_gdbProc, &QtcProcess::readyReadStandardOutput,
+ connect(&m_gdbProc, &Process::readyReadStandardOutput,
this, &GdbEngine::readGdbStandardOutput);
- connect(&m_gdbProc, &QtcProcess::readyReadStandardError,
+ connect(&m_gdbProc, &Process::readyReadStandardError,
this, &GdbEngine::readGdbStandardError);
// Output
@@ -4305,7 +4305,7 @@ void GdbEngine::interruptLocalInferior(qint64 pid)
if (runParameters().runAsRoot) {
Environment env = Environment::systemEnvironment();
RunControl::provideAskPassEntry(env);
- QtcProcess proc;
+ Process proc;
proc.setCommand(CommandLine{"sudo", {"-A", "kill", "-s", "SIGINT", QString::number(pid)}});
proc.setEnvironment(env);
proc.start();
@@ -5046,7 +5046,7 @@ CoreInfo CoreInfo::readExecutableNameFromCore(const Runnable &debugger, const Fi
args += {"-ex", "set osabi GNU/Linux"};
args += {"-ex", "core " + coreFile.toUserOutput()};
- QtcProcess proc;
+ Process proc;
Environment envLang(Environment::systemEnvironment());
envLang.setupEnglishOutput();
proc.setEnvironment(envLang);
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 5e84366b64..6a6e68991b 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -405,7 +405,7 @@ private: ////////// General Interface //////////
bool usesOutputCollector() const;
- Utils::QtcProcess m_gdbProc;
+ Utils::Process m_gdbProc;
OutputCollector m_outputCollector;
QString m_errorString;
};
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index a930465b68..91ef914c55 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -77,11 +77,11 @@ LldbEngine::LldbEngine()
connect(&ds.useDynamicType, &BaseAspect::changed, this, &LldbEngine::updateLocals);
connect(&ds.intelFlavor, &BaseAspect::changed, this, &LldbEngine::updateAll);
- connect(&m_lldbProc, &QtcProcess::started, this, &LldbEngine::handleLldbStarted);
- connect(&m_lldbProc, &QtcProcess::done, this, &LldbEngine::handleLldbDone);
- connect(&m_lldbProc, &QtcProcess::readyReadStandardOutput,
+ connect(&m_lldbProc, &Process::started, this, &LldbEngine::handleLldbStarted);
+ connect(&m_lldbProc, &Process::done, this, &LldbEngine::handleLldbDone);
+ connect(&m_lldbProc, &Process::readyReadStandardOutput,
this, &LldbEngine::readLldbStandardOutput);
- connect(&m_lldbProc, &QtcProcess::readyReadStandardError,
+ connect(&m_lldbProc, &Process::readyReadStandardError,
this, &LldbEngine::readLldbStandardError);
connect(this, &LldbEngine::outputReady,
@@ -187,7 +187,7 @@ void LldbEngine::setupEngine()
// LLDB 14 installation on Ubuntu 22.04 is broken:
// https://bugs.launchpad.net/ubuntu/+source/llvm-defaults/+bug/1972855
// Brush over it:
- QtcProcess lldbPythonPathFinder;
+ Process lldbPythonPathFinder;
lldbPythonPathFinder.setCommand({lldbCmd, {"-P"}});
lldbPythonPathFinder.start();
lldbPythonPathFinder.waitForFinished();
diff --git a/src/plugins/debugger/lldb/lldbengine.h b/src/plugins/debugger/lldb/lldbengine.h
index 8c0396ba50..2f5fe0d768 100644
--- a/src/plugins/debugger/lldb/lldbengine.h
+++ b/src/plugins/debugger/lldb/lldbengine.h
@@ -113,7 +113,7 @@ private:
QString m_inbuffer;
QString m_scriptFileName;
- Utils::QtcProcess m_lldbProc;
+ Utils::Process m_lldbProc;
// FIXME: Make generic.
int m_lastAgentId = 0;
diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp
index 6e7496bd37..a904e1d789 100644
--- a/src/plugins/debugger/moduleshandler.cpp
+++ b/src/plugins/debugger/moduleshandler.cpp
@@ -174,7 +174,7 @@ bool ModulesModel::contextMenuEvent(const ItemViewEvent &ev)
moduleNameValid && !modulePath.needsDevice() && modulePath.exists()
&& dependsCanBeFound(),
[modulePath] {
- QtcProcess::startDetached({{"depends"}, {modulePath.toString()}});
+ Process::startDetached({{"depends"}, {modulePath.toString()}});
});
addAction(this, menu, Tr::tr("Load Symbols for All Modules"),
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index 4435409506..54a347fb15 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -99,10 +99,10 @@ void PdbEngine::setupEngine()
m_interpreter = runParameters().interpreter;
QString bridge = ICore::resourcePath("debugger/pdbbridge.py").toString();
- connect(&m_proc, &QtcProcess::started, this, &PdbEngine::handlePdbStarted);
- connect(&m_proc, &QtcProcess::done, this, &PdbEngine::handlePdbDone);
- connect(&m_proc, &QtcProcess::readyReadStandardOutput, this, &PdbEngine::readPdbStandardOutput);
- connect(&m_proc, &QtcProcess::readyReadStandardError, this, &PdbEngine::readPdbStandardError);
+ connect(&m_proc, &Process::started, this, &PdbEngine::handlePdbStarted);
+ connect(&m_proc, &Process::done, this, &PdbEngine::handlePdbDone);
+ connect(&m_proc, &Process::readyReadStandardOutput, this, &PdbEngine::readPdbStandardOutput);
+ connect(&m_proc, &Process::readyReadStandardError, this, &PdbEngine::readPdbStandardError);
const FilePath scriptFile = runParameters().mainScript;
if (!scriptFile.isReadableFile()) {
diff --git a/src/plugins/debugger/pdb/pdbengine.h b/src/plugins/debugger/pdb/pdbengine.h
index c400388457..49dceb2441 100644
--- a/src/plugins/debugger/pdb/pdbengine.h
+++ b/src/plugins/debugger/pdb/pdbengine.h
@@ -87,7 +87,7 @@ private:
void updateLocals() override;
QString m_inbuffer;
- Utils::QtcProcess m_proc;
+ Utils::Process m_proc;
Utils::FilePath m_interpreter;
};
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 0730caaf78..096ddc1326 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -200,7 +200,7 @@ public:
QHash<QString, QTextDocument*> sourceDocuments;
InteractiveInterpreter interpreter;
- QtcProcess process;
+ Process process;
QmlInspectorAgent inspectorAgent;
QList<quint32> queryIds;
@@ -249,17 +249,17 @@ QmlEngine::QmlEngine()
connect(stackHandler(), &StackHandler::currentIndexChanged,
this, &QmlEngine::updateCurrentContext);
- connect(&d->process, &QtcProcess::readyReadStandardOutput, this, [this] {
+ connect(&d->process, &Process::readyReadStandardOutput, this, [this] {
// FIXME: Redirect to RunControl
showMessage(d->process.readAllStandardOutput(), AppOutput);
});
- connect(&d->process, &QtcProcess::readyReadStandardError, this, [this] {
+ connect(&d->process, &Process::readyReadStandardError, this, [this] {
// FIXME: Redirect to RunControl
showMessage(d->process.readAllStandardError(), AppOutput);
});
- connect(&d->process, &QtcProcess::done, this, &QmlEngine::disconnected);
- connect(&d->process, &QtcProcess::started, this, &QmlEngine::handleLauncherStarted);
+ connect(&d->process, &Process::done, this, &QmlEngine::disconnected);
+ connect(&d->process, &Process::started, this, &QmlEngine::handleLauncherStarted);
debuggerConsole()->populateFileFinder();
debuggerConsole()->setScriptEvaluator([this](const QString &expr) {
diff --git a/src/plugins/debugger/terminal.cpp b/src/plugins/debugger/terminal.cpp
index 49048ec179..4b96d1a0a9 100644
--- a/src/plugins/debugger/terminal.cpp
+++ b/src/plugins/debugger/terminal.cpp
@@ -174,12 +174,12 @@ void TerminalRunner::start()
QTC_ASSERT(!m_stubProc, reportFailure({}); return);
Runnable stub = m_stubRunnable();
- m_stubProc = new QtcProcess(this);
+ m_stubProc = new Process(this);
m_stubProc->setTerminalMode(TerminalMode::Debug);
- connect(m_stubProc, &QtcProcess::started,
+ connect(m_stubProc, &Process::started,
this, &TerminalRunner::stubStarted);
- connect(m_stubProc, &QtcProcess::done,
+ connect(m_stubProc, &Process::done,
this, &TerminalRunner::stubDone);
m_stubProc->setEnvironment(stub.environment);
diff --git a/src/plugins/debugger/terminal.h b/src/plugins/debugger/terminal.h
index b4fa1317c5..cd57e9eea2 100644
--- a/src/plugins/debugger/terminal.h
+++ b/src/plugins/debugger/terminal.h
@@ -8,7 +8,7 @@
#include <projectexplorer/runcontrol.h>
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace Debugger {
@@ -65,7 +65,7 @@ private:
void stubStarted();
void stubDone();
- Utils::QtcProcess *m_stubProc = nullptr;
+ Utils::Process *m_stubProc = nullptr;
std::function<ProjectExplorer::Runnable()> m_stubRunnable;
qint64 m_applicationPid = 0;
qint64 m_applicationMainThreadId = 0;
diff --git a/src/plugins/docker/dockerapi.cpp b/src/plugins/docker/dockerapi.cpp
index 102256fd44..3ffa59b52b 100644
--- a/src/plugins/docker/dockerapi.cpp
+++ b/src/plugins/docker/dockerapi.cpp
@@ -35,7 +35,7 @@ DockerApi *DockerApi::instance()
bool DockerApi::canConnect()
{
- QtcProcess process;
+ Process process;
FilePath dockerExe = dockerClient();
if (dockerExe.isEmpty() || !dockerExe.isExecutableFile())
return false;
@@ -43,7 +43,7 @@ bool DockerApi::canConnect()
bool result = false;
process.setCommand(CommandLine(dockerExe, QStringList{"info"}));
- connect(&process, &QtcProcess::done, [&process, &result] {
+ connect(&process, &Process::done, [&process, &result] {
qCInfo(dockerApiLog) << "'docker info' result:\n" << qPrintable(process.allOutput());
if (process.result() == ProcessResult::FinishedWithSuccess)
result = true;
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index 474bc402e7..64d3dcd6da 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -97,7 +97,7 @@ public:
{}
private:
- void setupShellProcess(QtcProcess *shellProcess) final
+ void setupShellProcess(Process *shellProcess) final
{
shellProcess->setCommand({m_settings->dockerBinaryPath.filePath(),
{"container", "start", "-i", "-a", m_containerId}});
@@ -226,7 +226,7 @@ private:
// as this object is alive.
IDevice::ConstPtr m_device;
- QtcProcess m_process;
+ Process m_process;
qint64 m_remotePID = 0;
bool m_hasReceivedFirstOutput = false;
};
@@ -236,7 +236,7 @@ DockerProcessImpl::DockerProcessImpl(IDevice::ConstPtr device, DockerDevicePriva
, m_device(std::move(device))
, m_process(this)
{
- connect(&m_process, &QtcProcess::started, this, [this] {
+ connect(&m_process, &Process::started, this, [this] {
qCDebug(dockerDeviceLog) << "Process started:" << m_process.commandLine();
if (m_setup.m_ptyData.has_value()) {
@@ -245,7 +245,7 @@ DockerProcessImpl::DockerProcessImpl(IDevice::ConstPtr device, DockerDevicePriva
}
});
- connect(&m_process, &QtcProcess::readyReadStandardOutput, this, [this] {
+ connect(&m_process, &Process::readyReadStandardOutput, this, [this] {
if (m_hasReceivedFirstOutput)
emit readyRead(m_process.readAllRawStandardOutput(), {});
@@ -273,12 +273,12 @@ DockerProcessImpl::DockerProcessImpl(IDevice::ConstPtr device, DockerDevicePriva
m_hasReceivedFirstOutput = true;
});
- connect(&m_process, &QtcProcess::readyReadStandardError, this, [this] {
+ connect(&m_process, &Process::readyReadStandardError, this, [this] {
if (m_remotePID)
emit readyRead({}, m_process.readAllRawStandardError());
});
- connect(&m_process, &QtcProcess::done, this, [this] {
+ connect(&m_process, &Process::done, this, [this] {
qCDebug(dockerDeviceLog) << "Process exited:" << m_process.commandLine()
<< "with code:" << m_process.resultData().m_exitCode;
@@ -437,9 +437,9 @@ DockerDevice::DockerDevice(DockerSettings *settings, const DockerDeviceData &dat
return;
}
- QtcProcess *proc = new QtcProcess(d);
+ Process *proc = new Process(d);
- QObject::connect(proc, &QtcProcess::done, [proc] {
+ QObject::connect(proc, &Process::done, [proc] {
if (proc->error() != QProcess::UnknownError && MessageManager::instance()) {
MessageManager::writeDisrupting(
Tr::tr("Error starting remote shell: %1").arg(proc->errorString()));
@@ -558,7 +558,7 @@ void DockerDevicePrivate::stopCurrentContainer()
m_shell.reset();
}
- QtcProcess proc;
+ Process proc;
proc.setCommand({m_settings->dockerBinaryPath.filePath(), {"container", "stop", m_container}});
m_container.clear();
@@ -662,7 +662,7 @@ QStringList DockerDevicePrivate::createMountArgs() const
bool DockerDevicePrivate::isImageAvailable() const
{
- QtcProcess proc;
+ Process proc;
proc.setCommand(
{m_settings->dockerBinaryPath.filePath(),
{"image", "list", m_data.repoAndTag(), "--format", "{{.Repository}}:{{.Tag}}"}});
@@ -714,7 +714,7 @@ bool DockerDevicePrivate::createContainer()
dockerCreate.addArg(m_data.repoAndTag());
qCDebug(dockerDeviceLog).noquote() << "RUNNING: " << dockerCreate.toUserOutput();
- QtcProcess createProcess;
+ Process createProcess;
createProcess.setCommand(dockerCreate);
createProcess.runBlocking();
@@ -930,7 +930,7 @@ void DockerDevicePrivate::fetchSystemEnviroment()
return;
}
- QtcProcess proc;
+ Process proc;
proc.setCommand(withDockerExecCmd({"env", {}}));
proc.start();
proc.waitForFinished();
@@ -1061,10 +1061,10 @@ public:
{"images", "--format", "{{.ID}}\\t{{.Repository}}\\t{{.Tag}}\\t{{.Size}}"}};
m_log->append(Tr::tr("Running \"%1\"\n").arg(cmd.toUserOutput()));
- m_process = new QtcProcess(this);
+ m_process = new Process(this);
m_process->setCommand(cmd);
- connect(m_process, &QtcProcess::readyReadStandardOutput, this, [this] {
+ connect(m_process, &Process::readyReadStandardOutput, this, [this] {
const QString out = m_process->readAllStandardOutput().trimmed();
m_log->append(out);
for (const QString &line : out.split('\n')) {
@@ -1083,12 +1083,12 @@ public:
m_log->append(Tr::tr("Done."));
});
- connect(m_process, &Utils::QtcProcess::readyReadStandardError, this, [this] {
+ connect(m_process, &Utils::Process::readyReadStandardError, this, [this] {
const QString out = Tr::tr("Error: %1").arg(m_process->cleanedStdErr());
m_log->append(Tr::tr("Error: %1").arg(out));
});
- connect(m_process, &QtcProcess::done, errorLabel, [errorLabel, this, statusLabel] {
+ connect(m_process, &Process::done, errorLabel, [errorLabel, this, statusLabel] {
delete statusLabel;
if (m_process->result() == ProcessResult::FinishedWithSuccess)
m_view->setEnabled(true);
@@ -1126,7 +1126,7 @@ public:
QDialogButtonBox *m_buttons;
DockerSettings *m_settings;
- QtcProcess *m_process = nullptr;
+ Process *m_process = nullptr;
QString m_selectedId;
};
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 0ac0244ff6..b13ff9dfce 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -1889,7 +1889,7 @@ void FakeVimPluginPrivate::editorOpened(IEditor *editor)
});
handler->processOutput.set([](const QString &command, const QString &input, QString *output) {
- QtcProcess proc;
+ Process proc;
proc.setCommand(Utils::CommandLine::fromUserInput(command));
proc.setWriteData(input.toLocal8Bit());
proc.start();
diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp
index f10b6abd22..275b00efbb 100644
--- a/src/plugins/git/branchmodel.cpp
+++ b/src/plugins/git/branchmodel.cpp
@@ -421,7 +421,7 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
d->currentDateTime = dateTime;
});
- const auto setupForEachRef = [=](QtcProcess &process) {
+ const auto setupForEachRef = [=](Process &process) {
d->workingDirectory = workingDirectory;
QStringList args = {"for-each-ref",
"--format=%(objectname)\t%(refname)\t%(upstream:short)\t"
@@ -433,7 +433,7 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
d->client->setupCommand(process, workingDirectory, args);
};
- const auto forEachRefDone = [=](const QtcProcess &process) {
+ const auto forEachRefDone = [=](const Process &process) {
const QString output = process.stdOut();
const QStringList lines = output.split('\n');
for (const QString &l : lines)
@@ -454,7 +454,7 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
}
};
- const auto forEachRefError = [=](const QtcProcess &process) {
+ const auto forEachRefError = [=](const Process &process) {
if (showError == ShowError::No)
return;
const QString message = Tr::tr("Cannot run \"%1\" in \"%2\": %3")
@@ -919,12 +919,12 @@ void BranchModel::updateUpstreamStatus(BranchNode *node)
if (node->tracking.isEmpty())
return;
- QtcProcess *process = new QtcProcess(node);
+ Process *process = new Process(node);
process->setEnvironment(d->client->processEnvironment());
process->setCommand({d->client->vcsBinary(), {"rev-list", "--no-color", "--left-right",
"--count", node->fullRef() + "..." + node->tracking}});
process->setWorkingDirectory(d->workingDirectory);
- connect(process, &QtcProcess::done, this, [this, process, node] {
+ connect(process, &Process::done, this, [this, process, node] {
process->deleteLater();
if (process->result() != ProcessResult::FinishedWithSuccess)
return;
diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp
index 34f9b546cd..ce3bca3485 100644
--- a/src/plugins/git/branchview.cpp
+++ b/src/plugins/git/branchview.cpp
@@ -542,10 +542,10 @@ TaskTree *BranchView::onFastForwardMerge(const std::function<void()> &callback)
const TreeStorage<FastForwardStorage> storage;
GitClient *client = GitClient::instance();
- const auto setupMergeBase = [=](QtcProcess &process) {
+ const auto setupMergeBase = [=](Process &process) {
client->setupCommand(process, m_repository, {"merge-base", "HEAD", branch});
};
- const auto onMergeBaseDone = [storage](const QtcProcess &process) {
+ const auto onMergeBaseDone = [storage](const Process &process) {
storage->mergeBase = process.cleanedStdOut().trimmed();
};
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index aba7be1ad2..2f93a2c7a1 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -209,12 +209,12 @@ void ChangeSelectionDialog::recalculateCompletion()
return;
GitClient *client = GitClient::instance();
- QtcProcess *process = new QtcProcess(this);
+ Process *process = new Process(this);
process->setEnvironment(client->processEnvironment());
process->setCommand({client->vcsBinary(), {"for-each-ref", "--format=%(refname:short)"}});
process->setWorkingDirectory(workingDir);
process->setUseCtrlCStub(true);
- connect(process, &QtcProcess::done, this, [this, process] {
+ connect(process, &Process::done, this, [this, process] {
if (process->result() == ProcessResult::FinishedWithSuccess)
m_changeModel->setStringList(process->cleanedStdOut().split('\n'));
process->deleteLater();
@@ -238,8 +238,8 @@ void ChangeSelectionDialog::recalculateDetails()
return;
}
- m_process.reset(new QtcProcess);
- connect(m_process.get(), &QtcProcess::done, this, &ChangeSelectionDialog::setDetails);
+ m_process.reset(new Process);
+ connect(m_process.get(), &Process::done, this, &ChangeSelectionDialog::setDetails);
m_process->setWorkingDirectory(workingDir);
m_process->setEnvironment(m_gitEnvironment);
m_process->setCommand({m_gitExecutable, {"show", "--decorate", "--stat=80", ref}});
diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h
index 69da3b20d4..24bc3155dc 100644
--- a/src/plugins/git/changeselectiondialog.h
+++ b/src/plugins/git/changeselectiondialog.h
@@ -18,7 +18,7 @@ QT_END_NAMESPACE
namespace Utils {
class CompletingLineEdit;
class PathChooser;
-class QtcProcess;
+class Process;
} // Utils
namespace Git::Internal {
@@ -53,7 +53,7 @@ private:
void enableButtons(bool b);
- std::unique_ptr<Utils::QtcProcess> m_process;
+ std::unique_ptr<Utils::Process> m_process;
Utils::FilePath m_gitExecutable;
Utils::Environment m_gitEnvironment;
ChangeCommand m_command = NoCommand;
diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp
index 8273fe0f09..4791a41d4f 100644
--- a/src/plugins/git/gerrit/gerritmodel.cpp
+++ b/src/plugins/git/gerrit/gerritmodel.cpp
@@ -227,7 +227,7 @@ private:
void errorTermination(const QString &msg);
- QtcProcess m_process;
+ Process m_process;
QTimer m_timer;
FilePath m_binary;
QByteArray m_output;
@@ -259,15 +259,15 @@ QueryContext::QueryContext(const QString &query,
+ "&o=CURRENT_REVISION&o=DETAILED_LABELS&o=DETAILED_ACCOUNTS";
m_arguments = server.curlArguments() << url;
}
- connect(&m_process, &QtcProcess::readyReadStandardError, this, [this] {
+ connect(&m_process, &Process::readyReadStandardError, this, [this] {
const QString text = QString::fromLocal8Bit(m_process.readAllRawStandardError());
VcsOutputWindow::appendError(text);
m_error.append(text);
});
- connect(&m_process, &QtcProcess::readyReadStandardOutput, this, [this] {
+ connect(&m_process, &Process::readyReadStandardOutput, this, [this] {
m_output.append(m_process.readAllRawStandardOutput());
});
- connect(&m_process, &QtcProcess::done, this, &QueryContext::processDone);
+ connect(&m_process, &Process::done, this, &QueryContext::processDone);
m_process.setEnvironment(Git::Internal::GitClient::instance()->processEnvironment());
m_timer.setInterval(timeOutMS);
@@ -340,7 +340,7 @@ void QueryContext::timeout()
arg(timeOutMS / 1000), QMessageBox::NoButton, parent);
QPushButton *terminateButton = box.addButton(Git::Tr::tr("Terminate"), QMessageBox::YesRole);
box.addButton(Git::Tr::tr("Keep Running"), QMessageBox::NoRole);
- connect(&m_process, &QtcProcess::done, &box, &QDialog::reject);
+ connect(&m_process, &Process::done, &box, &QDialog::reject);
box.exec();
if (m_process.state() != QProcess::Running)
return;
diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp
index 41fa83731f..0f5a393b1d 100644
--- a/src/plugins/git/gerrit/gerritplugin.cpp
+++ b/src/plugins/git/gerrit/gerritplugin.cpp
@@ -78,7 +78,7 @@ private:
const FetchMode m_fetchMode;
const Utils::FilePath m_git;
const GerritServer m_server;
- QtcProcess m_process;
+ Process m_process;
};
FetchContext::FetchContext(const QSharedPointer<GerritChange> &change,
@@ -93,11 +93,11 @@ FetchContext::FetchContext(const QSharedPointer<GerritChange> &change,
, m_server(server)
{
m_process.setUseCtrlCStub(true);
- connect(&m_process, &QtcProcess::done, this, &FetchContext::processDone);
- connect(&m_process, &QtcProcess::readyReadStandardError, this, [this] {
+ connect(&m_process, &Process::done, this, &FetchContext::processDone);
+ connect(&m_process, &Process::readyReadStandardError, this, [this] {
VcsBase::VcsOutputWindow::append(QString::fromLocal8Bit(m_process.readAllRawStandardError()));
});
- connect(&m_process, &QtcProcess::readyReadStandardOutput, this, [this] {
+ connect(&m_process, &Process::readyReadStandardOutput, this, [this] {
VcsBase::VcsOutputWindow::append(QString::fromLocal8Bit(m_process.readAllRawStandardOutput()));
});
m_process.setWorkingDirectory(repository);
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 14235cbe00..ab5c8cc58a 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -165,12 +165,12 @@ GitDiffEditorController::GitDiffEditorController(IDocument *document,
const TreeStorage<QString> diffInputStorage = inputStorage();
- const auto setupDiff = [=](QtcProcess &process) {
+ const auto setupDiff = [=](Process &process) {
process.setCodec(VcsBaseEditor::getCodec(workingDirectory(), {}));
setupCommand(process, {addConfigurationArguments(diffArgs(leftCommit, rightCommit, extraArgs))});
VcsOutputWindow::appendCommand(process.workingDirectory(), process.commandLine());
};
- const auto onDiffDone = [diffInputStorage](const QtcProcess &process) {
+ const auto onDiffDone = [diffInputStorage](const Process &process) {
*diffInputStorage = process.cleanedStdOut();
};
@@ -231,7 +231,7 @@ FileListDiffController::FileListDiffController(IDocument *document, const QStrin
const TreeStorage<DiffStorage> storage;
const TreeStorage<QString> diffInputStorage = inputStorage();
- const auto setupStaged = [this, stagedFiles](QtcProcess &process) {
+ const auto setupStaged = [this, stagedFiles](Process &process) {
if (stagedFiles.isEmpty())
return TaskAction::StopWithError;
process.setCodec(VcsBaseEditor::getCodec(workingDirectory(), stagedFiles));
@@ -240,11 +240,11 @@ FileListDiffController::FileListDiffController(IDocument *document, const QStrin
VcsOutputWindow::appendCommand(process.workingDirectory(), process.commandLine());
return TaskAction::Continue;
};
- const auto onStagedDone = [storage](const QtcProcess &process) {
+ const auto onStagedDone = [storage](const Process &process) {
storage->m_stagedOutput = process.cleanedStdOut();
};
- const auto setupUnstaged = [this, unstagedFiles](QtcProcess &process) {
+ const auto setupUnstaged = [this, unstagedFiles](Process &process) {
if (unstagedFiles.isEmpty())
return TaskAction::StopWithError;
process.setCodec(VcsBaseEditor::getCodec(workingDirectory(), unstagedFiles));
@@ -253,7 +253,7 @@ FileListDiffController::FileListDiffController(IDocument *document, const QStrin
VcsOutputWindow::appendCommand(process.workingDirectory(), process.commandLine());
return TaskAction::Continue;
};
- const auto onUnstagedDone = [storage](const QtcProcess &process) {
+ const auto onUnstagedDone = [storage](const Process &process) {
storage->m_unstagedOutput = process.cleanedStdOut();
};
@@ -321,13 +321,13 @@ ShowController::ShowController(IDocument *document, const QString &id)
setDescription(desc);
};
- const auto setupDescription = [this, id](QtcProcess &process) {
+ const auto setupDescription = [this, id](Process &process) {
process.setCodec(m_instance->encoding(GitClient::EncodingCommit, workingDirectory()));
setupCommand(process, {"show", "-s", noColorOption, showFormatC, id});
VcsOutputWindow::appendCommand(process.workingDirectory(), process.commandLine());
setDescription(Tr::tr("Waiting for data..."));
};
- const auto onDescriptionDone = [this, storage, updateDescription](const QtcProcess &process) {
+ const auto onDescriptionDone = [this, storage, updateDescription](const Process &process) {
ReloadStorage *data = storage.activeStorage();
const QString output = process.cleanedStdOut();
data->m_postProcessDescription = output.startsWith("commit ");
@@ -348,12 +348,12 @@ ShowController::ShowController(IDocument *document, const QString &id)
return TaskAction::Continue;
};
- const auto setupBranches = [this, storage](QtcProcess &process) {
+ const auto setupBranches = [this, storage](Process &process) {
storage->m_branches = busyMessage;
setupCommand(process, {"branch", noColorOption, "-a", "--contains", storage->m_commit});
VcsOutputWindow::appendCommand(process.workingDirectory(), process.commandLine());
};
- const auto onBranchesDone = [storage, updateDescription](const QtcProcess &process) {
+ const auto onBranchesDone = [storage, updateDescription](const Process &process) {
ReloadStorage *data = storage.activeStorage();
data->m_branches.clear();
const QString remotePrefix = "remotes/";
@@ -391,17 +391,17 @@ ShowController::ShowController(IDocument *document, const QString &id)
data->m_branches = data->m_branches.trimmed();
updateDescription(*data);
};
- const auto onBranchesError = [storage, updateDescription](const QtcProcess &) {
+ const auto onBranchesError = [storage, updateDescription](const Process &) {
ReloadStorage *data = storage.activeStorage();
data->m_branches.clear();
updateDescription(*data);
};
- const auto setupPrecedes = [this, storage](QtcProcess &process) {
+ const auto setupPrecedes = [this, storage](Process &process) {
storage->m_precedes = busyMessage;
setupCommand(process, {"describe", "--contains", storage->m_commit});
};
- const auto onPrecedesDone = [storage, updateDescription](const QtcProcess &process) {
+ const auto onPrecedesDone = [storage, updateDescription](const Process &process) {
ReloadStorage *data = storage.activeStorage();
data->m_precedes = process.cleanedStdOut().trimmed();
const int tilde = data->m_precedes.indexOf('~');
@@ -411,7 +411,7 @@ ShowController::ShowController(IDocument *document, const QString &id)
data->m_precedes.chop(2);
updateDescription(*data);
};
- const auto onPrecedesError = [storage, updateDescription](const QtcProcess &) {
+ const auto onPrecedesError = [storage, updateDescription](const Process &) {
ReloadStorage *data = storage.activeStorage();
data->m_precedes.clear();
updateDescription(*data);
@@ -427,10 +427,10 @@ ShowController::ShowController(IDocument *document, const QString &id)
data->m_follows = {busyMessage};
data->m_follows.resize(parents.size());
- const auto setupFollow = [this](QtcProcess &process, const QString &parent) {
+ const auto setupFollow = [this](Process &process, const QString &parent) {
setupCommand(process, {"describe", "--tags", "--abbrev=0", parent});
};
- const auto onFollowDone = [data, updateDescription](const QtcProcess &process, int index) {
+ const auto onFollowDone = [data, updateDescription](const Process &process, int index) {
data->m_follows[index] = process.cleanedStdOut().trimmed();
updateDescription(*data);
};
@@ -448,13 +448,13 @@ ShowController::ShowController(IDocument *document, const QString &id)
taskTree.setupRoot(tasks);
};
- const auto setupDiff = [this, id](QtcProcess &process) {
+ const auto setupDiff = [this, id](Process &process) {
setupCommand(process, addConfigurationArguments(
{"show", "--format=format:", // omit header, already generated
noColorOption, decorateOption, id}));
VcsOutputWindow::appendCommand(process.workingDirectory(), process.commandLine());
};
- const auto onDiffDone = [diffInputStorage](const QtcProcess &process) {
+ const auto onDiffDone = [diffInputStorage](const Process &process) {
*diffInputStorage = process.cleanedStdOut();
};
@@ -1736,10 +1736,10 @@ Utils::Tasking::ProcessTask GitClient::topRevision(
{
using namespace Tasking;
- const auto setupProcess = [=](QtcProcess &process) {
+ const auto setupProcess = [=](Process &process) {
setupCommand(process, workingDirectory, {"show", "-s", "--pretty=format:%H:%ct", HEAD});
};
- const auto onProcessDone = [=](const QtcProcess &process) {
+ const auto onProcessDone = [=](const Process &process) {
const QStringList output = process.cleanedStdOut().trimmed().split(':');
QDateTime dateTime;
if (output.size() > 1) {
@@ -2424,7 +2424,7 @@ void GitClient::launchRepositoryBrowser(const FilePath &workingDirectory) const
{
const FilePath repBrowserBinary = settings().repositoryBrowserCmd.filePath();
if (!repBrowserBinary.isEmpty())
- QtcProcess::startDetached({repBrowserBinary, {workingDirectory.toString()}}, workingDirectory);
+ Process::startDetached({repBrowserBinary, {workingDirectory.toString()}}, workingDirectory);
}
static FilePath gitBinDir(const GitClient::GitKLaunchTrial trial, const FilePath &parentDir)
@@ -2471,18 +2471,18 @@ void GitClient::tryLaunchingGitK(const Environment &env,
// This should always use QtcProcess::startDetached (as not to kill
// the child), but that does not have an environment parameter.
if (!settings().path.value().isEmpty()) {
- auto process = new QtcProcess(const_cast<GitClient*>(this));
+ auto process = new Process(const_cast<GitClient*>(this));
process->setWorkingDirectory(workingDirectory);
process->setEnvironment(env);
process->setCommand({binary, arguments});
- connect(process, &QtcProcess::done, this, [=] {
+ connect(process, &Process::done, this, [=] {
if (process->result() == ProcessResult::StartFailed)
handleGitKFailedToStart(env, workingDirectory, fileName, trial, gitBinDirectory);
process->deleteLater();
});
process->start();
} else {
- if (!QtcProcess::startDetached({binary, arguments}, workingDirectory))
+ if (!Process::startDetached({binary, arguments}, workingDirectory))
handleGitKFailedToStart(env, workingDirectory, fileName, trial, gitBinDirectory);
}
}
@@ -2519,7 +2519,7 @@ bool GitClient::launchGitGui(const FilePath &workingDirectory) {
if (gitBinary.isEmpty()) {
success = false;
} else {
- success = QtcProcess::startDetached({gitBinary, {"gui"}}, workingDirectory);
+ success = Process::startDetached({gitBinary, {"gui"}}, workingDirectory);
}
if (!success)
@@ -2564,7 +2564,7 @@ bool GitClient::launchGitBash(const FilePath &workingDirectory)
success = false;
} else {
const FilePath gitBash = git.absolutePath().parentDir() / "git-bash.exe";
- success = QtcProcess::startDetached({gitBash, {}}, workingDirectory);
+ success = Process::startDetached({gitBash, {}}, workingDirectory);
}
if (!success)
@@ -3466,8 +3466,8 @@ QFuture<unsigned> GitClient::gitVersion() const
const FilePath newGitBinary = vcsBinary();
const bool needToRunGit = m_gitVersionForBinary != newGitBinary && !newGitBinary.isEmpty();
if (needToRunGit) {
- auto proc = new QtcProcess(const_cast<GitClient *>(this));
- connect(proc, &QtcProcess::done, this, [this, proc, fi, newGitBinary]() mutable {
+ auto proc = new Process(const_cast<GitClient *>(this));
+ connect(proc, &Process::done, this, [this, proc, fi, newGitBinary]() mutable {
if (proc->result() == ProcessResult::FinishedWithSuccess) {
m_cachedGitVersion = parseGitVersion(proc->cleanedStdOut());
m_gitVersionForBinary = newGitBinary;
diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp
index cd9c8bf5d6..2f70cddc82 100644
--- a/src/plugins/git/gitgrep.cpp
+++ b/src/plugins/git/gitgrep.cpp
@@ -161,7 +161,7 @@ public:
});
arguments << "--" << filterArgs << exclusionArgs;
- QtcProcess process;
+ Process process;
process.setEnvironment(m_environment);
process.setCommand({m_vcsBinary, arguments});
process.setWorkingDirectory(m_directory);
diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index f696bef124..6fbc9d5ea8 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -23,8 +23,8 @@ namespace Git::Internal {
MergeTool::MergeTool(QObject *parent) : QObject(parent)
{
- connect(&m_process, &QtcProcess::done, this, &MergeTool::done);
- connect(&m_process, &QtcProcess::readyReadStandardOutput, this, &MergeTool::readData);
+ connect(&m_process, &Process::done, this, &MergeTool::done);
+ connect(&m_process, &Process::readyReadStandardOutput, this, &MergeTool::readData);
Environment env = Environment::systemEnvironment();
env.set("LANG", "C");
env.set("LANGUAGE", "C");
diff --git a/src/plugins/git/mergetool.h b/src/plugins/git/mergetool.h
index 290b50f10c..1fd32e3a4f 100644
--- a/src/plugins/git/mergetool.h
+++ b/src/plugins/git/mergetool.h
@@ -49,7 +49,7 @@ private:
void chooseAction();
void addButton(QMessageBox *msgBox, const QString &text, char key);
- Utils::QtcProcess m_process;
+ Utils::Process m_process;
MergeType m_mergeType = NormalMerge;
QString m_fileName;
FileState m_localState = UnknownState;
diff --git a/src/plugins/gitlab/queryrunner.cpp b/src/plugins/gitlab/queryrunner.cpp
index 2ddc86cd09..fd56c68c29 100644
--- a/src/plugins/gitlab/queryrunner.cpp
+++ b/src/plugins/gitlab/queryrunner.cpp
@@ -96,7 +96,7 @@ QueryRunner::QueryRunner(const Query &query, const Id &id, QObject *parent)
url += query.toString();
args << url;
m_process.setCommand({p->curl, args});
- connect(&m_process, &QtcProcess::done, this, [this, id] {
+ connect(&m_process, &Process::done, this, [this, id] {
if (m_process.result() != ProcessResult::FinishedWithSuccess) {
const int exitCode = m_process.exitCode();
if (m_process.exitStatus() == QProcess::NormalExit
diff --git a/src/plugins/gitlab/queryrunner.h b/src/plugins/gitlab/queryrunner.h
index ee698e384f..bdb5e06034 100644
--- a/src/plugins/gitlab/queryrunner.h
+++ b/src/plugins/gitlab/queryrunner.h
@@ -47,7 +47,7 @@ signals:
void resultRetrieved(const QByteArray &json);
private:
- Utils::QtcProcess m_process;
+ Utils::Process m_process;
};
} // namespace GitLab
diff --git a/src/plugins/haskell/haskellmanager.cpp b/src/plugins/haskell/haskellmanager.cpp
index ac3564f23e..250b795af7 100644
--- a/src/plugins/haskell/haskellmanager.cpp
+++ b/src/plugins/haskell/haskellmanager.cpp
@@ -87,11 +87,11 @@ void HaskellManager::openGhci(const FilePath &haskellFile)
});
const auto args = QStringList{"ghci"}
+ (isHaskell ? QStringList{haskellFile.fileName()} : QStringList());
- auto p = new QtcProcess(m_instance);
+ auto p = new Process(m_instance);
p->setTerminalMode(TerminalMode::On);
p->setCommand({stackExecutable(), args});
p->setWorkingDirectory(haskellFile.absolutePath());
- connect(p, &QtcProcess::done, p, [p] {
+ connect(p, &Process::done, p, [p] {
if (p->result() != ProcessResult::FinishedWithSuccess) {
Core::MessageManager::writeDisrupting(
Tr::tr("Failed to run GHCi: \"%1\".").arg(p->errorString()));
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index 4ba74298a9..0eab6b7947 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -212,7 +212,7 @@ static QByteArray decodeProvisioningProfile(const QString &path)
{
QTC_ASSERT(!path.isEmpty(), return QByteArray());
- QtcProcess p;
+ Process p;
p.setTimeoutS(3);
// path is assumed to be valid file path to .mobileprovision
p.setCommand({"openssl", {"smime", "-inform", "der", "-verify", "-in", path}});
diff --git a/src/plugins/ios/iosprobe.cpp b/src/plugins/ios/iosprobe.cpp
index c835e48390..7b3e977e96 100644
--- a/src/plugins/ios/iosprobe.cpp
+++ b/src/plugins/ios/iosprobe.cpp
@@ -40,7 +40,7 @@ void XcodeProbe::addDeveloperPath(const QString &path)
void XcodeProbe::detectDeveloperPaths()
{
- Utils::QtcProcess selectedXcode;
+ Utils::Process selectedXcode;
selectedXcode.setTimeoutS(5);
selectedXcode.setCommand({"/usr/bin/xcode-select", {"--print-path"}});
selectedXcode.runBlocking();
diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp
index ceb9fd7785..2caa691c92 100644
--- a/src/plugins/ios/iossimulator.cpp
+++ b/src/plugins/ios/iossimulator.cpp
@@ -52,7 +52,7 @@ Utils::Port IosSimulator::nextPort() const
// use qrand instead?
if (++m_lastPort >= Constants::IOS_SIMULATOR_PORT_END)
m_lastPort = Constants::IOS_SIMULATOR_PORT_START;
- Utils::QtcProcess portVerifier;
+ Utils::Process portVerifier;
// this is a bit too broad (it does not check just listening sockets, but also connections
// to that port from this computer)
portVerifier.setCommand({"lsof", {"-n", "-P", "-i", QString(":%1").arg(m_lastPort)}});
diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp
index d3af86365d..9d50088cd9 100644
--- a/src/plugins/ios/simulatorcontrol.cpp
+++ b/src/plugins/ios/simulatorcontrol.cpp
@@ -57,7 +57,7 @@ static bool checkForTimeout(const chrono::high_resolution_clock::time_point &sta
static bool runCommand(const CommandLine &command, QString *stdOutput, QString *allOutput = nullptr)
{
- QtcProcess p;
+ Process p;
p.setTimeoutS(-1);
p.setCommand(command);
p.runBlocking();
@@ -98,7 +98,7 @@ static bool launchSimulator(const QString &simUdid) {
}
}
- return QtcProcess::startDetached({simulatorAppPath, {"--args", "-CurrentDeviceUDID", simUdid}});
+ return Process::startDetached({simulatorAppPath, {"--args", "-CurrentDeviceUDID", simUdid}});
}
static bool isAvailable(const QJsonObject &object)
diff --git a/src/plugins/languageclient/languageclientinterface.cpp b/src/plugins/languageclient/languageclientinterface.cpp
index 541d1c3ab0..84f4b5ed0a 100644
--- a/src/plugins/languageclient/languageclientinterface.cpp
+++ b/src/plugins/languageclient/languageclientinterface.cpp
@@ -95,14 +95,14 @@ void StdIOClientInterface::startImpl()
QTC_CHECK(!m_process->isRunning());
delete m_process;
}
- m_process = new QtcProcess;
+ m_process = new Process;
m_process->setProcessMode(ProcessMode::Writer);
- connect(m_process, &QtcProcess::readyReadStandardError,
+ connect(m_process, &Process::readyReadStandardError,
this, &StdIOClientInterface::readError);
- connect(m_process, &QtcProcess::readyReadStandardOutput,
+ connect(m_process, &Process::readyReadStandardOutput,
this, &StdIOClientInterface::readOutput);
- connect(m_process, &QtcProcess::started, this, &StdIOClientInterface::started);
- connect(m_process, &QtcProcess::done, this, [this] {
+ connect(m_process, &Process::started, this, &StdIOClientInterface::started);
+ connect(m_process, &Process::done, this, [this] {
m_logFile.flush();
if (m_process->result() != ProcessResult::FinishedWithSuccess)
emit error(QString("%1 (see logs in \"%2\")")
diff --git a/src/plugins/languageclient/languageclientinterface.h b/src/plugins/languageclient/languageclientinterface.h
index e0d4789e1d..ec1fc8206f 100644
--- a/src/plugins/languageclient/languageclientinterface.h
+++ b/src/plugins/languageclient/languageclientinterface.h
@@ -71,7 +71,7 @@ protected:
void sendData(const QByteArray &data) final;
Utils::CommandLine m_cmd;
Utils::FilePath m_workingDirectory;
- Utils::QtcProcess *m_process = nullptr;
+ Utils::Process *m_process = nullptr;
Utils::Environment m_env;
private:
diff --git a/src/plugins/mcusupport/mcusupportversiondetection.cpp b/src/plugins/mcusupport/mcusupportversiondetection.cpp
index b31d01d8bc..2ea28c3852 100644
--- a/src/plugins/mcusupport/mcusupportversiondetection.cpp
+++ b/src/plugins/mcusupport/mcusupportversiondetection.cpp
@@ -41,7 +41,7 @@ QString McuPackageExecutableVersionDetector::parseVersion(const FilePath &packag
return {};
const int timeout = 3000; // usually runs below 1s, but we want to be on the safe side
- QtcProcess process;
+ Process process;
process.setCommand({binaryPath, m_detectionArgs});
process.start();
if (!process.waitForFinished(timeout) || process.result() != ProcessResult::FinishedWithSuccess)
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index 0eb212f856..6243989650 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -55,11 +55,11 @@ MercurialDiffEditorController::MercurialDiffEditorController(IDocument *document
const TreeStorage<QString> diffInputStorage = inputStorage();
- const auto setupDiff = [=](QtcProcess &process) {
+ const auto setupDiff = [=](Process &process) {
setupCommand(process, {addConfigurationArguments(args)});
VcsOutputWindow::appendCommand(process.workingDirectory(), process.commandLine());
};
- const auto onDiffDone = [diffInputStorage](const QtcProcess &process) {
+ const auto onDiffDone = [diffInputStorage](const Process &process) {
*diffInputStorage = process.cleanedStdOut();
};
diff --git a/src/plugins/mesonprojectmanager/mesonprocess.cpp b/src/plugins/mesonprojectmanager/mesonprocess.cpp
index 0c828588c2..5732f617e7 100644
--- a/src/plugins/mesonprojectmanager/mesonprocess.cpp
+++ b/src/plugins/mesonprojectmanager/mesonprocess.cpp
@@ -63,12 +63,12 @@ void MesonProcess::setupProcess(const Command &command, const Environment &env,
{
if (m_process)
m_process.release()->deleteLater();
- m_process.reset(new QtcProcess);
- connect(m_process.get(), &QtcProcess::done, this, &MesonProcess::handleProcessDone);
+ m_process.reset(new Process);
+ connect(m_process.get(), &Process::done, this, &MesonProcess::handleProcessDone);
if (!captureStdo) {
- connect(m_process.get(), &QtcProcess::readyReadStandardOutput,
+ connect(m_process.get(), &Process::readyReadStandardOutput,
this, &MesonProcess::processStandardOutput);
- connect(m_process.get(), &QtcProcess::readyReadStandardError,
+ connect(m_process.get(), &Process::readyReadStandardError,
this, &MesonProcess::processStandardError);
}
diff --git a/src/plugins/mesonprojectmanager/mesonprocess.h b/src/plugins/mesonprojectmanager/mesonprocess.h
index 949af3339f..c01427c8fb 100644
--- a/src/plugins/mesonprojectmanager/mesonprocess.h
+++ b/src/plugins/mesonprojectmanager/mesonprocess.h
@@ -12,7 +12,7 @@
namespace Utils {
class Environment;
-class QtcProcess;
+class Process;
}
namespace MesonProjectManager {
@@ -44,7 +44,7 @@ private:
void processStandardOutput();
void processStandardError();
- std::unique_ptr<Utils::QtcProcess> m_process;
+ std::unique_ptr<Utils::Process> m_process;
QElapsedTimer m_elapsed;
QByteArray m_stdo;
QByteArray m_stderr;
diff --git a/src/plugins/mesonprojectmanager/mesonwrapper.h b/src/plugins/mesonprojectmanager/mesonwrapper.h
index b229ab6555..668c78bc4c 100644
--- a/src/plugins/mesonprojectmanager/mesonwrapper.h
+++ b/src/plugins/mesonprojectmanager/mesonwrapper.h
@@ -35,7 +35,7 @@ bool containsFiles(const QString &path, const File_t &file, const T &...files)
inline bool run_meson(const Command &command, QIODevice *output = nullptr)
{
- Utils::QtcProcess process;
+ Utils::Process process;
process.setWorkingDirectory(command.workDir());
process.setCommand(command.cmdLine());
process.start();
diff --git a/src/plugins/mesonprojectmanager/toolwrapper.cpp b/src/plugins/mesonprojectmanager/toolwrapper.cpp
index 9864fd030b..e3e54ef1b2 100644
--- a/src/plugins/mesonprojectmanager/toolwrapper.cpp
+++ b/src/plugins/mesonprojectmanager/toolwrapper.cpp
@@ -40,7 +40,7 @@ void ToolWrapper::setExe(const Utils::FilePath &newExe)
Version ToolWrapper::read_version(const Utils::FilePath &toolPath)
{
if (toolPath.toFileInfo().isExecutable()) {
- Utils::QtcProcess process;
+ Utils::Process process;
process.setCommand({ toolPath, { "--version" } });
process.start();
if (process.waitForFinished())
diff --git a/src/plugins/nim/project/nimblebuildsystem.cpp b/src/plugins/nim/project/nimblebuildsystem.cpp
index b1317153a8..f9be804571 100644
--- a/src/plugins/nim/project/nimblebuildsystem.cpp
+++ b/src/plugins/nim/project/nimblebuildsystem.cpp
@@ -20,7 +20,7 @@ namespace Nim {
const char C_NIMBLEPROJECT_TASKS[] = "Nim.NimbleProject.Tasks";
-static QList<QByteArray> linesFromProcessOutput(QtcProcess *process)
+static QList<QByteArray> linesFromProcessOutput(Process *process)
{
QList<QByteArray> lines = process->readAllRawStandardOutput().split('\n');
lines = Utils::transform(lines, [](const QByteArray &line){ return line.trimmed(); });
@@ -30,7 +30,7 @@ static QList<QByteArray> linesFromProcessOutput(QtcProcess *process)
static std::vector<NimbleTask> parseTasks(const FilePath &nimblePath, const FilePath &workingDirectory)
{
- QtcProcess process;
+ Process process;
process.setCommand({nimblePath, {"tasks"}});
process.setWorkingDirectory(workingDirectory);
process.start();
@@ -58,7 +58,7 @@ static std::vector<NimbleTask> parseTasks(const FilePath &nimblePath, const File
static NimbleMetadata parseMetadata(const FilePath &nimblePath, const FilePath &workingDirectory)
{
- QtcProcess process;
+ Process process;
process.setCommand({nimblePath, {"dump"}});
process.setWorkingDirectory(workingDirectory);
process.start();
diff --git a/src/plugins/nim/project/nimtoolchain.cpp b/src/plugins/nim/project/nimtoolchain.cpp
index b373fc9418..159985f59d 100644
--- a/src/plugins/nim/project/nimtoolchain.cpp
+++ b/src/plugins/nim/project/nimtoolchain.cpp
@@ -95,7 +95,7 @@ bool NimToolChain::fromMap(const QVariantMap &data)
bool NimToolChain::parseVersion(const FilePath &path, std::tuple<int, int, int> &result)
{
- QtcProcess process;
+ Process process;
process.setCommand({path, {"--version"}});
process.start();
if (!process.waitForFinished())
diff --git a/src/plugins/nim/suggest/server.cpp b/src/plugins/nim/suggest/server.cpp
index b891404fe8..7573505f72 100644
--- a/src/plugins/nim/suggest/server.cpp
+++ b/src/plugins/nim/suggest/server.cpp
@@ -10,8 +10,8 @@ namespace Suggest {
NimSuggestServer::NimSuggestServer(QObject *parent) : QObject(parent)
{
- connect(&m_process, &QtcProcess::done, this, &NimSuggestServer::onDone);
- connect(&m_process, &QtcProcess::readyReadStandardOutput, this,
+ connect(&m_process, &Process::done, this, &NimSuggestServer::onDone);
+ connect(&m_process, &Process::readyReadStandardOutput, this,
&NimSuggestServer::onStandardOutputAvailable);
}
diff --git a/src/plugins/nim/suggest/server.h b/src/plugins/nim/suggest/server.h
index 9d8e880663..a9f7d49b88 100644
--- a/src/plugins/nim/suggest/server.h
+++ b/src/plugins/nim/suggest/server.h
@@ -36,7 +36,7 @@ private:
void clearState();
bool m_portAvailable = false;
- Utils::QtcProcess m_process;
+ Utils::Process m_process;
quint16 m_port = 0;
QString m_projectFilePath;
QString m_executablePath;
diff --git a/src/plugins/perforce/perforcechecker.cpp b/src/plugins/perforce/perforcechecker.cpp
index fc2aeae3e1..f9a5b5df38 100644
--- a/src/plugins/perforce/perforcechecker.cpp
+++ b/src/plugins/perforce/perforcechecker.cpp
@@ -21,7 +21,7 @@ namespace Internal {
PerforceChecker::PerforceChecker(QObject *parent) : QObject(parent)
{
- connect(&m_process, &QtcProcess::done, this, &PerforceChecker::slotDone);
+ connect(&m_process, &Process::done, this, &PerforceChecker::slotDone);
}
PerforceChecker::~PerforceChecker()
diff --git a/src/plugins/perforce/perforcechecker.h b/src/plugins/perforce/perforcechecker.h
index e9325b4ced..5f7d2b1673 100644
--- a/src/plugins/perforce/perforcechecker.h
+++ b/src/plugins/perforce/perforcechecker.h
@@ -44,7 +44,7 @@ private:
void parseOutput(const QString &);
inline void resetOverrideCursor();
- Utils::QtcProcess m_process;
+ Utils::Process m_process;
Utils::FilePath m_binary;
int m_timeOutMS = -1;
bool m_timedOut = false;
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index ccd4faec16..336ee8e7dc 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -1225,7 +1225,7 @@ PerforceResponse PerforcePluginPrivate::synchronousProcess(const FilePath &worki
QTC_ASSERT(stdInput.isEmpty(), return PerforceResponse()); // Not supported here
// Run, connect stderr to the output window
- QtcProcess process;
+ Process process;
const int timeOutS = (flags & LongTimeOut) ? m_settings.longTimeOutS() : m_settings.timeOutS.value();
process.setTimeoutS(timeOutS);
if (outputCodec)
@@ -1283,7 +1283,7 @@ PerforceResponse PerforcePluginPrivate::fullySynchronousProcess(const FilePath &
const QByteArray &stdInput,
QTextCodec *outputCodec) const
{
- QtcProcess process;
+ Process process;
if (flags & OverrideDiffEnvironment)
process.setEnvironment(overrideDiffEnvironmentVariable());
diff --git a/src/plugins/perfprofiler/perfconfigwidget.cpp b/src/plugins/perfprofiler/perfconfigwidget.cpp
index 68c86ff720..eed31e373a 100644
--- a/src/plugins/perfprofiler/perfconfigwidget.cpp
+++ b/src/plugins/perfprofiler/perfconfigwidget.cpp
@@ -120,9 +120,9 @@ void PerfConfigWidget::setTarget(ProjectExplorer::Target *target)
QTC_ASSERT(device, return);
QTC_CHECK(!m_process || m_process->state() == QProcess::NotRunning);
- m_process.reset(new QtcProcess);
+ m_process.reset(new Process);
m_process->setCommand({device->filePath("perf"), {"probe", "-l"}});
- connect(m_process.get(), &QtcProcess::done,
+ connect(m_process.get(), &Process::done,
this, &PerfConfigWidget::handleProcessDone);
useTracePointsButton->setEnabled(true);
diff --git a/src/plugins/perfprofiler/perfconfigwidget.h b/src/plugins/perfprofiler/perfconfigwidget.h
index 3fc65c4753..5372647064 100644
--- a/src/plugins/perfprofiler/perfconfigwidget.h
+++ b/src/plugins/perfprofiler/perfconfigwidget.h
@@ -14,7 +14,7 @@ class QPushButton;
class QTableView;
QT_END_NAMESPACE
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace PerfProfiler {
namespace Internal {
@@ -37,7 +37,7 @@ private:
void handleProcessDone();
PerfSettings *m_settings;
- std::unique_ptr<Utils::QtcProcess> m_process;
+ std::unique_ptr<Utils::Process> m_process;
QTableView *eventsView;
QPushButton *useTracePointsButton;
diff --git a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp
index d14bfb87cd..68ba9e883f 100644
--- a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp
+++ b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp
@@ -105,10 +105,10 @@ public:
void start() override
{
- m_process = new QtcProcess(this);
+ m_process = new Process(this);
- connect(m_process, &QtcProcess::started, this, &RunWorker::reportStarted);
- connect(m_process, &QtcProcess::done, this, [this] {
+ connect(m_process, &Process::started, this, &RunWorker::reportStarted);
+ connect(m_process, &Process::done, this, [this] {
// The terminate() below will frequently lead to QProcess::Crashed. We're not interested
// in that. FailedToStart is the only actual failure.
if (m_process->error() == QProcess::FailedToStart) {
@@ -141,10 +141,10 @@ public:
m_process->terminate();
}
- QtcProcess *recorder() { return m_process; }
+ Process *recorder() { return m_process; }
private:
- QPointer<QtcProcess> m_process;
+ QPointer<Process> m_process;
QStringList m_perfRecordArguments;
};
@@ -193,12 +193,12 @@ void PerfProfilerRunner::start()
PerfDataReader *reader = m_perfParserWorker->reader();
if (auto prw = qobject_cast<LocalPerfRecordWorker *>(m_perfRecordWorker)) {
// That's the local case.
- QtcProcess *recorder = prw->recorder();
- connect(recorder, &QtcProcess::readyReadStandardError, this, [this, recorder] {
+ Process *recorder = prw->recorder();
+ connect(recorder, &Process::readyReadStandardError, this, [this, recorder] {
appendMessage(QString::fromLocal8Bit(recorder->readAllRawStandardError()),
Utils::StdErrFormat);
});
- connect(recorder, &QtcProcess::readyReadStandardOutput, this, [this, reader, recorder] {
+ connect(recorder, &Process::readyReadStandardOutput, this, [this, reader, recorder] {
if (!reader->feedParser(recorder->readAllRawStandardOutput()))
reportFailure(Tr::tr("Failed to transfer Perf data to perfparser."));
});
diff --git a/src/plugins/perfprofiler/perftracepointdialog.cpp b/src/plugins/perfprofiler/perftracepointdialog.cpp
index 1a2e2c346a..004f9aa0e1 100644
--- a/src/plugins/perfprofiler/perftracepointdialog.cpp
+++ b/src/plugins/perfprofiler/perftracepointdialog.cpp
@@ -93,7 +93,7 @@ void PerfTracePointDialog::runScript()
m_privilegesChooser->setEnabled(false);
m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
- m_process.reset(new QtcProcess(this));
+ m_process.reset(new Process(this));
m_process->setWriteData(m_textEdit->toPlainText().toUtf8());
m_textEdit->clear();
@@ -103,7 +103,7 @@ void PerfTracePointDialog::runScript()
else
m_process->setCommand({m_device->filePath("sh"), {}});
- connect(m_process.get(), &QtcProcess::done, this, &PerfTracePointDialog::handleProcessDone);
+ connect(m_process.get(), &Process::done, this, &PerfTracePointDialog::handleProcessDone);
m_process->start();
}
diff --git a/src/plugins/perfprofiler/perftracepointdialog.h b/src/plugins/perfprofiler/perftracepointdialog.h
index 427220e64e..d5affdcc7c 100644
--- a/src/plugins/perfprofiler/perftracepointdialog.h
+++ b/src/plugins/perfprofiler/perftracepointdialog.h
@@ -15,7 +15,7 @@ class QLabel;
class QTextEdit;
QT_END_NAMESPACE
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace PerfProfiler {
namespace Internal {
@@ -40,7 +40,7 @@ private:
QComboBox *m_privilegesChooser;
QDialogButtonBox *m_buttonBox;
ProjectExplorer::IDeviceConstPtr m_device;
- std::unique_ptr<Utils::QtcProcess> m_process;
+ std::unique_ptr<Utils::Process> m_process;
void accept() final;
void reject() final;
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 30036fcdc5..eca8b5c44f 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -76,7 +76,7 @@ public:
void cleanUp(int exitCode, QProcess::ExitStatus status);
AbstractProcessStep *q;
- std::unique_ptr<QtcProcess> m_process;
+ std::unique_ptr<Process> m_process;
std::unique_ptr<TaskTree> m_taskTree;
ProcessParameters m_param;
ProcessParameters *m_displayedParams = &m_param;
@@ -182,9 +182,9 @@ void AbstractProcessStep::doRun()
setupStreams();
- d->m_process.reset(new QtcProcess);
+ d->m_process.reset(new Process);
setupProcess(d->m_process.get());
- connect(d->m_process.get(), &QtcProcess::done, this, &AbstractProcessStep::handleProcessDone);
+ connect(d->m_process.get(), &Process::done, this, &AbstractProcessStep::handleProcessDone);
d->m_process->start();
}
@@ -209,7 +209,7 @@ void AbstractProcessStep::setupStreams()
d->stderrStream = std::make_unique<QTextDecoder>(QTextCodec::codecForLocale());
}
-void AbstractProcessStep::setupProcess(QtcProcess *process)
+void AbstractProcessStep::setupProcess(Process *process)
{
process->setUseCtrlCStub(HostOsInfo::isWindowsHost());
process->setWorkingDirectory(d->m_param.effectiveWorkingDirectory());
@@ -224,15 +224,15 @@ void AbstractProcessStep::setupProcess(QtcProcess *process)
if (d->m_lowPriority && ProjectExplorerPlugin::projectExplorerSettings().lowBuildPriority)
process->setLowPriority();
- connect(process, &QtcProcess::readyReadStandardOutput, this, [this, process] {
+ connect(process, &Process::readyReadStandardOutput, this, [this, process] {
emit addOutput(d->stdoutStream->toUnicode(process->readAllRawStandardOutput()),
OutputFormat::Stdout, DontAppendNewline);
});
- connect(process, &QtcProcess::readyReadStandardError, this, [this, process] {
+ connect(process, &Process::readyReadStandardError, this, [this, process] {
emit addOutput(d->stderrStream->toUnicode(process->readAllRawStandardError()),
OutputFormat::Stderr, DontAppendNewline);
});
- connect(process, &QtcProcess::started, this, [this] {
+ connect(process, &Process::started, this, [this] {
ProcessParameters *params = displayedParameters();
emit addOutput(Tr::tr("Starting: \"%1\" %2")
.arg(params->effectiveCommand().toUserOutput(), params->prettyArguments()),
diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h
index 8112541447..d8050b66a8 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.h
+++ b/src/plugins/projectexplorer/abstractprocessstep.h
@@ -10,7 +10,7 @@
namespace Utils {
class CommandLine;
enum class ProcessResult;
-class QtcProcess;
+class Process;
namespace Tasking { class Group; }
}
@@ -51,7 +51,7 @@ protected:
virtual void finish(Utils::ProcessResult result);
bool checkWorkingDirectory();
- void setupProcess(Utils::QtcProcess *process);
+ void setupProcess(Utils::Process *process);
void runTaskTree(const Utils::Tasking::Group &recipe);
ProcessParameters *displayedParameters() const;
diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp
index f2b33378b5..34ab30442d 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp
@@ -64,7 +64,7 @@ static bool
const QMap<QString, QString> &fieldMap,
QString *stdOut /* = 0 */, QString *errorMessage)
{
- Utils::QtcProcess process;
+ Utils::Process process;
const QString binary = script.front();
QStringList arguments;
const int binarySize = script.size();
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
index 2ac44ad622..82734cf6a9 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
@@ -61,8 +61,8 @@ DesktopDevice::DesktopDevice()
const FilePath shell = Terminal::defaultShellForDevice(path);
- QtcProcess *process = new QtcProcess(d.get());
- QObject::connect(process, &QtcProcess::done, process, &QtcProcess::deleteLater);
+ Process *process = new Process(d.get());
+ QObject::connect(process, &Process::done, process, &Process::deleteLater);
process->setTerminalMode(TerminalMode::On);
process->setEnvironment(realEnv);
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index ff3baf6148..8973a7baf6 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -464,7 +464,7 @@ DeviceManager::DeviceManager(bool isInstance) : d(std::make_unique<DeviceManager
return device->systemEnvironment();
};
- QtcProcess::setRemoteProcessHooks(processHooks);
+ Process::setRemoteProcessHooks(processHooks);
Terminal::Hooks::instance().getTerminalCommandsForDevicesHook().set(
[this]() -> QList<Terminal::NameAndCommandLine> {
diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
index 8081c9745d..b04397a66b 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
+++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
@@ -22,7 +22,7 @@ namespace Internal {
class DeviceUsedPortsGathererPrivate
{
public:
- std::unique_ptr<QtcProcess> process;
+ std::unique_ptr<Process> process;
QList<Port> usedPorts;
IDevice::ConstPtr device;
PortsGatheringMethod portsGatheringMethod;
@@ -54,10 +54,10 @@ void DeviceUsedPortsGatherer::start()
const QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::AnyIPProtocol;
- d->process.reset(new QtcProcess);
+ d->process.reset(new Process);
d->process->setCommand(d->portsGatheringMethod.commandLine(protocol));
- connect(d->process.get(), &QtcProcess::done, this, &DeviceUsedPortsGatherer::handleProcessDone);
+ connect(d->process.get(), &Process::done, this, &DeviceUsedPortsGatherer::handleProcessDone);
d->process->start();
}
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h
index 9c2dc2122f..04c1facf41 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.h
+++ b/src/plugins/projectexplorer/devicesupport/idevice.h
@@ -35,7 +35,7 @@ class Icon;
class PortList;
class Port;
class ProcessInterface;
-class QtcProcess;
+class Process;
} // Utils
namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/devicesupport/sshparameters.cpp b/src/plugins/projectexplorer/devicesupport/sshparameters.cpp
index 2ab8aa006e..8b67f300db 100644
--- a/src/plugins/projectexplorer/devicesupport/sshparameters.cpp
+++ b/src/plugins/projectexplorer/devicesupport/sshparameters.cpp
@@ -69,7 +69,7 @@ QStringList SshParameters::connectionOptions(const FilePath &binary) const
return args;
}
-bool SshParameters::setupSshEnvironment(QtcProcess *process)
+bool SshParameters::setupSshEnvironment(Process *process)
{
Environment env = process->controlEnvironment();
if (!env.hasChanges())
diff --git a/src/plugins/projectexplorer/devicesupport/sshparameters.h b/src/plugins/projectexplorer/devicesupport/sshparameters.h
index 8bdd936d27..3ee483d5f3 100644
--- a/src/plugins/projectexplorer/devicesupport/sshparameters.h
+++ b/src/plugins/projectexplorer/devicesupport/sshparameters.h
@@ -7,7 +7,7 @@
#include <utils/filepath.h>
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace ProjectExplorer {
@@ -45,7 +45,7 @@ public:
AuthenticationType authenticationType = AuthenticationTypeAll;
SshHostKeyCheckingMode hostKeyCheckingMode = SshHostKeyCheckingAllowNoMatch;
- static bool setupSshEnvironment(Utils::QtcProcess *process);
+ static bool setupSshEnvironment(Utils::Process *process);
friend PROJECTEXPLORER_EXPORT bool operator==(const SshParameters &p1, const SshParameters &p2);
friend bool operator!=(const SshParameters &p1, const SshParameters &p2) { return !(p1 == p2); }
diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp
index a220f1906f..e60d6cb5d1 100644
--- a/src/plugins/projectexplorer/extracompiler.cpp
+++ b/src/plugins/projectexplorer/extracompiler.cpp
@@ -381,7 +381,7 @@ void ProcessExtraCompiler::runInThread(QPromise<FileNameToContentsHash> &promise
if (sourceContents.isNull() || !prepareToRun(sourceContents))
return;
- QtcProcess process;
+ Process process;
process.setEnvironment(env);
if (!workDir.isEmpty())
diff --git a/src/plugins/projectexplorer/extracompiler.h b/src/plugins/projectexplorer/extracompiler.h
index 889a79f858..323fbb139d 100644
--- a/src/plugins/projectexplorer/extracompiler.h
+++ b/src/plugins/projectexplorer/extracompiler.h
@@ -25,7 +25,7 @@ class QPromise;
class QThreadPool;
QT_END_NAMESPACE
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
namespace ProjectExplorer {
@@ -96,7 +96,7 @@ protected:
virtual bool prepareToRun(const QByteArray &sourceContents);
- virtual FileNameToContentsHash handleProcessFinished(Utils::QtcProcess *process) = 0;
+ virtual FileNameToContentsHash handleProcessFinished(Utils::Process *process) = 0;
virtual Tasks parseIssues(const QByteArray &stdErr);
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 7212e24dd5..40a97737db 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -119,7 +119,7 @@ static QString runGcc(const FilePath &gcc, const QStringList &arguments, const E
if (!gcc.isExecutableFile())
return {};
- QtcProcess cpp;
+ Process cpp;
Environment environment(env);
environment.setupEnglishOutput();
@@ -1570,7 +1570,7 @@ bool ClangToolChain::matchesCompilerCommand(const FilePath &command) const
m_resolvedCompilerCommand = FilePath();
if (HostOsInfo::isMacHost()
&& compilerCommand().parentDir() == FilePath::fromString("/usr/bin")) {
- QtcProcess xcrun;
+ Process xcrun;
xcrun.setCommand({"/usr/bin/xcrun", {"-f", compilerCommand().fileName()}});
xcrun.runBlocking();
const FilePath output = FilePath::fromString(xcrun.cleanedStdOut().trimmed());
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index d8cc0f7cff..87547b2a79 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -255,7 +255,7 @@ static std::optional<VisualStudioInstallation> detectCppBuildTools2017()
static QVector<VisualStudioInstallation> detectVisualStudioFromVsWhere(const QString &vswhere)
{
QVector<VisualStudioInstallation> installations;
- QtcProcess vsWhereProcess;
+ Process vsWhereProcess;
vsWhereProcess.setCodec(QTextCodec::codecForName("UTF-8"));
const int timeoutS = 5;
vsWhereProcess.setTimeoutS(timeoutS);
@@ -649,7 +649,7 @@ Macros MsvcToolChain::msvcPredefinedMacros(const QStringList &cxxflags,
qWarning("%s: %s", Q_FUNC_INFO, qPrintable(saver.errorString()));
return predefinedMacros;
}
- Utils::QtcProcess cpp;
+ Utils::Process cpp;
cpp.setEnvironment(env);
cpp.setWorkingDirectory(Utils::TemporaryDirectory::masterDirectoryFilePath());
QStringList arguments;
@@ -1555,7 +1555,7 @@ static QVersionNumber clangClVersion(const FilePath &clangClPath)
if (!dllversion.isEmpty())
return QVersionNumber::fromString(dllversion);
- QtcProcess clangClProcess;
+ Process clangClProcess;
clangClProcess.setCommand({clangClPath, {"--version"}});
clangClProcess.runBlocking();
if (clangClProcess.result() != ProcessResult::FinishedWithSuccess)
@@ -1772,7 +1772,7 @@ Macros ClangClToolChain::msvcPredefinedMacros(const QStringList &cxxflags,
if (!cxxflags.contains("--driver-mode=g++"))
return MsvcToolChain::msvcPredefinedMacros(cxxflags, env);
- QtcProcess cpp;
+ Process cpp;
cpp.setEnvironment(env);
cpp.setWorkingDirectory(Utils::TemporaryDirectory::masterDirectoryFilePath());
@@ -2122,7 +2122,7 @@ std::optional<QString> MsvcToolChain::generateEnvironmentSettings(const Utils::E
return QString();
}
- Utils::QtcProcess run;
+ Utils::Process run;
// As of WinSDK 7.1, there is logic preventing the path from being set
// correctly if "ORIGINALPATH" is already set. That can cause problems
diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp
index 39f2af549a..3f0accdc31 100644
--- a/src/plugins/projectexplorer/runcontrol.cpp
+++ b/src/plugins/projectexplorer/runcontrol.cpp
@@ -1179,7 +1179,7 @@ public:
bool m_runAsRoot = false;
- QtcProcess m_process;
+ Process m_process;
QTextCodec *m_outputCodec = nullptr;
QTextCodec::ConverterState m_outputCodecState;
@@ -1216,11 +1216,11 @@ SimpleTargetRunnerPrivate::SimpleTargetRunnerPrivate(SimpleTargetRunner *parent)
: q(parent)
{
m_process.setProcessChannelMode(defaultProcessChannelMode());
- connect(&m_process, &QtcProcess::started, this, &SimpleTargetRunnerPrivate::forwardStarted);
- connect(&m_process, &QtcProcess::done, this, &SimpleTargetRunnerPrivate::handleDone);
- connect(&m_process, &QtcProcess::readyReadStandardError,
+ connect(&m_process, &Process::started, this, &SimpleTargetRunnerPrivate::forwardStarted);
+ connect(&m_process, &Process::done, this, &SimpleTargetRunnerPrivate::handleDone);
+ connect(&m_process, &Process::readyReadStandardError,
this, &SimpleTargetRunnerPrivate::handleStandardError);
- connect(&m_process, &QtcProcess::readyReadStandardOutput,
+ connect(&m_process, &Process::readyReadStandardOutput,
this, &SimpleTargetRunnerPrivate::handleStandardOutput);
if (WinDebugInterface::instance()) {
diff --git a/src/plugins/python/pipsupport.cpp b/src/plugins/python/pipsupport.cpp
index 0a155cb464..db45647945 100644
--- a/src/plugins/python/pipsupport.cpp
+++ b/src/plugins/python/pipsupport.cpp
@@ -27,9 +27,9 @@ const char pipInstallTaskId[] = "Python::pipInstallTask";
PipInstallTask::PipInstallTask(const FilePath &python)
: m_python(python)
{
- connect(&m_process, &QtcProcess::done, this, &PipInstallTask::handleDone);
- connect(&m_process, &QtcProcess::readyReadStandardError, this, &PipInstallTask::handleError);
- connect(&m_process, &QtcProcess::readyReadStandardOutput, this, &PipInstallTask::handleOutput);
+ connect(&m_process, &Process::done, this, &PipInstallTask::handleDone);
+ connect(&m_process, &Process::readyReadStandardError, this, &PipInstallTask::handleError);
+ connect(&m_process, &Process::readyReadStandardOutput, this, &PipInstallTask::handleOutput);
connect(&m_killTimer, &QTimer::timeout, this, &PipInstallTask::cancel);
connect(&m_watcher, &QFutureWatcher<void>::canceled, this, &PipInstallTask::cancel);
m_watcher.setFuture(m_future.future());
@@ -160,7 +160,7 @@ static PipPackageInfo infoImpl(const PipPackage &package, const FilePath &python
{
PipPackageInfo result;
- QtcProcess pip;
+ Process pip;
pip.setCommand(CommandLine(python, {"-m", "pip", "show", "-f", package.packageName}));
pip.runBlocking();
QString fieldName;
diff --git a/src/plugins/python/pipsupport.h b/src/plugins/python/pipsupport.h
index ea59519c32..fefd329575 100644
--- a/src/plugins/python/pipsupport.h
+++ b/src/plugins/python/pipsupport.h
@@ -80,7 +80,7 @@ private:
const Utils::FilePath m_python;
QList<PipPackage> m_packages;
- Utils::QtcProcess m_process;
+ Utils::Process m_process;
QFutureInterface<void> m_future;
QFutureWatcher<void> m_watcher;
QTimer m_killTimer;
diff --git a/src/plugins/python/pyside.cpp b/src/plugins/python/pyside.cpp
index 5e69c096a3..eb604f01e6 100644
--- a/src/plugins/python/pyside.cpp
+++ b/src/plugins/python/pyside.cpp
@@ -55,7 +55,7 @@ bool PySideInstaller::missingPySideInstallation(const FilePath &pythonPath,
if (pythonWithPyside[pythonPath].contains(pySide))
return false;
- QtcProcess pythonProcess;
+ Process pythonProcess;
pythonProcess.setCommand({pythonPath, {"-c", "import " + pySide}});
pythonProcess.runBlocking();
const bool missing = pythonProcess.result() != ProcessResult::FinishedWithSuccess;
diff --git a/src/plugins/python/pysideuicextracompiler.cpp b/src/plugins/python/pysideuicextracompiler.cpp
index b1e7e31bb7..c195aeaa1f 100644
--- a/src/plugins/python/pysideuicextracompiler.cpp
+++ b/src/plugins/python/pysideuicextracompiler.cpp
@@ -30,7 +30,7 @@ FilePath PySideUicExtraCompiler::command() const
return m_pySideUic;
}
-FileNameToContentsHash PySideUicExtraCompiler::handleProcessFinished(QtcProcess *process)
+FileNameToContentsHash PySideUicExtraCompiler::handleProcessFinished(Process *process)
{
FileNameToContentsHash result;
if (process->exitStatus() != QProcess::NormalExit && process->exitCode() != 0)
diff --git a/src/plugins/python/pysideuicextracompiler.h b/src/plugins/python/pysideuicextracompiler.h
index f2a09bed78..058717621e 100644
--- a/src/plugins/python/pysideuicextracompiler.h
+++ b/src/plugins/python/pysideuicextracompiler.h
@@ -21,7 +21,7 @@ public:
private:
Utils::FilePath command() const override;
ProjectExplorer::FileNameToContentsHash handleProcessFinished(
- Utils::QtcProcess *process) override;
+ Utils::Process *process) override;
Utils::FilePath m_pySideUic;
};
diff --git a/src/plugins/python/pythonlanguageclient.cpp b/src/plugins/python/pythonlanguageclient.cpp
index 75ee2c8b68..6d3d7c8cfa 100644
--- a/src/plugins/python/pythonlanguageclient.cpp
+++ b/src/plugins/python/pythonlanguageclient.cpp
@@ -80,7 +80,7 @@ FilePath getPylsModulePath(CommandLine pylsCommand)
pylsCommand.addArg("-h");
- QtcProcess pythonProcess;
+ Process pythonProcess;
Environment env = pythonProcess.environment();
env.set("PYTHONVERBOSE", "x");
pythonProcess.setEnvironment(env);
@@ -114,7 +114,7 @@ static PythonLanguageServerState checkPythonLanguageServer(const FilePath &pytho
const CommandLine pythonLShelpCommand(python, {"-m", "pylsp", "-h"});
const FilePath &modulePath = getPylsModulePath(pythonLShelpCommand);
- QtcProcess pythonProcess;
+ Process pythonProcess;
pythonProcess.setCommand(pythonLShelpCommand);
pythonProcess.runBlocking();
if (pythonProcess.allOutput().contains("Python Language Server"))
diff --git a/src/plugins/python/pythonsettings.cpp b/src/plugins/python/pythonsettings.cpp
index d6eccc999b..119bd9d260 100644
--- a/src/plugins/python/pythonsettings.cpp
+++ b/src/plugins/python/pythonsettings.cpp
@@ -62,7 +62,7 @@ static Interpreter createInterpreter(const FilePath &python,
result.id = QUuid::createUuid().toString();
result.command = python;
- QtcProcess pythonProcess;
+ Process pythonProcess;
pythonProcess.setProcessChannelMode(QProcess::MergedChannels);
pythonProcess.setTimeoutS(1);
pythonProcess.setCommand({python, {"--version"}});
diff --git a/src/plugins/python/pythonutils.cpp b/src/plugins/python/pythonutils.cpp
index 1f89eef5b5..328ada95d9 100644
--- a/src/plugins/python/pythonutils.cpp
+++ b/src/plugins/python/pythonutils.cpp
@@ -116,13 +116,13 @@ void openPythonRepl(QObject *parent, const FilePath &file, ReplType type)
};
const auto args = QStringList{"-i"} + replImportArgs(file, type);
- auto process = new QtcProcess(parent);
+ auto process = new Process(parent);
process->setTerminalMode(TerminalMode::On);
const FilePath pythonCommand = detectPython(file);
process->setCommand({pythonCommand, args});
process->setWorkingDirectory(workingDir(file));
const QString commandLine = process->commandLine().toUserOutput();
- QObject::connect(process, &QtcProcess::done, process, [process, commandLine] {
+ QObject::connect(process, &Process::done, process, [process, commandLine] {
if (process->error() != QProcess::UnknownError) {
Core::MessageManager::writeDisrupting(Tr::tr(
(process->error() == QProcess::FailedToStart)
@@ -142,7 +142,7 @@ QString pythonName(const FilePath &pythonPath)
return {};
QString name = nameForPython.value(pythonPath);
if (name.isEmpty()) {
- QtcProcess pythonProcess;
+ Process pythonProcess;
pythonProcess.setTimeoutS(2);
pythonProcess.setCommand({pythonPath, {"--version"}});
pythonProcess.runBlocking();
@@ -174,10 +174,10 @@ void createVenv(const Utils::FilePath &python,
const CommandLine command(python, QStringList{"-m", "venv", venvPath.toUserOutput()});
- auto process = new QtcProcess;
+ auto process = new Process;
auto progress = new Core::ProcessProgress(process);
progress->setDisplayName(Tr::tr("Create Python venv"));
- QObject::connect(process, &QtcProcess::done, [process, callback](){
+ QObject::connect(process, &Process::done, [process, callback](){
callback(process->result() == ProcessResult::FinishedWithSuccess);
process->deleteLater();
});
diff --git a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp
index c5e658ba54..953768661d 100644
--- a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp
@@ -223,7 +223,7 @@ QString QbsProfileManager::runQbsConfig(QbsConfigOp op, const QString &key, cons
const Utils::FilePath qbsConfigExe = QbsSettings::qbsConfigFilePath();
if (qbsConfigExe.isEmpty() || !qbsConfigExe.exists())
return {};
- Utils::QtcProcess qbsConfig;
+ Utils::Process qbsConfig;
qbsConfig.setCommand({qbsConfigExe, args});
qbsConfig.start();
if (!qbsConfig.waitForFinished(5000)) {
diff --git a/src/plugins/qbsprojectmanager/qbssession.cpp b/src/plugins/qbsprojectmanager/qbssession.cpp
index 06c605e842..7248143313 100644
--- a/src/plugins/qbsprojectmanager/qbssession.cpp
+++ b/src/plugins/qbsprojectmanager/qbssession.cpp
@@ -129,7 +129,7 @@ private:
class QbsSession::Private
{
public:
- QtcProcess *qbsProcess = nullptr;
+ Process *qbsProcess = nullptr;
PacketReader *packetReader = nullptr;
QJsonObject currentRequest;
QJsonObject projectData;
@@ -152,16 +152,16 @@ void QbsSession::initialize()
d->packetReader = new PacketReader(this);
- d->qbsProcess = new QtcProcess(this);
+ d->qbsProcess = new Process(this);
d->qbsProcess->setProcessMode(ProcessMode::Writer);
d->qbsProcess->setEnvironment(env);
- connect(d->qbsProcess, &QtcProcess::readyReadStandardOutput, this, [this] {
+ connect(d->qbsProcess, &Process::readyReadStandardOutput, this, [this] {
d->packetReader->handleData(d->qbsProcess->readAllRawStandardOutput());
});
- connect(d->qbsProcess, &QtcProcess::readyReadStandardError, this, [this] {
+ connect(d->qbsProcess, &Process::readyReadStandardError, this, [this] {
qCDebug(qbsPmLog) << "[qbs stderr]: " << d->qbsProcess->readAllRawStandardError();
});
- connect(d->qbsProcess, &QtcProcess::done, this, [this] {
+ connect(d->qbsProcess, &Process::done, this, [this] {
if (d->qbsProcess->result() == ProcessResult::StartFailed) {
d->eventLoop.exit(1);
setError(Error::QbsFailedToStart);
diff --git a/src/plugins/qbsprojectmanager/qbssettings.cpp b/src/plugins/qbsprojectmanager/qbssettings.cpp
index 2168d56d9e..6317580f68 100644
--- a/src/plugins/qbsprojectmanager/qbssettings.cpp
+++ b/src/plugins/qbsprojectmanager/qbssettings.cpp
@@ -31,7 +31,7 @@ static QString getQbsVersion(const FilePath &qbsExe)
{
if (qbsExe.isEmpty() || !qbsExe.exists())
return {};
- QtcProcess qbsProc;
+ Process qbsProc;
qbsProc.setCommand({qbsExe, {"--version"}});
qbsProc.start();
if (!qbsProc.waitForFinished(5000) || qbsProc.exitCode() != 0)
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index 3846ce2eb8..a78c001283 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -1593,12 +1593,12 @@ void QmakeBuildSystem::runGenerator(Utils::Id id)
showError(Tr::tr("Cannot create output directory \"%1\"").arg(outDir.toUserOutput()));
return;
}
- const auto proc = new QtcProcess(this);
- connect(proc, &QtcProcess::done, proc, &QtcProcess::deleteLater);
- connect(proc, &QtcProcess::readyReadStandardOutput, this, [proc] {
+ const auto proc = new Process(this);
+ connect(proc, &Process::done, proc, &Process::deleteLater);
+ connect(proc, &Process::readyReadStandardOutput, this, [proc] {
Core::MessageManager::writeFlashing(QString::fromLocal8Bit(proc->readAllRawStandardOutput()));
});
- connect(proc, &QtcProcess::readyReadStandardError, this, [proc] {
+ connect(proc, &Process::readyReadStandardError, this, [proc] {
Core::MessageManager::writeDisrupting(QString::fromLocal8Bit(proc->readAllRawStandardError()));
});
proc->setWorkingDirectory(outDir);
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 7271e1f6e2..d8e99a39a5 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -284,14 +284,14 @@ void QMakeStep::doRun()
using namespace Tasking;
- const auto setupQMake = [this](QtcProcess &process) {
+ const auto setupQMake = [this](Process &process) {
m_outputFormatter->setLineParsers({new QMakeParser});
ProcessParameters *pp = processParameters();
pp->setCommandLine(m_qmakeCommand);
setupProcess(&process);
};
- const auto setupMakeQMake = [this](QtcProcess &process) {
+ const auto setupMakeQMake = [this](Process &process) {
auto *parser = new GnuMakeParser;
parser->addSearchDir(processParameters()->workingDirectory());
m_outputFormatter->setLineParsers({parser});
@@ -300,13 +300,13 @@ void QMakeStep::doRun()
setupProcess(&process);
};
- const auto onDone = [this](const QtcProcess &) {
+ const auto onDone = [this](const Process &) {
const QString command = displayedParameters()->effectiveCommand().toUserOutput();
emit addOutput(Tr::tr("The process \"%1\" exited normally.").arg(command),
OutputFormat::NormalMessage);
};
- const auto onError = [this](const QtcProcess &process) {
+ const auto onError = [this](const Process &process) {
const QString command = displayedParameters()->effectiveCommand().toUserOutput();
if (process.result() == ProcessResult::FinishedWithError) {
emit addOutput(Tr::tr("The process \"%1\" exited with code %2.")
diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h
index 90ae46010a..33ad100c0b 100644
--- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h
+++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h
@@ -23,7 +23,7 @@ QT_END_NAMESPACE
class StudioQuickWidget;
namespace Utils {
- class QtcProcess;
+ class Process;
}
namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
index b8b1fa94e8..f6ea4a8455 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
@@ -1667,10 +1667,10 @@ void openEffectMaker(const QString &filePath)
if (env.osType() == Utils::OsTypeMac)
env.appendOrSet("QSG_RHI_BACKEND", "metal");
- Utils::QtcProcess *qqemProcess = new Utils::QtcProcess();
+ Utils::Process *qqemProcess = new Utils::Process();
qqemProcess->setEnvironment(env);
qqemProcess->setCommand({ effectMakerPath, arguments });
- QObject::connect(qqemProcess, &Utils::QtcProcess::done, [qqemProcess]() {
+ QObject::connect(qqemProcess, &Utils::Process::done, [qqemProcess]() {
qqemProcess->deleteLater();
});
qqemProcess->start();
diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
index 467cef0ed3..632dbfce07 100644
--- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
+++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
@@ -34,7 +34,7 @@ class Target;
}
namespace Utils {
-class QtcProcess;
+class Process;
}
namespace QmlDesigner {
@@ -228,7 +228,7 @@ private: // functions
void updateWatcher(const QString &path);
void handleShaderChanges();
- void handleQsbProcessExit(Utils::QtcProcess *qsbProcess, const QString &shader);
+ void handleQsbProcessExit(Utils::Process *qsbProcess, const QString &shader);
void updateQsbPathToFilterMap();
void updateRotationBlocks();
void maybeResetOnPropertyChange(const PropertyName &name, const ModelNode &node,
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index 406a7a295d..67674ed5e9 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -2066,7 +2066,7 @@ void NodeInstanceView::updateWatcher(const QString &path)
m_generateQsbFilesTimer.start();
}
-void NodeInstanceView::handleQsbProcessExit(Utils::QtcProcess *qsbProcess, const QString &shader)
+void NodeInstanceView::handleQsbProcessExit(Utils::Process *qsbProcess, const QString &shader)
{
--m_remainingQsbTargets;
@@ -2167,8 +2167,8 @@ void NodeInstanceView::handleShaderChanges()
QStringList args = baseArgs;
args.append(outPath.toString());
args.append(shader);
- auto qsbProcess = new Utils::QtcProcess(this);
- connect(qsbProcess, &Utils::QtcProcess::done, this, [this, qsbProcess, shader] {
+ auto qsbProcess = new Utils::Process(this);
+ connect(qsbProcess, &Utils::Process::done, this, [this, qsbProcess, shader] {
handleQsbProcessExit(qsbProcess, shader);
});
qsbProcess->setWorkingDirectory(srcPath);
diff --git a/src/plugins/qmldesigner/generateresource.cpp b/src/plugins/qmldesigner/generateresource.cpp
index 8b00335ce3..673ba41de4 100644
--- a/src/plugins/qmldesigner/generateresource.cpp
+++ b/src/plugins/qmldesigner/generateresource.cpp
@@ -177,7 +177,7 @@ QList<GenerateResource::ResourceFile> getFilesFromQrc(QFile *file, bool inProjec
static bool runRcc(const CommandLine &command, const FilePath &workingDir,
const QString &resourceFile)
{
- Utils::QtcProcess rccProcess;
+ Utils::Process rccProcess;
rccProcess.setWorkingDirectory(workingDir);
rccProcess.setCommand(command);
rccProcess.start();
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index 443d5478fc..2c1a294e7a 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -116,10 +116,10 @@ void QmlProjectPlugin::openQDS(const Utils::FilePath &fileName)
qputenv(Constants::enviromentLaunchedQDS, "true");
//-a and -client arguments help to append project to open design studio application
if (Utils::HostOsInfo::isMacHost())
- qdsStarted = Utils::QtcProcess::startDetached(
+ qdsStarted = Utils::Process::startDetached(
{"/usr/bin/open", {"-a", qdsPath.path(), fileName.toString()}});
else
- qdsStarted = Utils::QtcProcess::startDetached({qdsPath, {"-client", fileName.toString()}});
+ qdsStarted = Utils::Process::startDetached({qdsPath, {"-client", fileName.toString()}});
if (!qdsStarted) {
QMessageBox::warning(Core::ICore::dialogParent(),
diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
index 65caee381a..6450223e43 100644
--- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
+++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
@@ -119,12 +119,12 @@ QList<DeployableFile> collectFilesToUpload(const DeployableFile &deployable)
TaskItem QnxDeployQtLibrariesDialogPrivate::checkDirTask()
{
- const auto setupHandler = [this](QtcProcess &process) {
+ const auto setupHandler = [this](Process &process) {
m_deployLogWindow->appendPlainText(Tr::tr("Checking existence of \"%1\"")
.arg(fullRemoteDirectory()));
process.setCommand({m_device->filePath("test"), {"-d", fullRemoteDirectory()}});
};
- const auto doneHandler = [this](const QtcProcess &process) {
+ const auto doneHandler = [this](const Process &process) {
Q_UNUSED(process)
const int answer = QMessageBox::question(q, q->windowTitle(),
Tr::tr("The remote directory \"%1\" already exists.\n"
@@ -133,7 +133,7 @@ TaskItem QnxDeployQtLibrariesDialogPrivate::checkDirTask()
QMessageBox::Yes | QMessageBox::No);
m_checkResult = answer == QMessageBox::Yes ? CheckResult::RemoveDir : CheckResult::Abort;
};
- const auto errorHandler = [this](const QtcProcess &process) {
+ const auto errorHandler = [this](const Process &process) {
if (process.result() != ProcessResult::FinishedWithError) {
m_deployLogWindow->appendPlainText(Tr::tr("Connection failed: %1")
.arg(process.errorString()));
@@ -147,14 +147,14 @@ TaskItem QnxDeployQtLibrariesDialogPrivate::checkDirTask()
TaskItem QnxDeployQtLibrariesDialogPrivate::removeDirTask()
{
- const auto setupHandler = [this](QtcProcess &process) {
+ const auto setupHandler = [this](Process &process) {
if (m_checkResult != CheckResult::RemoveDir)
return TaskAction::StopWithDone;
m_deployLogWindow->appendPlainText(Tr::tr("Removing \"%1\"").arg(fullRemoteDirectory()));
process.setCommand({m_device->filePath("rm"), {"-rf", fullRemoteDirectory()}});
return TaskAction::Continue;
};
- const auto errorHandler = [this](const QtcProcess &process) {
+ const auto errorHandler = [this](const Process &process) {
QTC_ASSERT(process.exitCode() == 0, return);
m_deployLogWindow->appendPlainText(Tr::tr("Connection failed: %1")
.arg(process.errorString()));
@@ -198,11 +198,11 @@ TaskItem QnxDeployQtLibrariesDialogPrivate::uploadTask()
TaskItem QnxDeployQtLibrariesDialogPrivate::chmodTask(const DeployableFile &file)
{
- const auto setupHandler = [=](QtcProcess &process) {
+ const auto setupHandler = [=](Process &process) {
process.setCommand({m_device->filePath("chmod"),
{"a+x", Utils::ProcessArgs::quoteArgUnix(file.remoteFilePath())}});
};
- const auto errorHandler = [=](const QtcProcess &process) {
+ const auto errorHandler = [=](const Process &process) {
const QString error = process.errorString();
if (!error.isEmpty()) {
emitWarningMessage(Tr::tr("Remote chmod failed for file \"%1\": %2")
diff --git a/src/plugins/qnx/qnxdevicetester.cpp b/src/plugins/qnx/qnxdevicetester.cpp
index 9e9e0524e2..a96f5b6d7e 100644
--- a/src/plugins/qnx/qnxdevicetester.cpp
+++ b/src/plugins/qnx/qnxdevicetester.cpp
@@ -44,7 +44,7 @@ void QnxDeviceTester::testDevice(const ProjectExplorer::IDevice::Ptr &device)
using namespace Tasking;
- auto setupHandler = [device, this](QtcProcess &process) {
+ auto setupHandler = [device, this](Process &process) {
emit progressMessage(Tr::tr("Checking that files can be created in %1...")
.arg(Constants::QNX_TMP_DIR));
const QString pidFile = QString("%1/qtc_xxxx.pid").arg(Constants::QNX_TMP_DIR);
@@ -52,10 +52,10 @@ void QnxDeviceTester::testDevice(const ProjectExplorer::IDevice::Ptr &device)
{"-c", QLatin1String("rm %1 > /dev/null 2>&1; echo ABC > %1 && rm %1").arg(pidFile)});
process.setCommand(cmd);
};
- auto doneHandler = [this](const QtcProcess &) {
+ auto doneHandler = [this](const Process &) {
emit progressMessage(Tr::tr("Files can be created in /var/run.") + '\n');
};
- auto errorHandler = [this](const QtcProcess &process) {
+ auto errorHandler = [this](const Process &process) {
const QString message = process.result() == ProcessResult::StartFailed
? Tr::tr("An error occurred while checking that files can be created in %1.")
.arg(Constants::QNX_TMP_DIR) + '\n' + process.errorString()
diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp
index 5c1107f599..3cc73e6d54 100644
--- a/src/plugins/qnx/qnxutils.cpp
+++ b/src/plugins/qnx/qnxutils.cpp
@@ -98,7 +98,7 @@ EnvironmentItems QnxUtils::qnxEnvironmentFromEnvFile(const FilePath &filePath)
tmpFile->writeFileContents(content.toUtf8());
// running wrapper script
- QtcProcess process;
+ Process process;
if (isWindows)
process.setCommand({filePath.withNewPath("cmd.exe"), {"/C", tmpFile->path()}});
else
diff --git a/src/plugins/qnx/slog2inforunner.cpp b/src/plugins/qnx/slog2inforunner.cpp
index 0d17b872c9..21de26e5a2 100644
--- a/src/plugins/qnx/slog2inforunner.cpp
+++ b/src/plugins/qnx/slog2inforunner.cpp
@@ -34,36 +34,36 @@ void Slog2InfoRunner::start()
using namespace Utils::Tasking;
QTC_CHECK(!m_taskTree);
- const auto testStartHandler = [this](QtcProcess &process) {
+ const auto testStartHandler = [this](Process &process) {
process.setCommand({device()->filePath("slog2info"), {}});
};
- const auto testDoneHandler = [this](const QtcProcess &) {
+ const auto testDoneHandler = [this](const Process &) {
m_found = true;
};
- const auto testErrorHandler = [this](const QtcProcess &) {
+ const auto testErrorHandler = [this](const Process &) {
appendMessage(Tr::tr("Warning: \"slog2info\" is not found on the device, "
"debug output not available."), ErrorMessageFormat);
};
- const auto launchTimeStartHandler = [this](QtcProcess &process) {
+ const auto launchTimeStartHandler = [this](Process &process) {
process.setCommand({device()->filePath("date"), "+\"%d %H:%M:%S\"", CommandLine::Raw});
};
- const auto launchTimeDoneHandler = [this](const QtcProcess &process) {
+ const auto launchTimeDoneHandler = [this](const Process &process) {
QTC_CHECK(!m_applicationId.isEmpty());
QTC_CHECK(m_found);
m_launchDateTime = QDateTime::fromString(process.cleanedStdOut().trimmed(), "dd HH:mm:ss");
};
- const auto logStartHandler = [this](QtcProcess &process) {
+ const auto logStartHandler = [this](Process &process) {
process.setCommand({device()->filePath("slog2info"), {"-w"}});
- connect(&process, &QtcProcess::readyReadStandardOutput, this, [&] {
+ connect(&process, &Process::readyReadStandardOutput, this, [&] {
processLogInput(QString::fromLatin1(process.readAllRawStandardOutput()));
});
- connect(&process, &QtcProcess::readyReadStandardError, this, [&] {
+ connect(&process, &Process::readyReadStandardError, this, [&] {
appendMessage(QString::fromLatin1(process.readAllRawStandardError()), StdErrFormat);
});
};
- const auto logErrorHandler = [this](const QtcProcess &process) {
+ const auto logErrorHandler = [this](const Process &process) {
appendMessage(Tr::tr("Cannot show slog2info output. Error: %1").arg(process.errorString()),
StdErrFormat);
};
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index c96f310e0b..c08f296a8c 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -1684,7 +1684,7 @@ static QByteArray runQmakeQuery(const FilePath &binary, const Environment &env,
// Prevent e.g. qmake 4.x on MinGW to show annoying errors about missing dll's.
WindowsCrashDialogBlocker crashDialogBlocker;
- QtcProcess process;
+ Process process;
process.setEnvironment(env);
process.setCommand({binary, {"-query"}});
process.start();
diff --git a/src/plugins/qtsupport/externaleditors.cpp b/src/plugins/qtsupport/externaleditors.cpp
index ee3a361103..9732693e6e 100644
--- a/src/plugins/qtsupport/externaleditors.cpp
+++ b/src/plugins/qtsupport/externaleditors.cpp
@@ -224,7 +224,7 @@ static bool startEditorProcess(const LaunchData &data, QString *errorMessage)
if (debug)
qDebug() << Q_FUNC_INFO << '\n' << data.binary << data.arguments << data.workingDirectory;
qint64 pid = 0;
- if (!QtcProcess::startDetached({FilePath::fromString(data.binary), data.arguments}, data.workingDirectory, &pid)) {
+ if (!Process::startDetached({FilePath::fromString(data.binary), data.arguments}, data.workingDirectory, &pid)) {
*errorMessage = msgStartFailed(data.binary, data.arguments);
return false;
}
diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp
index 85c467281d..7cb67f6171 100644
--- a/src/plugins/qtsupport/qscxmlcgenerator.cpp
+++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp
@@ -91,7 +91,7 @@ bool QScxmlcGenerator::prepareToRun(const QByteArray &sourceContents)
return true;
}
-FileNameToContentsHash QScxmlcGenerator::handleProcessFinished(Utils::QtcProcess *process)
+FileNameToContentsHash QScxmlcGenerator::handleProcessFinished(Utils::Process *process)
{
Q_UNUSED(process)
const Utils::FilePath wd = workingDirectory();
diff --git a/src/plugins/qtsupport/qscxmlcgenerator.h b/src/plugins/qtsupport/qscxmlcgenerator.h
index 633fb1231b..342db3cb09 100644
--- a/src/plugins/qtsupport/qscxmlcgenerator.h
+++ b/src/plugins/qtsupport/qscxmlcgenerator.h
@@ -23,7 +23,7 @@ protected:
private:
Utils::FilePath tmpFile() const;
- ProjectExplorer::FileNameToContentsHash handleProcessFinished(Utils::QtcProcess *process) override;
+ ProjectExplorer::FileNameToContentsHash handleProcessFinished(Utils::Process *process) override;
bool prepareToRun(const QByteArray &sourceContents) override;
ProjectExplorer::Tasks parseIssues(const QByteArray &processStderr) override;
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index 8a1c94bddc..37d141e11c 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -76,7 +76,7 @@ static void processRunnerCallback(ProcessData *data)
{
FilePath rootPath = FilePath::fromString(data->deviceRoot);
- QtcProcess proc;
+ Process proc;
proc.setProcessChannelMode(data->processChannelMode);
proc.setCommand({rootPath.withNewPath("/bin/sh"), {QString("-c"), data->command}});
proc.setWorkingDirectory(FilePath::fromString(data->workingDirectory));
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index e9a3691cdb..bde9d2e337 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -368,7 +368,7 @@ static void saveQtVersions()
// Executes qtchooser with arguments in a process and returns its output
static QList<QByteArray> runQtChooser(const QString &qtchooser, const QStringList &arguments)
{
- QtcProcess p;
+ Process p;
p.setCommand({FilePath::fromString(qtchooser), arguments});
p.start();
p.waitForFinished();
diff --git a/src/plugins/qtsupport/uicgenerator.cpp b/src/plugins/qtsupport/uicgenerator.cpp
index 36c109e7b4..f48a8d310e 100644
--- a/src/plugins/qtsupport/uicgenerator.cpp
+++ b/src/plugins/qtsupport/uicgenerator.cpp
@@ -48,7 +48,7 @@ QStringList UicGenerator::arguments() const
return {"-p"};
}
-FileNameToContentsHash UicGenerator::handleProcessFinished(Utils::QtcProcess *process)
+FileNameToContentsHash UicGenerator::handleProcessFinished(Utils::Process *process)
{
FileNameToContentsHash result;
if (process->exitStatus() != QProcess::NormalExit && process->exitCode() != 0)
diff --git a/src/plugins/qtsupport/uicgenerator.h b/src/plugins/qtsupport/uicgenerator.h
index 1d9344634a..d68b6814c2 100644
--- a/src/plugins/qtsupport/uicgenerator.h
+++ b/src/plugins/qtsupport/uicgenerator.h
@@ -18,7 +18,7 @@ public:
protected:
Utils::FilePath command() const override;
QStringList arguments() const override;
- ProjectExplorer::FileNameToContentsHash handleProcessFinished(Utils::QtcProcess *process) override;
+ ProjectExplorer::FileNameToContentsHash handleProcessFinished(Utils::Process *process) override;
};
class UicGeneratorFactory : public ProjectExplorer::ExtraCompilerFactory
diff --git a/src/plugins/remotelinux/customcommanddeploystep.cpp b/src/plugins/remotelinux/customcommanddeploystep.cpp
index 80e8ded988..7249d2c6b2 100644
--- a/src/plugins/remotelinux/customcommanddeploystep.cpp
+++ b/src/plugins/remotelinux/customcommanddeploystep.cpp
@@ -57,22 +57,22 @@ CheckResult CustomCommandDeployStep::isDeploymentPossible() const
Group CustomCommandDeployStep::deployRecipe()
{
- const auto setupHandler = [this](QtcProcess &process) {
+ const auto setupHandler = [this](Process &process) {
addProgressMessage(Tr::tr("Starting remote command \"%1\"...").arg(m_commandLine));
process.setCommand({deviceConfiguration()->filePath("/bin/sh"),
{"-c", m_commandLine}});
- QtcProcess *proc = &process;
- connect(proc, &QtcProcess::readyReadStandardOutput, this, [this, proc] {
+ Process *proc = &process;
+ connect(proc, &Process::readyReadStandardOutput, this, [this, proc] {
handleStdOutData(proc->readAllStandardOutput());
});
- connect(proc, &QtcProcess::readyReadStandardError, this, [this, proc] {
+ connect(proc, &Process::readyReadStandardError, this, [this, proc] {
handleStdErrData(proc->readAllStandardError());
});
};
- const auto doneHandler = [this](const QtcProcess &) {
+ const auto doneHandler = [this](const Process &) {
addProgressMessage(Tr::tr("Remote command finished successfully."));
};
- const auto errorHandler = [this](const QtcProcess &process) {
+ const auto errorHandler = [this](const Process &process) {
if (process.error() != QProcess::UnknownError
|| process.exitStatus() != QProcess::NormalExit) {
addErrorMessage(Tr::tr("Remote process failed: %1").arg(process.errorString()));
diff --git a/src/plugins/remotelinux/filesystemaccess_test.cpp b/src/plugins/remotelinux/filesystemaccess_test.cpp
index 44dc404810..24267b16bd 100644
--- a/src/plugins/remotelinux/filesystemaccess_test.cpp
+++ b/src/plugins/remotelinux/filesystemaccess_test.cpp
@@ -186,7 +186,7 @@ void FileSystemAccessTest::testWorkingDirectory()
{
const FilePath dir = baseFilePath() / "testdir with space and 'various' \"quotes\" here";
QVERIFY(dir.ensureWritableDir());
- QtcProcess proc;
+ Process proc;
proc.setCommand({"pwd", {}});
proc.setWorkingDirectory(dir);
proc.start();
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index c1abc891b7..4889dbb35d 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -70,7 +70,7 @@ public:
bool isDeploymentNecessary() const final;
Utils::Tasking::Group deployRecipe() final;
- QDateTime timestampFromStat(const DeployableFile &file, QtcProcess *statProc);
+ QDateTime timestampFromStat(const DeployableFile &file, Process *statProc);
using FilesToStat = std::function<QList<DeployableFile>(UploadStorage *)>;
using StatEndHandler
@@ -115,7 +115,7 @@ bool GenericDirectUploadStep::isDeploymentNecessary() const
}
QDateTime GenericDirectUploadStep::timestampFromStat(const DeployableFile &file,
- QtcProcess *statProc)
+ Process *statProc)
{
bool succeeded = false;
QString error;
@@ -160,13 +160,13 @@ TaskItem GenericDirectUploadStep::statTask(UploadStorage *storage,
const DeployableFile &file,
StatEndHandler statEndHandler)
{
- const auto setupHandler = [=](QtcProcess &process) {
+ const auto setupHandler = [=](Process &process) {
// We'd like to use --format=%Y, but it's not supported by busybox.
process.setCommand({deviceConfiguration()->filePath("stat"),
{"-t", Utils::ProcessArgs::quoteArgUnix(file.remoteFilePath())}});
};
- const auto endHandler = [=](const QtcProcess &process) {
- QtcProcess *proc = const_cast<QtcProcess *>(&process);
+ const auto endHandler = [=](const Process &process) {
+ Process *proc = const_cast<Process *>(&process);
const QDateTime timestamp = timestampFromStat(file, proc);
statEndHandler(storage, file, timestamp);
};
@@ -231,11 +231,11 @@ TaskItem GenericDirectUploadStep::uploadTask(const TreeStorage<UploadStorage> &s
TaskItem GenericDirectUploadStep::chmodTask(const DeployableFile &file)
{
- const auto setupHandler = [=](QtcProcess &process) {
+ const auto setupHandler = [=](Process &process) {
process.setCommand({deviceConfiguration()->filePath("chmod"),
{"a+x", Utils::ProcessArgs::quoteArgUnix(file.remoteFilePath())}});
};
- const auto errorHandler = [=](const QtcProcess &process) {
+ const auto errorHandler = [=](const Process &process) {
const QString error = process.errorString();
if (!error.isEmpty()) {
addWarningMessage(Tr::tr("Remote chmod failed for file \"%1\": %2")
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 583a6bdeaf..6aca035bb6 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -92,7 +92,7 @@ private:
QStringList connectionArgs(const FilePath &binary) const;
const SshParameters m_sshParameters;
- std::unique_ptr<QtcProcess> m_masterProcess;
+ std::unique_ptr<Process> m_masterProcess;
std::unique_ptr<QTemporaryDir> m_masterSocketDir;
QTimer m_timer;
int m_ref = 0;
@@ -158,11 +158,11 @@ void SshSharedConnection::connectToHost()
return;
}
- m_masterProcess.reset(new QtcProcess);
+ m_masterProcess.reset(new Process);
SshParameters::setupSshEnvironment(m_masterProcess.get());
m_timer.setSingleShot(true);
connect(&m_timer, &QTimer::timeout, this, &SshSharedConnection::autoDestructRequested);
- connect(m_masterProcess.get(), &QtcProcess::readyReadStandardOutput, this, [this] {
+ connect(m_masterProcess.get(), &Process::readyReadStandardOutput, this, [this] {
const QByteArray reply = m_masterProcess->readAllRawStandardOutput();
if (reply == "\n")
emitConnected();
@@ -170,7 +170,7 @@ void SshSharedConnection::connectToHost()
});
// TODO: in case of refused connection we are getting the following on stdErr:
// ssh: connect to host 127.0.0.1 port 22: Connection refused\r\n
- connect(m_masterProcess.get(), &QtcProcess::done, this, [this] {
+ connect(m_masterProcess.get(), &Process::done, this, [this] {
const ProcessResult result = m_masterProcess->result();
const ProcessResultData resultData = m_masterProcess->resultData();
if (result == ProcessResult::StartFailed) {
@@ -316,7 +316,7 @@ public:
QThread m_shellThread;
ShellThreadHandler *m_handler = nullptr;
mutable QMutex m_shellMutex;
- QList<QtcProcess *> m_terminals;
+ QList<Process *> m_terminals;
LinuxDeviceFileAccess m_fileAccess{this};
QReadWriteLock m_environmentCacheLock;
@@ -340,7 +340,7 @@ Environment LinuxDevicePrivate::getEnvironment()
if (m_environmentCache.has_value())
return m_environmentCache.value();
- QtcProcess getEnvProc;
+ Process getEnvProc;
getEnvProc.setCommand({q->filePath("env"), {}});
getEnvProc.runBlocking();
@@ -388,7 +388,7 @@ public:
// as this object is alive.
IDevice::ConstPtr m_device;
std::unique_ptr<SshConnectionHandle> m_connectionHandle;
- QtcProcess m_process;
+ Process m_process;
QString m_socketFilePath;
SshParameters m_sshParameters;
@@ -435,7 +435,7 @@ qint64 SshProcessInterface::processId() const
bool SshProcessInterface::runInShell(const CommandLine &command, const QByteArray &data)
{
- QtcProcess process;
+ Process process;
CommandLine cmd = {d->m_device->filePath("/bin/sh"), {"-c"}};
QString tmp;
ProcessArgs::addArg(&tmp, command.executable().path());
@@ -584,11 +584,11 @@ SshProcessInterfacePrivate::SshProcessInterfacePrivate(SshProcessInterface *sshI
, m_device(device)
, m_process(this)
{
- connect(&m_process, &QtcProcess::started, this, &SshProcessInterfacePrivate::handleStarted);
- connect(&m_process, &QtcProcess::done, this, &SshProcessInterfacePrivate::handleDone);
- connect(&m_process, &QtcProcess::readyReadStandardOutput,
+ connect(&m_process, &Process::started, this, &SshProcessInterfacePrivate::handleStarted);
+ connect(&m_process, &Process::done, this, &SshProcessInterfacePrivate::handleDone);
+ connect(&m_process, &Process::readyReadStandardOutput,
this, &SshProcessInterfacePrivate::handleReadyReadStandardOutput);
- connect(&m_process, &QtcProcess::readyReadStandardError,
+ connect(&m_process, &Process::readyReadStandardError,
this, &SshProcessInterfacePrivate::handleReadyReadStandardError);
}
@@ -796,7 +796,7 @@ class ShellThreadHandler : public QObject
}
private:
- void setupShellProcess(QtcProcess *shellProcess) override
+ void setupShellProcess(Process *shellProcess) override
{
SshParameters::setupSshEnvironment(shellProcess);
shellProcess->setCommand(m_cmdLine);
@@ -961,9 +961,9 @@ LinuxDevice::LinuxDevice()
}});
setOpenTerminal([this](const Environment &env, const FilePath &workingDir) {
- QtcProcess * const proc = new QtcProcess;
+ Process * const proc = new Process;
d->m_terminals.append(proc);
- QObject::connect(proc, &QtcProcess::done, proc, [this, proc] {
+ QObject::connect(proc, &Process::done, proc, [this, proc] {
if (proc->error() != QProcess::UnknownError) {
const QString errorString = proc->errorString();
QString message;
@@ -1172,10 +1172,10 @@ protected:
, m_process(this)
{
SshParameters::setupSshEnvironment(&m_process);
- connect(&m_process, &QtcProcess::readyReadStandardOutput, this, [this] {
+ connect(&m_process, &Process::readyReadStandardOutput, this, [this] {
emit progress(QString::fromLocal8Bit(m_process.readAllRawStandardOutput()));
});
- connect(&m_process, &QtcProcess::done, this, &SshTransferInterface::doneImpl);
+ connect(&m_process, &Process::done, this, &SshTransferInterface::doneImpl);
}
IDevice::ConstPtr device() const { return m_device; }
@@ -1215,7 +1215,7 @@ protected:
QString host() const { return m_sshParameters.host(); }
QString userAtHost() const { return m_sshParameters.userAtHost(); }
- QtcProcess &process() { return m_process; }
+ Process &process() { return m_process; }
private:
virtual void startImpl() = 0;
@@ -1274,7 +1274,7 @@ private:
QString m_socketFilePath;
bool m_connecting = false;
- QtcProcess m_process;
+ Process m_process;
};
class SftpTransferImpl : public SshTransferInterface
diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index f4df0b9bac..c28b2ecfc5 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -92,11 +92,11 @@ QStringList GenericLinuxDeviceTesterPrivate::commandsToTest() const
TaskItem GenericLinuxDeviceTesterPrivate::echoTask(const QString &contents) const
{
- const auto setup = [this, contents](QtcProcess &process) {
+ const auto setup = [this, contents](Process &process) {
emit q->progressMessage(Tr::tr("Sending echo to device..."));
process.setCommand({m_device->filePath("echo"), {contents}});
};
- const auto done = [this, contents](const QtcProcess &process) {
+ const auto done = [this, contents](const Process &process) {
const QString reply = Utils::chopIfEndsWith(process.cleanedStdOut(), '\n');
if (reply != contents)
emit q->errorMessage(Tr::tr("Device replied to echo with unexpected contents: \"%1\"")
@@ -104,7 +104,7 @@ TaskItem GenericLinuxDeviceTesterPrivate::echoTask(const QString &contents) cons
else
emit q->progressMessage(Tr::tr("Device replied to echo with expected contents.") + '\n');
};
- const auto error = [this](const QtcProcess &process) {
+ const auto error = [this](const Process &process) {
const QString stdErrOutput = process.cleanedStdErr();
if (!stdErrOutput.isEmpty())
emit q->errorMessage(Tr::tr("echo failed: %1").arg(stdErrOutput) + '\n');
@@ -116,14 +116,14 @@ TaskItem GenericLinuxDeviceTesterPrivate::echoTask(const QString &contents) cons
TaskItem GenericLinuxDeviceTesterPrivate::unameTask() const
{
- const auto setup = [this](QtcProcess &process) {
+ const auto setup = [this](Process &process) {
emit q->progressMessage(Tr::tr("Checking kernel version..."));
process.setCommand({m_device->filePath("uname"), {"-rsm"}});
};
- const auto done = [this](const QtcProcess &process) {
+ const auto done = [this](const Process &process) {
emit q->progressMessage(process.cleanedStdOut());
};
- const auto error = [this](const QtcProcess &process) {
+ const auto error = [this](const Process &process) {
const QString stdErrOutput = process.cleanedStdErr();
if (!stdErrOutput.isEmpty())
emit q->errorMessage(Tr::tr("uname failed: %1").arg(stdErrOutput) + '\n');
@@ -233,16 +233,16 @@ TaskItem GenericLinuxDeviceTesterPrivate::transferTasks() const
TaskItem GenericLinuxDeviceTesterPrivate::commandTask(const QString &commandName) const
{
- const auto setup = [this, commandName](QtcProcess &process) {
+ const auto setup = [this, commandName](Process &process) {
emit q->progressMessage(Tr::tr("%1...").arg(commandName));
CommandLine command{m_device->filePath("/bin/sh"), {"-c"}};
command.addArgs(QLatin1String("\"command -v %1\"").arg(commandName), CommandLine::Raw);
process.setCommand(command);
};
- const auto done = [this, commandName](const QtcProcess &) {
+ const auto done = [this, commandName](const Process &) {
emit q->progressMessage(Tr::tr("%1 found.").arg(commandName));
};
- const auto error = [this, commandName](const QtcProcess &process) {
+ const auto error = [this, commandName](const Process &process) {
const QString message = process.result() == ProcessResult::StartFailed
? Tr::tr("An error occurred while checking for %1.").arg(commandName)
+ '\n' + process.errorString()
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
index fcff8efd44..c5564d3c74 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
@@ -23,7 +23,7 @@ namespace Internal {
class PublicKeyDeploymentDialogPrivate
{
public:
- QtcProcess m_process;
+ Process m_process;
bool m_done;
};
} // namespace Internal;
@@ -56,7 +56,7 @@ PublicKeyDeploymentDialog::PublicKeyDeploymentDialog(const IDevice::ConstPtr &de
setValue(0);
connect(this, &PublicKeyDeploymentDialog::canceled, this,
[this] { d->m_done ? accept() : reject(); });
- connect(&d->m_process, &QtcProcess::done, this, [this] {
+ connect(&d->m_process, &Process::done, this, [this] {
const bool succeeded = d->m_process.result() == ProcessResult::FinishedWithSuccess;
QString finalMessage;
if (!succeeded) {
diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
index e073acde05..4ee28e7701 100644
--- a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
+++ b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
@@ -30,8 +30,8 @@ static QString signalProcessGroupByPidCommandLine(qint64 pid, int signal)
void RemoteLinuxSignalOperation::run(const QString &command)
{
QTC_ASSERT(!m_process, return);
- m_process.reset(new QtcProcess);
- connect(m_process.get(), &QtcProcess::done, this, &RemoteLinuxSignalOperation::runnerDone);
+ m_process.reset(new Process);
+ connect(m_process.get(), &Process::done, this, &RemoteLinuxSignalOperation::runnerDone);
m_process->setCommand({m_device->filePath("/bin/sh"), {"-c", command}});
m_process->start();
diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.h b/src/plugins/remotelinux/remotelinuxsignaloperation.h
index d3e840e0d3..00967c9414 100644
--- a/src/plugins/remotelinux/remotelinuxsignaloperation.h
+++ b/src/plugins/remotelinux/remotelinuxsignaloperation.h
@@ -32,7 +32,7 @@ private:
void run(const QString &command);
const ProjectExplorer::IDeviceConstPtr m_device;
- std::unique_ptr<Utils::QtcProcess> m_process;
+ std::unique_ptr<Utils::Process> m_process;
friend class LinuxDevice;
};
diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp
index 193a112cb5..7a161601b7 100644
--- a/src/plugins/remotelinux/rsyncdeploystep.cpp
+++ b/src/plugins/remotelinux/rsyncdeploystep.cpp
@@ -88,7 +88,7 @@ bool RsyncDeployStep::isDeploymentNecessary() const
TaskItem RsyncDeployStep::mkdirTask()
{
- const auto setupHandler = [this](QtcProcess &process) {
+ const auto setupHandler = [this](Process &process) {
QStringList remoteDirs;
for (const FileToTransfer &file : std::as_const(m_files))
remoteDirs << file.m_target.parentDir().path();
@@ -96,11 +96,11 @@ TaskItem RsyncDeployStep::mkdirTask()
remoteDirs.removeDuplicates();
process.setCommand({deviceConfiguration()->filePath("mkdir"),
QStringList("-p") + remoteDirs});
- connect(&process, &QtcProcess::readyReadStandardError, this, [this, proc = &process] {
+ connect(&process, &Process::readyReadStandardError, this, [this, proc = &process] {
handleStdErrData(QString::fromLocal8Bit(proc->readAllRawStandardError()));
});
};
- const auto errorHandler = [this](const QtcProcess &process) {
+ const auto errorHandler = [this](const Process &process) {
QString finalMessage = process.errorString();
const QString stdErr = process.cleanedStdErr();
if (!stdErr.isEmpty()) {
diff --git a/src/plugins/remotelinux/sshkeycreationdialog.cpp b/src/plugins/remotelinux/sshkeycreationdialog.cpp
index e0128d2a2a..16dcf9220d 100644
--- a/src/plugins/remotelinux/sshkeycreationdialog.cpp
+++ b/src/plugins/remotelinux/sshkeycreationdialog.cpp
@@ -109,7 +109,7 @@ void SshKeyCreationDialog::generateKeys()
}
const QString keyTypeString = QLatin1String(m_rsa->isChecked() ? "rsa": "ecdsa");
QApplication::setOverrideCursor(Qt::BusyCursor);
- QtcProcess keygen;
+ Process keygen;
const QStringList args{"-t", keyTypeString, "-b", m_comboBox->currentText(),
"-N", QString(), "-f", privateKeyFilePath().path()};
QString errorMsg;
diff --git a/src/plugins/remotelinux/tarpackagedeploystep.cpp b/src/plugins/remotelinux/tarpackagedeploystep.cpp
index 795acabe0d..4f517ea91d 100644
--- a/src/plugins/remotelinux/tarpackagedeploystep.cpp
+++ b/src/plugins/remotelinux/tarpackagedeploystep.cpp
@@ -92,24 +92,24 @@ TaskItem TarPackageDeployStep::uploadTask()
TaskItem TarPackageDeployStep::installTask()
{
- const auto setupHandler = [this](QtcProcess &process) {
+ const auto setupHandler = [this](Process &process) {
const QString cmdLine = QLatin1String("cd / && tar xvf ") + remoteFilePath()
+ " && (rm " + remoteFilePath() + " || :)";
process.setCommand({deviceConfiguration()->filePath("/bin/sh"), {"-c", cmdLine}});
- QtcProcess *proc = &process;
- connect(proc, &QtcProcess::readyReadStandardOutput, this, [this, proc] {
+ Process *proc = &process;
+ connect(proc, &Process::readyReadStandardOutput, this, [this, proc] {
handleStdOutData(proc->readAllStandardOutput());
});
- connect(proc, &QtcProcess::readyReadStandardError, this, [this, proc] {
+ connect(proc, &Process::readyReadStandardError, this, [this, proc] {
handleStdErrData(proc->readAllStandardError());
});
addProgressMessage(Tr::tr("Installing package to device..."));
};
- const auto doneHandler = [this](const QtcProcess &) {
+ const auto doneHandler = [this](const Process &) {
saveDeploymentTimeStamp(DeployableFile(m_packageFilePath, {}), {});
addProgressMessage(Tr::tr("Successfully installed package file."));
};
- const auto errorHandler = [this](const QtcProcess &process) {
+ const auto errorHandler = [this](const Process &process) {
addErrorMessage(Tr::tr("Installing package failed.") + process.errorString());
};
return ProcessTask(setupHandler, doneHandler, errorHandler);
diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp
index 9956a54777..e2a85ab53c 100644
--- a/src/plugins/silversearcher/findinfilessilversearcher.cpp
+++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp
@@ -62,7 +62,7 @@ QString convertWildcardToRegex(const QString &wildcard)
bool isSilverSearcherAvailable()
{
- QtcProcess silverSearcherProcess;
+ Process silverSearcherProcess;
silverSearcherProcess.setCommand({"ag", {"--version"}});
silverSearcherProcess.start();
if (silverSearcherProcess.waitForFinished(1000)) {
@@ -106,7 +106,7 @@ void runSilverSeacher(QPromise<FileSearchResultList> &promise, FileFindParameter
arguments << "--" << parameters.text << directory.normalizedPathName().toString();
- QtcProcess process;
+ Process process;
process.setCommand({"ag", arguments});
process.start();
if (process.waitForFinished()) {
diff --git a/src/plugins/squish/objectsmapdocument.cpp b/src/plugins/squish/objectsmapdocument.cpp
index eb7266ddc4..0555bb3512 100644
--- a/src/plugins/squish/objectsmapdocument.cpp
+++ b/src/plugins/squish/objectsmapdocument.cpp
@@ -209,7 +209,7 @@ Core::IDocument::OpenResult ObjectsMapDocument::openImpl(QString *error,
return OpenResult::ReadError;
}
- Utils::QtcProcess objectMapReader;
+ Utils::Process objectMapReader;
objectMapReader.setCommand({exe, {"--scriptMap", "--mode", "read",
"--scriptedObjectMapPath", realFileName.toUserOutput()}});
objectMapReader.setCodec(QTextCodec::codecForName("UTF-8"));
@@ -240,7 +240,7 @@ bool ObjectsMapDocument::writeFile(const Utils::FilePath &fileName) const
if (!exe.isExecutableFile())
return false;
- Utils::QtcProcess objectMapWriter;
+ Utils::Process objectMapWriter;
objectMapWriter.setCommand({exe, {"--scriptMap", "--mode", "write",
"--scriptedObjectMapPath", fileName.toUserOutput()}});
objectMapWriter.setWriteData(contents());
diff --git a/src/plugins/squish/squishprocessbase.cpp b/src/plugins/squish/squishprocessbase.cpp
index 23d3a49aa7..744ea506c1 100644
--- a/src/plugins/squish/squishprocessbase.cpp
+++ b/src/plugins/squish/squishprocessbase.cpp
@@ -8,9 +8,9 @@ namespace Squish::Internal {
SquishProcessBase::SquishProcessBase(QObject *parent)
: QObject(parent)
{
- connect(&m_process, &Utils::QtcProcess::readyReadStandardError,
+ connect(&m_process, &Utils::Process::readyReadStandardError,
this, &SquishProcessBase::onErrorOutput);
- connect(&m_process, &Utils::QtcProcess::done,
+ connect(&m_process, &Utils::Process::done,
this, &SquishProcessBase::onDone);
}
diff --git a/src/plugins/squish/squishprocessbase.h b/src/plugins/squish/squishprocessbase.h
index 088eca8a73..d8af2e9d4f 100644
--- a/src/plugins/squish/squishprocessbase.h
+++ b/src/plugins/squish/squishprocessbase.h
@@ -36,7 +36,7 @@ protected:
virtual void onDone() {}
virtual void onErrorOutput() {}
- Utils::QtcProcess m_process;
+ Utils::Process m_process;
private:
SquishProcessState m_state = Idle;
diff --git a/src/plugins/squish/squishserverprocess.cpp b/src/plugins/squish/squishserverprocess.cpp
index 4d7bb2ef97..9e4b974143 100644
--- a/src/plugins/squish/squishserverprocess.cpp
+++ b/src/plugins/squish/squishserverprocess.cpp
@@ -10,7 +10,7 @@ namespace Squish::Internal {
SquishServerProcess::SquishServerProcess(QObject *parent)
: SquishProcessBase(parent)
{
- connect(&m_process, &Utils::QtcProcess::readyReadStandardOutput,
+ connect(&m_process, &Utils::Process::readyReadStandardOutput,
this, &SquishServerProcess::onStandardOutput);
}
@@ -25,7 +25,7 @@ void SquishServerProcess::start(const Utils::CommandLine &commandLine,
void SquishServerProcess::stop()
{
if (m_process.state() != QProcess::NotRunning && m_serverPort > 0) {
- Utils::QtcProcess serverKiller;
+ Utils::Process serverKiller;
QStringList args;
args << "--stop" << "--port" << QString::number(m_serverPort);
serverKiller.setCommand({m_process.commandLine().executable(), args});
diff --git a/src/plugins/squish/squishtools.cpp b/src/plugins/squish/squishtools.cpp
index bc09e2fa6c..37b76136e7 100644
--- a/src/plugins/squish/squishtools.cpp
+++ b/src/plugins/squish/squishtools.cpp
@@ -1040,7 +1040,7 @@ void SquishTools::interruptRunner()
QTC_ASSERT(m_primaryRunner, return);
qint64 processId = m_primaryRunner->processId();
const CommandLine cmd(toolsSettings.processComPath, {QString::number(processId), "break"});
- QtcProcess process;
+ Process process;
process.setCommand(cmd);
process.start();
process.waitForFinished();
@@ -1056,7 +1056,7 @@ void SquishTools::terminateRunner()
QTC_ASSERT(m_primaryRunner, return);
qint64 processId = m_primaryRunner->processId();
const CommandLine cmd(toolsSettings.processComPath, {QString::number(processId), "terminate"});
- QtcProcess process;
+ Process process;
process.setCommand(cmd);
process.start();
process.waitForFinished();
diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp
index ad657188f1..c9b28724ea 100644
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -171,7 +171,7 @@ SubversionDiffEditorController::SubversionDiffEditorController(IDocument *docume
const TreeStorage<QString> diffInputStorage = inputStorage();
- const auto setupDescription = [this](QtcProcess &process) {
+ const auto setupDescription = [this](Process &process) {
if (m_changeNumber == 0)
return TaskAction::StopWithDone;
setupCommand(process, {"log", "-r", QString::number(m_changeNumber)});
@@ -181,14 +181,14 @@ SubversionDiffEditorController::SubversionDiffEditorController(IDocument *docume
setDescription(Tr::tr("Waiting for data..."));
return TaskAction::Continue;
};
- const auto onDescriptionDone = [this](const QtcProcess &process) {
+ const auto onDescriptionDone = [this](const Process &process) {
setDescription(process.cleanedStdOut());
};
- const auto onDescriptionError = [this](const QtcProcess &) {
+ const auto onDescriptionError = [this](const Process &) {
setDescription({});
};
- const auto setupDiff = [this](QtcProcess &process) {
+ const auto setupDiff = [this](Process &process) {
QStringList args = QStringList{"diff"} << "--internal-diff";
if (ignoreWhitespace())
args << "-x" << "-uw";
@@ -202,7 +202,7 @@ SubversionDiffEditorController::SubversionDiffEditorController(IDocument *docume
command << SubversionClient::AddAuthOptions();
process.setCommand(command);
};
- const auto onDiffDone = [diffInputStorage](const QtcProcess &process) {
+ const auto onDiffDone = [diffInputStorage](const Process &process) {
*diffInputStorage = process.cleanedStdOut();
};
diff --git a/src/plugins/terminal/shellintegration.cpp b/src/plugins/terminal/shellintegration.cpp
index 00f1b75cd6..230c6e3da8 100644
--- a/src/plugins/terminal/shellintegration.cpp
+++ b/src/plugins/terminal/shellintegration.cpp
@@ -102,7 +102,7 @@ void ShellIntegration::onOsc(int cmd, const VTermStringFragment &fragment)
}
}
-void ShellIntegration::prepareProcess(Utils::QtcProcess &process)
+void ShellIntegration::prepareProcess(Utils::Process &process)
{
Environment env = process.environment().hasChanges() ? process.environment()
: Environment::systemEnvironment();
diff --git a/src/plugins/terminal/shellintegration.h b/src/plugins/terminal/shellintegration.h
index 264b5a4d67..8fce983b01 100644
--- a/src/plugins/terminal/shellintegration.h
+++ b/src/plugins/terminal/shellintegration.h
@@ -21,7 +21,7 @@ public:
void onOsc(int cmd, const VTermStringFragment &fragment);
- void prepareProcess(Utils::QtcProcess &process);
+ void prepareProcess(Utils::Process &process);
signals:
void commandChanged(const Utils::CommandLine &command);
diff --git a/src/plugins/terminal/terminalwidget.cpp b/src/plugins/terminal/terminalwidget.cpp
index 6e13960bcc..11397d87b4 100644
--- a/src/plugins/terminal/terminalwidget.cpp
+++ b/src/plugins/terminal/terminalwidget.cpp
@@ -137,7 +137,7 @@ TerminalWidget::~TerminalWidget()
void TerminalWidget::setupPty()
{
- m_process = std::make_unique<QtcProcess>();
+ m_process = std::make_unique<Process>();
CommandLine shellCommand = m_openParameters.shellCommand.value_or(
CommandLine{TerminalSettings::instance().shell.filePath(),
@@ -163,11 +163,11 @@ void TerminalWidget::setupPty()
m_surface->shellIntegration()->prepareProcess(*m_process.get());
}
- connect(m_process.get(), &QtcProcess::readyReadStandardOutput, this, [this]() {
+ connect(m_process.get(), &Process::readyReadStandardOutput, this, [this]() {
onReadyRead(false);
});
- connect(m_process.get(), &QtcProcess::done, this, [this] {
+ connect(m_process.get(), &Process::done, this, [this] {
if (m_process) {
if (m_process->exitCode() != 0) {
QByteArray msg = QString("\r\n\033[31mProcess exited with code: %1")
@@ -206,7 +206,7 @@ void TerminalWidget::setupPty()
}
});
- connect(m_process.get(), &QtcProcess::started, this, [this] {
+ connect(m_process.get(), &Process::started, this, [this] {
if (m_shellName.isEmpty())
m_shellName = m_process->commandLine().executable().fileName();
if (HostOsInfo::isWindowsHost() && m_shellName.endsWith(QTC_WIN_EXE_SUFFIX))
diff --git a/src/plugins/terminal/terminalwidget.h b/src/plugins/terminal/terminalwidget.h
index 4e1f2906b0..f6ea7d763b 100644
--- a/src/plugins/terminal/terminalwidget.h
+++ b/src/plugins/terminal/terminalwidget.h
@@ -179,7 +179,7 @@ protected:
void updateCopyState();
private:
- std::unique_ptr<Utils::QtcProcess> m_process;
+ std::unique_ptr<Utils::Process> m_process;
std::unique_ptr<Internal::TerminalSurface> m_surface;
std::unique_ptr<ShellIntegration> m_shellIntegration;
diff --git a/src/plugins/texteditor/formattexteditor.cpp b/src/plugins/texteditor/formattexteditor.cpp
index 143b584877..5f02b7e9d0 100644
--- a/src/plugins/texteditor/formattexteditor.cpp
+++ b/src/plugins/texteditor/formattexteditor.cpp
@@ -64,7 +64,7 @@ static FormatTask format(FormatTask task)
// Format temporary file
QStringList options = task.command.options();
options.replaceInStrings(QLatin1String("%file"), sourceFile.filePath().toString());
- QtcProcess process;
+ Process process;
process.setTimeoutS(5);
process.setCommand({executable, options});
process.runBlocking();
@@ -89,7 +89,7 @@ static FormatTask format(FormatTask task)
return task;
case Command::PipeProcessing: {
- QtcProcess process;
+ Process process;
QStringList options = task.command.options();
options.replaceInStrings("%filename", task.filePath.fileName());
options.replaceInStrings("%file", task.filePath.toString());
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp
index 435deb4812..8ee3247010 100644
--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -119,7 +119,7 @@ void UpdateInfoPlugin::startCheckForUpdates()
using namespace Tasking;
- const auto doSetup = [this](QtcProcess &process, const QStringList &args) {
+ const auto doSetup = [this](Process &process, const QStringList &args) {
process.setCommand({d->m_maintenanceTool, args});
};
const auto doCleanup = [this] {
@@ -127,19 +127,19 @@ void UpdateInfoPlugin::startCheckForUpdates()
checkForUpdatesStopped();
};
- const auto setupUpdate = [doSetup](QtcProcess &process) {
+ const auto setupUpdate = [doSetup](Process &process) {
doSetup(process, {"ch", "-g", "*=false,ifw.package.*=true"});
};
- const auto updateDone = [this](const QtcProcess &process) {
+ const auto updateDone = [this](const Process &process) {
d->m_updateOutput = process.cleanedStdOut();
};
QList<TaskItem> tasks { ProcessTask(setupUpdate, updateDone) };
if (d->m_settings.checkForQtVersions) {
- const auto setupPackages = [doSetup](QtcProcess &process) {
+ const auto setupPackages = [doSetup](Process &process) {
doSetup(process, {"se", "qt[.]qt[0-9][.][0-9]+$", "-g", "*=false,ifw.package.*=true"});
};
- const auto packagesDone = [this](const QtcProcess &process) {
+ const auto packagesDone = [this](const Process &process) {
d->m_packagesOutput = process.cleanedStdOut();
};
tasks << ProcessTask(setupPackages, packagesDone);
@@ -461,7 +461,7 @@ QDate UpdateInfoPlugin::nextCheckDate(CheckUpdateInterval interval) const
void UpdateInfoPlugin::startMaintenanceTool(const QStringList &args) const
{
- QtcProcess::startDetached(CommandLine{d->m_maintenanceTool, args});
+ Process::startDetached(CommandLine{d->m_maintenanceTool, args});
}
void UpdateInfoPlugin::startUpdater() const
diff --git a/src/plugins/valgrind/callgrindengine.cpp b/src/plugins/valgrind/callgrindengine.cpp
index d238cb89e0..2c2f73b10e 100644
--- a/src/plugins/valgrind/callgrindengine.cpp
+++ b/src/plugins/valgrind/callgrindengine.cpp
@@ -175,7 +175,7 @@ void CallgrindToolRunner::run(Option option)
// save back current running operation
m_lastOption = option;
- m_controllerProcess.reset(new QtcProcess);
+ m_controllerProcess.reset(new Process);
switch (option) {
case CallgrindToolRunner::Dump:
@@ -197,7 +197,7 @@ void CallgrindToolRunner::run(Option option)
#if CALLGRIND_CONTROL_DEBUG
m_controllerProcess->setProcessChannelMode(QProcess::ForwardedChannels);
#endif
- connect(m_controllerProcess.get(), &QtcProcess::done,
+ connect(m_controllerProcess.get(), &Process::done,
this, &CallgrindToolRunner::controllerProcessDone);
const FilePath control =
diff --git a/src/plugins/valgrind/callgrindengine.h b/src/plugins/valgrind/callgrindengine.h
index 2f22280ffa..13d04b6335 100644
--- a/src/plugins/valgrind/callgrindengine.h
+++ b/src/plugins/valgrind/callgrindengine.h
@@ -73,7 +73,7 @@ private:
bool m_markAsPaused = false;
- std::unique_ptr<Utils::QtcProcess> m_controllerProcess;
+ std::unique_ptr<Utils::Process> m_controllerProcess;
ProjectExplorer::Runnable m_valgrindRunnable;
qint64 m_pid = 0;
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index 4daa04efcf..9b35de452d 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -361,7 +361,7 @@ CallgrindToolPrivate::CallgrindToolPrivate()
action->setIcon(kCachegrindIcon.icon());
action->setToolTip(Tr::tr("Open results in KCachegrind."));
connect(action, &QAction::triggered, this, [this, settings] {
- QtcProcess::startDetached({FilePath::fromString(settings->kcachegrindExecutable.value()), { m_lastFileName }});
+ Process::startDetached({FilePath::fromString(settings->kcachegrindExecutable.value()), { m_lastFileName }});
});
// dump action
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 7042419a7b..b07288b175 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -129,9 +129,9 @@ public:
void start() override
{
QTC_ASSERT(!m_process, return);
- m_process.reset(new QtcProcess);
+ m_process.reset(new Process);
m_process->setCommand({device()->filePath("echo"), "-n $SSH_CLIENT", CommandLine::Raw});
- connect(m_process.get(), &QtcProcess::done, this, [this] {
+ connect(m_process.get(), &Process::done, this, [this] {
if (m_process->error() != QProcess::UnknownError) {
reportFailure();
return;
@@ -159,7 +159,7 @@ public:
}
private:
- std::unique_ptr<QtcProcess> m_process = nullptr;
+ std::unique_ptr<Process> m_process = nullptr;
QHostAddress *m_localServerAddress = nullptr;
};
diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp
index ef84fba675..3750217ad7 100644
--- a/src/plugins/valgrind/valgrindrunner.cpp
+++ b/src/plugins/valgrind/valgrindrunner.cpp
@@ -25,18 +25,18 @@ class ValgrindRunner::Private : public QObject
{
public:
Private(ValgrindRunner *owner) : q(owner) {
- connect(&m_process, &QtcProcess::started, this, [this] {
+ connect(&m_process, &Process::started, this, [this] {
emit q->valgrindStarted(m_process.processId());
});
- connect(&m_process, &QtcProcess::done, this, [this] {
+ connect(&m_process, &Process::done, this, [this] {
if (m_process.result() != ProcessResult::FinishedWithSuccess)
emit q->processErrorReceived(m_process.errorString(), m_process.error());
emit q->finished();
});
- connect(&m_process, &QtcProcess::readyReadStandardOutput, this, [this] {
+ connect(&m_process, &Process::readyReadStandardOutput, this, [this] {
emit q->appendMessage(m_process.readAllStandardOutput(), StdOutFormat);
});
- connect(&m_process, &QtcProcess::readyReadStandardError, this, [this] {
+ connect(&m_process, &Process::readyReadStandardError, this, [this] {
emit q->appendMessage(m_process.readAllStandardError(), StdErrFormat);
});
@@ -53,7 +53,7 @@ public:
Runnable m_debuggee;
CommandLine m_command;
- QtcProcess m_process;
+ Process m_process;
QHostAddress m_localServerAddress;
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index 1bd13f312a..b781b1772a 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -90,7 +90,7 @@ VcsCommand *VcsBaseClientImpl::createCommand(const FilePath &workingDirectory,
return cmd;
}
-void VcsBaseClientImpl::setupCommand(Utils::QtcProcess &process,
+void VcsBaseClientImpl::setupCommand(Utils::Process &process,
const FilePath &workingDirectory,
const QStringList &args) const
{
diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h
index 4e5bf91d5f..035e2f0042 100644
--- a/src/plugins/vcsbase/vcsbaseclient.h
+++ b/src/plugins/vcsbase/vcsbaseclient.h
@@ -24,7 +24,7 @@ class QToolBar;
QT_END_NAMESPACE
namespace Utils {
-class QtcProcess;
+class Process;
}
namespace VcsBase {
@@ -60,7 +60,7 @@ public:
VcsCommand *createCommand(const Utils::FilePath &workingDirectory,
VcsBaseEditorWidget *editor = nullptr) const;
- void setupCommand(Utils::QtcProcess &process,
+ void setupCommand(Utils::Process &process,
const Utils::FilePath &workingDirectory,
const QStringList &args) const;
diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
index 527a81be7e..aaea619a2b 100644
--- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
+++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
@@ -66,7 +66,7 @@ Tasking::TaskItem VcsBaseDiffEditorController::postProcessTask()
return AsyncTask<QList<FileData>>(setupDiffProcessor, onDiffProcessorDone, onDiffProcessorError);
}
-void VcsBaseDiffEditorController::setupCommand(QtcProcess &process, const QStringList &args) const
+void VcsBaseDiffEditorController::setupCommand(Process &process, const QStringList &args) const
{
process.setEnvironment(d->m_processEnvironment);
process.setWorkingDirectory(workingDirectory());
diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
index 75672edb1f..22d651fe72 100644
--- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
+++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
@@ -9,7 +9,7 @@
namespace Utils {
class Environment;
-class QtcProcess;
+class Process;
} // Utils
namespace VcsBase {
@@ -31,7 +31,7 @@ protected:
Utils::Tasking::TreeStorage<QString> inputStorage() const;
Utils::Tasking::TaskItem postProcessTask();
- void setupCommand(Utils::QtcProcess &process, const QStringList &args) const;
+ void setupCommand(Utils::Process &process, const QStringList &args) const;
private:
friend class VcsBaseDiffEditorControllerPrivate;
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 23a41f363e..0d9f92a702 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -561,7 +561,7 @@ bool VcsBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript
// Run check process
VcsOutputWindow::appendShellCommandLine(msgCheckScript(d->m_checkScriptWorkingDirectory,
checkScript));
- QtcProcess checkProcess;
+ Process checkProcess;
if (!d->m_checkScriptWorkingDirectory.isEmpty())
checkProcess.setWorkingDirectory(d->m_checkScriptWorkingDirectory);
checkProcess.setCommand({FilePath::fromString(checkScript), {saver.filePath().toString()}});
diff --git a/src/plugins/vcsbase/vcscommand.cpp b/src/plugins/vcsbase/vcscommand.cpp
index 5a4f43d28c..a16545b70b 100644
--- a/src/plugins/vcsbase/vcscommand.cpp
+++ b/src/plugins/vcsbase/vcscommand.cpp
@@ -55,10 +55,10 @@ public:
void setup();
void cleanup();
- void setupProcess(QtcProcess *process, const Job &job);
- void installStdCallbacks(QtcProcess *process);
+ void setupProcess(Process *process, const Job &job);
+ void installStdCallbacks(Process *process);
EventLoopMode eventLoopMode() const;
- void handleDone(QtcProcess *process);
+ void handleDone(Process *process);
void startAll();
void startNextJob();
void processDone();
@@ -73,7 +73,7 @@ public:
QList<Job> m_jobs;
int m_currentJob = 0;
- std::unique_ptr<QtcProcess> m_process;
+ std::unique_ptr<Process> m_process;
QString m_stdOut;
QString m_stdErr;
ProcessResult m_result = ProcessResult::StartFailed;
@@ -99,7 +99,7 @@ void VcsCommandPrivate::cleanup()
GlobalFileChangeBlocker::instance()->forceBlocked(false);
}
-void VcsCommandPrivate::setupProcess(QtcProcess *process, const Job &job)
+void VcsCommandPrivate::setupProcess(Process *process, const Job &job)
{
process->setExitCodeInterpreter(job.exitCodeInterpreter);
process->setTimeoutS(job.timeoutS);
@@ -127,12 +127,12 @@ void VcsCommandPrivate::setupProcess(QtcProcess *process, const Job &job)
progress->setProgressParser(m_progressParser);
}
-void VcsCommandPrivate::installStdCallbacks(QtcProcess *process)
+void VcsCommandPrivate::installStdCallbacks(Process *process)
{
if (!(m_flags & RunFlags::MergeOutputChannels) && (m_flags & RunFlags::ProgressiveOutput
|| m_progressParser || !(m_flags & RunFlags::SuppressStdErr))) {
process->setTextChannelMode(Channel::Error, TextChannelMode::MultiLine);
- connect(process, &QtcProcess::textOnStandardError, this, [this](const QString &text) {
+ connect(process, &Process::textOnStandardError, this, [this](const QString &text) {
if (!(m_flags & RunFlags::SuppressStdErr))
VcsOutputWindow::appendError(text);
if (m_flags & RunFlags::ProgressiveOutput)
@@ -142,7 +142,7 @@ void VcsCommandPrivate::installStdCallbacks(QtcProcess *process)
if (m_progressParser || m_flags & RunFlags::ProgressiveOutput
|| m_flags & RunFlags::ShowStdOut) {
process->setTextChannelMode(Channel::Output, TextChannelMode::MultiLine);
- connect(process, &QtcProcess::textOnStandardOutput, this, [this](const QString &text) {
+ connect(process, &Process::textOnStandardOutput, this, [this](const QString &text) {
if (m_flags & RunFlags::ShowStdOut)
VcsOutputWindow::append(text);
if (m_flags & RunFlags::ProgressiveOutput)
@@ -158,7 +158,7 @@ EventLoopMode VcsCommandPrivate::eventLoopMode() const
return EventLoopMode::Off;
}
-void VcsCommandPrivate::handleDone(QtcProcess *process)
+void VcsCommandPrivate::handleDone(Process *process)
{
// Success/Fail message in appropriate window?
if (process->result() == ProcessResult::FinishedWithSuccess) {
@@ -187,8 +187,8 @@ void VcsCommandPrivate::startAll()
void VcsCommandPrivate::startNextJob()
{
QTC_ASSERT(m_currentJob < m_jobs.count(), return);
- m_process.reset(new QtcProcess);
- connect(m_process.get(), &QtcProcess::done, this, &VcsCommandPrivate::processDone);
+ m_process.reset(new Process);
+ connect(m_process.get(), &Process::done, this, &VcsCommandPrivate::processDone);
setupProcess(m_process.get(), m_jobs.at(m_currentJob));
m_process->start();
}
@@ -297,7 +297,7 @@ CommandResult VcsCommand::runBlocking(const Utils::FilePath &workingDirectory,
CommandResult VcsCommand::runBlockingHelper(const CommandLine &command, int timeoutS)
{
- QtcProcess process;
+ Process process;
if (command.executable().isEmpty())
return {};
@@ -321,7 +321,7 @@ void VcsCommand::setProgressParser(const ProgressParser &parser)
d->m_progressParser = parser;
}
-CommandResult::CommandResult(const QtcProcess &process)
+CommandResult::CommandResult(const Process &process)
: m_result(process.result())
, m_exitCode(process.exitCode())
, m_exitMessage(process.exitMessage())
diff --git a/src/plugins/vcsbase/vcscommand.h b/src/plugins/vcsbase/vcscommand.h
index 568d109580..1cc4d5db54 100644
--- a/src/plugins/vcsbase/vcscommand.h
+++ b/src/plugins/vcsbase/vcscommand.h
@@ -20,7 +20,7 @@ QT_END_NAMESPACE
namespace Utils {
class CommandLine;
class Environment;
-class QtcProcess;
+class Process;
}
namespace VcsBase {
@@ -33,7 +33,7 @@ class VCSBASE_EXPORT CommandResult
{
public:
CommandResult() = default;
- CommandResult(const Utils::QtcProcess &process);
+ CommandResult(const Utils::Process &process);
CommandResult(const VcsCommand &command);
CommandResult(Utils::ProcessResult result, const QString &exitMessage)
: m_result(result), m_exitMessage(exitMessage) {}
diff --git a/src/plugins/webassembly/webassemblyemsdk.cpp b/src/plugins/webassembly/webassemblyemsdk.cpp
index 4acf6589c4..e66df1272d 100644
--- a/src/plugins/webassembly/webassemblyemsdk.cpp
+++ b/src/plugins/webassembly/webassemblyemsdk.cpp
@@ -29,7 +29,7 @@ static QString emSdkEnvOutput(const FilePath &sdkRoot)
if (!emSdkEnvCache()->contains(cacheKey)) {
const FilePath scriptFile = sdkRoot.pathAppended(QLatin1String("emsdk_env") +
(isWindows ? ".bat" : ".sh"));
- QtcProcess emSdkEnv;
+ Process emSdkEnv;
if (isWindows) {
emSdkEnv.setCommand(CommandLine(scriptFile));
} else {
@@ -88,7 +88,7 @@ QVersionNumber version(const FilePath &sdkRoot)
QLatin1String scriptFile{sdkRoot.osType() == OsType::OsTypeWindows ? "emcc.bat" : "emcc"};
FilePath script = sdkRoot.withNewPath(scriptFile).searchInDirectories(env.path());
const CommandLine command(script, {"-dumpversion"});
- QtcProcess emcc;
+ Process emcc;
emcc.setCommand(command);
emcc.setEnvironment(env);
emcc.runBlocking();
diff --git a/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp b/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp
index abd6de8ed6..70484168eb 100644
--- a/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp
+++ b/src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp
@@ -29,7 +29,7 @@ static WebBrowserEntries emrunBrowsers(ProjectExplorer::Target *target)
const Utils::Environment environment = bc->environment();
const Utils::FilePath emrunPath = environment.searchInPath("emrun");
- QtcProcess browserLister;
+ Process browserLister;
browserLister.setEnvironment(environment);
browserLister.setCommand({emrunPath, {"--list_browsers"}});
browserLister.start();