Rename createSurface and similar signals

* createSurface -> surfaceRequested
* createXdgSurface -> xdgSurfaceRequested
* createXdgPopup -> xdgPopupRequested
* createShellSurface -> wlShellSurfaceRequested
* shellSurfaceCreated -> wlShellSurfaceCreated

Change-Id: I715a927242130d7504955002a6a64a2bac516d46
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>

6 files changed, 13 insertions, 13 deletions

diff --git a/examples/wayland/custom-extension/compositor/qml/main.qml b/examples/wayland/custom-extension/compositor/qml/main.qml
index fe33fb0c8..a7ca56e03 100644
--- a/examples/wayland/custom-extension/compositor/qml/main.qml
+++ b/examples/wayland/custom-extension/compositor/qml/main.qml
@@ -76,7 +76,7 @@ WaylandCompositor {
 
     WlShell {
         id: defaultShell
-        onShellSurfaceCreated: {
+        onWlShellSurfaceCreated: {
             var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } );
             lastItem = item;
         }
diff --git a/examples/wayland/minimal-qml/main.qml b/examples/wayland/minimal-qml/main.qml
index dde223859..7894a0321 100644
--- a/examples/wayland/minimal-qml/main.qml
+++ b/examples/wayland/minimal-qml/main.qml
@@ -73,7 +73,7 @@ WaylandCompositor {
     // chromeComponent on the output.
     extensions: [
         WlShell {
-            onShellSurfaceCreated:
+            onWlShellSurfaceCreated:
                 chromeComponent.createObject(surfaceArea, { "shellSurface": shellSurface } );
         },
         XdgShell {
diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml
index 18fbd4604..e8a30100d 100644
--- a/examples/wayland/multi-output/qml/main.qml
+++ b/examples/wayland/multi-output/qml/main.qml
@@ -84,13 +84,13 @@ WaylandCompositor {
     WlShell {
         id: defaultShell
 
-        onShellSurfaceCreated: {
+        onWlShellSurfaceCreated: {
             var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } );
             item.surface.activated.connect(item.raise);
         }
     }
 
-    onCreateSurface: {
+    onSurfaceRequested: {
         var surface = surfaceComponent.createObject(comp, { } );
         surface.initialize(comp, client, id, version);
     }
diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index 4f331641b..69e8d2c84 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -68,7 +68,7 @@ WaylandCompositor {
     }
 
     WlShell {
-        onShellSurfaceCreated: {
+        onWlShellSurfaceCreated: {
             chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } );
         }
     }
@@ -88,7 +88,7 @@ WaylandCompositor {
     TextInputManager {
     }
 
-    onCreateSurface: {
+    onSurfaceRequested: {
         var surface = surfaceComponent.createObject(comp, { } );
         surface.initialize(comp, client, id, version);
     }
diff --git a/examples/wayland/qwindow-compositor/compositor.cpp b/examples/wayland/qwindow-compositor/compositor.cpp
index 4999a5ed0..cff3df082 100644
--- a/examples/wayland/qwindow-compositor/compositor.cpp
+++ b/examples/wayland/qwindow-compositor/compositor.cpp
@@ -147,9 +147,9 @@ Compositor::Compositor(QWindow *window)
     , m_wlShell(new QWaylandWlShell(this))
     , m_xdgShell(new QWaylandXdgShell(this))
 {
-    connect(m_wlShell, &QWaylandWlShell::shellSurfaceCreated, this, &Compositor::onWlShellSurfaceCreated);
+    connect(m_wlShell, &QWaylandWlShell::wlShellSurfaceCreated, this, &Compositor::onWlShellSurfaceCreated);
     connect(m_xdgShell, &QWaylandXdgShell::xdgSurfaceCreated, this, &Compositor::onXdgSurfaceCreated);
-    connect(m_xdgShell, &QWaylandXdgShell::createXdgPopup, this, &Compositor::onCreateXdgPopup);
+    connect(m_xdgShell, &QWaylandXdgShell::xdgPopupRequested, this, &Compositor::onXdgPopupRequested);
 }
 
 Compositor::~Compositor()
@@ -252,9 +252,9 @@ void Compositor::onXdgSurfaceCreated(QWaylandXdgSurface *xdgSurface)
     connect(xdgSurface, &QWaylandXdgSurface::unsetFullscreen, view, &View::onXdgUnsetFullscreen);
 }
 
-void Compositor::onCreateXdgPopup(QWaylandSurface *surface, QWaylandSurface *parent,
-                                        QWaylandInputDevice *inputDevice, const QPoint &position,
-                                        const QWaylandResource &resource)
+void Compositor::onXdgPopupRequested(QWaylandSurface *surface, QWaylandSurface *parent,
+                                     QWaylandInputDevice *inputDevice, const QPoint &position,
+                                     const QWaylandResource &resource)
 {
     Q_UNUSED(inputDevice);
 
diff --git a/examples/wayland/qwindow-compositor/compositor.h b/examples/wayland/qwindow-compositor/compositor.h
index 8eec0a58f..3e25ea7df 100644
--- a/examples/wayland/qwindow-compositor/compositor.h
+++ b/examples/wayland/qwindow-compositor/compositor.h
@@ -133,8 +133,8 @@ private slots:
     void onSurfaceCreated(QWaylandSurface *surface);
     void onWlShellSurfaceCreated(QWaylandWlShellSurface *wlShellSurface);
     void onXdgSurfaceCreated(QWaylandXdgSurface *xdgSurface);
-    void onCreateXdgPopup(QWaylandSurface *surface, QWaylandSurface *parent, QWaylandInputDevice *inputDevice,
-                          const QPoint &position, const QWaylandResource &resource);
+    void onXdgPopupRequested(QWaylandSurface *surface, QWaylandSurface *parent, QWaylandInputDevice *inputDevice,
+                             const QPoint &position, const QWaylandResource &resource);
     void onSetTransient(QWaylandSurface *parentSurface, const QPoint &relativeToParent, QWaylandWlShellSurface::FocusPolicy focusPolicy);
     void onSetPopup(QWaylandInputDevice *inputDevice, QWaylandSurface *parent, const QPoint &relativeToParent);