From b97ee238f88e9578da228388210cd8cab5360778 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:18:14 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kmail/kmfoldertree.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'kmail/kmfoldertree.cpp') diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 067568a1..ae340e7f 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -149,12 +149,12 @@ TQPixmap KMFolderTreeItem::normalIcon(int size) const if (mFolder && mFolder->useCustomIcons() ) { icon = mFolder->normalIconPath(); } - KIconLoader * il = TDEGlobal::instance()->iconLoader(); - TQPixmap pm = il->loadIcon( icon, KIcon::Small, size, - KIcon::DefaultState, 0, true ); + TDEIconLoader * il = TDEGlobal::instance()->iconLoader(); + TQPixmap pm = il->loadIcon( icon, TDEIcon::Small, size, + TDEIcon::DefaultState, 0, true ); if ( mFolder && pm.isNull() ) { - pm = il->loadIcon( mFolder->normalIconPath(), KIcon::Small, size, - KIcon::DefaultState, 0, true ); + pm = il->loadIcon( mFolder->normalIconPath(), TDEIcon::Small, size, + TDEIcon::DefaultState, 0, true ); } return pm; @@ -170,25 +170,25 @@ TQPixmap KMFolderTreeItem::unreadIcon(int size) const kmkernel->folderIsDraftOrOutbox( mFolder ) ) pm = normalIcon( size ); - KIconLoader * il = TDEGlobal::instance()->iconLoader(); + TDEIconLoader * il = TDEGlobal::instance()->iconLoader(); if ( mFolder && mFolder->useCustomIcons() ) { - pm = il->loadIcon( mFolder->unreadIconPath(), KIcon::Small, size, - KIcon::DefaultState, 0, true ); + pm = il->loadIcon( mFolder->unreadIconPath(), TDEIcon::Small, size, + TDEIcon::DefaultState, 0, true ); if ( pm.isNull() ) - pm = il->loadIcon( mFolder->normalIconPath(), KIcon::Small, size, - KIcon::DefaultState, 0, true ); + pm = il->loadIcon( mFolder->normalIconPath(), TDEIcon::Small, size, + TDEIcon::DefaultState, 0, true ); } if ( pm.isNull() ) { if ( mFolder && mFolder->noContent() ) { - pm = il->loadIcon( "folder_grey_open", KIcon::Small, size, - KIcon::DefaultState, 0, true ); + pm = il->loadIcon( "folder_grey_open", TDEIcon::Small, size, + TDEIcon::DefaultState, 0, true ); } else { if( kmkernel->iCalIface().isResourceFolder( mFolder ) ) pm = il->loadIcon( kmkernel->iCalIface().folderPixmap( type() ), - KIcon::Small, size, KIcon::DefaultState, 0, true ); + TDEIcon::Small, size, TDEIcon::DefaultState, 0, true ); if ( pm.isNull() ) - pm = il->loadIcon( "folder_open", KIcon::Small, size, - KIcon::DefaultState, 0, true ); + pm = il->loadIcon( "folder_open", TDEIcon::Small, size, + TDEIcon::DefaultState, 0, true ); } } -- cgit v1.2.3