From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Thu, 19 Sep 2019 00:41:48 -0700
Subject: merged from 0.6.7 codebase

---
 application/pages/global/JavaPage.h | 58 ++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'application/pages/global/JavaPage.h')

diff --git a/application/pages/global/JavaPage.h b/application/pages/global/JavaPage.h
index e3a9f37f..3efebb78 100644
--- a/application/pages/global/JavaPage.h
+++ b/application/pages/global/JavaPage.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,42 +31,42 @@ class JavaPage;
 
 class JavaPage : public QWidget, public BasePage
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit JavaPage(QWidget *parent = 0);
-	~JavaPage();
+    explicit JavaPage(QWidget *parent = 0);
+    ~JavaPage();
 
-	QString displayName() const override
-	{
-		return tr("Java");
-	}
-	QIcon icon() const override
-	{
-		return MMC->getThemedIcon("java");
-	}
-	QString id() const override
-	{
-		return "java-settings";
-	}
-	QString helpPage() const override
-	{
-		return "Java-settings";
-	}
-	bool apply() override;
+    QString displayName() const override
+    {
+        return tr("Java");
+    }
+    QIcon icon() const override
+    {
+        return MMC->getThemedIcon("java");
+    }
+    QString id() const override
+    {
+        return "java-settings";
+    }
+    QString helpPage() const override
+    {
+        return "Java-settings";
+    }
+    bool apply() override;
 
 private:
-	void applySettings();
-	void loadSettings();
+    void applySettings();
+    void loadSettings();
 
 private
 slots:
-	void on_javaDetectBtn_clicked();
-	void on_javaTestBtn_clicked();
-	void on_javaBrowseBtn_clicked();
-	void checkerFinished();
+    void on_javaDetectBtn_clicked();
+    void on_javaTestBtn_clicked();
+    void on_javaBrowseBtn_clicked();
+    void checkerFinished();
 
 private:
-	Ui::JavaPage *ui;
-	unique_qobject_ptr<JavaCommon::TestCheck> checker;
+    Ui::JavaPage *ui;
+    unique_qobject_ptr<JavaCommon::TestCheck> checker;
 };
-- 
cgit v1.2.3