equal
deleted
inserted
replaced
143 \param changeTypa indicates if entry was updated, removed or added |
143 \param changeTypa indicates if entry was updated, removed or added |
144 */ |
144 */ |
145 void CaIconCache::remove(const CaEntry &entry, ChangeType changeType) |
145 void CaIconCache::remove(const CaEntry &entry, ChangeType changeType) |
146 { |
146 { |
147 CACLIENTTEST_FUNC_ENTRY("CaIconCache::remove"); |
147 CACLIENTTEST_FUNC_ENTRY("CaIconCache::remove"); |
148 if (changeType != AddChangeType) { |
148 if (changeType != AddChangeType && !(entry.flags() & UninstallEntryFlag)) { |
149 QString entryKey = key(entry); |
149 QString entryKey = key(entry); |
150 entryKey.append(separator); |
150 entryKey.append(separator); |
151 QList<QString> keys = mCache.keys(); |
151 QList<QString> keys = mCache.keys(); |
152 foreach(QString cacheKey,keys) { |
152 foreach(QString cacheKey,keys) { |
153 if (cacheKey.contains(entryKey)) { |
153 if (cacheKey.contains(entryKey)) { |
167 QString CaIconCache::key(const CaEntry &entry, const QSize &size) |
167 QString CaIconCache::key(const CaEntry &entry, const QSize &size) |
168 { |
168 { |
169 QString key; |
169 QString key; |
170 if (!entry.iconDescription().filename().isEmpty()) { |
170 if (!entry.iconDescription().filename().isEmpty()) { |
171 key.append(entry.iconDescription().filename()); |
171 key.append(entry.iconDescription().filename()); |
|
172 key.append(separator); |
|
173 key.append(entry.entryTypeName()); |
172 } else { |
174 } else { |
173 key.append(separator); |
175 key.append(separator); |
174 key.append(entry.id()); |
176 key.append(entry.id()); |
175 } |
177 } |
176 if (size.isValid()) { |
178 if (size.isValid()) { |