refactor: simpler includes for quazip

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()

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"

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"
 

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 <nonstd/optional>
-#include <QuaZip-Qt5-1.2/quazip/JlCompress.h>
-#endif
 
 namespace MMCZip
 {

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"
 

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;

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>
 

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>

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"

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"

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"

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>

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>

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