summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/app.cpp7
-rw-r--r--src/app.hpp2
-rw-r--r--src/json_helper.cpp1
-rw-r--r--src/layers.cpp2
4 files changed, 7 insertions, 5 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());
diff --git a/src/app.hpp b/src/app.hpp
index a35be27..c3c2060 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -119,7 +119,7 @@ struct App {
result<int> request_surface(char const *drawing_name);
// Activate (i.e. make visible, if allowed!) a surface
- char const *activate_surface(char const *drawng_name);
+ char const *activate_surface(char const *drawing_name);
// add tasks, executed after dispatch_events()
void add_task(char const *name, std::function<void()> &&f);
diff --git a/src/json_helper.cpp b/src/json_helper.cpp
index 179c8cc..e4d73bc 100644
--- a/src/json_helper.cpp
+++ b/src/json_helper.cpp
@@ -16,6 +16,7 @@
#include "json_helper.hpp"
+#include <stdlib.h>
#include <json.h>
json_object *to_json(genivi::surface_properties const &s) {
diff --git a/src/layers.cpp b/src/layers.cpp
index 931fd5e..7beb075 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -132,7 +132,7 @@ optional<layer> get_surface_id_to_layer(struct layer_map const *s2l,
return nullopt;
}
-}
+} // namespace
optional<int> layer_map::get_layer_id(int surface_id) {
auto e = get_surface_id_to_layer(this, surface_id);