summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-06-19 10:29:38 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-08 17:24:00 +0200
commit6cbdcf493969b1f819a34d087f2fa306090b76c7 (patch)
tree56ffe5f7a47b4423582777d12a844a890aa9454f /src
parentc895f9ff2931f647d7309c841054487cd4fe898c (diff)
renamed controller event methods, all have now a controller_ prefix
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Diffstat (limited to 'src')
-rw-r--r--src/wayland.cpp21
-rw-r--r--src/wayland.hpp9
2 files changed, 16 insertions, 14 deletions
diff --git a/src/wayland.cpp b/src/wayland.cpp
index ce20978..c19b0dc 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -158,24 +158,24 @@ namespace {
void controller_screen(void *data, struct ivi_controller *ivi_controller,
uint32_t id_screen,
struct ivi_controller_screen *screen) {
- static_cast<struct controller *>(data)->screen(id_screen, screen);
+ static_cast<struct controller *>(data)->controller_screen(id_screen, screen);
}
void controller_layer(void *data, struct ivi_controller *ivi_controller,
uint32_t id_layer) {
- static_cast<struct controller *>(data)->layer(id_layer);
+ static_cast<struct controller *>(data)->controller_layer(id_layer);
}
void controller_surface(void *data, struct ivi_controller *ivi_controller,
uint32_t id_surface) {
- static_cast<struct controller *>(data)->surface(id_surface);
+ static_cast<struct controller *>(data)->controller_surface(id_surface);
}
void controller_error(void *data, struct ivi_controller *ivi_controller,
int32_t object_id, int32_t object_type,
int32_t error_code, const char *error_text) {
- static_cast<struct controller *>(data)->error(object_id, object_type,
- error_code, error_text);
+ static_cast<struct controller *>(data)->controller_error(
+ object_id, object_type, error_code, error_text);
}
constexpr struct ivi_controller_listener listener = {
@@ -190,24 +190,25 @@ controller::controller(struct wl_registry *r, uint32_t name, uint32_t version)
controller::~controller() {}
-void controller::screen(uint32_t id, struct ivi_controller_screen *screen) {
+void controller::controller_screen(uint32_t id,
+ struct ivi_controller_screen *screen) {
logdebug("genivi::controller @ %p screen %u (%x) @ %p", this->proxy, id, id,
screen);
this->screens[id] = std::make_unique<struct screen>(id, this, screen);
}
-void controller::layer(uint32_t id) {
+void controller::controller_layer(uint32_t id) {
logdebug("genivi::controller @ %p layer %u (%x)", this->proxy, id, id);
this->layers[id] = std::make_unique<struct layer>(id, this);
}
-void controller::surface(uint32_t id) {
+void controller::controller_surface(uint32_t id) {
logdebug("genivi::controller @ %p surface %u (%x)", this->proxy, id, id);
this->surfaces[id] = std::make_unique<struct surface>(id, this);
}
-void controller::error(int32_t object_id, int32_t object_type,
- int32_t error_code, const char *error_text) {
+void controller::controller_error(int32_t object_id, int32_t object_type,
+ int32_t error_code, const char *error_text) {
logdebug("genivi::controller @ %p error o %i t %i c %i text %s", this->proxy,
object_id, object_type, error_code, error_text);
}
diff --git a/src/wayland.hpp b/src/wayland.hpp
index 85ca4f6..c97c51a 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -259,10 +259,11 @@ struct controller : public wayland_proxy<struct ivi_controller> {
// Events
// controller
- void screen(uint32_t id, struct ivi_controller_screen *screen);
- void layer(uint32_t id);
- void surface(uint32_t id);
- void error(int32_t oid, int32_t otype, int32_t code, char const *text);
+ void controller_screen(uint32_t id, struct ivi_controller_screen *screen);
+ void controller_layer(uint32_t id);
+ void controller_surface(uint32_t id);
+ void controller_error(int32_t oid, int32_t otype, int32_t code,
+ char const *text);
// surface
void surface_visibility(uint32_t id, int32_t visibility);