diff options
Diffstat (limited to 'src/imports/qmlwebsockets/qqmlwebsocket.cpp')
| -rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocket.cpp | 60 |
1 files changed, 36 insertions, 24 deletions
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp index d165260..08d39f6 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp @@ -5,36 +5,28 @@ ** ** This file is part of the QtWebSockets module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information ** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -42,6 +34,7 @@ /*! \qmltype WebSocket \instantiates QQmlWebSocket + \since 5.3 \inqmlmodule Qt.WebSockets \ingroup websockets-qml @@ -120,6 +113,18 @@ QQmlWebSocket::QQmlWebSocket(QObject *parent) : { } +QQmlWebSocket::QQmlWebSocket(QWebSocket *socket, QObject *parent) : + QObject(parent), + m_status(Closed), + m_url(socket->requestUrl()), + m_isActive(true), + m_componentCompleted(true), + m_errorString(socket->errorString()) +{ + setSocket(socket); + onStateChanged(socket->state()); +} + QQmlWebSocket::~QQmlWebSocket() { } @@ -173,8 +178,19 @@ void QQmlWebSocket::classBegin() void QQmlWebSocket::componentComplete() { - m_webSocket.reset(new (std::nothrow) QWebSocket()); - if (Q_LIKELY(m_webSocket)) { + setSocket(new QWebSocket); + + m_componentCompleted = true; + + open(); +} + +void QQmlWebSocket::setSocket(QWebSocket *socket) +{ + m_webSocket.reset(socket); + if (m_webSocket) { + // explicit ownership via QScopedPointer + m_webSocket->setParent(Q_NULLPTR); connect(m_webSocket.data(), &QWebSocket::textMessageReceived, this, &QQmlWebSocket::textMessageReceived); typedef void (QWebSocket::* ErrorSignal)(QAbstractSocket::SocketError); @@ -182,10 +198,6 @@ void QQmlWebSocket::componentComplete() this, &QQmlWebSocket::onError); connect(m_webSocket.data(), &QWebSocket::stateChanged, this, &QQmlWebSocket::onStateChanged); - - m_componentCompleted = true; - - open(); } } |