1 files changed, 3 insertions, 26 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index 0c7342329..cc1826fc7 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -40,7 +40,6 @@
 #include "qwaylandclient.h"
 #include "qwaylandinput.h"
 #include "qwaylandoutput.h"
-#include "qwaylandglobalinterface.h"
 #include "qwaylandsurfaceview.h"
 #include "qwaylandclient.h"
 
@@ -48,8 +47,9 @@
 #include "wayland_wrapper/qwldatadevice_p.h"
 #include "wayland_wrapper/qwlsurface_p.h"
 #include "wayland_wrapper/qwlinputdevice_p.h"
-#include "wayland_wrapper/qwlinputpanel_p.h"
-#include "wayland_wrapper/qwlshellsurface_p.h"
+
+#include "extensions/qwlinputpanel_p.h"
+#include "extensions/qwlshellsurface_p.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QStringList>
@@ -69,7 +69,6 @@ QWaylandCompositor::QWaylandCompositor(QObject *parent)
 
 QWaylandCompositor::~QWaylandCompositor()
 {
-    qDeleteAll(m_compositor->m_globals);
     delete m_compositor;
 }
 
@@ -111,17 +110,6 @@ QWaylandCompositor::ExtensionFlags QWaylandCompositor::extensionFlags() const
     return m_compositor->extensions();
 }
 
-void QWaylandCompositor::addGlobalInterface(QWaylandGlobalInterface *interface)
-{
-    wl_global_create(m_compositor->wl_display(), interface->interface(), interface->version(), interface, QtWayland::Compositor::bindGlobal);
-    m_compositor->m_globals << interface;
-}
-
-void QWaylandCompositor::addDefaultShell()
-{
-    addGlobalInterface(new QtWayland::Shell);
-}
-
 struct wl_display *QWaylandCompositor::waylandDisplay() const
 {
     return m_compositor->wl_display();
@@ -311,11 +299,6 @@ QWaylandInputDevice *QWaylandCompositor::defaultInputDevice() const
     return m_compositor->defaultInputDevice()->handle();
 }
 
-QWaylandInputPanel *QWaylandCompositor::inputPanel() const
-{
-    return m_compositor->inputPanel()->handle();
-}
-
 QWaylandDrag *QWaylandCompositor::drag() const
 {
     return m_compositor->defaultInputDevice()->dragHandle();
@@ -346,12 +329,6 @@ void QWaylandCompositor::setCursorSurface(QWaylandSurface *surface, int hotspotX
 }
 #endif
 
-void QWaylandCompositor::configureTouchExtension(TouchExtensionFlags flags)
-{
-    m_compositor->configureTouchExtension(flags);
-}
-
-
 QWaylandSurfaceView *QWaylandCompositor::createSurfaceView(QWaylandSurface *surface)
 {
     QWaylandSurfaceView *view = createView();