From efccc708d4578ff231bba2fba38bbb861dabcbe1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Samuel=20R=C3=B8dal?= Date: Wed, 7 Mar 2012 10:12:26 +0100 Subject: [PATCH] Get rid of dummy source update functions and debug output. The source update callbacks are unnecessary since change d224714afd087cc73d8 in wayland. Change-Id: Iac2266621b8739464077d9aa8f9292e06e9b4b35 Reviewed-by: Laszlo Agocs --- src/compositor/wayland_wrapper/wlcompositor.cpp | 1 - src/plugins/platforms/wayland/qwaylanddisplay.cpp | 7 +------ tests/auto/compositor/mockclient.cpp | 7 +------ 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/compositor/wayland_wrapper/wlcompositor.cpp b/src/compositor/wayland_wrapper/wlcompositor.cpp index 6cd9a3d..10cf3a8 100644 --- a/src/compositor/wayland_wrapper/wlcompositor.cpp +++ b/src/compositor/wayland_wrapper/wlcompositor.cpp @@ -135,7 +135,6 @@ Compositor::Compositor(WaylandCompositor *qt_compositor) , m_retainNotify(0) { compositor = this; - qDebug() << "Compositor instance is" << this; #if defined (QT_COMPOSITOR_WAYLAND_GL) QWindow *window = qt_compositor->window(); diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp index 01af936..a96d726 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp +++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp @@ -106,11 +106,6 @@ void QWaylandDisplay::setLastKeyboardFocusInputDevice(QWaylandInputDevice *devic static QWaylandDisplay *display = 0; -static int dummyUpdate(uint32_t, void *) -{ - return 0; -} - QWaylandDisplay::QWaylandDisplay(void) : mLastKeyboardFocusInputDevice(0) , mDndSelectionHandler(0) @@ -130,7 +125,7 @@ QWaylandDisplay::QWaylandDisplay(void) wl_display_add_global_listener(mDisplay, QWaylandDisplay::displayHandleGlobal, this); - mFd = wl_display_get_fd(mDisplay, dummyUpdate, 0); + mFd = wl_display_get_fd(mDisplay, 0, 0); #ifdef QTWAYLAND_EXPERIMENTAL_THREAD_SUPPORT mWritableNotificationFd = wl_display_get_write_notification_fd(mDisplay); diff --git a/tests/auto/compositor/mockclient.cpp b/tests/auto/compositor/mockclient.cpp index f47f253..5dabfcd 100644 --- a/tests/auto/compositor/mockclient.cpp +++ b/tests/auto/compositor/mockclient.cpp @@ -63,7 +63,7 @@ MockClient::MockClient() wl_display_add_global_listener(display, handleGlobal, this); - fd = wl_display_get_fd(display, sourceUpdate, 0); + fd = wl_display_get_fd(display, 0, 0); QSocketNotifier *readNotifier = new QSocketNotifier(fd, QSocketNotifier::Read, this); connect(readNotifier, SIGNAL(activated(int)), this, SLOT(readEvents())); @@ -96,11 +96,6 @@ void MockClient::handleGlobal(wl_display *, uint32_t id, const char *interface, resolve(data)->handleGlobal(id, QByteArray(interface)); } -int MockClient::sourceUpdate(uint32_t, void *) -{ - return 0; -} - void MockClient::outputGeometryEvent(void *data, wl_output *, int32_t x, int32_t y, int32_t width, int32_t height, -- 2.7.4