6 files changed, 23 insertions, 17 deletions
diff --git a/launcher/minecraft/services/CapeChange.cpp b/launcher/minecraft/services/CapeChange.cpp
index c1d88d14..d411965a 100644
--- a/launcher/minecraft/services/CapeChange.cpp
+++ b/launcher/minecraft/services/CapeChange.cpp
@@ -1,7 +1,9 @@
 #include "CapeChange.h"
+
 #include <QNetworkRequest>
 #include <QHttpMultiPart>
-#include <Env.h>
+
+#include "Application.h"
 
 CapeChange::CapeChange(QObject *parent, AuthSessionPtr session, QString cape)
     : Task(parent), m_capeId(cape), m_session(session)
@@ -12,11 +14,11 @@ void CapeChange::setCape(QString& cape) {
     QNetworkRequest request(QUrl("https://api.minecraftservices.com/minecraft/profile/capes/active"));
     auto requestString = QString("{\"capeId\":\"%1\"}").arg(m_capeId);
     request.setRawHeader("Authorization", QString("Bearer %1").arg(m_session->access_token).toLocal8Bit());
-    QNetworkReply *rep = ENV.qnam().put(request, requestString.toUtf8());
+    QNetworkReply *rep = APPLICATION->network()->put(request, requestString.toUtf8());
 
     setStatus(tr("Equipping cape"));
 
-    m_reply = std::shared_ptr<QNetworkReply>(rep);
+    m_reply = shared_qobject_ptr<QNetworkReply>(rep);
     connect(rep, &QNetworkReply::uploadProgress, this, &Task::setProgress);
     connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(downloadError(QNetworkReply::NetworkError)));
     connect(rep, SIGNAL(finished()), this, SLOT(downloadFinished()));
@@ -26,11 +28,11 @@ void CapeChange::clearCape() {
     QNetworkRequest request(QUrl("https://api.minecraftservices.com/minecraft/profile/capes/active"));
     auto requestString = QString("{\"capeId\":\"%1\"}").arg(m_capeId);
     request.setRawHeader("Authorization", QString("Bearer %1").arg(m_session->access_token).toLocal8Bit());
-    QNetworkReply *rep = ENV.qnam().deleteResource(request);
+    QNetworkReply *rep = APPLICATION->network()->deleteResource(request);
 
     setStatus(tr("Removing cape"));
 
-    m_reply = std::shared_ptr<QNetworkReply>(rep);
+    m_reply = shared_qobject_ptr<QNetworkReply>(rep);
     connect(rep, &QNetworkReply::uploadProgress, this, &Task::setProgress);
     connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(downloadError(QNetworkReply::NetworkError)));
     connect(rep, SIGNAL(finished()), this, SLOT(downloadFinished()));
diff --git a/launcher/minecraft/services/CapeChange.h b/launcher/minecraft/services/CapeChange.h
index 1b6f2f72..c04ad8c7 100644
--- a/launcher/minecraft/services/CapeChange.h
+++ b/launcher/minecraft/services/CapeChange.h
@@ -5,6 +5,7 @@
 #include <memory>
 #include <minecraft/auth/AuthSession.h>
 #include "tasks/Task.h"
+#include "QObjectPtr.h"
 
 class CapeChange : public Task
 {
@@ -20,7 +21,7 @@ private:
 private:
     QString m_capeId;
     AuthSessionPtr m_session;
-    std::shared_ptr<QNetworkReply> m_reply;
+    shared_qobject_ptr<QNetworkReply> m_reply;
 
 protected:
     virtual void executeTask();
diff --git a/launcher/minecraft/services/SkinDelete.cpp b/launcher/minecraft/services/SkinDelete.cpp
index 34977257..a0b0330c 100644
--- a/launcher/minecraft/services/SkinDelete.cpp
+++ b/launcher/minecraft/services/SkinDelete.cpp
@@ -1,7 +1,9 @@
 #include "SkinDelete.h"
+
 #include <QNetworkRequest>
 #include <QHttpMultiPart>
-#include <Env.h>
+
+#include "Application.h"
 
 SkinDelete::SkinDelete(QObject *parent, AuthSessionPtr session)
     : Task(parent), m_session(session)
@@ -12,8 +14,8 @@ void SkinDelete::executeTask()
 {
     QNetworkRequest request(QUrl("https://api.minecraftservices.com/minecraft/profile/skins/active"));
     request.setRawHeader("Authorization", QString("Bearer %1").arg(m_session->access_token).toLocal8Bit());
-    QNetworkReply *rep = ENV.qnam().deleteResource(request);
-    m_reply = std::shared_ptr<QNetworkReply>(rep);
+    QNetworkReply *rep = APPLICATION->network()->deleteResource(request);
+    m_reply = shared_qobject_ptr<QNetworkReply>(rep);
 
     setStatus(tr("Deleting skin"));
     connect(rep, &QNetworkReply::uploadProgress, this, &Task::setProgress);
diff --git a/launcher/minecraft/services/SkinDelete.h b/launcher/minecraft/services/SkinDelete.h
index 839bf9bc..6048b33a 100644
--- a/launcher/minecraft/services/SkinDelete.h
+++ b/launcher/minecraft/services/SkinDelete.h
@@ -2,11 +2,10 @@
 
 #include <QFile>
 #include <QtNetwork/QtNetwork>
-#include <memory>
 #include <minecraft/auth/AuthSession.h>
 #include "tasks/Task.h"
 
-typedef std::shared_ptr<class SkinDelete> SkinDeletePtr;
+typedef shared_qobject_ptr<class SkinDelete> SkinDeletePtr;
 
 class SkinDelete : public Task
 {
@@ -17,7 +16,7 @@ public:
 
 private:
     AuthSessionPtr m_session;
-    std::shared_ptr<QNetworkReply> m_reply;
+    shared_qobject_ptr<QNetworkReply> m_reply;
 
 protected:
     virtual void executeTask();
diff --git a/launcher/minecraft/services/SkinUpload.cpp b/launcher/minecraft/services/SkinUpload.cpp
index 4e5a1698..e58d32d7 100644
--- a/launcher/minecraft/services/SkinUpload.cpp
+++ b/launcher/minecraft/services/SkinUpload.cpp
@@ -1,7 +1,9 @@
 #include "SkinUpload.h"
+
 #include <QNetworkRequest>
 #include <QHttpMultiPart>
-#include <Env.h>
+
+#include "Application.h"
 
 QByteArray getVariant(SkinUpload::Model model) {
     switch (model) {
@@ -37,8 +39,8 @@ void SkinUpload::executeTask()
     multiPart->append(skin);
     multiPart->append(model);
 
-    QNetworkReply *rep = ENV.qnam().post(request, multiPart);
-    m_reply = std::shared_ptr<QNetworkReply>(rep);
+    QNetworkReply *rep = APPLICATION->network()->post(request, multiPart);
+    m_reply = shared_qobject_ptr<QNetworkReply>(rep);
 
     setStatus(tr("Uploading skin"));
     connect(rep, &QNetworkReply::uploadProgress, this, &Task::setProgress);
diff --git a/launcher/minecraft/services/SkinUpload.h b/launcher/minecraft/services/SkinUpload.h
index ec859699..2c782e11 100644
--- a/launcher/minecraft/services/SkinUpload.h
+++ b/launcher/minecraft/services/SkinUpload.h
@@ -6,7 +6,7 @@
 #include <minecraft/auth/AuthSession.h>
 #include "tasks/Task.h"
 
-typedef std::shared_ptr<class SkinUpload> SkinUploadPtr;
+typedef shared_qobject_ptr<class SkinUpload> SkinUploadPtr;
 
 class SkinUpload : public Task
 {
@@ -26,7 +26,7 @@ private:
     Model m_model;
     QByteArray m_skin;
     AuthSessionPtr m_session;
-    std::shared_ptr<QNetworkReply> m_reply;
+    shared_qobject_ptr<QNetworkReply> m_reply;
 protected:
     virtual void executeTask();