0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1227 renam GZip functions to not collide with zlib macros

Browse Source
This commit is contained in:
Petr Mrázek
2015-09-14 02:36:03 +02:00
parent e38cc1d480
commit dd8eacee1b
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logic/GZip.cpp
View File

@@ -2,7 +2,7 @@
#include <zlib.h>
#include <QByteArray>
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)
{