Merge branch 'develop' into feat/acknowledge_release_type

Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>

1 files changed, 13 insertions, 28 deletions

diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.h b/launcher/ui/pages/instance/InstanceSettingsPage.h
index 0438fe3b..21ecbaf8 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.h
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.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
@@ -46,41 +46,26 @@
 #include "ui/pages/BasePage.h"
 
 class JavaChecker;
-namespace Ui
-{
+namespace Ui {
 class InstanceSettingsPage;
 }
 
-class InstanceSettingsPage : public QWidget, public BasePage
-{
+class InstanceSettingsPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit InstanceSettingsPage(BaseInstance *inst, QWidget *parent = 0);
+   public:
+    explicit InstanceSettingsPage(BaseInstance* inst, QWidget* parent = 0);
     virtual ~InstanceSettingsPage();
-    virtual QString displayName() const override
-    {
-        return tr("Settings");
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("instance-settings");
-    }
-    virtual QString id() const override
-    {
-        return "settings";
-    }
+    virtual QString displayName() const override { return tr("Settings"); }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("instance-settings"); }
+    virtual QString id() const override { return "settings"; }
     virtual bool apply() override;
-    virtual QString helpPage() const override
-    {
-        return "Instance-settings";
-    }
+    virtual QString helpPage() const override { return "Instance-settings"; }
     void retranslate() override;
 
     void updateThresholds();
 
-private slots:
-    void updateRunningStatus(bool running);
+   private slots:
     void on_javaDetectBtn_clicked();
     void on_javaTestBtn_clicked();
     void on_javaBrowseBtn_clicked();
@@ -97,9 +82,9 @@ private slots:
     QIcon getFaceForAccount(MinecraftAccountPtr account);
     void changeInstanceAccount(int index);
 
-private:
-    Ui::InstanceSettingsPage *ui;
-    BaseInstance *m_instance;
+   private:
+    Ui::InstanceSettingsPage* ui;
+    BaseInstance* m_instance;
     SettingsObjectPtr m_settings;
     unique_qobject_ptr<JavaCommon::TestCheck> checker;
 };