From f5001e404097c3e55ed9fad207036c55d11f5c8d Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Sat, 8 Sep 2018 13:14:24 +0900 Subject: Change local variable name Signed-off-by: Kazumasa Mitsunari --- src/wm_layer.cpp | 8 ++++---- src/wm_layer.hpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wm_layer.cpp b/src/wm_layer.cpp index 7f8dbd9..1948b61 100644 --- a/src/wm_layer.cpp +++ b/src/wm_layer.cpp @@ -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 diff --git a/src/wm_layer.hpp b/src/wm_layer.hpp index 1cb54ee..b14be46 100644 --- a/src/wm_layer.hpp +++ b/src/wm_layer.hpp @@ -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; -- cgit 1.2.3-korg