X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.cpp;h=2bae9e8996606f3e1cc5adbb9259a9a2b6712ff4;hb=dc465727c14a7d7588dad8554afc08f55e769b76;hp=08624754bfc2a6b593a2cc8cee0ed90e533e2520;hpb=304eff45622c058bacad63326d5ffc2b8f75b8da;p=staging%2Fwindowmanager.git diff --git a/src/wayland.cpp b/src/wayland.cpp index 0862475..2bae9e8 100644 --- a/src/wayland.cpp +++ b/src/wayland.cpp @@ -22,7 +22,7 @@ display::display() logdebug("wl::display ~display @ %p", d); wl_display_disconnect(d); })), - r(!d ? nullptr : std::make_unique(d.get())) {} + r(d.get()) {} display::~display() {} @@ -74,8 +74,8 @@ void registry::global(uint32_t name, char const *iface, uint32_t v) { auto b = this->bindings.find(iface); if (b != this->bindings.end()) b->second(this->proxy, name, v); - logdebug("wl::registry @ %p global n %u i %s v %u", this->proxy, name, - iface, v); + logdebug("wl::registry @ %p global n %u i %s v %u", this->proxy, name, iface, + v); } void registry::global_remove(uint32_t name) {} @@ -318,14 +318,14 @@ constexpr struct ivi_controller_layer_listener layer_listener = { 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) - , dst_rect{} - , src_rect{} - , size{} - , orientation{} - , visibility{} - , opacity{} { + : wayland_proxy(ivi_controller_layer_create(c->proxy, i, w, h)), + controlled_entity(c, i), + dst_rect{}, + src_rect{}, + size{}, + orientation{}, + visibility{}, + opacity{} { ivi_controller_layer_add_listener(this->proxy, &layer_listener, this); }