From e196e57a045ef5ffcec9ac31f429a9dd39172fb3 Mon Sep 17 00:00:00 2001
From: Gurkengewuerz <niklas@schuetrumpf.net>
Date: Sun, 23 Feb 2020 20:55:24 +0100
Subject: [PATCH] delete unused pointers

---
 src/hotkeying.cpp  |  1 +
 src/io/ioutils.cpp | 28 +++++++++++++++-------------
 src/io/ioutils.hpp |  3 ++-
 src/mainwindow.cpp |  1 +
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/hotkeying.cpp b/src/hotkeying.cpp
index 9f49355..29143f6 100644
--- a/src/hotkeying.cpp
+++ b/src/hotkeying.cpp
@@ -45,6 +45,7 @@ void hotkeying::clearAll() {
     for(QString e : hotkeys.keys()) {
         QHotkey *hk = hotkeys.value(e);
         hk->setRegistered(false);
+        delete hk;
     }
 }
 
diff --git a/src/io/ioutils.cpp b/src/io/ioutils.cpp
index 4502671..06f958a 100644
--- a/src/io/ioutils.cpp
+++ b/src/io/ioutils.cpp
@@ -3,11 +3,10 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
-#include <thread>
 #include <logs/requestlogging.hpp>
 #include <logs/screenshotfile.h>
 
-QNetworkAccessManager ioutils::networkManager;
+QNetworkAccessManager* ioutils::networkManager= new QNetworkAccessManager();
 
 void ioutils::addLogEntry(QNetworkReply* reply, QByteArray data, QString result, ScreenshotFile sf) {
     requestlogging::RequestContext ctx;
@@ -38,13 +37,13 @@ void ioutils::postMultipart(QUrl target,
     for (auto header : headers) {
         if (header.first.toLower() != "content-type") req.setRawHeader(header.first.toUtf8(), header.second.toUtf8());
     }
-    QNetworkReply *reply = networkManager.post(req, body);
+    QNetworkReply *reply = networkManager->post(req, body);
     addTask();
     QObject::connect(reply, &QNetworkReply::finished, [reply, callback] {
         removeTask();
         QByteArray data = reply->readAll();
         callback(QJsonDocument::fromJson(data), data, reply);
-        delete reply;
+        reply->deleteLater();
     });
 }
 
@@ -56,13 +55,13 @@ void ioutils::postMultipartData(QUrl target,
     for (auto header : headers) {
         if (header.first.toLower() != "content-type") req.setRawHeader(header.first.toUtf8(), header.second.toUtf8());
     }
-    QNetworkReply *reply = networkManager.post(req, body);
+    QNetworkReply *reply = networkManager->post(req, body);
     addTask();
     QObject::connect(reply, &QNetworkReply::finished, [reply, callback] {
         removeTask();
         QByteArray data = reply->readAll();
         callback(data, reply);
-        delete reply;
+        reply->deleteLater();
     });
 }
 
@@ -73,7 +72,7 @@ void ioutils::getJson(QUrl target,
     for (auto header : headers) {
         req.setRawHeader(header.first.toUtf8(), header.second.toUtf8());
     }
-    QNetworkReply *reply = networkManager.get(req);
+    QNetworkReply *reply = networkManager->get(req);
     addTask();
     QObject::connect(reply, &QNetworkReply::finished, [reply, callback] {
         removeTask();
@@ -91,13 +90,13 @@ void ioutils::postJson(QUrl target,
     for (auto header : headers) {
         req.setRawHeader(header.first.toUtf8(), header.second.toUtf8());
     }
-    QNetworkReply *reply = networkManager.post(req, body);
+    QNetworkReply *reply = networkManager->post(req, body);
     addTask();
     QObject::connect(reply, &QNetworkReply::finished, [reply, callback] {
         removeTask();
         QByteArray data = reply->readAll();
         callback(QJsonDocument::fromJson(data), data, reply);
-        delete reply;
+        reply->deleteLater();
     });
 }
 
@@ -106,13 +105,13 @@ void ioutils::getData(QUrl target, QList<QPair<QString, QString>> headers, std::
     for (auto header : headers) {
         req.setRawHeader(header.first.toUtf8(), header.second.toUtf8());
     }
-    QNetworkReply *reply = networkManager.get(req);
+    QNetworkReply *reply = networkManager->get(req);
     addTask();
     QObject::connect(reply, &QNetworkReply::finished, [reply, callback] {
         removeTask();
         QByteArray data = reply->readAll();
         callback(data, reply);
-        delete reply;
+        reply->deleteLater();
     });
 }
 
@@ -124,16 +123,19 @@ void ioutils::postData(QUrl target,
     for (auto header : headers) {
         req.setRawHeader(header.first.toUtf8(), header.second.toUtf8());
     }
-    QNetworkReply *reply = networkManager.post(req, body);
+    QNetworkReply *reply = networkManager->post(req, body);
     addTask();
     QObject::connect(reply, &QNetworkReply::finished, [reply, callback] {
         removeTask();
         QByteArray data = reply->readAll();
         callback(data, reply);
-        delete reply;
+        reply->deleteLater();
     });
 }
 
+void ioutils::deleteNetworkManger() {
+    delete networkManager;
+}
 
 QString ioutils::methodString(QNetworkAccessManager::Operation operation) {
     switch (operation) {
diff --git a/src/io/ioutils.hpp b/src/io/ioutils.hpp
index bb36dc1..8423261 100644
--- a/src/io/ioutils.hpp
+++ b/src/io/ioutils.hpp
@@ -9,7 +9,7 @@
 #include <logs/screenshotfile.h>
 
 namespace ioutils {
-    extern QNetworkAccessManager networkManager;
+    extern QNetworkAccessManager* networkManager;
     void addLogEntry(QNetworkReply* reply, QByteArray data, QString result, ScreenshotFile sf);
     void getJson(QUrl target,
                  QList<QPair<QString, QString>> headers,
@@ -28,6 +28,7 @@ namespace ioutils {
                            QList<QPair<QString, QString>> headers,
                            QHttpMultiPart *body,
                            std::function<void(QByteArray, QNetworkReply *)> callback);
+    void deleteNetworkManger();
     QString methodString(QNetworkAccessManager::Operation operation);
     QString httpString(int responseCode);
 } // namespace ioutils
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6180797..e26ff56 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -205,6 +205,7 @@ void MainWindow::closeEvent(QCloseEvent *event) {
 }
 
 void MainWindow::quit() {
+    ioutils::deleteNetworkManger();
     hotkeying::clearAll();
     QApplication::quit();
 }