aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/locator/executefilter.cpp
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2013-09-05 01:52:17 +0200
committerhjk <hjk121@nokiamail.com>2013-09-05 12:51:00 +0200
commit527046acc212691b20be60d450c249d8d7dcbe12 (patch)
tree5d4e4f2e5d4359a2da95ecec20e8f3c59513b239 /src/plugins/locator/executefilter.cpp
parentaadb6f16af94a2baff9d13772e9ddce33faa7650 (diff)
MessageManager: General cleanup.
Apply 'static' pattern, rename 'printToOutputPane' to 'write' Change-Id: I6f31f1a8c914661e2a2182c0b6256b41ead28de7 Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/locator/executefilter.cpp')
-rw-r--r--src/plugins/locator/executefilter.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/plugins/locator/executefilter.cpp b/src/plugins/locator/executefilter.cpp
index b619d65867..cce2efd3ca 100644
--- a/src/plugins/locator/executefilter.cpp
+++ b/src/plugins/locator/executefilter.cpp
@@ -126,9 +126,9 @@ void ExecuteFilter::finished(int exitCode, QProcess::ExitStatus status)
{
QString log = QLatin1Char('\'') + headCommand() + QLatin1String("' ");
if (status == QProcess::NormalExit && exitCode == 0)
- MessageManager::instance()->printToOutputPane(log + tr("finished"), MessageManager::NoModeSwitch);
+ MessageManager::write(log + tr("finished"));
else
- MessageManager::instance()->printToOutputPane(log + tr("failed"), MessageManager::NoModeSwitch);
+ MessageManager::write(log + tr("failed"));
m_taskQueue.dequeue();
if (!m_taskQueue.isEmpty())
@@ -138,13 +138,13 @@ void ExecuteFilter::finished(int exitCode, QProcess::ExitStatus status)
void ExecuteFilter::readStandardOutput()
{
QByteArray data = m_process->readAllStandardOutput();
- MessageManager::instance()->printToOutputPane(QString::fromLocal8Bit(data), MessageManager::NoModeSwitch);
+ MessageManager::write(QString::fromLocal8Bit(data));
}
void ExecuteFilter::readStandardError()
{
QByteArray data = m_process->readAllStandardError();
- MessageManager::instance()->printToOutputPane(QString::fromLocal8Bit(data), MessageManager::NoModeSwitch);
+ MessageManager::write(QString::fromLocal8Bit(data));
}
void ExecuteFilter::runHeadCommand()
@@ -153,14 +153,12 @@ void ExecuteFilter::runHeadCommand()
const ExecuteData &d = m_taskQueue.head();
const QString fullPath = Utils::Environment::systemEnvironment().searchInPath(d.executable);
if (fullPath.isEmpty()) {
- const QString log = tr("Could not find executable for '%1'").arg(d.executable);
- MessageManager::instance()->printToOutputPane(log, MessageManager::NoModeSwitch);
+ MessageManager::write(tr("Could not find executable for '%1'").arg(d.executable));
m_taskQueue.dequeue();
runHeadCommand();
return;
}
- QString log(tr("Starting command '%1'").arg(headCommand()));
- MessageManager::instance()->printToOutputPane(log, MessageManager::NoModeSwitch);
+ MessageManager::write(tr("Starting command '%1'").arg(headCommand()));
m_process->setWorkingDirectory(d.workingDirectory);
m_process->setCommand(fullPath, d.arguments);
m_process->start();