From 03280cc62e75f8073f8d3d9e9e3952acf21fa77d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 15 Jul 2018 14:04:09 +0200 Subject: NOISSUE separate new mods model from the simple one It should list mods in various locations... --- application/pages/instance/ModFolderPage.cpp | 6 +++--- application/pages/instance/ModFolderPage.h | 8 ++++---- application/pages/instance/NewModFolderPage.cpp | 4 ++-- application/pages/instance/NewModFolderPage.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'application/pages') diff --git a/application/pages/instance/ModFolderPage.cpp b/application/pages/instance/ModFolderPage.cpp index 90155df3..0309383d 100644 --- a/application/pages/instance/ModFolderPage.cpp +++ b/application/pages/instance/ModFolderPage.cpp @@ -25,13 +25,13 @@ #include "dialogs/CustomMessageBox.h" #include "dialogs/ModEditDialogCommon.h" #include -#include "minecraft/ModList.h" +#include "minecraft/SimpleModList.h" #include "minecraft/Mod.h" #include "minecraft/VersionFilterData.h" #include "minecraft/ComponentList.h" #include -ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr mods, QString id, +ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr mods, QString id, QString iconName, QString displayName, QString helpPage, QWidget *parent) : QWidget(parent), ui(new Ui::ModFolderPage) @@ -76,7 +76,7 @@ void ModFolderPage::on_filterTextChanged(const QString& newContents) } -CoreModFolderPage::CoreModFolderPage(BaseInstance *inst, std::shared_ptr mods, +CoreModFolderPage::CoreModFolderPage(BaseInstance *inst, std::shared_ptr mods, QString id, QString iconName, QString displayName, QString helpPage, QWidget *parent) : ModFolderPage(inst, mods, id, iconName, displayName, helpPage, parent) diff --git a/application/pages/instance/ModFolderPage.h b/application/pages/instance/ModFolderPage.h index 15e728cb..0242f1c9 100644 --- a/application/pages/instance/ModFolderPage.h +++ b/application/pages/instance/ModFolderPage.h @@ -21,7 +21,7 @@ #include "pages/BasePage.h" #include -class ModList; +class SimpleModList; namespace Ui { class ModFolderPage; @@ -32,7 +32,7 @@ class ModFolderPage : public QWidget, public BasePage Q_OBJECT public: - explicit ModFolderPage(BaseInstance *inst, std::shared_ptr mods, QString id, + explicit ModFolderPage(BaseInstance *inst, std::shared_ptr mods, QString id, QString iconName, QString displayName, QString helpPage = "", QWidget *parent = 0); virtual ~ModFolderPage(); @@ -71,7 +71,7 @@ protected: protected: Ui::ModFolderPage *ui; - std::shared_ptr m_mods; + std::shared_ptr m_mods; QSortFilterProxyModel *m_filterModel; QString m_iconName; QString m_id; @@ -98,7 +98,7 @@ slots: class CoreModFolderPage : public ModFolderPage { public: - explicit CoreModFolderPage(BaseInstance *inst, std::shared_ptr mods, QString id, + explicit CoreModFolderPage(BaseInstance *inst, std::shared_ptr mods, QString id, QString iconName, QString displayName, QString helpPage = "", QWidget *parent = 0); virtual ~CoreModFolderPage() diff --git a/application/pages/instance/NewModFolderPage.cpp b/application/pages/instance/NewModFolderPage.cpp index dc00fefa..35972fba 100644 --- a/application/pages/instance/NewModFolderPage.cpp +++ b/application/pages/instance/NewModFolderPage.cpp @@ -25,13 +25,13 @@ #include "dialogs/CustomMessageBox.h" #include "dialogs/ModEditDialogCommon.h" #include -#include "minecraft/ModList.h" +#include "minecraft/ModsModel.h" #include "minecraft/Mod.h" #include "minecraft/VersionFilterData.h" #include "minecraft/ComponentList.h" #include -NewModFolderPage::NewModFolderPage(BaseInstance *inst, std::shared_ptr mods, QString id, +NewModFolderPage::NewModFolderPage(BaseInstance *inst, std::shared_ptr mods, QString id, QString iconName, QString displayName, QString helpPage, QWidget *parent) : QWidget(parent), ui(new Ui::NewModFolderPage) diff --git a/application/pages/instance/NewModFolderPage.h b/application/pages/instance/NewModFolderPage.h index 2c81a233..2a8136aa 100644 --- a/application/pages/instance/NewModFolderPage.h +++ b/application/pages/instance/NewModFolderPage.h @@ -21,7 +21,7 @@ #include "pages/BasePage.h" #include -class ModList; +class SimpleModList; namespace Ui { class NewModFolderPage; @@ -32,7 +32,7 @@ class NewModFolderPage : public QWidget, public BasePage Q_OBJECT public: - explicit NewModFolderPage(BaseInstance *inst, std::shared_ptr mods, QString id, + explicit NewModFolderPage(BaseInstance *inst, std::shared_ptr mods, QString id, QString iconName, QString displayName, QString helpPage = "", QWidget *parent = 0); virtual ~NewModFolderPage(); @@ -71,7 +71,7 @@ protected: protected: Ui::NewModFolderPage *ui; - std::shared_ptr m_mods; + std::shared_ptr m_mods; QSortFilterProxyModel *m_filterModel; QString m_iconName; QString m_id; -- cgit v1.2.3