diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-29 19:00:37 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-29 19:00:37 +0000 |
| commit | 25794f504692e5a36c490438814e9dfda8aaa2dd (patch) | |
| tree | 8061e6d27b5bc9042afdff177872779c4e8c9015 /src/iconstorage.cpp | |
| parent | 35ff2a942f63b5201c04f41c3097e61cdd7817e9 (diff) | |
| download | kchmviewer-25794f504692e5a36c490438814e9dfda8aaa2dd.tar.gz kchmviewer-25794f504692e5a36c490438814e9dfda8aaa2dd.zip | |
TQt4 port kchmviewer
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kchmviewer@1234150 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/iconstorage.cpp')
| -rw-r--r-- | src/iconstorage.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/iconstorage.cpp b/src/iconstorage.cpp index c4bbb25..1c8ce2a 100644 --- a/src/iconstorage.cpp +++ b/src/iconstorage.cpp @@ -973,7 +973,7 @@ static const KCHMIconStorage::png_memory_image_t png_image_toolbakicons[] = -const QPixmap * KCHMIconStorage::getApplicationIcon( ) +const TQPixmap * KCHMIconStorage::getApplicationIcon( ) { static const char png_image_cr64_app_kchmviewer[] = { @@ -1197,7 +1197,7 @@ const QPixmap * KCHMIconStorage::getApplicationIcon( ) if ( !m_iconApplication ) { - m_iconApplication = new QPixmap (); + m_iconApplication = new TQPixmap (); if ( !m_iconApplication->loadFromData ((const uchar*)png_image_cr64_app_kchmviewer, sizeof(png_image_cr64_app_kchmviewer) - 1, "PNG") ) qFatal ("Could not load application icon"); } @@ -1206,7 +1206,7 @@ const QPixmap * KCHMIconStorage::getApplicationIcon( ) } -const QPixmap * KCHMIconStorage::getCloseWindowIcon( ) +const TQPixmap * KCHMIconStorage::getCloseWindowIcon( ) { static const char png_image_cancel[] = { @@ -1253,7 +1253,7 @@ const QPixmap * KCHMIconStorage::getCloseWindowIcon( ) if ( !m_iconCloseWindow ) { - m_iconCloseWindow = new QPixmap (); + m_iconCloseWindow = new TQPixmap (); if ( !m_iconCloseWindow->loadFromData ((const uchar*)png_image_cancel, sizeof(png_image_cancel) - 1, "PNG") ) qFatal ("Could not load cancel icon"); @@ -1274,19 +1274,19 @@ KCHMIconStorage::KCHMIconStorage( ) KCHMIconStorage gIconStorage; -const QPixmap * KCHMIconStorage::getToolbarPixmap( pixmap_index_t pix ) +const TQPixmap * KCHMIconStorage::getToolbarPixmap( pixmap_index_t pix ) { return returnOrLoadImage ( (unsigned int) pix, png_image_toolbakicons + (pix - KCHMIconStorage::back)); } -const QPixmap * KCHMIconStorage::returnOrLoadImage( unsigned int id, const png_memory_image_t * image ) +const TQPixmap * KCHMIconStorage::returnOrLoadImage( unsigned int id, const png_memory_image_t * image ) { - QMap<unsigned int, QPixmap*>::iterator it = m_iconMap.find (id); + TQMap<unsigned int, TQPixmap*>::iterator it = m_iconMap.tqfind (id); if ( it == m_iconMap.end() ) { - m_iconMap[id] = new QPixmap (); + m_iconMap[id] = new TQPixmap (); if ( !m_iconMap[id]->loadFromData ((const uchar*)image->data, image->size, "PNG") ) qFatal ("Could not load image %d", id); } |