Rename KIcon to enhance compatibility with KDE4

37 files changed, 128 insertions, 128 deletions

diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp
index 7a2dda9..f011e62 100644
--- a/ark/arkviewer.cpp
+++ b/ark/arkviewer.cpp
@@ -75,7 +75,7 @@ bool ArkViewer::view( const KURL& filename )
 	headerLayout->setAutoAdd( true );
 
 	TQLabel *iconLabel = new TQLabel( header );
-	iconLabel->setPixmap( mimetype->pixmap( KIcon::Desktop ) );
+	iconLabel->setPixmap( mimetype->pixmap( TDEIcon::Desktop ) );
 	iconLabel->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
 
 	TQVBox *headerRight = new TQVBox( header );
diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp
index 51e1704..8792239 100644
--- a/ark/filelistview.cpp
+++ b/ark/filelistview.cpp
@@ -176,7 +176,7 @@ static FileLVI* folderLVI( TDEListViewItem *parent, const TQString& name )
 
 	folder->setText( 0, name );
 
-	folder->setPixmap( 0, KMimeType::mimeType( "inode/directory" )->pixmap( KIcon::Small ) );
+	folder->setPixmap( 0, KMimeType::mimeType( "inode/directory" )->pixmap( TDEIcon::Small ) );
 
 	return folder;
 }
@@ -185,7 +185,7 @@ static FileLVI* folderLVI( TDEListView *parent, const TQString& name )
 {
 	FileLVI *folder = new FileLVI( parent );
 	folder->setText( 0, name );
-	folder->setPixmap( 0, KMimeType::mimeType( "inode/directory" )->pixmap( KIcon::Small ) );
+	folder->setPixmap( 0, KMimeType::mimeType( "inode/directory" )->pixmap( TDEIcon::Small ) );
 	return folder;
 }
 
@@ -401,7 +401,7 @@ void FileListView::addItem( const TQStringList & entries )
 	}
 
 	KMimeType::Ptr mimeType = KMimeType::findByPath( entries.first(), 0, true );
-	flvi->setPixmap( 0, mimeType->pixmap( KIcon::Small ) );
+	flvi->setPixmap( 0, mimeType->pixmap( TDEIcon::Small ) );
 }
 
 void FileListView::selectAll()
diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp
index b595066..c2ba916 100644
--- a/kdelirc/irkick/irkick.cpp
+++ b/kdelirc/irkick/irkick.cpp
@@ -172,7 +172,7 @@ void IRKick::updateModeIcons()
 				currentModeIcons[i.key()]->contextMenu()->changeTitle(0, mode.remoteName());
 				currentModeIcons[i.key()]->actionCollection()->action("file_quit")->setEnabled(false);
 			}
-			currentModeIcons[i.key()]->setPixmap(KIconLoader().loadIcon(mode.iconFile(), KIcon::Panel));
+			currentModeIcons[i.key()]->setPixmap(TDEIconLoader().loadIcon(mode.iconFile(), TDEIcon::Panel));
 			TQToolTip::add(currentModeIcons[i.key()], mode.remoteName() + ": <b>" + mode.name() + "</b>");
 		}
 	}
diff --git a/kdelirc/kcmlirc/editmode.cpp b/kdelirc/kcmlirc/editmode.cpp
index aad27da..a197bb7 100644
--- a/kdelirc/kcmlirc/editmode.cpp
+++ b/kdelirc/kcmlirc/editmode.cpp
@@ -18,7 +18,7 @@
 
 EditMode::EditMode(TQWidget *parent, const char *name, bool modal, WFlags fl) : EditModeBase(parent, name, modal, fl)
 {
-	theIcon->setIconType(KIcon::Panel, KIcon::Any);
+	theIcon->setIconType(TDEIcon::Panel, TDEIcon::Any);
 }
 
 EditMode::~EditMode()
diff --git a/kdelirc/kcmlirc/editmodebase.ui b/kdelirc/kcmlirc/editmodebase.ui
index 8195eaa..b59533b 100644
--- a/kdelirc/kcmlirc/editmodebase.ui
+++ b/kdelirc/kcmlirc/editmodebase.ui
@@ -85,7 +85,7 @@
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="KIconButton">
+                        <widget class="TDEIconButton">
                             <property name="name">
                                 <cstring>theIcon</cstring>
                             </property>
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index fc42db5..3858937 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -413,7 +413,7 @@ void KCMLirc::updateModes()
 	{	Mode mode = allModes.getMode(*i, "");
 		TQListViewItem *a = new TDEListViewItem(theKCMLircBase->theModes, RemoteServer::remoteServer()->getRemoteName(*i), allModes.isDefault(mode) ? "Default" : "", mode.iconFile().isNull() ? "" : "");
 		if(!mode.iconFile().isNull())
-			a->setPixmap(2, KIconLoader().loadIcon(mode.iconFile(), KIcon::Panel));
+			a->setPixmap(2, TDEIconLoader().loadIcon(mode.iconFile(), TDEIcon::Panel));
 		modeMap[a] = mode;	// the null mode
 		if(modeMap[a] == oldCurrent) { a->setSelected(true); theKCMLircBase->theModes->setCurrentItem(a); }
 		a->setOpen(true);
@@ -422,7 +422,7 @@ void KCMLirc::updateModes()
 			if(!(*j).name().isEmpty())
 			{	TQListViewItem *b = new TDEListViewItem(a, (*j).name(), allModes.isDefault(*j) ? i18n("Default") : "", (*j).iconFile().isNull() ? "" : "");
 				if(!(*j).iconFile().isNull())
-					b->setPixmap(2, KIconLoader().loadIcon((*j).iconFile(), KIcon::Panel));
+					b->setPixmap(2, TDEIconLoader().loadIcon((*j).iconFile(), TDEIcon::Panel));
 				modeMap[b] = *j;
 				if(*j == oldCurrent) { b->setSelected(true); theKCMLircBase->theModes->setCurrentItem(b); }
 			}
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index aa2b566..db4e715 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -99,8 +99,8 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
 	     this,TQT_SLOT(slotChanged()));
     gl->addWidget( mIconLineEdit, 2, 0 );
 
-    mIconButton = new KIconButton(mGroupBox);
-    mIconButton->setIconType(KIcon::Small, KIcon::Device);
+    mIconButton = new TDEIconButton(mGroupBox);
+    mIconButton->setIconType(TDEIcon::Small, TDEIcon::Device);
     TQ_CHECK_PTR(mIconButton);
     mIconButton->setFixedWidth( mIconButton->sizeHint().height() );
     connect(mIconButton,TQT_SIGNAL(iconChanged(TQString)),this,TQT_SLOT(iconChangedButton(TQString)));
@@ -273,8 +273,8 @@ void MntConfigWidget::iconChanged(const TQString &iconName)
 	    {
 	      disk->setIconName(iconName);
 	      mIconLineEdit->setText(iconName);
-	      KIconLoader &loader = *TDEGlobal::iconLoader();
-	      item->setPixmap( ICONCOL, loader.loadIcon( iconName, KIcon::Small));
+	      TDEIconLoader &loader = *TDEGlobal::iconLoader();
+	      item->setPixmap( ICONCOL, loader.loadIcon( iconName, TDEIcon::Small));
 	    }
 	  break;
 	}
diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h
index 3ae0c1a..6ea8125 100644
--- a/kdf/mntconfig.h
+++ b/kdf/mntconfig.h
@@ -36,7 +36,7 @@ class TQGroupBox;
 class TQPushButton;
 class TQRadioButton;
 class TQLineEdit;
-class KIconButton;
+class TDEIconButton;
 
 class CListView;
 class TQListViewItem;
@@ -90,7 +90,7 @@ class MntConfigWidget : public TQWidget
     TQLineEdit   *mUmountLineEdit;
     TQPushButton *mMountButton;
     TQPushButton *mUmountButton;
-    KIconButton *mIconButton;
+    TDEIconButton *mIconButton;
     DiskList    mDiskList;
     bool        mInitializing;
     TQMemArray<TQListViewItem*> mDiskLookup;
diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp
index 15a6e67..06c6e04 100644
--- a/kgpg/keyinfowidget.cpp
+++ b/kgpg/keyinfowidget.cpp
@@ -430,14 +430,14 @@ void KgpgKeyInfo::slotChangeTrust(int newTrust)
 
 void KgpgKeyInfo::slotInfoPasswordChanged()
 {
-KPassivePopup::message(i18n("Passphrase for the key was changed"),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this);
+KPassivePopup::message(i18n("Passphrase for the key was changed"),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),this);
 }
 
 void KgpgKeyInfo::slotInfoTrustChanged()
 {
 keyWasChanged=true;
 loadKey(displayedKeyID);
-//KPassivePopup::message(i18n("Owner trust of the key was changed"),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this,0,600);
+//KPassivePopup::message(i18n("Owner trust of the key was changed"),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),this,0,600);
 }
 
 void KgpgKeyInfo::slotInfoExpirationChanged(int res)
@@ -451,7 +451,7 @@ else prop->tLExpiration->setText(TDEGlobal::locale()->formatDate(kdt->date()));
 }
 if (res==2) {
 infoMessage=i18n("Could not change expiration");infoText=i18n("Bad passphrase");
-KPassivePopup::message(infoMessage,infoText,TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this);
+KPassivePopup::message(infoMessage,infoText,TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),this);
 }
 }
 
diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp
index 8f05a83..0044387 100644
--- a/kgpg/keyservers.cpp
+++ b/kgpg/keyservers.cpp
@@ -119,7 +119,7 @@ void keyServer::slotprocread(KProcIO *p)
         ///////////////////////////////////////////////////////////////// extract  encryption keys
         bool dead;
         TQString tst;
-	//TQPixmap pixkeySingle(TDEGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20));
+	//TQPixmap pixkeySingle(TDEGlobal::iconLoader()->loadIcon("kgpg_key1",TDEIcon::Small,20));
         while (p->readln(tst)!=-1) {
                 //tst=tst.stripWhiteSpace();
                 if (tst.startsWith("pub")) {
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index 776c60f..433b373 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -206,7 +206,7 @@ if (encryptedFolder.exists()) {
                 }
 
 pop = new KPassivePopup();
-	pop->setView(i18n("Processing folder compression and encryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop));
+	pop->setView(i18n("Processing folder compression and encryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop));
 	pop->setAutoDelete(false);
 	pop->show();
 	kapp->processEvents();
@@ -1009,7 +1009,7 @@ int KgpgAppletApp::newInstance()
 void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,bool,bool symmetric)
 {
         if (kapp->clipboard()->text(clipboardMode).isEmpty()) {
-	KPassivePopup::message(i18n("Clipboard is empty."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this);
+	KPassivePopup::message(i18n("Clipboard is empty."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),this);
 	return;
 	}
                 if (KGpgSettings::pgpCompatibility())
@@ -1033,7 +1033,7 @@ if (newtxt.length()>300)
                 newtxt.replace(TQRegExp("\n"),"<br>");
 
 pop = new KPassivePopup( this);
-                pop->setView(i18n("Encrypted following text:"),newtxt,TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop));
+                pop->setView(i18n("Encrypted following text:"),newtxt,TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop));
                 pop->setTimeout(3200);
                 pop->show();
                 TQRect qRect(TQApplication::desktop()->screenGeometry());
diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp
index ad0ee00..b8d62f6 100644
--- a/kgpg/kgpglibrary.cpp
+++ b/kgpg/kgpglibrary.cpp
@@ -122,7 +122,7 @@ void KgpgLibrary::processpopup2(TQString fileName)
 {
         
 	//pop->setTimeout(0);
-        pop->setView(i18n("Processing encryption (%1)").arg(fileName),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop));
+        pop->setView(i18n("Processing encryption (%1)").arg(fileName),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop));
         pop->show();
         /*TQRect qRect(TQApplication::desktop()->screenGeometry());
         int iXpos=qRect.width()/2-pop->width()/2;
@@ -154,7 +154,7 @@ void KgpgLibrary::slotShredResult( TDEIO::Job * job )
     {
     job->showErrorDialog( (TQWidget*)parent() );
     emit systemMessage(TQString(),true);
-    KPassivePopup::message(i18n("KGpg Error"),i18n("Process halted, not all files were shredded."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),panel,"kgpg_error",0);
+    KPassivePopup::message(i18n("KGpg Error"),i18n("Process halted, not all files were shredded."),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),panel,"kgpg_error",0);
     }
 }
 
@@ -194,7 +194,7 @@ void KgpgLibrary::processpopup(TQString fileName)
 {
 	emit systemMessage(i18n("Decrypting %1").arg(fileName));
 	pop->setTimeout(0);
-        pop->setView(i18n("Processing decryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop));
+        pop->setView(i18n("Processing decryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop));
         pop->show();
         TQRect qRect(TQApplication::desktop()->screenGeometry());
         int iXpos=qRect.width()/2-pop->width()/2;
diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp
index 7113b4e..8c6e92d 100644
--- a/kgpg/kgpgoptions.cpp
+++ b/kgpg/kgpgoptions.cpp
@@ -96,8 +96,8 @@ kdDebug(2100)<<"Adding pages"<<endl;
 
 	page7->shredInfo->setText(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>"));
 	page7->groupShred->adjustSize();
-	pixkeySingle=TDEGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20);
-	pixkeyDouble=TDEGlobal::iconLoader()->loadIcon("kgpg_key2",KIcon::Small,20);
+	pixkeySingle=TDEGlobal::iconLoader()->loadIcon("kgpg_key1",TDEIcon::Small,20);
+	pixkeyDouble=TDEGlobal::iconLoader()->loadIcon("kgpg_key2",TDEIcon::Small,20);
         addPage(page1, i18n("Encryption"), "encrypted");
         addPage(page2, i18n("Decryption"), "decrypted");
         addPage(page3, i18n("Appearance"), "looknfeel");
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index 5804280..903fe3d 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -219,8 +219,8 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel)
         TQString keyname;
         page = new TQWidget(this);
         TQLabel *labeltxt;
-        KIconLoader *loader = TDEGlobal::iconLoader();
-        keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
+        TDEIconLoader *loader = TDEGlobal::iconLoader();
+        keyPair=loader->loadIcon("kgpg_key2",TDEIcon::Small,20);
 
         setMinimumSize(350,100);
         keysListpr = new TDEListView( page );
@@ -395,16 +395,16 @@ TQString KgpgSelKey::getkeyMail()
 KeyView::KeyView( TQWidget *parent, const char *name )
                 : TDEListView( parent, name )
 {
-        KIconLoader *loader = TDEGlobal::iconLoader();
+        TDEIconLoader *loader = TDEGlobal::iconLoader();
 
-        pixkeyOrphan=loader->loadIcon("kgpg_key4",KIcon::Small,20);
-        pixkeyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20);
-        pixkeyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
-        pixkeySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20);
-        pixsignature=loader->loadIcon("signature",KIcon::Small,20);
-        pixuserid=loader->loadIcon("kgpg_identity",KIcon::Small,20);
-        pixuserphoto=loader->loadIcon("kgpg_photo",KIcon::Small,20);
-        pixRevoke=loader->loadIcon("stop",KIcon::Small,20);
+        pixkeyOrphan=loader->loadIcon("kgpg_key4",TDEIcon::Small,20);
+        pixkeyGroup=loader->loadIcon("kgpg_key3",TDEIcon::Small,20);
+        pixkeyPair=loader->loadIcon("kgpg_key2",TDEIcon::Small,20);
+        pixkeySingle=loader->loadIcon("kgpg_key1",TDEIcon::Small,20);
+        pixsignature=loader->loadIcon("signature",TDEIcon::Small,20);
+        pixuserid=loader->loadIcon("kgpg_identity",TDEIcon::Small,20);
+        pixuserphoto=loader->loadIcon("kgpg_photo",TDEIcon::Small,20);
+        pixRevoke=loader->loadIcon("stop",TDEIcon::Small,20);
 	TQPixmap blankFrame;
 	blankFrame.load(locate("appdata", "pics/kgpg_blank.png"));
 
@@ -1778,8 +1778,8 @@ void listKeys::editGroup()
         KDialogBase *dialogGroupEdit=new KDialogBase(KDialogBase::Swallow, i18n("Group Properties"), KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,this,0,true);
 
         gEdit=new groupEdit();
-        gEdit->buttonAdd->setPixmap(TDEGlobal::iconLoader()->loadIcon("down",KIcon::Small,20));
-        gEdit->buttonRemove->setPixmap(TDEGlobal::iconLoader()->loadIcon("up",KIcon::Small,20));
+        gEdit->buttonAdd->setPixmap(TDEGlobal::iconLoader()->loadIcon("down",TDEIcon::Small,20));
+        gEdit->buttonRemove->setPixmap(TDEGlobal::iconLoader()->loadIcon("up",TDEIcon::Small,20));
 
         connect(gEdit->buttonAdd,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupAdd()));
         connect(gEdit->buttonRemove,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupRemove()));
@@ -2149,7 +2149,7 @@ void listKeys::slotgenkey()
                         TQWidget *wid=new TQWidget(pop);
                         TQVBoxLayout *vbox=new TQVBoxLayout(wid,3);
 
-                        TQVBox *passiveBox=pop->standardView(i18n("Generating new key pair."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),wid);
+                        TQVBox *passiveBox=pop->standardView(i18n("Generating new key pair."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),wid);
 
 
                         TQMovie anim;
diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp
index fd7343b..59864f7 100644
--- a/kgpg/popuppublic.cpp
+++ b/kgpg/popuppublic.cpp
@@ -100,11 +100,11 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
         if (KGpgSettings::allowCustomEncryptionOptions())
                 customOptions=KGpgSettings::customEncryptionOptions();
 
-        KIconLoader *loader = TDEGlobal::iconLoader();
+        TDEIconLoader *loader = TDEGlobal::iconLoader();
 
-        keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
-        keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20);
-	keyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20);
+        keyPair=loader->loadIcon("kgpg_key2",TDEIcon::Small,20);
+        keySingle=loader->loadIcon("kgpg_key1",TDEIcon::Small,20);
+	keyGroup=loader->loadIcon("kgpg_key3",TDEIcon::Small,20);
 
         if (filemode) setCaption(i18n("Select Public Key for %1").arg(sfile));
         fmode=filemode;
diff --git a/khexedit/hexdrag.cc b/khexedit/hexdrag.cc
index f833256..eff7c93 100644
--- a/khexedit/hexdrag.cc
+++ b/khexedit/hexdrag.cc
@@ -52,7 +52,7 @@ void CHexDrag::prepPixmap(void)
   // Wont use it yet,
   //
   /*
-  KIconLoader &loader = *TDEGlobal::iconLoader();
+  TDEIconLoader &loader = *TDEGlobal::iconLoader();
   TQPixmap pix = loader.loadIcon( "binary.xpm" );
 
   TQPoint hotspot( pix.width()-20,pix.height()/2 );
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index 05a86ca..0b17930 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -103,7 +103,7 @@ void COptionDialog::setupLayoutPage( void )
 {
   TQString text;
   TQFrame *page = addPage( i18n("Layout"), i18n("Data Layout in Editor"),
-			  BarIcon("khexedit", KIcon::SizeMedium ) );
+			  BarIcon("khexedit", TDEIcon::SizeMedium ) );
 
   TQGridLayout *gbox = new TQGridLayout( page, 15, 2, 0, spacingHint() );
   gbox->setColStretch( 1, 10 );
@@ -256,7 +256,7 @@ void COptionDialog::setupCursorPage( void )
   TQString text;
   TQFrame *page = addPage( i18n("Cursor"),
     i18n("Cursor Behavior (only valid for editor)"),
-    BarIcon("mouse", KIcon::SizeMedium ) );
+    BarIcon("mouse", TDEIcon::SizeMedium ) );
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
   TQVButtonGroup *group = new TQVButtonGroup( i18n("Blinking"), page );
@@ -322,7 +322,7 @@ void COptionDialog::setupColorPage( void )
   TQString text;
   TQFrame *page = addPage( i18n("Colors"),
     i18n("Editor Colors (system selection color is always used)"),
-    BarIcon("colorize", KIcon::SizeMedium ) );
+    BarIcon("colorize", TDEIcon::SizeMedium ) );
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
@@ -374,7 +374,7 @@ void COptionDialog::setupFontPage( void )
   TQString text;
   TQFrame *page = addPage( i18n("Font"),
     i18n("Font Selection (editor can only use a fixed font)"),
-    BarIcon("fonts", KIcon::SizeMedium ) );
+    BarIcon("fonts", TDEIcon::SizeMedium ) );
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
@@ -426,7 +426,7 @@ void COptionDialog::setupFilePage( void )
 {
   TQString text;
   TQFrame *page = addPage( i18n("Files"), i18n("File Management"),
-			  BarIcon("tdemultiple", KIcon::SizeMedium ) );
+			  BarIcon("tdemultiple", TDEIcon::SizeMedium ) );
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
@@ -518,7 +518,7 @@ void COptionDialog::setupMiscPage( void )
   TQLabel *label;
 
   TQFrame *page = addPage( i18n("Miscellaneous"), i18n("Various Properties"),
-			  BarIcon("gear", KIcon::SizeMedium ) );
+			  BarIcon("gear", TDEIcon::SizeMedium ) );
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 4d42209..a91ea78 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -50,7 +50,7 @@
 
 #define KJOTSVERSION "0.7"
 
-extern KIconLoader* global_pix_loader;
+extern TDEIconLoader* global_pix_loader;
 
 //----------------------------------------------------------------------
 // KJOTSMAIN
diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index d1f94e2..1376a68 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -245,7 +245,7 @@ void KJotsBook::init()
     m_open = false;
     m_saveProgressDialog = 0;
     setExpandable(true);
-    setPixmap(0, kapp->iconLoader()->loadIcon(TQString("contents"),KIcon::Small));
+    setPixmap(0, kapp->iconLoader()->loadIcon(TQString("contents"),TDEIcon::Small));
 }
 
 /*!
@@ -849,7 +849,7 @@ KJotsPage::KJotsPage(KJotsBook* parent, TQListViewItem *after)
 {
     m_isBook = false;
     m_paraPos = m_indexPos = 0;
-    setPixmap(0, kapp->iconLoader()->loadIcon(TQString("edit"), KIcon::Small));
+    setPixmap(0, kapp->iconLoader()->loadIcon(TQString("edit"), TDEIcon::Small));
 }
 
 KJotsPage::~KJotsPage()
diff --git a/klaptopdaemon/acpi.h b/klaptopdaemon/acpi.h
index 5d6891f..68adb46 100644
--- a/klaptopdaemon/acpi.h
+++ b/klaptopdaemon/acpi.h
@@ -32,8 +32,8 @@ class TQWidget;
 class TQSpinBox;
 class TDEConfig;
 class TQCheckBox;
-class KIconLoader;
-class KIconButton;
+class TDEIconLoader;
+class TDEIconButton;
 class TQPushButton;
 
 
diff --git a/klaptopdaemon/apm.h b/klaptopdaemon/apm.h
index 0972fce..74510ee 100644
--- a/klaptopdaemon/apm.h
+++ b/klaptopdaemon/apm.h
@@ -32,8 +32,8 @@ class TQWidget;
 class TQSpinBox;
 class TDEConfig;
 class TQCheckBox;
-class KIconLoader;
-class KIconButton;
+class TDEIconLoader;
+class TDEIconButton;
 class TQPushButton;
 
 
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index 12edee7..31ad563 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -93,7 +93,7 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
     if (!apm) {
       top_layout->addWidget( laptop_portable::no_power_management_explanation(this) );
     } else {
-      iconloader = new KIconLoader("klaptopdaemon");
+      iconloader = new TDEIconLoader("klaptopdaemon");
 
       // the poll time (in seconds)
       TQHBox *hb = new TQHBox( this );
@@ -119,15 +119,15 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
       TQGrid *icon_grid = new TQGrid( 3 /*cols*/, icons_groupbox );
       icon_grid->setSpacing( KDialog::spacingHint() );
 
-      buttonNoBattery = new KIconButton( iconloader, icon_grid );
-      buttonNoCharge  = new KIconButton( iconloader, icon_grid );
-      buttonCharge    = new KIconButton( iconloader, icon_grid );
+      buttonNoBattery = new TDEIconButton( iconloader, icon_grid );
+      buttonNoCharge  = new TDEIconButton( iconloader, icon_grid );
+      buttonCharge    = new TDEIconButton( iconloader, icon_grid );
       (void)new TQLabel( buttonNoBattery, i18n("No &battery"), icon_grid);
       (void)new TQLabel( buttonNoCharge, i18n("&Not charging"), icon_grid);
       (void)new TQLabel( buttonCharge, i18n("Char&ging"), icon_grid);
-      buttonNoBattery->setIconType( KIcon::NoGroup, KIcon::Any, 1);
-      buttonNoCharge->setIconType( KIcon::NoGroup, KIcon::Any, 1);
-      buttonCharge->setIconType( KIcon::NoGroup, KIcon::Any, 1);
+      buttonNoBattery->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1);
+      buttonNoCharge->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1);
+      buttonCharge->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1);
       connect(buttonNoBattery, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(iconChanged()));
       connect(buttonNoCharge, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(iconChanged()));
       connect(buttonCharge, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(configChanged()));
@@ -249,8 +249,8 @@ void BatteryConfig::load(bool useDefaults)
                 buttonCharge->setIcon(chargebattery);
 	        buttonNoBattery->setIcon(nobattery);
         }
-        battery_pm = SmallIcon(nochargebattery, 20, KIcon::DefaultState, instance);
-        battery_nopm = SmallIcon(nobattery, 20, KIcon::DefaultState, instance);
+        battery_pm = SmallIcon(nochargebattery, 20, TDEIcon::DefaultState, instance);
+        battery_nopm = SmallIcon(nobattery, 20, TDEIcon::DefaultState, instance);
         emit changed(useDefaults);
 	BatteryStateUpdate();
 }
@@ -374,8 +374,8 @@ void BatteryConfig::iconChanged()
 {
     nobattery =  buttonNoBattery->icon();
     nochargebattery =  buttonNoCharge->icon();
-    battery_pm = SmallIcon(nochargebattery, 20, KIcon::DefaultState, instance);
-    battery_nopm = SmallIcon(nobattery, 20, KIcon::DefaultState, instance);
+    battery_pm = SmallIcon(nochargebattery, 20, TDEIcon::DefaultState, instance);
+    battery_nopm = SmallIcon(nobattery, 20, TDEIcon::DefaultState, instance);
     emit changed(true);
     BatteryStateUpdate();
 }
diff --git a/klaptopdaemon/battery.h b/klaptopdaemon/battery.h
index d830740..b93be4b 100644
--- a/klaptopdaemon/battery.h
+++ b/klaptopdaemon/battery.h
@@ -36,8 +36,8 @@ class TQWidget;
 class TQSpinBox;
 class TDEConfig;
 class TQCheckBox;
-class KIconLoader;
-class KIconButton;
+class TDEIconLoader;
+class TDEIconButton;
 class TQPushButton;
 class TQLabel;
 
@@ -81,11 +81,11 @@ private:
 	bool		useblanksaver;
 	bool		notifyme;
 
-	KIconLoader *iconloader;
+	TDEIconLoader *iconloader;
 
-        KIconButton *buttonNoBattery;
-        KIconButton *buttonNoCharge;
-        KIconButton *buttonCharge;
+        TDEIconButton *buttonNoBattery;
+        TDEIconButton *buttonNoCharge;
+        TDEIconButton *buttonCharge;
         TQString nobattery, nochargebattery, chargebattery;
 	TQPushButton *startMonitor;
         bool    apm;
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index d18702e..f734de0 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -715,7 +715,7 @@ quit:
             // "This function is slow because it involves transformation to a TQImage,
             // non-trivial computations and a transformation back to a TQBitmap."). Then
             // I have to convert the resulting TQPixmap to a TQImage in order to overlay
-            // the light KMail icon with the number (because KIconEffect::overlay only
+            // the light KMail icon with the number (because TDEIconEffect::overlay only
             // works with TQImage). Finally the resulting TQImage has to be converted
             // back to a TQPixmap.
             // That's a lot of work for overlaying the KMail icon with the number of
@@ -732,7 +732,7 @@ quit:
         
             // Overlay the light KMail icon with the number image
             TQImage iconWithPercentageImage = image.copy();
-            KIconEffect::overlay( iconWithPercentageImage, percentageImage );
+            TDEIconEffect::overlay( iconWithPercentageImage, percentageImage );
         
             TQPixmap iconWithPercentage;
             iconWithPercentage.convertFromImage( iconWithPercentageImage );
diff --git a/klaptopdaemon/profile.h b/klaptopdaemon/profile.h
index aa44c21..c518c92 100644
--- a/klaptopdaemon/profile.h
+++ b/klaptopdaemon/profile.h
@@ -33,8 +33,8 @@ class TQSpinBox;
 class TDEConfig;
 class TQCheckBox;
 class TQSlider;
-class KIconLoader;
-class KIconButton;
+class TDEIconLoader;
+class TDEIconButton;
 class TQPushButton;
 class KComboBox;
 
diff --git a/klaptopdaemon/sony.h b/klaptopdaemon/sony.h
index 9b6d698..5339aaf 100644
--- a/klaptopdaemon/sony.h
+++ b/klaptopdaemon/sony.h
@@ -33,8 +33,8 @@ class TQSpinBox;
 class TDEConfig;
 class TQCheckBox;
 class TQSlider;
-class KIconLoader;
-class KIconButton;
+class TDEIconLoader;
+class TDEIconButton;
 class TQPushButton;
 
 
diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp
index 269e8e5..147e348 100644
--- a/kregexpeditor/kregexpeditorprivate.cpp
+++ b/kregexpeditor/kregexpeditorprivate.cpp
@@ -174,7 +174,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name)
 #ifdef TQT_ONLY
   TQPixmap pix( "icons/error.png" );
 #else
-  TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/error.png") ), KIcon::Toolbar );
+  TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/error.png") ), TDEIcon::Toolbar );
 #endif
   _error = new TQLabel( this );
   _error->setPixmap( pix );
diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp
index b450d84..62500c8 100644
--- a/kregexpeditor/regexpbuttons.cpp
+++ b/kregexpeditor/regexpbuttons.cpp
@@ -53,7 +53,7 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
   TQPixmap pix;
   pix.convertFromImage( qembed_findImage( "select" ) );
 #else
-  TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/select.png") ), KIcon::Toolbar );
+  TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/select.png") ), TDEIcon::Toolbar );
 #endif
 
   _selectBut->setPixmap( pix );
@@ -159,7 +159,7 @@ DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQStri
     pix.convertFromImage( qembed_findImage( TQString::fromLatin1( name ) ) );
 #else
     TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/")+TQString::fromLatin1(name) +
-                                                       TQString::fromLatin1(".png") ), KIcon::Toolbar );
+                                                       TQString::fromLatin1(".png") ), TDEIcon::Toolbar );
 #endif
 
   DoubleClickButton* but = new DoubleClickButton( pix, this, "RegExpButtons::but");
diff --git a/kregexpeditor/util.cpp b/kregexpeditor/util.cpp
index bfcd0fe..dedccfc 100644
--- a/kregexpeditor/util.cpp
+++ b/kregexpeditor/util.cpp
@@ -27,7 +27,7 @@ TQPixmap Util::getKRegExpEditorIcon( const TQString& name )
     return pix;
 #else
   return TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/") +name ),
-                                         KIcon::Toolbar );
+                                         TDEIcon::Toolbar );
 #endif
 }
 
@@ -38,8 +38,8 @@ TQPixmap Util::getSystemIcon( const TQString& name )
     pix.convertFromImage( qembed_findImage( name ) );
     return pix;
 #else
-  KIconLoader loader;
-  return loader.loadIcon( name, KIcon::Toolbar);
+  TDEIconLoader loader;
+  return loader.loadIcon( name, TDEIcon::Toolbar);
 #endif
 
 }
@@ -51,8 +51,8 @@ TQIconSet Util::getSystemIconSet( const TQString& name )
     pix.convertFromImage( qembed_findImage( name ) );
     return TQIconSet( pix );
 #else
-  KIconLoader loader;
-  return loader.loadIconSet( name, KIcon::Toolbar);
+  TDEIconLoader loader;
+  return loader.loadIconSet( name, TDEIcon::Toolbar);
 #endif
 
 }
diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp
index 66d2ef3..073324b 100644
--- a/ksim/ksimpref.cpp
+++ b/ksim/ksimpref.cpp
@@ -48,12 +48,12 @@ KSim::ConfigDialog::ConfigDialog(KSim::Config *config,
   m_config = config;
 
   setFolderIcon(TQStringList(' ' + i18n("Plugins")),
-     BarIcon("folder", KIcon::SizeSmall));
+     BarIcon("folder", TDEIcon::SizeSmall));
   setFolderIcon(TQStringList(' ' + i18n("Miscellaneous")),
-     BarIcon("misc", KIcon::SizeSmall));
+     BarIcon("misc", TDEIcon::SizeSmall));
 
   TQFrame *monitors = addHBoxPage(' ' + i18n("Monitors"),
-     i18n("Monitors Installed"), BarIcon("ksim", KIcon::SizeSmall));
+     i18n("Monitors Installed"), BarIcon("ksim", TDEIcon::SizeSmall));
   m_monPage = new KSim::MonitorPrefs(monitors);
 
   TQStringList list;
@@ -87,7 +87,7 @@ KSim::ConfigDialog::ConfigDialog(KSim::Config *config,
   m_swapPage = new KSim::SwapPrefs(swap);
 
   TQFrame *theme = addHBoxPage(' ' + i18n("Themes"),
-     i18n("Theme Selector"), BarIcon("folder_image", KIcon::SizeSmall));
+     i18n("Theme Selector"), BarIcon("folder_image", TDEIcon::SizeSmall));
   m_themePage = new KSim::ThemePrefs(theme);
 
   connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(savePrefs()));
diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp
index 9186349..4e3afb2 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -345,8 +345,8 @@ Task::Task(WId win, TaskManager * parent, const char *name) :
   // try to guess the icon from the classhint
   if(_pixmap.isNull())
     TDEGlobal::instance()->iconLoader()->loadIcon(className().lower(),
-            KIcon::Small,KIcon::Small,
-            KIcon::DefaultState, 0, true);
+            TDEIcon::Small,TDEIcon::Small,
+            TDEIcon::DefaultState, 0, true);
 
   // load xapp icon
   if (_pixmap.isNull())
@@ -373,7 +373,7 @@ void Task::refresh(bool icon)
     if(_pixmap.isNull())
     {
         TDEGlobal::instance()->iconLoader()->loadIcon(className().lower(),
-            KIcon::Small, KIcon::Small, KIcon::DefaultState, 0, true);
+            TDEIcon::Small, TDEIcon::Small, TDEIcon::DefaultState, 0, true);
     }
 
     // load xapp icon
@@ -532,20 +532,20 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
   isStaticIcon = false;
 
   switch( size ) {
-  case KIcon::SizeSmall:
+  case TDEIcon::SizeSmall:
     {
       pixmap = icon( 16, 16, true  );
 
       // Icon of last resort
       if( pixmap.isNull() ) {
   pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
-              KIcon::NoGroup,
-              KIcon::SizeSmall );
+              TDEIcon::NoGroup,
+              TDEIcon::SizeSmall );
   isStaticIcon = true;
       }
     }
     break;
-  case KIcon::SizeMedium:
+  case TDEIcon::SizeMedium:
     {
       //
       // Try 34x34 first for KDE 2.1 icons with shadows, if we don't
@@ -562,13 +562,13 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
       // Icon of last resort
       if( pixmap.isNull() ) {
   pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
-              KIcon::NoGroup,
-              KIcon::SizeMedium );
+              TDEIcon::NoGroup,
+              TDEIcon::SizeMedium );
   isStaticIcon = true;
       }
     }
     break;
-  case KIcon::SizeLarge:
+  case TDEIcon::SizeLarge:
     {
       // If there's a 48x48 icon in the hints then use it
       pixmap = icon( size, size, false  );
@@ -576,9 +576,9 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
       // If not, try to get one from the classname
       if ( pixmap.isNull() || pixmap.width() != size || pixmap.height() != size ) {
   pixmap = TDEGlobal::iconLoader()->loadIcon( className(),
-              KIcon::NoGroup,
+              TDEIcon::NoGroup,
               size,
-              KIcon::DefaultState,
+              TDEIcon::DefaultState,
               0L,
               true );
   isStaticIcon = true;
@@ -593,7 +593,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
       // Icon of last resort
       if( pixmap.isNull() ) {
   pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
-              KIcon::NoGroup,
+              TDEIcon::NoGroup,
               size );
   isStaticIcon = true;
       }
diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h
index 12915f2..6740f54 100644
--- a/superkaramba/src/taskmanager.h
+++ b/superkaramba/src/taskmanager.h
@@ -104,25 +104,25 @@ public:
     TQValueList<WId> transients() const { return _transients; }
 
     /**
-     * Returns a 16x16 (KIcon::Small) icon for the task. This method will
+     * Returns a 16x16 (TDEIcon::Small) icon for the task. This method will
      * only fall back to a static icon if there is no icon of any size in
      * the WM hints.
      */
     TQPixmap pixmap() const { return _pixmap; }
 
     /**
-     * Returns the best icon for any of the KIcon::StdSizes. If there is no
+     * Returns the best icon for any of the TDEIcon::StdSizes. If there is no
      * icon of the specified size specified in the WM hints, it will try to
-     * get one using KIconLoader.
+     * get one using TDEIconLoader.
      *
      * <pre>
      *   bool gotStaticIcon;
-     *   TQPixmap icon = myTask->icon( KIcon::SizeMedium, gotStaticIcon );
+     *   TQPixmap icon = myTask->icon( TDEIcon::SizeMedium, gotStaticIcon );
      * </pre>
      *
-     * @param size Any of the constants in KIcon::StdSizes.
-     * @param isStaticIcon Set to true if KIconLoader was used, false otherwise.
-     * @see KIcon
+     * @param size Any of the constants in TDEIcon::StdSizes.
+     * @param isStaticIcon Set to true if TDEIconLoader was used, false otherwise.
+     * @see TDEIcon
      */
     TQPixmap bestIcon( int size, bool &isStaticIcon );
 
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index d47b039..9311853 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -127,7 +127,7 @@ void ThemesDlg::populateListbox()
 
   item = new ThemeWidget;
   item->icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("knewstuff",
-                        KIcon::NoGroup, KIcon::SizeHuge));
+                        TDEIcon::NoGroup, TDEIcon::SizeHuge));
   item->setHeaderText(i18n("Get New Stuff"));
   item->setDescriptionText(i18n("Download new themes."));
 
@@ -143,7 +143,7 @@ void ThemesDlg::populateListbox()
 
   item = new ThemeWidget;
   item->icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("ksysguard",
-                        KIcon::NoGroup, KIcon::SizeHuge));
+                        TDEIcon::NoGroup, TDEIcon::SizeHuge));
   item->setHeaderText(i18n("Open Local Theme"));
   item->setDescriptionText(i18n("Add local theme to the list."));
   item->buttonGo->setProperty("stdItem", 18);
diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp
index 1939f5a..3da85ee 100644
--- a/tdewallet/allyourbase.cpp
+++ b/tdewallet/allyourbase.cpp
@@ -45,21 +45,21 @@ KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, con
 	setDragEnabled(true);
 	setDropEnabled(true);
 
-	TQPixmap pix = getFolderIcon(KIcon::Small);
+	TQPixmap pix = getFolderIcon(TDEIcon::Small);
 	
 	setPixmap(0,pix);
 }
 
-TQPixmap KWalletFolderItem::getFolderIcon(KIcon::Group group){
-	KIconLoader *loader = TDEGlobal::instance()->iconLoader();
+TQPixmap KWalletFolderItem::getFolderIcon(TDEIcon::Group group){
+	TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
 	TQPixmap pix = loader->loadIcon( _name, group, 0,
-			KIcon::DefaultState, 0, true );
+			TDEIcon::DefaultState, 0, true );
 	if (pix.isNull())
 		pix = loader->loadIcon( _name.lower(), group, 0,
-			KIcon::DefaultState, 0, true);
+			TDEIcon::DefaultState, 0, true);
 	if (pix.isNull())
 		pix = loader->loadIcon( "folder_red", group, 0,
-			KIcon::DefaultState, 0, true);
+			TDEIcon::DefaultState, 0, true);
 	return pix;
 }
 
@@ -619,7 +619,7 @@ class KWalletIconDrag : public TQIconDrag {
 *  *  KWalletIconView - An iconview to store wallets
 *   */
 KWalletIconView::KWalletIconView(TQWidget *parent, const char *name)
-: KIconView(parent, name) {
+: TDEIconView(parent, name) {
 	TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
 	connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), TQT_SLOT(slotDropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)));
 }
@@ -671,7 +671,7 @@ void KWalletIconView::contentsMousePressEvent(TQMouseEvent *e) {
 	if (!findItem(_mousePos)) {
 		clearSelection();
 	}
-	KIconView::contentsMousePressEvent( e );
+	TDEIconView::contentsMousePressEvent( e );
 }
 
 TQDragObject *KWalletIconView::dragObject() {
diff --git a/tdewallet/allyourbase.h b/tdewallet/allyourbase.h
index b6b0770..3479189 100644
--- a/tdewallet/allyourbase.h
+++ b/tdewallet/allyourbase.h
@@ -83,7 +83,7 @@ class KWalletFolderItem : public TDEListViewItem {
 		TQString name() const;
 		void refresh();
 		KWalletContainerItem* getContainer(KWallet::Wallet::EntryType type);
-		TQPixmap getFolderIcon(KIcon::Group group);
+		TQPixmap getFolderIcon(TDEIcon::Group group);
 		bool contains(const TQString& itemKey);
 		TQListViewItem* getItem(const TQString& itemKey);
 
@@ -132,7 +132,7 @@ class KWalletItem : public TQIconViewItem {
 };
 
 
-class KWalletIconView : public KIconView {
+class KWalletIconView : public TDEIconView {
 	Q_OBJECT
   
 	public:
diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp
index 054824b..6755d60 100644
--- a/tdewallet/tdewalleteditor.cpp
+++ b/tdewallet/tdewalleteditor.cpp
@@ -455,7 +455,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) {
 	if (fi) {
 		_currentFolder = fi->name();
 		_ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0)));
-		_ww->_iconTitle->setPixmap(fi->getFolderIcon(KIcon::Toolbar));
+		_ww->_iconTitle->setPixmap(fi->getFolderIcon(TDEIcon::Toolbar));
 	}
 }
 
diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp
index 296e2e5..aafbdfa 100644
--- a/tdewallet/tdewalletmanager.cpp
+++ b/tdewallet/tdewalletmanager.cpp
@@ -415,7 +415,7 @@ TQPixmap KWalletManager::loadSystemTrayIcon(const TQString &icon) {
 	TDEConfig *appCfg = kapp->config();
 	TDEConfigGroupSaver configSaver(appCfg, "System Tray");
 	int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
-	return kapp->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth );
+	return kapp->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth );
 #endif
 }