From 5b222098649674042ca721583abcbee22ea60930 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Tue, 9 Aug 2016 14:04:32 +0200 Subject: Compositor API: rename QWaylandInputDevice to QWaylandSeat The name QWaylandInputDevice could be confusing and misleading: - A QWaylandInputDevice was not one input device, but a collection of many. - Classes that sounded like they should inherit from it did not, i.e: QWaylandKeyboard, QWaylandPointer and QWaylandTouch. - The Wayland protocol already has another term for this, which is seat. Change-Id: I9d9690d5b378075d9dddaeb8cf18395c7f47603e Reviewed-by: Giulio Camuffo --- tests/auto/compositor/testcompositor.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/compositor/testcompositor.h') diff --git a/tests/auto/compositor/testcompositor.h b/tests/auto/compositor/testcompositor.h index fb5909d19..8eeb7ade6 100644 --- a/tests/auto/compositor/testcompositor.h +++ b/tests/auto/compositor/testcompositor.h @@ -43,12 +43,12 @@ public slots: void onSurfaceAboutToBeDestroyed(QWaylandSurface *surface); protected: - QWaylandInputDevice *createInputDevice() Q_DECL_OVERRIDE; - QWaylandKeyboard *createKeyboardDevice(QWaylandInputDevice *inputDevice) Q_DECL_OVERRIDE; + QWaylandSeat *createSeat() Q_DECL_OVERRIDE; + QWaylandKeyboard *createKeyboardDevice(QWaylandSeat *seat) Q_DECL_OVERRIDE; public: QList surfaces; QWaylandWlShell* shell; - bool m_createInputDevice; + bool m_createSeat; }; -- cgit v1.2.3