Merge branch 'develop' into icon-indexing

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

1 files changed, 18 insertions, 33 deletions

diff --git a/launcher/ui/pages/global/LauncherPage.h b/launcher/ui/pages/global/LauncherPage.h
index e06d9897..e733224d 100644
--- a/launcher/ui/pages/global/LauncherPage.h
+++ b/launcher/ui/pages/global/LauncherPage.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,56 +35,41 @@
 
 #pragma once
 
-#include <memory>
 #include <QDialog>
+#include <memory>
 
-#include "java/JavaChecker.h"
-#include "ui/pages/BasePage.h"
 #include <Application.h>
-#include "ui/ColorCache.h"
 #include <translations/TranslationsModel.h>
+#include "java/JavaChecker.h"
+#include "ui/ColorCache.h"
+#include "ui/pages/BasePage.h"
 
 class QTextCharFormat;
 class SettingsObject;
 
-namespace Ui
-{
+namespace Ui {
 class LauncherPage;
 }
 
-class LauncherPage : public QWidget, public BasePage
-{
+class LauncherPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit LauncherPage(QWidget *parent = 0);
+   public:
+    explicit LauncherPage(QWidget* parent = 0);
     ~LauncherPage();
 
-    QString displayName() const override
-    {
-        return tr("Launcher");
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("launcher");
-    }
-    QString id() const override
-    {
-        return "launcher-settings";
-    }
-    QString helpPage() const override
-    {
-        return "Launcher-settings";
-    }
+    QString displayName() const override { return tr("Launcher"); }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("launcher"); }
+    QString id() const override { return "launcher-settings"; }
+    QString helpPage() const override { return "Launcher-settings"; }
     bool apply() override;
     void retranslate() override;
 
-private:
+   private:
     void applySettings();
     void loadSettings();
 
-private
-slots:
+   private slots:
     void on_instDirBrowseBtn_clicked();
     void on_modsDirBrowseBtn_clicked();
     void on_iconsDirBrowseBtn_clicked();
@@ -96,8 +81,8 @@ slots:
      */
     void refreshFontPreview();
 
-private:
-    Ui::LauncherPage *ui;
+   private:
+    Ui::LauncherPage* ui;
 
     /*!
      * Stores the currently selected update channel.
@@ -105,7 +90,7 @@ private:
     QString m_currentUpdateChannel;
 
     // default format for the font preview...
-    QTextCharFormat *defaultFormat;
+    QTextCharFormat* defaultFormat;
 
     std::unique_ptr<LogColorCache> m_colors;