1 files changed, 16 insertions, 12 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h
index 8966acb38..708d0113d 100644
--- a/src/compositor/compositor_api/qwaylandcompositor_p.h
+++ b/src/compositor/compositor_api/qwaylandcompositor_p.h
@@ -90,12 +90,12 @@ public:
     QtWayland::DataDeviceManager *dataDeviceManager() const { return data_device_manager; }
     void feedRetainedSelectionData(QMimeData *data);
 
-    QWaylandPointer *callCreatePointerDevice(QWaylandInputDevice *inputDevice)
-    { return q_func()->createPointerDevice(inputDevice); }
-    QWaylandKeyboard *callCreateKeyboardDevice(QWaylandInputDevice *inputDevice)
-    { return q_func()->createKeyboardDevice(inputDevice); }
-    QWaylandTouch *callCreateTouchDevice(QWaylandInputDevice *inputDevice)
-    { return q_func()->createTouchDevice(inputDevice); }
+    QWaylandPointer *callCreatePointerDevice(QWaylandSeat *seat)
+    { return q_func()->createPointerDevice(seat); }
+    QWaylandKeyboard *callCreateKeyboardDevice(QWaylandSeat *seat)
+    { return q_func()->createKeyboardDevice(seat); }
+    QWaylandTouch *callCreateTouchDevice(QWaylandSeat *seat)
+    { return q_func()->createTouchDevice(seat); }
 
     inline void addClient(QWaylandClient *client);
     inline void removeClient(QWaylandClient *client);
@@ -114,7 +114,7 @@ protected:
 protected:
     void initializeHardwareIntegration();
     void initializeExtensions();
-    void initializeDefaultInputDevice();
+    void initializeDefaultSeat();
 
     void loadClientBufferIntegration();
     void loadServerBufferIntegration();
@@ -122,7 +122,7 @@ protected:
     QByteArray socket_name;
     struct wl_display *display;
 
-    QList<QWaylandInputDevice *> inputDevices;
+    QList<QWaylandSeat *> seats;
     QList<QWaylandOutput *> outputs;
 
     QList<QWaylandSurface *> all_surfaces;
@@ -135,7 +135,7 @@ protected:
 
     QList<QWaylandClient *> clients;
 
-#ifdef QT_COMPOSITOR_WAYLAND_GL
+#ifdef QT_WAYLAND_COMPOSITOR_GL
     bool use_hw_integration_extension;
     QScopedPointer<QtWayland::HardwareIntegration> hw_integration;
     QScopedPointer<QtWayland::ClientBufferIntegration> client_buffer_integration;
@@ -154,7 +154,7 @@ protected:
 
 QtWayland::ClientBufferIntegration * QWaylandCompositorPrivate::clientBufferIntegration() const
 {
-#ifdef QT_COMPOSITOR_WAYLAND_GL
+#ifdef QT_WAYLAND_COMPOSITOR_GL
     return client_buffer_integration.data();
 #else
     return 0;
@@ -163,7 +163,7 @@ QtWayland::ClientBufferIntegration * QWaylandCompositorPrivate::clientBufferInte
 
 QtWayland::ServerBufferIntegration * QWaylandCompositorPrivate::serverBufferIntegration() const
 {
-#ifdef QT_COMPOSITOR_WAYLAND_GL
+#ifdef QT_WAYLAND_COMPOSITOR_GL
     return server_buffer_integration.data();
 #else
     return 0;
@@ -185,16 +185,20 @@ void QWaylandCompositorPrivate::removeClient(QWaylandClient *client)
 void QWaylandCompositorPrivate::addOutput(QWaylandOutput *output)
 {
     Q_ASSERT(output);
+    Q_Q(QWaylandCompositor);
     if (outputs.contains(output))
         return;
     outputs.append(output);
+    emit q->outputAdded(output);
 }
 
 void QWaylandCompositorPrivate::removeOutput(QWaylandOutput *output)
 {
     Q_ASSERT(output);
     Q_ASSERT(outputs.count(output) == 1);
-    outputs.removeOne(output);
+    Q_Q(QWaylandCompositor);
+    if (outputs.removeOne(output))
+        emit q->outputRemoved(output);
 }
 
 QT_END_NAMESPACE