From 29f7ea752fd34bdea64a7c7f2c505982ac39ce0d Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 24 Jan 2023 16:52:09 -0300
Subject: 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>
---
 launcher/modplatform/helpers/HashUtils.cpp          |  8 ++++----
 launcher/modplatform/helpers/NetworkResourceAPI.cpp | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'launcher/modplatform/helpers')

diff --git a/launcher/modplatform/helpers/HashUtils.cpp b/launcher/modplatform/helpers/HashUtils.cpp
index af484be0..2177ddad 100644
--- a/launcher/modplatform/helpers/HashUtils.cpp
+++ b/launcher/modplatform/helpers/HashUtils.cpp
@@ -28,22 +28,22 @@ Hasher::Ptr createHasher(QString file_path, ModPlatform::ResourceProvider provid
 
 Hasher::Ptr createModrinthHasher(QString file_path)
 {
-    return new ModrinthHasher(file_path);
+    return makeShared<ModrinthHasher>(file_path);
 }
 
 Hasher::Ptr createFlameHasher(QString file_path)
 {
-    return new FlameHasher(file_path);
+    return makeShared<FlameHasher>(file_path);
 }
 
 Hasher::Ptr createBlockedModHasher(QString file_path, ModPlatform::ResourceProvider provider)
 {
-    return new BlockedModHasher(file_path, provider);
+    return makeShared<BlockedModHasher>(file_path, provider);
 }
 
 Hasher::Ptr createBlockedModHasher(QString file_path, ModPlatform::ResourceProvider provider, QString type)
 {
-    auto hasher = new BlockedModHasher(file_path, provider);
+    auto hasher = makeShared<BlockedModHasher>(file_path, provider);
     hasher->useHashType(type);
     return hasher;
 }
diff --git a/launcher/modplatform/helpers/NetworkResourceAPI.cpp b/launcher/modplatform/helpers/NetworkResourceAPI.cpp
index ac994c31..010ac15e 100644
--- a/launcher/modplatform/helpers/NetworkResourceAPI.cpp
+++ b/launcher/modplatform/helpers/NetworkResourceAPI.cpp
@@ -20,11 +20,11 @@ Task::Ptr NetworkResourceAPI::searchProjects(SearchArgs&& args, SearchCallbacks&
     auto search_url = search_url_optional.value();
 
     auto response = new QByteArray();
-    auto netJob = new NetJob(QString("%1::Search").arg(debugName()), APPLICATION->network());
+    auto netJob = makeShared<NetJob>(QString("%1::Search").arg(debugName()), APPLICATION->network());
 
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(search_url), response));
 
-    QObject::connect(netJob, &NetJob::succeeded, [=]{
+    QObject::connect(netJob.get(), &NetJob::succeeded, [=]{
         QJsonParseError parse_error{};
         QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
         if (parse_error.error != QJsonParseError::NoError) {
@@ -40,14 +40,14 @@ Task::Ptr NetworkResourceAPI::searchProjects(SearchArgs&& args, SearchCallbacks&
         callbacks.on_succeed(doc);
     });
 
-    QObject::connect(netJob, &NetJob::failed, [=](QString reason){
+    QObject::connect(netJob.get(), &NetJob::failed, [=](QString reason){
         int network_error_code = -1;
         if (auto* failed_action = netJob->getFailedActions().at(0); failed_action && failed_action->m_reply)
             network_error_code = failed_action->m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
 
        callbacks.on_fail(reason, network_error_code); 
     });
-    QObject::connect(netJob, &NetJob::aborted, [=]{
+    QObject::connect(netJob.get(), &NetJob::aborted, [=]{
        callbacks.on_abort(); 
     });
 
@@ -83,12 +83,12 @@ Task::Ptr NetworkResourceAPI::getProjectVersions(VersionSearchArgs&& args, Versi
 
     auto versions_url = versions_url_optional.value();
 
-    auto netJob = new NetJob(QString("%1::Versions").arg(args.pack.name), APPLICATION->network());
+    auto netJob = makeShared<NetJob>(QString("%1::Versions").arg(args.pack.name), APPLICATION->network());
     auto response = new QByteArray();
 
     netJob->addNetAction(Net::Download::makeByteArray(versions_url, response));
 
-    QObject::connect(netJob, &NetJob::succeeded, [=] {
+    QObject::connect(netJob.get(), &NetJob::succeeded, [=] {
         QJsonParseError parse_error{};
         QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
         if (parse_error.error != QJsonParseError::NoError) {
@@ -101,7 +101,7 @@ Task::Ptr NetworkResourceAPI::getProjectVersions(VersionSearchArgs&& args, Versi
         callbacks.on_succeed(doc, args.pack);
     });
 
-    QObject::connect(netJob, &NetJob::finished, [response] {
+    QObject::connect(netJob.get(), &NetJob::finished, [response] {
         delete response;
     });
 
@@ -116,11 +116,11 @@ Task::Ptr NetworkResourceAPI::getProject(QString addonId, QByteArray* response)
 
     auto project_url = project_url_optional.value();
 
-    auto netJob = new NetJob(QString("%1::GetProject").arg(addonId), APPLICATION->network());
+    auto netJob = makeShared<NetJob>(QString("%1::GetProject").arg(addonId), APPLICATION->network());
 
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(project_url), response));
 
-    QObject::connect(netJob, &NetJob::finished, [response] {
+    QObject::connect(netJob.get(), &NetJob::finished, [response] {
         delete response;
     });
 
-- 
cgit