Remove QtWayland::Surface

Its enough to have QWaylandSurface and QWaylandSurfacePrivate. Also
don't pass QWaylandSurfacePrivate around, but pass QWaylandSurface and
then use the QWaylandSurfacePrivate::get function.

Change-Id: I915cc9d7b4497ad1c6f1f2dee61d9d0db069ba6b

1 files changed, 5 insertions, 4 deletions

diff --git a/src/compositor/extensions/qwlextendedsurface_p.h b/src/compositor/extensions/qwlextendedsurface_p.h
index f666c44a3..052ecf5e4 100644
--- a/src/compositor/extensions/qwlextendedsurface_p.h
+++ b/src/compositor/extensions/qwlextendedsurface_p.h
@@ -40,7 +40,6 @@
 #include <wayland-server.h>
 
 #include <QtCompositor/private/qwayland-server-surface-extension.h>
-#include <private/qwlsurface_p.h>
 #include <QtCompositor/qwaylandsurface.h>
 #include <QtCompositor/qwaylandextension.h>
 
@@ -82,7 +81,7 @@ public:
     };
     Q_DECLARE_FLAGS(WindowFlags, WindowFlag)
 
-    ExtendedSurface(struct wl_client *client, uint32_t id, int version, Surface *surface);
+    ExtendedSurface(struct wl_client *client, uint32_t id, int version, QWaylandSurface *surface);
     ~ExtendedSurface();
 
     void sendGenericProperty(const QString &name, const QVariant &variant);
@@ -95,7 +94,7 @@ public:
     ExtendedSurface *parent() const;
     void setParent(ExtendedSurface *parent);
     QLinkedList<QWaylandSurface *> subSurfaces() const;
-    void setParentSurface(Surface *s);
+    void setParentSurface(QWaylandSurface *s);
 
     Qt::ScreenOrientations contentOrientationMask() const;
 
@@ -109,11 +108,13 @@ Q_SIGNALS:
     void contentOrientationMaskChanged();
     void windowFlagsChanged();
     void windowPropertyChanged(const QString &name, const QVariant &value);
+    void raiseRequested();
+    void lowerRequested();
 
 private:
     void setWindowPropertyImpl(const QString &name, const QVariant &value);
 
-    Surface *m_surface;
+    QWaylandSurface *m_surface;
 
     Qt::ScreenOrientations m_contentOrientationMask;