summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-01 16:25:24 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-08 17:24:00 +0200
commitef35039988c64c66c252b01827081ae8cabaa811 (patch)
tree2fafaa3fbcc0053d5db02ad1fcf1f2bcdb380b50
parentd2fe9e8e49a0970986282162b04d335c57845ac3 (diff)
app: rename load_layer_ids to load_layer_map
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
-rw-r--r--src/app.cpp5
1 files changed, 3 insertions, 2 deletions
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 {