From a0bb8ab3a1227555f7066160d1440fa1e99810cc Mon Sep 17 00:00:00 2001 From: Jim Broadus Date: Fri, 14 Feb 2020 00:56:18 -0800 Subject: [PATCH] Replace closures with new Qt functor variant of connect. --- src/internet/dropbox/dropboxservice.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/internet/dropbox/dropboxservice.cpp b/src/internet/dropbox/dropboxservice.cpp index 3817d007d..bb2805099 100644 --- a/src/internet/dropbox/dropboxservice.cpp +++ b/src/internet/dropbox/dropboxservice.cpp @@ -118,8 +118,8 @@ void DropboxService::RequestFileList() { QJsonDocument document(json); QNetworkReply* reply = network_->post(request, document.toJson()); - NewClosure(reply, SIGNAL(finished()), this, - SLOT(RequestFileListFinished(QNetworkReply*)), reply); + connect(reply, &QNetworkReply::finished, + [=] { this->RequestFileListFinished(reply); }); } else { QUrl url = QUrl(kListFolderContinueEndpoint); QJsonObject json; @@ -129,8 +129,8 @@ void DropboxService::RequestFileList() { request.setRawHeader("Authorization", GenerateAuthorisationHeader()); request.setRawHeader("Content-Type", "application/json; charset=utf-8"); QNetworkReply* reply = network_->post(request, document.toJson()); - NewClosure(reply, SIGNAL(finished()), this, - SLOT(RequestFileListFinished(QNetworkReply*)), reply); + connect(reply, &QNetworkReply::finished, + [=] { this->RequestFileListFinished(reply); }); } } @@ -176,9 +176,9 @@ void DropboxService::RequestFileListFinished(QNetworkReply* reply) { if (ShouldIndexFile(url, GuessMimeTypeForFile(url.toString()))) { QNetworkReply* reply = FetchContentUrl(url); - NewClosure(reply, SIGNAL(finished()), this, - SLOT(FetchContentUrlFinished(QNetworkReply*, QVariantMap)), - reply, item.toVariantMap()); + connect(reply, &QNetworkReply::finished, [=] { + this->FetchContentUrlFinished(reply, item.toVariantMap()); + }); } } @@ -209,8 +209,8 @@ void DropboxService::LongPollDelta() { request.setRawHeader("Content-Type", "application/json; charset=utf-8"); QJsonDocument document(json); QNetworkReply* reply = network_->post(request, document.toJson()); - NewClosure(reply, SIGNAL(finished()), this, - SLOT(LongPollFinished(QNetworkReply*)), reply); + connect(reply, &QNetworkReply::finished, + [=] { this->LongPollFinished(reply); }); } void DropboxService::LongPollFinished(QNetworkReply* reply) {