diff options
| author | miniak <milan.burda@gmail.com> | 2009-09-22 08:33:30 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-09-22 08:33:30 (GMT) |
| commit | e689e41ad1baad65d90866eefe88a96f5e16fa04 (patch) | |
| tree | 1914948c3416a725ff243b2ee5b09a4d04d8321d /src/gui/image/qpixmapdata_p.h | |
| parent | ac7fca3606d1a7dd5985b6fc284c40c0f2682fe5 (diff) | |
| download | Qt-e689e41ad1baad65d90866eefe88a96f5e16fa04.zip Qt-e689e41ad1baad65d90866eefe88a96f5e16fa04.tar.gz Qt-e689e41ad1baad65d90866eefe88a96f5e16fa04.tar.bz2 | |
Cleanup convertHIconToPixmap() & loadIconFromShell32()
Replace convertHIconToPixmap() by QPixmap::fromWinHICON()
Move loadIconFromShell32() to qwindowsstyle.cpp
Merge-request: 1570
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/gui/image/qpixmapdata_p.h')
| -rw-r--r-- | src/gui/image/qpixmapdata_p.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h index bac5065..5920a06 100644 --- a/src/gui/image/qpixmapdata_p.h +++ b/src/gui/image/qpixmapdata_p.h @@ -141,15 +141,6 @@ private: uint is_cached; }; -#ifdef Q_WS_WIN -#ifndef Q_WS_WINCE -QPixmap convertHIconToPixmap( const HICON icon); -#else -QPixmap convertHIconToPixmap( const HICON icon, bool large = false); -#endif -QPixmap loadIconFromShell32( int resourceId, int size ); -#endif - # define QT_XFORM_TYPE_MSBFIRST 0 # define QT_XFORM_TYPE_LSBFIRST 1 # if defined(Q_WS_WIN) |