diff options
| -rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocket.cpp | 2 | ||||
| -rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocketserver.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp index c5685f6..51a84cf 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp @@ -214,7 +214,7 @@ void QQmlWebSocket::setSocket(QWebSocket *socket) m_webSocket.reset(socket); if (m_webSocket) { // explicit ownership via QScopedPointer - m_webSocket->setParent(Q_NULLPTR); + m_webSocket->setParent(nullptr); connect(m_webSocket.data(), &QWebSocket::textMessageReceived, this, &QQmlWebSocket::textMessageReceived); connect(m_webSocket.data(), &QWebSocket::binaryMessageReceived, diff --git a/src/imports/qmlwebsockets/qqmlwebsocketserver.h b/src/imports/qmlwebsockets/qqmlwebsocketserver.h index 69c3910..0bc2028 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocketserver.h +++ b/src/imports/qmlwebsockets/qqmlwebsocketserver.h @@ -28,7 +28,7 @@ class QQmlWebSocketServer : public QObject, public QQmlParserStatus Q_PROPERTY(bool accept READ accept WRITE setAccept NOTIFY acceptChanged) public: - explicit QQmlWebSocketServer(QObject *parent = Q_NULLPTR); + explicit QQmlWebSocketServer(QObject *parent = nullptr); ~QQmlWebSocketServer() override; void classBegin() override; |