diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:38:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:38:57 +0200 |
| commit | ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b (patch) | |
| tree | 3379cee43d6acae95312e51e6cd05c3c4198a95e /examples/webchannel/shared/websockettransport.h | |
| parent | 749951c19cbb7d301bed20f24d16dd4e713485c2 (diff) | |
| parent | d84318e98aa3cbac11b4f95b3581e95aab96a34a (diff) | |
| download | qtwebchannel-ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2v5.10.0-beta1
Change-Id: I54f0bcd46ffb496156e46d723275cdd29601e45c
Diffstat (limited to 'examples/webchannel/shared/websockettransport.h')
| -rw-r--r-- | examples/webchannel/shared/websockettransport.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/examples/webchannel/shared/websockettransport.h b/examples/webchannel/shared/websockettransport.h index 44cb92e..252eaeb 100644 --- a/examples/webchannel/shared/websockettransport.h +++ b/examples/webchannel/shared/websockettransport.h @@ -51,11 +51,12 @@ #ifndef WEBSOCKETTRANSPORT_H #define WEBSOCKETTRANSPORT_H -#include <QtWebChannel/QWebChannelAbstractTransport> +#include <QWebChannelAbstractTransport> QT_BEGIN_NAMESPACE - class QWebSocket; +QT_END_NAMESPACE + class WebSocketTransport : public QWebChannelAbstractTransport { Q_OBJECT @@ -63,15 +64,13 @@ public: explicit WebSocketTransport(QWebSocket *socket); virtual ~WebSocketTransport(); - void sendMessage(const QJsonObject &message) Q_DECL_OVERRIDE; + void sendMessage(const QJsonObject &message) override; -private Q_SLOTS: +private slots: void textMessageReceived(const QString &message); private: QWebSocket *m_socket; }; -QT_END_NAMESPACE - #endif // WEBSOCKETTRANSPORT_H |