Make the native interface get the waylandintegration handle

Then we don't need to go through the screen and the default screen if we
don't have a handle.

Change-Id: I2a2bb4d87a41c1acdf9af2f3abf3647b0f405a3a
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

1 files changed, 8 insertions, 14 deletions

diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
index d42d68b00..a079b6ed4 100644
--- a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
@@ -43,17 +43,24 @@
 #include "qwaylanddisplay.h"
 #include "qwaylandwindow.h"
 #include "qwaylandextendedsurface.h"
+#include "qwaylandintegration.h"
+#include "qwaylanddisplay.h"
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/QScreen>
 
 #include "windowmanager_integration/qwaylandwindowmanagerintegration.h"
 
+QWaylandNativeInterface::QWaylandNativeInterface(QWaylandIntegration *integration)
+    : m_integration(integration)
+{
+}
+
 void *QWaylandNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window)
 {
     QByteArray lowerCaseResource = resourceString.toLower();
 
     if (lowerCaseResource == "display")
-	return qPlatformScreenForWindow(window)->display()->wl_display();
+        return m_integration->display()->wl_display();
     if (lowerCaseResource == "surface") {
 	return ((QWaylandWindow *) window->handle())->wl_surface();
     }
@@ -61,19 +68,6 @@ void *QWaylandNativeInterface::nativeResourceForWindow(const QByteArray &resourc
     return NULL;
 }
 
-
-QWaylandScreen * QWaylandNativeInterface::qPlatformScreenForWindow(QWindow *window)
-{
-    QWaylandScreen *screen;
-
-    if (window) {
-        screen = static_cast<QWaylandScreen *>(window->screen()->handle());
-    } else {
-        screen = static_cast<QWaylandScreen *>(QGuiApplication::primaryScreen()->handle());
-    }
-    return screen;
-}
-
 QVariantMap QWaylandNativeInterface::windowProperties(QPlatformWindow *window) const
 {
     QWaylandWindow *waylandWindow = static_cast<QWaylandWindow *>(window);