summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qbitmap.cpp
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-07-15 14:07:12 +0200
committerJørgen Lind <jorgen.lind@nokia.com>2011-07-19 09:50:37 +0200
commit310519d6d11da546b23c1cba307f37c24e0a5c0b (patch)
tree3118b6539107ba0541abd09005bacc4e592a27e0 /src/gui/image/qbitmap.cpp
parent5abf4f55b1bd1180ea2dbfb867a48364bc89af80 (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/gui/image/qbitmap.cpp')
-rw-r--r--src/gui/image/qbitmap.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp
index 59b8bb037e..c614ba1b0a 100644
--- a/src/gui/image/qbitmap.cpp
+++ b/src/gui/image/qbitmap.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include "qbitmap.h"
-#include "qpixmapdata_p.h"
+#include "qplatformpixmap_qpa.h"
#include "qimage.h"
#include "qvariant.h"
#include <qpainter.h>
@@ -101,7 +101,7 @@ QT_BEGIN_NAMESPACE
\sa QPixmap::isNull()
*/
QBitmap::QBitmap()
- : QPixmap(QSize(0, 0), QPixmapData::BitmapType)
+ : QPixmap(QSize(0, 0), QPlatformPixmap::BitmapType)
{
}
@@ -115,7 +115,7 @@ QBitmap::QBitmap()
*/
QBitmap::QBitmap(int w, int h)
- : QPixmap(QSize(w, h), QPixmapData::BitmapType)
+ : QPixmap(QSize(w, h), QPlatformPixmap::BitmapType)
{
}
@@ -127,7 +127,7 @@ QBitmap::QBitmap(int w, int h)
*/
QBitmap::QBitmap(const QSize &size)
- : QPixmap(size, QPixmapData::BitmapType)
+ : QPixmap(size, QPlatformPixmap::BitmapType)
{
}
@@ -172,7 +172,7 @@ QBitmap::QBitmap(const QPixmap &pixmap)
*/
QBitmap::QBitmap(const QString& fileName, const char *format)
- : QPixmap(QSize(0, 0), QPixmapData::BitmapType)
+ : QPixmap(QSize(0, 0), QPlatformPixmap::BitmapType)
{
load(fileName, format, Qt::MonoOnly);
}
@@ -260,7 +260,7 @@ QBitmap QBitmap::fromImage(const QImage &image, Qt::ImageConversionFlags flags)
img.setColor(1, c0);
}
- QScopedPointer<QPixmapData> data(QGuiApplicationPrivate::platformIntegration()->createPixmapData(QPixmapData::BitmapType));
+ QScopedPointer<QPlatformPixmap> data(QGuiApplicationPrivate::platformIntegration()->createPlatformPixmap(QPlatformPixmap::BitmapType));
data->fromImage(img, flags | Qt::MonoOnly);
return QPixmap(data.take());