From 05d90a6243d3c2f48114b0090ed320ef85dfb182 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 12 Mar 2013 16:41:24 +0100 Subject: [PATCH] ExternalToolRunner: Adjust to MessageManager api change Note: The popup now no longer switches modes. Change-Id: I855f393a8e97bddaff1471d3672a092c38c992f9 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/externaltool.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp index 23231557601..d127b4e1001 100644 --- a/src/plugins/coreplugin/externaltool.cpp +++ b/src/plugins/coreplugin/externaltool.cpp @@ -615,7 +615,7 @@ void ExternalToolRunner::run() m_process->setWorkingDirectory(m_resolvedWorkingDirectory); m_process->setCommand(m_resolvedExecutable, m_resolvedArguments); ICore::messageManager()->printToOutputPane( - tr("Starting external tool '%1' %2").arg(m_resolvedExecutable, m_resolvedArguments), false); + tr("Starting external tool '%1' %2").arg(m_resolvedExecutable, m_resolvedArguments), MessageManager::Silent); m_process->start(); } @@ -637,7 +637,7 @@ void ExternalToolRunner::finished(int exitCode, QProcess::ExitStatus status) DocumentManager::unexpectFileChange(m_expectedFileName); } ICore::messageManager()->printToOutputPane( - tr("'%1' finished").arg(m_resolvedExecutable), false); + tr("'%1' finished").arg(m_resolvedExecutable), MessageManager::Silent); deleteLater(); } @@ -657,7 +657,7 @@ void ExternalToolRunner::readStandardOutput() QByteArray data = m_process->readAllStandardOutput(); QString output = m_outputCodec->toUnicode(data.constData(), data.length(), &m_outputCodecState); if (m_tool->outputHandling() == ExternalTool::ShowInPane) - ICore::messageManager()->printToOutputPane(output, true); + ICore::messageManager()->printToOutputPane(output, MessageManager::NoModeSwitch); else if (m_tool->outputHandling() == ExternalTool::ReplaceSelection) m_processOutput.append(output); } @@ -669,7 +669,7 @@ void ExternalToolRunner::readStandardError() QByteArray data = m_process->readAllStandardError(); QString output = m_outputCodec->toUnicode(data.constData(), data.length(), &m_errorCodecState); if (m_tool->errorHandling() == ExternalTool::ShowInPane) - ICore::messageManager()->printToOutputPane(output, true); + ICore::messageManager()->printToOutputPane(output, MessageManager::NoModeSwitch); else if (m_tool->errorHandling() == ExternalTool::ReplaceSelection) m_processOutput.append(output); } @@ -771,7 +771,7 @@ void ExternalToolManager::menuActivated() QTC_ASSERT(tool, return); ExternalToolRunner *runner = new ExternalToolRunner(tool); if (runner->hasError()) - ICore::messageManager()->printToOutputPane(runner->errorString(), true); + ICore::messageManager()->printToOutputPane(runner->errorString(), MessageManager::NoModeSwitch); } QMap > ExternalToolManager::toolsByCategory() const