Changeset 769 for trunk/src/gui/image/qimagepixmapcleanuphooks.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/image/qimagepixmapcleanuphooks.cpp (modified) (4 diffs)

trunk/src/gui/image/qimagepixmapcleanuphooks.cpp

@@ -97 +97 @@
 {
     QImagePixmapCleanupHooks *h = qt_image_and_pixmap_cleanup_hooks();
+
+
+
+
+
     for (int i = 0; i < h->pixmapModificationHooks.count(); ++i)
         h->pixmapModificationHooks[i](pmd);
@@ -107 +112 @@
 {
     QImagePixmapCleanupHooks *h = qt_image_and_pixmap_cleanup_hooks();
+
+
+
+
+
     for (int i = 0; i < h->pixmapDestructionHooks.count(); ++i)
         h->pixmapDestructionHooks[i](pmd);
@@ -123 +133 @@
 }
 
-void QImagePixmapCleanupHooks::enableCleanupHooks(const QPixmap &pixmap)
-{
-    enableCleanupHooks(const_cast<QPixmap &>(pixmap).data_ptr().data());
-}
 
 void QImagePixmapCleanupHooks::enableCleanupHooks(QPixmapData *pixmapData)
 {
     pixmapData->is_cached = true;
+
+
+
+
+
 }
 
@@ -138 +149 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE