tests: Convert ExpressionMatchTests into a GTest-based test case

[quassel.git] / src / common / compressor.cpp

diff --git a/src/common/compressor.cpp b/src/common/compressor.cpp
index fd3108d..816f26c 100644 (file)
--- a/src/common/compressor.cpp
+++ b/src/common/compressor.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 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  *
@@ -23,13 +23,6 @@
 #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!
 
@@ -37,10 +30,10 @@ Compressor::Compressor(QTcpSocket *socket, Compressor::CompressionLevel level, Q
     : 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)
@@ -48,14 +41,14 @@ Compressor::Compressor(QTcpSocket *socket, Compressor::CompressionLevel level, Q
 
     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);
 }
 
 
@@ -133,7 +126,7 @@ qint64 Compressor::read(char *data, qint64 maxSize)
 
     // 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;
 }