Valgrind: Port to Qt5-style connect

Change-Id: If5f36bb262b932b60133d4301ab614311ce1feee
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-06 12:39:07 +02:00
committed by hjk
parent 5b22e292bc
commit e9a6e99011
14 changed files with 141 additions and 143 deletions

View File

@@ -94,16 +94,16 @@ void ValgrindRunner::Private::run(ValgrindProcess *_process)
// consider appending our options last so they override any interfering user-supplied options
// -q as suggested by valgrind manual
QObject::connect(process, SIGNAL(processOutput(QString,Utils::OutputFormat)),
q, SIGNAL(processOutputReceived(QString,Utils::OutputFormat)));
QObject::connect(process, SIGNAL(started()),
q, SLOT(processStarted()));
QObject::connect(process, SIGNAL(finished(int,QProcess::ExitStatus)),
q, SLOT(processFinished(int,QProcess::ExitStatus)));
QObject::connect(process, SIGNAL(error(QProcess::ProcessError)),
q, SLOT(processError(QProcess::ProcessError)));
QObject::connect(process, SIGNAL(localHostAddressRetrieved(QHostAddress)), q,
SLOT(localHostAddressRetrieved(QHostAddress)));
QObject::connect(process, &ValgrindProcess::processOutput,
q, &ValgrindRunner::processOutputReceived);
QObject::connect(process, &ValgrindProcess::started,
q, &ValgrindRunner::started);
QObject::connect(process, &ValgrindProcess::finished,
q, &ValgrindRunner::processFinished);
QObject::connect(process, &ValgrindProcess::error,
q, &ValgrindRunner::processError);
QObject::connect(process, &ValgrindProcess::localHostAddressRetrieved, q,
&ValgrindRunner::localHostAddressRetrieved);
process->setValgrindExecutable(valgrindExecutable);
process->setValgrindArguments(q->fullValgrindArguments());
@@ -234,7 +234,7 @@ void ValgrindRunner::waitForFinished() const
return;
QEventLoop loop;
connect(this, SIGNAL(finished()), &loop, SLOT(quit()));
connect(this, &ValgrindRunner::finished, &loop, &QEventLoop::quit);
loop.exec();
}
@@ -275,11 +275,6 @@ void ValgrindRunner::localHostAddressRetrieved(const QHostAddress &localHostAddr
Q_UNUSED(localHostAddress);
}
void ValgrindRunner::processStarted()
{
emit started();
}
QString ValgrindRunner::errorString() const
{
if (d->process)