Rename KIcon to enhance compatibility with KDE4

14 files changed, 152 insertions, 152 deletions

diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp
index 512e517..13bd860 100644
--- a/KMFSysTray/kmfsystray.cpp
+++ b/KMFSysTray/kmfsystray.cpp
@@ -82,7 +82,7 @@ KMFSysTray::~KMFSysTray() {}
 
 void KMFSysTray::initMenu() {
 	TDEPopupMenu* menu = contextMenu ();
-	menu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", KIcon::Small ), i18n( "Launch KMyFirewall..."), this, TQT_SLOT( slotLaunchKMF() ), CTRL+Key_K );
+	menu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", TDEIcon::Small ), i18n( "Launch KMyFirewall..."), this, TQT_SLOT( slotLaunchKMF() ), CTRL+Key_K );
 	
 }
 
diff --git a/kmyfirewall/genericinterface/kmfgenericinterface.cpp b/kmyfirewall/genericinterface/kmfgenericinterface.cpp
index 6abfb2b..d123b0d 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterface.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterface.cpp
@@ -207,29 +207,29 @@ void KMFGenericInterface::slotPageChanged( TQWidget* /*wid*/ ){
 
 void KMFGenericInterface::loadIcons() {
 	kdDebug() << "void KMFGenericInterface::loadIcons()" << endl;
-	KIconLoader *loader = TDEGlobal:: iconLoader();
+	TDEIconLoader *loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "network";
-	icon_zone_page = loader->loadIcon( icon_name, KIcon::Desktop );
+	icon_zone_page = loader->loadIcon( icon_name, TDEIcon::Desktop );
 
 	icon_name = "services";
-	icon_protocol_page = loader->loadIcon( icon_name, KIcon::Desktop );
+	icon_protocol_page = loader->loadIcon( icon_name, TDEIcon::Desktop );
 
 	icon_name = "nfs_unmount";
-	icon_edit_protocol_page = loader->loadIcon( icon_name, KIcon::Desktop );
+	icon_edit_protocol_page = loader->loadIcon( icon_name, TDEIcon::Desktop );
 
 	icon_name = "pipe";
-	icon_icmp_page = loader->loadIcon( icon_name, KIcon::Desktop );
+	icon_icmp_page = loader->loadIcon( icon_name, TDEIcon::Desktop );
 
 	icon_name = "log";
-	icon_logging_page = loader->loadIcon( icon_name, KIcon::Desktop );
+	icon_logging_page = loader->loadIcon( icon_name, TDEIcon::Desktop );
 
 	icon_name = "network_local";
-	icon_host_page = loader->loadIcon( icon_name, KIcon::Desktop );
+	icon_host_page = loader->loadIcon( icon_name, TDEIcon::Desktop );
 
 	icon_name = "filesaveas";
-	icon_nat_page = loader->loadIcon( icon_name, KIcon::Desktop );
+	icon_nat_page = loader->loadIcon( icon_name, TDEIcon::Desktop );
 }
 
 }
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
index 75d6778..049e878 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
@@ -448,69 +448,69 @@ KMFListViewItem* KMFGenericInterfaceHost::findKMFItem( const TQUuid& obj_id ) {
 
 void KMFGenericInterfaceHost::loadIcons() {
 	kdDebug() << "void KMFGenericInterfa::loadIcons()" << endl;
-	KIconLoader *loader = TDEGlobal:: iconLoader();
+	TDEIconLoader *loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "up";
-	icon_up = loader->loadIcon( icon_name, KIcon::Small );
+	icon_up = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "down";
-	icon_down = loader->loadIcon( icon_name, KIcon::Small );
+	icon_down = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "editdelete";
-	icon_del = loader->loadIcon( icon_name, KIcon::Small );
+	icon_del = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filenew";
-	icon_new = loader->loadIcon( icon_name, KIcon::Small );
+	icon_new = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit";
-	icon_edit = loader->loadIcon( icon_name, KIcon::Small );
+	icon_edit = loader->loadIcon( icon_name, TDEIcon::Small );
 
 
 	icon_name = "filter";
-	icon_filter = loader->loadIcon( icon_name, KIcon::Small );
+	icon_filter = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "text";
-	icon_rename = loader->loadIcon( icon_name, KIcon::Small );
+	icon_rename = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "rule-22";
-	icon_rule = loader->loadIcon( icon_name, KIcon::User );
+	icon_rule = loader->loadIcon( icon_name, TDEIcon::User );
 
 	icon_name = "view_tree";
-	icon_chain = loader->loadIcon( icon_name, KIcon::Small );
+	icon_chain = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "reject";
-	icon_reject = loader->loadIcon( icon_name, KIcon::User );
+	icon_reject = loader->loadIcon( icon_name, TDEIcon::User );
 
 	icon_name = "target";
-	icon_target = loader->loadIcon( icon_name, KIcon::User );
+	icon_target = loader->loadIcon( icon_name, TDEIcon::User );
 
 	icon_name = "stop";
-	icon_drop = loader->loadIcon( icon_name, KIcon::Small );
+	icon_drop = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "button_ok";
-	icon_accept = loader->loadIcon( icon_name, KIcon::Small );
+	icon_accept = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filesaveas";
-	icon_log = loader->loadIcon( icon_name, KIcon::Small );
+	icon_log = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "undo";
-	icon_return = loader->loadIcon( icon_name, KIcon::Small );
+	icon_return = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "editclear";
-	icon_cmd = loader->loadIcon( icon_name, KIcon::Small );
+	icon_cmd = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filter";
-	icon_filter = loader->loadIcon( icon_name, KIcon::Small );
+	icon_filter = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "pipe";
-	icon_queue = loader->loadIcon( icon_name, KIcon::Small );
+	icon_queue = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "editcopy";
-	icon_copy = loader->loadIcon( icon_name, KIcon::Small );
+	icon_copy = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "forward";
-	icon_move = loader->loadIcon( icon_name, KIcon::Small );
+	icon_move = loader->loadIcon( icon_name, TDEIcon::Small );
 
 }
 
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
index d0b5fea..98892d9 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
@@ -613,69 +613,69 @@ void KMFGenericInterfaceProtocol::slotRenameItem( TQListViewItem* item, int, con
  
 void KMFGenericInterfaceProtocol::loadIcons() {
 	kdDebug() << "void KMFGenericInterfa::loadIcons()" << endl;
-	KIconLoader *loader = TDEGlobal:: iconLoader();
+	TDEIconLoader *loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "up";
-	icon_up = loader->loadIcon( icon_name, KIcon::Small );
+	icon_up = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "down";
-	icon_down = loader->loadIcon( icon_name, KIcon::Small );
+	icon_down = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "editdelete";
-	icon_del = loader->loadIcon( icon_name, KIcon::Small );
+	icon_del = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filenew";
-	icon_new = loader->loadIcon( icon_name, KIcon::Small );
+	icon_new = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit";
-	icon_edit = loader->loadIcon( icon_name, KIcon::Small );
+	icon_edit = loader->loadIcon( icon_name, TDEIcon::Small );
 
 
 	icon_name = "filter";
-	icon_filter = loader->loadIcon( icon_name, KIcon::Small );
+	icon_filter = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "text";
-	icon_rename = loader->loadIcon( icon_name, KIcon::Small );
+	icon_rename = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "rule-22";
-	icon_rule = loader->loadIcon( icon_name, KIcon::Small );
+	icon_rule = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "view_tree";
-	icon_chain = loader->loadIcon( icon_name, KIcon::Small );
+	icon_chain = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "reject";
-	icon_reject = loader->loadIcon( icon_name, KIcon::User );
+	icon_reject = loader->loadIcon( icon_name, TDEIcon::User );
 
 	icon_name = "target";
-	icon_target = loader->loadIcon( icon_name, KIcon::User );
+	icon_target = loader->loadIcon( icon_name, TDEIcon::User );
 
 	icon_name = "stop";
-	icon_drop = loader->loadIcon( icon_name, KIcon::Small );
+	icon_drop = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "button_ok";
-	icon_accept = loader->loadIcon( icon_name, KIcon::Small );
+	icon_accept = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filesaveas";
-	icon_log = loader->loadIcon( icon_name, KIcon::Small );
+	icon_log = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "undo";
-	icon_return = loader->loadIcon( icon_name, KIcon::Small );
+	icon_return = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "editclear";
-	icon_cmd = loader->loadIcon( icon_name, KIcon::Small );
+	icon_cmd = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filter";
-	icon_filter = loader->loadIcon( icon_name, KIcon::Small );
+	icon_filter = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "pipe";
-	icon_queue = loader->loadIcon( icon_name, KIcon::Small );
+	icon_queue = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "editcopy";
-	icon_copy = loader->loadIcon( icon_name, KIcon::Small );
+	icon_copy = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "forward";
-	icon_move = loader->loadIcon( icon_name, KIcon::Small );
+	icon_move = loader->loadIcon( icon_name, TDEIcon::Small );
 
 }
 
diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.cpp b/kmyfirewall/installer/linux/kmfiptinstaller.cpp
index 78e4255..cd42647 100644
--- a/kmyfirewall/installer/linux/kmfiptinstaller.cpp
+++ b/kmyfirewall/installer/linux/kmfiptinstaller.cpp
@@ -1120,16 +1120,16 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p
 
 void KMFIPTInstaller::loadIcons() {
 	kdDebug() << "void KMFIPTInstaller::loadIcons()" << endl;
-	KIconLoader *loader = TDEGlobal:: iconLoader();
+	TDEIconLoader *loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 	icon_name = "encrypted";
-	icon_run = loader->loadIcon( icon_name, KIcon::Toolbar );
+	icon_run = loader->loadIcon( icon_name, TDEIcon::Toolbar );
 
 	icon_name = "decrypted";
-	icon_stop = loader->loadIcon( icon_name, KIcon::Toolbar );
+	icon_stop = loader->loadIcon( icon_name, TDEIcon::Toolbar );
 
 	icon_name = "openterm";
-	icon_show = loader->loadIcon( icon_name, KIcon::Toolbar );
+	icon_show = loader->loadIcon( icon_name, TDEIcon::Toolbar );
 }
 
 // It's usually safe to leave the factory code alone.. with the
diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
index 429ee48..19fbf0c 100644
--- a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
+++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
@@ -1080,16 +1080,16 @@ void KMFPFInstaller::generateInstallerPackage( KMFTarget* target, const KURL& pa
 // 
 // void KMFPFInstaller::loadIcons() {
 // 	kdDebug() << "void KMFPFInstaller::loadIcons()" << endl;
-// 	KIconLoader *loader = TDEGlobal:: iconLoader();
+// 	TDEIconLoader *loader = TDEGlobal:: iconLoader();
 // 	TQString icon_name;
 // 	icon_name = "encrypted";
-// 	icon_run = loader->loadIcon( icon_name, KIcon::Toolbar );
+// 	icon_run = loader->loadIcon( icon_name, TDEIcon::Toolbar );
 // 
 // 	icon_name = "decrypted";
-// 	icon_stop = loader->loadIcon( icon_name, KIcon::Toolbar );
+// 	icon_stop = loader->loadIcon( icon_name, TDEIcon::Toolbar );
 // 
 // 	icon_name = "openterm";
-// 	icon_show = loader->loadIcon( icon_name, KIcon::Toolbar );
+// 	icon_show = loader->loadIcon( icon_name, TDEIcon::Toolbar );
 // }
 
 // It's usually safe to leave the factory code alone.. with the
diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.cpp b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
index f0b35cf..bf4e5bf 100644
--- a/kmyfirewall/ipteditor/kmfipteditorpart.cpp
+++ b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
@@ -90,10 +90,10 @@ KMFIPTEditorPart::KMFIPTEditorPart( TQWidget *parentWidget, const char *widgetNa
 	                                0 , this, TQT_SLOT( slotDelChain() ), actionCollection(), "del_chain" );
 
 	
-	m_actionNewRule = new TDEAction( i18n( "Add New Rule..." ), TQIconSet( TDEGlobal:: iconLoader()->loadIcon( "rule", KIcon::Toolbar ) ) ,
+	m_actionNewRule = new TDEAction( i18n( "Add New Rule..." ), TQIconSet( TDEGlobal:: iconLoader()->loadIcon( "rule", TDEIcon::Toolbar ) ) ,
 								   TDEStdAccel::shortcut(TDEStdAccel::New) , this, TQT_SLOT( slotNewRule() ), actionCollection(), "new_rule" );
 	
-//	m_actionNewRule->setIconSet( TQIconSet(  loader->loadIcon( "rule-22", KIcon::User ) ) );							   
+//	m_actionNewRule->setIconSet( TQIconSet(  loader->loadIcon( "rule-22", TDEIcon::User ) ) );							   
 								   
 	m_actionDelRule = new TDEAction( i18n( "Delete Rule" ), TQIconSet( BarIcon( "editdelete", KMFIPTEditorPartFactory::instance() ) ),
 								   TDEStdAccel::shortcut(TDEStdAccel::DeleteWordBack), this, TQT_SLOT( slotDelRule() ), actionCollection(), "del_rule" );
diff --git a/kmyfirewall/ipteditor/kmfruleedit.cpp b/kmyfirewall/ipteditor/kmfruleedit.cpp
index 4c2fbe9..7b5bbcc 100644
--- a/kmyfirewall/ipteditor/kmfruleedit.cpp
+++ b/kmyfirewall/ipteditor/kmfruleedit.cpp
@@ -1446,69 +1446,69 @@ void KMFRuleEdit::slotHelp() {
 }
 void KMFRuleEdit::loadIcons() {
 	kdDebug() << "void KMFRuleEdit::loadIcons()" << endl;
-	KIconLoader *loader = TDEGlobal:: iconLoader();
+	TDEIconLoader *loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "up";
-	icon_up = loader->loadIcon( icon_name, KIcon::Small );
+	icon_up = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "down";
-	icon_down = loader->loadIcon( icon_name, KIcon::Small );
+	icon_down = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "editdelete";
-	icon_del = loader->loadIcon( icon_name, KIcon::Small );
+	icon_del = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filenew";
-	icon_new = loader->loadIcon( icon_name, KIcon::Small );
+	icon_new = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit";
-	icon_edit = loader->loadIcon( icon_name, KIcon::Small );
+	icon_edit = loader->loadIcon( icon_name, TDEIcon::Small );
 
 
 	icon_name = "filter";
-	icon_filter = loader->loadIcon( icon_name, KIcon::Small );
+	icon_filter = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "text";
-	icon_rename = loader->loadIcon( icon_name, KIcon::Small );
+	icon_rename = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "rule-22";
-	icon_rule = loader->loadIcon( icon_name, KIcon::Small );
+	icon_rule = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "view_tree";
-	icon_chain = loader->loadIcon( icon_name, KIcon::Small );
+	icon_chain = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "reject";
-	icon_reject = loader->loadIcon( icon_name, KIcon::User );
+	icon_reject = loader->loadIcon( icon_name, TDEIcon::User );
 
 	icon_name = "target";
-	icon_target = loader->loadIcon( icon_name, KIcon::User );
+	icon_target = loader->loadIcon( icon_name, TDEIcon::User );
 
 	icon_name = "stop";
-	icon_drop = loader->loadIcon( icon_name, KIcon::Small );
+	icon_drop = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "button_ok";
-	icon_accept = loader->loadIcon( icon_name, KIcon::Small );
+	icon_accept = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filesaveas";
-	icon_log = loader->loadIcon( icon_name, KIcon::Small );
+	icon_log = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "undo";
-	icon_return = loader->loadIcon( icon_name, KIcon::Small );
+	icon_return = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "editclear";
-	icon_cmd = loader->loadIcon( icon_name, KIcon::Small );
+	icon_cmd = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filter";
-	icon_filter = loader->loadIcon( icon_name, KIcon::Small );
+	icon_filter = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "pipe";
-	icon_queue = loader->loadIcon( icon_name, KIcon::Small );
+	icon_queue = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "editcopy";
-	icon_copy = loader->loadIcon( icon_name, KIcon::Small );
+	icon_copy = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "forward";
-	icon_move = loader->loadIcon( icon_name, KIcon::Small );
+	icon_move = loader->loadIcon( icon_name, TDEIcon::Small );
 
 }
 
diff --git a/kmyfirewall/kmfconfigdialog.cpp b/kmyfirewall/kmfconfigdialog.cpp
index 4ad3bb0..1d6f782 100644
--- a/kmyfirewall/kmfconfigdialog.cpp
+++ b/kmyfirewall/kmfconfigdialog.cpp
@@ -392,23 +392,23 @@ void KMFConfigDialog::slotEnableWarnings() {
 }
 
 void KMFConfigDialog::loadIcons() {
-	KIconLoader * loader = TDEGlobal:: iconLoader();
+	TDEIconLoader * loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "about_kde";
-	icon_general = loader->loadIcon( icon_name, KIcon::Desktop );
+	icon_general = loader->loadIcon( icon_name, TDEIcon::Desktop );
 
 	icon_name = "folder";
-	icon_paths = loader->loadIcon( icon_name, KIcon::Desktop );
+	icon_paths = loader->loadIcon( icon_name, TDEIcon::Desktop );
 
 	icon_name = "network";
-	icon_interfaces = loader->loadIcon( icon_name, KIcon::Desktop );
+	icon_interfaces = loader->loadIcon( icon_name, TDEIcon::Desktop );
 
 	icon_name = "view_tree";
-	icon_listview = loader->loadIcon( icon_name, KIcon::Desktop );
+	icon_listview = loader->loadIcon( icon_name, TDEIcon::Desktop );
 	
 	icon_name = "nfs_unmount";
-	icon_edit_protocol_page = loader->loadIcon( icon_name, KIcon::Desktop );
+	icon_edit_protocol_page = loader->loadIcon( icon_name, TDEIcon::Desktop );
 }
 
 }
diff --git a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
index 5db3c42..afd2f91 100644
--- a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
+++ b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
@@ -88,14 +88,14 @@ void KMFCheckListOutput::clearList() {
 
 void KMFCheckListOutput::loadIcons() {
 	kdDebug() << "void KMFCheckListOutput::loadIcons()" << endl;
-	KIconLoader *loader = TDEGlobal::iconLoader();
+	TDEIconLoader *loader = TDEGlobal::iconLoader();
 	TQString icon_name;
 
 	icon_name = "stop";
-	icon_err = loader->loadIcon( icon_name, KIcon::Small );
+	icon_err = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "button_ok";
-	icon_ok = loader->loadIcon( icon_name, KIcon::Small );
+	icon_ok = loader->loadIcon( icon_name, TDEIcon::Small );
 
 }
 
diff --git a/kmyfirewall/kmfwidgets/kmflistview.cpp b/kmyfirewall/kmfwidgets/kmflistview.cpp
index 3366e38..f8c3b33 100644
--- a/kmyfirewall/kmfwidgets/kmflistview.cpp
+++ b/kmyfirewall/kmfwidgets/kmflistview.cpp
@@ -1062,83 +1062,83 @@ KMFListViewItem* KMFListView::findKMFItem( const TQString & text1, int column1,c
 
 void KMFListView::loadIcons() {
 	kdDebug() << "void KMFListView::loadIcons()" << endl;
-	KIconLoader *loader = TDEGlobal::iconLoader();
+	TDEIconLoader *loader = TDEGlobal::iconLoader();
 	TQString icon_name;
 
 	icon_name = "up";
-	icon_up = loader->loadIcon( icon_name, KIcon::Small );
+	icon_up = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "down";
-	icon_down = loader->loadIcon( icon_name, KIcon::Small );
+	icon_down = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "ereaser";
-	icon_del = loader->loadIcon( icon_name, KIcon::Small );
+	icon_del = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filenew";
-	icon_new = loader->loadIcon( icon_name, KIcon::Small );
+	icon_new = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit";
-	icon_edit = loader->loadIcon( icon_name, KIcon::Small );
+	icon_edit = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "rule";
-	icon_rule = loader->loadIcon( icon_name, KIcon::Small );
+	icon_rule = loader->loadIcon( icon_name, TDEIcon::Small );
 	
 	icon_name = "user_defined";
-	icon_user = loader->loadIcon( icon_name, KIcon::Small );
+	icon_user = loader->loadIcon( icon_name, TDEIcon::Small );
 	
 	icon_name = "builtin";
-	icon_builtin = loader->loadIcon( icon_name, KIcon::Small );
+	icon_builtin = loader->loadIcon( icon_name, TDEIcon::Small );
 	
 	icon_name = "table";
-	icon_table = loader->loadIcon( icon_name, KIcon::Small );
+	icon_table = loader->loadIcon( icon_name, TDEIcon::Small );
 	
 	icon_name = "filter";
-	icon_filter = loader->loadIcon( icon_name, KIcon::Small );
+	icon_filter = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "text";
-	icon_rename = loader->loadIcon( icon_name, KIcon::Small );
+	icon_rename = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "view_tree";
-	icon_chain = loader->loadIcon( icon_name, KIcon::Small );
+	icon_chain = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "reject";
-	icon_reject = loader->loadIcon( icon_name, KIcon::User );
+	icon_reject = loader->loadIcon( icon_name, TDEIcon::User );
 
 	icon_name = "target";
-	icon_target = loader->loadIcon( icon_name, KIcon::User );
+	icon_target = loader->loadIcon( icon_name, TDEIcon::User );
 
 	icon_name = "stop";
-	icon_drop = loader->loadIcon( icon_name, KIcon::Small );
+	icon_drop = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "button_ok";
-	icon_accept = loader->loadIcon( icon_name, KIcon::Small );
+	icon_accept = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filesaveas";
-	icon_log = loader->loadIcon( icon_name, KIcon::Small );
+	icon_log = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "undo";
-	icon_return = loader->loadIcon( icon_name, KIcon::Small );
+	icon_return = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "editclear";
-	icon_cmd = loader->loadIcon( icon_name, KIcon::Small );
+	icon_cmd = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filter";
-	icon_filter = loader->loadIcon( icon_name, KIcon::Small );
+	icon_filter = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "pipe";
-	icon_queue = loader->loadIcon( icon_name, KIcon::Small );
+	icon_queue = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "button_cancel";
-	icon_disabled = loader->loadIcon( icon_name, KIcon::Small );
+	icon_disabled = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "1rightarrow";
-	icon_fwd = loader->loadIcon( icon_name, KIcon::Small );
+	icon_fwd = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "2rightarrow";
-	icon_fwds = loader->loadIcon( icon_name, KIcon::Small );
+	icon_fwds = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "fill";
-	icon_feed = loader->loadIcon( icon_name, KIcon::Small );
+	icon_feed = loader->loadIcon( icon_name, TDEIcon::Small );
 
 }
 
diff --git a/kmyfirewall/kmfwidgets/kmflistviewitem.cpp b/kmyfirewall/kmfwidgets/kmflistviewitem.cpp
index d7b32a3..47591f8 100644
--- a/kmyfirewall/kmfwidgets/kmflistviewitem.cpp
+++ b/kmyfirewall/kmfwidgets/kmflistviewitem.cpp
@@ -162,7 +162,7 @@ void KMFListViewItem::setupProtocolView() {
 		delete firstChild();
 	}
 	
-	setPixmap(0, TDEGlobal:: iconLoader()->loadIcon("kmyfirewall", KIcon::Small ) );
+	setPixmap(0, TDEGlobal:: iconLoader()->loadIcon("kmyfirewall", TDEIcon::Small ) );
 	setText( 0, protocol()->name() );
 	setText( 1, protocol()->description() );
 	// setOpen( true );
@@ -190,7 +190,7 @@ void KMFListViewItem::setupProtocolCategoryView() {
 		delete firstChild();
 	}
 	
-	setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "folder" , KIcon::Small ) );
+	setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "folder" , TDEIcon::Small ) );
 	setText( 0, protocolCategory()->name() );
 	setText( 1, protocolCategory()->description() );
 
@@ -209,9 +209,9 @@ void KMFListViewItem::setupTargetView() {
 // 		setFont( TQFont::Bold );
 // 	}
 	if ( target()->isCurrentTarget() ) {
-		setPixmap(0, TDEGlobal:: iconLoader()->loadIcon("kmyfirewall", KIcon::Small ) );
+		setPixmap(0, TDEGlobal:: iconLoader()->loadIcon("kmyfirewall", TDEIcon::Small ) );
 	} else {
-		setPixmap(0, TDEGlobal:: iconLoader()->loadIcon("enhanced_browsing", KIcon::Small ) );
+		setPixmap(0, TDEGlobal:: iconLoader()->loadIcon("enhanced_browsing", TDEIcon::Small ) );
 	}
 	setText( 0, target()->guiName() );
 	setText( 1,"[" +  target()->address()->toString() + "]" );
@@ -221,7 +221,7 @@ void KMFListViewItem::setupTargetView() {
 }
 
 void KMFListViewItem::setupNetHostView() {
-	setPixmap(0, TDEGlobal:: iconLoader()->loadIcon("home_white", KIcon::Small ) );
+	setPixmap(0, TDEGlobal:: iconLoader()->loadIcon("home_white", TDEIcon::Small ) );
 	setText( 0, host()->guiName() );
 	setText( 1,"[" +  host()->address()->toString() + "]" );
 		
@@ -240,13 +240,13 @@ void KMFListViewItem::setupZoneView() {
 	if ( type() != NetfilterObject::NETZONE ) {
 		return;
 	}
-	KIconLoader *loader = TDEGlobal:: iconLoader();
+	TDEIconLoader *loader = TDEGlobal:: iconLoader();
 
 	setText( 0,m_zone->guiName() );
 	if ( m_zone->name() == "incoming_world" || m_zone->name() == "outgoing_world" ) {
-		setPixmap(0, loader->loadIcon("network", KIcon::Small ) );
+		setPixmap(0, loader->loadIcon("network", TDEIcon::Small ) );
 	} else {
-		setPixmap(0, loader->loadIcon("network_local", KIcon::Small ) );
+		setPixmap(0, loader->loadIcon("network_local", TDEIcon::Small ) );
 	}
 	
 	// if (  m_zone->name().startsWith("incoming_world") ||  m_zone->name().startsWith("outgoing_world") )
@@ -309,7 +309,7 @@ void KMFListViewItem::setupZoneView() {
 			// item->setRenameEnabled( 0, true );
 			item->setupNetHostView();*/
 
-/*			item->setPixmap(0, loader->loadIcon("home_white", KIcon::Small ) );
+/*			item->setPixmap(0, loader->loadIcon("home_white", TDEIcon::Small ) );
 			item->setText( 0, host->guiName() );
 			item->setText( 1,"[" +  host->address()->toString() + "]" );
 		
@@ -329,7 +329,7 @@ void KMFListViewItem::setupZoneView() {
 		
 // 		KMFListViewItem *item = new KMFListViewItem( this, 0,  it2.current() );
 // 		item->loadNetfilterObject( it2.current() );
-// 		item->setPixmap(0, loader->loadIcon("home_white", KIcon::Small ) );
+// 		item->setPixmap(0, loader->loadIcon("home_white", TDEIcon::Small ) );
 // 		item->setText( 0, it2.current()->guiName() );
 // 		item->setText( 1,"[" +  it2.current()->address()->toString() + "]" );
 // 		
diff --git a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
index 7dfb723..bb0484d 100644
--- a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
@@ -265,7 +265,7 @@ void KMFMyNetworkWidget::slotZoneRBM( TQListViewItem* item, const TQPoint& point
 			}
 			if ( ! m_target->isCurrentTarget() ) {
 				m_contextMenu->insertSeparator();
-				m_contextMenu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", KIcon::Small ), i18n( "Make Active Target..." ), this, TQT_SLOT( slotSetActiveTarget() ) );
+				m_contextMenu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", TDEIcon::Small ), i18n( "Make Active Target..." ), this, TQT_SLOT( slotSetActiveTarget() ) );
 			}
 			
 			m_contextMenu->popup( point );
@@ -513,69 +513,69 @@ KMFListViewItem* KMFMyNetworkWidget::findItem( const TQUuid& obj_id ) {
 /*$SPECIALIZATION$*/
 void KMFMyNetworkWidget::loadIcons() {
 	kdDebug() << "void KMFGenericInterfa::loadIcons()" << endl;
-	KIconLoader *loader = TDEGlobal:: iconLoader();
+	TDEIconLoader *loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "up";
-	icon_up = loader->loadIcon( icon_name, KIcon::Small );
+	icon_up = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "down";
-	icon_down = loader->loadIcon( icon_name, KIcon::Small );
+	icon_down = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "editdelete";
-	icon_del = loader->loadIcon( icon_name, KIcon::Small );
+	icon_del = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filenew";
-	icon_new = loader->loadIcon( icon_name, KIcon::Small );
+	icon_new = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit";
-	icon_edit = loader->loadIcon( icon_name, KIcon::Small );
+	icon_edit = loader->loadIcon( icon_name, TDEIcon::Small );
 
 
 	icon_name = "filter";
-	icon_filter = loader->loadIcon( icon_name, KIcon::Small );
+	icon_filter = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "text";
-	icon_rename = loader->loadIcon( icon_name, KIcon::Small );
+	icon_rename = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "rule-22";
-	icon_rule = loader->loadIcon( icon_name, KIcon::Small );
+	icon_rule = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "view_tree";
-	icon_chain = loader->loadIcon( icon_name, KIcon::Small );
+	icon_chain = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "reject";
-	icon_reject = loader->loadIcon( icon_name, KIcon::User );
+	icon_reject = loader->loadIcon( icon_name, TDEIcon::User );
 
 	icon_name = "target";
-	icon_target = loader->loadIcon( icon_name, KIcon::User );
+	icon_target = loader->loadIcon( icon_name, TDEIcon::User );
 
 	icon_name = "stop";
-	icon_drop = loader->loadIcon( icon_name, KIcon::Small );
+	icon_drop = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "button_ok";
-	icon_accept = loader->loadIcon( icon_name, KIcon::Small );
+	icon_accept = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filesaveas";
-	icon_log = loader->loadIcon( icon_name, KIcon::Small );
+	icon_log = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "undo";
-	icon_return = loader->loadIcon( icon_name, KIcon::Small );
+	icon_return = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "editclear";
-	icon_cmd = loader->loadIcon( icon_name, KIcon::Small );
+	icon_cmd = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filter";
-	icon_filter = loader->loadIcon( icon_name, KIcon::Small );
+	icon_filter = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "pipe";
-	icon_queue = loader->loadIcon( icon_name, KIcon::Small );
+	icon_queue = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "editcopy";
-	icon_copy = loader->loadIcon( icon_name, KIcon::Small );
+	icon_copy = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "forward";
-	icon_move = loader->loadIcon( icon_name, KIcon::Small );
+	icon_move = loader->loadIcon( icon_name, TDEIcon::Small );
 
 }
 
diff --git a/kmyfirewall/kmfwidgets/kmfprocout.cpp b/kmyfirewall/kmfwidgets/kmfprocout.cpp
index c9126de..1869148 100644
--- a/kmyfirewall/kmfwidgets/kmfprocout.cpp
+++ b/kmyfirewall/kmfwidgets/kmfprocout.cpp
@@ -52,14 +52,14 @@ KMFProcOut::~KMFProcOut() {
 }
 
 void KMFProcOut::initGUI() {
-	KIconLoader * loader = TDEGlobal:: iconLoader();
+	TDEIconLoader * loader = TDEGlobal:: iconLoader();
 	TQString icon_name;
 
 	icon_name = "stop";
-	icon_stop = loader->loadIcon( icon_name, KIcon::Small );
+	icon_stop = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "quit";
-	icon_close = loader->loadIcon( icon_name, KIcon::Small );
+	icon_close = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	m_layout = new TQGridLayout( this, 0, 0, 2, 2, "layout" );