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/global/ProxyPage.h b/launcher/ui/pages/global/ProxyPage.h
index 279a9029..26118f18 100644
--- a/launcher/ui/pages/global/ProxyPage.h
+++ b/launcher/ui/pages/global/ProxyPage.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>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
@@ -36,53 +36,39 @@
 
 #pragma once
 
-#include <memory>
 #include <QAbstractButton>
 #include <QDialog>
+#include <memory>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
+namespace Ui {
 class ProxyPage;
 }
 
-class ProxyPage : public QWidget, public BasePage
-{
+class ProxyPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit ProxyPage(QWidget *parent = 0);
+   public:
+    explicit ProxyPage(QWidget* parent = 0);
     ~ProxyPage();
 
-    QString displayName() const override
-    {
-        return tr("Proxy");
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("proxy");
-    }
-    QString id() const override
-    {
-        return "proxy-settings";
-    }
-    QString helpPage() const override
-    {
-        return "Proxy-settings";
-    }
+    QString displayName() const override { return tr("Proxy"); }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("proxy"); }
+    QString id() const override { return "proxy-settings"; }
+    QString helpPage() const override { return "Proxy-settings"; }
     bool apply() override;
     void retranslate() override;
 
-private slots:
-    void proxyGroupChanged(QAbstractButton *button);
+   private slots:
+    void proxyGroupChanged(QAbstractButton* button);
 
-private:
+   private:
     void updateCheckboxStuff();
     void applySettings();
     void loadSettings();
 
-private:
-    Ui::ProxyPage *ui;
+   private:
+    Ui::ProxyPage* ui;
 };