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/qmaskgenerator.h | 2 +- src/websockets/qsslserver_p.h | 2 +- src/websockets/qwebsocket.cpp | 2 +- src/websockets/qwebsocket.h | 4 ++-- src/websockets/qwebsocket_p.cpp | 8 ++++---- src/websockets/qwebsocket_p.h | 2 +- src/websockets/qwebsocketdataprocessor.cpp | 6 +++--- src/websockets/qwebsocketdataprocessor_p.h | 2 +- src/websockets/qwebsocketserver.cpp | 2 +- src/websockets/qwebsocketserver.h | 2 +- src/websockets/qwebsocketserver_p.cpp | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/websockets/qmaskgenerator.h b/src/websockets/qmaskgenerator.h index 55cd237..5cd8144 100644 --- a/src/websockets/qmaskgenerator.h +++ b/src/websockets/qmaskgenerator.h @@ -50,7 +50,7 @@ class Q_WEBSOCKETS_EXPORT QMaskGenerator : public QObject Q_DISABLE_COPY(QMaskGenerator) public: - explicit QMaskGenerator(QObject *parent = Q_NULLPTR); + explicit QMaskGenerator(QObject *parent = nullptr); virtual ~QMaskGenerator(); virtual bool seed() = 0; diff --git a/src/websockets/qsslserver_p.h b/src/websockets/qsslserver_p.h index d5e581a..4cd0eac 100644 --- a/src/websockets/qsslserver_p.h +++ b/src/websockets/qsslserver_p.h @@ -65,7 +65,7 @@ class QSslServer : public QTcpServer Q_DISABLE_COPY(QSslServer) public: - explicit QSslServer(QObject *parent = Q_NULLPTR); + explicit QSslServer(QObject *parent = nullptr); virtual ~QSslServer(); void setSslConfiguration(const QSslConfiguration &sslConfiguration); diff --git a/src/websockets/qwebsocket.cpp b/src/websockets/qwebsocket.cpp index 30bb39d..7a017b5 100644 --- a/src/websockets/qwebsocket.cpp +++ b/src/websockets/qwebsocket.cpp @@ -684,7 +684,7 @@ void QWebSocket::setProxy(const QNetworkProxy &networkProxy) /*! Sets the generator to use for creating masks to \a maskGenerator. - The default QWebSocket generator can be reset by supplying a \e Q_NULLPTR. + The default QWebSocket generator can be reset by supplying a \e nullptr. The mask generator can be changed at any time, even while the connection is open. */ void QWebSocket::setMaskGenerator(const QMaskGenerator *maskGenerator) diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h index cbe53ca..a80c47a 100644 --- a/src/websockets/qwebsocket.h +++ b/src/websockets/qwebsocket.h @@ -68,7 +68,7 @@ class Q_WEBSOCKETS_EXPORT QWebSocket : public QObject public: explicit QWebSocket(const QString &origin = QString(), QWebSocketProtocol::Version version = QWebSocketProtocol::VersionLatest, - QObject *parent = Q_NULLPTR); + QObject *parent = nullptr); virtual ~QWebSocket(); void abort(); @@ -147,7 +147,7 @@ Q_SIGNALS: private: QWebSocket(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version, - QObject *parent = Q_NULLPTR); + QObject *parent = nullptr); }; QT_END_NAMESPACE 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; } /*! diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h index 4d33788..fd46e0a 100644 --- a/src/websockets/qwebsocket_p.h +++ b/src/websockets/qwebsocket_p.h @@ -199,7 +199,7 @@ private: upgradeFrom(QTcpSocket *tcpSocket, const QWebSocketHandshakeRequest &request, const QWebSocketHandshakeResponse &response, - QObject *parent = Q_NULLPTR); + QObject *parent = nullptr); quint32 generateMaskingKey() const; QByteArray generateKey() const; diff --git a/src/websockets/qwebsocketdataprocessor.cpp b/src/websockets/qwebsocketdataprocessor.cpp index d9fc550..8070698 100644 --- a/src/websockets/qwebsocketdataprocessor.cpp +++ b/src/websockets/qwebsocketdataprocessor.cpp @@ -83,7 +83,7 @@ QWebSocketDataProcessor::QWebSocketDataProcessor(QObject *parent) : m_binaryMessage(), m_textMessage(), m_payloadLength(0), - m_pConverterState(Q_NULLPTR), + m_pConverterState(nullptr), m_pTextCodec(QTextCodec::codecForName("UTF-8")) { clear(); @@ -97,7 +97,7 @@ QWebSocketDataProcessor::~QWebSocketDataProcessor() clear(); if (m_pConverterState) { delete m_pConverterState; - m_pConverterState = Q_NULLPTR; + m_pConverterState = nullptr; } } @@ -219,7 +219,7 @@ void QWebSocketDataProcessor::clear() if (m_pConverterState) { if ((m_pConverterState->remainingChars != 0) || (m_pConverterState->invalidChars != 0)) { delete m_pConverterState; - m_pConverterState = Q_NULLPTR; + m_pConverterState = nullptr; } } if (!m_pConverterState) diff --git a/src/websockets/qwebsocketdataprocessor_p.h b/src/websockets/qwebsocketdataprocessor_p.h index 0bf0b8f..79881f8 100644 --- a/src/websockets/qwebsocketdataprocessor_p.h +++ b/src/websockets/qwebsocketdataprocessor_p.h @@ -69,7 +69,7 @@ class Q_AUTOTEST_EXPORT QWebSocketDataProcessor : public QObject Q_DISABLE_COPY(QWebSocketDataProcessor) public: - explicit QWebSocketDataProcessor(QObject *parent = Q_NULLPTR); + explicit QWebSocketDataProcessor(QObject *parent = nullptr); virtual ~QWebSocketDataProcessor(); static quint64 maxMessageSize(); diff --git a/src/websockets/qwebsocketserver.cpp b/src/websockets/qwebsocketserver.cpp index e4cfe12..be66946 100644 --- a/src/websockets/qwebsocketserver.cpp +++ b/src/websockets/qwebsocketserver.cpp @@ -354,7 +354,7 @@ int QWebSocketServer::maxPendingConnections() const QWebSocketServer does not take ownership of the returned QWebSocket object. It is up to the caller to delete the object explicitly when it will no longer be used, otherwise a memory leak will occur. - Q_NULLPTR is returned if this function is called when there are no pending connections. + nullptr is returned if this function is called when there are no pending connections. Note: The returned QWebSocket object cannot be used from another thread. diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h index f846290..8a78c57 100644 --- a/src/websockets/qwebsocketserver.h +++ b/src/websockets/qwebsocketserver.h @@ -76,7 +76,7 @@ public: }; explicit QWebSocketServer(const QString &serverName, SslMode secureMode, - QObject *parent = Q_NULLPTR); + QObject *parent = nullptr); virtual ~QWebSocketServer(); bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port = 0); diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp index b7972b0..13f86de 100644 --- a/src/websockets/qwebsocketserver_p.cpp +++ b/src/websockets/qwebsocketserver_p.cpp @@ -69,7 +69,7 @@ QWebSocketServerPrivate::QWebSocketServerPrivate(const QString &serverName, QWebSocketServer * const pWebSocketServer) : QObjectPrivate(), q_ptr(pWebSocketServer), - m_pTcpServer(Q_NULLPTR), + m_pTcpServer(nullptr), m_serverName(serverName), m_secureMode(secureMode), m_pendingConnections(), @@ -211,7 +211,7 @@ void QWebSocketServerPrivate::setErrorFromSocketError(QAbstractSocket::SocketErr */ QWebSocket *QWebSocketServerPrivate::nextPendingConnection() { - QWebSocket *pWebSocket = Q_NULLPTR; + QWebSocket *pWebSocket = nullptr; if (Q_LIKELY(!m_pendingConnections.isEmpty())) pWebSocket = m_pendingConnections.dequeue(); return pWebSocket; -- cgit v1.2.1