Change local variable name
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>
Sat, 8 Sep 2018 04:14:24 +0000 (13:14 +0900)
committerKazumasa Mitsunari <knimitz@witz-inc.co.jp>
Sat, 8 Sep 2018 05:02:03 +0000 (14:02 +0900)
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
src/wm_layer.cpp
src/wm_layer.hpp

index 7f8dbd9..1948b61 100644 (file)
@@ -82,7 +82,7 @@ void LayerState::setArea(const string& app, const string& area)
     this->area2appid[area] = app;
 }
 
-WMLayer::WMLayer(json_object* j) : before_state(), state()
+WMLayer::WMLayer(json_object* j) : tmp_state(), state()
 {
     this->name = jh::getStringFromJson(j, "name");
     this->role_list = jh::getStringFromJson(j, "role");
@@ -162,7 +162,7 @@ const string& WMLayer::layerName()
 
 WMError WMLayer::setLayerState(const LayerState& l)
 {
-    this->before_state = l;
+    this->tmp_state = l;
     return WMError::SUCCESS;
 }
 
@@ -205,12 +205,12 @@ bool WMLayer::hasRole(const string& role)
 
 /* WMError WMLayer::commitChange()
 {
-    this->state = this->before_state;
+    this->state = this->tmp_state;
 }
 
 void WMLayer::undo()
 {
-    this->before_state = this->state;
+    this->tmp_state = this->state;
 }
  */
 } // namespace wm
index 1cb54ee..b14be46 100644 (file)
@@ -65,12 +65,12 @@ class WMLayer
     MANAGEMENT_TYPE    layerType() { return this->type; }
     void appendArea(const std::string& area);
     void removeLayerID(unsigned id);
-    LayerState& getLayerState() { return before_state; }
+    LayerState& getLayerState() { return tmp_state; }
     WMError setLayerState(const LayerState& l);
     bool hasLayerID(unsigned id);
     bool hasRole(const std::string& role);
   private:
-    LayerState before_state;
+    LayerState tmp_state;
     LayerState state;
     std::string name = ""; // Layer name
     MANAGEMENT_TYPE type;