1 files changed, 12 insertions, 14 deletions
diff --git a/src/plugins/platforms/xcb/qglxintegration.h b/src/plugins/platforms/xcb/qglxintegration.h
index 84de7b7143..bbe67b653a 100644
--- a/src/plugins/platforms/xcb/qglxintegration.h
+++ b/src/plugins/platforms/xcb/qglxintegration.h
@@ -43,36 +43,34 @@
 #define QGLXINTEGRATION_H
 
 #include "qxcbwindow.h"
+#include "qxcbscreen.h"
 
-#include <QtGui/QPlatformGLContext>
-#include <QtGui/QPlatformWindowFormat>
+#include <QtGui/QPlatformOpenGLContext>
+#include <QtGui/QSurfaceFormat>
 
 #include <QtCore/QMutex>
 
 #include <GL/glx.h>
 
-class QGLXContext : public QPlatformGLContext
+class QGLXContext : public QPlatformOpenGLContext
 {
 public:
-    QGLXContext(Window window, QXcbScreen *xd, const QPlatformWindowFormat &format);
+    QGLXContext(QXcbScreen *xd, const QSurfaceFormat &format, QPlatformOpenGLContext *share);
     ~QGLXContext();
 
-    virtual void makeCurrent();
-    virtual void doneCurrent();
-    virtual void swapBuffers();
-    virtual void* getProcAddress(const QString& procName);
+    bool makeCurrent(QPlatformSurface *surface);
+    void doneCurrent();
+    void swapBuffers(QPlatformSurface *surface);
+    void (*getProcAddress(const QByteArray &procName)) ();
 
-    GLXContext glxContext() const { return m_context; }
+    QSurfaceFormat format() const;
 
-    QPlatformWindowFormat platformWindowFormat() const;
+    GLXContext glxContext() const { return m_context; }
 
 private:
     QXcbScreen *m_screen;
-    Drawable m_drawable;
     GLXContext m_context;
-    QPlatformWindowFormat m_windowFormat;
-
-    QGLXContext (QXcbScreen *screen, Drawable drawable, GLXContext context);
+    QSurfaceFormat m_format;
 };
 
 #endif