151 */ |
151 */ |
152 |
152 |
153 QString CaIconCache::key(const CaEntry &entry, const QSizeF &size) |
153 QString CaIconCache::key(const CaEntry &entry, const QSizeF &size) |
154 { |
154 { |
155 QString key; |
155 QString key; |
156 if (!entry.iconDescription().filename().isEmpty()) { |
156 if (!entry.iconDescription().skinId().isEmpty()) { |
|
157 key.append(entry.iconDescription().skinId()); |
|
158 key.append(separator); |
|
159 key.append(entry.entryTypeName()); |
|
160 } else if (!entry.iconDescription().filename().isEmpty()) { |
157 key.append(entry.iconDescription().filename()); |
161 key.append(entry.iconDescription().filename()); |
158 key.append(separator); |
162 key.append(separator); |
159 key.append(entry.entryTypeName()); |
163 key.append(entry.entryTypeName()); |
160 } else { |
164 } else { |
161 key.append(separator); |
165 key.append(separator); |
162 key.append(entry.id()); |
166 key.append(entry.id()); |
163 } |
167 } |
|
168 key.append(separator); |
164 if (size.isValid()) { |
169 if (size.isValid()) { |
165 key.append(separator); |
|
166 key += QString::number(size.height()); |
170 key += QString::number(size.height()); |
167 key.append(separator); |
171 key.append(separator); |
168 key += QString::number(size.width()); |
172 key += QString::number(size.width()); |
169 } |
173 } |
170 return key; |
174 return key; |