1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused method QWaylandDisplay::lastKeyboardFocusInputDevice

Browse Source 
Change-Id: Iee19b36ae2032112e0097dc6eb2e4592697c2a1c
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
This commit is contained in:
Johan Klokkhammer Helsing 2016-06-20 13:33:13 +02:00 committed by Johan Helsing
parent 795378e64c
commit 261f31eacb
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -118,19 +118,8 @@ QWaylandWindowManagerIntegration *QWaylandDisplay::windowManagerIntegration() co
return mWindowManagerIntegration.data(); return mWindowManagerIntegration.data();
} }
QWaylandInputDevice *QWaylandDisplay::lastKeyboardFocusInputDevice() const
{
return mLastKeyboardFocusInputDevice;
}
void QWaylandDisplay::setLastKeyboardFocusInputDevice(QWaylandInputDevice *device)
{
mLastKeyboardFocusInputDevice = device;
}
QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration) QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration)
: mWaylandIntegration(waylandIntegration) : mWaylandIntegration(waylandIntegration)
, mLastKeyboardFocusInputDevice(0)
, mDndSelectionHandler(0) , mDndSelectionHandler(0)
, mWindowExtension(0) , mWindowExtension(0)
, mSubCompositor(0) , mSubCompositor(0)

4
src/plugins/platforms/wayland/qwaylanddisplay_p.h
View File

@ -134,9 +134,6 @@ public:
QWaylandInputDevice *defaultInputDevice() const; QWaylandInputDevice *defaultInputDevice() const;
QWaylandInputDevice *currentInputDevice() const { return defaultInputDevice(); } QWaylandInputDevice *currentInputDevice() const { return defaultInputDevice(); }
QWaylandInputDevice *lastKeyboardFocusInputDevice() const;
void setLastKeyboardFocusInputDevice(QWaylandInputDevice *device);
QWaylandDataDeviceManager *dndSelectionHandler() const { return mDndSelectionHandler.data(); } QWaylandDataDeviceManager *dndSelectionHandler() const { return mDndSelectionHandler.data(); }
QtWayland::qt_surface_extension *windowExtension() const { return mWindowExtension.data(); } QtWayland::qt_surface_extension *windowExtension() const { return mWindowExtension.data(); }
@ -194,7 +191,6 @@ private:
QList<QWaylandInputDevice *> mInputDevices; QList<QWaylandInputDevice *> mInputDevices;
QList<Listener> mRegistryListeners; QList<Listener> mRegistryListeners;
QWaylandIntegration *mWaylandIntegration; QWaylandIntegration *mWaylandIntegration;
QWaylandInputDevice *mLastKeyboardFocusInputDevice;
QScopedPointer<QWaylandDataDeviceManager> mDndSelectionHandler; QScopedPointer<QWaylandDataDeviceManager> mDndSelectionHandler;
QScopedPointer<QtWayland::qt_surface_extension> mWindowExtension; QScopedPointer<QtWayland::qt_surface_extension> mWindowExtension;
QScopedPointer<QtWayland::wl_subcompositor> mSubCompositor; QScopedPointer<QtWayland::wl_subcompositor> mSubCompositor;

1
src/plugins/platforms/wayland/qwaylandinputdevice.cpp
View File

@ -633,7 +633,6 @@ void QWaylandInputDevice::Keyboard::focusCallback(void *data, struct wl_callback
self->mFocusCallback = 0; self->mFocusCallback = 0;
} }
self->mParent->mQDisplay->setLastKeyboardFocusInputDevice(self->mFocus ? self->mParent : 0);
QWindowSystemInterface::handleWindowActivated(self->mFocus ? self->mFocus->window() : 0); QWindowSystemInterface::handleWindowActivated(self->mFocus ? self->mFocus->window() : 0);
} }