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/json_helper.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/json_helper.cpp') diff --git a/src/json_helper.cpp b/src/json_helper.cpp index 179c8cc..8c4274d 100644 --- a/src/json_helper.cpp +++ b/src/json_helper.cpp @@ -18,7 +18,7 @@ #include -json_object *to_json(genivi::surface_properties const &s) { +json_object *to_json(compositor::surface_properties const &s) { // auto j = json::object({ auto j = json_object_new_object(); @@ -70,7 +70,7 @@ json_object *to_json(genivi::surface_properties const &s) { return j; } -json_object *to_json(genivi::screen const *s) { +json_object *to_json(compositor::screen const *s) { auto o = json_object_new_object(); json_object_object_add(o, "id", json_object_new_int(s->id)); return o; @@ -89,7 +89,7 @@ json_object *to_json_(T const &s) { return a; } -json_object *to_json(genivi::controller::props_map const &s) { +json_object *to_json(compositor::controller::props_map const &s) { return to_json_(s); } -- cgit 1.2.3-korg