From: Peter Penz Date: Sat, 12 Dec 2009 07:30:43 +0000 (+0000) Subject: don't update the version control emblems each time, reuse the cached versions (fixed... X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/1dbcada3764c9d04116672544e7d85aeb3146452 don't update the version control emblems each time, reuse the cached versions (fixed wrong logic in 'if'-statement) svn path=/trunk/KDE/kdebase/apps/; revision=1061553 --- diff --git a/src/dolphinfileitemdelegate.cpp b/src/dolphinfileitemdelegate.cpp index 7a6ef118e..1c920b853 100644 --- a/src/dolphinfileitemdelegate.cpp +++ b/src/dolphinfileitemdelegate.cpp @@ -110,7 +110,7 @@ QPixmap DolphinFileItemDelegate::emblemForState(KVersionControlPlugin::VersionSt // TODO: all icons that are use here will be replaced by revision control emblems provided by the // Oxygen team before KDE 4.4 Q_ASSERT(state <= KVersionControlPlugin::ConflictingVersion); - if ((m_cachedSize != size) || !m_cachedEmblems[state].isNull()) { + if ((m_cachedSize != size) || m_cachedEmblems[state].isNull()) { m_cachedSize = size; const int iconHeight = size.height();