From de9e304236ac0c11dd2b6bfb8b6f55943349c0e9 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sun, 10 Jul 2022 15:15:25 -0300
Subject: fix: std::list -> QList

Qt6 removed Qlist::toStdList() :sob:

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/ui/dialogs/ModUpdateDialog.cpp | 16 ++++++++--------
 launcher/ui/dialogs/ModUpdateDialog.h   | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'launcher/ui/dialogs')

diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index c54d178b..b6e76ff1 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -36,7 +36,7 @@ static ModAPI::ModLoaderTypes mcLoaders(BaseInstance* inst)
 ModUpdateDialog::ModUpdateDialog(QWidget* parent,
                                  BaseInstance* instance,
                                  const std::shared_ptr<ModFolderModel> mods,
-                                 std::list<Mod::Ptr>& search_for)
+                                 QList<Mod::Ptr>& search_for)
     : ReviewMessageBox(parent, tr("Confirm mods to update"), "")
     , m_parent(parent)
     , m_mod_model(mods)
@@ -88,14 +88,14 @@ void ModUpdateDialog::checkCandidates()
     if (!m_modrinth_to_update.empty()) {
         m_modrinth_check_task = new ModrinthCheckUpdate(m_modrinth_to_update, versions, loaders, m_mod_model);
         connect(m_modrinth_check_task, &CheckUpdateTask::checkFailed, this,
-                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.emplace_back(mod, reason, recover_url); });
+                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({mod, reason, recover_url}); });
         check_task.addTask(m_modrinth_check_task);
     }
 
     if (!m_flame_to_update.empty()) {
         m_flame_check_task = new FlameCheckUpdate(m_flame_to_update, versions, loaders, m_mod_model);
         connect(m_flame_check_task, &CheckUpdateTask::checkFailed, this,
-                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.emplace_back(mod, reason, recover_url); });
+                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({mod, reason, recover_url}); });
         check_task.addTask(m_flame_check_task);
     }
 
@@ -205,8 +205,8 @@ auto ModUpdateDialog::ensureMetadata() -> bool
 
     // A better use of data structures here could remove the need for this QHash
     QHash<QString, bool> should_try_others;
-    std::list<Mod*> modrinth_tmp;
-    std::list<Mod*> flame_tmp;
+    QList<Mod*> modrinth_tmp;
+    QList<Mod*> flame_tmp;
 
     bool confirm_rest = false;
     bool try_others_rest = false;
@@ -332,7 +332,7 @@ void ModUpdateDialog::onMetadataFailed(Mod* mod, bool try_others, ModPlatform::P
     } else {
         QString reason{ tr("Didn't find a valid version on the selected mod provider(s)") };
 
-        m_failed_metadata.emplace_back(mod, reason);
+        m_failed_metadata.append({mod, reason});
     }
 }
 
@@ -390,9 +390,9 @@ void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info)
     ui->modTreeWidget->addTopLevelItem(item_top);
 }
 
-auto ModUpdateDialog::getTasks() -> const std::list<ModDownloadTask*>
+auto ModUpdateDialog::getTasks() -> const QList<ModDownloadTask*>
 {
-    std::list<ModDownloadTask*> list;
+    QList<ModDownloadTask*> list;
 
     auto* item = ui->modTreeWidget->topLevelItem(0);
 
diff --git a/launcher/ui/dialogs/ModUpdateDialog.h b/launcher/ui/dialogs/ModUpdateDialog.h
index 638f64bc..76aaab36 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.h
+++ b/launcher/ui/dialogs/ModUpdateDialog.h
@@ -19,13 +19,13 @@ class ModUpdateDialog final : public ReviewMessageBox {
     explicit ModUpdateDialog(QWidget* parent,
                              BaseInstance* instance,
                              const std::shared_ptr<ModFolderModel> mod_model,
-                             std::list<Mod::Ptr>& search_for);
+                             QList<Mod::Ptr>& search_for);
 
     void checkCandidates();
 
     void appendMod(const CheckUpdateTask::UpdatableMod& info);
 
-    const std::list<ModDownloadTask*> getTasks();
+    const QList<ModDownloadTask*> getTasks();
     auto indexDir() const -> QDir { return m_mod_model->indexDir(); }
 
     auto noUpdates() const -> bool { return m_no_updates; };
@@ -46,13 +46,13 @@ class ModUpdateDialog final : public ReviewMessageBox {
 
     const std::shared_ptr<ModFolderModel> m_mod_model;
 
-    std::list<Mod::Ptr>& m_candidates;
-    std::list<Mod*> m_modrinth_to_update;
-    std::list<Mod*> m_flame_to_update;
+    QList<Mod::Ptr>& m_candidates;
+    QList<Mod*> m_modrinth_to_update;
+    QList<Mod*> m_flame_to_update;
 
     ConcurrentTask* m_second_try_metadata;
-    std::list<std::tuple<Mod*, QString>> m_failed_metadata;
-    std::list<std::tuple<Mod*, QString, QUrl>> m_failed_check_update;
+    QList<std::tuple<Mod*, QString>> m_failed_metadata;
+    QList<std::tuple<Mod*, QString, QUrl>> m_failed_check_update;
 
     QHash<QString, ModDownloadTask*> m_tasks;
     BaseInstance* m_instance;
-- 
cgit