mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
kdeui: do not pass KIconLoader pointer to KIcon in KGuiItem::icon()
same as not passing one Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
6a84ebfe95
commit
f2badd9016
1 changed files with 1 additions and 2 deletions
|
@ -20,7 +20,6 @@
|
|||
|
||||
#include "kguiitem.h"
|
||||
|
||||
#include <kiconloader.h> // TODO remove
|
||||
#include <kdebug.h>
|
||||
#include <kicon.h>
|
||||
#include <kcomponentdata.h>
|
||||
|
@ -152,7 +151,7 @@ KIcon KGuiItem::icon( ) const
|
|||
{
|
||||
if (d->m_hasIcon) {
|
||||
if (!d->m_iconName.isEmpty()) {
|
||||
return KIcon(d->m_iconName, KGlobal::mainComponent().isValid() ? KIconLoader::global() : 0);
|
||||
return KIcon(d->m_iconName);
|
||||
} else {
|
||||
return d->m_icon;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue