summaryrefslogtreecommitdiffstats
path: root/logic/GZip.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-09-14 02:36:03 +0200
committerPetr Mrázek <peterix@gmail.com>2015-09-14 02:36:03 +0200
commitdd8eacee1b28ca40f8dc770587d111656d92d5fb (patch)
tree152e671cbb9ad23ce8966a23e752423ace7d8b82 /logic/GZip.h
parente38cc1d480fdcf3ad08829688fe1a61961612e36 (diff)
downloadMultiMC-dd8eacee1b28ca40f8dc770587d111656d92d5fb.tar
MultiMC-dd8eacee1b28ca40f8dc770587d111656d92d5fb.tar.gz
MultiMC-dd8eacee1b28ca40f8dc770587d111656d92d5fb.tar.lz
MultiMC-dd8eacee1b28ca40f8dc770587d111656d92d5fb.tar.xz
MultiMC-dd8eacee1b28ca40f8dc770587d111656d92d5fb.zip
GH-1227 renam GZip functions to not collide with zlib macros
Diffstat (limited to 'logic/GZip.h')
-rw-r--r--logic/GZip.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/GZip.h b/logic/GZip.h
index 51be5ca1..6993a222 100644
--- a/logic/GZip.h
+++ b/logic/GZip.h
@@ -6,7 +6,7 @@
class MULTIMC_LOGIC_EXPORT GZip
{
public:
- static bool decompress(const QByteArray &compressedBytes, QByteArray &uncompressedBytes);
- static bool compress(const QByteArray &uncompressedBytes, QByteArray &compressedBytes);
+ static bool unzip(const QByteArray &compressedBytes, QByteArray &uncompressedBytes);
+ static bool zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes);
};