From 4e1f6616b5ce24022f088943912e4b98e7764100 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Mon, 30 Oct 2017 15:38:04 +0900 Subject: Change namespace name to generic name The name of namespace "genivi" was used. This is not generic, so changed it to "compositor". Conflicts: src/app.cpp Change-Id: Ie088e5d404e1981f7bc149abbc20e900bea8ec2d Signed-off-by: Kazumasa Mitsunari --- src/layers.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/layers.cpp') diff --git a/src/layers.cpp b/src/layers.cpp index fe95495..e37160c 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -30,10 +30,10 @@ layer::layer(nlohmann::json const &j) { this->role = j["role"]; this->name = j["name"]; this->layer_id = j["layer_id"]; - this->rect = genivi::full_rect; + this->rect = compositor::full_rect; if (j["area"]["type"] == "rect") { auto jr = j["area"]["rect"]; - this->rect = genivi::rect{ + this->rect = compositor::rect{ jr["width"], jr["height"], jr["x"], jr["y"], }; } @@ -134,7 +134,7 @@ optional layer_map::get_layer_id(std::string const &role) { } json layer::to_json() const { - auto is_full = this->rect == genivi::full_rect; + auto is_full = this->rect == compositor::full_rect; json r{}; if (is_full) { -- cgit 1.2.3-korg