diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-06-26 22:52:59 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-07-04 09:35:58 +0000 |
| commit | 88dfa84fc62484a6ec74ee7acb39808605f23390 (patch) | |
| tree | 452b5df699ea002476c41b1acaffc5cb58e52f2d /src/plugins/android/androidsignaloperation.cpp | |
| parent | c3acbc46edb1997fcf690e910e4eefee51c8c243 (diff) | |
| download | qt-creator-88dfa84fc62484a6ec74ee7acb39808605f23390.tar.gz | |
Android: Use Qt5-style connects
The heavy lifting was done by clazy.
Change-Id: Id09b62b7b9812d9c0981202c257d18387a8b09d9
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/plugins/android/androidsignaloperation.cpp')
| -rw-r--r-- | src/plugins/android/androidsignaloperation.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/android/androidsignaloperation.cpp b/src/plugins/android/androidsignaloperation.cpp index 2c88f52a3a..a92d980bf6 100644 --- a/src/plugins/android/androidsignaloperation.cpp +++ b/src/plugins/android/androidsignaloperation.cpp @@ -39,7 +39,7 @@ Android::Internal::AndroidSignalOperation::AndroidSignalOperation() , m_signal(0) { m_timeout->setInterval(5000); - connect(m_timeout, SIGNAL(timeout()), this, SLOT(handleTimeout())); + connect(m_timeout, &QTimer::timeout, this, &AndroidSignalOperation::handleTimeout); } void Android::Internal::AndroidSignalOperation::adbFindRunAsFinished(int exitCode, @@ -63,8 +63,9 @@ void Android::Internal::AndroidSignalOperation::adbFindRunAsFinished(int exitCod m_state = Idle; emit finished(m_errorMessage); } else { - connect(m_adbProcess, SIGNAL(finished(int,QProcess::ExitStatus)), - SLOT(adbKillFinished(int,QProcess::ExitStatus))); + connect(m_adbProcess, + static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), + this, &AndroidSignalOperation::adbKillFinished); m_state = Kill; m_timeout->start(); m_adbProcess->start(m_adbPath, QStringList() @@ -116,8 +117,9 @@ void Android::Internal::AndroidSignalOperation::signalOperationViaADB(qint64 pid m_adbProcess->disconnect(this); m_pid = pid; m_signal = signal; - connect(m_adbProcess, SIGNAL(finished(int,QProcess::ExitStatus)), - SLOT(adbFindRunAsFinished(int,QProcess::ExitStatus))); + connect(m_adbProcess, + static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), + this, &AndroidSignalOperation::adbFindRunAsFinished); m_state = RunAs; m_timeout->start(); m_adbProcess->start(m_adbPath, QStringList() |