From e62e1d9701703d3c8a1c47f6be58c5a5b1b41348 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 3 Jan 2023 12:48:22 -0300
Subject: [PATCH] refactor(RD): move BaseInstance dep. to subclasses of
 ResourceModel

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/ui/pages/modplatform/ModModel.cpp      | 2 +-
 launcher/ui/pages/modplatform/ModModel.h        | 4 ++++
 launcher/ui/pages/modplatform/ResourceModel.cpp | 2 +-
 launcher/ui/pages/modplatform/ResourceModel.h   | 5 +----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/launcher/ui/pages/modplatform/ModModel.cpp b/launcher/ui/pages/modplatform/ModModel.cpp
index d52a430e..433c7b10 100644
--- a/launcher/ui/pages/modplatform/ModModel.cpp
+++ b/launcher/ui/pages/modplatform/ModModel.cpp
@@ -7,7 +7,7 @@
 
 namespace ResourceDownload {
 
-ModModel::ModModel(BaseInstance const& base_inst, ResourceAPI* api) : ResourceModel(base_inst, api) {}
+ModModel::ModModel(BaseInstance const& base_inst, ResourceAPI* api) : ResourceModel(api), m_base_instance(base_inst) {}
 
 /******** Make data requests ********/
 
diff --git a/launcher/ui/pages/modplatform/ModModel.h b/launcher/ui/pages/modplatform/ModModel.h
index c705371a..1fac9040 100644
--- a/launcher/ui/pages/modplatform/ModModel.h
+++ b/launcher/ui/pages/modplatform/ModModel.h
@@ -2,6 +2,8 @@
 
 #include <QAbstractListModel>
 
+#include "BaseInstance.h"
+
 #include "modplatform/ModIndex.h"
 #include "modplatform/ResourceAPI.h"
 
@@ -38,6 +40,8 @@ class ModModel : public ResourceModel {
     auto documentToArray(QJsonDocument& obj) const -> QJsonArray override = 0;
 
    protected:
+    const BaseInstance& m_base_instance;
+
     std::shared_ptr<ModFilterWidget::Filter> m_filter = nullptr;
 };
 
diff --git a/launcher/ui/pages/modplatform/ResourceModel.cpp b/launcher/ui/pages/modplatform/ResourceModel.cpp
index 05d44ee2..202aa29a 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.cpp
+++ b/launcher/ui/pages/modplatform/ResourceModel.cpp
@@ -21,7 +21,7 @@ namespace ResourceDownload {
 
 QHash<ResourceModel*, bool> ResourceModel::s_running_models;
 
-ResourceModel::ResourceModel(BaseInstance const& base_inst, ResourceAPI* api) : QAbstractListModel(), m_base_instance(base_inst), m_api(api)
+ResourceModel::ResourceModel(ResourceAPI* api) : QAbstractListModel(), m_api(api)
 {
     s_running_models.insert(this, true);
 }
diff --git a/launcher/ui/pages/modplatform/ResourceModel.h b/launcher/ui/pages/modplatform/ResourceModel.h
index d8be3b6b..02014fd6 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.h
+++ b/launcher/ui/pages/modplatform/ResourceModel.h
@@ -5,7 +5,6 @@
 #include <QAbstractListModel>
 
 #include "QObjectPtr.h"
-#include "BaseInstance.h"
 
 #include "modplatform/ResourceAPI.h"
 
@@ -26,7 +25,7 @@ class ResourceModel : public QAbstractListModel {
     Q_PROPERTY(QString search_term MEMBER m_search_term WRITE setSearchTerm)
 
    public:
-    ResourceModel(BaseInstance const&, ResourceAPI* api);
+    ResourceModel(ResourceAPI* api);
     ~ResourceModel() override;
 
     [[nodiscard]] auto data(const QModelIndex&, int role) const -> QVariant override;
@@ -103,8 +102,6 @@ class ResourceModel : public QAbstractListModel {
     virtual void loadIndexedPackVersions(ModPlatform::IndexedPack&, QJsonArray&);
 
    protected:
-    const BaseInstance& m_base_instance;
-
     /* Basic search parameters */
     enum class SearchState { None, CanFetchMore, ResetRequested, Finished } m_search_state = SearchState::None;
     int m_next_search_offset = 0;