From 64643feb50a184030a6f25ba9354d5fe41df49c8 Mon Sep 17 00:00:00 2001 From: Yuta Doi Date: Wed, 20 Jun 2018 21:17:41 +0900 Subject: Modify member variable name Change-Id: Ic9100cfc33c664d3dfa935c4c7131efd8dd2f1f7 Signed-off-by: Yuta Doi --- src/layout_manager/layout.cpp | 8 ++++---- src/layout_manager/layout.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/layout_manager') diff --git a/src/layout_manager/layout.cpp b/src/layout_manager/layout.cpp index 49381cc..a3952c4 100644 --- a/src/layout_manager/layout.cpp +++ b/src/layout_manager/layout.cpp @@ -41,7 +41,7 @@ int LayoutManager::initialize() { } compositor::rect LayoutManager::getAreaSize(const char* area) { - return this->area2size_[area]; + return this->area2size[area]; } extern const char* kDefaultLayoutDb; @@ -106,12 +106,12 @@ int LayoutManager::loadLayoutDb() { area_size.w = jh::getIntFromJson(json_rect, "w"); area_size.h = jh::getIntFromJson(json_rect, "h"); - this->area2size_[area] = area_size; + this->area2size[area] = area_size; } // Check - for(auto itr = this->area2size_.begin(); - itr != this->area2size_.end(); ++itr) { + for(auto itr = this->area2size.begin(); + itr != this->area2size.end(); ++itr) { HMI_DEBUG("wm:lm", "area:%s x:%d y:%d w:%d h:%d", itr->first.c_str(), itr->second.x, itr->second.y, itr->second.w, itr->second.h); diff --git a/src/layout_manager/layout.hpp b/src/layout_manager/layout.hpp index 648d80e..952765f 100644 --- a/src/layout_manager/layout.hpp +++ b/src/layout_manager/layout.hpp @@ -55,7 +55,7 @@ private: LayoutManager(LayoutManager &&) = delete; LayoutManager &operator=(LayoutManager &&) = delete; - std::unordered_map area2size_; + std::unordered_map area2size; int loadLayoutDb(); }; -- cgit 1.2.3-korg