diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2012-04-17 12:22:39 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-19 16:57:08 +0200 |
| commit | 8aa0be210a417d3e3955a3add5d57efe2565d774 (patch) | |
| tree | 32fe3bb798ed0a40b49340f66e07d5b1b63aea18 | |
| parent | 907909d858312ff7135c1e93a4960b041b9c86bc (diff) | |
Removed legacy pixmap and image cleanup hooks.
Task-number: QTBUG-25114
Change-Id: Id87172665ec15874e293e3891738e6366aef4554
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| -rw-r--r-- | src/gui/image/qimagepixmapcleanuphooks.cpp | 18 | ||||
| -rw-r--r-- | src/opengl/qgl.cpp | 7 |
2 files changed, 0 insertions, 25 deletions
diff --git a/src/gui/image/qimagepixmapcleanuphooks.cpp b/src/gui/image/qimagepixmapcleanuphooks.cpp index 5b414b8d00..b118f5f856 100644 --- a/src/gui/image/qimagepixmapcleanuphooks.cpp +++ b/src/gui/image/qimagepixmapcleanuphooks.cpp @@ -46,15 +46,6 @@ QT_BEGIN_NAMESPACE -// Legacy, single instance hooks: ### Qt 5: remove -typedef void (*_qt_pixmap_cleanup_hook)(int); -typedef void (*_qt_pixmap_cleanup_hook_64)(qint64); -typedef void (*_qt_image_cleanup_hook)(int); -Q_GUI_EXPORT _qt_pixmap_cleanup_hook qt_pixmap_cleanup_hook = 0; -Q_GUI_EXPORT _qt_pixmap_cleanup_hook_64 qt_pixmap_cleanup_hook_64 = 0; -Q_GUI_EXPORT _qt_image_cleanup_hook qt_image_cleanup_hook = 0; -Q_GUI_EXPORT _qt_image_cleanup_hook_64 qt_image_cleanup_hook_64 = 0; - Q_GLOBAL_STATIC(QImagePixmapCleanupHooks, qt_image_and_pixmap_cleanup_hooks) QImagePixmapCleanupHooks *QImagePixmapCleanupHooks::instance() @@ -103,9 +94,6 @@ void QImagePixmapCleanupHooks::executePlatformPixmapModificationHooks(QPlatformP return; for (int i = 0; i < h->pixmapModificationHooks.count(); ++i) h->pixmapModificationHooks[i](pmd); - - if (qt_pixmap_cleanup_hook_64) - qt_pixmap_cleanup_hook_64(pmd->cacheKey()); } void QImagePixmapCleanupHooks::executePlatformPixmapDestructionHooks(QPlatformPixmap* pmd) @@ -118,9 +106,6 @@ void QImagePixmapCleanupHooks::executePlatformPixmapDestructionHooks(QPlatformPi return; for (int i = 0; i < h->pixmapDestructionHooks.count(); ++i) h->pixmapDestructionHooks[i](pmd); - - if (qt_pixmap_cleanup_hook_64) - qt_pixmap_cleanup_hook_64(pmd->cacheKey()); } void QImagePixmapCleanupHooks::executeImageHooks(qint64 key) @@ -133,9 +118,6 @@ void QImagePixmapCleanupHooks::executeImageHooks(qint64 key) return; for (int i = 0; i < h->imageHooks.count(); ++i) h->imageHooks[i](key); - - if (qt_image_cleanup_hook_64) - qt_image_cleanup_hook_64(key); } diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 6b0c637c87..893915f433 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1648,13 +1648,6 @@ int qt_next_power_of_two(int v) return v; } -typedef void (*_qt_pixmap_cleanup_hook_64)(qint64); -typedef void (*_qt_image_cleanup_hook_64)(qint64); - -extern Q_GUI_EXPORT _qt_pixmap_cleanup_hook_64 qt_pixmap_cleanup_hook_64; -extern Q_GUI_EXPORT _qt_image_cleanup_hook_64 qt_image_cleanup_hook_64; - - Q_GLOBAL_STATIC(QGLTextureCache, qt_gl_texture_cache) QGLTextureCache::QGLTextureCache() |