diff options
| author |  Fabio Bas | 2008-10-11 13:37:25 +0000 |
|---|---|---|
| committer | Fabio Bas | 2008-10-11 13:37:25 +0000 |
| commit | e9ed274f62d2083cb484f48b3fab9741594c875a (patch) | |
| tree | f50481b558eb64fb31a9657f9f5f0490087bcf47 /src | |
| parent | fix for #258 (diff) | |
| download | KVIrc-e9ed274f62d2083cb484f48b3fab9741594c875a.tar.gz KVIrc-e9ed274f62d2083cb484f48b3fab9741594c875a.tar.bz2 KVIrc-e9ed274f62d2083cb484f48b3fab9741594c875a.zip | |
removed old patch code
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2699 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvilib/ext/kvi_animatedpixmap.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/kvilib/ext/kvi_animatedpixmap.h b/src/kvilib/ext/kvi_animatedpixmap.h index 903cabbb7..14a9e3543 100644 --- a/src/kvilib/ext/kvi_animatedpixmap.h +++ b/src/kvilib/ext/kvi_animatedpixmap.h @@ -118,25 +118,7 @@ public: * Returns active frame's pixmap. * Never fails. */ -//#ifdef COMPILE_ON_MINGW - /* - * Mingw/gcc3.4.2 have some problems linking kvirc because of this: - * It doesn't like the way we import inline static members from a singletone class, and spit out this error on linking: - * - * CMakeFiles\kvirc4.dir\ui\kvi_userlistview.obj(.text$_ZN17KviAnimatedPixmap6pixmapEv[KviAnimatedPixmap::pixmap()]+0x38): - * In function `ZN24KviPointerHashTableEntryI7QString16KviUserListEntryE3keyEv': - * C:/kvirctrunk/src/kvirc/../kvilib/core/kvi_pointerlist.h: undefined reference to `KviAnimatedPixmapCache::dummyPixmap()' - */ - -/* inline QPixmap* pixmap() - { - if(m_lFrames->count()>0) - return m_lFrames->at(m_uCurrentFrameNumber).pixmap; - else - return new QPixmap(); // FIXME, memory leak - } -#else*/ inline QPixmap* pixmap() { if(m_lFrames->count()>0) @@ -144,7 +126,7 @@ public: else return KviAnimatedPixmapCache::dummyPixmap(); } -//#endif + /* * Returns active frame number */ |