diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2014-07-10 00:05:28 +0200 |
|---|---|---|
| committer | Milian Wolff <milian.wolff@kdab.com> | 2014-07-29 13:58:04 +0200 |
| commit | 94912cf26ba70a2cadd23f1c931395be64c11eac (patch) | |
| tree | 28cfa1d98bbcc7eeccba6de1e3317e30add56a2f /src/webchannel/qwebchannelabstracttransport.h | |
| parent | 77a4c34bb0f3b8cc3107f9fc6be0f5f7b23bb9d6 (diff) | |
| download | qtwebchannel-94912cf26ba70a2cadd23f1c931395be64c11eac.tar.gz | |
Refactor and streamline API and IPC protocol.
This patch removes the obsolete API support to send raw messages using
a QWebChannel. Instead, it is encouraged to directly use WebSockets or
navigator.qt.
By doing so, we can cleanup the code considerably. While at it, the
transport API is adapted to work on QJsonObject messages, instead of
QStrings. This will allow us to use more efficient formats in e.g.
QtWebKit or QtWebEngine. One could also implement a JSONRPC interface
using a custom transport then.
Change-Id: Ia8c125a5558507b3cbecf128a46b19fdb013f47b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'src/webchannel/qwebchannelabstracttransport.h')
| -rw-r--r-- | src/webchannel/qwebchannelabstracttransport.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/webchannel/qwebchannelabstracttransport.h b/src/webchannel/qwebchannelabstracttransport.h index 0062fab..a13851c 100644 --- a/src/webchannel/qwebchannelabstracttransport.h +++ b/src/webchannel/qwebchannelabstracttransport.h @@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE +class QJsonObject; class Q_WEBCHANNEL_EXPORT QWebChannelAbstractTransport : public QObject { Q_OBJECT @@ -58,13 +59,13 @@ public Q_SLOTS: /** * Send a text @p message to the remote client. */ - virtual void sendTextMessage(const QString &message) = 0; + virtual void sendMessage(const QJsonObject &message) = 0; Q_SIGNALS: /** * Emitted when a new text message was received from the remote client. */ - void textMessageReceived(const QString &message); + void messageReceived(const QJsonObject &message, QWebChannelAbstractTransport *transport); }; QT_END_NAMESPACE |