[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kio/kio
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2010-08-19 12:04:39
Message-ID: 20100819120439.E38B6AC855 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1165448 by lunakl:

if KUriFilter claims to be thread-safe, then use KIconLoader::iconPath()
for finding out if an icon exists instead of KIconLoader::loadIcon()
which involves uses of QPixmap



 M  +2 -1      kurifilter.cpp  


--- trunk/KDE/kdelibs/kio/kio/kurifilter.cpp #1165447:1165448
@@ -56,7 +56,8 @@
             if (service && service->icon() != QLatin1String( "unknown" ))
                 iconName = service->icon();
             // Try to find an icon with the same name as the binary (useful for \
                non-kde apps)
-            else if ( !KIconLoader::global()->loadIcon( exeName, \
KIconLoader::NoGroup, 16, KIconLoader::DefaultState, QStringList(), 0, true \
).isNull() ) +            // Use iconPath rather than loadIcon() as the latter uses \
QPixmap (not threadsafe) +            else if ( !KIconLoader::global()->iconPath( \
exeName, KIconLoader::NoGroup, true ).isNull() )  iconName = exeName;
             else
                 // not found, use default


[prev in list] [next in list] [prev in thread] [next in thread]