Inline and mark as deprecated images's serialNumber()

These function are marked as obsolete since Qt 4.3

The motivation here was too fix QPixmap::serialNumber which is marked as
QT_DEPRECATED_SINCE but was not inlined.
But then I took the oportunity to do the same with all the other
functions.

Change-Id: Ic50a7857461fc402b2f2b4528c83e53e8e28ea30
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 5b23dbf..23d212c 100644 (file)
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -5132,7 +5132,8 @@ bool qt_xForm_helper(const QTransform &trueMat, int xoffset, int type, int depth
 #undef IWX_LSB
 #undef IWX_PIX
 
-/*! \obsolete
+/*! \fn int QImage::serialNumber() const
+    \obsolete
     Returns a number that identifies the contents of this
     QImage object. Distinct QImage objects can only have the same
     serial number if they refer to the same contents (but they don't
@@ -5147,14 +5148,6 @@ bool qt_xForm_helper(const QTransform &trueMat, int xoffset, int type, int depth
     \sa operator==()
 */
 
-int QImage::serialNumber() const
-{
-    if (!d)
-        return 0;
-    else
-        return d->ser_no;
-}
-
 /*!
     Returns a number that identifies the contents of this QImage
     object. Distinct QImage objects can only have the same key if they

diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 5a3ae8f..e9192f1 100644 (file)
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -253,7 +253,9 @@ public:
     inline static QImage fromData(const QByteArray &data, const char *format = 0)
         { return fromData(reinterpret_cast<const uchar *>(data.constData()), data.size(), format); }
 
-    int serialNumber() const;
+#if QT_DEPRECATED_SINCE(5, 0)
+    QT_DEPRECATED inline int serialNumber() const { return cacheKey() >> 32; }
+#endif
     qint64 cacheKey() const;
 
     QPaintEngine *paintEngine() const;

diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index e8c1304..1f325f5 100644 (file)
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -885,7 +885,8 @@ void QPixmap::fill(const QColor &color)
     data->fill(color);
 }
 
-/*! \obsolete
+/*! \fn int QPixmap::serialNumber() const
+    \obsolete
     Returns a number that identifies the contents of this QPixmap
     object. Distinct QPixmap objects can only have the same serial
     number if they refer to the same contents (but they don't have
@@ -898,12 +899,6 @@ void QPixmap::fill(const QColor &color)
     it as a cache key. For caching pixmaps, we recommend using the
     QPixmapCache class whenever possible.
 */
-int QPixmap::serialNumber() const
-{
-    if (isNull())
-        return 0;
-    return data->serialNumber();
-}
 
 /*!
     Returns a number that identifies this QPixmap. Distinct QPixmap

diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 27bfe15..3d78a43 100644 (file)
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -146,7 +146,7 @@ public:
     void scroll(int dx, int dy, const QRect &rect, QRegion *exposed = 0);
 
 #if QT_DEPRECATED_SINCE(5, 0)
-    QT_DEPRECATED int serialNumber() const;
+    QT_DEPRECATED inline int serialNumber() const { return cacheKey() >> 32; }
 #endif
     qint64 cacheKey() const;
 

diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp
index 8125b13..7c7c465 100644 (file)
--- a/src/gui/image/qpixmap_raster.cpp
+++ b/src/gui/image/qpixmap_raster.cpp
@@ -115,7 +115,7 @@ void QRasterPlatformPixmap::resize(int width, int height)
         image.setColor(1, QColor(Qt::color1).rgba());
     }
 
-    setSerialNumber(image.serialNumber());
+    setSerialNumber(image.cacheKey() >> 32);
 }
 
 bool QRasterPlatformPixmap::fromData(const uchar *buffer, uint len, const char *format,
@@ -349,7 +349,7 @@ void QRasterPlatformPixmap::createPixmapForImage(QImage &sourceImage, Qt::ImageC
     }
     is_null = (w <= 0 || h <= 0);
 
-    setSerialNumber(image.serialNumber());
+    setSerialNumber(image.cacheKey() >> 32);
 }
 
 QImage* QRasterPlatformPixmap::buffer()

diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index 6d3d1c9..90d9667 100644 (file)
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -844,7 +844,8 @@ bool QPalette::isEqual(QPalette::ColorGroup group1, QPalette::ColorGroup group2)
     return true;
 }
 
-/*! \obsolete
+/*! \fn int QPalette::serialNumber() const
+    \obsolete
 
     Returns a number that identifies the contents of this QPalette
     object. Distinct QPalette objects can only have the same serial
@@ -860,10 +861,6 @@ bool QPalette::isEqual(QPalette::ColorGroup group1, QPalette::ColorGroup group2)
 
     \sa operator==()
 */
-int QPalette::serialNumber() const
-{
-    return d->ser_no;
-}
 
 /*!
     Returns a number that identifies the contents of this QPalette

diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h
index cc710fa..ca619a8 100644 (file)
--- a/src/gui/kernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
@@ -139,7 +139,9 @@ public:
     inline bool operator!=(const QPalette &p) const { return !(operator==(p)); }
     bool isCopyOf(const QPalette &p) const;
 
-    int serialNumber() const;
+#if QT_DEPRECATED_SINCE(5, 0)
+    QT_DEPRECATED inline int serialNumber() const { return cacheKey() >> 32; }
+#endif
     qint64 cacheKey() const;
 
     QPalette resolve(const QPalette &) const;

diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index ddf2fb0..cbffc43 100644 (file)
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -2325,7 +2325,7 @@ void QTextCursor::insertImage(const QImage &image, const QString &name)
     }
     QString imageName = name;
     if (name.isEmpty())
-        imageName = QString::number(image.serialNumber());
+        imageName = QString::number(image.cacheKey());
     d->priv->document()->addResource(QTextDocument::ImageResource, QUrl(imageName), image);
     QTextImageFormat format;
     format.setName(imageName);

diff --git a/src/widgets/kernel/qicon.cpp b/src/widgets/kernel/qicon.cpp
index e579fac..c848dd7 100644 (file)
--- a/src/widgets/kernel/qicon.cpp
+++ b/src/widgets/kernel/qicon.cpp
@@ -621,7 +621,8 @@ QIcon::operator QVariant() const
     return QVariant(QVariant::Icon, this);
 }
 
-/*! \obsolete
+/*! \fn int QIcon::serialNumber() const
+    \obsolete
 
     Returns a number that identifies the contents of this
     QIcon object. Distinct QIcon objects can have
@@ -638,11 +639,6 @@ QIcon::operator QVariant() const
     \sa QPixmap::serialNumber()
 */
 
-int QIcon::serialNumber() const
-{
-    return d ? d->serialNum : 0;
-}
-
 /*!
     Returns a number that identifies the contents of this QIcon
     object. Distinct QIcon objects can have the same key if

diff --git a/src/widgets/kernel/qicon.h b/src/widgets/kernel/qicon.h
index 7bef500..c6e07ba 100644 (file)
--- a/src/widgets/kernel/qicon.h
+++ b/src/widgets/kernel/qicon.h
@@ -94,7 +94,9 @@ public:
     bool isDetached() const;
     void detach();
 
-    int serialNumber() const;
+#if QT_DEPRECATED_SINCE(5, 0)
+    QT_DEPRECATED inline int serialNumber() const { return cacheKey() >> 32; }
+#endif
     qint64 cacheKey() const;
 
     void addPixmap(const QPixmap &pixmap, Mode mode = Normal, State state = Off);

diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 50ae22c..7ca4fc9 100644 (file)
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -2938,7 +2938,7 @@ void tst_QTextDocumentFragment::backgroundImage()
     doc.setHtml("<p style=\"background-image: url(testPixmap)\">Hello</p>");
     QBrush bg = doc.begin().blockFormat().background();
     QVERIFY(bg.style() == Qt::TexturePattern);
-    QVERIFY(bg.texture().serialNumber() == doc.testPixmap.serialNumber());
+    QCOMPARE(bg.texture().cacheKey(), doc.testPixmap.cacheKey());
 }
 
 void tst_QTextDocumentFragment::dontMergePreAndNonPre()

diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 907a239..7cc043e 100644 (file)
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -1333,7 +1333,7 @@ void tst_QComboBox::textpixmapdata()
 
     for (int i = 0; i<text.count(); ++i) {
         QIcon icon = testWidget->itemIcon(i);
-        QVERIFY(icon.serialNumber() == icons.at(i).serialNumber());
+        QCOMPARE(icon.cacheKey(), icons.at(i).cacheKey());
         QPixmap original = icons.at(i).pixmap(1024);
         QPixmap pixmap = icon.pixmap(1024);
         QVERIFY(pixmap.toImage() == original.toImage());