From 98082d106415b638e165de3dad2df6e5d36a3249 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sat, 12 May 2018 16:07:03 +0200 Subject: [PATCH] Fix compilation issue on GCC 8.1.0 Fix #377 --- src/util/networkmanager.hpp | 44 ++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/util/networkmanager.hpp b/src/util/networkmanager.hpp index 7cf9dcfe..82203e9a 100644 --- a/src/util/networkmanager.hpp +++ b/src/util/networkmanager.hpp @@ -54,11 +54,11 @@ public: [worker, onFinished = std::move(onFinished), request = std::move(request)]() { QNetworkReply *reply = NetworkManager::NaM.get(request); - QObject::connect(reply, &QNetworkReply::finished, - [worker, reply, onFinished = std::move(onFinished)]() { - onFinished(reply); - delete worker; - }); + reply->connect(reply, &QNetworkReply::finished, + [worker, reply, onFinished = std::move(onFinished)]() { + onFinished(reply); + delete worker; + }); }); emit requester.requestUrl(); @@ -84,8 +84,8 @@ public: onReplyCreated(reply); - QObject::connect(reply, &QNetworkReply::finished, worker, - [=]() { emit worker->doneUrl(reply); }); + reply->connect(reply, &QNetworkReply::finished, worker, + [=]() { emit worker->doneUrl(reply); }); }); QObject::connect(worker, &NetworkWorker::doneUrl, caller, [=](QNetworkReply *reply) { @@ -114,11 +114,11 @@ public: [worker, data, onFinished = std::move(onFinished), request = std::move(request)]() { QNetworkReply *reply = NetworkManager::NaM.put(request, *data); - QObject::connect(reply, &QNetworkReply::finished, - [worker, reply, onFinished = std::move(onFinished)]() { - onFinished(reply); - delete worker; - }); + reply->connect(reply, &QNetworkReply::finished, + [worker, reply, onFinished = std::move(onFinished)]() { + onFinished(reply); + delete worker; + }); }); emit requester.requestUrl(); @@ -136,11 +136,11 @@ public: [onFinished = std::move(onFinished), request = std::move(request), worker]() { QNetworkReply *reply = NetworkManager::NaM.put(request, ""); - QObject::connect(reply, &QNetworkReply::finished, - [onFinished = std::move(onFinished), reply, worker]() { - onFinished(reply); - delete worker; - }); + reply->connect(reply, &QNetworkReply::finished, + [onFinished = std::move(onFinished), reply, worker]() { + onFinished(reply); + delete worker; + }); }); emit requester.requestUrl(); @@ -158,11 +158,11 @@ public: [onFinished = std::move(onFinished), request = std::move(request), worker]() { QNetworkReply *reply = NetworkManager::NaM.deleteResource(request); - QObject::connect(reply, &QNetworkReply::finished, - [onFinished = std::move(onFinished), reply, worker]() { - onFinished(reply); - delete worker; - }); + reply->connect(reply, &QNetworkReply::finished, + [onFinished = std::move(onFinished), reply, worker]() { + onFinished(reply); + delete worker; + }); }); emit requester.requestUrl();