From 0442b80a2c0a7d99fa8b7df5d64c1ddfc676f251 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 25 Jan 2022 12:53:33 +0100
Subject: [PATCH] refactor: simpler includes for quazip

---
 CMakeLists.txt                                          | 1 -
 launcher/InstanceImportTask.cpp                         | 5 -----
 launcher/MMCZip.cpp                                     | 7 +------
 launcher/MMCZip.h                                       | 6 +-----
 launcher/minecraft/MinecraftLoadAndCheck.h              | 5 -----
 launcher/minecraft/MinecraftUpdate.h                    | 5 -----
 launcher/minecraft/World.cpp                            | 7 -------
 launcher/minecraft/launch/ExtractNatives.cpp            | 6 ------
 launcher/minecraft/mod/LocalModParseTask.cpp            | 7 -------
 launcher/modplatform/atlauncher/ATLPackInstallTask.cpp  | 4 ----
 launcher/modplatform/legacy_ftb/PackInstallTask.h       | 7 -------
 launcher/modplatform/technic/SingleZipPackInstallTask.h | 4 ----
 launcher/modplatform/technic/TechnicPackProcessor.cpp   | 8 --------
 libraries/classparser/src/classparser.cpp               | 6 ------
 14 files changed, 2 insertions(+), 76 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ebc0dfd..ab39e83c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -263,7 +263,6 @@ add_subdirectory(libraries/javacheck) # java compatibility checker
 add_subdirectory(libraries/xz-embedded) # xz compression
 if (NOT QuaZip-Qt${QT_VERSION_MAJOR}_FOUND)
     set(QUAZIP_QT_MAJOR_VERSION ${QT_VERSION_MAJOR})
-    add_compile_definitions(QUAZIP_USE_SUBMODULE)
     MESSAGE(STATUS "Adding QuaZip submodule, with QT_VERSION_MAJOR ${QUAZIP_QT_MAJOR_VERSION}")
     add_subdirectory(libraries/quazip) # zip manipulation library
 endif()
diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index 8aab91c5..ec378538 100644
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@@ -29,12 +29,7 @@
 #include "modplatform/flame/FileResolvingTask.h"
 #include "modplatform/flame/PackManifest.h"
 #include "Json.h"
-
-#ifdef QUAZIP_USE_SUBMODULE
 #include <quazip/quazipdir.h>
-#else
-#include <QuaZip-Qt5-1.2/quazip/quazipdir.h>
-#endif
 #include "modplatform/technic/TechnicPackProcessor.h"
 
 #include "icons/IconList.h"
diff --git a/launcher/MMCZip.cpp b/launcher/MMCZip.cpp
index 36562b06..9b8b7908 100644
--- a/launcher/MMCZip.cpp
+++ b/launcher/MMCZip.cpp
@@ -12,15 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifdef QUAZIP_USE_SUBMODULE
+
 #include <quazip/quazip.h>
 #include <quazip/quazipdir.h>
 #include <quazip/quazipfile.h>
-#else
-#include <QuaZip-Qt5-1.2/quazip/quazip.h>
-#include <QuaZip-Qt5-1.2/quazip/quazipdir.h>
-#include <QuaZip-Qt5-1.2/quazip/quazipfile.h>
-#endif
 #include "MMCZip.h"
 #include "FileSystem.h"
 
diff --git a/launcher/MMCZip.h b/launcher/MMCZip.h
index 5983aa37..c8e830ab 100644
--- a/launcher/MMCZip.h
+++ b/launcher/MMCZip.h
@@ -19,14 +19,10 @@
 #include <QFileInfo>
 #include <QSet>
 #include "minecraft/mod/Mod.h"
-#include "nonstd/optional"
 #include <functional>
 
-#ifdef QUAZIP_USE_SUBMODULE
 #include <quazip/JlCompress.h>
-#else
-#include <QuaZip-Qt5-1.2/quazip/JlCompress.h>
-#endif
+#include <nonstd/optional>
 
 namespace MMCZip
 {
diff --git a/launcher/minecraft/MinecraftLoadAndCheck.h b/launcher/minecraft/MinecraftLoadAndCheck.h
index 1aeb79f8..d9af3ace 100644
--- a/launcher/minecraft/MinecraftLoadAndCheck.h
+++ b/launcher/minecraft/MinecraftLoadAndCheck.h
@@ -20,12 +20,7 @@
 #include <QUrl>
 
 #include "tasks/Task.h"
-
-#ifdef QUAZIP_USE_SUBMODULE
 #include <quazip/quazip.h>
-#else
-#include <QuaZip-Qt5-1.2/quazip/quazip.h>
-#endif
 
 #include "QObjectPtr.h"
 
diff --git a/launcher/minecraft/MinecraftUpdate.h b/launcher/minecraft/MinecraftUpdate.h
index 36c4310b..9ebef656 100644
--- a/launcher/minecraft/MinecraftUpdate.h
+++ b/launcher/minecraft/MinecraftUpdate.h
@@ -22,12 +22,7 @@
 #include "net/NetJob.h"
 #include "tasks/Task.h"
 #include "minecraft/VersionFilterData.h"
-
-#ifdef QUAZIP_USE_SUBMODULE
 #include <quazip/quazip.h>
-#else
-#include <QuaZip-Qt5-1.2/quazip/quazip.h>
-#endif
 
 class MinecraftVersion;
 class MinecraftInstance;
diff --git a/launcher/minecraft/World.cpp b/launcher/minecraft/World.cpp
index 8fd77919..2937c116 100644
--- a/launcher/minecraft/World.cpp
+++ b/launcher/minecraft/World.cpp
@@ -26,16 +26,9 @@
 #include <io/stream_reader.h>
 #include <tag_string.h>
 #include <tag_primitive.h>
-
-#ifdef QUAZIP_USE_SUBMODULE
 #include <quazip/quazip.h>
 #include <quazip/quazipfile.h>
 #include <quazip/quazipdir.h>
-#else
-#include <QuaZip-Qt5-1.2/quazip/quazip.h>
-#include <QuaZip-Qt5-1.2/quazip/quazipfile.h>
-#include <QuaZip-Qt5-1.2/quazip/quazipdir.h>
-#endif
 
 #include <QCoreApplication>
 
diff --git a/launcher/minecraft/launch/ExtractNatives.cpp b/launcher/minecraft/launch/ExtractNatives.cpp
index 5f13f730..7d5f4179 100644
--- a/launcher/minecraft/launch/ExtractNatives.cpp
+++ b/launcher/minecraft/launch/ExtractNatives.cpp
@@ -17,14 +17,8 @@
 #include <minecraft/MinecraftInstance.h>
 #include <launch/LaunchTask.h>
 
-#ifdef QUAZIP_USE_SUBMODULE
 #include <quazip/quazip.h>
 #include <quazip/quazipdir.h>
-#else
-#include <QuaZip-Qt5-1.2/quazip/quazip.h>
-#include <QuaZip-Qt5-1.2/quazip/quazipdir.h>
-#endif
-
 #include "MMCZip.h"
 #include "FileSystem.h"
 #include <QDir>
diff --git a/launcher/minecraft/mod/LocalModParseTask.cpp b/launcher/minecraft/mod/LocalModParseTask.cpp
index 651b96ac..757a2187 100644
--- a/launcher/minecraft/mod/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/LocalModParseTask.cpp
@@ -4,15 +4,8 @@
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
-
-#ifdef QUAZIP_USE_SUBMODULE
 #include <quazip/quazip.h>
 #include <quazip/quazipfile.h>
-#else
-#include <QuaZip-Qt5-1.2/quazip/quazip.h>
-#include <QuaZip-Qt5-1.2/quazip/quazipfile.h>
-#endif
-
 #include <toml.h>
 
 #include "settings/INIFile.h"
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index c4f4b96f..8de5fc9f 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -19,11 +19,7 @@
 
 #include <QtConcurrent/QtConcurrent>
 
-#ifdef QUAZIP_USE_SUBMODULE
 #include <quazip/quazip.h>
-#else
-#include <QuaZip-Qt5-1.2/quazip/quazip.h>
-#endif
 
 #include "MMCZip.h"
 #include "minecraft/OneSixVersionFormat.h"
diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.h b/launcher/modplatform/legacy_ftb/PackInstallTask.h
index 2cdfee7a..a7395220 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.h
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.h
@@ -1,15 +1,8 @@
 #pragma once
 #include "InstanceTask.h"
 #include "net/NetJob.h"
-
-#ifdef QUAZIP_USE_SUBMODULE
 #include <quazip/quazip.h>
 #include <quazip/quazipdir.h>
-#else
-#include "QuaZip-Qt5-1.2/quazip/quazip.h"
-#include "QuaZip-Qt5-1.2/quazip/quazipdir.h"
-#endif
-
 #include "meta/Index.h"
 #include "meta/Version.h"
 #include "meta/VersionList.h"
diff --git a/launcher/modplatform/technic/SingleZipPackInstallTask.h b/launcher/modplatform/technic/SingleZipPackInstallTask.h
index d3bdc00b..4d1fcbff 100644
--- a/launcher/modplatform/technic/SingleZipPackInstallTask.h
+++ b/launcher/modplatform/technic/SingleZipPackInstallTask.h
@@ -18,11 +18,7 @@
 #include "InstanceTask.h"
 #include "net/NetJob.h"
 
-#ifdef QUAZIP_USE_SUBMODULE
 #include <quazip/quazip.h>
-#else
-#include "QuaZip-Qt5-1.2/quazip/quazip.h"
-#endif
 
 #include <QFutureWatcher>
 #include <QStringList>
diff --git a/launcher/modplatform/technic/TechnicPackProcessor.cpp b/launcher/modplatform/technic/TechnicPackProcessor.cpp
index a8b4d05b..c45061ac 100644
--- a/launcher/modplatform/technic/TechnicPackProcessor.cpp
+++ b/launcher/modplatform/technic/TechnicPackProcessor.cpp
@@ -19,17 +19,9 @@
 #include <Json.h>
 #include <minecraft/MinecraftInstance.h>
 #include <minecraft/PackProfile.h>
-
-#ifdef QUAZIP_USE_SUBMODULE
 #include <quazip/quazip.h>
 #include <quazip/quazipdir.h>
 #include <quazip/quazipfile.h>
-#else
-#include <QuaZip-Qt5-1.2/quazip/quazip.h>
-#include <QuaZip-Qt5-1.2/quazip/quazipdir.h>
-#include <QuaZip-Qt5-1.2/quazip/quazipfile.h>
-#endif
-
 #include <settings/INISettingsObject.h>
 
 #include <memory>
diff --git a/libraries/classparser/src/classparser.cpp b/libraries/classparser/src/classparser.cpp
index b7612a41..601521f6 100644
--- a/libraries/classparser/src/classparser.cpp
+++ b/libraries/classparser/src/classparser.cpp
@@ -18,13 +18,7 @@
 #include "classparser.h"
 
 #include <QFile>
-
-#ifdef QUAZIP_USE_SUBMODULE
 #include <quazip/quazipfile.h>
-#else
-#include <QuaZip-Qt5-1.2/quazip/quazipfile.h>
-#endif
-
 #include <QDebug>
 
 namespace classparser