Merge branch 'develop' into better-launch

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

1 files changed, 15 insertions, 31 deletions

diff --git a/launcher/ui/pages/global/MinecraftPage.h b/launcher/ui/pages/global/MinecraftPage.h
index cf5f95eb..28c31b5d 100644
--- a/launcher/ui/pages/global/MinecraftPage.h
+++ b/launcher/ui/pages/global/MinecraftPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,57 +35,41 @@
 
 #pragma once
 
-#include <memory>
 #include <QDialog>
+#include <memory>
 
+#include <Application.h>
 #include "java/JavaChecker.h"
 #include "ui/pages/BasePage.h"
-#include <Application.h>
 
 class SettingsObject;
 
-namespace Ui
-{
+namespace Ui {
 class MinecraftPage;
 }
 
-class MinecraftPage : public QWidget, public BasePage
-{
+class MinecraftPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit MinecraftPage(QWidget *parent = 0);
+   public:
+    explicit MinecraftPage(QWidget* parent = 0);
     ~MinecraftPage();
 
-    QString displayName() const override
-    {
-        return tr("Minecraft");
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("minecraft");
-    }
-    QString id() const override
-    {
-        return "minecraft-settings";
-    }
-    QString helpPage() const override
-    {
-        return "Minecraft-settings";
-    }
+    QString displayName() const override { return tr("Minecraft"); }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("minecraft"); }
+    QString id() const override { return "minecraft-settings"; }
+    QString helpPage() const override { return "Minecraft-settings"; }
     bool apply() override;
     void retranslate() override;
 
-private:
+   private:
     void updateCheckboxStuff();
     void applySettings();
     void loadSettings();
 
-private
-slots:
+   private slots:
     void on_maximizedCheckBox_clicked(bool checked);
 
-private:
-    Ui::MinecraftPage *ui;
-
+   private:
+    Ui::MinecraftPage* ui;
 };