Merge branch 'MultiMC:develop' into develop

CMakeLists.txt

@@ -21,6 +21,20 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     endif()
 endif()
 
+option(Launcher_RUN_CLANG_TIDY "Run clang-tidy with the compiler." OFF)
+if(Launcher_RUN_CLANG_TIDY)
+  find_program(CLANG_TIDY_COMMAND NAMES clang-tidy)
+  if(NOT CLANG_TIDY_COMMAND)
+    message(WARNING "CMake_RUN_CLANG_TIDY is ON but clang-tidy is not found!")
+    set(DO_CLANG_TIDY "" CACHE STRING "" FORCE)
+  else()
+    set(CLANG_TIDY_CHECKS "-modernize-use-trailing-return-type,-readability-magic-numbers,-modernize-avoid-c-arrays")
+    set(DO_CLANG_TIDY "${CLANG_TIDY_COMMAND};-checks=${CLANG_TIDY_CHECKS};-header-filter='${CMAKE_SOURCE_DIR}/src/*'")
+  endif()
+  # TODO: make this per-target, differentiate between libraries and main codebase
+  set(CMAKE_CXX_CLANG_TIDY ${DO_CLANG_TIDY})
+endif()
+
 
 ##################################### Set CMake options #####################################
 set(CMAKE_AUTOMOC ON)

launcher/minecraft/auth/steps/LauncherLoginStep.cpp

@@ -50,7 +50,6 @@ void LauncherLoginStep::onRequestDone(
     auto requestor = qobject_cast<AuthRequest *>(QObject::sender());
     requestor->deleteLater();
 
-    qDebug() << data;
     if (error != QNetworkReply::NoError) {
         qWarning() << "Reply error:" << error;
 #ifndef NDEBUG

launcher/mojang/PackageManifest.cpp

@@ -1,3 +1,10 @@
+/*
+ * Copyright 2020 Petr Mrázek
+ *
+ * This source is subject to the Microsoft Permissive License (MS-PL).
+ * Please see the COPYING.md file for more information.
+ */
+
 #include "PackageManifest.h"
 #include <Json.h>
 #include <QDir>

launcher/mojang/PackageManifest.h

@@ -1,3 +1,10 @@
+/*
+ * Copyright 2020 Petr Mrázek
+ *
+ * This source is subject to the Microsoft Permissive License (MS-PL).
+ * Please see the COPYING.md file for more information.
+ */
+
 #pragma once
 
 #include <QString>

launcher/mojang/PackageManifest_test.cpp

@@ -1,3 +1,10 @@
+/*
+ * Copyright 2020 Petr Mrázek
+ *
+ * This source is subject to the Microsoft Permissive License (MS-PL).
+ * Please see the COPYING.md file for more information.
+ */
+
 #include <QTest>
 #include <QDebug>
 #include "TestUtil.h"

launcher/ui/pages/modplatform/import_ftb/Model.cpp

@@ -233,12 +233,13 @@ void resolveModloader(QString mcVersion, ModLoader &loader) {
             if(versionIsNext) {
                 loader.type = ModLoaderType::Forge;
                 loader.version = value;
-                break;
+                return;
             }
             if(value == "--fml.forgeVersion") {
                 versionIsNext = true;
             }
         }
+        loader.type = ModLoaderType::Unresolved;
         return;
     }
     catch (const JSONValidationError &e)