Commit 9c6d9857 authored by hjk's avatar hjk

fix oversight in OutputFormat refactoring

parent 7000f7ca
......@@ -75,9 +75,9 @@ signals:
private slots:
void processStopped();
void appendProcessMessage(const QString &output, bool onStdErr);
#ifdef Q_OS_WIN
void readWinDebugOutput(const QString &output, bool onStdErr);
void appendWinMessage(const QString &output, bool onStdErr);
void processFinished(int exitCode);
#else
void guiProcessError();
......
......@@ -51,12 +51,12 @@ ApplicationLauncher::ApplicationLauncher(QObject *parent)
: QObject(parent), d(new ApplicationLauncherPrivate)
{
connect(&d->m_consoleProcess, SIGNAL(processMessage(QString,bool)),
this, SIGNAL(appendWinMessage(QString,bool)));
this, SIGNAL(appendProcessMessage(QString,bool)));
connect(&d->m_consoleProcess, SIGNAL(processStopped()),
this, SLOT(processStopped()));
connect(&d->m_winGuiProcess, SIGNAL(processMessage(QString, bool)),
this, SIGNAL(appendWinMessage(QString,bool)));
this, SIGNAL(appendProcessMessage(QString,bool)));
connect(&d->m_winGuiProcess, SIGNAL(receivedDebugOutput(QString, bool)),
this, SLOT(readWinDebugOutput(QString, bool)));
connect(&d->m_winGuiProcess, SIGNAL(processFinished(int)),
......@@ -123,8 +123,7 @@ qint64 ApplicationLauncher::applicationPID() const
return result;
}
void ApplicationLauncher::appendWinMessage(const QString &output,
bool onStdErr)
void ApplicationLauncher::appendProcessMessage(const QString &output, bool onStdErr)
{
emit appendMessage(output, onStdErr ? ErrorMessageFormat : NormalMessageFormat);
}
......
......@@ -78,7 +78,7 @@ ApplicationLauncher::ApplicationLauncher(QObject *parent)
d->m_consoleProcess.setSettings(Core::ICore::instance()->settings());
connect(&d->m_consoleProcess, SIGNAL(processMessage(QString,bool)),
this, SIGNAL(appendMessage(QString,bool)));
this, SLOT(appendProcessMessage(QString,bool)));
connect(&d->m_consoleProcess, SIGNAL(processStopped()),
this, SLOT(processStopped()));
}
......@@ -87,6 +87,11 @@ ApplicationLauncher::~ApplicationLauncher()
{
}
void ApplicationLauncher::appendProcessMessage(const QString &output, bool onStdErr)
{
emit appendMessage(output, onStdErr ? ErrorMessageFormat : NormalMessageFormat);
}
void ApplicationLauncher::setWorkingDirectory(const QString &dir)
{
d->m_guiProcess.setWorkingDirectory(dir);
......
......@@ -209,6 +209,7 @@ signals:
public slots:
void bringApplicationToForeground(qint64 pid);
void appendMessage(const QString &error, ProjectExplorer::OutputFormat);
private slots:
void bringApplicationToForegroundInternal();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment