From ef35039988c64c66c252b01827081ae8cabaa811 Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Tue, 1 Aug 2017 16:25:24 +0200 Subject: [PATCH] app: rename load_layer_ids to load_layer_map Signed-off-by: Marcus Fritzsch --- src/app.cpp | 5 +++-- 1 file 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 file_to_json(char const *filename) { return Ok(j); } +// Will throw if parsing fails struct result load_layout(char const *filename) { DB("loading layout from " << filename); @@ -87,7 +88,7 @@ struct result load_layout(char const *filename) { } struct result - 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 { -- 2.16.6