Merge branch 'develop' into icon-indexing

Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>

1 files changed, 16 insertions, 30 deletions

diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.h b/launcher/ui/pages/modplatform/technic/TechnicPage.h
index 753261b3..91b61eaf 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.h
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2021-2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,46 +37,32 @@
 
 #include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
+#include "TechnicData.h"
 #include "net/NetJob.h"
 #include "tasks/Task.h"
-#include "TechnicData.h"
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
+namespace Ui {
 class TechnicPage;
 }
 
 class NewInstanceDialog;
 
 namespace Technic {
-    class ListModel;
+class ListModel;
 }
 
-class TechnicPage : public QWidget, public BasePage
-{
+class TechnicPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit TechnicPage(NewInstanceDialog* dialog, QWidget *parent = 0);
+   public:
+    explicit TechnicPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~TechnicPage();
-    virtual QString displayName() const override
-    {
-        return "Technic";
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("technic");
-    }
-    virtual QString id() const override
-    {
-        return "technic";
-    }
-    virtual QString helpPage() const override
-    {
-        return "Technic-platform";
-    }
+    virtual QString displayName() const override { return "Technic"; }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("technic"); }
+    virtual QString id() const override { return "technic"; }
+    virtual QString helpPage() const override { return "Technic-platform"; }
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
@@ -84,19 +70,19 @@ public:
 
     bool eventFilter(QObject* watched, QEvent* event) override;
 
-private:
+   private:
     void suggestCurrent();
     void metadataLoaded();
     void selectVersion();
 
-private slots:
+   private slots:
     void triggerSearch();
     void onSelectionChanged(QModelIndex first, QModelIndex second);
     void onSolderLoaded();
     void onVersionSelectionChanged(QString data);
 
-private:
-    Ui::TechnicPage *ui = nullptr;
+   private:
+    Ui::TechnicPage* ui = nullptr;
     NewInstanceDialog* dialog = nullptr;
     Technic::ListModel* model = nullptr;