forked from qt-creator/qt-creator
Valgrind: Use QString for processOutput signal
Change-Id: I446f1a06b2c00280679dd09cd1818c1dd69c7e11 Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
@@ -113,8 +113,8 @@ bool ValgrindRunControl::startEngine()
|
||||
run->setConnectionParameters(sp.connParams);
|
||||
run->setStartMode(sp.startMode);
|
||||
|
||||
connect(run, SIGNAL(processOutputReceived(QByteArray,Utils::OutputFormat)),
|
||||
SLOT(receiveProcessOutput(QByteArray,Utils::OutputFormat)));
|
||||
connect(run, SIGNAL(processOutputReceived(QString,Utils::OutputFormat)),
|
||||
SLOT(receiveProcessOutput(QString,Utils::OutputFormat)));
|
||||
connect(run, SIGNAL(processErrorReceived(QString,QProcess::ProcessError)),
|
||||
SLOT(receiveProcessError(QString,QProcess::ProcessError)));
|
||||
connect(run, SIGNAL(finished()), SLOT(runnerFinished()));
|
||||
@@ -178,13 +178,13 @@ void ValgrindRunControl::runnerFinished()
|
||||
|
||||
m_progress->reportFinished();
|
||||
|
||||
disconnect(runner(), SIGNAL(processOutputReceived(QByteArray,Utils::OutputFormat)),
|
||||
this, SLOT(receiveProcessOutput(QByteArray,Utils::OutputFormat)));
|
||||
disconnect(runner(), SIGNAL(processOutputReceived(QString,Utils::OutputFormat)),
|
||||
this, SLOT(receiveProcessOutput(QString,Utils::OutputFormat)));
|
||||
disconnect(runner(), SIGNAL(finished()),
|
||||
this, SLOT(runnerFinished()));
|
||||
}
|
||||
|
||||
void ValgrindRunControl::receiveProcessOutput(const QByteArray &output, OutputFormat format)
|
||||
void ValgrindRunControl::receiveProcessOutput(const QString &output, OutputFormat format)
|
||||
{
|
||||
int progress = m_progress->progressValue();
|
||||
if (progress < 5 * progressMaximum / 10)
|
||||
@@ -192,7 +192,7 @@ void ValgrindRunControl::receiveProcessOutput(const QByteArray &output, OutputFo
|
||||
else if (progress < 9 * progressMaximum / 10)
|
||||
progress += progress / 1000;
|
||||
m_progress->setProgressValue(progress);
|
||||
appendMessage(QString::fromLocal8Bit(output), format);
|
||||
appendMessage(output, format);
|
||||
}
|
||||
|
||||
void ValgrindRunControl::receiveProcessError(const QString &message, QProcess::ProcessError error)
|
||||
|
||||
Reference in New Issue
Block a user