app: add very c++-y layout parsing

[staging/windowmanager.git] / src / json_helper.hpp

diff --git a/src/json_helper.hpp b/src/json_helper.hpp
index 4a536d3..7d5d26f 100644 (file)
--- 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<uint32_t> const &v);
 
 #endif  // TMCAGLWM_JSON_HELPER_HPP