Modify member variable name

Change-Id: Ic9100cfc33c664d3dfa935c4c7131efd8dd2f1f7
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>

1 files changed, 30 insertions, 30 deletions

diff --git a/src/app.cpp b/src/app.cpp
index 4f7a971..4fbf639 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -122,13 +122,13 @@ void App::updateCarStates(json_object* json_out) {
 
         // Update state and emit event
         if ("parking_brake_off" == parking_brake_state) {
-            this->crr_car_info_.parking_brake_stt = false;
+            this->crr_car_info.parking_brake_stt = false;
 #if 0 // FOR ALS: using lightstatus brake, so do not emit parking brake event
             this->emitParkingBrakeOff();
 #endif
         }
         else if ("parking_brake_on" == parking_brake_state) {
-            this->crr_car_info_.parking_brake_stt = true;
+            this->crr_car_info.parking_brake_stt = true;
 #if 0 // FOR ALS: using lightstatus brake, so do not emit parking brake event
             this->emitParkingBrakeOn();
 #endif
@@ -153,10 +153,10 @@ void App::updateCarStates(json_object* json_out) {
 
         // Update state
         if ("accel_pedal_off" == accel_pedal_state) {
-            this->crr_car_info_.accel_pedal_stt = false;
+            this->crr_car_info.accel_pedal_stt = false;
         }
         else if ("accel_pedal_on" == accel_pedal_state) {
-            this->crr_car_info_.accel_pedal_stt = true;
+            this->crr_car_info.accel_pedal_stt = true;
         }
         else {
             HMI_DEBUG("wm", "Unknown accel pedal state");
@@ -178,11 +178,11 @@ void App::updateCarStates(json_object* json_out) {
 
         // Update state and emit event
         if ("lightstatus_brake_off" == lightstatus_brake_state) {
-            this->crr_car_info_.lightstatus_brake_stt = false;
+            this->crr_car_info.lightstatus_brake_stt = false;
             this->emitLightstatusBrakeOff();
         }
         else if ("lightstatus_brake_on" == lightstatus_brake_state) {
-            this->crr_car_info_.lightstatus_brake_stt = true;
+            this->crr_car_info.lightstatus_brake_stt = true;
             this->emitLightstatusBrakeOn();
         }
         else {
@@ -205,11 +205,11 @@ void App::updateCarStates(json_object* json_out) {
 
         // Emit car event
         if ("car_stop" == car_state) {
-            this->crr_car_info_.car_stt = "stop";
+            this->crr_car_info.car_stt = "stop";
             this->emitCarStop();
         }
         else if ("car_run" == car_state) {
-            this->crr_car_info_.car_stt = "run";
+            this->crr_car_info.car_stt = "run";
             this->emitCarRun();
         }
         else {
@@ -232,11 +232,11 @@ void App::updateCarStates(json_object* json_out) {
 
         // Update state and emit event
         if ("lamp_off" == lamp_state) {
-            this->crr_car_info_.headlamp_stt = false;
+            this->crr_car_info.headlamp_stt = false;
             this->emitHeadlampOff();
         }
         else if ("lamp_on" == lamp_state) {
-            this->crr_car_info_.headlamp_stt = true;
+            this->crr_car_info.headlamp_stt = true;
             this->emitHeadlampOn();
         }
         else {
@@ -365,11 +365,11 @@ App::App(wl::display *d)
    }
 
    // Initialize current car info
-   this->crr_car_info_.parking_brake_stt = true;
-   this->crr_car_info_.accel_pedal_stt = false;
-   this->crr_car_info_.accel_pedal_pos = 0;
-   this->crr_car_info_.car_stt = "stop";
-   this->crr_car_info_.headlamp_stt = false;
+   this->crr_car_info.parking_brake_stt = true;
+   this->crr_car_info.accel_pedal_stt = false;
+   this->crr_car_info.accel_pedal_pos = 0;
+   this->crr_car_info.car_stt = "stop";
+   this->crr_car_info.headlamp_stt = false;
 }
 
 int App::init() {
@@ -391,16 +391,16 @@ int App::init() {
 #endif
 
    // Initialize PolicyManager
-   this->pm_.initialize();
+   this->pm.initialize();
 
    // Register callback to PolicyManager
    PolicyManager::CallbackTable callback;
    callback.onStateTransitioned = rm::onStateTransitioned;
    callback.onError = rm::onError;
-   this->pm_.registerCallback(callback);
+   this->pm.registerCallback(callback);
 
    // Initialize LayoutManager
-   this->lm_.initialize();
+   this->lm.initialize();
 
    // Make afb event
    for (int i=Event_Val_Min; i<=Event_Val_Max; i++) {
@@ -525,9 +525,9 @@ void App::layout_commit() {
 const char* App::convertDrawingNameToRole(char const *drawing_name) {
     const char* role;
 
-    if (this->drawingname2role_.find(drawing_name) != this->drawingname2role_.end()) {
+    if (this->drawingname2role.find(drawing_name) != this->drawingname2role.end()) {
         // drawing_name is old role. So convert to new role.
-        role = this->drawingname2role_[drawing_name].c_str();
+        role = this->drawingname2role[drawing_name].c_str();
     }
     else {
         // drawing_name is new role.
@@ -599,10 +599,10 @@ void App::allocateWindowResource(char const *event, char const *drawing_name,
     }
 
     // Set input event data
-    this->pm_.setInputEventData(json_in);
+    this->pm.setInputEventData(json_in);
 
     // Execute state transition
-    this->pm_.executeStateTransition();
+    this->pm.executeStateTransition();
 
     // Release json_object
     json_object_put(json_in);
@@ -832,7 +832,7 @@ result<int> App::api_request_surface(char const *drawing_name) {
       }
 
       // Set map of (role, drawing_name)
-      this->role2drawingname_[role] = std::string(drawing_name);
+      this->role2drawingname[role] = std::string(drawing_name);
 
       return Ok<int>(id);
    }
@@ -1021,7 +1021,7 @@ void App::deactivate(std::string role) {
       HMI_ERROR("wm", "Surface does not exist");
       return;
     }
-    std::string drawing_name = this->role2drawingname_[role];
+    std::string drawing_name = this->role2drawingname[role];
     HMI_DEBUG("wm", "Deactivate role:%s (drawing_name:%s)",
               role.c_str(), drawing_name.c_str());
 
@@ -1059,7 +1059,7 @@ void App::setSurfaceSize(const char* role, const char* area) {
     HMI_DEBUG("wm", "role:%s area:%s", role, area);
 
     // Get size of current area
-    compositor::rect size = this->lm_.getAreaSize(area);
+    compositor::rect size = this->lm.getAreaSize(area);
 
     // Set destination to the display rectangle
     auto const &surface_id = this->lookup_id(role);
@@ -1081,7 +1081,7 @@ void App::setSurfaceSize(const char* role, const char* area) {
               size.x, size.y, size.w, size.h);
 
     // Emit syncDraw event
-    const char* drawing_name = this->role2drawingname_[role].c_str();
+    const char* drawing_name = this->role2drawingname[role].c_str();
     this->emit_syncdraw(drawing_name, area,
                         size.x, size.y, size.w, size.h);
 
@@ -1090,7 +1090,7 @@ void App::setSurfaceSize(const char* role, const char* area) {
 }
 
 void App::setAccelPedalPos(double val) {
-    this->crr_car_info_.accel_pedal_pos = val;
+    this->crr_car_info.accel_pedal_pos = val;
 }
 
 extern const char* kDefaultAppDb;
@@ -1148,12 +1148,12 @@ int App::loadAppDb() {
         }
         HMI_DEBUG("wm", "> role:%s", role);
 
-        this->drawingname2role_[app] = std::string(role);
+        this->drawingname2role[app] = std::string(role);
     }
 
     // Check
-    for(auto itr = this->drawingname2role_.begin();
-      itr != this->drawingname2role_.end(); ++itr) {
+    for(auto itr = this->drawingname2role.begin();
+      itr != this->drawingname2role.end(); ++itr) {
         HMI_DEBUG("wm", "app:%s role:%s",
                   itr->first.c_str(), itr->second.c_str());
     }