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
v3.5.13-sru
tpearson 13 years ago
parent e496df8f55
commit ba9755cbdc

@ -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" ) );

@ -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;

Loading…
Cancel
Save