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/downloadfiletask.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/downloadfiletask.cpp')
-rw-r--r-- | src/libs/installer/downloadfiletask.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/libs/installer/downloadfiletask.cpp b/src/libs/installer/downloadfiletask.cpp index f308315c9..dde85795c 100644 --- a/src/libs/installer/downloadfiletask.cpp +++ b/src/libs/installer/downloadfiletask.cpp @@ -55,7 +55,7 @@ AuthenticationRequiredException::AuthenticationRequiredException(Type type, cons Downloader::Downloader() : m_finished(0) { - connect(&m_nam, SIGNAL(finished(QNetworkReply*)), SLOT(onFinished(QNetworkReply*))); + connect(&m_nam, &QNetworkAccessManager::finished, this, &Downloader::onFinished); } Downloader::~Downloader() @@ -78,11 +78,11 @@ void Downloader::download(QFutureInterface<FileTaskResult> &fi, const QList<File fi.setExpectedResultCount(items.count()); m_nam.setProxyFactory(networkProxyFactory); - connect(&m_nam, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), this, - SLOT(onAuthenticationRequired(QNetworkReply*,QAuthenticator*))); - connect(&m_nam, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), this, - SLOT(onProxyAuthenticationRequired(QNetworkProxy,QAuthenticator*))); - QTimer::singleShot(0, this, SLOT(doDownload())); + connect(&m_nam, &QNetworkAccessManager::authenticationRequired, this, + &Downloader::onAuthenticationRequired); + connect(&m_nam, &QNetworkAccessManager::proxyAuthenticationRequired, this, + &Downloader::onProxyAuthenticationRequired); + QTimer::singleShot(0, this, &Downloader::doDownload); } void Downloader::doDownload() @@ -345,14 +345,13 @@ QNetworkReply *Downloader::startDownload(const FileTaskItem &item) std::unique_ptr<Data> data(new Data(item)); m_downloads[reply] = std::move(data); - connect(reply, SIGNAL(readyRead()), this, SLOT(onReadyRead())); + connect(reply, &QIODevice::readyRead, this, &Downloader::onReadyRead); connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onError(QNetworkReply::NetworkError))); #ifndef QT_NO_SSL - connect(reply, SIGNAL(sslErrors(QList<QSslError>)), SLOT(onSslErrors(QList<QSslError>))); + connect(reply, &QNetworkReply::sslErrors, this, &Downloader::onSslErrors); #endif - connect(reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(onDownloadProgress(qint64, - qint64))); + connect(reply, &QNetworkReply::downloadProgress, this, &Downloader::onDownloadProgress); return reply; } @@ -399,7 +398,7 @@ void DownloadFileTask::doTask(QFutureInterface<FileTaskResult> &fi) { QEventLoop el; Downloader downloader; - connect(&downloader, SIGNAL(finished()), &el, SLOT(quit())); + connect(&downloader, &Downloader::finished, &el, &QEventLoop::quit); QList<FileTaskItem> items = taskItems(); if (!m_authenticator.isNull()) { |