chatterino2
Code Issues

Remove unused "urlDelete" function from NetworkManager

Browse Source 
Allow NetworkRequest to be constructed with a QUrl
This commit is contained in:
Rasmus Karlsson
2018-07-06 19:31:58 +00:00
parent 1f2968934c
commit 091b597fe9
4 changed files with 48 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/NetworkManager.hpp
+4 -26
View File
@@ -34,11 +34,11 @@ public:
worker->moveToThread(&NetworkManager::workerThread);
QObject::connect(
&requester, &NetworkRequester::requestUrl, worker,
[ worker, data, onFinished = std::move(onFinished), request = std::move(request) ]() {
[worker, data, onFinished = std::move(onFinished), request = std::move(request)]() {
QNetworkReply *reply = NetworkManager::NaM.put(request, *data);
reply->connect(reply, &QNetworkReply::finished,
[ worker, reply, onFinished = std::move(onFinished) ]() {
[worker, reply, onFinished = std::move(onFinished)]() {
onFinished(reply);
delete worker;
});
@@ -56,33 +56,11 @@ public:
worker->moveToThread(&NetworkManager::workerThread);
QObject::connect(
&requester, &NetworkRequester::requestUrl, worker,
[ onFinished = std::move(onFinished), request = std::move(request), worker ]() {
[onFinished = std::move(onFinished), request = std::move(request), worker]() {
QNetworkReply *reply = NetworkManager::NaM.put(request, "");
reply->connect(reply, &QNetworkReply::finished,
[ onFinished = std::move(onFinished), reply, worker ]() {
onFinished(reply);
delete worker;
});
});
emit requester.requestUrl();
}
template <typename FinishedCallback>
static void urlDelete(QNetworkRequest request, FinishedCallback onFinished)
{
NetworkRequester requester;
NetworkWorker *worker = new NetworkWorker;
worker->moveToThread(&NetworkManager::workerThread);
QObject::connect(
&requester, &NetworkRequester::requestUrl, worker,
[ onFinished = std::move(onFinished), request = std::move(request), worker ]() {
QNetworkReply *reply = NetworkManager::NaM.deleteResource(request);
reply->connect(reply, &QNetworkReply::finished,
[ onFinished = std::move(onFinished), reply, worker ]() {
[onFinished = std::move(onFinished), reply, worker]() {
onFinished(reply);
delete worker;
});