summaryrefslogtreecommitdiffstats
path: root/src/layers.cpp
diff options
context:
space:
mode:
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>2017-10-30 15:38:04 +0900
committerKazumasa Mitsunari <knimitz@witz-inc.co.jp>2017-11-01 20:13:32 +0900
commit4e1f6616b5ce24022f088943912e4b98e7764100 (patch)
treed9a72b56e8ca1a31a5a52be97c7201bbeeae728d /src/layers.cpp
parent1ac578c061ec2640efb8b09396c824511702877d (diff)
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 <knimitz@witz-inc.co.jp>
Diffstat (limited to 'src/layers.cpp')
-rw-r--r--src/layers.cpp6
1 files changed, 3 insertions, 3 deletions
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<int> 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) {