diff options
author | Loïc Collignon <loic.collignon@iot.bzh> | 2018-07-02 17:07:51 +0200 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-12-13 14:12:02 +0100 |
commit | 6ea9af1bf19ba06e2e30fe88f247fb274751b23d (patch) | |
tree | d7311aed2241820db57fc552e03de6307c78c87b | |
parent | 52df213f2a810cc66af3c2a3ef009afe7b652d80 (diff) |
Rename method to avoid conflict with Qt's one
Each QtObject define an 'event' method, which can conflict with the
'event' method to handle events in an Application Framework meaning.
Change-Id: I0fad844bfaa8fbfc2d14cc15b1f346b6f739a643
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
-rw-r--r-- | qafbwebsocketclient.cpp | 2 | ||||
-rw-r--r-- | qafbwebsocketclient.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qafbwebsocketclient.cpp b/qafbwebsocketclient.cpp index c4eb8ae..f0f3dce 100644 --- a/qafbwebsocketclient.cpp +++ b/qafbwebsocketclient.cpp @@ -167,7 +167,7 @@ void QAfbWebsocketClient::onSocketTextReceived(QString msg) break; } case 5: // Events - emit event(arr[1].toString(), arr[2].toObject()["data"]); + emit eventReceived(arr[1].toString(), arr[2].toObject()["data"]); break; } } diff --git a/qafbwebsocketclient.h b/qafbwebsocketclient.h index 71e719d..9e97dcc 100644 --- a/qafbwebsocketclient.h +++ b/qafbwebsocketclient.h @@ -58,7 +58,7 @@ signals: void error(QAbstractSocket::SocketError); void textReceived(QString msg); void textSent(QString msg); - void event(QString eventName, const QJsonValue& data); + void eventReceived(QString eventName, const QJsonValue& data); private: int m_nextCallId; |