Rename compositor Shell to WlShell

 * QWaylandShell -> QWaylandWlShell
 * QWaylandShellSurface -> QWaylandWlShellSurface
 * QWaylandQuickShellSurfaceItem -> QWaylandQuickWlShellSurfaceItem
 * Shell -> WlShell (QML)
 * ShellSurface -> WlShellSurface (QML)
 * ShellSurfaceItem -> WlShellSurfaceItem (QML)

This is done to avoid confusion with XdgShell and will hopefully help
clarify that some of the examples only support wl_shell and not
xdg_shell.

Additionally, this makes "Shell" an available name in the compositor
API, which may in turn enable the creation of a more general abstraction
hiding the details of the shell backends (i.e. xdg_shell, wl_shell, and
eventually ivi_shell).

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

1 files changed, 101 insertions, 101 deletions

diff --git a/src/imports/compositor/plugins.qmltypes b/src/imports/compositor/plugins.qmltypes
index f9f78463a..4fba02b13 100644
--- a/src/imports/compositor/plugins.qmltypes
+++ b/src/imports/compositor/plugins.qmltypes
@@ -214,15 +214,6 @@ Module {
         Method { name: "updateStarted" }
     }
     Component {
-        name: "QWaylandQuickShellSurfaceItem"
-        defaultProperty: "data"
-        prototype: "QWaylandQuickItem"
-        exports: ["QtWayland.Compositor/ShellSurfaceItem 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "shellSurface"; type: "QWaylandShellSurface"; isPointer: true }
-        Property { name: "moveItem"; type: "QQuickItem"; isPointer: true }
-    }
-    Component {
         name: "QWaylandQuickSurface"
         prototype: "QWaylandSurface"
         exports: ["QtWayland.Compositor/WaylandSurface 1.0"]
@@ -231,13 +222,104 @@ Module {
         Property { name: "clientRenderingEnabled"; type: "bool" }
     }
     Component {
+        name: "QWaylandQuickWlShellSurfaceItem"
+        defaultProperty: "data"
+        prototype: "QWaylandQuickItem"
+        exports: ["QtWayland.Compositor/WlShellSurfaceItem 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "shellSurface"; type: "QWaylandWlShellSurface"; isPointer: true }
+        Property { name: "moveItem"; type: "QQuickItem"; isPointer: true }
+    }
+    Component {
         name: "QWaylandResource"
         exports: ["QtWayland.Compositor/WaylandResource 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
     }
     Component {
-        name: "QWaylandShell"
+        name: "QWaylandSurface"
+        prototype: "QObject"
+        exports: ["QtWayland.Compositor/WaylandSurfaceBase 1.0"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Origin"
+            values: {
+                "OriginTopLeft": 0,
+                "OriginBottomLeft": 1
+            }
+        }
+        Property { name: "client"; type: "QWaylandClient"; isReadonly: true; isPointer: true }
+        Property { name: "size"; type: "QSize"; isReadonly: true }
+        Property { name: "contentOrientation"; type: "Qt::ScreenOrientation"; isReadonly: true }
+        Property { name: "origin"; type: "QWaylandSurface::Origin"; isReadonly: true }
+        Property { name: "isMapped"; type: "bool"; isReadonly: true }
+        Property { name: "cursorSurface"; type: "bool" }
+        Signal { name: "mappedChanged" }
+        Signal {
+            name: "damaged"
+            Parameter { name: "rect"; type: "QRegion" }
+        }
+        Signal {
+            name: "parentChanged"
+            Parameter { name: "newParent"; type: "QWaylandSurface"; isPointer: true }
+            Parameter { name: "oldParent"; type: "QWaylandSurface"; isPointer: true }
+        }
+        Signal {
+            name: "childAdded"
+            Parameter { name: "child"; type: "QWaylandSurface"; isPointer: true }
+        }
+        Signal {
+            name: "offsetForNextFrame"
+            Parameter { name: "offset"; type: "QPoint" }
+        }
+        Signal { name: "pong" }
+        Signal { name: "surfaceDestroyed" }
+        Signal {
+            name: "subsurfacePositionChanged"
+            Parameter { name: "position"; type: "QPoint" }
+        }
+        Signal {
+            name: "subsurfacePlaceAbove"
+            Parameter { name: "sibling"; type: "QWaylandSurface"; isPointer: true }
+        }
+        Signal {
+            name: "subsurfacePlaceBelow"
+            Parameter { name: "sibling"; type: "QWaylandSurface"; isPointer: true }
+        }
+        Signal {
+            name: "configure"
+            Parameter { name: "hasBuffer"; type: "bool" }
+        }
+        Signal { name: "redraw" }
+        Method { name: "updateSelection" }
+        Method {
+            name: "initialize"
+            Parameter { name: "compositor"; type: "QWaylandCompositor"; isPointer: true }
+            Parameter { name: "client"; type: "QWaylandClient"; isPointer: true }
+            Parameter { name: "id"; type: "uint" }
+            Parameter { name: "version"; type: "int" }
+        }
+        Method { name: "destroy" }
+        Method { name: "isDestroyed"; type: "bool" }
+        Method { name: "frameStarted" }
+        Method { name: "sendFrameCallbacks" }
+    }
+    Component {
+        name: "QWaylandView"
+        prototype: "QObject"
+        exports: ["QtWayland.Compositor/WaylandView 1.0"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "renderObject"; type: "QObject"; isReadonly: true; isPointer: true }
+        Property { name: "surface"; type: "QWaylandSurface"; isPointer: true }
+        Property { name: "output"; type: "QWaylandOutput"; isPointer: true }
+        Property { name: "bufferLock"; type: "bool" }
+        Property { name: "discardFrontBuffers"; type: "bool" }
+        Signal { name: "surfaceDestroyed" }
+    }
+    Component {
+        name: "QWaylandWlShell"
         prototype: "QWaylandExtension"
         Signal {
             name: "createShellSurface"
@@ -246,17 +328,17 @@ Module {
         }
     }
     Component {
-        name: "QWaylandShellQuickData"
+        name: "QWaylandWlShellQuickData"
         defaultProperty: "data"
-        prototype: "QWaylandShell"
-        exports: ["QtWayland.Compositor/Shell 1.0"]
+        prototype: "QWaylandWlShell"
+        exports: ["QtWayland.Compositor/WlShell 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
     }
     Component {
-        name: "QWaylandShellSurface"
+        name: "QWaylandWlShellSurface"
         prototype: "QWaylandExtension"
-        exports: ["QtWayland.Compositor/ShellSurfaceBase 1.0"]
+        exports: ["QtWayland.Compositor/WlShellSurfaceBase 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
         Enum {
@@ -329,7 +411,7 @@ Module {
         Method { name: "ping" }
         Method {
             name: "initialize"
-            Parameter { name: "shell"; type: "QWaylandShell"; isPointer: true }
+            Parameter { name: "shell"; type: "QWaylandWlShell"; isPointer: true }
             Parameter { name: "surface"; type: "QWaylandSurface"; isPointer: true }
             Parameter { name: "resource"; type: "QWaylandResource" }
         }
@@ -348,96 +430,14 @@ Module {
         Method { name: "sendPopupDone" }
     }
     Component {
-        name: "QWaylandShellSurfaceQuickData"
+        name: "QWaylandWlShellSurfaceQuickData"
         defaultProperty: "data"
-        prototype: "QWaylandShellSurface"
-        exports: ["QtWayland.Compositor/ShellSurface 1.0"]
+        prototype: "QWaylandWlShellSurface"
+        exports: ["QtWayland.Compositor/WlShellSurface 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
     }
     Component {
-        name: "QWaylandSurface"
-        prototype: "QObject"
-        exports: ["QtWayland.Compositor/WaylandSurfaceBase 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "Origin"
-            values: {
-                "OriginTopLeft": 0,
-                "OriginBottomLeft": 1
-            }
-        }
-        Property { name: "client"; type: "QWaylandClient"; isReadonly: true; isPointer: true }
-        Property { name: "size"; type: "QSize"; isReadonly: true }
-        Property { name: "contentOrientation"; type: "Qt::ScreenOrientation"; isReadonly: true }
-        Property { name: "origin"; type: "QWaylandSurface::Origin"; isReadonly: true }
-        Property { name: "isMapped"; type: "bool"; isReadonly: true }
-        Property { name: "cursorSurface"; type: "bool" }
-        Signal { name: "mappedChanged" }
-        Signal {
-            name: "damaged"
-            Parameter { name: "rect"; type: "QRegion" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { name: "newParent"; type: "QWaylandSurface"; isPointer: true }
-            Parameter { name: "oldParent"; type: "QWaylandSurface"; isPointer: true }
-        }
-        Signal {
-            name: "childAdded"
-            Parameter { name: "child"; type: "QWaylandSurface"; isPointer: true }
-        }
-        Signal {
-            name: "offsetForNextFrame"
-            Parameter { name: "offset"; type: "QPoint" }
-        }
-        Signal { name: "pong" }
-        Signal { name: "surfaceDestroyed" }
-        Signal {
-            name: "subsurfacePositionChanged"
-            Parameter { name: "position"; type: "QPoint" }
-        }
-        Signal {
-            name: "subsurfacePlaceAbove"
-            Parameter { name: "sibling"; type: "QWaylandSurface"; isPointer: true }
-        }
-        Signal {
-            name: "subsurfacePlaceBelow"
-            Parameter { name: "sibling"; type: "QWaylandSurface"; isPointer: true }
-        }
-        Signal {
-            name: "configure"
-            Parameter { name: "hasBuffer"; type: "bool" }
-        }
-        Signal { name: "redraw" }
-        Method { name: "updateSelection" }
-        Method {
-            name: "initialize"
-            Parameter { name: "compositor"; type: "QWaylandCompositor"; isPointer: true }
-            Parameter { name: "client"; type: "QWaylandClient"; isPointer: true }
-            Parameter { name: "id"; type: "uint" }
-            Parameter { name: "version"; type: "int" }
-        }
-        Method { name: "destroy" }
-        Method { name: "isDestroyed"; type: "bool" }
-        Method { name: "frameStarted" }
-        Method { name: "sendFrameCallbacks" }
-    }
-    Component {
-        name: "QWaylandView"
-        prototype: "QObject"
-        exports: ["QtWayland.Compositor/WaylandView 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "renderObject"; type: "QObject"; isReadonly: true; isPointer: true }
-        Property { name: "surface"; type: "QWaylandSurface"; isPointer: true }
-        Property { name: "output"; type: "QWaylandOutput"; isPointer: true }
-        Property { name: "bufferLock"; type: "bool" }
-        Property { name: "discardFrontBuffers"; type: "bool" }
-        Signal { name: "surfaceDestroyed" }
-    }
-    Component {
         prototype: "QQuickItem"
         name: "QtWayland.Compositor/WaylandCursorItem 1.0"
         exports: ["QtWayland.Compositor/WaylandCursorItem 1.0"]