use a const iterator; some ws fixes

svn path=/trunk/KDE/kdelibs/; revision=894551
This commit is contained in:
Aaron J. Seigo 2008-12-08 21:16:55 +00:00
parent 011832d5fb
commit 12eca1edaf

12
svg.cpp
View File

@ -211,14 +211,14 @@ class SvgPrivate
void scheduledCacheUpdate() void scheduledCacheUpdate()
{ {
QHash<QString, QPixmap>::iterator i = itemsToSave.begin(); QHash<QString, QPixmap>::const_iterator i = itemsToSave.begin();
while (i != itemsToSave.end()) { while (i != itemsToSave.constEnd()) {
//kDebug()<<"Saving item to cache: "<<i.key(); //kDebug()<<"Saving item to cache: "<<i.key();
Theme::defaultTheme()->insertIntoCache(i.key(), i.value()); Theme::defaultTheme()->insertIntoCache(i.key(), i.value());
++i; ++i;
} }
itemsToSave.clear(); itemsToSave.clear();
} }
@ -271,7 +271,7 @@ class SvgPrivate
QString id = cacheId(elementId); QString id = cacheId(elementId);
if (localRectCache.contains(id)) { if (localRectCache.contains(id)) {
return localRectCache[id]; return localRectCache.value(id);
} }
QRectF rect; QRectF rect;
@ -366,7 +366,7 @@ class SvgPrivate
Svg *q; Svg *q;
static QHash<QString, SharedSvgRenderer::Ptr> s_renderers; static QHash<QString, SharedSvgRenderer::Ptr> s_renderers;
QHash<QString, QRectF> localRectCache; QHash<QString, QRectF> localRectCache;
QHash <QString, QPixmap> itemsToSave; QHash<QString, QPixmap> itemsToSave;
QTimer *saveTimer; QTimer *saveTimer;
SharedSvgRenderer::Ptr renderer; SharedSvgRenderer::Ptr renderer;
QString themePath; QString themePath;
@ -487,7 +487,7 @@ bool Svg::hasElement(const QString &elementId) const
QString id = d->cacheId(elementId); QString id = d->cacheId(elementId);
if (d->localRectCache.contains(id)) { if (d->localRectCache.contains(id)) {
return d->localRectCache[id].isValid(); return d->localRectCache.value().isValid();
} }
QRectF elementRect; QRectF elementRect;