From dd8eacee1b28ca40f8dc770587d111656d92d5fb Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Mon, 14 Sep 2015 02:36:03 +0200 Subject: GH-1227 renam GZip functions to not collide with zlib macros --- logic/GZip.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'logic/GZip.cpp') diff --git a/logic/GZip.cpp b/logic/GZip.cpp index d38d06e2..38605df6 100644 --- a/logic/GZip.cpp +++ b/logic/GZip.cpp @@ -2,7 +2,7 @@ #include #include -bool GZip::decompress(const QByteArray &compressedBytes, QByteArray &uncompressedBytes) +bool GZip::unzip(const QByteArray &compressedBytes, QByteArray &uncompressedBytes) { if (compressedBytes.size() == 0) { @@ -59,7 +59,7 @@ bool GZip::decompress(const QByteArray &compressedBytes, QByteArray &uncompresse return true; } -bool GZip::compress(const QByteArray &uncompressedBytes, QByteArray &compressedBytes) +bool GZip::zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes) { if (uncompressedBytes.size() == 0) { -- cgit