Use QObjectPrivate::q_ptr instead of shadowing it

Some private classes had a q_ptr pointer shadowing
the QObjectPrivate::q_ptr pointer. Q_Q casts the QObjectPrivate::q_ptr
pointer to match the public class so there is no need to store a
different pointer.

Change-Id: I8f5c4323b1dcf45a9796c0dd9f522bdbc63add18
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

1 files changed, 3 insertions, 6 deletions

diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h
index 91f8ad2..73f2745 100644
--- a/src/websockets/qwebsocket_p.h
+++ b/src/websockets/qwebsocket_p.h
@@ -64,6 +64,7 @@
 #include <QtCore/QTime>
 #include <private/qobject_p.h>
 
+#include "qwebsocket.h"
 #include "qwebsocketprotocol.h"
 #include "qwebsocketdataprocessor_p.h"
 #include "qdefaultmaskgenerator_p.h"
@@ -102,8 +103,7 @@ class QWebSocketPrivate : public QObjectPrivate
 public:
     Q_DECLARE_PUBLIC(QWebSocket)
     explicit QWebSocketPrivate(const QString &origin,
-                               QWebSocketProtocol::Version version,
-                               QWebSocket * const pWebSocket);
+                               QWebSocketProtocol::Version version);
     ~QWebSocketPrivate() override;
 
     void init();
@@ -155,11 +155,8 @@ public:
     void open(const QNetworkRequest &request, bool mask);
     void ping(const QByteArray &payload);
 
-    QWebSocket * const q_ptr;
-
 private:
-    QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version,
-                      QWebSocket *pWebSocket);
+    QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version);
     void setVersion(QWebSocketProtocol::Version version);
     void setResourceName(const QString &resourceName);
     void setRequest(const QNetworkRequest &request);