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

2
application/pages/OtherLogsPage.cpp
View File

@@ -130,7 +130,7 @@ void OtherLogsPage::on_btnReload_clicked()
if(file.fileName().endsWith(".gz"))
{
QByteArray temp;
if(!GZip::decompress(file.readAll(), temp))
if(!GZip::unzip(file.readAll(), temp))
{
ui->text->setPlainText(
tr("The file (%1) is not readable.").arg(file.fileName()));

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)
{

4
logic/GZip.h
View File

@@ -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);
};

2
logic/minecraft/World.cpp
View File

@@ -187,7 +187,7 @@ static int64_t read_long (nbt::value& parent, const char * name, const int64_t &
void World::parseLevelDat(QByteArray data)
{
QByteArray output;
is_valid = GZip::decompress(data, output);
is_valid = GZip::unzip(data, output);
if(!is_valid)
{
return;

6
tests/tst_GZip.cpp
View File

@@ -42,8 +42,10 @@ slots:
{
QByteArray copy = random;
copy.resize(cur);
QVERIFY(GZip::compress(copy, compressed));
QVERIFY(GZip::decompress(compressed, decompressed));
compressed.clear();
decompressed.clear();
QVERIFY(GZip::zip(copy, compressed));
QVERIFY(GZip::unzip(compressed, decompressed));
QCOMPARE(decompressed, copy);
fib(prev, cur);
} while (cur < size);