From b05d022ccda5707eb0c4b545bb273fa4af67a3a8 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@nokia.com>
Date: Thu, 8 Sep 2011 09:53:59 +0200
Subject: More xlib plugin fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I8b8093cd9e66129dd7cc631dd36a2fb27c3d617e
Reviewed-on: http://codereview.qt-project.org/4408
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/platforms/xlib/qglxintegration.cpp     |  1 -
 .../platforms/xlib/qxlibnativeinterface.cpp        | 38 +++++++++++-----------
 src/plugins/platforms/xlib/qxlibnativeinterface.h  | 16 ++++-----
 3 files changed, 27 insertions(+), 28 deletions(-)

(limited to 'src/plugins/platforms')

diff --git a/src/plugins/platforms/xlib/qglxintegration.cpp b/src/plugins/platforms/xlib/qglxintegration.cpp
index f3badd657f..6733f22093 100644
--- a/src/plugins/platforms/xlib/qglxintegration.cpp
+++ b/src/plugins/platforms/xlib/qglxintegration.cpp
@@ -105,7 +105,6 @@ bool QGLXContext::makeCurrent(QPlatformSurface *surface)
 
 void QGLXContext::doneCurrent()
 {
-    QPlatformOpenGLContext::doneCurrent();
     glXMakeCurrent(m_screen->display()->nativeDisplay(), 0, 0);
 }
 
diff --git a/src/plugins/platforms/xlib/qxlibnativeinterface.cpp b/src/plugins/platforms/xlib/qxlibnativeinterface.cpp
index de4c960b24..2c706e64e4 100644
--- a/src/plugins/platforms/xlib/qxlibnativeinterface.cpp
+++ b/src/plugins/platforms/xlib/qxlibnativeinterface.cpp
@@ -63,29 +63,29 @@ public:
 Q_GLOBAL_STATIC(QXlibResourceMap, qXlibResourceMap)
 
 
-void * QXlibNativeInterface::nativeResourceForWidget(const QByteArray &resourceString, QWindow *widget)
+void * QXlibNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window)
 {
     QByteArray lowerCaseResource = resourceString.toLower();
     ResourceType resource = qXlibResourceMap()->value(lowerCaseResource);
     void *result = 0;
     switch(resource) {
     case Display:
-        result = displayForWidget(widget);
+        result = displayForWindow(window);
         break;
     case EglDisplay:
-        result = eglDisplayForWidget(widget);
+        result = eglDisplayForWindow(window);
         break;
     case Connection:
-        result = connectionForWidget(widget);
+        result = connectionForWindow(window);
         break;
     case Screen:
-        result = reinterpret_cast<void *>(qPlatformScreenForWidget(widget)->xScreenNumber());
+        result = reinterpret_cast<void *>(qPlatformScreenForWindow(window)->xScreenNumber());
         break;
     case GraphicsDevice:
-        result = graphicsDeviceForWidget(widget);
+        result = graphicsDeviceForWindow(window);
         break;
     case EglContext:
-        result = eglContextForWidget(widget);
+        result = eglContextForWindow(window);
         break;
     default:
         result = 0;
@@ -93,37 +93,37 @@ void * QXlibNativeInterface::nativeResourceForWidget(const QByteArray &resourceS
     return result;
 }
 
-void * QXlibNativeInterface::displayForWidget(QWindow *widget)
+void * QXlibNativeInterface::displayForWindow(QWindow *window)
 {
-    return qPlatformScreenForWidget(widget)->display()->nativeDisplay();
+    return qPlatformScreenForWindow(window)->display()->nativeDisplay();
 }
 
-void * QXlibNativeInterface::eglDisplayForWidget(QWindow *widget)
+void * QXlibNativeInterface::eglDisplayForWindow(QWindow *window)
 {
-    Q_UNUSED(widget);
+    Q_UNUSED(window);
     return 0;
 }
 
-void * QXlibNativeInterface::screenForWidget(QWindow *widget)
+void * QXlibNativeInterface::screenForWindow(QWindow *window)
 {
-    Q_UNUSED(widget);
+    Q_UNUSED(window);
     return 0;
 }
 
-void * QXlibNativeInterface::graphicsDeviceForWidget(QWindow *widget)
+void * QXlibNativeInterface::graphicsDeviceForWindow(QWindow *window)
 {
-    Q_UNUSED(widget);
+    Q_UNUSED(window);
     return 0;
 }
 
-void * QXlibNativeInterface::eglContextForWidget(QWindow *widget)
+void * QXlibNativeInterface::eglContextForWindow(QWindow *window)
 {
-    Q_UNUSED(widget);
+    Q_UNUSED(window);
     return 0;
 }
 
-QXlibScreen * QXlibNativeInterface::qPlatformScreenForWidget(QWindow *widget)
+QXlibScreen * QXlibNativeInterface::qPlatformScreenForWindow(QWindow *window)
 {
-    QScreen *screen = widget ? widget->screen() : QGuiApplication::primaryScreen();
+    QScreen *screen = window ? window->screen() : QGuiApplication::primaryScreen();
     return static_cast<QXlibScreen *>(screen->handle());
 }
diff --git a/src/plugins/platforms/xlib/qxlibnativeinterface.h b/src/plugins/platforms/xlib/qxlibnativeinterface.h
index 2260f1e379..4c6ce770b0 100644
--- a/src/plugins/platforms/xlib/qxlibnativeinterface.h
+++ b/src/plugins/platforms/xlib/qxlibnativeinterface.h
@@ -58,17 +58,17 @@ public:
         EglContext
     };
 
-    void *nativeResourceForWidget(const QByteArray &resourceString, QWindow *widget);
+    void *nativeResourceForWindow(const QByteArray &resourceString, QWindow *window);
 
-    void *displayForWidget(QWindow *widget);
-    void *eglDisplayForWidget(QWindow *widget);
-    void *connectionForWidget(QWindow *widget);
-    void *screenForWidget(QWindow *widget);
-    void *graphicsDeviceForWidget(QWindow *widget);
-    void *eglContextForWidget(QWindow *widget);
+    void *displayForWindow(QWindow *window);
+    void *eglDisplayForWindow(QWindow *window);
+    void *connectionForWindow(QWindow *window);
+    void *screenForWindow(QWindow *window);
+    void *graphicsDeviceForWindow(QWindow *window);
+    void *eglContextForWindow(QWindow *window);
 
 private:
-    static QXlibScreen *qPlatformScreenForWidget(QWindow *widget);
+    static QXlibScreen *qPlatformScreenForWindow(QWindow *window);
 };
 
 
-- 
cgit v1.2.3