Code Review
/
apps
/
agl-service-windowmanager-2017.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Enable an application re-launch
[apps/agl-service-windowmanager-2017.git]
/
src
/
json_helper.cpp
diff --git
a/src/json_helper.cpp
b/src/json_helper.cpp
index
179c8cc
..
193a187
100644
(file)
--- 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.
*
* 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.h>
#include <json.h>
-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();
// 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;
}
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;
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;
}
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);
}
return to_json_(s);
}