X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.cpp;h=93877ba2c167e37906be2143191c4286a0ff94c1;hb=ef35039988c64c66c252b01827081ae8cabaa811;hp=f925e3da50544d7c7bb0fd8df6144a0e35ff764c;hpb=d2fe9e8e49a0970986282162b04d335c57845ac3;p=staging%2Fwindowmanager.git

diff --git a/src/app.cpp b/src/app.cpp
index f925e3d..93877ba 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -69,6 +69,7 @@ result<json> file_to_json(char const *filename) {
    return Ok(j);
 }
 
+// Will throw if parsing fails
 struct result<layouts_type> load_layout(char const *filename) {
    DB("loading layout from " << filename);
 
@@ -87,7 +88,7 @@ struct result<layouts_type> load_layout(char const *filename) {
 }
 
 struct result<layer_map>
-   load_layer_ids(char const *filename) {
+   load_layer_map(char const *filename) {
    DB("loading IDs from " << filename);
 
    auto j = file_to_json(filename);
@@ -119,7 +120,7 @@ App::App(wl::display *d)
    g_app = this;
 
    {
-      auto l = load_layer_ids("../ids.json");
+      auto l = load_layer_map("../ids.json");
       if (l.is_ok()) {
          this->layers = l.unwrap();
       } else {