Rename KIcon to enhance compatibility with KDE4

8 files changed, 25 insertions, 25 deletions

diff --git a/apps/ktorrent/fileselectdlg.cpp b/apps/ktorrent/fileselectdlg.cpp
index 377cfd3..c483f94 100644
--- a/apps/ktorrent/fileselectdlg.cpp
+++ b/apps/ktorrent/fileselectdlg.cpp
@@ -252,7 +252,7 @@ void FileSelectDlg::setupSinglefileTorrent()
 	single_root->setText(0,tc->getStats().torrent_name);
 	single_root->setText(1,BytesToString(tc->getStats().total_bytes));
 	single_root->setText(2,i18n("Yes"));
-	single_root->setPixmap(0,KMimeType::findByPath(tc->getStats().torrent_name)->pixmap(KIcon::Small));
+	single_root->setPixmap(0,KMimeType::findByPath(tc->getStats().torrent_name)->pixmap(TDEIcon::Small));
 	root = 0;
 	updateSizeLabels();
 	m_select_all->setEnabled(false);
diff --git a/apps/ktorrent/groups/group.cpp b/apps/ktorrent/groups/group.cpp
index 09de6db..31142df 100644
--- a/apps/ktorrent/groups/group.cpp
+++ b/apps/ktorrent/groups/group.cpp
@@ -42,7 +42,7 @@ namespace kt
 	void Group::setIconByName(const TQString & in)
 	{
 		icon_name = in;
-		icon = TDEGlobal::iconLoader()->loadIcon(in,KIcon::Small);
+		icon = TDEGlobal::iconLoader()->loadIcon(in,TDEIcon::Small);
 	}
 	
 	void Group::rename(const TQString & nn)
diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp
index dc1cc47..dd4204b 100644
--- a/apps/ktorrent/groups/groupview.cpp
+++ b/apps/ktorrent/groups/groupview.cpp
@@ -105,7 +105,7 @@ namespace kt
 		addGroup(gman->activeUploadsGroup(), active);
 		
 		custom_root = new TDEListViewItem(all,i18n("Custom Groups"));
-		custom_root->setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small));
+		custom_root->setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",TDEIcon::Small));
 		setOpen(custom_root,true);
 	}
 
diff --git a/apps/ktorrent/groups/torrentdrag.cpp b/apps/ktorrent/groups/torrentdrag.cpp
index 69aaf94..0860ab6 100644
--- a/apps/ktorrent/groups/torrentdrag.cpp
+++ b/apps/ktorrent/groups/torrentdrag.cpp
@@ -26,7 +26,7 @@ namespace kt
 
 	TorrentDrag::TorrentDrag(TQWidget* src, const char *name) : TQStoredDrag("application/x-ktorrent-drag-object",src, name)
 	{
-		setPixmap(TDEGlobal::iconLoader()->loadIcon("player_playlist",KIcon::Small));
+		setPixmap(TDEGlobal::iconLoader()->loadIcon("player_playlist",TDEIcon::Small));
 	}
 
 
diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp
index dbdefbf..738ec2c 100644
--- a/apps/ktorrent/ktorrent.cpp
+++ b/apps/ktorrent/ktorrent.cpp
@@ -859,7 +859,7 @@ void KTorrent::addToolWidget(TQWidget* w,const TQString & icon,const TQString &
 	
 	
 	if (!icon.isNull())
-		w->setIcon(TDEGlobal::iconLoader()->loadIcon(icon,KIcon::Small));
+		w->setIcon(TDEGlobal::iconLoader()->loadIcon(icon,TDEIcon::Small));
 	
 	switch (dock)
 	{
diff --git a/apps/ktorrent/ktorrentviewmenu.cpp b/apps/ktorrent/ktorrentviewmenu.cpp
index 2b9578c..b31c310 100644
--- a/apps/ktorrent/ktorrentviewmenu.cpp
+++ b/apps/ktorrent/ktorrentviewmenu.cpp
@@ -31,32 +31,32 @@ using namespace kt;
 KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name )
 		: TDEPopupMenu ( parent, name ),view(parent)
 {
-	KIconLoader* iload = TDEGlobal::iconLoader();
+	TDEIconLoader* iload = TDEGlobal::iconLoader();
 	
 	stop_id = insertItem(
-			iload->loadIconSet("ktstop",KIcon::Small),i18n("to stop", "Stop"),
+			iload->loadIconSet("ktstop",TDEIcon::Small),i18n("to stop", "Stop"),
 			parent,TQT_SLOT(stopDownloads()));
 
 	start_id = insertItem(
-			iload->loadIconSet("ktstart",KIcon::Small),i18n("to start", "Start"),
+			iload->loadIconSet("ktstart",TDEIcon::Small),i18n("to start", "Start"),
 			parent,TQT_SLOT(startDownloads()));
 
 	remove_id = insertItem(
-			iload->loadIconSet("ktremove",KIcon::Small),i18n("Remove Torrent"),
+			iload->loadIconSet("ktremove",TDEIcon::Small),i18n("Remove Torrent"),
 			parent,TQT_SLOT(removeDownloads()));
 	
 	remove_all_id = insertItem(
-			iload->loadIconSet("ktremove",KIcon::Small),i18n("Remove Torrent and Data"),
+			iload->loadIconSet("ktremove",TDEIcon::Small),i18n("Remove Torrent and Data"),
 			parent,TQT_SLOT(removeDownloadsAndData()));
 	
 	queue_id = insertItem(
-			iload->loadIconSet("player_playlist",KIcon::Small),i18n("Enqueue/Dequeue"),
+			iload->loadIconSet("player_playlist",TDEIcon::Small),i18n("Enqueue/Dequeue"),
 			parent,TQT_SLOT(queueSlot()));
 	
 	insertSeparator();
 	
 	add_peer_id = insertItem(
-			iload->loadIconSet("add", KIcon::Small), i18n("Add Peers"),
+			iload->loadIconSet("add", TDEIcon::Small), i18n("Add Peers"),
 			parent, TQT_SLOT(showAddPeersWidget())); 
 	
 	peer_sources_menu = new TDEPopupMenu(this);
@@ -69,19 +69,19 @@ KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name )
 	insertSeparator();
 	
 	announce_id = insertItem(
-			iload->loadIconSet("apply",KIcon::Small),i18n("Manual Announce"),
+			iload->loadIconSet("apply",TDEIcon::Small),i18n("Manual Announce"),
 			parent,TQT_SLOT(manualAnnounce())); 
 	
 	preview_id = insertItem(
-			iload->loadIconSet("frame_image",KIcon::Small),i18n("Preview"), 
+			iload->loadIconSet("frame_image",TDEIcon::Small),i18n("Preview"), 
 			parent, TQT_SLOT(previewFiles()));
 	
 	insertSeparator();
 	dirs_sub_menu = new TDEPopupMenu(this);
 	dirs_id = insertItem(i18n("Open Directory"), dirs_sub_menu);
-	outputdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",KIcon::Small), i18n("Data Directory"), 
+	outputdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",TDEIcon::Small), i18n("Data Directory"), 
 											 parent, TQT_SLOT(openOutputDirectory()));
-	torxdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",KIcon::Small), i18n("Temporary Directory"),
+	torxdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",TDEIcon::Small), i18n("Temporary Directory"),
 										   parent, TQT_SLOT(openTorXDirectory()));
 	
 	downloaddir_id = insertItem(i18n("Set Download Location"), parent, TQT_SLOT(setDownloadLocationSlot()));
diff --git a/apps/ktorrent/pref.cpp b/apps/ktorrent/pref.cpp
index e7461f0..12b8e31 100644
--- a/apps/ktorrent/pref.cpp
+++ b/apps/ktorrent/pref.cpp
@@ -144,7 +144,7 @@ void KTorrentPreferences::removePrefPage(kt::PrefPageInterface* pp)
 
 ///////////////////////////////////////////////////////
 
-DownloadPrefPage::DownloadPrefPage() : kt::PrefPageInterface(i18n("Downloads"), i18n("Download Options"), TDEGlobal::iconLoader()->loadIcon("down", KIcon::NoGroup)), dp(0)
+DownloadPrefPage::DownloadPrefPage() : kt::PrefPageInterface(i18n("Downloads"), i18n("Download Options"), TDEGlobal::iconLoader()->loadIcon("down", TDEIcon::NoGroup)), dp(0)
 {}
 
 DownloadPrefPage::~ DownloadPrefPage()
@@ -214,7 +214,7 @@ void DownloadPrefPage::deleteWidget()
 //////////////////////////////////////
 GeneralPrefPage::GeneralPrefPage() :
 		kt::PrefPageInterface(i18n("General"), i18n("General Options"),
-							  TDEGlobal::iconLoader()->loadIcon("package_settings", KIcon::NoGroup)), gp(0)
+							  TDEGlobal::iconLoader()->loadIcon("package_settings", TDEIcon::NoGroup)), gp(0)
 {}
 
 GeneralPrefPage::~GeneralPrefPage()
@@ -409,7 +409,7 @@ void GeneralPrefPage::deleteWidget()
 
 AdvancedPrefPage::AdvancedPrefPage() :
 		kt::PrefPageInterface(i18n("Advanced"), i18n("Advanced Options"),
-							  TDEGlobal::iconLoader()->loadIcon("package_settings", KIcon::NoGroup)), ap(0)
+							  TDEGlobal::iconLoader()->loadIcon("package_settings", TDEIcon::NoGroup)), ap(0)
 {}
 
 AdvancedPrefPage::~AdvancedPrefPage()
diff --git a/apps/ktorrent/queuedialog.cpp b/apps/ktorrent/queuedialog.cpp
index a828017..212c920 100644
--- a/apps/ktorrent/queuedialog.cpp
+++ b/apps/ktorrent/queuedialog.cpp
@@ -98,12 +98,12 @@ void QueueItem::paintCell(TQPainter* p,const TQColorGroup & cg,int column,int wi
 QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *name)
 	:QueueDlg(parent, name)
 {
-	KIconLoader* iload = TDEGlobal::iconLoader();
+	TDEIconLoader* iload = TDEGlobal::iconLoader();
 	
-	m_tabs->setTabIconSet(m_tabs->page(0), iload->loadIconSet("down", KIcon::Small));
-	m_tabs->setTabIconSet(m_tabs->page(1), iload->loadIconSet("up", KIcon::Small));
+	m_tabs->setTabIconSet(m_tabs->page(0), iload->loadIconSet("down", TDEIcon::Small));
+	m_tabs->setTabIconSet(m_tabs->page(1), iload->loadIconSet("up", TDEIcon::Small));
 	
- 	logo->setPixmap(iload->loadIcon("ktqueuemanager", KIcon::Desktop));
+ 	logo->setPixmap(iload->loadIcon("ktqueuemanager", TDEIcon::Desktop));
 	
 	connect(downloadList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(downloadList_currentChanged( TQListViewItem* )));
 	connect(seedList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(seedList_currentChanged( TQListViewItem* )));
@@ -114,8 +114,8 @@ QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *nam
 	if(seedList->firstChild())
 		seedList->setCurrentItem(seedList->firstChild());
 	
-	btnMoveUp->setPixmap(iload->loadIcon("up", KIcon::Small));
-	btnMoveDown->setPixmap(iload->loadIcon("down", KIcon::Small));
+	btnMoveUp->setPixmap(iload->loadIcon("up", TDEIcon::Small));
+	btnMoveDown->setPixmap(iload->loadIcon("down", TDEIcon::Small));
 	
 	this->qman = qm;