diff options
author | Pierre Rossi <pierre.rossi@digia.com> | 2014-06-26 15:08:01 +0200 |
---|---|---|
committer | Milian Wolff <milian.wolff@kdab.com> | 2014-06-26 15:32:55 +0200 |
commit | 6e2b5470dd1606c23ddf237d1b471530280e842c (patch) | |
tree | 13b8c03f4b8a77bf145e3d14136d915468567e48 /src | |
parent | 48e814442e6e8507aacd16362b44d5754c059228 (diff) | |
download | qtwebchannel-6e2b5470dd1606c23ddf237d1b471530280e842c.tar.gz |
Fix public headers for use with QT_NO_KEYWORDS
QtWebEngineCore has to build that way, so we better make sure the
two can play nicely together.
Change-Id: Ibab5a2d042b3c8ea230922aeca6768ffec2ca452
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/webchannel/qmlwebchannel.h | 2 | ||||
-rw-r--r-- | src/imports/webchannel/qmlwebchannelattached.h | 2 | ||||
-rw-r--r-- | src/imports/webchannel/qmlwebviewtransport.h | 4 | ||||
-rw-r--r-- | src/webchannel/qmetaobjectpublisher_p.h | 2 | ||||
-rw-r--r-- | src/webchannel/qwebchannel.h | 4 | ||||
-rw-r--r-- | src/webchannel/qwebsockettransport_p.h | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/webchannel/qmlwebchannel.h b/src/imports/webchannel/qmlwebchannel.h index d5adf1d..3610307 100644 --- a/src/imports/webchannel/qmlwebchannel.h +++ b/src/imports/webchannel/qmlwebchannel.h @@ -78,7 +78,7 @@ public: Q_INVOKABLE void connectTo(QObject *transport); Q_INVOKABLE void disconnectFrom(QObject *transport); -private slots: +private Q_SLOTS: void objectIdChanged(const QString &newId); void transportDestroyed(QObject *transport); diff --git a/src/imports/webchannel/qmlwebchannelattached.h b/src/imports/webchannel/qmlwebchannelattached.h index 6a0d191..3d60122 100644 --- a/src/imports/webchannel/qmlwebchannelattached.h +++ b/src/imports/webchannel/qmlwebchannelattached.h @@ -58,7 +58,7 @@ public: QString id() const; void setId(const QString &id); -signals: +Q_SIGNALS: void idChanged(const QString &id); private: diff --git a/src/imports/webchannel/qmlwebviewtransport.h b/src/imports/webchannel/qmlwebviewtransport.h index bb1e27e..8fbfdd9 100644 --- a/src/imports/webchannel/qmlwebviewtransport.h +++ b/src/imports/webchannel/qmlwebviewtransport.h @@ -62,11 +62,11 @@ public: void setWebViewExperimental(QObject *webViewExperimental); QObject *webViewExperimental() const; -signals: +Q_SIGNALS: void webViewChanged(QObject *webViewExperimental); void messageReceived(const QString &message); -private slots: +private Q_SLOTS: void handleWebViewMessage(const QVariantMap &message); private: diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h index 4413df4..49b3ed0 100644 --- a/src/webchannel/qmetaobjectpublisher_p.h +++ b/src/webchannel/qmetaobjectpublisher_p.h @@ -166,7 +166,7 @@ public: */ void handleMessage(const QString &message, QWebChannelTransportInterface* transport, int clientId) Q_DECL_OVERRIDE; -signals: +Q_SIGNALS: void blockUpdatesChanged(bool block); protected: diff --git a/src/webchannel/qwebchannel.h b/src/webchannel/qwebchannel.h index ec3f72b..76e77b8 100644 --- a/src/webchannel/qwebchannel.h +++ b/src/webchannel/qwebchannel.h @@ -92,10 +92,10 @@ public: void connectTo(QWebChannelTransportInterface *transport); void disconnectFrom(QWebChannelTransportInterface *transport); -signals: +Q_SIGNALS: void blockUpdatesChanged(bool block); -public slots: +public Q_SLOTS: void sendMessage(const QJsonValue &id, const QJsonValue &data = QJsonValue()) const; private: diff --git a/src/webchannel/qwebsockettransport_p.h b/src/webchannel/qwebsockettransport_p.h index 95a431d..b9bd9b0 100644 --- a/src/webchannel/qwebsockettransport_p.h +++ b/src/webchannel/qwebsockettransport_p.h @@ -67,13 +67,13 @@ public: void initLater(); void sendMessage(const QString &message, int clientId); -signals: +Q_SIGNALS: void failed(const QString &reason); void initialized(); void baseUrlChanged(const QString &baseUrl); void textDataReceived(const QString &message); -private slots: +private Q_SLOTS: void validateNewConnection(); void init(); void socketError(); |