From 8dfa3393dc59a386123c84dd30287bf9f1d17faf Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Wed, 2 Nov 2022 08:43:42 +0000
Subject: [PATCH] Formatting and forward-declaration

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/ui/dialogs/ModDownloadDialog.cpp | 10 ++++-----
 launcher/ui/dialogs/ModDownloadDialog.h   | 25 +++++++++++------------
 launcher/ui/pages/modplatform/ModPage.cpp | 13 +++++-------
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/launcher/ui/dialogs/ModDownloadDialog.cpp b/launcher/ui/dialogs/ModDownloadDialog.cpp
index 876f015a3..0a0e61e36 100644
--- a/launcher/ui/dialogs/ModDownloadDialog.cpp
+++ b/launcher/ui/dialogs/ModDownloadDialog.cpp
@@ -132,7 +132,7 @@ QList<BasePage*> ModDownloadDialog::getPages()
     if (APPLICATION->capabilities() & Application::SupportsFlame)
         pages.append(FlameModPage::create(this, m_instance));
 
-    m_selected_page = dynamic_cast<ModPage*>(pages[0]);
+    m_selectedPage = dynamic_cast<ModPage*>(pages[0]);
 
     return pages;
 }
@@ -181,14 +181,14 @@ void ModDownloadDialog::selectedPageChanged(BasePage* previous, BasePage* select
         return;
     }
 
-    m_selected_page = dynamic_cast<ModPage*>(selected);
-    if (!m_selected_page) {
+    m_selectedPage = dynamic_cast<ModPage*>(selected);
+    if (!m_selectedPage) {
         qCritical() << "Page '" << selected->displayName() << "' in ModDownloadDialog is not a ModPage!";
         return;
     }
 
     // Same effect as having a global search bar
-    m_selected_page->setSearchTerm(prev_page->getSearchTerm());
+    m_selectedPage->setSearchTerm(prev_page->getSearchTerm());
 }
 
 bool ModDownloadDialog::selectPage(QString pageId)
@@ -198,5 +198,5 @@ bool ModDownloadDialog::selectPage(QString pageId)
 
 ModPage* ModDownloadDialog::getSelectedPage()
 {
-    return m_selected_page;
+    return m_selectedPage;
 }
\ No newline at end of file
diff --git a/launcher/ui/dialogs/ModDownloadDialog.h b/launcher/ui/dialogs/ModDownloadDialog.h
index c637a70ac..29bdcf82d 100644
--- a/launcher/ui/dialogs/ModDownloadDialog.h
+++ b/launcher/ui/dialogs/ModDownloadDialog.h
@@ -25,7 +25,6 @@
 #include "ModDownloadTask.h"
 #include "minecraft/mod/ModFolderModel.h"
 #include "ui/pages/BasePageProvider.h"
-#include "ui/pages/modplatform/ModPage.h"
 
 namespace Ui
 {
@@ -34,13 +33,14 @@ class ModDownloadDialog;
 
 class PageContainer;
 class QDialogButtonBox;
+class ModPage;
 class ModrinthModPage;
 
 class ModDownloadDialog final : public QDialog, public BasePageProvider
 {
     Q_OBJECT
 
-public:
+   public:
     explicit ModDownloadDialog(const std::shared_ptr<ModFolderModel>& mods, QWidget* parent, BaseInstance* instance);
     ~ModDownloadDialog() override = default;
 
@@ -53,27 +53,26 @@ public:
     bool isModSelected(QString name) const;
 
     const QList<ModDownloadTask*> getTasks();
-    const std::shared_ptr<ModFolderModel> &mods;
+    const std::shared_ptr<ModFolderModel>& mods;
 
     bool selectPage(QString pageId);
-
     ModPage* getSelectedPage();
 
-public slots:
+   public slots:
     void confirm();
     void accept() override;
     void reject() override;
 
-private slots:
+   private slots:
     void selectedPageChanged(BasePage* previous, BasePage* selected);
 
-private:
-    Ui::ModDownloadDialog *ui = nullptr;
-    PageContainer * m_container = nullptr;
-    QDialogButtonBox * m_buttons = nullptr;
-    QVBoxLayout *m_verticalLayout = nullptr;
-    ModPage *m_selected_page = nullptr;
+   private:
+    Ui::ModDownloadDialog* ui = nullptr;
+    PageContainer* m_container = nullptr;
+    QDialogButtonBox* m_buttons = nullptr;
+    QVBoxLayout* m_verticalLayout = nullptr;
+    ModPage* m_selectedPage = nullptr;
 
     QHash<QString, ModDownloadTask*> modTask;
-    BaseInstance *m_instance;
+    BaseInstance* m_instance;
 };
diff --git a/launcher/ui/pages/modplatform/ModPage.cpp b/launcher/ui/pages/modplatform/ModPage.cpp
index f269fc72c..af16eaeff 100644
--- a/launcher/ui/pages/modplatform/ModPage.cpp
+++ b/launcher/ui/pages/modplatform/ModPage.cpp
@@ -257,17 +257,15 @@ void ModPage::openUrl(const QUrl& url)
     int prefixLength;
     const char* page;
 
-    if ((url.host() == "modrinth.com" || url.host() == "www.modrinth.com")
-            && url.path().startsWith("/mod/")) {
+    if ((url.host() == "modrinth.com" || url.host() == "www.modrinth.com") && url.path().startsWith("/mod/")) {
         prefixLength = 5;
         page = "modrinth";
-    } else if (APPLICATION->capabilities() & Application::SupportsFlame
-            && (url.host() == "curseforge.com" || url.host() == "www.curseforge.com")
-            && url.path().toLower().startsWith("/minecraft/mc-mods/")) {
+    } else if (APPLICATION->capabilities() & Application::SupportsFlame &&
+               (url.host() == "curseforge.com" || url.host() == "www.curseforge.com") &&
+               url.path().toLower().startsWith("/minecraft/mc-mods/")) {
         prefixLength = 19;
         page = "curseforge";
-    }
-    else
+    } else
         prefixLength = 0;
 
     if (prefixLength != 0) {
@@ -312,7 +310,6 @@ void ModPage::openUrl(const QUrl& url)
     QDesktopServices::openUrl(url);
 }
 
-
 /******** Make changes to the UI ********/
 
 void ModPage::retranslate()