From 0eea55926f0faa735f3f7422829f5429e9292c83 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 3 May 2022 01:11:56 +0200 Subject: [PATCH] ApplicationLauncher: Get rid of m_useTerminal field Change-Id: Iab77cf695c1d21cf0e89a230f76ad129757ffb5b Reviewed-by: hjk Reviewed-by: --- src/plugins/projectexplorer/applicationlauncher.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp index 3f1faf90cd1..643053b5daf 100644 --- a/src/plugins/projectexplorer/applicationlauncher.cpp +++ b/src/plugins/projectexplorer/applicationlauncher.cpp @@ -100,8 +100,6 @@ public: QTextCodec::ConverterState m_outputCodecState; QTextCodec::ConverterState m_errorCodecState; - // Local - bool m_useTerminal = false; // Keep track whether we need to emit a finished signal bool m_processRunning = false; @@ -156,7 +154,7 @@ void ApplicationLauncher::setProcessChannelMode(QProcess::ProcessChannelMode mod void ApplicationLauncher::setUseTerminal(bool on) { - d->m_useTerminal = on; + d->m_process->setTerminalMode(on ? Utils::TerminalMode::On : Utils::TerminalMode::Off); } void ApplicationLauncher::setRunAsRoot(bool on) @@ -249,7 +247,7 @@ void ApplicationLauncherPrivate::handleDone() return; } // TODO: why below handlings are different? - if (m_useTerminal) { + if (m_process->usesTerminal()) { emit q->appendMessage(m_process->errorString(), ErrorMessageFormat); if (m_processRunning && m_process->processId() == 0) { m_processRunning = false; @@ -409,7 +407,6 @@ void ApplicationLauncherPrivate::start() else m_outputCodec = QTextCodec::codecForName("utf8"); - m_process->setTerminalMode(m_useTerminal ? Utils::TerminalMode::On : Utils::TerminalMode::Off); m_process->start(); }