diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-22 10:49:28 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-29 10:25:24 +0200 |
commit | 6e28e8441b698c3397c2c78125c877f2e9867cb1 (patch) | |
tree | 1e3ad0e43cb775854835817cd04bdc8b5e047e15 /src/plugins/platforms/windows | |
parent | aaa4a26f82f99fa8724841eba91bad029306e0ce (diff) |
Copy core GL functionality to QtGui with QGL -> QOpenGL naming.
Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855
Reviewed-on: http://codereview.qt.nokia.com/3710
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows')
4 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp index e94b4ffdf2..4abccfb416 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp @@ -778,7 +778,7 @@ QDebug operator<<(QDebug d, const QOpenGLStaticContext &s) */ QWindowsGLContext::QWindowsGLContext(const QOpenGLStaticContextPtr &staticContext, - QGuiGLContext *context) : + QOpenGLContext *context) : m_staticContext(staticContext), m_context(context), m_pixelFormat(0), m_extensionsUsed(false) @@ -843,7 +843,7 @@ QWindowsGLContext::QWindowsGLContext(const QOpenGLStaticContextPtr &staticContex } // Create context with sharing, again preferably using ARB. HGLRC sharingRenderingContext = 0; - if (const QPlatformGLContext *sc = context->shareHandle()) + if (const QPlatformOpenGLContext *sc = context->shareHandle()) sharingRenderingContext = static_cast<const QWindowsGLContext *>(sc)->renderingContext(); if (m_extensionsUsed) diff --git a/src/plugins/platforms/windows/qwindowsglcontext.h b/src/plugins/platforms/windows/qwindowsglcontext.h index c5edd8978f..0bf8ffbbc5 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.h +++ b/src/plugins/platforms/windows/qwindowsglcontext.h @@ -45,8 +45,8 @@ #include "array.h" #include "qtwindows_additional.h" -#include <QtGui/QPlatformGLContext> -#include <QtGui/QGuiGLContext> +#include <QtGui/QPlatformOpenGLContext> +#include <QtGui/QOpenGLContext> #include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE @@ -125,13 +125,13 @@ public: QDebug operator<<(QDebug d, const QOpenGLStaticContext &); -class QWindowsGLContext : public QPlatformGLContext +class QWindowsGLContext : public QPlatformOpenGLContext { public: typedef QSharedPointer<QOpenGLStaticContext> QOpenGLStaticContextPtr; explicit QWindowsGLContext(const QOpenGLStaticContextPtr &staticContext, - QGuiGLContext *context); + QOpenGLContext *context); virtual ~QWindowsGLContext(); bool isValid() const { return m_renderingContext; } virtual QSurfaceFormat format() const { return m_obtainedFormat; } @@ -151,7 +151,7 @@ private: inline void releaseDCs(); const QOpenGLStaticContextPtr m_staticContext; - QGuiGLContext *m_context; + QOpenGLContext *m_context; QSurfaceFormat m_obtainedFormat; HGLRC m_renderingContext; Array<QOpenGLContextData> m_windowContexts; diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index fdcc05abe0..cde6da671a 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -217,8 +217,8 @@ QPlatformBackingStore *QWindowsIntegration::createPlatformBackingStore(QWindow * return new QWindowsBackingStore(window); } -QPlatformGLContext - *QWindowsIntegration::createPlatformGLContext(QGuiGLContext *context) const +QPlatformOpenGLContext + *QWindowsIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const { if (QWindowsContext::verboseIntegration) qDebug() << __FUNCTION__ << context->format(); diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h index 70f12f8bfd..14a65c67e0 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.h +++ b/src/plugins/platforms/windows/qwindowsintegration.h @@ -60,7 +60,7 @@ public: virtual QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const; QPlatformWindow *createPlatformWindow(QWindow *window) const; QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; - virtual QPlatformGLContext *createPlatformGLContext(QGuiGLContext *context) const; + virtual QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const; virtual QAbstractEventDispatcher *guiThreadEventDispatcher() const; virtual QPlatformClipboard *clipboard() const; |