app: rename load_layer_ids to load_layer_map

[staging/windowmanager.git] / src / app.cpp

diff --git a/src/app.cpp b/src/app.cpp
index f925e3d..93877ba 100644 (file)
--- 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 {