1 files changed, 15 insertions, 25 deletions

diff --git a/src/websockets/qwebsocketframe_p.h b/src/websockets/qwebsocketframe_p.h
index e2b4e9f..a8b9684 100644
--- a/src/websockets/qwebsocketframe_p.h
+++ b/src/websockets/qwebsocketframe_p.h
@@ -54,7 +54,7 @@
 #include <QtCore/QString>
 #include <QtCore/QByteArray>
 #include <QtCore/QCoreApplication>
-#include <limits.h>
+#include <limits>
 
 #include "qwebsockets_global.h"
 #include "qwebsocketprotocol.h"
@@ -64,25 +64,15 @@ QT_BEGIN_NAMESPACE
 
 class QIODevice;
 
-const quint64 MAX_FRAME_SIZE_IN_BYTES = INT_MAX - 1;
-const quint64 MAX_MESSAGE_SIZE_IN_BYTES = INT_MAX - 1;
+const quint64 MAX_FRAME_SIZE_IN_BYTES = std::numeric_limits<int>::max() - 1;
+const quint64 MAX_MESSAGE_SIZE_IN_BYTES = std::numeric_limits<int>::max() - 1;
 
 class Q_AUTOTEST_EXPORT QWebSocketFrame
 {
     Q_DECLARE_TR_FUNCTIONS(QWebSocketFrame)
 
 public:
-    QWebSocketFrame();
-    QWebSocketFrame(const QWebSocketFrame &other);
-
-    QWebSocketFrame &operator =(const QWebSocketFrame &other);
-
-#ifdef Q_COMPILER_RVALUE_REFS
-    QWebSocketFrame(QWebSocketFrame &&other);
-    QWebSocketFrame &operator =(QWebSocketFrame &&other);
-#endif
-
-    void swap(QWebSocketFrame &other);
+    QWebSocketFrame() = default;
 
     QWebSocketProtocol::CloseCode closeCode() const;
     QString closeReason() const;
@@ -106,18 +96,12 @@ public:
     void readFrame(QIODevice *pIoDevice);
 
 private:
-    QWebSocketProtocol::CloseCode m_closeCode;
     QString m_closeReason;
-    quint32 m_mask;
-    QWebSocketProtocol::OpCode m_opCode;
-    quint64 m_length;
     QByteArray m_payload;
-
-    bool m_isFinalFrame;
-    bool m_rsv1;
-    bool m_rsv2;
-    bool m_rsv3;
-    bool m_isValid;
+    quint64 m_length = 0;
+    quint32 m_mask = 0;
+    QWebSocketProtocol::CloseCode m_closeCode = QWebSocketProtocol::CloseCodeNormal;
+    QWebSocketProtocol::OpCode m_opCode = QWebSocketProtocol::OpCodeReservedC;
 
     enum ProcessingState
     {
@@ -127,7 +111,13 @@ private:
         PS_READ_PAYLOAD,
         PS_DISPATCH_RESULT,
         PS_WAIT_FOR_MORE_DATA
-    } m_processingState{PS_READ_HEADER};
+    } m_processingState = PS_READ_HEADER;
+
+    bool m_isFinalFrame = true;
+    bool m_rsv1 = false;
+    bool m_rsv2 = false;
+    bool m_rsv3 = false;
+    bool m_isValid = false;
 
     ProcessingState readFrameHeader(QIODevice *pIoDevice);
     ProcessingState readFramePayloadLength(QIODevice *pIoDevice);