X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fjson_helper.cpp;h=193a1872946c419407bc27e13d86acd5eba41ba5;hb=5d05965a888976ee4b8cf65e25c01bbff8769b3c;hp=179c8cc483c660f0fbf21ae27b630a6ab7a8c0e8;hpb=074d058a7a483a66af7f8c0b928b321ad483f47c;p=apps%2Fagl-service-windowmanager-2017.git diff --git a/src/json_helper.cpp b/src/json_helper.cpp index 179c8cc..193a187 100644 --- a/src/json_helper.cpp +++ b/src/json_helper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH + * Copyright (c) 2017 TOYOTA MOTOR CORPORATION * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -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); }