Rename KIcon to enhance compatibility with KDE4

17 files changed, 32 insertions, 32 deletions

diff --git a/plugins/infowidget/fileview.cpp b/plugins/infowidget/fileview.cpp
index 7776ec7..1e4b87b 100644
--- a/plugins/infowidget/fileview.cpp
+++ b/plugins/infowidget/fileview.cpp
@@ -139,7 +139,7 @@ namespace kt
 					s.torrent_name,
 					BytesToString(s.total_bytes));
 	
-			item->setPixmap(0,KMimeType::findByPath(s.torrent_name)->pixmap(KIcon::Small));
+			item->setPixmap(0,KMimeType::findByPath(s.torrent_name)->pixmap(TDEIcon::Small));
 			setEnabled(true);
 			connect(curr_tc,TQT_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )),
 				this,TQT_SLOT(refreshFileTree( kt::TorrentInterface* )));
diff --git a/plugins/infowidget/infowidgetprefpage.cpp b/plugins/infowidget/infowidgetprefpage.cpp
index 2e94116..4ddd0dd 100644
--- a/plugins/infowidget/infowidgetprefpage.cpp
+++ b/plugins/infowidget/infowidgetprefpage.cpp
@@ -31,7 +31,7 @@ namespace kt
 {
 
 	InfoWidgetPrefPage::InfoWidgetPrefPage(InfoWidgetPlugin* iw)
-	: PrefPageInterface(i18n("Info Widget"),i18n("Information Widget Options"),TDEGlobal::iconLoader()->loadIcon("ktinfowidget",KIcon::NoGroup)),iw(iw)
+	: PrefPageInterface(i18n("Info Widget"),i18n("Information Widget Options"),TDEGlobal::iconLoader()->loadIcon("ktinfowidget",TDEIcon::NoGroup)),iw(iw)
 	{
 		pref = 0;
 	}
diff --git a/plugins/infowidget/peerview.cpp b/plugins/infowidget/peerview.cpp
index 26628cd..4fccbc4 100644
--- a/plugins/infowidget/peerview.cpp
+++ b/plugins/infowidget/peerview.cpp
@@ -65,13 +65,13 @@ namespace kt
 	{	
 		if (!yes_no_pix_loaded)
 		{
-			KIconLoader* iload = TDEGlobal::iconLoader();
+			TDEIconLoader* iload = TDEGlobal::iconLoader();
 			/* Prefer builtin flag images to the ones provided by KDE */
 			flagDB.addFlagSource("data",  TQString("ktorrent/geoip/%1.png"));
 			flagDB.addFlagSource("locale", TQString("l10n/%1/flag.png"));
-			yes_pix = iload->loadIcon("button_ok",KIcon::Small);
-			no_pix = iload->loadIcon("button_cancel",KIcon::Small);
-			lock_pix = iload->loadIcon("ktencrypted",KIcon::Small);
+			yes_pix = iload->loadIcon("button_ok",TDEIcon::Small);
+			no_pix = iload->loadIcon("button_cancel",TDEIcon::Small);
+			lock_pix = iload->loadIcon("ktencrypted",TDEIcon::Small);
 #ifdef USE_SYSTEM_GEOIP
 			geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD);
 			geoip_db_exists = (geo_ip != NULL);
@@ -246,8 +246,8 @@ namespace kt
 		setShowSortIndicator(true);
 		
 		menu = new TDEPopupMenu(this);
-		kick_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("delete_user", KIcon::NoGroup), i18n("to kick", "Kick peer"));
-		ban_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("filter",KIcon::NoGroup), i18n("to ban", "Ban peer"));
+		kick_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("delete_user", TDEIcon::NoGroup), i18n("to kick", "Kick peer"));
+		ban_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("filter",TDEIcon::NoGroup), i18n("to ban", "Ban peer"));
 		
 		connect(this,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )),
 				this,TQT_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& )));
diff --git a/plugins/infowidget/trackerview.cpp b/plugins/infowidget/trackerview.cpp
index 1e3d6e2..c689f26 100644
--- a/plugins/infowidget/trackerview.cpp
+++ b/plugins/infowidget/trackerview.cpp
@@ -46,11 +46,11 @@ namespace kt
 	TrackerView::TrackerView(TQWidget *parent, const char *name)
 		:TrackerViewBase(parent, name), tc(0)
 	{
-		KIconLoader* iload = TDEGlobal::iconLoader();
-		btnUpdate->setIconSet(iload->loadIconSet("apply", KIcon::Small));
-		btnAdd->setIconSet(iload->loadIconSet("add", KIcon::Small));
-		btnRemove->setIconSet(iload->loadIconSet("remove", KIcon::Small));
-		btnRestore->setIconSet(iload->loadIconSet("undo", KIcon::Small));
+		TDEIconLoader* iload = TDEGlobal::iconLoader();
+		btnUpdate->setIconSet(iload->loadIconSet("apply", TDEIcon::Small));
+		btnAdd->setIconSet(iload->loadIconSet("add", TDEIcon::Small));
+		btnRemove->setIconSet(iload->loadIconSet("remove", TDEIcon::Small));
+		btnRestore->setIconSet(iload->loadIconSet("undo", TDEIcon::Small));
 		
 		TQPalette p = lblCurrent->palette();
 		p.setColor(TQPalette::Active,TQColorGroup::Base,p.color(TQPalette::Active,TQColorGroup::Background));
diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp
index 9bcbe3d..e9416ae 100644
--- a/plugins/ipfilter/ipblockingprefpage.cpp
+++ b/plugins/ipfilter/ipblockingprefpage.cpp
@@ -220,7 +220,7 @@ namespace kt
 	////////////////////////////////////////////////////////////////////////////////////
 
 	IPBlockingPrefPage::IPBlockingPrefPage(CoreInterface* core, IPFilterPlugin* p)
-	: PrefPageInterface(i18n("IPBlocking Filter"), i18n("IPBlocking Filter Options"), TDEGlobal::iconLoader()->loadIcon("filter",KIcon::NoGroup)), m_core(core), m_plugin(p)
+	: PrefPageInterface(i18n("IPBlocking Filter"), i18n("IPBlocking Filter Options"), TDEGlobal::iconLoader()->loadIcon("filter",TDEIcon::NoGroup)), m_core(core), m_plugin(p)
 	{
 		widget = 0;
 	}
diff --git a/plugins/logviewer/logprefpage.cpp b/plugins/logviewer/logprefpage.cpp
index cd16e56..4a2ca9b 100644
--- a/plugins/logviewer/logprefpage.cpp
+++ b/plugins/logviewer/logprefpage.cpp
@@ -29,7 +29,7 @@ namespace kt
 
 	LogPrefPage::LogPrefPage()
 		: PrefPageInterface(i18n("LogViewer"), i18n("LogViewer Options"),
-						TDEGlobal::iconLoader()->loadIcon("toggle_log",KIcon::NoGroup))
+						TDEGlobal::iconLoader()->loadIcon("toggle_log",TDEIcon::NoGroup))
 	{
 		m_widget = 0;
 	}
diff --git a/plugins/rssfeed/rssfeedplugin.cpp b/plugins/rssfeed/rssfeedplugin.cpp
index 8025055..051c8e2 100644
--- a/plugins/rssfeed/rssfeedplugin.cpp
+++ b/plugins/rssfeed/rssfeedplugin.cpp
@@ -61,10 +61,10 @@ namespace kt
 	void RssFeedPlugin::load()
 	{
 		//add the new tab to the gui
-		KIconLoader* iload = TDEGlobal::iconLoader();
+		TDEIconLoader* iload = TDEGlobal::iconLoader();
 		m_rssFeedManager = new RssFeedManager(getCore());
 		getGUI()->addTabPage(
-			m_rssFeedManager,iload->loadIconSet("player_playlist", KIcon::Small),
+			m_rssFeedManager,iload->loadIconSet("player_playlist", TDEIcon::Small),
 			i18n("RSS Feeds"));
 		
 	}
diff --git a/plugins/scanfolder/scanfolderprefpage.cpp b/plugins/scanfolder/scanfolderprefpage.cpp
index 177cda5..b8dd406 100644
--- a/plugins/scanfolder/scanfolderprefpage.cpp
+++ b/plugins/scanfolder/scanfolderprefpage.cpp
@@ -32,7 +32,7 @@ namespace kt
 
 	ScanFolderPrefPage::ScanFolderPrefPage(ScanFolderPlugin* plugin)
 		: PrefPageInterface(i18n("ScanFolder"), i18n("ScanFolder Options"),
-							TDEGlobal::iconLoader()->loadIcon("view_sidetree",KIcon::NoGroup)), m_plugin(plugin)
+							TDEGlobal::iconLoader()->loadIcon("view_sidetree",TDEIcon::NoGroup)), m_plugin(plugin)
 	{}
 
 
diff --git a/plugins/scheduler/bwsprefpagewidget.cpp b/plugins/scheduler/bwsprefpagewidget.cpp
index f0e68e8..48d00e9 100644
--- a/plugins/scheduler/bwsprefpagewidget.cpp
+++ b/plugins/scheduler/bwsprefpagewidget.cpp
@@ -53,7 +53,7 @@ namespace kt
 
 		lblStatus->clear();
 
-		pix_icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("clock",KIcon::NoGroup));
+		pix_icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("clock",TDEIcon::NoGroup));
 		
 		btnOk->setGuiItem(KStdGuiItem::ok());
 		btnCancel->setGuiItem(KStdGuiItem::cancel());
diff --git a/plugins/scheduler/schedulerprefpage.cpp b/plugins/scheduler/schedulerprefpage.cpp
index 9f561a4..f6219a8 100644
--- a/plugins/scheduler/schedulerprefpage.cpp
+++ b/plugins/scheduler/schedulerprefpage.cpp
@@ -32,7 +32,7 @@ namespace kt
 {
 
 	SchedulerPrefPage::SchedulerPrefPage(SchedulerPlugin* plugin)
-		: PrefPageInterface(i18n("Scheduler"), i18n("Scheduler plugin options"), TDEGlobal::iconLoader()->loadIcon("clock",KIcon::NoGroup)), m_plugin(plugin)
+		: PrefPageInterface(i18n("Scheduler"), i18n("Scheduler plugin options"), TDEGlobal::iconLoader()->loadIcon("clock",TDEIcon::NoGroup)), m_plugin(plugin)
 	{
 		widget = 0;
 	}
diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp
index bd4efca..d3172c6 100644
--- a/plugins/search/searchplugin.cpp
+++ b/plugins/search/searchplugin.cpp
@@ -113,10 +113,10 @@ namespace kt
 			return;
 		}
 		
-		KIconLoader* iload = TDEGlobal::iconLoader();
+		TDEIconLoader* iload = TDEGlobal::iconLoader();
 		
 		SearchWidget* search = new SearchWidget(this);
-		getGUI()->addTabPage(search,iload->loadIconSet("viewmag", KIcon::Small),text,this);
+		getGUI()->addTabPage(search,iload->loadIconSet("viewmag", TDEIcon::Small),text,this);
 		
 		TDEAction* copy_act = KStdAction::copy(TQT_TQOBJECT(search),TQT_SLOT(copy()),actionCollection());
 		copy_act->plug(search->rightClickMenu(),0);
diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
index cc39647..ba79b00 100644
--- a/plugins/search/searchprefpage.cpp
+++ b/plugins/search/searchprefpage.cpp
@@ -245,7 +245,7 @@ namespace kt
 
 	SearchPrefPage::SearchPrefPage(SearchPlugin* plugin)
 		: PrefPageInterface(i18n("a noun", "Search"), i18n("Search Engine Options"),
-							TDEGlobal::iconLoader()->loadIcon("viewmag",KIcon::NoGroup)), m_plugin(plugin)
+							TDEGlobal::iconLoader()->loadIcon("viewmag",TDEIcon::NoGroup)), m_plugin(plugin)
 	{
 		widget = 0;
 	}
diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
index ed5141e..f77af71 100644
--- a/plugins/search/searchwidget.cpp
+++ b/plugins/search/searchwidget.cpp
@@ -68,10 +68,10 @@ namespace kt
 		right_click_menu->insertSeparator();
 		back_id = right_click_menu->insertItem(
                         TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() 
-                        ? "forward" : "back",KIcon::Small),
+                        ? "forward" : "back",TDEIcon::Small),
 				i18n("Back"),html_part,TQT_SLOT(back()));
 		right_click_menu->insertItem(
-				TDEGlobal::iconLoader()->loadIconSet("reload",KIcon::Small),
+				TDEGlobal::iconLoader()->loadIconSet("reload",TDEIcon::Small),
 				i18n("Reload"),html_part,TQT_SLOT(reload()));
 	
 		right_click_menu->setItemEnabled(back_id,false);
@@ -84,12 +84,12 @@ namespace kt
 	
 		sbar->m_clear_button->setIconSet(
 				TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() 
-                        ? "clear_left" : "locationbar_erase",KIcon::Small));
+                        ? "clear_left" : "locationbar_erase",TDEIcon::Small));
 		sbar->m_back->setIconSet(
                         TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() 
-                        ? "forward" : "back", KIcon::Small));
+                        ? "forward" : "back", TDEIcon::Small));
 		sbar->m_reload->setIconSet(
-				TDEGlobal::iconLoader()->loadIconSet("reload",KIcon::Small));
+				TDEGlobal::iconLoader()->loadIconSet("reload",TDEIcon::Small));
 		
 		
 		connect(html_part,TQT_SIGNAL(backAvailable(bool )),
diff --git a/plugins/stats/StatsPluginPrefs.cc b/plugins/stats/StatsPluginPrefs.cc
index 495e077..e9becd6 100644
--- a/plugins/stats/StatsPluginPrefs.cc
+++ b/plugins/stats/StatsPluginPrefs.cc
@@ -22,7 +22,7 @@
 
 namespace kt {
 
-StatsPluginPrefs::StatsPluginPrefs() : PrefPageInterface(i18n("Statistics"), i18n("Statistics options"), TDEGlobal::iconLoader()->loadIcon("ktimemon",KIcon::NoGroup)), pmUi(0)
+StatsPluginPrefs::StatsPluginPrefs() : PrefPageInterface(i18n("Statistics"), i18n("Statistics options"), TDEGlobal::iconLoader()->loadIcon("ktimemon",TDEIcon::NoGroup)), pmUi(0)
 {	
 }
 
diff --git a/plugins/upnp/upnpplugin.cpp b/plugins/upnp/upnpplugin.cpp
index b2195d6..aa5773a 100644
--- a/plugins/upnp/upnpplugin.cpp
+++ b/plugins/upnp/upnpplugin.cpp
@@ -59,7 +59,7 @@ namespace kt
 
 	void UPnPPlugin::load()
 	{
-		//KIconLoader* iload = TDEGlobal::iconLoader();
+		//TDEIconLoader* iload = TDEGlobal::iconLoader();
 		sock = new UPnPMCastSocket();
 		pref = new UPnPPrefPage(sock);
 		this->getGUI()->addPrefPage(pref);
diff --git a/plugins/upnp/upnpprefpage.cpp b/plugins/upnp/upnpprefpage.cpp
index 7e9e095..e360b3c 100644
--- a/plugins/upnp/upnpprefpage.cpp
+++ b/plugins/upnp/upnpprefpage.cpp
@@ -28,7 +28,7 @@
 namespace kt
 {
 
-	UPnPPrefPage::UPnPPrefPage(UPnPMCastSocket* sock): PrefPageInterface(i18n("UPnP"), i18n("UPnP Devices"),TDEGlobal::iconLoader()->loadIcon("ktupnp",KIcon::NoGroup)),sock(sock)
+	UPnPPrefPage::UPnPPrefPage(UPnPMCastSocket* sock): PrefPageInterface(i18n("UPnP"), i18n("UPnP Devices"),TDEGlobal::iconLoader()->loadIcon("ktupnp",TDEIcon::NoGroup)),sock(sock)
 	{
 		widget = 0;
 	}
diff --git a/plugins/webinterface/webinterfaceprefpage.cpp b/plugins/webinterface/webinterfaceprefpage.cpp
index 0821ab1..ecc7a62 100644
--- a/plugins/webinterface/webinterfaceprefpage.cpp
+++ b/plugins/webinterface/webinterfaceprefpage.cpp
@@ -25,7 +25,7 @@ namespace kt
 
 	WebInterfacePrefPage::WebInterfacePrefPage(WebInterfacePlugin* plugin)
 		: PrefPageInterface(i18n("WebInterface"), i18n("WebInterface Options"),
-						TDEGlobal::iconLoader()->loadIcon("toggle_log",KIcon::NoGroup))
+						TDEGlobal::iconLoader()->loadIcon("toggle_log",TDEIcon::NoGroup))
 	{
 		m_widget = 0;
 		w_plugin=plugin;