qa: Avoid deprecation warnings for QList/QSet conversions

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

diff --git a/src/common/compressor.h b/src/common/compressor.h
index b8b9e71..47a4350 100644 (file)
--- a/src/common/compressor.h
+++ b/src/common/compressor.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,11 +18,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COMPRESSOR_H
-#define COMPRESSOR_H
+#pragma once
 
 #include <QObject>
 
+#include <zlib.h>
+
 class QTcpSocket;
 
 class Compressor : public QObject
@@ -30,51 +31,60 @@ class Compressor : public QObject
     Q_OBJECT
 
 public:
-    enum CompressionLevel {
+    enum CompressionLevel
+    {
         NoCompression,
         DefaultCompression,
         BestCompression,
         BestSpeed
     };
 
-    enum Error {
+    enum Error
+    {
         NoError,
         StreamError,
         DeviceError
     };
 
-    enum WriteBufferHint {
+    enum WriteBufferHint
+    {
         NoFlush,
         Flush
     };
 
-    Compressor(QTcpSocket *socket, CompressionLevel level, QObject *parent = 0);
+    Compressor(QTcpSocket* socket, CompressionLevel level, QObject* parent = nullptr);
+    ~Compressor() override;
 
     CompressionLevel compressionLevel() const { return _level; }
 
     qint64 bytesAvailable() const;
 
-    qint64 read(char *data, qint64 maxSize);
-    qint64 write(const char *data, qint64 count, WriteBufferHint flush = Flush);
+    qint64 read(char* data, qint64 maxSize);
+    qint64 write(const char* data, qint64 count, WriteBufferHint flush = Flush);
 
     void flush();
 
 signals:
     void readyRead();
-    void error(Compressor::Error errorCode);
+    void error(Compressor::Error errorCode = StreamError);
 
 private slots:
     void readData();
 
 private:
+    bool initStreams();
     void writeData();
 
 private:
-    QTcpSocket *_socket;
+    QTcpSocket* _socket;
     CompressionLevel _level;
 
     QByteArray _readBuffer;
     QByteArray _writeBuffer;
-};
 
-#endif
+    QByteArray _inputBuffer;
+    QByteArray _outputBuffer;
+
+    z_streamp _inflater;
+    z_streamp _deflater;
+};