From 0c673801b78c98fe116b4d14bf37fb18f8b749dc Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Mon, 10 Jul 2017 10:44:29 +0200 Subject: Track surface/layer properties with one struct As both share the exact same properties this makes sense, we now can write code once and work on both layer and surface properties. This however is only relevant in the wayland "level" of things, as in WM semantics layers are always fullscreen. Signed-off-by: Marcus Fritzsch --- src/json_helper.hpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/json_helper.hpp') diff --git a/src/json_helper.hpp b/src/json_helper.hpp index 4a536d3..7d5d26f 100644 --- a/src/json_helper.hpp +++ b/src/json_helper.hpp @@ -5,12 +5,8 @@ struct json_object; -json_object *to_json(genivi::surface const *s); -json_object *to_json(genivi::layer const *l); json_object *to_json(genivi::screen const *s); -json_object *to_json(genivi::controller::surface_map_type const &s); -json_object *to_json(genivi::controller::layer_map_type const &l); -json_object *to_json(genivi::controller::screen_map_type const &s); +json_object *to_json(genivi::controller::props_map const &s); json_object *to_json(std::vector const &v); #endif // TMCAGLWM_JSON_HELPER_HPP -- cgit 1.2.3-korg