static QImage rotated180(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;
friend class QRasterPixmapData;
friend class QBlittablePixmapData;
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:
QT_BEGIN_NAMESPACE
-// ### Qt 5: remove
-Q_GUI_EXPORT qint64 qt_pixmap_id(const QPixmap &pixmap)
-{
- return pixmap.cacheKey();
-}
-
static bool qt_pixmap_thread_test()
{
if (!qApp) {
#if !defined(QT_NO_DATASTREAM)
friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPixmap &);
#endif
- friend Q_GUI_EXPORT qint64 qt_pixmap_id(const QPixmap &pixmap);
public:
QPixmapData* pixmapData() const;
*/
QPixmap *QItemDelegate::selected(const QPixmap &pixmap, const QPalette &palette, bool enabled) const
{
- QString key = qPixmapSerial(qt_pixmap_id(pixmap), enabled);
+ QString key = qPixmapSerial(pixmap.cacheKey(), enabled);
QPixmap *pm = QPixmapCache::find(key);
if (!pm) {
QImage img = pixmap.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied);
QT_BEGIN_NAMESPACE
-extern qint64 qt_pixmap_id(const QPixmap &pixmap);
-extern qint64 qt_image_id(const QImage &image);
-
//#define FONT_DUMP
// might be helpful for smooth transforms of images
return 0;
QImage image = brush.texture().toImage();
bool bitmap = true;
- imageObject = addImage(image, &bitmap, qt_pixmap_id(brush.texture()));
+ imageObject = addImage(image, &bitmap, brush.texture().cacheKey());
if (imageObject != -1) {
QImage::Format f = image.format();
if (f != QImage::Format_MonoLSB && f != QImage::Format_Mono) {