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, 30 insertions, 30 deletions

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