diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-10 15:35:33 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-15 13:48:13 +0000 |
commit | 90135a5b7a31c30322f19e403d697780b552bf19 (patch) | |
tree | d64bef2da4d0143c38167eca2ae32d47b7226ced /src/libs/installer/elevatedexecuteoperation.cpp | |
parent | 80b2694aede1ed736c619f76cb7b6250a913635b (diff) |
Convert to Qt 5 connect syntax
Convert to new signal/slot syntax where it does not make things more
complicated: connections where the signal or slot is an overloaded
method, or where the receiver method is not in a QObject, are left alone.
The new syntax allows compile-time checking of the connection.
Change-Id: I2cc3c93b9812797bd67f64a8728569491eeec668
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/elevatedexecuteoperation.cpp')
-rw-r--r-- | src/libs/installer/elevatedexecuteoperation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/elevatedexecuteoperation.cpp b/src/libs/installer/elevatedexecuteoperation.cpp index 1f439067c..9fe20a103 100644 --- a/src/libs/installer/elevatedexecuteoperation.cpp +++ b/src/libs/installer/elevatedexecuteoperation.cpp @@ -161,12 +161,12 @@ bool ElevatedExecuteOperation::Private::run(const QStringList &arguments) if (showStandardError) process->setProcessChannelMode(QProcessWrapper::MergedChannels); - connect(q, SIGNAL(cancelProcess()), process, SLOT(cancel())); + connect(q, &ElevatedExecuteOperation::cancelProcess, process, &QProcessWrapper::cancel); //we still like the none blocking possibility to perform this operation without threads QEventLoop loop; if (QThread::currentThread() == qApp->thread()) { - QObject::connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), &loop, SLOT(quit())); + QObject::connect(process, &QProcessWrapper::finished, &loop, &QEventLoop::quit); } //readProcessOutput should only called from this current Thread -> Qt::DirectConnection QObject::connect(process, SIGNAL(readyRead()), q, SLOT(readProcessOutput()), Qt::DirectConnection); |