1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove qt_image_id() and qt_image_colortable().

Browse Source 
Both of these have been unused at least as far back as Qt 4.5 according to git
log -p.

Change-Id: I381024cb1621fbfdb806a62e1cc55ce13219ef17
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
This commit is contained in:
Robin Burchell 2011-12-20 12:53:32 +01:00 committed by Qt by Nokia
parent b652cc8d20
commit ab9ce77e09
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/image/qimage.cpp
View File

@ -114,17 +114,6 @@ static QImage rotated90(const QImage &src);
static QImage rotated180(const QImage &src); static QImage rotated180(const QImage &src);
static QImage rotated270(const QImage &src); static QImage rotated270(const QImage &src);
// ### Qt 5: remove
Q_GUI_EXPORT qint64 qt_image_id(const QImage &image)
{
return image.cacheKey();
}
const QVector<QRgb> *qt_image_colortable(const QImage &image)
{
return &image.d->colortable;
}
QBasicAtomicInt qimage_serial_number = Q_BASIC_ATOMIC_INITIALIZER(1); QBasicAtomicInt qimage_serial_number = Q_BASIC_ATOMIC_INITIALIZER(1);
QImageData::QImageData() QImageData::QImageData()

2
src/gui/image/qimage.h
View File

@ -295,8 +295,6 @@ private:
friend class QRasterPlatformPixmap; friend class QRasterPlatformPixmap;
friend class QBlittablePlatformPixmap; friend class QBlittablePlatformPixmap;
friend class QPixmapCacheEntry; friend class QPixmapCacheEntry;
friend Q_GUI_EXPORT qint64 qt_image_id(const QImage &image);
friend const QVector<QRgb> *qt_image_colortable(const QImage &image);
public: public:
typedef QImageData * DataPtr; typedef QImageData * DataPtr;

2
src/gui/painting/qpaintengine_raster.cpp
View File

@ -4501,8 +4501,6 @@ void QSpanData::setupMatrix(const QTransform &matrix, int bilin)
adjustSpanMethods(); adjustSpanMethods();
} }
extern const QVector<QRgb> *qt_image_colortable(const QImage &image);
void QSpanData::initTexture(const QImage *image, int alpha, QTextureData::Type _type, const QRect &sourceRect) void QSpanData::initTexture(const QImage *image, int alpha, QTextureData::Type _type, const QRect &sourceRect)
{ {
const QImageData *d = const_cast<QImage *>(image)->data_ptr(); const QImageData *d = const_cast<QImage *>(image)->data_ptr();