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/qwebsocket.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/qwebsocket.cpp')
-rw-r--r-- | src/websockets/qwebsocket.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/websockets/qwebsocket.cpp b/src/websockets/qwebsocket.cpp index b500853..45394e3 100644 --- a/src/websockets/qwebsocket.cpp +++ b/src/websockets/qwebsocket.cpp @@ -260,8 +260,7 @@ QT_BEGIN_NAMESPACE QWebSocket::QWebSocket(const QString &origin, QWebSocketProtocol::Version version, QObject *parent) : - QObject(parent), - d_ptr(new QWebSocketPrivate(origin, version, this, this)) + QObject(*(new QWebSocketPrivate(origin, version, this)), parent) { } @@ -271,7 +270,6 @@ QWebSocket::QWebSocket(const QString &origin, */ QWebSocket::~QWebSocket() { - delete d_ptr; } /*! @@ -301,8 +299,7 @@ QAbstractSocket::SocketError QWebSocket::error() const */ QWebSocket::QWebSocket(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version, QObject *parent) : - QObject(parent), - d_ptr(new QWebSocketPrivate(pTcpSocket, version, this, this)) + QObject(*(new QWebSocketPrivate(pTcpSocket, version, this)), parent) { } |