refactor: add in-tree QuaZip

13 files changed, 71 insertions, 8 deletions

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 0ef27f6b..c704563b 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -899,7 +899,6 @@ endif()
 add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES} ${LAUNCHER_UI} ${LAUNCHER_RESOURCES})
 target_link_libraries(Launcher_logic
     systeminfo
-    Launcher_quazip
     Launcher_classparser
     ${NBT_NAME}
     ${ZLIB_LIBRARIES}
@@ -917,7 +916,7 @@ target_link_libraries(Launcher_logic
 )
 target_link_libraries(Launcher_logic
     Launcher_iconfix
-    ${QUAZIP_LIBRARIES}
+    QuaZip::QuaZip
     hoedown
     Launcher_rainbow
     LocalPeer
diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index 6e2dd912..8aab91c5 100644
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@@ -29,7 +29,12 @@
 #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 e1906a0c..74c9b388 100644
--- a/launcher/MMCZip.cpp
+++ b/launcher/MMCZip.cpp
@@ -12,10 +12,15 @@
  * 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 5260f856..5983aa37 100644
--- a/launcher/MMCZip.h
+++ b/launcher/MMCZip.h
@@ -19,13 +19,14 @@
 #include <QFileInfo>
 #include <QSet>
 #include "minecraft/mod/Mod.h"
+#include "nonstd/optional"
 #include <functional>
 
-//#include <QuaZip-Qt5-1.2/quazip/JlCompress.h>
-// TODO: Blocked by https://github.com/stachenov/quazip/pull/141
-// For now, checkout https://github.com/Scrumplex/quazip/tree/expose-jlcompress-fns at ../../quazip
-#include <../../quazip/quazip/JlCompress.h>
-#include <nonstd/optional>
+#ifdef QUAZIP_USE_SUBMODULE
+#include <quazip/JlCompress.h>
+#else
+#include <QuaZip-Qt5-1.2/quazip/JlCompress.h>
+#endif
 
 namespace MMCZip
 {
diff --git a/launcher/minecraft/MinecraftLoadAndCheck.h b/launcher/minecraft/MinecraftLoadAndCheck.h
index 4e673a4b..1aeb79f8 100644
--- a/launcher/minecraft/MinecraftLoadAndCheck.h
+++ b/launcher/minecraft/MinecraftLoadAndCheck.h
@@ -20,7 +20,12 @@
 #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 a1df4b3f..36c4310b 100644
--- a/launcher/minecraft/MinecraftUpdate.h
+++ b/launcher/minecraft/MinecraftUpdate.h
@@ -22,7 +22,12 @@
 #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 95892d43..8fd77919 100644
--- a/launcher/minecraft/World.cpp
+++ b/launcher/minecraft/World.cpp
@@ -26,9 +26,16 @@
 #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 744e7ac6..5f13f730 100644
--- a/launcher/minecraft/launch/ExtractNatives.cpp
+++ b/launcher/minecraft/launch/ExtractNatives.cpp
@@ -17,8 +17,14 @@
 #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 fa3a4538..651b96ac 100644
--- a/launcher/minecraft/mod/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/LocalModParseTask.cpp
@@ -4,8 +4,15 @@
 #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 30a61026..c4f4b96f 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -19,7 +19,11 @@
 
 #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 6797971c..2cdfee7a 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.h
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.h
@@ -1,8 +1,15 @@
 #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 58594136..d3bdc00b 100644
--- a/launcher/modplatform/technic/SingleZipPackInstallTask.h
+++ b/launcher/modplatform/technic/SingleZipPackInstallTask.h
@@ -18,7 +18,11 @@
 #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 f5c011f5..a8b4d05b 100644
--- a/launcher/modplatform/technic/TechnicPackProcessor.cpp
+++ b/launcher/modplatform/technic/TechnicPackProcessor.cpp
@@ -19,9 +19,17 @@
 #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>