Ignore:
Timestamp:
Mar 8, 2010, 12:52:58 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.2 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/image/qimagepixmapcleanuphooks.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
     
    6363}
    6464
    65 void QImagePixmapCleanupHooks::addPixmapModificationHook(_qt_pixmap_cleanup_hook_pm hook)
     65void QImagePixmapCleanupHooks::addPixmapDataModificationHook(_qt_pixmap_cleanup_hook_pmd hook)
    6666{
    6767    pixmapModificationHooks.append(hook);
    6868}
    6969
    70 void QImagePixmapCleanupHooks::addPixmapDestructionHook(_qt_pixmap_cleanup_hook_pm hook)
     70void QImagePixmapCleanupHooks::addPixmapDataDestructionHook(_qt_pixmap_cleanup_hook_pmd hook)
    7171{
    7272    pixmapDestructionHooks.append(hook);
     
    7979}
    8080
    81 void QImagePixmapCleanupHooks::removePixmapModificationHook(_qt_pixmap_cleanup_hook_pm hook)
     81void QImagePixmapCleanupHooks::removePixmapDataModificationHook(_qt_pixmap_cleanup_hook_pmd hook)
    8282{
    8383    pixmapModificationHooks.removeAll(hook);
    8484}
    8585
    86 void QImagePixmapCleanupHooks::removePixmapDestructionHook(_qt_pixmap_cleanup_hook_pm hook)
     86void QImagePixmapCleanupHooks::removePixmapDataDestructionHook(_qt_pixmap_cleanup_hook_pmd hook)
    8787{
    8888    pixmapDestructionHooks.removeAll(hook);
     
    9494}
    9595
    96 void QImagePixmapCleanupHooks::executePixmapModificationHooks(QPixmap* pm)
     96void QImagePixmapCleanupHooks::executePixmapDataModificationHooks(QPixmapData* pmd)
    9797{
    9898    QImagePixmapCleanupHooks *h = qt_image_and_pixmap_cleanup_hooks();
    9999    for (int i = 0; i < h->pixmapModificationHooks.count(); ++i)
    100         h->pixmapModificationHooks[i](pm);
     100        h->pixmapModificationHooks[i](pmd);
    101101
    102102    if (qt_pixmap_cleanup_hook_64)
    103         qt_pixmap_cleanup_hook_64(pm->cacheKey());
     103        qt_pixmap_cleanup_hook_64(pmd->cacheKey());
    104104}
    105105
    106 void QImagePixmapCleanupHooks::executePixmapDestructionHooks(QPixmap* pm)
     106void QImagePixmapCleanupHooks::executePixmapDataDestructionHooks(QPixmapData* pmd)
    107107{
    108108    QImagePixmapCleanupHooks *h = qt_image_and_pixmap_cleanup_hooks();
    109109    for (int i = 0; i < h->pixmapDestructionHooks.count(); ++i)
    110         h->pixmapDestructionHooks[i](pm);
     110        h->pixmapDestructionHooks[i](pmd);
    111111
    112112    if (qt_pixmap_cleanup_hook_64)
    113         qt_pixmap_cleanup_hook_64(pm->cacheKey());
     113        qt_pixmap_cleanup_hook_64(pmd->cacheKey());
    114114}
    115115
Note: See TracChangeset for help on using the changeset viewer.