diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp index 7d13482272b..f50fe9aaea2 100644 --- a/src/libs/qmljs/qmljsplugindumper.cpp +++ b/src/libs/qmljs/qmljsplugindumper.cpp @@ -511,8 +511,7 @@ void PluginDumper::runQmlDump(const QmlJS::ModelManagerInterface::ProjectInfo &i process->setEnvironment(info.qmlDumpEnvironment.toStringList()); connect(process, static_cast(&QProcess::finished), this, &PluginDumper::qmlPluginTypeDumpDone); - connect(process, static_cast(&QProcess::error), - this, &PluginDumper::qmlPluginTypeDumpError); + connect(process, &QProcess::errorOccurred, this, &PluginDumper::qmlPluginTypeDumpError); process->start(info.qmlDumpPath, arguments); m_runningQmldumps.insert(process, importPath); } diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index c970084113f..f43728adfe1 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -739,7 +739,7 @@ void QtcProcess::start() setErrorString(tr("Error in command line.")); // Should be FailedToStart, but we cannot set the process error from the outside, // so it would be inconsistent. - emit error(QProcess::UnknownError); + emit errorOccurred(QProcess::UnknownError); return; } QProcess::start(command, arguments.toUnixArgs()); diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp index 7852cc88da2..fe1b11a34f3 100644 --- a/src/libs/utils/synchronousprocess.cpp +++ b/src/libs/utils/synchronousprocess.cpp @@ -300,8 +300,7 @@ SynchronousProcess::SynchronousProcess() : connect(&d->m_process, static_cast(&QProcess::finished), this, &SynchronousProcess::finished); - connect(&d->m_process, static_cast(&QProcess::error), - this, &SynchronousProcess::error); + connect(&d->m_process, &QProcess::errorOccurred, this, &SynchronousProcess::error); connect(&d->m_process, &QProcess::readyReadStandardOutput, this, [this]() { d->m_hangTimerCount = 0; diff --git a/src/plugins/baremetal/gdbserverproviderprocess.cpp b/src/plugins/baremetal/gdbserverproviderprocess.cpp index b7dc005d007..0a3a7e34485 100644 --- a/src/plugins/baremetal/gdbserverproviderprocess.cpp +++ b/src/plugins/baremetal/gdbserverproviderprocess.cpp @@ -48,11 +48,8 @@ GdbServerProviderProcess::GdbServerProviderProcess( if (Utils::HostOsInfo::isWindowsHost()) m_process->setUseCtrlCStub(true); - connect(m_process, - static_cast(&QProcess::error), - this, &GdbServerProviderProcess::error); - connect(m_process, - static_cast(&QProcess::finished), + connect(m_process, &QProcess::errorOccurred, this, &GdbServerProviderProcess::error); + connect(m_process, static_cast(&QProcess::finished), this, &GdbServerProviderProcess::finished); connect(m_process, &QProcess::readyReadStandardOutput, diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp index 04ee9f8155f..f538aa7893e 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp @@ -84,14 +84,11 @@ ClangStaticAnalyzerRunner::ClangStaticAnalyzerRunner(const QString &clangExecuta m_process.setProcessChannelMode(QProcess::MergedChannels); m_process.setProcessEnvironment(environment.toProcessEnvironment()); m_process.setWorkingDirectory(m_clangLogFileDir); // Current clang-cl puts log file into working dir. - connect(&m_process, &QProcess::started, - this, &ClangStaticAnalyzerRunner::onProcessStarted); + connect(&m_process, &QProcess::started, this, &ClangStaticAnalyzerRunner::onProcessStarted); connect(&m_process, static_cast(&QProcess::finished), this, &ClangStaticAnalyzerRunner::onProcessFinished); - connect(&m_process, static_cast(&QProcess::error), - this, &ClangStaticAnalyzerRunner::onProcessError); - connect(&m_process, &QProcess::readyRead, - this, &ClangStaticAnalyzerRunner::onProcessOutput); + connect(&m_process, &QProcess::errorOccurred, this, &ClangStaticAnalyzerRunner::onProcessError); + connect(&m_process, &QProcess::readyRead, this, &ClangStaticAnalyzerRunner::onProcessOutput); } ClangStaticAnalyzerRunner::~ClangStaticAnalyzerRunner() diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp index 0f309182c1b..9903d58125b 100644 --- a/src/plugins/coreplugin/externaltool.cpp +++ b/src/plugins/coreplugin/externaltool.cpp @@ -626,8 +626,7 @@ void ExternalToolRunner::run() connect(m_process, &QProcess::started, this, &ExternalToolRunner::started); connect(m_process, static_cast(&QProcess::finished), this, &ExternalToolRunner::finished); - connect(m_process, static_cast(&QProcess::error), - this, &ExternalToolRunner::error); + connect(m_process, &QProcess::errorOccurred, this, &ExternalToolRunner::error); connect(m_process, &QProcess::readyReadStandardOutput, this, &ExternalToolRunner::readStandardOutput); connect(m_process, &QProcess::readyReadStandardError, diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index bd79057f112..a08daae7fd9 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -249,8 +249,7 @@ CdbEngine::CdbEngine(const DebuggerRunParameters &sp) : this, &CdbEngine::createFullBacktrace); connect(&m_process, static_cast(&QProcess::finished), this, &CdbEngine::processFinished); - connect(&m_process, static_cast(&QProcess::error), - this, &CdbEngine::processError); + connect(&m_process, &QProcess::errorOccurred, this, &CdbEngine::processError); connect(&m_process, &QProcess::readyReadStandardOutput, this, &CdbEngine::readyReadStandardOut); connect(&m_process, &QProcess::readyReadStandardError, diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 1cb7158a41e..b8117ffc8b9 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -3990,8 +3990,7 @@ void GdbEngine::startGdb(const QStringList &args) gdbArgs << "-n"; gdbArgs += args; - connect(&m_gdbProc, static_cast(&QProcess::error), - this, &GdbEngine::handleGdbError); + connect(&m_gdbProc, &QProcess::errorOccurred, this, &GdbEngine::handleGdbError); connect(&m_gdbProc, static_cast(&QProcess::finished), this, &GdbEngine::handleGdbFinished); connect(&m_gdbProc, &QtcProcess::readyReadStandardOutput, this, &GdbEngine::readGdbStandardOutput); diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp index 0d40d703a14..9d2b60d78fc 100644 --- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp +++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp @@ -60,8 +60,7 @@ GdbRemoteServerEngine::GdbRemoteServerEngine(const DebuggerRunParameters &runPar if (HostOsInfo::isWindowsHost()) m_gdbProc.setUseCtrlCStub(runParameters.useCtrlCStub); // This is only set for QNX/BlackBerry - connect(&m_uploadProc, static_cast(&QProcess::error), - this, &GdbRemoteServerEngine::uploadProcError); + connect(&m_uploadProc, &QProcess::errorOccurred, this, &GdbRemoteServerEngine::uploadProcError); connect(&m_uploadProc, &QProcess::readyReadStandardOutput, this, &GdbRemoteServerEngine::readUploadStandardOutput); connect(&m_uploadProc, &QProcess::readyReadStandardError, diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index b5b37351e00..4d527f0e5ca 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -248,8 +248,7 @@ void LldbEngine::setupEngine() void LldbEngine::startLldb() { QString lldbCmd = runParameters().debugger.executable; - connect(&m_lldbProc, static_cast(&QProcess::error), - this, &LldbEngine::handleLldbError); + connect(&m_lldbProc, &QProcess::errorOccurred, this, &LldbEngine::handleLldbError); connect(&m_lldbProc, static_cast(&QProcess::finished), this, &LldbEngine::handleLldbFinished); connect(&m_lldbProc, &QProcess::readyReadStandardOutput, diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index eab055ba4f8..b7e044c0198 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -120,8 +120,7 @@ void PdbEngine::setupEngine() m_interpreter = runParameters().interpreter; QString bridge = ICore::resourcePath() + QLatin1String("/debugger/pdbbridge.py"); - connect(&m_proc, static_cast(&QProcess::error), - this, &PdbEngine::handlePdbError); + connect(&m_proc, &QProcess::errorOccurred, this, &PdbEngine::handlePdbError); connect(&m_proc, static_cast(&QProcess::finished), this, &PdbEngine::handlePdbFinished); connect(&m_proc, &QProcess::readyReadStandardOutput, diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp index a3a0c96cdcd..aaaaa38ae3c 100644 --- a/src/plugins/git/gerrit/gerritmodel.cpp +++ b/src/plugins/git/gerrit/gerritmodel.cpp @@ -268,8 +268,7 @@ QueryContext::QueryContext(const QStringList &queries, this, &QueryContext::readyReadStandardOutput); connect(&m_process, static_cast(&QProcess::finished), this, &QueryContext::processFinished); - connect(&m_process, static_cast(&QProcess::error), - this, &QueryContext::processError); + connect(&m_process, &QProcess::errorOccurred, this, &QueryContext::processError); connect(&m_watcher, &QFutureWatcherBase::canceled, this, &QueryContext::terminate); m_watcher.setFuture(m_progress.future()); m_process.setProcessEnvironment(Git::Internal::GitPlugin::client()->processEnvironment()); diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 5f6ac4517a6..9148eb0dfa2 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -142,8 +142,7 @@ FetchContext::FetchContext(const QSharedPointer &change, , m_parameters(p) , m_state(FetchState) { - connect(&m_process, static_cast(&QProcess::error), - this, &FetchContext::processError); + connect(&m_process, &QProcess::errorOccurred, this, &FetchContext::processError); connect(&m_process, static_cast(&QProcess::finished), this, &FetchContext::processFinished); connect(&m_process, &QProcess::readyReadStandardError, diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index 23481f74e83..3e7ec53fb0a 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -231,9 +231,7 @@ IosToolHandlerPrivate::IosToolHandlerPrivate(const IosDeviceType &devType, QObject::connect(&process, static_cast(&QProcess::finished), q, &IosToolHandler::subprocessFinished); - QObject::connect(&process, - static_cast(&QProcess::error), - q, &IosToolHandler::subprocessError); + QObject::connect(&process, &QProcess::errorOccurred, q, &IosToolHandler::subprocessError); QObject::connect(&killTimer, &QTimer::timeout, q, &IosToolHandler::killProcess); } diff --git a/src/plugins/perforce/perforcechecker.cpp b/src/plugins/perforce/perforcechecker.cpp index 6f011502bd3..87b02e6ef30 100644 --- a/src/plugins/perforce/perforcechecker.cpp +++ b/src/plugins/perforce/perforcechecker.cpp @@ -41,8 +41,7 @@ namespace Internal { PerforceChecker::PerforceChecker(QObject *parent) : QObject(parent) { - connect(&m_process, static_cast(&QProcess::error), - this, &PerforceChecker::slotError); + connect(&m_process, &QProcess::errorOccurred, this, &PerforceChecker::slotError); connect(&m_process, static_cast(&QProcess::finished), this, &PerforceChecker::slotFinished); } diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp index 4c14e9a5bb3..45e837402ce 100644 --- a/src/plugins/projectexplorer/applicationlauncher.cpp +++ b/src/plugins/projectexplorer/applicationlauncher.cpp @@ -100,14 +100,12 @@ ApplicationLauncher::ApplicationLauncher(QObject *parent) : QObject(parent), } connect(&d->m_guiProcess, &QProcess::readyReadStandardOutput, this, &ApplicationLauncher::readStandardOutput); - connect(&d->m_guiProcess, static_cast(&QProcess::error), + connect(&d->m_guiProcess, &QProcess::errorOccurred, this, &ApplicationLauncher::guiProcessError); connect(&d->m_guiProcess, static_cast(&QProcess::finished), this, &ApplicationLauncher::processDone); - connect(&d->m_guiProcess, &QProcess::started, - this, &ApplicationLauncher::bringToForeground); - connect(&d->m_guiProcess, static_cast(&QProcess::error), - this, &ApplicationLauncher::error); + connect(&d->m_guiProcess, &QProcess::started, this, &ApplicationLauncher::bringToForeground); + connect(&d->m_guiProcess, &QProcess::errorOccurred, this, &ApplicationLauncher::error); #ifdef Q_OS_UNIX d->m_consoleProcess.setSettings(Core::ICore::settings()); diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.cpp index 67dbb684485..f037a6de594 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.cpp @@ -39,8 +39,7 @@ DesktopDeviceProcess::DesktopDeviceProcess(const QSharedPointer & QObject *parent) : DeviceProcess(device, parent) { - connect(&m_process, static_cast(&QProcess::error), - this, &DeviceProcess::error); + connect(&m_process, &QProcess::errorOccurred, this, &DeviceProcess::error); connect(&m_process, static_cast(&QProcess::finished), this, &DeviceProcess::finished); connect(&m_process, &QProcess::readyReadStandardOutput, diff --git a/src/plugins/winrt/winrtdevicefactory.cpp b/src/plugins/winrt/winrtdevicefactory.cpp index 1462534af9d..35b25cadbf2 100644 --- a/src/plugins/winrt/winrtdevicefactory.cpp +++ b/src/plugins/winrt/winrtdevicefactory.cpp @@ -102,9 +102,7 @@ void WinRtDeviceFactory::autoDetect() if (!m_process) { m_process = new Utils::QtcProcess(this); - connect(m_process, - static_cast(&QProcess::error), - this, &WinRtDeviceFactory::onProcessError); + connect(m_process, &QProcess::errorOccurred, this, &WinRtDeviceFactory::onProcessError); connect(m_process, static_cast(&QProcess::finished), this, &WinRtDeviceFactory::onProcessFinished); diff --git a/src/plugins/winrt/winrtrunnerhelper.cpp b/src/plugins/winrt/winrtrunnerhelper.cpp index 038e35a8507..05256fe93c8 100644 --- a/src/plugins/winrt/winrtrunnerhelper.cpp +++ b/src/plugins/winrt/winrtrunnerhelper.cpp @@ -232,8 +232,7 @@ void WinRtRunnerHelper::startWinRtRunner(const RunConf &conf) connect(process, static_cast(&QProcess::finished), this, &WinRtRunnerHelper::onProcessFinished); - connect(process, static_cast(&QProcess::error), - this, &WinRtRunnerHelper::onProcessError); + connect(process, &QProcess::errorOccurred, this, &WinRtRunnerHelper::onProcessError); connect(process, &QProcess::readyReadStandardOutput, this, &WinRtRunnerHelper::onProcessReadyReadStdOut); connect(process, &QProcess::readyReadStandardError, this, &WinRtRunnerHelper::onProcessReadyReadStdErr); } diff --git a/src/tools/qtcreatorcrashhandler/backtracecollector.cpp b/src/tools/qtcreatorcrashhandler/backtracecollector.cpp index 014b387eee2..848788e8562 100644 --- a/src/tools/qtcreatorcrashhandler/backtracecollector.cpp +++ b/src/tools/qtcreatorcrashhandler/backtracecollector.cpp @@ -52,9 +52,7 @@ BacktraceCollector::BacktraceCollector(QObject *parent) : connect(&d->debugger, static_cast(&QProcess::finished), this, &BacktraceCollector::onDebuggerFinished); - connect(&d->debugger, - static_cast(&QProcess::error), - this, &BacktraceCollector::onDebuggerError); + connect(&d->debugger, &QProcess::errorOccurred, this, &BacktraceCollector::onDebuggerError); connect(&d->debugger, &QIODevice::readyRead, this, &BacktraceCollector::onDebuggerOutputAvailable); d->debugger.setProcessChannelMode(QProcess::MergedChannels);