From: Loïc Collignon <loic.collignon@iot.bzh>
Date: Mon, 2 Jul 2018 15:07:51 +0000 (+0200)
Subject: Rename method to avoid conflict with Qt's one
X-Git-Tag: flounder/5.99.2~8
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F14941%2F1;p=apps%2Fapp-afb-helpers-submodule.git

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>
---

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;