diff options
Diffstat (limited to 'src/gui/image/qpixmap.h')
-rw-r--r-- | src/gui/image/qpixmap.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 544425754b..5be98be14d 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -8,8 +8,8 @@ #include <QtGui/qpaintdevice.h> #include <QtGui/qcolor.h> #include <QtCore/qnamespace.h> +#include <QtCore/qshareddata.h> #include <QtCore/qstring.h> // char*->QString conversion -#include <QtCore/qsharedpointer.h> #include <QtGui/qimage.h> #include <QtGui/qtransform.h> @@ -129,7 +129,6 @@ private: QPixmap(const QSize &s, int type); void doInit(int, int, int); - Q_DUMMY_COMPARISON_OPERATOR(QPixmap) friend class QPlatformPixmap; friend class QBitmap; friend class QPaintDevice; @@ -164,7 +163,7 @@ inline void QPixmap::scroll(int dx, int dy, int ax, int ay, int awidth, int ahei inline bool QPixmap::loadFromData(const QByteArray &buf, const char *format, Qt::ImageConversionFlags flags) { - return loadFromData(reinterpret_cast<const uchar *>(buf.constData()), buf.size(), format, flags); + return loadFromData(reinterpret_cast<const uchar *>(buf.constData()), uint(buf.size()), format, flags); } |