Merge pull request #787 from flowln/make_shared_ptrs_explicit

17 files changed, 84 insertions, 85 deletions

diff --git a/launcher/minecraft/AssetsUtils.cpp b/launcher/minecraft/AssetsUtils.cpp
index 15062c2b..16fdfdb1 100644
--- a/launcher/minecraft/AssetsUtils.cpp
+++ b/launcher/minecraft/AssetsUtils.cpp
@@ -340,7 +340,7 @@ QString AssetObject::getRelPath()
 
 NetJob::Ptr AssetsIndex::getDownloadJob()
 {
-    auto job = new NetJob(QObject::tr("Assets for %1").arg(id), APPLICATION->network());
+    auto job = makeShared<NetJob>(QObject::tr("Assets for %1").arg(id), APPLICATION->network());
     for (auto &object : objects.values())
     {
         auto dl = object.getDownloadAction();
diff --git a/launcher/minecraft/ComponentUpdateTask.cpp b/launcher/minecraft/ComponentUpdateTask.cpp
index 6db21622..d55bc17f 100644
--- a/launcher/minecraft/ComponentUpdateTask.cpp
+++ b/launcher/minecraft/ComponentUpdateTask.cpp
@@ -572,7 +572,7 @@ void ComponentUpdateTask::resolveDependencies(bool checkOnly)
         // add stuff...
         for(auto &add: toAdd)
         {
-            ComponentPtr component = new Component(d->m_list, add.uid);
+            auto component = makeShared<Component>(d->m_list, add.uid);
             if(!add.equalsVersion.isEmpty())
             {
                 // exact version
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index d0a5ed31..8a814cbf 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -962,12 +962,12 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
 
     // print a header
     {
-        process->appendStep(new TextPrint(pptr, "Minecraft folder is:\n" + gameRoot() + "\n\n", MessageLevel::Launcher));
+        process->appendStep(makeShared<TextPrint>(pptr, "Minecraft folder is:\n" + gameRoot() + "\n\n", MessageLevel::Launcher));
     }
 
     // check java
     {
-        process->appendStep(new CheckJava(pptr));
+        process->appendStep(makeShared<CheckJava>(pptr));
     }
 
     // check launch method
@@ -975,13 +975,13 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     QString method = launchMethod();
     if(!validMethods.contains(method))
     {
-        process->appendStep(new TextPrint(pptr, "Selected launch method \"" + method + "\" is not valid.\n", MessageLevel::Fatal));
+        process->appendStep(makeShared<TextPrint>(pptr, "Selected launch method \"" + method + "\" is not valid.\n", MessageLevel::Fatal));
         return process;
     }
 
     // create the .minecraft folder and server-resource-packs (workaround for Minecraft bug MCL-3732)
     {
-        process->appendStep(new CreateGameFolders(pptr));
+        process->appendStep(makeShared<CreateGameFolders>(pptr));
     }
 
     if (!serverToJoin && settings()->get("JoinServerOnLaunch").toBool())
@@ -993,7 +993,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     if(serverToJoin && serverToJoin->port == 25565)
     {
         // Resolve server address to join on launch
-        auto *step = new LookupServerAddress(pptr);
+        auto step = makeShared<LookupServerAddress>(pptr);
         step->setLookupAddress(serverToJoin->address);
         step->setOutputAddressPtr(serverToJoin);
         process->appendStep(step);
@@ -1002,7 +1002,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     // run pre-launch command if that's needed
     if(getPreLaunchCommand().size())
     {
-        auto step = new PreLaunchCommand(pptr);
+        auto step = makeShared<PreLaunchCommand>(pptr);
         step->setWorkingDirectory(gameRoot());
         process->appendStep(step);
     }
@@ -1011,43 +1011,43 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     if(session->status != AuthSession::PlayableOffline)
     {
         if(!session->demo) {
-            process->appendStep(new ClaimAccount(pptr, session));
+            process->appendStep(makeShared<ClaimAccount>(pptr, session));
         }
-        process->appendStep(new Update(pptr, Net::Mode::Online));
+        process->appendStep(makeShared<Update>(pptr, Net::Mode::Online));
     }
     else
     {
-        process->appendStep(new Update(pptr, Net::Mode::Offline));
+        process->appendStep(makeShared<Update>(pptr, Net::Mode::Offline));
     }
 
     // if there are any jar mods
     {
-        process->appendStep(new ModMinecraftJar(pptr));
+        process->appendStep(makeShared<ModMinecraftJar>(pptr));
     }
 
     // Scan mods folders for mods
     {
-        process->appendStep(new ScanModFolders(pptr));
+        process->appendStep(makeShared<ScanModFolders>(pptr));
     }
 
     // print some instance info here...
     {
-        process->appendStep(new PrintInstanceInfo(pptr, session, serverToJoin));
+        process->appendStep(makeShared<PrintInstanceInfo>(pptr, session, serverToJoin));
     }
 
     // extract native jars if needed
     {
-        process->appendStep(new ExtractNatives(pptr));
+        process->appendStep(makeShared<ExtractNatives>(pptr));
     }
 
     // reconstruct assets if needed
     {
-        process->appendStep(new ReconstructAssets(pptr));
+        process->appendStep(makeShared<ReconstructAssets>(pptr));
     }
 
     // verify that minimum Java requirements are met
     {
-        process->appendStep(new VerifyJavaInstall(pptr));
+        process->appendStep(makeShared<VerifyJavaInstall>(pptr));
     }
 
     {
@@ -1055,7 +1055,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         auto method = launchMethod();
         if(method == "LauncherPart")
         {
-            auto step = new LauncherPartLaunch(pptr);
+            auto step = makeShared<LauncherPartLaunch>(pptr);
             step->setWorkingDirectory(gameRoot());
             step->setAuthSession(session);
             step->setServerToJoin(serverToJoin);
@@ -1063,7 +1063,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         }
         else if (method == "DirectJava")
         {
-            auto step = new DirectJavaLaunch(pptr);
+            auto step = makeShared<DirectJavaLaunch>(pptr);
             step->setWorkingDirectory(gameRoot());
             step->setAuthSession(session);
             step->setServerToJoin(serverToJoin);
@@ -1074,7 +1074,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     // run post-exit command if that's needed
     if(getPostExitCommand().size())
     {
-        auto step = new PostLaunchCommand(pptr);
+        auto step = makeShared<PostLaunchCommand>(pptr);
         step->setWorkingDirectory(gameRoot());
         process->appendStep(step);
     }
@@ -1084,8 +1084,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     }
     if(m_settings->get("QuitAfterGameStop").toBool())
     {
-        auto step = new QuitAfterGameStop(pptr);
-        process->appendStep(step);
+        process->appendStep(makeShared<QuitAfterGameStop>(pptr));
     }
     m_launchProcess = process;
     emit launchTaskChanged(m_launchProcess);
diff --git a/launcher/minecraft/MinecraftUpdate.cpp b/launcher/minecraft/MinecraftUpdate.cpp
index 3a3aa864..07ad4882 100644
--- a/launcher/minecraft/MinecraftUpdate.cpp
+++ b/launcher/minecraft/MinecraftUpdate.cpp
@@ -43,7 +43,7 @@ void MinecraftUpdate::executeTask()
     m_tasks.clear();
     // create folders
     {
-        m_tasks.append(new FoldersTask(m_inst));
+        m_tasks.append(makeShared<FoldersTask>(m_inst));
     }
 
     // add metadata update task if necessary
@@ -59,17 +59,17 @@ void MinecraftUpdate::executeTask()
 
     // libraries download
     {
-        m_tasks.append(new LibrariesTask(m_inst));
+        m_tasks.append(makeShared<LibrariesTask>(m_inst));
     }
 
     // FML libraries download and copy into the instance
     {
-        m_tasks.append(new FMLLibrariesTask(m_inst));
+        m_tasks.append(makeShared<FMLLibrariesTask>(m_inst));
     }
 
     // assets update
     {
-        m_tasks.append(new AssetUpdateTask(m_inst));
+        m_tasks.append(makeShared<AssetUpdateTask>(m_inst));
     }
 
     if(!m_preFailure.isEmpty())
diff --git a/launcher/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp
index 42021b3c..da7c1d84 100644
--- a/launcher/minecraft/PackProfile.cpp
+++ b/launcher/minecraft/PackProfile.cpp
@@ -130,7 +130,7 @@ static ComponentPtr componentFromJsonV1(PackProfile * parent, const QString & co
     // critical
     auto uid = Json::requireString(obj.value("uid"));
     auto filePath = componentJsonPattern.arg(uid);
-    auto component = new Component(parent, uid);
+    auto component = makeShared<Component>(parent, uid);
     component->m_version = Json::ensureString(obj.value("version"));
     component->m_dependencyOnly = Json::ensureBoolean(obj.value("dependencyOnly"), false);
     component->m_important = Json::ensureBoolean(obj.value("important"), false);
@@ -518,23 +518,23 @@ bool PackProfile::revertToBase(int index)
     return true;
 }
 
-Component * PackProfile::getComponent(const QString &id)
+ComponentPtr PackProfile::getComponent(const QString &id)
 {
     auto iter = d->componentIndex.find(id);
     if (iter == d->componentIndex.end())
     {
         return nullptr;
     }
-    return (*iter).get();
+    return (*iter);
 }
 
-Component * PackProfile::getComponent(int index)
+ComponentPtr PackProfile::getComponent(int index)
 {
     if(index < 0 || index >= d->components.size())
     {
         return nullptr;
     }
-    return d->components[index].get();
+    return d->components[index];
 }
 
 QVariant PackProfile::data(const QModelIndex &index, int role) const
@@ -765,7 +765,7 @@ bool PackProfile::installEmpty(const QString& uid, const QString& name)
     file.write(OneSixVersionFormat::versionFileToJson(f).toJson());
     file.close();
 
-    appendComponent(new Component(this, f->uid, f));
+    appendComponent(makeShared<Component>(this, f->uid, f));
     scheduleSave();
     invalidateLaunchProfile();
     return true;
@@ -872,7 +872,7 @@ bool PackProfile::installJarMods_internal(QStringList filepaths)
         file.write(OneSixVersionFormat::versionFileToJson(f).toJson());
         file.close();
 
-        appendComponent(new Component(this, f->uid, f));
+        appendComponent(makeShared<Component>(this, f->uid, f));
     }
     scheduleSave();
     invalidateLaunchProfile();
@@ -933,7 +933,7 @@ bool PackProfile::installCustomJar_internal(QString filepath)
     file.write(OneSixVersionFormat::versionFileToJson(f).toJson());
     file.close();
 
-    appendComponent(new Component(this, f->uid, f));
+    appendComponent(makeShared<Component>(this, f->uid, f));
 
     scheduleSave();
     invalidateLaunchProfile();
@@ -989,7 +989,7 @@ bool PackProfile::installAgents_internal(QStringList filepaths)
         patchFile.write(OneSixVersionFormat::versionFileToJson(versionFile).toJson());
         patchFile.close();
 
-        appendComponent(new Component(this, versionFile->uid, versionFile));
+        appendComponent(makeShared<Component>(this, versionFile->uid, versionFile));
     }
 
     scheduleSave();
@@ -1038,7 +1038,7 @@ bool PackProfile::setComponentVersion(const QString& uid, const QString& version
     else
     {
         // add new
-        auto component = new Component(this, uid);
+        auto component = makeShared<Component>(this, uid);
         component->m_version = version;
         component->m_important = important;
         appendComponent(component);
diff --git a/launcher/minecraft/PackProfile.h b/launcher/minecraft/PackProfile.h
index 67b418f4..731cd0ba 100644
--- a/launcher/minecraft/PackProfile.h
+++ b/launcher/minecraft/PackProfile.h
@@ -136,10 +136,10 @@ signals:
 
 public:
     /// get the profile component by id
-    Component * getComponent(const QString &id);
+    ComponentPtr getComponent(const QString &id);
 
     /// get the profile component by index
-    Component * getComponent(int index);
+    ComponentPtr getComponent(int index);
 
     /// Add the component to the internal list of patches
     // todo(merged): is this the best approach
diff --git a/launcher/minecraft/auth/MinecraftAccount.cpp b/launcher/minecraft/auth/MinecraftAccount.cpp
index 73d570f1..48cf5d42 100644
--- a/launcher/minecraft/auth/MinecraftAccount.cpp
+++ b/launcher/minecraft/auth/MinecraftAccount.cpp
@@ -75,7 +75,7 @@ MinecraftAccountPtr MinecraftAccount::loadFromJsonV3(const QJsonObject& json) {
 
 MinecraftAccountPtr MinecraftAccount::createFromUsername(const QString &username)
 {
-    MinecraftAccountPtr account = new MinecraftAccount();
+    auto account = makeShared<MinecraftAccount>();
     account->data.type = AccountType::Mojang;
     account->data.yggdrasilToken.extra["userName"] = username;
     account->data.yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]"));
@@ -91,7 +91,7 @@ MinecraftAccountPtr MinecraftAccount::createBlankMSA()
 
 MinecraftAccountPtr MinecraftAccount::createOffline(const QString &username)
 {
-    MinecraftAccountPtr account = new MinecraftAccount();
+    auto account = makeShared<MinecraftAccount>();
     account->data.type = AccountType::Offline;
     account->data.yggdrasilToken.token = "offline";
     account->data.yggdrasilToken.validity = Katabasis::Validity::Certain;
diff --git a/launcher/minecraft/auth/flows/MSA.cpp b/launcher/minecraft/auth/flows/MSA.cpp
index 416b8f2c..f1987e0c 100644
--- a/launcher/minecraft/auth/flows/MSA.cpp
+++ b/launcher/minecraft/auth/flows/MSA.cpp
@@ -10,28 +10,28 @@
 #include "minecraft/auth/steps/GetSkinStep.h"
 
 MSASilent::MSASilent(AccountData* data, QObject* parent) : AuthFlow(data, parent) {
-    m_steps.append(new MSAStep(m_data, MSAStep::Action::Refresh));
-    m_steps.append(new XboxUserStep(m_data));
-    m_steps.append(new XboxAuthorizationStep(m_data, &m_data->xboxApiToken, "http://xboxlive.com", "Xbox"));
-    m_steps.append(new XboxAuthorizationStep(m_data, &m_data->mojangservicesToken, "rp://api.minecraftservices.com/", "Mojang"));
-    m_steps.append(new LauncherLoginStep(m_data));
-    m_steps.append(new XboxProfileStep(m_data));
-    m_steps.append(new EntitlementsStep(m_data));
-    m_steps.append(new MinecraftProfileStep(m_data));
-    m_steps.append(new GetSkinStep(m_data));
+    m_steps.append(makeShared<MSAStep>(m_data, MSAStep::Action::Refresh));
+    m_steps.append(makeShared<XboxUserStep>(m_data));
+    m_steps.append(makeShared<XboxAuthorizationStep>(m_data, &m_data->xboxApiToken, "http://xboxlive.com", "Xbox"));
+    m_steps.append(makeShared<XboxAuthorizationStep>(m_data, &m_data->mojangservicesToken, "rp://api.minecraftservices.com/", "Mojang"));
+    m_steps.append(makeShared<LauncherLoginStep>(m_data));
+    m_steps.append(makeShared<XboxProfileStep>(m_data));
+    m_steps.append(makeShared<EntitlementsStep>(m_data));
+    m_steps.append(makeShared<MinecraftProfileStep>(m_data));
+    m_steps.append(makeShared<GetSkinStep>(m_data));
 }
 
 MSAInteractive::MSAInteractive(
     AccountData* data,
     QObject* parent
 ) : AuthFlow(data, parent) {
-    m_steps.append(new MSAStep(m_data, MSAStep::Action::Login));
-    m_steps.append(new XboxUserStep(m_data));
-    m_steps.append(new XboxAuthorizationStep(m_data, &m_data->xboxApiToken, "http://xboxlive.com", "Xbox"));
-    m_steps.append(new XboxAuthorizationStep(m_data, &m_data->mojangservicesToken, "rp://api.minecraftservices.com/", "Mojang"));
-    m_steps.append(new LauncherLoginStep(m_data));
-    m_steps.append(new XboxProfileStep(m_data));
-    m_steps.append(new EntitlementsStep(m_data));
-    m_steps.append(new MinecraftProfileStep(m_data));
-    m_steps.append(new GetSkinStep(m_data));
+    m_steps.append(makeShared<MSAStep>(m_data, MSAStep::Action::Login));
+    m_steps.append(makeShared<XboxUserStep>(m_data));
+    m_steps.append(makeShared<XboxAuthorizationStep>(m_data, &m_data->xboxApiToken, "http://xboxlive.com", "Xbox"));
+    m_steps.append(makeShared<XboxAuthorizationStep>(m_data, &m_data->mojangservicesToken, "rp://api.minecraftservices.com/", "Mojang"));
+    m_steps.append(makeShared<LauncherLoginStep>(m_data));
+    m_steps.append(makeShared<XboxProfileStep>(m_data));
+    m_steps.append(makeShared<EntitlementsStep>(m_data));
+    m_steps.append(makeShared<MinecraftProfileStep>(m_data));
+    m_steps.append(makeShared<GetSkinStep>(m_data));
 }
diff --git a/launcher/minecraft/auth/flows/Mojang.cpp b/launcher/minecraft/auth/flows/Mojang.cpp
index b86b0936..5900ea98 100644
--- a/launcher/minecraft/auth/flows/Mojang.cpp
+++ b/launcher/minecraft/auth/flows/Mojang.cpp
@@ -9,10 +9,10 @@ MojangRefresh::MojangRefresh(
     AccountData *data,
     QObject *parent
 ) : AuthFlow(data, parent) {
-    m_steps.append(new YggdrasilStep(m_data, QString()));
-    m_steps.append(new MinecraftProfileStepMojang(m_data));
-    m_steps.append(new MigrationEligibilityStep(m_data));
-    m_steps.append(new GetSkinStep(m_data));
+    m_steps.append(makeShared<YggdrasilStep>(m_data, QString()));
+    m_steps.append(makeShared<MinecraftProfileStepMojang>(m_data));
+    m_steps.append(makeShared<MigrationEligibilityStep>(m_data));
+    m_steps.append(makeShared<GetSkinStep>(m_data));
 }
 
 MojangLogin::MojangLogin(
@@ -20,8 +20,8 @@ MojangLogin::MojangLogin(
     QString password,
     QObject *parent
 ): AuthFlow(data, parent), m_password(password) {
-    m_steps.append(new YggdrasilStep(m_data, m_password));
-    m_steps.append(new MinecraftProfileStepMojang(m_data));
-    m_steps.append(new MigrationEligibilityStep(m_data));
-    m_steps.append(new GetSkinStep(m_data));
+    m_steps.append(makeShared<YggdrasilStep>(m_data, m_password));
+    m_steps.append(makeShared<MinecraftProfileStepMojang>(m_data));
+    m_steps.append(makeShared<MigrationEligibilityStep>(m_data));
+    m_steps.append(makeShared<GetSkinStep>(m_data));
 }
diff --git a/launcher/minecraft/auth/flows/Offline.cpp b/launcher/minecraft/auth/flows/Offline.cpp
index fc614a8c..d5c63271 100644
--- a/launcher/minecraft/auth/flows/Offline.cpp
+++ b/launcher/minecraft/auth/flows/Offline.cpp
@@ -6,12 +6,12 @@ OfflineRefresh::OfflineRefresh(
     AccountData *data,
     QObject *parent
 ) : AuthFlow(data, parent) {
-    m_steps.append(new OfflineStep(m_data));
+    m_steps.append(makeShared<OfflineStep>(m_data));
 }
 
 OfflineLogin::OfflineLogin(
     AccountData *data,
     QObject *parent
 ) : AuthFlow(data, parent) {
-    m_steps.append(new OfflineStep(m_data));
+    m_steps.append(makeShared<OfflineStep>(m_data));
 }
diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
index ebac707d..da4bd091 100644
--- a/launcher/minecraft/mod/ResourcePackFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
@@ -142,7 +142,7 @@ int ResourcePackFolderModel::columnCount(const QModelIndex& parent) const
 
 Task* ResourcePackFolderModel::createUpdateTask()
 {
-    return new BasicFolderLoadTask(m_dir, [](QFileInfo const& entry) { return new ResourcePack(entry); });
+    return new BasicFolderLoadTask(m_dir, [](QFileInfo const& entry) { return makeShared<ResourcePack>(entry); });
 }
 
 Task* ResourcePackFolderModel::createParseTask(Resource& resource)
diff --git a/launcher/minecraft/mod/TexturePackFolderModel.cpp b/launcher/minecraft/mod/TexturePackFolderModel.cpp
index 561f6202..5a32cfaf 100644
--- a/launcher/minecraft/mod/TexturePackFolderModel.cpp
+++ b/launcher/minecraft/mod/TexturePackFolderModel.cpp
@@ -43,7 +43,7 @@ TexturePackFolderModel::TexturePackFolderModel(const QString &dir) : ResourceFol
 
 Task* TexturePackFolderModel::createUpdateTask()
 {
-    return new BasicFolderLoadTask(m_dir, [](QFileInfo const& entry) { return new TexturePack(entry); });
+    return new BasicFolderLoadTask(m_dir, [](QFileInfo const& entry) { return makeShared<TexturePack>(entry); });
 }
 
 Task* TexturePackFolderModel::createParseTask(Resource& resource)
diff --git a/launcher/minecraft/mod/tasks/BasicFolderLoadTask.h b/launcher/minecraft/mod/tasks/BasicFolderLoadTask.h
index 2fce2942..3ee7e2e0 100644
--- a/launcher/minecraft/mod/tasks/BasicFolderLoadTask.h
+++ b/launcher/minecraft/mod/tasks/BasicFolderLoadTask.h
@@ -26,11 +26,11 @@ class BasicFolderLoadTask : public Task {
    public:
     BasicFolderLoadTask(QDir dir) : Task(nullptr, false), m_dir(dir), m_result(new Result), m_thread_to_spawn_into(thread())
     {
-        m_create_func = [](QFileInfo const& entry) -> Resource* {
-                return new Resource(entry);
+        m_create_func = [](QFileInfo const& entry) -> Resource::Ptr {
+                return makeShared<Resource>(entry);
             };
     }
-    BasicFolderLoadTask(QDir dir, std::function<Resource*(QFileInfo const&)> create_function)
+    BasicFolderLoadTask(QDir dir, std::function<Resource::Ptr(QFileInfo const&)> create_function)
         : Task(nullptr, false), m_dir(dir), m_result(new Result), m_create_func(std::move(create_function)), m_thread_to_spawn_into(thread())
     {}
 
@@ -65,7 +65,7 @@ private:
 
     std::atomic<bool> m_aborted = false;
 
-    std::function<Resource*(QFileInfo const&)> m_create_func;
+    std::function<Resource::Ptr(QFileInfo const&)> m_create_func;
 
     /** This is the thread in which we should put new mod objects */
     QThread* m_thread_to_spawn_into;
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index 78ef4386..3677a1dc 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -72,14 +72,14 @@ void ModFolderLoadTask::executeTask()
                 delete mod;
             }
             else {
-                m_result->mods[mod->internal_id()] = mod;
+                m_result->mods[mod->internal_id()].reset(std::move(mod));
                 m_result->mods[mod->internal_id()]->setStatus(ModStatus::NoMetadata);
             }
         }
         else { 
             QString chopped_id = mod->internal_id().chopped(9);
             if (m_result->mods.contains(chopped_id)) {
-                m_result->mods[mod->internal_id()] = mod;
+                m_result->mods[mod->internal_id()].reset(std::move(mod));
 
                 auto metadata = m_result->mods[chopped_id]->metadata();
                 if (metadata) {
@@ -90,7 +90,7 @@ void ModFolderLoadTask::executeTask()
                 }
             }
             else {
-                m_result->mods[mod->internal_id()] = mod;
+                m_result->mods[mod->internal_id()].reset(std::move(mod));
                 m_result->mods[mod->internal_id()]->setStatus(ModStatus::NoMetadata);
             }
         }
@@ -130,6 +130,6 @@ void ModFolderLoadTask::getFromMetadata()
 
         auto* mod = new Mod(m_mods_dir, metadata);
         mod->setStatus(ModStatus::NotInstalled);
-        m_result->mods[mod->internal_id()] = mod;
+        m_result->mods[mod->internal_id()].reset(std::move(mod));
     }
 }
diff --git a/launcher/minecraft/update/AssetUpdateTask.cpp b/launcher/minecraft/update/AssetUpdateTask.cpp
index dd246665..8ccb0e1d 100644
--- a/launcher/minecraft/update/AssetUpdateTask.cpp
+++ b/launcher/minecraft/update/AssetUpdateTask.cpp
@@ -24,7 +24,7 @@ void AssetUpdateTask::executeTask()
     auto assets = profile->getMinecraftAssets();
     QUrl indexUrl = assets->url;
     QString localPath = assets->id + ".json";
-    auto job = new NetJob(
+    auto job = makeShared<NetJob>(
         tr("Asset index for %1").arg(m_inst->name()),
         APPLICATION->network()
     );
diff --git a/launcher/minecraft/update/FMLLibrariesTask.cpp b/launcher/minecraft/update/FMLLibrariesTask.cpp
index 7a0bd2f3..96fd3ba3 100644
--- a/launcher/minecraft/update/FMLLibrariesTask.cpp
+++ b/launcher/minecraft/update/FMLLibrariesTask.cpp
@@ -61,7 +61,7 @@ void FMLLibrariesTask::executeTask()
 
     // download missing libs to our place
     setStatus(tr("Downloading FML libraries..."));
-    auto dljob = new NetJob("FML libraries", APPLICATION->network());
+    NetJob::Ptr dljob{ new NetJob("FML libraries", APPLICATION->network()) };
     auto metacache = APPLICATION->metacache();
     Net::Download::Options options = Net::Download::Option::MakeEternal;
     for (auto &lib : fmlLibsToProcess)
@@ -71,10 +71,10 @@ void FMLLibrariesTask::executeTask()
         dljob->addNetAction(Net::Download::makeCached(QUrl(urlString), entry, options));
     }
 
-    connect(dljob, &NetJob::succeeded, this, &FMLLibrariesTask::fmllibsFinished);
-    connect(dljob, &NetJob::failed, this, &FMLLibrariesTask::fmllibsFailed);
-    connect(dljob, &NetJob::aborted, this, [this]{ emitFailed(tr("Aborted")); });
-    connect(dljob, &NetJob::progress, this, &FMLLibrariesTask::progress);
+    connect(dljob.get(), &NetJob::succeeded, this, &FMLLibrariesTask::fmllibsFinished);
+    connect(dljob.get(), &NetJob::failed, this, &FMLLibrariesTask::fmllibsFailed);
+    connect(dljob.get(), &NetJob::aborted, this, [this]{ emitFailed(tr("Aborted")); });
+    connect(dljob.get(), &NetJob::progress, this, &FMLLibrariesTask::progress);
     downloadJob.reset(dljob);
     downloadJob->start();
 }
diff --git a/launcher/minecraft/update/LibrariesTask.cpp b/launcher/minecraft/update/LibrariesTask.cpp
index 33a575c2..b9410111 100644
--- a/launcher/minecraft/update/LibrariesTask.cpp
+++ b/launcher/minecraft/update/LibrariesTask.cpp
@@ -20,7 +20,7 @@ void LibrariesTask::executeTask()
     auto components = inst->getPackProfile();
     auto profile = components->getProfile();
 
-    auto job = new NetJob(tr("Libraries for instance %1").arg(inst->name()), APPLICATION->network());
+    NetJob::Ptr job{ new NetJob(tr("Libraries for instance %1").arg(inst->name()), APPLICATION->network()) };
     downloadJob.reset(job);
 
     auto metacache = APPLICATION->metacache();