remove obsolete qt_image_id() and qt_pixmap_id()

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 55d1603..f5d79c6 100644 (file)
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -109,12 +109,6 @@ static QImage rotated90(const QImage &src);
 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;

diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 023aced..a87f6ad 100644 (file)
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -274,7 +274,6 @@ private:
     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:

diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index ef1dd3a..1028b28 100644 (file)
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -87,12 +87,6 @@
 
 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) {

diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 9592853..cf7d209 100644 (file)
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -240,7 +240,6 @@ private:
 #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;

diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp
index 76fe551..69b221c 100644 (file)
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
@@ -1044,7 +1044,7 @@ static QString qPixmapSerial(quint64 i, bool enabled)
 */
 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);

diff --git a/src/gui/painting/qprintengine_pdf.cpp b/src/gui/painting/qprintengine_pdf.cpp
index 1fe1096..ec3a69e 100644 (file)
--- a/src/gui/painting/qprintengine_pdf.cpp
+++ b/src/gui/painting/qprintengine_pdf.cpp
@@ -68,9 +68,6 @@
 
 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
@@ -469,7 +466,7 @@ int QPdfEnginePrivate::addBrushPattern(const QTransform &m, bool *specifyColor,
             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) {