diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-05-04 23:06:26 +0300 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-05-05 09:17:19 +0200 |
| commit | 4dfa08c22f7452a8ad00b7b56b4a63736684f7d2 (patch) | |
| tree | 64860a849d0a2d638863327d5b870bf6f5e038f7 /src/plugins/valgrind/valgrindengine.cpp | |
| parent | b9c2475726c9b41cb0b26de84c96b659a05b75e5 (diff) | |
| download | qt-creator-4dfa08c22f7452a8ad00b7b56b4a63736684f7d2.tar.gz | |
Valgrind: Use QString for processOutput signal
Change-Id: I446f1a06b2c00280679dd09cd1818c1dd69c7e11
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/valgrind/valgrindengine.cpp')
| -rw-r--r-- | src/plugins/valgrind/valgrindengine.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index a5e8336f97..d03f016a3d 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -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) |