diff options
author | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-06-26 16:34:55 +0200 |
---|---|---|
committer | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-08-08 17:24:00 +0200 |
commit | 7ffa858f1f3bdd4823ed2834186ceea010d6dd33 (patch) | |
tree | 6857ada07dd8ceaa883d589934665310133bcf3f | |
parent | ccad564c1621ba8aa69ce47ea9374da373b0bcce (diff) |
wayland: rename controlled_entity to controller_child
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
-rw-r--r-- | src/wayland.cpp | 6 | ||||
-rw-r--r-- | src/wayland.hpp | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/wayland.cpp b/src/wayland.cpp index 1078a14..7be89c5 100644 --- a/src/wayland.cpp +++ b/src/wayland.cpp @@ -324,7 +324,7 @@ layer::layer(uint32_t i, struct controller *c) : layer(i, 0, 0, c) {} layer::layer(uint32_t i, int32_t w, int32_t h, struct controller *c) : wayland_proxy(ivi_controller_layer_create(c->proxy, i, w, h)), - controlled_entity(c, i), + controller_child(c, i), dst_rect{}, src_rect{}, size{}, @@ -489,7 +489,7 @@ constexpr struct ivi_controller_surface_listener surface_listener = { surface::surface(uint32_t i, struct controller *c) : wayland_proxy(ivi_controller_surface_create(c->proxy, i)), - controlled_entity(c, i), + controller_child(c, i), dst_rect{}, src_rect{}, size{}, @@ -581,7 +581,7 @@ void controller::surface_content(uint32_t id, int32_t content_state) { // screen::screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p) - : wayland_proxy(p), controlled_entity(c, i) { + : wayland_proxy(p), controller_child(c, i) { logdebug("genivi::screen @ %p id %u", p, i); } } diff --git a/src/wayland.hpp b/src/wayland.hpp index 7ff1145..fbb9704 100644 --- a/src/wayland.hpp +++ b/src/wayland.hpp @@ -124,12 +124,12 @@ struct rect { struct controller; -struct controlled_entity { +struct controller_child { struct controller *parent; uint32_t id; - controlled_entity(struct controller *c, uint32_t i) : parent(c), id(i) {} - virtual ~controlled_entity() {} + controller_child(struct controller *c, uint32_t i) : parent(c), id(i) {} + virtual ~controller_child() {} }; // __ @@ -139,7 +139,7 @@ struct controlled_entity { // |___/\__,_|_| |_| \__,_|\___\___| // struct surface : public wayland_proxy<struct ivi_controller_surface>, - controlled_entity { + controller_child { struct rect dst_rect; struct rect src_rect; struct size size; @@ -197,7 +197,7 @@ struct surface : public wayland_proxy<struct ivi_controller_surface>, // |_|\__,_|\__, |\___|_| // |___/ struct layer : public wayland_proxy<struct ivi_controller_layer>, - controlled_entity { + controller_child { struct rect dst_rect; struct rect src_rect; struct size size; @@ -271,7 +271,7 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>, // |___/\___|_| \___|\___|_| |_| // struct screen : public wayland_proxy<struct ivi_controller_screen>, - controlled_entity { + controller_child { screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p); void clear() { ivi_controller_screen_clear(this->proxy); } |