From d5393e2b159b3298b0ee8d0024ae0e02fca56e90 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Fri, 12 Aug 2011 16:01:44 +0200 Subject: [PATCH] prepare to support refactor based on QWindow --- src/qt-compositor/compositor_api/waylandcompositor.cpp | 4 ++-- src/qt-compositor/compositor_api/waylandcompositor.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qt-compositor/compositor_api/waylandcompositor.cpp b/src/qt-compositor/compositor_api/waylandcompositor.cpp index 0d36162..e312cec 100644 --- a/src/qt-compositor/compositor_api/waylandcompositor.cpp +++ b/src/qt-compositor/compositor_api/waylandcompositor.cpp @@ -50,7 +50,7 @@ #include "waylandsurfaceitem.h" #endif -WaylandCompositor::WaylandCompositor(QWidget *topLevelWidget, QGLContext *context, const char *socketName) +WaylandCompositor::WaylandCompositor(QWindow *topLevelWidget, QGLContext *context, const char *socketName) : m_compositor(0) , m_glContext(context) , m_toplevel_widget(topLevelWidget) @@ -115,7 +115,7 @@ QGLContext * WaylandCompositor::glContext() const return m_glContext; } -QWidget * WaylandCompositor::topLevelWidget() const +QWindow * WaylandCompositor::topLevelWidget() const { return m_toplevel_widget; } diff --git a/src/qt-compositor/compositor_api/waylandcompositor.h b/src/qt-compositor/compositor_api/waylandcompositor.h index f3459d4..546af78 100644 --- a/src/qt-compositor/compositor_api/waylandcompositor.h +++ b/src/qt-compositor/compositor_api/waylandcompositor.h @@ -62,7 +62,7 @@ namespace Wayland class WaylandCompositor { public: - WaylandCompositor(QWidget *topLevelWidget = 0, QGLContext *context = 0, const char *socketName = 0); + WaylandCompositor(QWindow *topLevelWidget = 0, QGLContext *context = 0, const char *socketName = 0); virtual ~WaylandCompositor(); void frameFinished(WaylandSurface *surface = 0); @@ -75,7 +75,7 @@ public: WaylandSurface *directRenderSurface() const; QGLContext *glContext() const; - QWidget *topLevelWidget()const; + QWindow *topLevelWidget()const; virtual void surfaceCreated(WaylandSurface *surface) = 0; @@ -99,7 +99,7 @@ private: Wayland::Compositor *m_compositor; QGLContext *m_glContext; - QWidget *m_toplevel_widget; + QWindow *m_toplevel_widget; QByteArray m_socket_name; }; -- 2.7.4