From: Marcus Fritzsch Date: Tue, 27 Jun 2017 07:23:43 +0000 (+0200) Subject: wayland: removed unnecessary destructors X-Git-Tag: 4.99.1~292 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=2dbb276974558e1e40f3169a8f4ca5d6100fc633;p=staging%2Fwindowmanager.git wayland: removed unnecessary destructors Signed-off-by: Marcus Fritzsch --- diff --git a/src/wayland.cpp b/src/wayland.cpp index af28edf..c50a7be 100644 --- a/src/wayland.cpp +++ b/src/wayland.cpp @@ -30,8 +30,6 @@ display::display() r(d.get()) { } -display::~display() = default; - bool display::ok() const { return d && wl_display_get_error(d.get()) == 0; } void display::roundtrip() { wl_display_roundtrip(this->d.get()); } @@ -70,10 +68,6 @@ registry::registry(struct wl_display *d) } } -registry::~registry() { - logdebug("wl::registry %s @ %p", __func__, this->proxy); -} - void registry::add_global_handler(char const *iface, binder bind) { this->bindings[iface] = std::move(bind); } @@ -215,8 +209,6 @@ controller::controller(struct wl_registry *r, uint32_t name, uint32_t version) ivi_controller_add_listener(this->proxy, &listener, this); } -controller::~controller() = default; - void controller::layer_create(uint32_t id, int32_t w, int32_t h) { this->layers[id] = std::make_unique(id, w, h, this); } diff --git a/src/wayland.hpp b/src/wayland.hpp index 60a045b..40b18b0 100644 --- a/src/wayland.hpp +++ b/src/wayland.hpp @@ -50,7 +50,6 @@ struct registry : public wayland_proxy { std::unordered_map bindings; registry(struct wl_display *d); - ~registry(); void add_global_handler(char const *iface, binder bind); @@ -70,7 +69,6 @@ struct display { struct registry r; display(); - ~display(); bool ok() const; void roundtrip(); int dispatch(); @@ -245,7 +243,6 @@ struct controller : public wayland_proxy { void execute_pending(); controller(struct wl_registry *r, uint32_t name, uint32_t version); - ~controller() override; // Requests void commit_changes() const { ivi_controller_commit_changes(this->proxy); }