From efa414c442a77735a5f972b7103e8ce866a6bdd1 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Thu, 20 Jan 2022 20:40:56 +0100
Subject: refactor: initial migration to QuaZip 1.2

Let's move off our custom QuaZip. In the olden times we needed the
custom version of QuaZip, as it was basically unmaintained and on
SourceForge (eww). But nowadays it's maintained and on GitHub. See
new GitHub page: https://github.com/stachenov/quazip
---
 libraries/classparser/src/classparser.cpp | 2 +-
 libraries/quazip                          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 160000 libraries/quazip

(limited to 'libraries')

diff --git a/libraries/classparser/src/classparser.cpp b/libraries/classparser/src/classparser.cpp
index 8825ea39..a47d1aad 100644
--- a/libraries/classparser/src/classparser.cpp
+++ b/libraries/classparser/src/classparser.cpp
@@ -18,7 +18,7 @@
 #include "classparser.h"
 
 #include <QFile>
-#include <quazipfile.h>
+#include <QuaZip-Qt5-1.2/quazip/quazipfile.h>
 #include <QDebug>
 
 namespace classparser
diff --git a/libraries/quazip b/libraries/quazip
deleted file mode 160000
index c9ef32de..00000000
--- a/libraries/quazip
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c9ef32de19bceb58d236f5c22382698deaec69fd
-- 
cgit 


From 3aa809b8c0de48ca241ec567acda31ed1a728540 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 24 Jan 2022 22:55:57 +0100
Subject: refactor: add in-tree QuaZip

---
 libraries/classparser/CMakeLists.txt      | 2 +-
 libraries/classparser/src/classparser.cpp | 6 ++++++
 libraries/quazip                          | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 160000 libraries/quazip

(limited to 'libraries')

diff --git a/libraries/classparser/CMakeLists.txt b/libraries/classparser/CMakeLists.txt
index c07e871c..fc510e68 100644
--- a/libraries/classparser/CMakeLists.txt
+++ b/libraries/classparser/CMakeLists.txt
@@ -38,4 +38,4 @@ add_definitions(-DCLASSPARSER_LIBRARY)
 
 add_library(Launcher_classparser STATIC ${CLASSPARSER_SOURCES} ${CLASSPARSER_HEADERS})
 target_include_directories(Launcher_classparser PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
-target_link_libraries(Launcher_classparser Launcher_quazip Qt5::Core)
+target_link_libraries(Launcher_classparser QuaZip::QuaZip Qt5::Core)
diff --git a/libraries/classparser/src/classparser.cpp b/libraries/classparser/src/classparser.cpp
index a47d1aad..b7612a41 100644
--- a/libraries/classparser/src/classparser.cpp
+++ b/libraries/classparser/src/classparser.cpp
@@ -18,7 +18,13 @@
 #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
diff --git a/libraries/quazip b/libraries/quazip
new file mode 160000
index 00000000..09ec1d10
--- /dev/null
+++ b/libraries/quazip
@@ -0,0 +1 @@
+Subproject commit 09ec1d10c6d627f895109b21728dda000cbfa7d1
-- 
cgit 


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: refactor: simpler includes for quazip

---
 libraries/classparser/src/classparser.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'libraries')

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
-- 
cgit