refactor: make shared_qobject_ptr ctor explicit

This turns issues like creating two shared ptrs from a single raw ptr
from popping up at runtime, instead making them a compile error.

Signed-off-by: flow <flowlnlnln@gmail.com>

4 files changed, 10 insertions, 10 deletions

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));
     }
 }