X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fwm-client.cpp;h=25420163539562768cd55ac5680571cb5ea1c792;hb=be2a72a0759f50e0f76b45382772ed039a60e44f;hp=380c841a2f2e453ed15fdde176d3f8aeaba8ed0a;hpb=962293365db4ea2e11878c205e452844827338ab;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/wm-client.cpp b/src/wm-client.cpp
index 380c841..2542016 100644
--- a/src/wm-client.cpp
+++ b/src/wm-client.cpp
@@ -26,31 +26,30 @@ using std::vector;
 namespace wm
 {
 
-const vector<string> wm_events = {
+const vector<string> kWMEvents = {
     // Private event for applications
     "syncDraw", "flushDraw", "visible", "invisible", "active", "inactive", "error"};
-const vector<string> error_description = {
+const vector<string> kErrorDescription = {
     "unknown-error"};
 
-static const char key_drawing_name[] = "drawing_name";
-static const char key_role[] = "role";
-static const char key_err[] = "error";
-static const char key_err_desc[] = "error_description";
+static const char kKeyDrawingName[] = "drawing_name";
+static const char kKeyrole[] = "role";
+static const char kKeyError[] = "error";
+static const char kKeyErrorDesc[] = "kErrorDescription";
 
 WMClient::WMClient(const string &appid, unsigned layerID, unsigned surfaceID, const string &role)
-    : layer(layerID),
-      id(appid),
+    : id(appid), layer(layerID),
       role2surface(0)
 {
     role2surface[role] = surfaceID;
-    for (auto x : wm_events)
+    for (auto x : kWMEvents)
     {
 #if GTEST_ENABLED
         string ev = x;
 #else
         afb_event ev = afb_daemon_make_event(x.c_str());
 #endif
-        event_list[x] = ev;
+        event2list[x] = ev;
     }
 }
 
@@ -58,17 +57,17 @@ WMClient::WMClient(const string &appid, const string &role)
     : id(appid),
       layer(0),
       role2surface(0),
-      event_list(0)
+      event2list(0)
 {
     role2surface[role] = INVALID_SURFACE_ID;
-    for (auto x : wm_events)
+    for (auto x : kWMEvents)
     {
 #if GTEST_ENABLED
         string ev = x;
 #else
         afb_event ev = afb_daemon_make_event(x.c_str());
 #endif
-        event_list[x] = ev;
+        event2list[x] = ev;
     }
 }
 
@@ -76,24 +75,24 @@ WMClient::~WMClient()
 {
 }
 
-string WMClient::appID()
+string WMClient::appID() const
 {
     return this->id;
 }
 
-unsigned WMClient::surfaceID(const string &role)
+unsigned WMClient::surfaceID(const string &role) const
 {
-    if (0 == role2surface.count(role))
+    if (0 == this->role2surface.count(role))
     {
         HMI_WARNING("wm", "invalid role");
         return INVALID_SURFACE_ID;
     }
-    return role2surface.at(role);
+    return this->role2surface.at(role);
 }
 
-unsigned WMClient::layerID()
+unsigned WMClient::layerID() const
 {
-    return layer;
+    return this->layer;
 }
 
 void WMClient::registerLayer(unsigned layerID)
@@ -104,22 +103,22 @@ void WMClient::registerLayer(unsigned layerID)
 bool WMClient::addSurface(const string &role, unsigned surface)
 {
     HMI_DEBUG("wm", "Add role %s with surface %d", role.c_str(), surface);
-    if (0 != role2surface.count(role))
+    if (0 != this->role2surface.count(role))
     {
-        HMI_NOTICE("wm", "override surfaceID %d with %d", role2surface[role], surface);
+        HMI_NOTICE("wm", "override surfaceID %d with %d", this->role2surface[role], surface);
     }
-    role2surface[role] = surface;
+    this->role2surface[role] = surface;
     return true;
 }
 
 bool WMClient::removeSurfaceIfExist(unsigned surfaceID)
 {
     bool ret = false;
-    for (auto &x : role2surface)
+    for (auto &x : this->role2surface)
     {
         if (surfaceID == x.second)
         {
-            role2surface.erase(x.first);
+            this->role2surface.erase(x.first);
             ret = true;
             break;
         }
@@ -130,9 +129,9 @@ bool WMClient::removeSurfaceIfExist(unsigned surfaceID)
 bool WMClient::removeRole(const string &role)
 {
     bool ret = false;
-    if (role2surface.count(role) != 0)
+    if (this->role2surface.count(role) != 0)
     {
-        role2surface.erase(role);
+        this->role2surface.erase(role);
         ret = true;
     }
     return ret;
@@ -140,11 +139,11 @@ bool WMClient::removeRole(const string &role)
 
 bool WMClient::subscribe(afb_req req, const string &evname)
 {
-    if(evname != key_err){
+    if(evname != kKeyError){
         HMI_DEBUG("wm", "error is only enabeled for now");
         return false;
     }
-    int ret = afb_req_subscribe(req, event_list[evname]);
+    int ret = afb_req_subscribe(req, this->event2list[evname]);
     if (ret)
     {
         HMI_DEBUG("wm", "Failed to subscribe %s", evname.c_str());
@@ -155,16 +154,16 @@ bool WMClient::subscribe(afb_req req, const string &evname)
 
 void WMClient::emitError(WM_CLIENT_ERROR_EVENT ev)
 {
-    if (!afb_event_is_valid(this->event_list[key_err])){
+    if (!afb_event_is_valid(this->event2list[kKeyError])){
         HMI_ERROR("wm", "event err is not valid");
         return;
     }
     json_object *j = json_object_new_object();
-    json_object_object_add(j, key_err, json_object_new_int(ev));
-    json_object_object_add(j, key_err_desc, json_object_new_string(error_description[ev].c_str()));
-    HMI_DEBUG("wm", "error: %d, description:%s", ev, error_description[ev].c_str());
+    json_object_object_add(j, kKeyError, json_object_new_int(ev));
+    json_object_object_add(j, kKeyErrorDesc, json_object_new_string(kErrorDescription[ev].c_str()));
+    HMI_DEBUG("wm", "error: %d, description:%s", ev, kErrorDescription[ev].c_str());
 
-    int ret = afb_event_push(this->event_list[key_err], j);
+    int ret = afb_event_push(this->event2list[kKeyError], j);
     if (ret != 0)
     {
         HMI_DEBUG("wm", "afb_event_push failed: %m");
@@ -175,7 +174,7 @@ void WMClient::dumpInfo()
 {
     DUMP("APPID : %s", id.c_str());
     DUMP("  LAYER : %d", layer);
-    for (const auto &x : role2surface)
+    for (const auto &x : this->role2surface)
     {
         DUMP("  ROLE  : %s , SURFACE : %d", x.first.c_str(), x.second);
     }