diff options
| author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2014-02-04 12:29:40 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-05 20:13:35 +0100 |
| commit | 0a9ea1ed6f2c201445381be62305a5e8b889f321 (patch) | |
| tree | 277995f66a26f2435875e06d8d3d0949f3616acb /src/websockets/qwebsocketserver.cpp | |
| parent | 8f41c45d2835d70a29fd64b50194bf617556f46d (diff) | |
| download | qtwebsockets-0a9ea1ed6f2c201445381be62305a5e8b889f321.tar.gz | |
Use QObjectPrivate instead of dedicated d-ptr
Change-Id: I3f69a2b0ca81e1e003200bb8e0a337b9532e64a0
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src/websockets/qwebsocketserver.cpp')
| -rw-r--r-- | src/websockets/qwebsocketserver.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/websockets/qwebsocketserver.cpp b/src/websockets/qwebsocketserver.cpp index 580e0ce..10ee83e 100644 --- a/src/websockets/qwebsocketserver.cpp +++ b/src/websockets/qwebsocketserver.cpp @@ -223,8 +223,7 @@ QT_BEGIN_NAMESPACE */ QWebSocketServer::QWebSocketServer(const QString &serverName, SslMode secureMode, QObject *parent) : - QObject(parent), - d_ptr(new QWebSocketServerPrivate(serverName, + QObject(*(new QWebSocketServerPrivate(serverName, #ifndef QT_NO_SSL (secureMode == SecureMode) ? QWebSocketServerPrivate::SecureMode : @@ -232,8 +231,7 @@ QWebSocketServer::QWebSocketServer(const QString &serverName, SslMode secureMode #else QWebSocketServerPrivate::NonSecureMode, #endif - this, - this)) + this)), parent) { #ifdef QT_NO_SSL Q_UNUSED(secureMode) @@ -249,7 +247,6 @@ QWebSocketServer::QWebSocketServer(const QString &serverName, SslMode secureMode */ QWebSocketServer::~QWebSocketServer() { - delete d_ptr; } /*! |