Skip to content
Commit 074c91a5 authored by Nate Graham's avatar Nate Graham
Browse files

Move redundant logic in KIO::iconNameForUrl() into KFileItem::iconName()

Summary:
`KIO::iconNameForUrl()` was doing a lot of redundant work on file items that `KFileItem::iconName()`
already does for us. This patch moves most of that logic into `KIO::iconNameForUrl()` when operating
on local files (but not for remote files, which may be slower, and for which we don't want to stat).

BUG: 356045
FIXED-IN: 5.60

Test Plan:
Functionality testing:
- Tested that adding a directory with a custom icon to the Places panel resuts in the Places panel entry inheriting its custom icon: {F5864410}
- Used the system with this patch in place for one year; did not find any instances of incorrect icons

Regression testing:
- Tested that the trash changes its icon appropriately when adding an item to an empty trash, removing all items from the trash, and emptying the trash (testtrash test passes)
- Tested that other icons on the Places panel look the same as they did before the patch

Unit testing:
- No test regressions

Reviewers: #frameworks, broulik, meven, apol, dfaure

Reviewed By: dfaure

Subscribers: apol, kde-frameworks-devel

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D13048
parent ae84a670
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment