File kbfx-0.4.9.3.1-gcc45.patch of Package kbfx
Description: Fix build with GCC 4.5
Author: Kyrill Detinov <lazy.kent.syse@gmail.com>
Index: kbfxlib/common/kbfxconfig.cpp
===================================================================
--- kbfxlib/common/kbfxconfig.cpp.orig 2007-05-04 22:26:51.000000000 +0400
+++ kbfxlib/common/kbfxconfig.cpp 2010-08-27 23:46:52.000000000 +0400
@@ -495,8 +495,8 @@ void KbfxConfig::readThemerc ( QString &
}
/* load theme's on and off buttons if any */
- KbfxOnImg = QPixmap::QPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "on", themePath, themeName ) );
- KbfxOffImg = QPixmap::QPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "off", themePath, themeName ) );
+ KbfxOnImg = QPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "on", themePath, themeName ) );
+ KbfxOffImg = QPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "off", themePath, themeName ) );
/* use theme's default dude image if any */
KConfigSkeleton *confskel = new KConfigSkeleton ( QString::fromLatin1 ( "kbfxrc" ) );
Index: kbfxlib/common/kbfxplasmapixmapprovider.cpp
===================================================================
--- kbfxlib/common/kbfxplasmapixmapprovider.cpp.orig 2007-05-04 22:26:51.000000000 +0400
+++ kbfxlib/common/kbfxplasmapixmapprovider.cpp 2010-08-27 23:47:53.000000000 +0400
@@ -41,7 +41,7 @@ KbfxPlasmaPixmapProvider::PixmapPath ( Q
{
QString lFileName = ConfigInit ().m_SpinxThemeBasePath + ConfigInit ().m_SpinxThemeName + "/" + pixmapName + ".png";
- if ( QPixmap::QPixmap ( lFileName ).isNull() )
+ if ( QPixmap ( lFileName ).isNull() )
lFileName = locate ( "data", "kbfx/skins/default/" + pixmapName + ".png" );
return lFileName;
@@ -52,7 +52,7 @@ KbfxPlasmaPixmapProvider::PixmapPath ( Q
{
QString lFileName = themePath + themeName + "/" + pixmapName + ".png";
- if ( QPixmap::QPixmap ( lFileName ).isNull() )
+ if ( QPixmap ( lFileName ).isNull() )
lFileName = locate ( "data", "kbfx/skins/default/" + pixmapName + ".png" );
return lFileName;
@@ -61,7 +61,7 @@ KbfxPlasmaPixmapProvider::PixmapPath ( Q
bool
KbfxPlasmaPixmapProvider::PixmapPathCheck ( QString pixmapPath )
{
- if ( QPixmap::QPixmap ( pixmapPath ).isNull() )
+ if ( QPixmap ( pixmapPath ).isNull() )
return FALSE;
return TRUE;