From 6ea9af1bf19ba06e2e30fe88f247fb274751b23d Mon Sep 17 00:00:00 2001
From: Loïc Collignon <loic.collignon@iot.bzh>
Date: Mon, 2 Jul 2018 17:07:51 +0200
Subject: Rename method to avoid conflict with Qt's one
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
qafbwebsocketclient.cpp | 2 +-
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;
--
cgit