Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging

.clang-format

@@ -1,16 +1,17 @@
 ---
-Language:        Cpp
+BasedOnStyle: Chromium
-BasedOnStyle:  Chromium
 IndentWidth: 4
-AlignConsecutiveMacros: false
-AlignConsecutiveAssignments: false
 AllowShortIfStatementsOnASingleLine: false
+ColumnLimit: 140
+---
+Language: Cpp
+AlignConsecutiveMacros: None
+AlignConsecutiveAssignments: None
 BraceWrapping:
-  AfterFunction:   true
+  AfterFunction: true
   SplitEmptyFunction: false
   SplitEmptyRecord: false
   SplitEmptyNamespace: false
 BreakBeforeBraces: Custom
 BreakConstructorInitializers: BeforeComma
-ColumnLimit:     140
 Cpp11BracedListStyle: false

launcher/InstancePageProvider.h

@@ -16,9 +16,8 @@
 #include "ui/pages/instance/OtherLogsPage.h"
 #include "ui/pages/instance/WorldListPage.h"
 #include "ui/pages/instance/ServersPage.h"
-#include "ui/pages/instance/GameOptionsPage.h"
 
-class InstancePageProvider : public QObject, public BasePageProvider
+class InstancePageProvider : protected QObject, public BasePageProvider
 {
     Q_OBJECT
 public:

launcher/JavaCommon.cpp

@@ -68,7 +68,7 @@ bool JavaCommon::checkJVMArgs(QString jvmargs, QWidget *parent)
     return true;
 }
 
-void JavaCommon::javaWasOk(QWidget *parent, JavaCheckResult result)
+void JavaCommon::javaWasOk(QWidget *parent, const JavaCheckResult &result)
 {
     QString text;
     text += QObject::tr("Java test succeeded!<br />Platform reported: %1<br />Java version "
@@ -83,7 +83,7 @@ void JavaCommon::javaWasOk(QWidget *parent, JavaCheckResult result)
     CustomMessageBox::selectable(parent, QObject::tr("Java test success"), text, QMessageBox::Information)->show();
 }
 
-void JavaCommon::javaArgsWereBad(QWidget *parent, JavaCheckResult result)
+void JavaCommon::javaArgsWereBad(QWidget *parent, const JavaCheckResult &result)
 {
     auto htmlError = result.errorLog;
     QString text;
@@ -93,7 +93,7 @@ void JavaCommon::javaArgsWereBad(QWidget *parent, JavaCheckResult result)
     CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
 }
 
-void JavaCommon::javaBinaryWasBad(QWidget *parent, JavaCheckResult result)
+void JavaCommon::javaBinaryWasBad(QWidget *parent, const JavaCheckResult &result)
 {
     QString text;
     text += QObject::tr(

launcher/JavaCommon.h

@@ -11,11 +11,11 @@ namespace JavaCommon
     bool checkJVMArgs(QString args, QWidget *parent);
 
     // Show a dialog saying that the Java binary was usable
-    void javaWasOk(QWidget *parent, JavaCheckResult result);
+    void javaWasOk(QWidget *parent, const JavaCheckResult &result);
     // Show a dialog saying that the Java binary was not usable because of bad options
-    void javaArgsWereBad(QWidget *parent, JavaCheckResult result);
+    void javaArgsWereBad(QWidget *parent, const JavaCheckResult &result);
     // Show a dialog saying that the Java binary was not usable
-    void javaBinaryWasBad(QWidget *parent, JavaCheckResult result);
+    void javaBinaryWasBad(QWidget *parent, const JavaCheckResult &result);
     // Show a dialog if we couldn't find Java Checker
     void javaCheckNotFound(QWidget *parent);
 

launcher/java/JavaVersion.cpp

@@ -43,7 +43,7 @@ JavaVersion::JavaVersion(const QString &rhs)
     operator=(rhs);
 }
 
-QString JavaVersion::toString()
+QString JavaVersion::toString() const
 {
     return m_string;
 }

launcher/java/JavaVersion.h

@@ -25,7 +25,7 @@ public:
 
     bool requiresPermGen();
 
-    QString toString();
+    QString toString() const;
 
     int major()
     {

launcher/minecraft/PackProfile.cpp

@@ -591,10 +591,7 @@ QVariant PackProfile::data(const QModelIndex &index, int role) const
     }
     case Qt::DecorationRole:
     {
-        switch(column)
+        if (column == NameColumn) {
-        {
-        case NameColumn:
-        {
             auto severity = patch->getProblemSeverity();
             switch (severity)
             {
@@ -606,11 +603,7 @@ QVariant PackProfile::data(const QModelIndex &index, int role) const
                     return QVariant();
             }
         }
-        default:
+        return QVariant();
-        {
-            return QVariant();
-        }
-        }
     }
     }
     return QVariant();

launcher/minecraft/World.h

@@ -28,7 +28,7 @@ struct GameType {
     enum
     {
         Unknown = -1,
-        Survival = 0,
+        Survival,
         Creative,
         Adventure,
         Spectator

launcher/ui/instanceview/AccessibleInstanceView.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <QString>
+#include <QObject>
 class QAccessibleInterface;
 
 QAccessibleInterface *groupViewAccessibleFactory(const QString &classname, QObject *object);

nix/dev.nix

@@ -19,9 +19,8 @@
           nil.enable = true;
 
           clang-format = {
-            enable =
+            enable = true;
-              false; # As most of the codebase is **not** formatted, we don't want clang-format yet
+            types_or = ["c" "c++" "java" "json" "objective-c"];
-            types_or = ["c" "c++"];
           };
         };
       };