Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeui: remove hardcoded pixmaps directories and filter duplicate directories in KIconTheme

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-09-23 05:03:56 +03:00
parent 5b03742ff8
commit e79637377e
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
kdeui/icons/kicontheme.cpp
View file

@ -153,7 +153,6 @@ KIconTheme::KIconTheme(const QString& name, const QString& appName)
icnlibs = KGlobal::dirs()->resourceDirs("icon")
<< KGlobal::dirs()->resourceDirs("xdgdata-icon")
<< "/usr/share/pixmaps/"
// These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
<< KGlobal::dirs()->resourceDirs("xdgdata-pixmap");
icnlibs.removeDuplicates();
@ -541,11 +540,11 @@ QStringList KIconTheme::list()
return *_theme_list;
}
const QStringList icnlibs = KGlobal::dirs()->resourceDirs("icon")
<< KGlobal::dirs()->resourceDirs("xdgdata-icon")
<< "/usr/share/pixmaps"
// These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
<< KGlobal::dirs()->resourceDirs("xdgdata-pixmap");
QStringList icnlibs = KGlobal::dirs()->resourceDirs("icon")
<< KGlobal::dirs()->resourceDirs("xdgdata-icon")
// These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
<< KGlobal::dirs()->resourceDirs("xdgdata-pixmap");
icnlibs.removeDuplicates();
QStringList::ConstIterator it;
for (it=icnlibs.begin(); it!=icnlibs.end(); ++it) {