/***************************************************************************
- * Copyright (C) 2005-2014 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include <QTcpSocket>
#include <QTimer>
-#ifdef HAVE_ZLIB
-# include <zlib.h>
-#else
-# define MINIZ_HEADER_FILE_ONLY
-# include "../../3rdparty/miniz/miniz.c"
-#endif
-
const int maxBufferSize = 64 * 1024 * 1024; // protect us from zip bombs
const int ioBufferSize = 64 * 1024; // chunk size for inflate/deflate; should not be too large as we preallocate that space!
: QObject(parent),
_socket(socket),
_level(level),
- _inflater(0),
- _deflater(0)
+ _inflater(nullptr),
+ _deflater(nullptr)
{
- connect(socket, SIGNAL(readyRead()), SLOT(readData()));
+ connect(socket, &QIODevice::readyRead, this, &Compressor::readData);
bool ok = true;
if (level != NoCompression)
if (!ok) {
// something went wrong during initialization... but we can only emit an error after RemotePeer has connected its signal
- QTimer::singleShot(0, this, SIGNAL(error()));
+ QTimer::singleShot(0, this, [this]() { emit error(); });
return;
}
// It's possible that more data has already arrived during the handshake, so readyRead() wouldn't be triggered.
// However, we want to give RemotePeer a chance to connect to our signals, so trigger this asynchronously.
if (socket->bytesAvailable())
- QTimer::singleShot(0, this, SLOT(readData()));
+ QTimer::singleShot(0, this, &Compressor::readData);
}
_deflater = new z_stream;
memset(_deflater, 0, sizeof(z_stream));
if (Z_OK != deflateInit(_deflater, zlevel)) {
- qWarning() << "Could not intialize the deflate stream!";
+ qWarning() << "Could not initialize the deflate stream!";
return false;
}
// If there's still data left in the socket buffer, make sure to schedule a read
if (_socket->bytesAvailable())
- QTimer::singleShot(0, this, SLOT(readData()));
+ QTimer::singleShot(0, this, &Compressor::readData);
return n;
}