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>

1 files changed, 11 insertions, 11 deletions

diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
index 2979663d..68d4751c 100644
--- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
+++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
@@ -87,15 +87,15 @@ void PackInstallTask::executeTask()
 
     auto version = *version_it;
 
-    auto* netJob = new NetJob("ModpacksCH::VersionFetch", APPLICATION->network());
+    auto netJob = makeShared<NetJob>("ModpacksCH::VersionFetch", APPLICATION->network());
 
     auto searchUrl = QString(BuildConfig.MODPACKSCH_API_BASE_URL + "public/modpack/%1/%2").arg(m_pack.id).arg(version.id);
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &m_response));
 
-    QObject::connect(netJob, &NetJob::succeeded, this, &PackInstallTask::onManifestDownloadSucceeded);
-    QObject::connect(netJob, &NetJob::failed, this, &PackInstallTask::onManifestDownloadFailed);
-    QObject::connect(netJob, &NetJob::aborted, this, &PackInstallTask::abort);
-    QObject::connect(netJob, &NetJob::progress, this, &PackInstallTask::setProgress);
+    QObject::connect(netJob.get(), &NetJob::succeeded, this, &PackInstallTask::onManifestDownloadSucceeded);
+    QObject::connect(netJob.get(), &NetJob::failed, this, &PackInstallTask::onManifestDownloadFailed);
+    QObject::connect(netJob.get(), &NetJob::aborted, this, &PackInstallTask::abort);
+    QObject::connect(netJob.get(), &NetJob::progress, this, &PackInstallTask::setProgress);
 
     m_net_job = netJob;
 
@@ -162,7 +162,7 @@ void PackInstallTask::resolveMods()
         index++;
     }
 
-    m_mod_id_resolver_task = new Flame::FileResolvingTask(APPLICATION->network(), manifest);
+    m_mod_id_resolver_task.reset(new Flame::FileResolvingTask(APPLICATION->network(), manifest));
 
     connect(m_mod_id_resolver_task.get(), &Flame::FileResolvingTask::succeeded, this, &PackInstallTask::onResolveModsSucceeded);
     connect(m_mod_id_resolver_task.get(), &Flame::FileResolvingTask::failed, this, &PackInstallTask::onResolveModsFailed);
@@ -294,7 +294,7 @@ void PackInstallTask::downloadPack()
     setStatus(tr("Downloading mods..."));
     setAbortable(false);
 
-    auto* jobPtr = new NetJob(tr("Mod download"), APPLICATION->network());
+    auto jobPtr = makeShared<NetJob>(tr("Mod download"), APPLICATION->network());
     for (auto const& file : m_version.files) {
         if (file.serverOnly || file.url.isEmpty())
             continue;
@@ -313,10 +313,10 @@ void PackInstallTask::downloadPack()
         jobPtr->addNetAction(dl);
     }
 
-    connect(jobPtr, &NetJob::succeeded, this, &PackInstallTask::onModDownloadSucceeded);
-    connect(jobPtr, &NetJob::failed, this, &PackInstallTask::onModDownloadFailed);
-    connect(jobPtr, &NetJob::aborted, this, &PackInstallTask::abort);
-    connect(jobPtr, &NetJob::progress, this, &PackInstallTask::setProgress);
+    connect(jobPtr.get(), &NetJob::succeeded, this, &PackInstallTask::onModDownloadSucceeded);
+    connect(jobPtr.get(), &NetJob::failed, this, &PackInstallTask::onModDownloadFailed);
+    connect(jobPtr.get(), &NetJob::aborted, this, &PackInstallTask::abort);
+    connect(jobPtr.get(), &NetJob::progress, this, &PackInstallTask::setProgress);
 
     m_net_job = jobPtr;