Code Review
/
staging
/
windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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);
}
return Ok(j);
}
+// Will throw if parsing fails
struct result<layouts_type> load_layout(char const *filename) {
DB("loading layout from " << filename);
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>
}
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);
DB("loading IDs from " << filename);
auto j = file_to_json(filename);
@@
-119,7
+120,7
@@
App::App(wl::display *d)
g_app = this;
{
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 {
if (l.is_ok()) {
this->layers = l.unwrap();
} else {