feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Analyzer: Use Utils::OutputFormat everywhere

Browse Source 
Replace hard distinction between 'out', 'err' with flexible
OutputFormat. Also make sure that QmlProfiler shows application output.

Change-Id: I130c71884321e4c59c9a75f0836c37a7f0e805c4
Reviewed-on: http://codereview.qt.nokia.com/458
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
This commit is contained in:
Kai Koehne
2011-06-10 16:34:06 +02:00
parent 83566c3c3a
commit 73b66f5d08
12 changed files with 50 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/valgrind/valgrindprocess.cpp
View File

@@ -128,14 +128,14 @@ void LocalValgrindProcess::readyReadStandardError()
{
const QByteArray b = m_process.readAllStandardError();
if (!b.isEmpty())
emit standardErrorReceived(b);
emit processOutput(b, Utils::StdErrFormat);
}
void LocalValgrindProcess::readyReadStandardOutput()
{
const QByteArray b = m_process.readAllStandardOutput();
if (!b.isEmpty())
emit standardOutputReceived(b);
emit processOutput(b, Utils::StdOutFormat);
}
////////////////////////
@@ -202,9 +202,9 @@ void RemoteValgrindProcess::connected()
m_process = m_connection->createRemoteProcess(cmd.toUtf8());
connect(m_process.data(), SIGNAL(errorOutputAvailable(QByteArray)),
this, SIGNAL(standardErrorReceived(QByteArray)));
this, SLOT(standardError(QByteArray)));
connect(m_process.data(), SIGNAL(outputAvailable(QByteArray)),
this, SIGNAL(standardOutputReceived(QByteArray)));
this, SLOT(standardOutput(QByteArray)));
connect(m_process.data(), SIGNAL(closed(int)),
this, SLOT(closed(int)));
connect(m_process.data(), SIGNAL(started()),
@@ -242,7 +242,7 @@ void RemoteValgrindProcess::processStarted()
m_findPID = m_connection->createRemoteProcess(cmd.toUtf8());
connect(m_findPID.data(), SIGNAL(errorOutputAvailable(QByteArray)),
this, SIGNAL(standardErrorReceived(QByteArray)));
this, SLOT(standardOutput(QByteArray)));
connect(m_findPID.data(), SIGNAL(outputAvailable(QByteArray)),
this, SLOT(findPIDOutputReceived(QByteArray)));
m_findPID->start();
@@ -263,6 +263,16 @@ void RemoteValgrindProcess::findPIDOutputReceived(const QByteArray &output)
}
}
void RemoteValgrindProcess::standardOutput(const QByteArray &output)
{
emit processOutput(output, Utils::StdOutFormat);
}
void RemoteValgrindProcess::standardError(const QByteArray &output)
{
emit processOutput(output, Utils::StdErrFormat);
}
void RemoteValgrindProcess::error(Utils::SshError error)
{
switch (error) {