summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocket_p.h
diff options
context:
space:
mode:
authorSteven Ceuppens <steven.ceuppens@icloud.com>2013-10-10 16:05:54 +0200
committerSteven Ceuppens <steven.ceuppens@icloud.com>2013-10-11 10:46:56 +0200
commit6dfcbd2ef321ecec1869aa6a7f2a8d881727ea3a (patch)
tree9f9139a2528ae5971bf1655604658a1bb7117449 /src/websockets/qwebsocket_p.h
parentb86f2949f63e0ae904c19fb6d39dc6793b164db9 (diff)
downloadqtwebsockets-6dfcbd2ef321ecec1869aa6a7f2a8d881727ea3a.tar.gz
make use of the new Q_NULLPTR keyword & shorten if(ptr) conditions
Change-Id: I4a71909134032d10b398ede74c431964bce7d675 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src/websockets/qwebsocket_p.h')
-rw-r--r--src/websockets/qwebsocket_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h
index a6b8e7d..b2dcdb8 100644
--- a/src/websockets/qwebsocket_p.h
+++ b/src/websockets/qwebsocket_p.h
@@ -57,7 +57,7 @@ public:
explicit QWebSocketPrivate(const QString &origin,
QWebSocketProtocol::Version version,
QWebSocket * const pWebSocket,
- QObject *parent = 0);
+ QObject *parent = Q_NULLPTR);
virtual ~QWebSocketPrivate();
void abort();
@@ -114,7 +114,7 @@ private Q_SLOTS:
private:
QWebSocket * const q_ptr;
- QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version, QWebSocket *pWebSocket, QObject *parent = 0);
+ QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version, QWebSocket *pWebSocket, QObject *parent = Q_NULLPTR);
void setVersion(QWebSocketProtocol::Version version);
void setResourceName(const QString &resourceName);
void setRequestUrl(const QUrl &requestUrl);
@@ -143,7 +143,7 @@ private:
static QWebSocket *upgradeFrom(QTcpSocket *tcpSocket,
const QWebSocketHandshakeRequest &request,
const QWebSocketHandshakeResponse &response,
- QObject *parent = 0);
+ QObject *parent = Q_NULLPTR);
quint32 generateMaskingKey() const;
QByteArray generateKey() const;