diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-01 19:21:34 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-01 19:21:34 +0000 |
| commit | ba9755cbdc76d556757b1facb56e1c453f67025b (patch) | |
| tree | 790f70e8d873b5c084139719e7210c772ed6abb8 | |
| parent | e496df8f5591fcd687776f2444c5d15c990cf097 (diff) | |
| download | kbfx-ba9755cbdc76d556757b1facb56e1c453f67025b.tar.gz kbfx-ba9755cbdc76d556757b1facb56e1c453f67025b.zip | |
Fix kbfx FTBFS under gcc4.6
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kbfx@1244307 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kbfxlib/common/kbfxconfig.cpp | 4 | ||||
| -rw-r--r-- | kbfxlib/common/kbfxplasmapixmapprovider.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kbfxlib/common/kbfxconfig.cpp b/kbfxlib/common/kbfxconfig.cpp index 99d60d6..c279a41 100644 --- a/kbfxlib/common/kbfxconfig.cpp +++ b/kbfxlib/common/kbfxconfig.cpp @@ -495,8 +495,8 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us } /* load theme's on and off buttons if any */ - KbfxOnImg = TQPixmap::TQPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "on", themePath, themeName ) ); - KbfxOffImg = TQPixmap::TQPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "off", themePath, themeName ) ); + KbfxOnImg = TQPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "on", themePath, themeName ) ); + KbfxOffImg = TQPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "off", themePath, themeName ) ); /* use theme's default dude image if any */ KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::tqfromLatin1 ( "kbfxrc" ) ); diff --git a/kbfxlib/common/kbfxplasmapixmapprovider.cpp b/kbfxlib/common/kbfxplasmapixmapprovider.cpp index 9310362..8107583 100644 --- a/kbfxlib/common/kbfxplasmapixmapprovider.cpp +++ b/kbfxlib/common/kbfxplasmapixmapprovider.cpp @@ -41,7 +41,7 @@ KbfxPlasmaPixmapProvider::PixmapPath ( TQString pixmapName ) { TQString lFileName = ConfigInit ().m_SpinxThemeBasePath + ConfigInit ().m_SpinxThemeName + "/" + pixmapName + ".png"; - if ( TQPixmap::TQPixmap ( lFileName ).isNull() ) + if ( TQPixmap ( lFileName ).isNull() ) lFileName = locate ( "data", "kbfx/skins/default/" + pixmapName + ".png" ); return lFileName; @@ -52,7 +52,7 @@ KbfxPlasmaPixmapProvider::PixmapPath ( TQString pixmapName, TQString themePath, { TQString lFileName = themePath + themeName + "/" + pixmapName + ".png"; - if ( TQPixmap::TQPixmap ( lFileName ).isNull() ) + if ( TQPixmap ( lFileName ).isNull() ) lFileName = locate ( "data", "kbfx/skins/default/" + pixmapName + ".png" ); return lFileName; @@ -61,7 +61,7 @@ KbfxPlasmaPixmapProvider::PixmapPath ( TQString pixmapName, TQString themePath, bool KbfxPlasmaPixmapProvider::PixmapPathCheck ( TQString pixmapPath ) { - if ( TQPixmap::TQPixmap ( pixmapPath ).isNull() ) + if ( TQPixmap ( pixmapPath ).isNull() ) return FALSE; return TRUE; |