summaryrefslogtreecommitdiff
path: root/src/webchannel
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2014-06-26 15:08:01 +0200
committerMilian Wolff <milian.wolff@kdab.com>2014-06-26 15:32:55 +0200
commit6e2b5470dd1606c23ddf237d1b471530280e842c (patch)
tree13b8c03f4b8a77bf145e3d14136d915468567e48 /src/webchannel
parent48e814442e6e8507aacd16362b44d5754c059228 (diff)
downloadqtwebchannel-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/webchannel')
-rw-r--r--src/webchannel/qmetaobjectpublisher_p.h2
-rw-r--r--src/webchannel/qwebchannel.h4
-rw-r--r--src/webchannel/qwebsockettransport_p.h4
3 files changed, 5 insertions, 5 deletions
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();