summaryrefslogtreecommitdiffstats
path: root/src/app.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/app.cpp')
-rw-r--r--src/app.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/app.cpp b/src/app.cpp
index fbeb4fd..f3c9234 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -311,7 +311,8 @@ void App::surface_set_layout(uint32_t surface_id) {
// XXX: visibility should be determined independently of our
// layer + geometry setup.
- s->set_visibility(surface_id == (unsigned)this->layers.main_surface ? 1 : 0);
+ s->set_visibility(
+ surface_id == static_cast<unsigned>(this->layers.main_surface) ? 1 : 0);
this->controller->layers[layer_id]->add_surface(s.get());
logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
@@ -448,7 +449,7 @@ binding_api::result_type binding_api::activate_surface(
char const *drawing_name) {
logdebug("%s drawing_name %s", __func__, drawing_name);
auto r = this->app->activate_surface(drawing_name);
- if (r) {
+ if (r != nullptr) {
return Err<json_object *>(r);
}
return Ok(json_object_new_object());
@@ -488,7 +489,7 @@ binding_api::result_type binding_api::debug_terminate() {
binding_api::result_type binding_api::demo_activate_surface(
uint32_t surfaceid) {
char const *e = this->app->activate_surface(surfaceid);
- if (e) {
+ if (e != nullptr) {
return Err<json_object *>(e);
}
return Ok(json_object_new_object());