Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog

1 files changed, 15 insertions, 29 deletions

diff --git a/launcher/ui/pages/instance/OtherLogsPage.h b/launcher/ui/pages/instance/OtherLogsPage.h
index 95591638..4b3b122b 100644
--- a/launcher/ui/pages/instance/OtherLogsPage.h
+++ b/launcher/ui/pages/instance/OtherLogsPage.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
@@ -37,47 +37,33 @@
 
 #include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
 #include <pathmatcher/IPathMatcher.h>
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
+namespace Ui {
 class OtherLogsPage;
 }
 
 class RecursiveFileSystemWatcher;
 
-class OtherLogsPage : public QWidget, public BasePage
-{
+class OtherLogsPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit OtherLogsPage(QString path, IPathMatcher::Ptr fileFilter, QWidget *parent = 0);
+   public:
+    explicit OtherLogsPage(QString path, IPathMatcher::Ptr fileFilter, QWidget* parent = 0);
     ~OtherLogsPage();
 
-    QString id() const override
-    {
-        return "logs";
-    }
-    QString displayName() const override
-    {
-        return tr("Other logs");
-    }
-    QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("log");
-    }
-    QString helpPage() const override
-    {
-        return "Minecraft-Logs";
-    }
+    QString id() const override { return "logs"; }
+    QString displayName() const override { return tr("Other logs"); }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("log"); }
+    QString helpPage() const override { return "Minecraft-Logs"; }
     void retranslate() override;
 
     void openedImpl() override;
     void closedImpl() override;
 
-private slots:
+   private slots:
     void populateSelectLogBox();
     void on_selectLogBox_currentIndexChanged(const int index);
     void on_btnReload_clicked();
@@ -91,13 +77,13 @@ private slots:
     void findNextActivated();
     void findPreviousActivated();
 
-private:
+   private:
     void setControlsEnabled(const bool enabled);
 
-private:
-    Ui::OtherLogsPage *ui;
+   private:
+    Ui::OtherLogsPage* ui;
     QString m_path;
     QString m_currentFile;
     IPathMatcher::Ptr m_fileFilter;
-    RecursiveFileSystemWatcher *m_watcher;
+    RecursiveFileSystemWatcher* m_watcher;
 };