X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=0a216353052a46b90af65c1132be24b2fab1bd4f;hb=ef1b8f5fa4c2e939e9b6f08069ee08d362ee0ee5;hp=6a7fc69105d7701588df17e526f5d551a0f4bf1b;hpb=6e444881b679e72388f4bc76d5372f62f7f61145;p=staging%2Fwindowmanager.git diff --git a/src/app.cpp b/src/app.cpp index 6a7fc69..0a21635 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -43,12 +43,12 @@ using json = nlohmann::json; struct wm::area area_from_json(json const &j) { DB(j); return wm::area{ - j["name"].get(), + j["name"], { - get(j["width"]), get(j["height"]), - get(j["x"]), get(j["y"]), + j["width"], j["height"], + j["x"], j["y"], }, - get(j["zorder"]), + j["zorder"], }; } @@ -56,7 +56,7 @@ result layout_from_json(json const &j) { DB(j); auto &ja = j["areas"]; - auto l = layout{j["name"].get(), uint32_t(ja.size()), {}}; + auto l = layout{j["name"], uint32_t(ja.size()), {}}; if (ja.size() > layout::MAX_N_AREAS) { return Err("Invalid number of areas in layout");