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, 2 insertions, 5 deletions

diff --git a/src/websockets/qwebsocketserver_p.h b/src/websockets/qwebsocketserver_p.h
index b34bb72..be7744f 100644
--- a/src/websockets/qwebsocketserver_p.h
+++ b/src/websockets/qwebsocketserver_p.h
@@ -55,6 +55,7 @@
 #include <QtCore/QString>
 #include <QtNetwork/QHostAddress>
 #include <private/qobject_p.h>
+#include "qwebsocketserver.h"
 #include "qwebsocket.h"
 
 #ifndef QT_NO_SSL
@@ -66,7 +67,6 @@ QT_BEGIN_NAMESPACE
 
 class QTcpServer;
 class QTcpSocket;
-class QWebSocketServer;
 
 class QWebSocketServerPrivate : public QObjectPrivate
 {
@@ -80,8 +80,7 @@ public:
         NonSecureMode
     };
 
-    explicit QWebSocketServerPrivate(const QString &serverName, SslMode secureMode,
-                                     QWebSocketServer * const pWebSocketServer);
+    explicit QWebSocketServerPrivate(const QString &serverName, SslMode secureMode);
     ~QWebSocketServerPrivate() override;
 
     void init();
@@ -123,8 +122,6 @@ public:
 
     void handleConnection(QTcpSocket *pTcpSocket) const;
 
-    QWebSocketServer * const q_ptr;
-
 private:
     QTcpServer *m_pTcpServer;
     QString m_serverName;