From f0d9414627149fe5a2b055e7459619a4fff84da6 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Thu, 4 Oct 2018 10:39:37 +0900 Subject: Clean: Remove split_layout structure split_layout is not used anymore. Change-Id: Iff24ebb4e827aee28394deb3aa55c96692cd0cc6 Signed-off-by: Kazumasa Mitsunari --- src/layers.cpp | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) (limited to 'src/layers.cpp') diff --git a/src/layers.cpp b/src/layers.cpp index bbe7c09..b7a0fa2 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -31,35 +31,7 @@ layer::layer(nlohmann::json const &j) this->name = j["name"]; this->layer_id = j["layer_id"]; - // Init flag of normal layout only - this->is_normal_layout_only = true; - - auto split_layouts = j.find("split_layouts"); - if (split_layouts != j.end()) - { - - // Clear flag of normal layout only - this->is_normal_layout_only = false; - - auto &sls = j["split_layouts"]; - // this->layouts.reserve(sls.size()); - std::transform(std::cbegin(sls), std::cend(sls), - std::back_inserter(this->layouts), [this](json const &sl) { - struct split_layout l - { - sl["name"], sl["main_match"], sl["sub_match"] - }; - HMI_DEBUG("wm", - "layer %d add split_layout \"%s\" (main: \"%s\") (sub: " - "\"%s\")", - this->layer_id, - l.name.c_str(), l.main_match.c_str(), - l.sub_match.c_str()); - return l; - }); - } - HMI_DEBUG("wm", "layer_id:%d is_normal_layout_only:%d\n", - this->layer_id, this->is_normal_layout_only); + HMI_DEBUG("wm", "layer_id:%d name:%s", this->layer_id, this->name.c_str()); } struct result to_layer_map(nlohmann::json const &j) -- cgit 1.2.3-korg