diff options
Diffstat (limited to 'src/webchannel/qwebchannel.cpp')
| -rw-r--r-- | src/webchannel/qwebchannel.cpp | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/src/webchannel/qwebchannel.cpp b/src/webchannel/qwebchannel.cpp index d0b968e..3aebb14 100644 --- a/src/webchannel/qwebchannel.cpp +++ b/src/webchannel/qwebchannel.cpp @@ -50,20 +50,6 @@ QT_BEGIN_NAMESPACE -QByteArray generateJSONMessage(const QJsonValue &id, const QJsonValue &data, bool response) -{ - QJsonObject obj; - if (response) { - obj[QStringLiteral("response")] = true; - } - obj[QStringLiteral("id")] = id; - if (!data.isNull()) { - obj[QStringLiteral("data")] = data; - } - QJsonDocument doc(obj); - return doc.toJson(QJsonDocument::Compact); -} - void QWebChannelPrivate::_q_transportDestroyed(QObject *object) { const int idx = transports.indexOf(static_cast<QWebChannelAbstractTransport*>(object)); @@ -144,7 +130,7 @@ void QWebChannel::connectTo(QWebChannelAbstractTransport *transport) Q_ASSERT(transport); if (!d->transports.contains(transport)) { d->transports << transport; - connect(transport, &QWebChannelAbstractTransport::textMessageReceived, + connect(transport, &QWebChannelAbstractTransport::messageReceived, d->publisher, &QMetaObjectPublisher::handleMessage, Qt::UniqueConnection); connect(transport, SIGNAL(destroyed(QObject*)), @@ -162,21 +148,6 @@ void QWebChannel::disconnectFrom(QWebChannelAbstractTransport *transport) } } -void QWebChannel::sendMessage(const QJsonValue &id, const QJsonValue &data) const -{ - Q_D(const QWebChannel); - if (d->transports.isEmpty()) { - qWarning("QWebChannel is not connected to any transports, cannot send messages."); - return; - } - - const QByteArray &message = generateJSONMessage(id, data, false); - const QString &messageText = QString::fromUtf8(message); - foreach (QWebChannelAbstractTransport *transport, d->transports) { - transport->sendTextMessage(messageText); - } -} - QT_END_NAMESPACE #include "moc_qwebchannel.cpp" |