clang-tidy once more

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

diff --git a/src/app.cpp b/src/app.cpp
index 8a3abec..871222f 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -4,6 +4,7 @@
 
 #include "app.hpp"
 #include "json_helper.hpp"
+#include "layers.hpp"
 #include "layout.hpp"
 #include "util.hpp"
 #include "wayland.hpp"
@@ -93,10 +94,9 @@ struct result<surface_id_to_layer_map>
                      });
 
       for (auto sid : tests) {
-         DB("layer id for surface "
-            << sid.first << " is "
-            << i.get_layer_for_surface(sid.first).value_or(-1) << " expected "
-            << sid.second);
+         if (i.get_layer_for_surface(sid.first).value_or(-1) != sid.second) {
+            return Err<surface_id_to_layer_map>("ID Map embedded test failed!");
+         }
       }
    }
 
@@ -106,7 +106,7 @@ struct result<surface_id_to_layer_map>
 }  // namespace
 
 App::App(wl::display *d)
-   : api{this}, display{d}, controller{}, outputs(), layouts() {
+   : api{this}, display{d}, controller{} {
    // layouts(load_layout("../layout.json").unwrap()) {
    assert(g_app == nullptr);
    g_app = this;