diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-01-20 20:40:56 +0100 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-01-31 21:40:59 +0100 |
| commit | efa414c442a77735a5f972b7103e8ce866a6bdd1 (patch) | |
| tree | dbefe8703aeed2f40e95fb2d5dac5a0ad0f794f0 /launcher/MMCZip.h | |
| parent | c39da093bf5f4d73f2cfbc1b030d5c1e8297f5a2 (diff) | |
| download | PrismLauncher-efa414c442a77735a5f972b7103e8ce866a6bdd1.tar.gz PrismLauncher-efa414c442a77735a5f972b7103e8ce866a6bdd1.tar.bz2 PrismLauncher-efa414c442a77735a5f972b7103e8ce866a6bdd1.zip | |
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
Diffstat (limited to 'launcher/MMCZip.h')
| -rw-r--r-- | launcher/MMCZip.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/launcher/MMCZip.h b/launcher/MMCZip.h index 9c47fa11..5260f856 100644 --- a/launcher/MMCZip.h +++ b/launcher/MMCZip.h @@ -21,17 +21,21 @@ #include "minecraft/mod/Mod.h" #include <functional> -#include <JlCompress.h> +//#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> namespace MMCZip { + using FilterFunction = std::function<bool(const QString &)>; /** * Merge two zip files, using a filter function */ bool mergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString> &contained, - const JlCompress::FilterFunction filter = nullptr); + const FilterFunction filter = nullptr); /** * take a source jar, add mods to it, resulting in target jar |