8 files changed, 13 insertions, 20 deletions
diff --git a/launcher/InstancePageProvider.h b/launcher/InstancePageProvider.h
index b4b6e739..d25cd330 100644
--- a/launcher/InstancePageProvider.h
+++ b/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:
diff --git a/launcher/JavaCommon.cpp b/launcher/JavaCommon.cpp
index e29e2270..30a7dbac 100644
--- a/launcher/JavaCommon.cpp
+++ b/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(
diff --git a/launcher/JavaCommon.h b/launcher/JavaCommon.h
index 59cb7a67..2ba64c0c 100644
--- a/launcher/JavaCommon.h
+++ b/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);
 
diff --git a/launcher/java/JavaVersion.cpp b/launcher/java/JavaVersion.cpp
index 0e4fc1d3..7124e22f 100644
--- a/launcher/java/JavaVersion.cpp
+++ b/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;
 }
diff --git a/launcher/java/JavaVersion.h b/launcher/java/JavaVersion.h
index 6b92d401..d74e0148 100644
--- a/launcher/java/JavaVersion.h
+++ b/launcher/java/JavaVersion.h
@@ -25,7 +25,7 @@ public:
 
     bool requiresPermGen();
 
-    QString toString();
+    QString toString() const;
 
     int major()
     {
diff --git a/launcher/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp
index 00809bb0..1f210d69 100644
--- a/launcher/minecraft/PackProfile.cpp
+++ b/launcher/minecraft/PackProfile.cpp
@@ -591,10 +591,7 @@ QVariant PackProfile::data(const QModelIndex &index, int role) const
     }
     case Qt::DecorationRole:
     {
-        switch(column)
-        {
-        case NameColumn:
-        {
+        if (column == 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();
diff --git a/launcher/minecraft/World.h b/launcher/minecraft/World.h
index 10328cce..dc3733d5 100644
--- a/launcher/minecraft/World.h
+++ b/launcher/minecraft/World.h
@@ -28,7 +28,7 @@ struct GameType {
     enum
     {
         Unknown = -1,
-        Survival = 0,
+        Survival,
         Creative,
         Adventure,
         Spectator
diff --git a/launcher/ui/instanceview/AccessibleInstanceView.h b/launcher/ui/instanceview/AccessibleInstanceView.h
index 9bfd1745..eb4222f5 100644
--- a/launcher/ui/instanceview/AccessibleInstanceView.h
+++ b/launcher/ui/instanceview/AccessibleInstanceView.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <QString>
+#include <QObject>
 class QAccessibleInterface;
 
 QAccessibleInterface *groupViewAccessibleFactory(const QString &classname, QObject *object);