Valgrind: Port to Qt5-style connect

Change-Id: If5f36bb262b932b60133d4301ab614311ce1feee
Reviewed-by: hjk <hjk@theqtcompany.com>

2 files changed, 16 insertions, 16 deletions

diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
index 07cccf0e33..02f128d307 100644
--- a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
@@ -103,10 +103,10 @@ void CallgrindController::run(Option option)
                 connection ? connection->connectionParameters() : QSsh::SshConnectionParameters(),
                 connection, this);
 
-    connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)),
-            SLOT(processFinished(int,QProcess::ExitStatus)));
-    connect(m_process, SIGNAL(error(QProcess::ProcessError)),
-            SLOT(processError(QProcess::ProcessError)));
+    connect(m_process, &ValgrindProcess::finished,
+            this, &CallgrindController::processFinished);
+    connect(m_process, &ValgrindProcess::error,
+            this, &CallgrindController::processError);
 
     // save back current running operation
     m_lastOption = option;
@@ -209,8 +209,8 @@ void CallgrindController::getLocalDataFile()
         // if there are files like callgrind.out.PID.NUM, set it to the most recent one of those
         QString cmd = QString::fromLatin1("ls -t %1* | head -n 1").arg(fileName);
         m_findRemoteFile = m_ssh->createRemoteProcess(cmd.toUtf8());
-        connect(m_findRemoteFile.data(), SIGNAL(readyReadStandardOutput()), this,
-            SLOT(foundRemoteFile()));
+        connect(m_findRemoteFile.data(), &QSsh::SshRemoteProcess::readyReadStandardOutput,
+                this, &CallgrindController::foundRemoteFile);
         m_findRemoteFile->start();
     } else {
         QDir dir(workingDir, QString::fromLatin1("%1.*").arg(baseFileName), QDir::Time);
@@ -228,9 +228,10 @@ void CallgrindController::foundRemoteFile()
     m_remoteFile = m_findRemoteFile->readAllStandardOutput().trimmed();
 
     m_sftp = m_ssh->createSftpChannel();
-    connect(m_sftp.data(), SIGNAL(finished(QSsh::SftpJobId,QString)),
-            this, SLOT(sftpJobFinished(QSsh::SftpJobId,QString)));
-    connect(m_sftp.data(), SIGNAL(initialized()), this, SLOT(sftpInitialized()));
+    connect(m_sftp.data(), &QSsh::SftpChannel::finished,
+            this, &CallgrindController::sftpJobFinished);
+    connect(m_sftp.data(), &QSsh::SftpChannel::initialized,
+            this, &CallgrindController::sftpInitialized);
     m_sftp->initialize();
 }
 
diff --git a/src/plugins/valgrind/callgrind/callgrindrunner.cpp b/src/plugins/valgrind/callgrind/callgrindrunner.cpp
index a277446d1e..800db8d793 100644
--- a/src/plugins/valgrind/callgrind/callgrindrunner.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindrunner.cpp
@@ -44,13 +44,12 @@ CallgrindRunner::CallgrindRunner(QObject *parent)
     , m_parser(new Parser(this))
     , m_paused(false)
 {
-    connect(m_controller,
-            SIGNAL(finished(Valgrind::Callgrind::CallgrindController::Option)),
-            SLOT(controllerFinished(Valgrind::Callgrind::CallgrindController::Option)));
-    connect(m_controller, SIGNAL(localParseDataAvailable(QString)),
-            this, SLOT(localParseDataAvailable(QString)));
-    connect(m_controller, SIGNAL(statusMessage(QString)),
-            this, SIGNAL(statusMessage(QString)));
+    connect(m_controller, &CallgrindController::finished,
+            this, &CallgrindRunner::controllerFinished);
+    connect(m_controller, &CallgrindController::localParseDataAvailable,
+            this, &CallgrindRunner::localParseDataAvailable);
+    connect(m_controller, &CallgrindController::statusMessage,
+            this, &CallgrindRunner::statusMessage);
 }
 
 QString CallgrindRunner::tool() const