From c5d1f239426b4cf9b3ddc0f34fd1514504dfb985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Mon, 23 May 2011 09:52:14 +0200
Subject: [PATCH] Remove superfluous setter  / getter for QWindowFormat in
 QWindow.

---
 src/gui/kernel/qwindow.cpp                            | 11 -----------
 src/gui/kernel/qwindow.h                              |  3 ---
 .../xcomposite_glx/qwaylandxcompositeglxcontext.cpp   |  2 +-
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 5efd087b09..b5bcc72d10 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -388,17 +388,6 @@ QWindowContext * QWindow::glContext() const
     return d->glContext;
 }
 
-void QWindow::setRequestFormat(const QWindowFormat &format)
-{
-    Q_D(QWindow);
-    d->requestedFormat = format;
-}
-
-QWindowFormat QWindow::format() const
-{
-    return QWindowFormat();
-}
-
 void QWindow::destroy()
 {
     Q_D(QWindow);
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index de4e414703..998a48fb42 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -136,9 +136,6 @@ public:
 
     QWindowContext *glContext() const;
 
-    void setRequestFormat(const QWindowFormat &format);
-    QWindowFormat format() const;
-
     void destroy();
 
     QPlatformWindow *handle() const;
diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
index 39bd99e5a0..d4d7d8aff0 100644
--- a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
@@ -56,7 +56,7 @@ QWaylandXCompositeGLXContext::QWaylandXCompositeGLXContext(QWaylandXCompositeGLX
     , mWindow(window)
     , mBuffer(0)
     , mXWindow(0)
-    , mConfig(qglx_findConfig(glxIntegration->xDisplay(),glxIntegration->screen(),window->window()->format()))
+    , mConfig(qglx_findConfig(glxIntegration->xDisplay(),glxIntegration->screen(),window->window()->requestedWindowFormat()))
     , mWaitingForSyncCallback(false)
 {
     XVisualInfo *visualInfo = glXGetVisualFromFBConfig(glxIntegration->xDisplay(),mConfig);