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, 0 insertions, 241 deletions

diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp
deleted file mode 100644
index 5eb34b849..000000000
--- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qwaylandquickshellsurfaceitem.h"
-#include "qwaylandquickshellsurfaceitem_p.h"
-
-#include <QtWaylandCompositor/QWaylandCompositor>
-#include <QtWaylandCompositor/QWaylandInputDevice>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- * \qmltype ShellSurfaceItem
- * \inqmlmodule QtWayland.Compositor
- * \brief An item representing a ShellSurface.
- *
- * This type can be used to render shell surfaces as part of a Qt Quick scene.
- * It handles moving and resizing triggered by clicking on the window decorations.
- */
-
-/*!
- * \class QWaylandQuickShellSurfaceItem
- * \inmodule QtWaylandCompositor
- * \brief A Qt Quick item for QWaylandShellSurface.
- *
- * This class can be used to create Qt Quick items representing shell surfaces.
- * It handles moving and resizing triggered by clicking on the window decorations.
- *
- * \sa QWaylandQuickItem
- */
-
-/*!
- * Constructs a QWaylandQuickShellSurfaceItem with the given \a parent.
- */
-QWaylandQuickShellSurfaceItem::QWaylandQuickShellSurfaceItem(QQuickItem *parent)
-    : QWaylandQuickItem(*new QWaylandQuickShellSurfaceItemPrivate(), parent)
-{
-}
-
-/*!
- * \internal
- */
-QWaylandQuickShellSurfaceItem::QWaylandQuickShellSurfaceItem(QWaylandQuickShellSurfaceItemPrivate &dd, QQuickItem *parent)
-    : QWaylandQuickItem(dd, parent)
-{
-}
-
-/*!
- * \qmlproperty object QtWaylandCompositor::ShellSurfaceItem::shellSurface
- *
- * This property holds the shell surface rendered by this ShellSurfaceItem.
- */
-
-/*!
- * \property QWaylandQuickShellSurfaceItem::shellSurface
- *
- * This property holds the shell surface rendered by this QWaylandQuickShellSurfaceItem.
- */
-QWaylandShellSurface *QWaylandQuickShellSurfaceItem::shellSurface() const
-{
-    Q_D(const QWaylandQuickShellSurfaceItem);
-    return d->shellSurface;
-}
-
-void QWaylandQuickShellSurfaceItem::setShellSurface(QWaylandShellSurface *shellSurface)
-{
-    Q_D(QWaylandQuickShellSurfaceItem);
-    if (shellSurface == d->shellSurface)
-        return;
-
-    if (d->shellSurface) {
-        disconnect(d->shellSurface, &QWaylandShellSurface::startMove, this, &QWaylandQuickShellSurfaceItem::handleStartMove);
-        disconnect(d->shellSurface, &QWaylandShellSurface::startResize, this, &QWaylandQuickShellSurfaceItem::handleStartResize);
-    }
-    d->shellSurface = shellSurface;
-    if (d->shellSurface) {
-        connect(d->shellSurface, &QWaylandShellSurface::startMove, this, &QWaylandQuickShellSurfaceItem::handleStartMove);
-        connect(d->shellSurface, &QWaylandShellSurface::startResize, this, &QWaylandQuickShellSurfaceItem::handleStartResize);
-    }
-    emit shellSurfaceChanged();
-}
-
-/*!
- * \internal
- * \property QWaylandQuickShellSurfaceItem::moveItem
- *
- * This property holds the move item for this QWaylandQuickShellSurfaceItem.
- */
-QQuickItem *QWaylandQuickShellSurfaceItem::moveItem() const
-{
-    Q_D(const QWaylandQuickShellSurfaceItem);
-    return d->moveItem;
-}
-
-void QWaylandQuickShellSurfaceItem::setMoveItem(QQuickItem *moveItem)
-{
-    Q_D(QWaylandQuickShellSurfaceItem);
-    if (d->moveItem == moveItem)
-        return;
-    d->moveItem = moveItem;
-    moveItemChanged();
-}
-
-/*!
- * \internal
- */
-void QWaylandQuickShellSurfaceItem::handleStartMove(QWaylandInputDevice *inputDevice)
-{
-    Q_D(QWaylandQuickShellSurfaceItem);
-    d->grabberState = QWaylandQuickShellSurfaceItemPrivate::MoveState;
-    d->moveState.inputDevice = inputDevice;
-    d->moveState.initialized = false;
-}
-
-/*!
- * \internal
- */
-void QWaylandQuickShellSurfaceItem::handleStartResize(QWaylandInputDevice *inputDevice, QWaylandShellSurface::ResizeEdge edges)
-{
-    Q_D(QWaylandQuickShellSurfaceItem);
-    d->grabberState = QWaylandQuickShellSurfaceItemPrivate::ResizeState;
-    d->resizeState.inputDevice = inputDevice;
-    d->resizeState.resizeEdges = edges;
-    d->resizeState.initialSize = surface()->size();
-    d->resizeState.initialized = false;
-}
-
-/*!
- * \internal
- */
-void QWaylandQuickShellSurfaceItem::adjustOffsetForNextFrame(const QPointF &offset)
-{
-    Q_D(QWaylandQuickShellSurfaceItem);
-    QQuickItem *moveItem = d->moveItem ? d->moveItem : this;
-    moveItem->setPosition(moveItem->position() + offset);
-}
-
-/*!
- * \internal
- */
-void QWaylandQuickShellSurfaceItem::mouseMoveEvent(QMouseEvent *event)
-{
-    Q_D(QWaylandQuickShellSurfaceItem);
-    if (d->grabberState == QWaylandQuickShellSurfaceItemPrivate::ResizeState) {
-        Q_ASSERT(d->resizeState.inputDevice == compositor()->inputDeviceFor(event));
-        if (!d->resizeState.initialized) {
-            d->resizeState.initialMousePos = event->windowPos();
-            d->resizeState.initialized = true;
-            return;
-        }
-        QPointF delta = event->windowPos() - d->resizeState.initialMousePos;
-        QSize newSize = shellSurface()->sizeForResize(d->resizeState.initialSize, delta, d->resizeState.resizeEdges);
-        shellSurface()->sendConfigure(newSize, d->resizeState.resizeEdges);
-    } else if (d->grabberState == QWaylandQuickShellSurfaceItemPrivate::MoveState) {
-        Q_ASSERT(d->moveState.inputDevice == compositor()->inputDeviceFor(event));
-        QQuickItem *moveItem = d->moveItem ? d->moveItem : this;
-        if (!d->moveState.initialized) {
-            d->moveState.initialOffset = moveItem->mapFromItem(Q_NULLPTR, event->windowPos());
-            d->moveState.initialized = true;
-            return;
-        }
-        if (!moveItem->parentItem())
-            return;
-        QPointF parentPos = moveItem->parentItem()->mapFromItem(Q_NULLPTR, event->windowPos());
-        moveItem->setPosition(parentPos - d->moveState.initialOffset);
-    } else {
-        QWaylandQuickItem::mouseMoveEvent(event);
-    }
-}
-
-/*!
- * \internal
- */
-void QWaylandQuickShellSurfaceItem::mouseReleaseEvent(QMouseEvent *event)
-{
-    Q_D(QWaylandQuickShellSurfaceItem);
-    if (d->grabberState != QWaylandQuickShellSurfaceItemPrivate::DefaultState) {
-        d->grabberState = QWaylandQuickShellSurfaceItemPrivate::DefaultState;
-        return;
-    }
-    QWaylandQuickItem::mouseReleaseEvent(event);
-}
-
-/*!
- * \internal
- */
-void QWaylandQuickShellSurfaceItem::surfaceChangedEvent(QWaylandSurface *newSurface, QWaylandSurface *oldSurface)
-{
-    if (oldSurface)
-        disconnect(oldSurface, &QWaylandSurface::offsetForNextFrame, this, &QWaylandQuickShellSurfaceItem::adjustOffsetForNextFrame);
-
-    if (newSurface)
-        connect(newSurface, &QWaylandSurface::offsetForNextFrame, this, &QWaylandQuickShellSurfaceItem::adjustOffsetForNextFrame);
-}
-
-/*!
- * \internal
- */
-void QWaylandQuickShellSurfaceItem::componentComplete()
-{
-    Q_D(QWaylandQuickShellSurfaceItem);
-    if (!d->shellSurface)
-        setShellSurface(new QWaylandShellSurface());
-
-    QWaylandQuickItem::componentComplete();
-}
-
-QT_END_NAMESPACE