app: rename load_layer_ids to load_layer_map
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>
Tue, 1 Aug 2017 14:25:24 +0000 (16:25 +0200)
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>
Tue, 8 Aug 2017 15:24:00 +0000 (17:24 +0200)
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
src/app.cpp

index f925e3d..93877ba 100644 (file)
@@ -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 {