1 files changed, 22 insertions, 22 deletions

diff --git a/src/policy_manager/policy_manager.cpp b/src/policy_manager/policy_manager.cpp
index 19a6a0b..448c18d 100644
--- a/src/policy_manager/policy_manager.cpp
+++ b/src/policy_manager/policy_manager.cpp
@@ -84,12 +84,12 @@ std::unordered_map<std::string, LayoutState> g_default_layouts;
 
 
 PolicyManager::PolicyManager() :
-  eventname2no_(),
-  categoryname2no_(),
-  areaname2no_(),
-  role2category_(),
-  category2role_(),
-  role2defaultarea_()
+  eventname2no(),
+  categoryname2no(),
+  areaname2no(),
+  role2category(),
+  category2role(),
+  role2defaultarea()
 {
     HMI_DEBUG("wm:pm", "Call");
 }
@@ -102,17 +102,17 @@ int PolicyManager::initialize() {
     // Create convert map
     for (int i = stm::gStmEventNoMin; i <= stm::gStmEventNoMax; i++) {
         HMI_DEBUG("wm:pm", "event name:%s no:%d", stm::gStmEventName[i], stm::gStmEventNo[i]);
-        this->eventname2no_[stm::gStmEventName[i]] = stm::gStmEventNo[i];
+        this->eventname2no[stm::gStmEventName[i]] = stm::gStmEventNo[i];
     }
 
     for (int i = stm::gStmCategoryNoMin; i <= stm::gStmCategoryNoMax; i++) {
         HMI_DEBUG("wm:pm", "category name:%s no:%d", stm::gStmCategoryName[i], stm::gStmCategoryNo[i]);
-        this->categoryname2no_[stm::gStmCategoryName[i]] = stm::gStmCategoryNo[i];
+        this->categoryname2no[stm::gStmCategoryName[i]] = stm::gStmCategoryNo[i];
     }
 
     for (int i = stm::gStmAreaNoMin; i <= stm::gStmAreaNoMax; i++) {
         HMI_DEBUG("wm:pm", "area name:%s no:%d", stm::gStmAreaName[i], stm::gStmAreaNo[i]);
-        this->areaname2no_[stm::gStmAreaName[i]] = stm::gStmAreaNo[i];
+        this->areaname2no[stm::gStmAreaName[i]] = stm::gStmAreaNo[i];
     }
 
     // Load role.db
@@ -718,7 +718,7 @@ int PolicyManager::setInputEventData(json_object* json_in) {
     int event_no = 0;
     if (nullptr != event) {
         // Convert name to number
-        event_no = this->eventname2no_[event];
+        event_no = this->eventname2no[event];
         HMI_DEBUG("wm:pm", "event(%s:%d)", event, event_no);
     }
 
@@ -729,7 +729,7 @@ int PolicyManager::setInputEventData(json_object* json_in) {
         HMI_DEBUG("wm:pm", "role(%s)", role);
 
         // Convert role to category
-        const char* category = this->role2category_[role].c_str();
+        const char* category = this->role2category[role].c_str();
         if (0 == strcmp("", category)) {
             HMI_ERROR("wm:pm", "Error!!");
             return -1;
@@ -737,7 +737,7 @@ int PolicyManager::setInputEventData(json_object* json_in) {
         HMI_DEBUG("wm:pm", "category(%s)", category);
 
         // Convert name to number
-        category_no = categoryname2no_[category];
+        category_no = categoryname2no[category];
         HMI_DEBUG("wm:pm", "role(%s), category(%s:%d)", role, category, category_no);
     }
 
@@ -746,7 +746,7 @@ int PolicyManager::setInputEventData(json_object* json_in) {
     int area_no = 0;
     if (nullptr != area) {
         // Convert name to number
-        area_no = areaname2no_[area];
+        area_no = areaname2no[area];
         HMI_DEBUG("wm:pm", "area(%s:%d)", area, area_no);
     }
 
@@ -857,26 +857,26 @@ int PolicyManager::loadRoleDb() {
             std::string role = this->deleteSpace(*itr);
             std::string area = this->deleteSpace(vct_areas[0]);
 
-            this->role2category_[role] = std::string(category);
-            this->role2defaultarea_[role] = area;
+            this->role2category[role] = std::string(category);
+            this->role2defaultarea[role] = area;
         }
 
-        this->category2role_[std::string(category)] = std::string(roles);
+        this->category2role[std::string(category)] = std::string(roles);
     }
 
     // Check
-    HMI_DEBUG("wm:pm", "Check role2category_");
-    for (auto& x:this->role2category_){
+    HMI_DEBUG("wm:pm", "Check role2category");
+    for (auto& x:this->role2category){
         HMI_DEBUG("wm:pm", "key:%s, val:%s", x.first.c_str(), x.second.c_str());
     }
 
-    HMI_DEBUG("wm:pm", "Check role2defaultarea_");
-    for (auto& x:this->role2defaultarea_){
+    HMI_DEBUG("wm:pm", "Check role2defaultarea");
+    for (auto& x:this->role2defaultarea){
         HMI_DEBUG("wm:pm", "key:%s, val:%s", x.first.c_str(), x.second.c_str());
     }
 
-    HMI_DEBUG("wm:pm", "Check category2role_");
-    for (auto& x:this->category2role_){
+    HMI_DEBUG("wm:pm", "Check category2role");
+    for (auto& x:this->category2role){
         HMI_DEBUG("wm:pm", "key:%s, val:%s", x.first.c_str(), x.second.c_str());
     }