summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Collignon <loic.collignon@iot.bzh>2018-07-02 17:07:51 +0200
committerLoïc Collignon <loic.collignon@iot.bzh>2018-07-02 17:07:51 +0200
commit5bec8c5045c0247f1b4e06b4e159285b110a5b57 (patch)
treed7311aed2241820db57fc552e03de6307c78c87b
parent43ec9716bf83d8a6e5ff15909705cb1adc3c1892 (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.cpp2
-rw-r--r--qafbwebsocketclient.h2
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;