CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: use only a single unique_ptr for the api

Browse Source
This commit is contained in:
flow 2022-03-06 13:54:05 -03:00
parent 9a8599e4ba
commit 5e9d49a910
No known key found for this signature in database
GPG Key ID: 8D0F221F0A59F469
6 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/ui/pages/modplatform/ModPage.cpp
View File

@ -5,8 +5,8 @@
#include "ui/dialogs/ModDownloadDialog.h" #include "ui/dialogs/ModDownloadDialog.h"
ModPage::ModPage(ModDownloadDialog* dialog, BaseInstance* instance) ModPage::ModPage(ModDownloadDialog* dialog, BaseInstance* instance, ModAPI* api)
: QWidget(dialog), m_instance(instance), ui(new Ui::ModPage), dialog(dialog) : QWidget(dialog), m_instance(instance), ui(new Ui::ModPage), dialog(dialog), api(api)
{ {
ui->setupUi(this); ui->setupUi(this);
connect(ui->searchButton, &QPushButton::clicked, this, &ModPage::triggerSearch); connect(ui->searchButton, &QPushButton::clicked, this, &ModPage::triggerSearch);

12
launcher/ui/pages/modplatform/ModPage.h
View File

@ -15,23 +15,27 @@ namespace Ui {
class ModPage; class ModPage;
} }
/* This page handles most logic related to browsing and selecting mods to download.
* By default, the methods provided work with net requests, to fetch data from remote APIs. */
class ModPage : public QWidget, public BasePage { class ModPage : public QWidget, public BasePage {
Q_OBJECT Q_OBJECT
public: public:
explicit ModPage(ModDownloadDialog* dialog, BaseInstance* instance); explicit ModPage(ModDownloadDialog* dialog, BaseInstance* instance, ModAPI* api);
virtual ~ModPage(); virtual ~ModPage();
/* The name visible to the user */
virtual QString displayName() const override = 0; virtual QString displayName() const override = 0;
virtual QIcon icon() const override = 0; virtual QIcon icon() const override = 0;
virtual QString id() const override = 0; virtual QString id() const override = 0;
virtual QString helpPage() const override = 0; virtual QString helpPage() const override = 0;
virtual QString debugName() const = 0;
virtual QString metaEntryBase() const = 0; virtual QString metaEntryBase() const = 0;
/* This only appears in the debug console */
virtual QString debugName() const = 0;
virtual bool shouldDisplay() const override = 0; virtual bool shouldDisplay() const override = 0;
virtual const ModAPI* apiProvider() const = 0; const ModAPI* apiProvider() const { return api.get(); };
void openedImpl() override; void openedImpl() override;
bool eventFilter(QObject* watched, QEvent* event) override; bool eventFilter(QObject* watched, QEvent* event) override;
@ -55,5 +59,7 @@ class ModPage : public QWidget, public BasePage {
ModPlatform::ListModel* listModel = nullptr; ModPlatform::ListModel* listModel = nullptr;
ModPlatform::IndexedPack current; ModPlatform::IndexedPack current;
std::unique_ptr<ModAPI> api;
int selectedVersion = -1; int selectedVersion = -1;
}; };

2
launcher/ui/pages/modplatform/flame/FlameModPage.cpp
View File

@ -13,7 +13,7 @@
#include "ui/dialogs/ModDownloadDialog.h" #include "ui/dialogs/ModDownloadDialog.h"
FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance* instance) FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance* instance)
: ModPage(dialog, instance) : ModPage(dialog, instance, new FlameAPI())
{ {
listModel = new FlameMod::ListModel(this); listModel = new FlameMod::ListModel(this);
ui->packView->setModel(listModel); ui->packView->setModel(listModel);

4
launcher/ui/pages/modplatform/flame/FlameModPage.h
View File

@ -20,11 +20,7 @@ class FlameModPage : public ModPage {
inline QString metaEntryBase() const override { return "FlameMods"; }; inline QString metaEntryBase() const override { return "FlameMods"; };
bool shouldDisplay() const override; bool shouldDisplay() const override;
const ModAPI* apiProvider() const override { return &api; };
private: private:
void onModVersionSucceed(ModPage*, QByteArray*, QString) override; void onModVersionSucceed(ModPage*, QByteArray*, QString) override;
private:
FlameAPI api;
}; };

2
launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
View File

@ -13,7 +13,7 @@
#include "ui/dialogs/ModDownloadDialog.h" #include "ui/dialogs/ModDownloadDialog.h"
ModrinthPage::ModrinthPage(ModDownloadDialog* dialog, BaseInstance* instance) ModrinthPage::ModrinthPage(ModDownloadDialog* dialog, BaseInstance* instance)
: ModPage(dialog, instance) : ModPage(dialog, instance, new ModrinthAPI())
{ {
listModel = new Modrinth::ListModel(this); listModel = new Modrinth::ListModel(this);
ui->packView->setModel(listModel); ui->packView->setModel(listModel);

4
launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
View File

@ -20,11 +20,7 @@ class ModrinthPage : public ModPage {
inline QString metaEntryBase() const override { return "ModrinthPacks"; }; inline QString metaEntryBase() const override { return "ModrinthPacks"; };
bool shouldDisplay() const override; bool shouldDisplay() const override;
const ModAPI* apiProvider() const override { return &api; };
private: private:
void onModVersionSucceed(ModPage*, QByteArray*, QString) override; void onModVersionSucceed(ModPage*, QByteArray*, QString) override;
private:
ModrinthAPI api;
}; };