diff options
author | Milian Wolff <milian.wolff@kdab.com> | 2014-07-30 12:20:08 +0200 |
---|---|---|
committer | Lutz Schönemann <lutz.schoenemann@basyskom.com> | 2014-12-08 16:02:45 +0100 |
commit | 0a43a43a166d2e2b551f543de61090637bd8b387 (patch) | |
tree | b27ead870eef7af20f3d35a717d57bd0d262a911 /src/webchannel/qmetaobjectpublisher_p.h | |
parent | e50edc952ce15f3c11f4cdfad74ec984043cb080 (diff) | |
download | qtwebchannel-0a43a43a166d2e2b551f543de61090637bd8b387.tar.gz |
Do not broadcast initialization data to all clients.
Instead, send the data as a response to the initialization request
message. This simplifies the code and makes it more predictable, as we
do not spam all clients with initialization broadcasts anymore.
Note that the pending initialization "feature" is removed, but I don't
see a need for it anymore. If you want to delay client initialization,
do it on the client side.
Change-Id: I1ab71fd6c9e809ccb6085f1a3fbac3eb9b2e910b
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webchannel/qmetaobjectpublisher_p.h')
-rw-r--r-- | src/webchannel/qmetaobjectpublisher_p.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h index a7cdda7..eda17d9 100644 --- a/src/webchannel/qmetaobjectpublisher_p.h +++ b/src/webchannel/qmetaobjectpublisher_p.h @@ -108,7 +108,7 @@ public: * * Furthermore, if that was not done already, connect to their property notify signals. */ - void initializeClients(); + QJsonObject initializeClient(); /** * Go through all properties of the given object and connect to their notify signal. @@ -195,10 +195,6 @@ private: // true when no property updates should be sent, false otherwise bool blockUpdates; - // true when at least one client needs to be initialized, - // i.e. when a Qt.init came in which was not handled yet. - bool pendingInit; - // true when at least one client was initialized and thus // the property updates have been initialized and the // object info map set. |