summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocket.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.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.h')
-rw-r--r--src/websockets/qwebsocket.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h
index 1087878..c1b3db7 100644
--- a/src/websockets/qwebsocket.h
+++ b/src/websockets/qwebsocket.h
@@ -40,7 +40,7 @@ class Q_WEBSOCKETS_EXPORT QWebSocket : public QObject
Q_DECLARE_PRIVATE(QWebSocket)
public:
- explicit QWebSocket(const QString &origin = QString(), QWebSocketProtocol::Version version = QWebSocketProtocol::V_LATEST, QObject *parent = 0);
+ explicit QWebSocket(const QString &origin = QString(), QWebSocketProtocol::Version version = QWebSocketProtocol::V_LATEST, QObject *parent = Q_NULLPTR);
virtual ~QWebSocket();
void abort();
@@ -105,7 +105,7 @@ Q_SIGNALS:
void pong(quint64 elapsedTime, QByteArray payload);
private:
- QWebSocket(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version, QObject *parent = 0);
+ QWebSocket(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version, QObject *parent = Q_NULLPTR);
QWebSocketPrivate * const d_ptr;
};