From 54b0edd597c6e7788d18e4e6ca7ac74bff9dcbf5 Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Wed, 13 Sep 2017 12:13:22 +0200 Subject: [PATCH] app: a couple of style fixes + format Signed-off-by: Marcus Fritzsch --- src/app.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/app.cpp b/src/app.cpp index 4bd7393..240c7e4 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -376,7 +376,7 @@ char const *App::api_activate_surface(char const *drawing_name) { auto o_state = *this->layers.get_layout_state(*surface_id); - if (!o_state) { + if (o_state == nullptr) { return "Could not find layer for surface"; } @@ -482,7 +482,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { auto o_state = *this->layers.get_layout_state(*surface_id); - if (!o_state) { + if (o_state == nullptr) { return "Could not find layer for surface"; } @@ -742,7 +742,7 @@ bool App::can_split(struct LayoutState const &state, int new_id) { return false; } -void App::try_layout(struct LayoutState &state, +void App::try_layout(struct LayoutState & /*state*/, struct LayoutState const &new_layout, std::function apply) { if (this->policy.layout_is_valid(new_layout)) { @@ -764,10 +764,13 @@ void controller_hooks::surface_removed(uint32_t surface_id) { this->app->surface_removed(surface_id); } -void controller_hooks::surface_visibility(uint32_t surface_id, uint32_t v) { -} +void controller_hooks::surface_visibility(uint32_t /*surface_id*/, + uint32_t /*v*/) {} -void controller_hooks::surface_destination_rectangle(uint32_t surface_id, uint32_t x, uint32_t y, uint32_t w, uint32_t h) { -} +void controller_hooks::surface_destination_rectangle(uint32_t /*surface_id*/, + uint32_t /*x*/, + uint32_t /*y*/, + uint32_t /*w*/, + uint32_t /*h*/) {} } // namespace wm -- 2.16.6