X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.cpp;h=c19b0dc8b3e8fcc17286364a72cc9d852339bee8;hb=7c36569cc56a5d82bfe2d501ced76ff3a0a3af7b;hp=c2f55fa2e73cdcb9c327bd801bbdd74c0094824f;hpb=a0eba6dbbf675a45f744fb8d6f4fb3cc1c901713;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.cpp b/src/wayland.cpp
index c2f55fa..c19b0dc 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(std::make_unique<struct registry>(d.get())) {}
+     r(!d ? nullptr : std::make_unique<struct registry>(d.get())) {}
 
 display::~display() {}
 
@@ -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);
 }