From 799fae5feea55e95876c3722c79fd7dabadd2cd6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:19:44 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- parts/filecreate/fctypeeditbase.ui | 2 +- parts/filecreate/filecreate_listitem.cpp | 8 ++++---- parts/filecreate/filecreate_part.cpp | 10 +++++----- parts/filecreate/filecreate_widget2.cpp | 4 ++-- parts/filecreate/filecreate_widget2.h | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'parts/filecreate') diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui index 9d97d82b..e456e146 100644 --- a/parts/filecreate/fctypeeditbase.ui +++ b/parts/filecreate/fctypeeditbase.ui @@ -121,7 +121,7 @@ - + icon_url diff --git a/parts/filecreate/filecreate_listitem.cpp b/parts/filecreate/filecreate_listitem.cpp index d792ab26..6dd1e35a 100644 --- a/parts/filecreate/filecreate_listitem.cpp +++ b/parts/filecreate/filecreate_listitem.cpp @@ -82,10 +82,10 @@ namespace FileCreate { setText(0, m_filetype->ext()!="" ? TQString("." + m_filetype->ext()) : TQString("") ); setText(1, ""+m_filetype->name()+". " + m_filetype->descr() ); - KIconLoader * loader = TDEGlobal::iconLoader(); - TQPixmap iconPix = loader->loadIcon(m_filetype->icon(), KIcon::Desktop, - KIcon::SizeMedium, - KIcon::DefaultState, NULL, + TDEIconLoader * loader = TDEGlobal::iconLoader(); + TQPixmap iconPix = loader->loadIcon(m_filetype->icon(), TDEIcon::Desktop, + TDEIcon::SizeMedium, + TDEIcon::DefaultState, NULL, true); if (!iconPix.isNull()) { setPixmap(0, iconPix); diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index 50009952..9b99c83a 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -120,7 +120,7 @@ void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, TQWidget * pag void FileCreatePart::slotAboutToShowNewPopupMenu() { - KIconLoader * m_iconLoader = TDEGlobal::iconLoader(); + TDEIconLoader * m_iconLoader = TDEGlobal::iconLoader(); m_newPopupMenu->clear(); delete m_subPopups; m_subPopups = NULL; @@ -133,8 +133,8 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() if (filetype->subtypes().count()==0) { TQPixmap iconPix = m_iconLoader->loadIcon( - filetype->icon(), KIcon::Desktop, KIcon::SizeSmall, - KIcon::DefaultState, NULL, true); + filetype->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall, + TDEIcon::DefaultState, NULL, true); m_newPopupMenu->insertItem(iconPix, filetype->name(), this, TQT_SLOT(slotNewFilePopup(int)), 0, ++id ); m_newPopupMenu->setItemParameter( id, (long)filetype ); @@ -148,8 +148,8 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() if( !subMenu ) subMenu = new TDEPopupMenu(0,0); TQPixmap iconPix = m_iconLoader->loadIcon( - subtype->icon(), KIcon::Desktop, KIcon::SizeSmall, - KIcon::DefaultState, NULL, true); + subtype->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall, + TDEIcon::DefaultState, NULL, true); subMenu->insertItem(iconPix, subtype->name(), this, TQT_SLOT(slotNewFilePopup(int)), 0, ++id ); subMenu->setItemParameter( id, (long)subtype ); diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp index 59ec1a33..57fbe8f3 100644 --- a/parts/filecreate/filecreate_widget2.cpp +++ b/parts/filecreate/filecreate_widget2.cpp @@ -130,8 +130,8 @@ namespace FileCreate { item(row,1)->setWordWrap(true); item(row,3)->setWordWrap(true); //setRowStretchable(row,true); - TQPixmap iconPix = m_iconLoader->loadIcon(filetype->icon(), KIcon::Desktop, KIcon::SizeMedium, - KIcon::DefaultState, NULL, + TQPixmap iconPix = m_iconLoader->loadIcon(filetype->icon(), TDEIcon::Desktop, TDEIcon::SizeMedium, + TDEIcon::DefaultState, NULL, true); if (!iconPix.isNull()) { setPixmap(row, 0, iconPix); diff --git a/parts/filecreate/filecreate_widget2.h b/parts/filecreate/filecreate_widget2.h index 027333c9..217d37ce 100644 --- a/parts/filecreate/filecreate_widget2.h +++ b/parts/filecreate/filecreate_widget2.h @@ -20,7 +20,7 @@ #include "filecreate_typechooser.h" -class KIconLoader; +class TDEIconLoader; class KDevProject; class FileCreatePart; @@ -79,7 +79,7 @@ namespace FileCreate { /** * The default icon loader, here for convenience. */ - KIconLoader * m_iconLoader; + TDEIconLoader * m_iconLoader; /** * A mapping of each row number to a file type. */ -- cgit v1.2.3