Rename KIcon to enhance compatibility with KDE4

26 files changed, 135 insertions, 135 deletions

diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
index 4928ded..d33bf6e 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
+++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
@@ -50,11 +50,11 @@ GoogleFetcherDialog::GoogleFetcherDialog(const TQString &name,
     disableResize();
 
     TQHBox *mainBox = new TQHBox(this);
-    m_iconWidget = new KIconView(mainBox);
+    m_iconWidget = new TDEIconView(mainBox);
     m_iconWidget->setResizeMode(TQIconView::Adjust);
     m_iconWidget->setSelectionMode(TQIconView::Extended);
     m_iconWidget->setSpacing(10);
-    m_iconWidget->setMode(KIconView::Execute);
+    m_iconWidget->setMode(TDEIconView::Execute);
     m_iconWidget->setFixedSize(500,550);
     m_iconWidget->arrangeItemsInGrid();
     m_iconWidget->setItemsMovable(FALSE);
@@ -204,7 +204,7 @@ TQPixmap GoogleFetcherDialog::pixmapFromURL(const KURL &url) const
 ////////////////////////////////////////////////////////////////////////////////
 
 CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const GoogleImage &image) :
-    TQObject(parent), KIconViewItem(parent, parent->lastItem(), image.size()), m_job(0)
+    TQObject(parent), TDEIconViewItem(parent, parent->lastItem(), image.size()), m_job(0)
 {
     // Set up the iconViewItem
 
diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h b/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
index d4eafb3..e7e4831 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
+++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
@@ -68,7 +68,7 @@ private:
 
     TQPixmap m_pixmap;
     GoogleImageList m_imageList;
-    KIconView *m_iconWidget;
+    TDEIconView *m_iconWidget;
     bool m_takeIt;
     bool m_newSearch;
     TQString m_artist, m_album;
@@ -79,7 +79,7 @@ namespace TDEIO
     class TransferJob;
 }
 
-class CoverIconViewItem : public TQObject, public KIconViewItem
+class CoverIconViewItem : public TQObject, public TDEIconViewItem
 {
     Q_OBJECT
   
diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
index 203113d..a9f642a 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
@@ -390,7 +390,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	searchBtn = new TQToolButton( playlist );
 	searchBtn->setAutoRaise( true );
 	TQToolTip::add( searchBtn, i18n("Search"));
-	searchBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("locationbar_erase", KIcon::Small) );
+	searchBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("locationbar_erase", TDEIcon::Small) );
 	h1->addWidget( searchBtn );
 	TQLabel* filterLabel = new TQLabel(i18n("Filter") + ":", playlist);
 	h1->addWidget(filterLabel);
@@ -419,7 +419,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected()));
 
 	m_isCurrentEntry = UserIcon("playing");
-	m_cdPixmap = TDEGlobal::iconLoader()->loadIcon("cdtrack", KIcon::Small);
+	m_cdPixmap = TDEGlobal::iconLoader()->loadIcon("cdtrack", TDEIcon::Small);
 
 	setXMLFile("kaffeineplaylist.rc");
 	setupActions();
@@ -941,7 +941,7 @@ TQListViewItem* PlayList::insertItem(TQListViewItem* after, const MRL& m)
 	if ((mrl.mime() == "video/dvd") || (mrl.mime() == "video/vcd") || (mrl.mime() == "audio/cd"))
 		tmp->setPixmap(MIME_COLUMN, m_cdPixmap);
 	else
-		tmp->setPixmap(MIME_COLUMN, KMimeType::mimeType(mrl.mime())->pixmap(KIcon::Small));
+		tmp->setPixmap(MIME_COLUMN, KMimeType::mimeType(mrl.mime())->pixmap(TDEIcon::Small));
 
 	if (tmp->length().contains(':'))
 		m_playTime += timeStringToMs(tmp->length());
diff --git a/kaffeine/src/input/audiobrowser/urllistview.cpp b/kaffeine/src/input/audiobrowser/urllistview.cpp
index e95e6bb..a5d19bb 100644
--- a/kaffeine/src/input/audiobrowser/urllistview.cpp
+++ b/kaffeine/src/input/audiobrowser/urllistview.cpp
@@ -41,20 +41,20 @@ UrlListView::UrlListView(TQWidget *parent, const char *name ) : TDEListView(pare
  m_listCleared(true), m_itemOfContextMenu(NULL)
 {
   m_contextMenu = new TDEPopupMenu(this);
-  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play"), this, TQT_SLOT(slotPlayItem()));
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_play", TDEIcon::Small), i18n("Play"), this, TQT_SLOT(slotPlayItem()));
   m_contextMenu->insertItem(i18n("Play Next/Add to Queue"), this, TQT_SLOT(slotPlayNext()));
   m_contextMenu->insertSeparator();
 
-  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editcut", KIcon::Small), i18n("C&ut"), this, TQT_SIGNAL(signalCut()), CTRL+Key_X);
-  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editcopy", KIcon::Small), i18n("&Copy"), this, TQT_SIGNAL(signalCopy()), CTRL+Key_C);
-  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editpaste", KIcon::Small), i18n("&Paste"), this, TQT_SIGNAL(signalPaste()), CTRL+Key_V);
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editcut", TDEIcon::Small), i18n("C&ut"), this, TQT_SIGNAL(signalCut()), CTRL+Key_X);
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editcopy", TDEIcon::Small), i18n("&Copy"), this, TQT_SIGNAL(signalCopy()), CTRL+Key_C);
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editpaste", TDEIcon::Small), i18n("&Paste"), this, TQT_SIGNAL(signalPaste()), CTRL+Key_V);
   m_contextMenu->insertItem(i18n("Select &All"), this, TQT_SIGNAL(signalSelectAll()), CTRL+Key_A);
   m_contextMenu->insertItem(i18n("Create Playlist From Selected"), this, TQT_SIGNAL(signalPlaylistFromSelected()));
   m_contextMenu->insertSeparator();
-  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("indent", KIcon::Small), i18n("Add Sub&title..."), this, TQT_SLOT(slotAddSubtitle()),TQKeySequence(),100 );
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("indent", TDEIcon::Small), i18n("Add Sub&title..."), this, TQT_SLOT(slotAddSubtitle()),TQKeySequence(),100 );
   m_contextMenu->insertSeparator();
-  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit", KIcon::Small), i18n("&Edit Title"), this, TQT_SLOT(slotEditTitle()));
-  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("info", KIcon::Small), i18n("&Info"), this, TQT_SLOT(slotShowInfo()));
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit", TDEIcon::Small), i18n("&Edit Title"), this, TQT_SLOT(slotEditTitle()));
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("info", TDEIcon::Small), i18n("&Info"), this, TQT_SLOT(slotShowInfo()));
 
 /* width of the "length"-column */
   TQFontMetrics met(TDEGlobalSettings::generalFont());
diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp
index 63a07e0..44e7b49 100644
--- a/kaffeine/src/input/disc/disc.cpp
+++ b/kaffeine/src/input/disc/disc.cpp
@@ -113,8 +113,8 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
 	h1->addWidget( ripBtn );
 	vb->addLayout( h1 );
 
-	cdBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("cdaudio_unmount", KIcon::Toolbar) );
-	ripBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Toolbar) );
+	cdBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("cdaudio_unmount", TDEIcon::Toolbar) );
+	ripBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", TDEIcon::Toolbar) );
 
 	connect( cdBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startCD()) );
 	connect( ripBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startRIP()) );
@@ -160,7 +160,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
 	enc->setTextLabel( i18n("Encode...") );
 	enc->setTextPosition( TQToolButton::Under );
 	enc->setUsesTextLabel( true );
-	enc->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) );
+	enc->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", TDEIcon::Small) );
 	enc->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 	connect( enc, TQT_SIGNAL(clicked()), this, TQT_SLOT(encode()) );
 	vb->addWidget( encodeWidget );
diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp
index 546e7d6..1145129 100644
--- a/kaffeine/src/input/disc/paranoia.cpp
+++ b/kaffeine/src/input/disc/paranoia.cpp
@@ -54,10 +54,10 @@ KiloConfig::KiloConfig( TQWidget *parent, TDEConfig *confile, const TQStringList
 {
 	int i;
 
-	KIconLoader *icon = new KIconLoader();
-	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) );
-	cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", KIcon::Small) ) );
-	baseDirBtn->setIconSet( icon->loadIconSet("fileopen", KIcon::Small) );
+	TDEIconLoader *icon = new TDEIconLoader();
+	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", TDEIcon::Small) ) );
+	cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", TDEIcon::Small) ) );
+	baseDirBtn->setIconSet( icon->loadIconSet("fileopen", TDEIcon::Small) );
 	delete icon;
 	connect( baseDirBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setBaseDir() ) );
 	Conf = confile;
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
index caabbdf..47b956d 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
+++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
@@ -31,9 +31,9 @@
 
 LameSettings::LameSettings( TQWidget *parent, TDEConfig *confile ) : LameConfig( parent )
 {
-	KIconLoader *icon = new KIconLoader();
-	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) );
-	cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", KIcon::Small) ) );
+	TDEIconLoader *icon = new TDEIconLoader();
+	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", TDEIcon::Small) ) );
+	cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", TDEIcon::Small) ) );
 	delete icon;
 	brateComb->insertItem( "32" );
 	brateComb->insertItem( "40" );
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
index 6346d83..2ef4203 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
@@ -29,9 +29,9 @@
 
 OggSettings::OggSettings( TQWidget *parent, TDEConfig *confile ) : OggConfig( parent )
 {
-	KIconLoader *icon = new KIconLoader();
-	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) );
-	cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", KIcon::Small) ) );
+	TDEIconLoader *icon = new TDEIconLoader();
+	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", TDEIcon::Small) ) );
+	cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", TDEIcon::Small) ) );
 	delete icon;
 	Conf = confile;
 	Conf->setGroup("OggVorbis");
diff --git a/kaffeine/src/input/dvb/broadcasteditor.cpp b/kaffeine/src/input/dvb/broadcasteditor.cpp
index 3e73c55..2dc350e 100644
--- a/kaffeine/src/input/dvb/broadcasteditor.cpp
+++ b/kaffeine/src/input/dvb/broadcasteditor.cpp
@@ -29,16 +29,16 @@
 
 BroadcastEditor::BroadcastEditor( TQWidget *parent, TQPtrList<ChannelDesc> *ch, TQPtrList<ChannelDesc> *ret ) : BroadcastEditorUI( parent )
 {
-	KIconLoader *icon = new KIconLoader();
-
-	tvPix = icon->loadIcon( "kdvbtv", KIcon::Small );
-	tvcPix = icon->loadIcon( "kdvbtvc", KIcon::Small );
-	raPix = icon->loadIcon( "kdvbra", KIcon::Small );
-	racPix = icon->loadIcon( "kdvbrac", KIcon::Small );
-	addBtn->setGuiItem( KGuiItem(i18n("Add"), icon->loadIconSet("forward", KIcon::Small) ) );
-	resetBtn->setGuiItem( KGuiItem(i18n("Reset"), icon->loadIconSet("reload", KIcon::Small) ) );
-	cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", KIcon::Small) ) );
-	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) );
+	TDEIconLoader *icon = new TDEIconLoader();
+
+	tvPix = icon->loadIcon( "kdvbtv", TDEIcon::Small );
+	tvcPix = icon->loadIcon( "kdvbtvc", TDEIcon::Small );
+	raPix = icon->loadIcon( "kdvbra", TDEIcon::Small );
+	racPix = icon->loadIcon( "kdvbrac", TDEIcon::Small );
+	addBtn->setGuiItem( KGuiItem(i18n("Add"), icon->loadIconSet("forward", TDEIcon::Small) ) );
+	resetBtn->setGuiItem( KGuiItem(i18n("Reset"), icon->loadIconSet("reload", TDEIcon::Small) ) );
+	cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", TDEIcon::Small) ) );
+	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", TDEIcon::Small) ) );
 	
 	connect( channelLb, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), this, TQT_SLOT(slotAddChannel(TQListBoxItem*)) );
 
diff --git a/kaffeine/src/input/dvb/crontimer.cpp b/kaffeine/src/input/dvb/crontimer.cpp
index f6ccec3..b32d7c4 100644
--- a/kaffeine/src/input/dvb/crontimer.cpp
+++ b/kaffeine/src/input/dvb/crontimer.cpp
@@ -49,9 +49,9 @@ CronTimer::CronTimer( int m, TQWidget *parent ) : CronTimerUI( parent )
 	else
 		daysGb->setEnabled( false );
 
-	KIconLoader *icon = new KIconLoader();
-	cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", KIcon::Small) ) );
-	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) );
+	TDEIconLoader *icon = new TDEIconLoader();
+	cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", TDEIcon::Small) ) );
+	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", TDEIcon::Small) ) );
         delete icon;
 }
 
diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp
index 06c5ded..0489d13 100644
--- a/kaffeine/src/input/dvb/dvbconfig.cpp
+++ b/kaffeine/src/input/dvb/dvbconfig.cpp
@@ -569,7 +569,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 	KDialogBase ( IconList, i18n("DVB Settings"), Ok|Cancel, Ok, parent, "dvbConfigDialog", true, true )
 {
 	TQLabel *lab;
-	KIconLoader *icon = new KIconLoader();
+	TDEIconLoader *icon = new TDEIconLoader();
 	TQHBoxLayout *h1;
 	TQString s;
 	int i;
@@ -590,7 +590,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 
 	for ( i=0; i<(int)dvbConfig->devList.count(); i++ ) {
 		page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").arg(dvbConfig->devList.at(i)->adapter).arg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"),
-			TDEGlobal::instance()->iconLoader()->loadIcon( "hwinfo", KIcon::NoGroup, KIcon::SizeMedium ) );
+			TDEGlobal::instance()->iconLoader()->loadIcon( "hwinfo", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 		vb = new TQVBoxLayout( page, 6, 6 );
 		gb = new TQGroupBox( "", page );
 		grid = new TQGridLayout( gb, 1, 1, 20, 6 );
@@ -652,7 +652,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 			connect( satNumber[i], TQT_SIGNAL(signalValueChanged(int,int)), this, TQT_SLOT(satNumberChanged(int,int)));
 			grid->addWidget( satNumber[i], gridLine, 1 );
 			usals = new KPushButton( gb );
-			usals->setGuiItem( KGuiItem(i18n("Set rotor coordinates..."), icon->loadIconSet("move", KIcon::Small) ) );
+			usals->setGuiItem( KGuiItem(i18n("Set rotor coordinates..."), icon->loadIconSet("move", TDEIcon::Small) ) );
 			connect( usals, TQT_SIGNAL(clicked()), this, TQT_SLOT(setUsals()));
 			grid->addWidget( usals, gridLine, 2 );
 
@@ -669,7 +669,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 			++gridLine;
 
 			lnb0[i] = new MPushButton( gb, i, 0 );
-			lnb0[i]->setGuiItem( KGuiItem(i18n("LNB 1 settings..."), icon->loadIconSet("hwinfo", KIcon::Small) ) );
+			lnb0[i]->setGuiItem( KGuiItem(i18n("LNB 1 settings..."), icon->loadIconSet("hwinfo", TDEIcon::Small) ) );
 			lnb0[i]->setEnabled(true);
 			grid->addWidget( lnb0[i], gridLine, 0 );
 			connect( lnb0[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setLnb(int,int)));
@@ -698,7 +698,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 			++gridLine;
 
 			lnb1[i] = new MPushButton( gb, i, 1 );
-			lnb1[i]->setGuiItem( KGuiItem(i18n("LNB 2 settings..."), icon->loadIconSet("hwinfo", KIcon::Small) ) );
+			lnb1[i]->setGuiItem( KGuiItem(i18n("LNB 2 settings..."), icon->loadIconSet("hwinfo", TDEIcon::Small) ) );
 			lnb1[i]->setEnabled(false);
 			grid->addWidget( lnb1[i], gridLine, 0 );
 			connect( lnb1[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setLnb(int,int)));
@@ -730,7 +730,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 			++gridLine;
 
 			lnb2[i] = new MPushButton( gb, i, 2 );
-			lnb2[i]->setGuiItem( KGuiItem(i18n("LNB 3 settings..."), icon->loadIconSet("hwinfo", KIcon::Small) ) );
+			lnb2[i]->setGuiItem( KGuiItem(i18n("LNB 3 settings..."), icon->loadIconSet("hwinfo", TDEIcon::Small) ) );
 			lnb2[i]->setEnabled(false);
 			grid->addWidget( lnb2[i], gridLine, 0 );
 			connect( lnb2[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setLnb(int,int)));
@@ -762,7 +762,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 			++gridLine;
 
 			lnb3[i] = new MPushButton( gb, i, 3 );
-			lnb3[i]->setGuiItem( KGuiItem(i18n("LNB 4 settings..."), icon->loadIconSet("hwinfo", KIcon::Small) ) );
+			lnb3[i]->setGuiItem( KGuiItem(i18n("LNB 4 settings..."), icon->loadIconSet("hwinfo", TDEIcon::Small) ) );
 			lnb3[i]->setEnabled(false);
 			grid->addWidget( lnb3[i], gridLine, 0 );
 			connect( lnb3[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setLnb(int,int)));
@@ -827,7 +827,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 	}
 
 	page = addPage(i18n("Recording"),i18n("DVB Recording Options"),
-		TDEGlobal::instance()->iconLoader()->loadIcon( "hdd_unmount", KIcon::NoGroup, KIcon::SizeMedium ) );
+		TDEGlobal::instance()->iconLoader()->loadIcon( "hdd_unmount", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 	vb = new TQVBoxLayout( page, 6, 6 );
 	gb = new TQGroupBox( "", page );
 	grid = new TQGridLayout( gb, 1, 1, 20, 6 );
@@ -838,7 +838,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 	recordDirLe->setReadOnly( true );
 	grid->addWidget( recordDirLe, 0, 1 );
 	recordDirBtn = new TQToolButton( gb );
-	recordDirBtn->setIconSet( icon->loadIconSet("fileopen", KIcon::Small) );
+	recordDirBtn->setIconSet( icon->loadIconSet("fileopen", TDEIcon::Small) );
 	grid->addWidget( recordDirBtn, 0, 2 );
 
 	lab = new TQLabel( i18n("Time shifting directory:"), gb );
@@ -847,7 +847,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 	shiftDirLe->setReadOnly( true );
 	grid->addWidget( shiftDirLe, 1, 1 );
 	shiftDirBtn = new TQToolButton( gb );
-	shiftDirBtn->setIconSet( icon->loadIconSet("fileopen", KIcon::Small) );
+	shiftDirBtn->setIconSet( icon->loadIconSet("fileopen", TDEIcon::Small) );
 	grid->addWidget( shiftDirBtn, 1, 2 );
 
 	lab = new TQLabel( i18n("Begin margin:"), gb );
@@ -892,7 +892,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 	filenameFormatLe = new TQLineEdit( gb );
 	grid->addWidget( filenameFormatLe, 7, 1 );
 	helpNameBtn = new TQToolButton( gb );
-	helpNameBtn->setIconSet( icon->loadIconSet("help", KIcon::Small) );
+	helpNameBtn->setIconSet( icon->loadIconSet("help", TDEIcon::Small) );
 	grid->addWidget( helpNameBtn, 7, 2 );
 
 	vb->addWidget( gb );
@@ -907,7 +907,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 	filenameFormatLe->setText( dvbConfig->filenameFormat );
 
 	page = addPage(i18n("Broadcasting"),i18n("DVB Broadcasting"),
-		TDEGlobal::instance()->iconLoader()->loadIcon( "network_local", KIcon::NoGroup, KIcon::SizeMedium ) );
+		TDEGlobal::instance()->iconLoader()->loadIcon( "network_local", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 	vb = new TQVBoxLayout( page, 6, 6 );
 	gb = new TQGroupBox( "", page );
 	grid = new TQGridLayout( gb, 1, 1, 20, 6 );
@@ -933,7 +933,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 	sportSpin->setValue( dvbConfig->senderPort );
 
 	page = addPage(i18n("Misc"),i18n("Misc"),
-		TDEGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) );
+		TDEGlobal::instance()->iconLoader()->loadIcon( "misc", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 	vb = new TQVBoxLayout( page, 6, 6 );
 	gb = new TQGroupBox( "", page );
 	grid = new TQGridLayout( gb, 1, 1, 20, 6 );
@@ -962,13 +962,13 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 	lab = new TQLabel( i18n("Update scan data:"), gb );
 	grid->addWidget( lab, 3, 0 );
 	updateBtn = new KPushButton( gb );
-	updateBtn->setGuiItem( KGuiItem(i18n("Download"), icon->loadIconSet("tdehtml_kget", KIcon::Small) ) );
+	updateBtn->setGuiItem( KGuiItem(i18n("Download"), icon->loadIconSet("tdehtml_kget", TDEIcon::Small) ) );
 	grid->addWidget( updateBtn, 3, 1 );
 
 	lab = new TQLabel( i18n("Dump epg's events to \n~/kaffeine_dvb_events.tx:"), gb );
 	grid->addWidget( lab, 4, 0 );
 	dumpBtn = new KPushButton( gb );
-	dumpBtn->setGuiItem( KGuiItem(i18n("Dump"), icon->loadIconSet("filesave", KIcon::Small) ) );
+	dumpBtn->setGuiItem( KGuiItem(i18n("Dump"), icon->loadIconSet("filesave", TDEIcon::Small) ) );
 	grid->addWidget( dumpBtn, 4, 1 );
 
 	vb->addWidget( gb );
@@ -976,7 +976,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 
 	if ( p ) {
 		page = addPage(i18n("DVB plugins"),i18n("DVB plugins"),
-			TDEGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) );
+			TDEGlobal::instance()->iconLoader()->loadIcon( "misc", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 		vb = new TQVBoxLayout( page, 6, 6 );
 		gb = new TQGroupBox( "", page );
 		grid = new TQGridLayout( gb, 1, 1, 20, 6 );
diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
index b5ff0a8..dedce60 100644
--- a/kaffeine/src/input/dvb/dvbpanel.cpp
+++ b/kaffeine/src/input/dvb/dvbpanel.cpp
@@ -64,7 +64,7 @@
 
 
 DIconViewItem::DIconViewItem( DvbPanel *pan, TQIconView *parent, const TQString &text, const TQPixmap &icon )
-	: KIconViewItem( parent, text, icon )
+	: TDEIconViewItem( parent, text, icon )
 {
 	panel = pan;
 }
@@ -118,7 +118,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
 	split = new TQSplitter( mainWidget );
 	split->setOpaqueResize( true );
 	pbox = new TQVBox( split );
-	iconView = new KIconView( pbox );
+	iconView = new TDEIconView( pbox );
 	iconView->setVScrollBarMode( TQScrollView::AlwaysOff );
 	iconView->setHScrollBarMode( TQScrollView::AlwaysOff );
 	iconView->horizontalScrollBar()->setFixedHeight( 0 );
@@ -233,23 +233,23 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
 	h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
 	vb->addLayout( h1 );
 
-	KIconLoader *icon = new KIconLoader();
-	tvPix = icon->loadIcon( "kdvbtv", KIcon::Small );
-	tvcPix = icon->loadIcon( "kdvbtvc", KIcon::Small );
-	raPix = icon->loadIcon( "kdvbra", KIcon::Small );
-	racPix = icon->loadIcon( "kdvbrac", KIcon::Small );
+	TDEIconLoader *icon = new TDEIconLoader();
+	tvPix = icon->loadIcon( "kdvbtv", TDEIcon::Small );
+	tvcPix = icon->loadIcon( "kdvbtvc", TDEIcon::Small );
+	raPix = icon->loadIcon( "kdvbra", TDEIcon::Small );
+	racPix = icon->loadIcon( "kdvbrac", TDEIcon::Small );
 	TQIconSet iconset;
-	iconset.setPixmap( icon->loadIcon( "filesave", KIcon::Small ), TQIconSet::Small );
-	iconset.setPixmap( icon->loadIcon( "player_record", KIcon::Small), TQIconSet::Small, TQIconSet::Normal, TQIconSet::On );
+	iconset.setPixmap( icon->loadIcon( "filesave", TDEIcon::Small ), TQIconSet::Small );
+	iconset.setPixmap( icon->loadIcon( "player_record", TDEIcon::Small), TQIconSet::Small, TQIconSet::Normal, TQIconSet::On );
 	recordBtn->setIconSet( iconset );
-	broadcastBtn->setIconSet( icon->loadIconSet("network_local", KIcon::Small) );
-	dateBtn->setIconSet( icon->loadIconSet("date", KIcon::Small) );
-	infoBtn->setIconSet( icon->loadIconSet("view_text", KIcon::Small) );
-	osdBtn->setIconSet( icon->loadIconSet("info", KIcon::Small) );
-	channelsBtn->setIconSet( icon->loadIconSet("kdvbtv", KIcon::Small) );
-	configBtn->setIconSet( icon->loadIconSet("configure", KIcon::Small) );
-	recallBtn->setIconSet( icon->loadIconSet("reload", KIcon::Small) );
-	searchBtn->setIconSet( icon->loadIconSet("locationbar_erase", KIcon::Small) );
+	broadcastBtn->setIconSet( icon->loadIconSet("network_local", TDEIcon::Small) );
+	dateBtn->setIconSet( icon->loadIconSet("date", TDEIcon::Small) );
+	infoBtn->setIconSet( icon->loadIconSet("view_text", TDEIcon::Small) );
+	osdBtn->setIconSet( icon->loadIconSet("info", TDEIcon::Small) );
+	channelsBtn->setIconSet( icon->loadIconSet("kdvbtv", TDEIcon::Small) );
+	configBtn->setIconSet( icon->loadIconSet("configure", TDEIcon::Small) );
+	recallBtn->setIconSet( icon->loadIconSet("reload", TDEIcon::Small) );
+	searchBtn->setIconSet( icon->loadIconSet("locationbar_erase", TDEIcon::Small) );
 
 	setXMLFile("kaffeinedvb.rc");
 	setupActions();
@@ -580,15 +580,15 @@ void DvbPanel::catContextMenu( TQIconViewItem *it, const TQPoint &p )
 					ok = false;
 			}
 			if ( ok ) {
-				KIconViewItem* item = new DIconViewItem(this, iconView, name, TDEGlobal::iconLoader()->loadIcon("kaffeine", KIcon::NoGroup, KIcon::SizeSmallMedium));
+				TDEIconViewItem* item = new DIconViewItem(this, iconView, name, TDEGlobal::iconLoader()->loadIcon("kaffeine", TDEIcon::NoGroup, TDEIcon::SizeSmallMedium));
 				item->setDropEnabled( true );
 				dvbConfig->addCategory( name, "kaffeine" );
 			}
 			break;
 		case 1 :
-			icon = KIconDialog::getIcon();
+			icon = TDEIconDialog::getIcon();
 			if ( !icon.isEmpty() ) {
-				it->setPixmap( TDEGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeSmallMedium) );
+				it->setPixmap( TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::NoGroup, TDEIcon::SizeSmallMedium) );
 				dvbConfig->changeIconCategory( it->text(), icon );
 			}
 			break;
@@ -1022,17 +1022,17 @@ void DvbPanel::setConfig()
 {
 	int i;
 	int error = 0;
-	KIconViewItem* item = NULL;
+	TDEIconViewItem* item = NULL;
 	DvbStream *d;
 
 	TQString s = locateLocal("appdata", "");
 	dvbConfig = new DVBconfig( s );
-	item = new DIconViewItem(this, iconView, i18n("All"), TDEGlobal::iconLoader()->loadIcon(dvbConfig->allIcon, KIcon::NoGroup, KIcon::SizeSmallMedium));
+	item = new DIconViewItem(this, iconView, i18n("All"), TDEGlobal::iconLoader()->loadIcon(dvbConfig->allIcon, TDEIcon::NoGroup, TDEIcon::SizeSmallMedium));
 	iconView->setFixedHeight( item->height()+iconView->horizontalScrollBar()->height() );
 	item->setDropEnabled( true );
-	item = new DIconViewItem(this, iconView, i18n("Radio"), TDEGlobal::iconLoader()->loadIcon(dvbConfig->radioIcon, KIcon::NoGroup, KIcon::SizeSmallMedium));
+	item = new DIconViewItem(this, iconView, i18n("Radio"), TDEGlobal::iconLoader()->loadIcon(dvbConfig->radioIcon, TDEIcon::NoGroup, TDEIcon::SizeSmallMedium));
 	item->setDropEnabled( false );
-	item = new DIconViewItem(this, iconView, i18n("TV"), TDEGlobal::iconLoader()->loadIcon(dvbConfig->tvIcon, KIcon::NoGroup, KIcon::SizeSmallMedium));
+	item = new DIconViewItem(this, iconView, i18n("TV"), TDEGlobal::iconLoader()->loadIcon(dvbConfig->tvIcon, TDEIcon::NoGroup, TDEIcon::SizeSmallMedium));
 	item->setDropEnabled( false );
 
 	TDETrader::OfferList offers = TDETrader::self()->query("KaffeineDvbPlugin");
@@ -1051,7 +1051,7 @@ void DvbPanel::setConfig()
 	}
 
 	for ( i=0; i<(int)dvbConfig->categories.count(); i++ ) {
-		item = new DIconViewItem(this, iconView, dvbConfig->categories.at(i)->name, TDEGlobal::iconLoader()->loadIcon(dvbConfig->categories.at(i)->icon, KIcon::NoGroup, KIcon::SizeSmallMedium));
+		item = new DIconViewItem(this, iconView, dvbConfig->categories.at(i)->name, TDEGlobal::iconLoader()->loadIcon(dvbConfig->categories.at(i)->icon, TDEIcon::NoGroup, TDEIcon::SizeSmallMedium));
 		item->setDropEnabled( true );
 	}
 
diff --git a/kaffeine/src/input/dvb/dvbpanel.h b/kaffeine/src/input/dvb/dvbpanel.h
index 53fc9f9..66e388f 100644
--- a/kaffeine/src/input/dvb/dvbpanel.h
+++ b/kaffeine/src/input/dvb/dvbpanel.h
@@ -68,7 +68,7 @@ protected:
 
 
 
-class DIconViewItem : public KIconViewItem
+class DIconViewItem : public TDEIconViewItem
 {
 public:
 	DIconViewItem( DvbPanel *pan, TQIconView *parent, const TQString &text, const TQPixmap &icon );
@@ -173,7 +173,7 @@ private:
 	TQPixmap tvPix, raPix, tvcPix, racPix;
 	TQSplitter *split;
 	TQFrame *panel;
-	KIconView *iconView;
+	TDEIconView *iconView;
 	DListView *channelsCb;
 	TQToolButton *broadcastBtn, *recordBtn;
 	TQToolButton *dateBtn, *infoBtn, *channelsBtn, *configBtn, *osdBtn, *recallBtn;
diff --git a/kaffeine/src/input/dvb/kevents.cpp b/kaffeine/src/input/dvb/kevents.cpp
index 239b155..7d0b704 100644
--- a/kaffeine/src/input/dvb/kevents.cpp
+++ b/kaffeine/src/input/dvb/kevents.cpp
@@ -133,12 +133,12 @@ KEvents::KEvents( TQPtrList<ChannelDesc> *chans, TQPtrList<DvbStream> *d, EventT
 	grid->addWidget( textBrow, 2, 0 );
 	grid->setRowStretch( 2, 2 );
 
-	KIconLoader *icon = new KIconLoader();
-	resetBtn->setGuiItem( KGuiItem(i18n("Refresh"), icon->loadIconSet("reload", KIcon::Small) ) );
-	allBtn->setGuiItem( KGuiItem(i18n("Scheduled"), icon->loadIconSet("date", KIcon::Small) ) );
-	currentNextBtn->setGuiItem( KGuiItem(i18n("Current/Next"), icon->loadIconSet("toggle_log", KIcon::Small) ) );
-	currentChannelEpgBtn->setGuiItem( KGuiItem(i18n("Current Channel"), icon->loadIconSet("date", KIcon::Small) ) );
-	searchBtn->setIconSet( icon->loadIconSet("locationbar_erase", KIcon::Small) );
+	TDEIconLoader *icon = new TDEIconLoader();
+	resetBtn->setGuiItem( KGuiItem(i18n("Refresh"), icon->loadIconSet("reload", TDEIcon::Small) ) );
+	allBtn->setGuiItem( KGuiItem(i18n("Scheduled"), icon->loadIconSet("date", TDEIcon::Small) ) );
+	currentNextBtn->setGuiItem( KGuiItem(i18n("Current/Next"), icon->loadIconSet("toggle_log", TDEIcon::Small) ) );
+	currentChannelEpgBtn->setGuiItem( KGuiItem(i18n("Current Channel"), icon->loadIconSet("date", TDEIcon::Small) ) );
+	searchBtn->setIconSet( icon->loadIconSet("locationbar_erase", TDEIcon::Small) );
 
 	new EListViewItem( (TQListView*)listView, "Une chaine", "99/99/99  99:99 9999", "99:99 99", "un titre de programme", 0 );
 
diff --git a/kaffeine/src/input/dvb/krecord.cpp b/kaffeine/src/input/dvb/krecord.cpp
index 55b70e3..c2b000e 100644
--- a/kaffeine/src/input/dvb/krecord.cpp
+++ b/kaffeine/src/input/dvb/krecord.cpp
@@ -85,15 +85,15 @@ KRecord::KRecord( TQStringList chanList, TQPtrList<RecTimer> *t, TQWidget *paren
 	vb2->addWidget( line );
 	vb2->addLayout( hb1 );
 
-	KIconLoader *icon = new KIconLoader();
-	newBtn->setGuiItem( KGuiItem(i18n("New"), icon->loadIconSet("filenew", KIcon::Small) ) );
-	editBtn->setGuiItem( KGuiItem(i18n("Edit"), icon->loadIconSet("edit", KIcon::Small) ) );
+	TDEIconLoader *icon = new TDEIconLoader();
+	newBtn->setGuiItem( KGuiItem(i18n("New"), icon->loadIconSet("filenew", TDEIcon::Small) ) );
+	editBtn->setGuiItem( KGuiItem(i18n("Edit"), icon->loadIconSet("edit", TDEIcon::Small) ) );
 	//editBtn->setEnabled( false );
-	deleteBtn->setGuiItem( KGuiItem(i18n("Stop/Delete"), icon->loadIconSet("editcut", KIcon::Small) ) );
-	okBtn->setGuiItem( KGuiItem(i18n("Close"), icon->loadIconSet("exit", KIcon::Small) ) );
+	deleteBtn->setGuiItem( KGuiItem(i18n("Stop/Delete"), icon->loadIconSet("editcut", TDEIcon::Small) ) );
+	okBtn->setGuiItem( KGuiItem(i18n("Close"), icon->loadIconSet("exit", TDEIcon::Small) ) );
 
-	isRecording = icon->loadIcon("player_record", KIcon::Small);
-	yesRepeat = icon->loadIcon("reload", KIcon::Small);
+	isRecording = icon->loadIcon("player_record", TDEIcon::Small);
+	yesRepeat = icon->loadIcon("reload", TDEIcon::Small);
 
 	setCaption( i18n("Timers") );
 
@@ -223,13 +223,13 @@ void KRecord::deleteTimer()
 {
 	TQListViewItem *it;
 	int i=0, ret;
-	KIconLoader *icon = new KIconLoader();
+	TDEIconLoader *icon = new TDEIconLoader();
 
 	it = list->firstChild();
        while ( it!=0 ) {
 		if ( it->isSelected() )  {
 			if ( timers->at(i)->mode )
-				ret = KMessageBox::questionYesNoCancel( this, i18n("This timer is repeated. Do you want to skip the current job or delete the timer?"), i18n("Warning"), KGuiItem(i18n("Skip Current"), icon->loadIconSet("next", KIcon::Small) ), KGuiItem(i18n("Delete"), icon->loadIconSet("editcut", KIcon::Small) ) );
+				ret = KMessageBox::questionYesNoCancel( this, i18n("This timer is repeated. Do you want to skip the current job or delete the timer?"), i18n("Warning"), KGuiItem(i18n("Skip Current"), icon->loadIconSet("next", TDEIcon::Small) ), KGuiItem(i18n("Delete"), icon->loadIconSet("editcut", TDEIcon::Small) ) );
 			else
 				ret = KMessageBox::questionYesNo( this, i18n("Delete the selected timer?") );
 			if ( ret==KMessageBox::Yes ) {
diff --git a/kaffeine/src/input/dvb/ktimereditor.cpp b/kaffeine/src/input/dvb/ktimereditor.cpp
index be5c5af..1db3825 100644
--- a/kaffeine/src/input/dvb/ktimereditor.cpp
+++ b/kaffeine/src/input/dvb/ktimereditor.cpp
@@ -113,10 +113,10 @@ KTimerEditor::KTimerEditor( bool newone, TQStringList &chanList, RecTimer t, TQW
 		default : repeatLab->setText( i18n("Custom") );
 	}
 
-	KIconLoader *icon = new KIconLoader();
+	TDEIconLoader *icon = new TDEIconLoader();
 	cancelBtn->setGuiItem( KStdGuiItem::cancel() );
 	okBtn->setGuiItem( KStdGuiItem::ok() );
-	repeatBtn->setGuiItem( KGuiItem(i18n("Repeat..."), icon->loadIconSet("reload", KIcon::Small) ) );
+	repeatBtn->setGuiItem( KGuiItem(i18n("Repeat..."), icon->loadIconSet("reload", TDEIcon::Small) ) );
 
 	setCaption( i18n("Timer Editor") );
 
diff --git a/kaffeine/src/input/dvb/scandialog.cpp b/kaffeine/src/input/dvb/scandialog.cpp
index 9b68d93..44a2abb 100644
--- a/kaffeine/src/input/dvb/scandialog.cpp
+++ b/kaffeine/src/input/dvb/scandialog.cpp
@@ -55,11 +55,11 @@ ScanDialog::ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQS
 	int i, j;
 	TQStringList list, tmp;
 
-	KIconLoader *icon = new KIconLoader();
-	tvPix = icon->loadIcon( "kdvbtv", KIcon::Small );
-	tvcPix = icon->loadIcon( "kdvbtvc", KIcon::Small );
-	raPix = icon->loadIcon( "kdvbra", KIcon::Small );
-	racPix = icon->loadIcon( "kdvbrac", KIcon::Small );
+	TDEIconLoader *icon = new TDEIconLoader();
+	tvPix = icon->loadIcon( "kdvbtv", TDEIcon::Small );
+	tvcPix = icon->loadIcon( "kdvbtvc", TDEIcon::Small );
+	raPix = icon->loadIcon( "kdvbra", TDEIcon::Small );
+	racPix = icon->loadIcon( "kdvbrac", TDEIcon::Small );
 
 	chandesc = ch;
 	dvbsi = 0;
diff --git a/kaffeine/src/input/dvbclient/cdwidget.cpp b/kaffeine/src/input/dvbclient/cdwidget.cpp
index e9e79d3..f3d905f 100644
--- a/kaffeine/src/input/dvbclient/cdwidget.cpp
+++ b/kaffeine/src/input/dvbclient/cdwidget.cpp
@@ -53,10 +53,10 @@ CdWidget::CdWidget( const TQString &ad, int port, int info, const TQString &tspa
 
 	chan.setAutoDelete( true );
 
-	KIconLoader *icon = new KIconLoader();
+	TDEIconLoader *icon = new TDEIconLoader();
 
-	tvPix = icon->loadIcon( "kdvbtv", KIcon::Small );
-	raPix = icon->loadIcon( "kdvbra", KIcon::Small );
+	tvPix = icon->loadIcon( "kdvbtv", TDEIcon::Small );
+	raPix = icon->loadIcon( "kdvbra", TDEIcon::Small );
         delete icon;
 
 	listen = new CdListen();
diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
index 588d66a..aae2eca 100644
--- a/kaffeine/src/kaffeine.cpp
+++ b/kaffeine/src/kaffeine.cpp
@@ -180,20 +180,20 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
 	inplug = new InputManager( this, stack, mtBar );
 
 	m_startWindow = new StartWindow( stack );
-	inplug->addStartWindow( m_startWindow, TDEGlobal::iconLoader()->loadIcon("kmenu", KIcon::Small), i18n("Start") );
+	inplug->addStartWindow( m_startWindow, TDEGlobal::iconLoader()->loadIcon("kmenu", TDEIcon::Small), i18n("Start") );
 
 	playerWidget = new TQVBox( stack );
 	playerWidget->setMouseTracking( true );
-	inplug->addPlayerWidget( playerWidget, TDEGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Small), i18n("Player Window") );
+	inplug->addPlayerWidget( playerWidget, TDEGlobal::iconLoader()->loadIcon("kaffeine", TDEIcon::Small), i18n("Player Window") );
 
 	// playlist
 	m_playlist = new PlayList( stack, TQT_TQOBJECT(this) );
-	inplug->add( m_playlist, TDEGlobal::iconLoader()->loadIcon("view_text", KIcon::Small), i18n( "Playlist") );
+	inplug->add( m_playlist, TDEGlobal::iconLoader()->loadIcon("view_text", TDEIcon::Small), i18n( "Playlist") );
 	m_playlist->setFileFilter(DEFAULT_FILTER);
 	guiFactory()->addClient( m_playlist );
 
 	cddisc = new Disc( stack, TQT_TQOBJECT(this) );
-	inplug->add( cddisc, TDEGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Small), i18n( "Audio CD") );
+	inplug->add( cddisc, TDEGlobal::iconLoader()->loadIcon("cdrom_unmount", TDEIcon::Small), i18n( "Audio CD") );
 	guiFactory()->addClient( cddisc );
 
 	connect(m_playlist, TQT_SIGNAL(signalRequestForDVD(const TQString&)), cddisc, TQT_SLOT(startDVD(const TQString&)));
@@ -203,7 +203,7 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
 #ifdef HAVE_DVB
 	if ( dvbPanel )
 	{
-		inplug->add( dvbPanel, TDEGlobal::iconLoader()->loadIcon("tv", KIcon::Small), i18n( "Digital TV") );
+		inplug->add( dvbPanel, TDEGlobal::iconLoader()->loadIcon("tv", TDEIcon::Small), i18n( "Digital TV") );
 		guiFactory()->addClient( dvbPanel );
 		dvbPanel->checkFirstRun();
 	}
@@ -797,7 +797,7 @@ void Kaffeine::loadConfig()
 	if ( m_dvbClientEnabled )
 	{
 		dvbClient = new CdWidget( m_dvbClientAddress, m_dvbClientPort, m_dvbClientInfo, m_dvbClientShiftPath, this, TQT_TQOBJECT(this), "cdwidget");
-		inplug->add( dvbClient, TDEGlobal::iconLoader()->loadIcon("network", KIcon::Small), i18n( "DVB client") );
+		inplug->add( dvbClient, TDEGlobal::iconLoader()->loadIcon("network", TDEIcon::Small), i18n( "DVB client") );
 	}
 	else
 		dvbClient = 0;
@@ -913,7 +913,7 @@ void Kaffeine::slotDvbClient( bool enabled, const TQString &address, int port, i
 				connect( dvbClient, TQT_SIGNAL(setTimeShiftFilename(const TQString&)), m_mediaPart, TQT_SLOT(getTimeShiftFilename(const TQString&)) );
 				dvbClient->enableLive( true );
 			}
-			inplug->add( dvbClient, TDEGlobal::iconLoader()->loadIcon("network", KIcon::Small), i18n( "DVB client") );
+			inplug->add( dvbClient, TDEGlobal::iconLoader()->loadIcon("network", TDEIcon::Small), i18n( "DVB client") );
 		}
 	}
 	else
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
index abaec57..9f47172 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
@@ -44,8 +44,8 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
 	TQLabel* label = NULL;
 
 	//Audio Page
-	frame = addPage(i18n("Audio"), i18n("Audio Options"), TDEGlobal::iconLoader()->loadIcon("sound", KIcon::Panel,
-	                KIcon::SizeMedium));
+	frame = addPage(i18n("Audio"), i18n("Audio Options"), TDEGlobal::iconLoader()->loadIcon("sound", TDEIcon::Panel,
+	                TDEIcon::SizeMedium));
 	layout = new TQGridLayout(frame, 10, 2);
 	layout->setMargin(10);
 	layout->setSpacing(10);
@@ -57,8 +57,8 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
 	layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
 
 	//Video Page
-	frame = addPage(i18n("Video"), i18n("Video Options"), TDEGlobal::iconLoader()->loadIcon("video", KIcon::Panel,
-	                KIcon::SizeMedium));
+	frame = addPage(i18n("Video"), i18n("Video Options"), TDEGlobal::iconLoader()->loadIcon("video", TDEIcon::Panel,
+	                TDEIcon::SizeMedium));
 	layout = new TQGridLayout(frame, 10, 2);
 	layout->setMargin(10);
 	layout->setSpacing(10);
@@ -71,8 +71,8 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
 	layout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
 
 	//Media page
-	frame = addPage(i18n("Media"), i18n("Media Options"), TDEGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Panel,
-	                KIcon::SizeMedium));
+	frame = addPage(i18n("Media"), i18n("Media Options"), TDEGlobal::iconLoader()->loadIcon("cdrom_unmount", TDEIcon::Panel,
+	                TDEIcon::SizeMedium));
 	layout = new TQGridLayout(frame, 10, 2);
 	layout->setMargin(10);
 	layout->setSpacing(10);
diff --git a/kaffeine/src/player-parts/xine-part/filterdialog.cpp b/kaffeine/src/player-parts/xine-part/filterdialog.cpp
index 8d1e14a..9741c21 100644
--- a/kaffeine/src/player-parts/xine-part/filterdialog.cpp
+++ b/kaffeine/src/player-parts/xine-part/filterdialog.cpp
@@ -43,7 +43,7 @@ FilterDialog::FilterDialog(const TQStringList& audioFilters, const TQStringList&
 
 /****** Audio Filters ******/  
   TQWidget* audioPage = addPage(i18n("Audio"), i18n("Audio Filters"),
-           TDEGlobal::iconLoader()->loadIcon("sound", KIcon::Panel, KIcon::SizeMedium));
+           TDEGlobal::iconLoader()->loadIcon("sound", TDEIcon::Panel, TDEIcon::SizeMedium));
   TQGridLayout* audioGrid = new TQGridLayout( audioPage, 3, 3 );
   audioGrid->setSpacing( 5 );
 
@@ -76,7 +76,7 @@ FilterDialog::FilterDialog(const TQStringList& audioFilters, const TQStringList&
   
 /****** Video Filters ******/  
   TQWidget* videoPage = addPage(i18n("Video"), i18n("Video Filters"),
-           TDEGlobal::iconLoader()->loadIcon("video", KIcon::Panel, KIcon::SizeMedium));
+           TDEGlobal::iconLoader()->loadIcon("video", TDEIcon::Panel, TDEIcon::SizeMedium));
   TQGridLayout* videoGrid = new TQGridLayout( videoPage, 3, 3 );
   videoGrid->setSpacing( 5 );
 
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
index 3509271..e656d94 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
@@ -1263,7 +1263,7 @@ void XinePart::slotFinalize()
 		kdDebug() << "XinePart: no xmlguifactory, will create a simple context menu..." << endl;
 		TDEAction* action = NULL;
 		m_embeddedContext = new TDEPopupMenu(0);
-		m_embeddedContext->insertTitle(instance()->iconLoader()->loadIcon("kaffeine", KIcon::Small), i18n("Kaffeine Player"));
+		m_embeddedContext->insertTitle(instance()->iconLoader()->loadIcon("kaffeine", TDEIcon::Small), i18n("Kaffeine Player"));
 		actionCollection()->action("player_play")->plug(m_embeddedContext);
 		actionCollection()->action("player_pause")->plug(m_embeddedContext);
 		actionCollection()->action("player_stop")->plug(m_embeddedContext);
diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
index 4a88626..0ddc375 100644
--- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp
+++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
@@ -272,8 +272,8 @@ XineConfig::XineConfig(const xine_t* const xine) :
 		else
 			icon = "edit";
 
-		xineFrame = addPage(*it, i18n("%1 Options").arg(*it), TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Panel,
-		                    KIcon::SizeMedium));
+		xineFrame = addPage(*it, i18n("%1 Options").arg(*it), TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::Panel,
+		                    TDEIcon::SizeMedium));
 		xineLayout = new TQVBoxLayout(xineFrame, marginHint(), spacingHint());
 		tabWidget = new TQTabWidget(xineFrame);
 		xineLayout->addWidget(tabWidget);
diff --git a/kaffeine/src/pref.cpp b/kaffeine/src/pref.cpp
index f487121..3907b44 100644
--- a/kaffeine/src/pref.cpp
+++ b/kaffeine/src/pref.cpp
@@ -50,12 +50,12 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
 	TQGroupBox *gb;
 	TQVBoxLayout *vb;
 	TQGridLayout *grid;
-	KIconLoader *icon = new KIconLoader();
+	TDEIconLoader *icon = new TDEIconLoader();
 
 	setInitialSize(TQSize(400,400), false);
 
 //-----------behavior----------------
-	TQFrame *behavior = addPage(i18n("Behavior"), i18n("Behavior"), TDEGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Panel, KIcon::SizeMedium));
+	TQFrame *behavior = addPage(i18n("Behavior"), i18n("Behavior"), TDEGlobal::iconLoader()->loadIcon("kaffeine", TDEIcon::Panel, TDEIcon::SizeMedium));
 	vb = new TQVBoxLayout( behavior, 6, 6 );
 	gb = new TQGroupBox( "", behavior );
 	grid = new TQGridLayout( gb, 1, 1, 20, 6 );
@@ -66,7 +66,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
 	vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
 
 //-----------appearance--------------
-	TQFrame *looknfeel = addPage(i18n("Appearance"), i18n("Appearance"),TDEGlobal::iconLoader()->loadIcon("looknfeel", KIcon::Panel, KIcon::SizeMedium));
+	TQFrame *looknfeel = addPage(i18n("Appearance"), i18n("Appearance"),TDEGlobal::iconLoader()->loadIcon("looknfeel", TDEIcon::Panel, TDEIcon::SizeMedium));
 	vb = new TQVBoxLayout( looknfeel, 6, 6 );
 	gb = new TQGroupBox( "", looknfeel );
 	grid = new TQGridLayout( gb, 1, 1, 20, 6 );
@@ -88,7 +88,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
 	vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
 
 //-----------dvbclient--------------
-	TQFrame *dc = addPage(i18n("DVB Client"), i18n("DVB Client"),TDEGlobal::iconLoader()->loadIcon("network_local", KIcon::Panel, KIcon::SizeMedium));
+	TQFrame *dc = addPage(i18n("DVB Client"), i18n("DVB Client"),TDEGlobal::iconLoader()->loadIcon("network_local", TDEIcon::Panel, TDEIcon::SizeMedium));
 	vb = new TQVBoxLayout( dc, 6, 6 );
 	m_dcEnabled = new TQCheckBox(i18n("Enable DVB client"), dc);
 	vb->addWidget( m_dcEnabled );
@@ -115,7 +115,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
 	m_shiftDirLe->setReadOnly( true );
 	grid->addWidget( m_shiftDirLe, 3, 1 );
 	m_shiftDirBtn = new TQToolButton( gb );
-	m_shiftDirBtn->setIconSet( icon->loadIconSet("fileopen", KIcon::Small) );
+	m_shiftDirBtn->setIconSet( icon->loadIconSet("fileopen", TDEIcon::Small) );
 	grid->addWidget( m_shiftDirBtn, 3, 2 );
 	connect( m_shiftDirBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(setShiftDir()) );
 
@@ -123,7 +123,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
 	vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
 
 //-----------misc----------------
-	TQFrame *misc = addPage(i18n("Misc"), i18n("Miscellaneous Options"),TDEGlobal::iconLoader()->loadIcon("misc", KIcon::Panel, KIcon::SizeMedium));
+	TQFrame *misc = addPage(i18n("Misc"), i18n("Miscellaneous Options"),TDEGlobal::iconLoader()->loadIcon("misc", TDEIcon::Panel, TDEIcon::SizeMedium));
 	vb = new TQVBoxLayout( misc, 6, 6 );
 	gb = new TQGroupBox(1, Qt::Horizontal, "", misc);
 	gb->setInsideMargin(20);
diff --git a/kaffeine/src/startwindow.cpp b/kaffeine/src/startwindow.cpp
index c63653f..327dd0c 100644
--- a/kaffeine/src/startwindow.cpp
+++ b/kaffeine/src/startwindow.cpp
@@ -117,7 +117,7 @@ void StartWindow::registerTarget( const TQString& uiName, const TQString& pixNam
 	TQToolTip::add(btn, uiName);
 	btn->setTextPosition( TQToolButton::Under );
 	btn->setUsesTextLabel( true );
-	btn->setIconSet( TDEGlobal::iconLoader()->loadIconSet(pixName, KIcon::Panel) );
+	btn->setIconSet( TDEGlobal::iconLoader()->loadIconSet(pixName, TDEIcon::Panel) );
 	TQSize size = btn->sizeHint();
 	size.setHeight( size.height()+5 );
 	btn->resize( size );
diff --git a/kaffeine/src/systemtray.cpp b/kaffeine/src/systemtray.cpp
index 560ffc7..2057ff3 100644
--- a/kaffeine/src/systemtray.cpp
+++ b/kaffeine/src/systemtray.cpp
@@ -75,7 +75,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name ) : KSystemTray(parent
 	m_osd->setAlignment(SingleLine);
 	connect(&m_hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotHideOSD()));
 
-	setPixmap(TDEGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Panel, 22));
+	setPixmap(TDEGlobal::iconLoader()->loadIcon("kaffeine", TDEIcon::Panel, 22));
 	TQToolTip::add(this, i18n("Kaffeine Player"));
 }