diff options
-rw-r--r-- | src/app.cpp | 10 | ||||
-rw-r--r-- | src/json_helper.hpp | 12 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/app.cpp b/src/app.cpp index 00a8211..606c167 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -36,16 +36,6 @@ App *g_app; using json = nlohmann::json; -// We ned to manually unwrap numbers -template <typename T> -result<T> get(json const &j) { - DB(j); - T r; - std::istringstream s(j.get<std::string>()); - s >> r; - return !s.eof() || s.fail() ? Err<T>("Could not read int") : Ok(r); -} - struct wm::area area_from_json(json const &j) { DB(j); return wm::area{ diff --git a/src/json_helper.hpp b/src/json_helper.hpp index 7d5d26f..840a8c3 100644 --- a/src/json_helper.hpp +++ b/src/json_helper.hpp @@ -1,7 +1,9 @@ #ifndef TMCAGLWM_JSON_HELPER_HPP #define TMCAGLWM_JSON_HELPER_HPP +#include <json.hpp> #include "wayland.hpp" +#include "result.hpp" struct json_object; @@ -9,4 +11,14 @@ json_object *to_json(genivi::screen const *s); json_object *to_json(genivi::controller::props_map const &s); json_object *to_json(std::vector<uint32_t> const &v); +// We ned to manually unwrap numbers +template <typename T> +wm::result<T> get(nlohmann::json const &j) { + DB(j); + T r; + std::istringstream s(j.get<std::string>()); + s >> r; + return !s.eof() || s.fail() ? wm::Err<T>("Could not read int") : wm::Ok(r); +} + #endif // TMCAGLWM_JSON_HELPER_HPP |