From 75042d31d1d267d0a4091932c95579747a102e9d Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Sun, 24 Sep 2017 23:55:05 +0200 Subject: Replace Q_NULLPTR with nullptr Change-Id: I0988a4119b5bd790d286c16b5647d97d4d95aef0 Reviewed-by: Lars Knoll --- src/websockets/qwebsocket_p.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/websockets/qwebsocket_p.cpp') diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index f36056c..5253804 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -80,7 +80,7 @@ QWebSocketConfiguration::QWebSocketConfiguration() : #ifndef QT_NO_NETWORKPROXY m_proxy(QNetworkProxy::DefaultProxy), #endif - m_pSocket(Q_NULLPTR) + m_pSocket(nullptr) { } @@ -91,7 +91,7 @@ QWebSocketPrivate::QWebSocketPrivate(const QString &origin, QWebSocketProtocol:: QWebSocket *pWebSocket) : QObjectPrivate(), q_ptr(pWebSocket), - m_pSocket(Q_NULLPTR), + m_pSocket(nullptr), m_errorString(), m_version(version), m_resourceName(), @@ -376,7 +376,7 @@ void QWebSocketPrivate::open(const QNetworkRequest &request, bool mask) if (m_pSocket) { releaseConnections(m_pSocket); m_pSocket->deleteLater(); - m_pSocket = Q_NULLPTR; + m_pSocket = nullptr; } //if (m_url != url) if (Q_LIKELY(!m_pSocket)) { @@ -1137,7 +1137,7 @@ void QWebSocketPrivate::socketDestroyed(QObject *socket) { Q_ASSERT(m_pSocket); if (m_pSocket == socket) - m_pSocket = Q_NULLPTR; + m_pSocket = nullptr; } /*! -- cgit v1.2.1