X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fcompressor.h;h=47a4350c84fa0b21b3d070dd620e013c1544fcfc;hp=13369c700dfe58dc37781dfc0c235152cff116c6;hb=52209badc8e769e50aa3019b63689dda0e79e9d0;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf

diff --git a/src/common/compressor.h b/src/common/compressor.h
index 13369c70..47a4350c 100644
--- a/src/common/compressor.h
+++ b/src/common/compressor.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 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,51 +18,49 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COMPRESSOR_H
-#define COMPRESSOR_H
+#pragma once
 
 #include <QObject>
 
-class QTcpSocket;
+#include <zlib.h>
 
-#ifdef HAVE_ZLIB
-    typedef struct z_stream_s *z_streamp;
-#else
-    typedef struct mz_stream_s *z_streamp;
-#endif
+class QTcpSocket;
 
 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();
+    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();
 
@@ -78,7 +76,7 @@ private:
     void writeData();
 
 private:
-    QTcpSocket *_socket;
+    QTcpSocket* _socket;
     CompressionLevel _level;
 
     QByteArray _readBuffer;
@@ -90,5 +88,3 @@ private:
     z_streamp _inflater;
     z_streamp _deflater;
 };
-
-#endif