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

List:       kde-core-devel
Subject:    Re: [PATCH] Cache returned KIconLoader pixmaps in 4.5.2
From:       Matthias Fuchs <mat69 () gmx ! net>
Date:       2010-09-13 9:36:15
Message-ID: 201009131136.16274.mat69 () gmx ! net
[Download RAW message or body]

[Attachment #2 (multipart/mixed)]


I just realised that I sent an outdated patch, here is a newer one.

["kiconloader.diff" (text/x-patch)]

Index: kdeui/icons/kiconloader.cpp
===================================================================
--- kdeui/icons/kiconloader.cpp	(Revision 1174567)
+++ kdeui/icons/kiconloader.cpp	(Arbeitskopie)
@@ -37,6 +37,7 @@
 #include <QtCore/QBuffer>
 #include <QtCore/QDataStream>
 #include <QtCore/QByteArray>
+#include <QtCore/QStringBuilder>
 #include <QtGui/QIcon>
 #include <QtGui/QPainter>
 #include <QMovie>
@@ -756,26 +757,9 @@
 QString KIconLoaderPrivate::makeCacheKey(const QString &name, KIconLoader::Group \
                group,
                                          const QStringList &overlays, int size, int \
state) const  {
-    // The KSharedDataCache is shared so add some namespacing.
-    QString key;
-
-    if (group == KIconLoader::User) {
-        key = QLatin1String("$kicou_");
-    }
-    else {
-        key = QLatin1String("$kico_");
-    }
-
-    key.append(QString("%1_%2_%3").arg(name).arg(size).arg(overlays.join("_")));
-
-    if (group >= 0) {
-        key.append(mpEffect.fingerprint(group, state));
-    }
-    else {
-        key.append(QLatin1String("noeffect"));
-    }
-
-    return key;
+    return (group == KIconLoader::User ? QLatin1Literal("$kicou_") : \
QLatin1Literal("$kico_")) % +           name % QLatin1Char('_') % \
QString::number(size) % QLatin1Char('_') % overlays.join("_") % +           (group >= \
0 ? mpEffect.fingerprint(group, state) : QString("noeffect"));//QString here, since \
ternary operator does not support different classes  }
 
 QImage KIconLoaderPrivate::createIconImage(const QString &path, int size)


["signature.asc" (application/pgp-signature)]

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