diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-15 14:07:12 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-07-19 09:50:37 +0200 |
| commit | 310519d6d11da546b23c1cba307f37c24e0a5c0b (patch) | |
| tree | 3118b6539107ba0541abd09005bacc4e592a27e0 /src/plugins/platforms/xlib | |
| parent | 5abf4f55b1bd1180ea2dbfb867a48364bc89af80 (diff) | |
Rename QPixmapData to QPlatformPixmap.
Makes the API symmetric with the other Lighthouse APIs.
Change-Id: I8a399f3c968ea35d4624711b31f2ac5bb94b7893
Reviewed-on: http://codereview.qt.nokia.com/1735
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/plugins/platforms/xlib')
| -rw-r--r-- | src/plugins/platforms/xlib/qxlibintegration.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/platforms/xlib/qxlibintegration.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/xlib/qxlibintegration.cpp b/src/plugins/platforms/xlib/qxlibintegration.cpp index f659d439ec..bf3f06b081 100644 --- a/src/plugins/platforms/xlib/qxlibintegration.cpp +++ b/src/plugins/platforms/xlib/qxlibintegration.cpp @@ -59,7 +59,7 @@ #include <EGL/egl.h> #endif //!defined(QT_OPENGL_ES_2) #include <private/qwindowsurface_gl_p.h> -#include <private/qpixmapdata_gl_p.h> +#include <qplatformpixmap_gl_p.h> #endif //QT_NO_OPENGL QT_BEGIN_NAMESPACE @@ -83,13 +83,13 @@ bool QXlibIntegration::hasCapability(QPlatformIntegration::Capability cap) const } } -QPixmapData *QXlibIntegration::createPixmapData(QPixmapData::PixelType type) const +QPlatformPixmap *QXlibIntegration::createPlatformPixmap(QPlatformPixmap::PixelType type) const { #ifndef QT_NO_OPENGL if (mUseOpenGL) - return new QGLPixmapData(type); + return new QGLPlatformPixmap(type); #endif - return new QRasterPixmapData(type); + return new QRasterPlatformPixmap(type); } QWindowSurface *QXlibIntegration::createWindowSurface(QWidget *widget, WId) const diff --git a/src/plugins/platforms/xlib/qxlibintegration.h b/src/plugins/platforms/xlib/qxlibintegration.h index ce5f35a41d..3261e1a7fc 100644 --- a/src/plugins/platforms/xlib/qxlibintegration.h +++ b/src/plugins/platforms/xlib/qxlibintegration.h @@ -61,7 +61,7 @@ public: QXlibIntegration(bool useOpenGL = false); bool hasCapability(Capability cap) const; - QPixmapData *createPixmapData(QPixmapData::PixelType type) const; + QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const; QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId) const; QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const; QAbstractEventDispatcher *createEventDispatcher() const; |