diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/webchannel/qmlwebchannel.h | 8 | ||||
-rw-r--r-- | src/webchannel/qwebchannel.cpp | 4 | ||||
-rw-r--r-- | src/webchannel/qwebchannel.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/imports/webchannel/qmlwebchannel.h b/src/imports/webchannel/qmlwebchannel.h index 00fd4e6..d5adf1d 100644 --- a/src/imports/webchannel/qmlwebchannel.h +++ b/src/imports/webchannel/qmlwebchannel.h @@ -65,7 +65,7 @@ public: explicit QmlWebChannel(QObject *parent = 0); virtual ~QmlWebChannel(); - Q_INVOKABLE void registerObjects(const QVariantMap& objects); + Q_INVOKABLE void registerObjects(const QVariantMap &objects); QQmlListProperty<QObject> registeredObjects(); QQmlListProperty<QWebChannelTransportInterface> transports(); @@ -73,7 +73,7 @@ public: // TODO: remove this by replacing QML with C++ tests Q_INVOKABLE bool test_clientIsIdle() const; - static QmlWebChannelAttached* qmlAttachedProperties(QObject *obj); + static QmlWebChannelAttached *qmlAttachedProperties(QObject *obj); Q_INVOKABLE void connectTo(QObject *transport); Q_INVOKABLE void disconnectFrom(QObject *transport); @@ -83,12 +83,12 @@ private slots: void transportDestroyed(QObject *transport); private: - static void registeredObjects_append(QQmlListProperty<QObject> *prop, QObject* item); + static void registeredObjects_append(QQmlListProperty<QObject> *prop, QObject *item); static int registeredObjects_count(QQmlListProperty<QObject> *prop); static QObject *registeredObjects_at(QQmlListProperty<QObject> *prop, int index); static void registeredObjects_clear(QQmlListProperty<QObject> *prop); - static void transports_append(QQmlListProperty<QWebChannelTransportInterface> *prop, QWebChannelTransportInterface* item); + static void transports_append(QQmlListProperty<QWebChannelTransportInterface> *prop, QWebChannelTransportInterface *item); static int transports_count(QQmlListProperty<QWebChannelTransportInterface> *prop); static QWebChannelTransportInterface *transports_at(QQmlListProperty<QWebChannelTransportInterface> *prop, int index); static void transports_clear(QQmlListProperty<QWebChannelTransportInterface> *prop); diff --git a/src/webchannel/qwebchannel.cpp b/src/webchannel/qwebchannel.cpp index a080aae..5e8e320 100644 --- a/src/webchannel/qwebchannel.cpp +++ b/src/webchannel/qwebchannel.cpp @@ -136,12 +136,12 @@ void QWebChannel::disconnectFrom(QWebChannelTransportInterface *transport) } } -void QWebChannel::respond(const QJsonValue& messageId, const QJsonValue& data) const +void QWebChannel::respond(const QJsonValue &messageId, const QJsonValue &data) const { d->sendJSONMessage(messageId, data, true); } -void QWebChannel::sendMessage(const QJsonValue& id, const QJsonValue& data) const +void QWebChannel::sendMessage(const QJsonValue &id, const QJsonValue &data) const { d->sendJSONMessage(id, data, false); } diff --git a/src/webchannel/qwebchannel.h b/src/webchannel/qwebchannel.h index 9e30152..9139a15 100644 --- a/src/webchannel/qwebchannel.h +++ b/src/webchannel/qwebchannel.h @@ -96,8 +96,8 @@ signals: void blockUpdatesChanged(bool block); public slots: - void sendMessage(const QJsonValue& id, const QJsonValue& data = QJsonValue()) const; - void respond(const QJsonValue& messageId, const QJsonValue& data = QJsonValue()) const; + void sendMessage(const QJsonValue &id, const QJsonValue &data = QJsonValue()) const; + void respond(const QJsonValue &messageId, const QJsonValue &data = QJsonValue()) const; private: QScopedPointer<QWebChannelPrivate> d; |