Rename a number of classes to enhance compatibility with KDE4

25 files changed, 220 insertions, 220 deletions

diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.cpp b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
index f12d232..fafd8d6 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcher.cpp
+++ b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
@@ -249,7 +249,7 @@ TQPixmap GoogleFetcher::pixmap( bool forceFetch )
 
 void GoogleFetcher::displayWaitMessage()
 {
-    //KStatusBar *statusBar = static_cast<KMainWindow *>(kapp->mainWidget())->statusBar();
+    //KStatusBar *statusBar = static_cast<TDEMainWindow *>(kapp->mainWidget())->statusBar();
     //statusBar->message(i18n("Searching for Images. Please Wait..."));
     slotLoadImageURLs();
     //statusBar->clear();*/
diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
index ec672f7..5cbc21a 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
@@ -294,7 +294,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	vSplit = new TQSplitter( Qt::Vertical, panel );
 	vSplit->setOpaqueResize( true );
 	TQWidget *vb = new TQWidget( vSplit );
-	KToolBar *tb = new KToolBar( vb );
+	TDEToolBar *tb = new TDEToolBar( vb );
 	TQVBoxLayout *v = new TQVBoxLayout( vb, 0, 0 );
 	v->addWidget( tb );
 	tb->setIconSize( 16 );
@@ -324,7 +324,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	v1->addWidget( fileBrowser );
 	v->addLayout( v1 );
 
-	KActionCollection *col = fileBrowser->actionCollection();
+	TDEActionCollection *col = fileBrowser->actionCollection();
 	col->action( "up" )->plug( tb );
 	col->action( "back" )->plug( tb );
 	col->action( "forward" )->plug( tb );
@@ -346,7 +346,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 
 	m_list = new UrlListView(playlist);
 	mainWidget->setAcceptDrops(true);
-	m_list->setHScrollBarMode(KListView::AlwaysOff);
+	m_list->setHScrollBarMode(TDEListView::AlwaysOff);
 	m_list->setItemMargin(2);
 	m_list->setMargin(0);
 	m_list->setSelectionMode(TQListView::Extended);
@@ -415,7 +415,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	roller = new RollTitle( playlist );
 	layout->addWidget( roller, 0, 1 );
 
-	KAccel* accel = new KAccel(mainWidget);
+	TDEAccel* accel = new TDEAccel(mainWidget);
 	accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected()));
 
 	m_isCurrentEntry = UserIcon("playing");
@@ -497,19 +497,19 @@ PlayList::~PlayList()
 
 void PlayList::setupActions()
 {
-	m_repeat = new KToggleAction(i18n("&Repeat"), 0 , CTRL|Key_E, this, TQT_SLOT(slotRepeat()), actionCollection(),"playlist_repeat");
+	m_repeat = new TDEToggleAction(i18n("&Repeat"), 0 , CTRL|Key_E, this, TQT_SLOT(slotRepeat()), actionCollection(),"playlist_repeat");
 	m_repeat->setStatusText(i18n("Loop playlist"));
-	m_shuffle = new KToggleAction(i18n("Sh&uffle"), 0 , CTRL|Key_R, this, TQT_SLOT(slotShuffle()), actionCollection(),"playlist_shuffle");
+	m_shuffle = new TDEToggleAction(i18n("Sh&uffle"), 0 , CTRL|Key_R, this, TQT_SLOT(slotShuffle()), actionCollection(),"playlist_shuffle");
 	m_shuffle->setStatusText(i18n("Play items in random order"));
-	m_autoCover = new KToggleAction(i18n("Autodownload covers"), 0 , 0, this, TQT_SLOT(slotAutoCover()), actionCollection(),"playlist_autocover");
+	m_autoCover = new TDEToggleAction(i18n("Autodownload covers"), 0 , 0, this, TQT_SLOT(slotAutoCover()), actionCollection(),"playlist_autocover");
 	m_autoCover->setStatusText(i18n("Automatic dowloading of covers"));
-	m_showPlayer = new KToggleAction(i18n("Don't switch to player window"), 0 , 0, this, TQT_SLOT(slotShowPlayer()), actionCollection(),"playlist_showplayer");
+	m_showPlayer = new TDEToggleAction(i18n("Don't switch to player window"), 0 , 0, this, TQT_SLOT(slotShowPlayer()), actionCollection(),"playlist_showplayer");
 	m_showPlayer->setStatusText(i18n("Don't switch automatically to player window"));
-	new KAction(i18n("&Clear Current Playlist"), "eraser", 0, this, TQT_SLOT(slotClearList()), actionCollection(), "playlist_clear");
-	new KAction(i18n("Ne&w Playlist"), "filenew", 0, this, TQT_SLOT(slotNewList()), actionCollection(), "playlist_new");
-	new KAction(i18n("&Import Playlist..."), "project_open", 0, this, TQT_SLOT(slotPlaylistLoad()), actionCollection(), "playlist_load");
-	new KAction(i18n("&Save Current Playlist As..."), "filesaveas", 0, this, TQT_SLOT(slotPlaylistSaveAs()), actionCollection(), "playlist_save_as");
-	new KAction(i18n("Re&move Current Playlist"), "fileclose", 0, this, TQT_SLOT(slotPlaylistRemove()), actionCollection(), "playlist_remove");
+	new TDEAction(i18n("&Clear Current Playlist"), "eraser", 0, this, TQT_SLOT(slotClearList()), actionCollection(), "playlist_clear");
+	new TDEAction(i18n("Ne&w Playlist"), "filenew", 0, this, TQT_SLOT(slotNewList()), actionCollection(), "playlist_new");
+	new TDEAction(i18n("&Import Playlist..."), "project_open", 0, this, TQT_SLOT(slotPlaylistLoad()), actionCollection(), "playlist_load");
+	new TDEAction(i18n("&Save Current Playlist As..."), "filesaveas", 0, this, TQT_SLOT(slotPlaylistSaveAs()), actionCollection(), "playlist_save_as");
+	new TDEAction(i18n("Re&move Current Playlist"), "fileclose", 0, this, TQT_SLOT(slotPlaylistRemove()), actionCollection(), "playlist_remove");
 }
 
 void PlayList::slotClearList()
@@ -935,7 +935,7 @@ TQListViewItem* PlayList::insertItem(TQListViewItem* after, const MRL& m)
 		mrl.setMime(mime->name());
 	}
 
-	tmp = new PlaylistItem(m_list, dynamic_cast<KListViewItem *>(after), mrl);
+	tmp = new PlaylistItem(m_list, dynamic_cast<TDEListViewItem *>(after), mrl);
 	if (!tmp) return after;
 
 	if ((mrl.mime() == "video/dvd") || (mrl.mime() == "video/vcd") || (mrl.mime() == "audio/cd"))
diff --git a/kaffeine/src/input/audiobrowser/playlist.h b/kaffeine/src/input/audiobrowser/playlist.h
index 021d60d..5d9d1b0 100644
--- a/kaffeine/src/input/audiobrowser/playlist.h
+++ b/kaffeine/src/input/audiobrowser/playlist.h
@@ -269,7 +269,7 @@ private:
 	TQString coverImageFormat;
 	RollTitle *roller;
 
-	KToggleAction *m_repeat, *m_shuffle, *m_autoCover, *m_showPlayer;
+	TDEToggleAction *m_repeat, *m_shuffle, *m_autoCover, *m_showPlayer;
 
 	TQValueList<MRL> m_queue;
 
diff --git a/kaffeine/src/input/audiobrowser/playlistitem.cpp b/kaffeine/src/input/audiobrowser/playlistitem.cpp
index fe5a494..2152cff 100644
--- a/kaffeine/src/input/audiobrowser/playlistitem.cpp
+++ b/kaffeine/src/input/audiobrowser/playlistitem.cpp
@@ -26,15 +26,15 @@
 #include "mrl.h"
 #include "playlistitem.h"
 
-PlaylistItem::PlaylistItem(KListView *list, KListViewItem *after, const TQString& url, const TQString& mime, const TQString& title,
+PlaylistItem::PlaylistItem(TDEListView *list, TDEListViewItem *after, const TQString& url, const TQString& mime, const TQString& title,
              const TQString& length, const TQString& artist, const TQString& album, const TQString& year, const TQString& genre,
              const TQString& track, const TQStringList& subtitles, int currentSubtitle) :
-             KListViewItem(list, after, mime, title, artist, album, track, length),
+             TDEListViewItem(list, after, mime, title, artist, album, track, length),
 	     m_url(url), m_year(year), m_genre(genre), m_subtitles(subtitles), m_currentSubtitle(currentSubtitle), isCurrent(false)
 {}
 
-PlaylistItem::PlaylistItem(KListView* list, KListViewItem* after, const MRL& mrl) :
-                           KListViewItem(list, after, mrl.mime(), mrl.title(), mrl.artist(), mrl.album(),
+PlaylistItem::PlaylistItem(TDEListView* list, TDEListViewItem* after, const MRL& mrl) :
+                           TDEListViewItem(list, after, mrl.mime(), mrl.title(), mrl.artist(), mrl.album(),
 			   mrl.track(), mrl.length().toString("h:mm:ss")), m_url(mrl.url()),
 			   m_year(mrl.year()), m_genre(mrl.genre()),
 			   m_subtitles(mrl.subtitleFiles()), m_currentSubtitle(mrl.currentSubtitle()), isCurrent(false)
@@ -264,5 +264,5 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i
 		TQListViewItem::paintCell(p, colorGroup, column, width, align);
 	}
 	else
-		return KListViewItem::paintCell(p, cg, column, width, align);
+		return TDEListViewItem::paintCell(p, cg, column, width, align);
 }
diff --git a/kaffeine/src/input/audiobrowser/playlistitem.h b/kaffeine/src/input/audiobrowser/playlistitem.h
index d536117..712ce85 100644
--- a/kaffeine/src/input/audiobrowser/playlistitem.h
+++ b/kaffeine/src/input/audiobrowser/playlistitem.h
@@ -36,15 +36,15 @@ class TQString;
 class TQStringList;
 class MRL;
 
-class PlaylistItem : public KListViewItem
+class PlaylistItem : public TDEListViewItem
 {
 
 public:
-   PlaylistItem(KListView *list, KListViewItem *after, const TQString& url, const TQString& mime, const TQString& title,
+   PlaylistItem(TDEListView *list, TDEListViewItem *after, const TQString& url, const TQString& mime, const TQString& title,
                 const TQString& length = TQString(), const TQString& artist = TQString(), const TQString& album = TQString(),
                 const TQString& track = TQString(), const TQString& year = TQString(), const TQString& genre = TQString(),
 		const TQStringList& subtitles = TQStringList(), int currentSubtitle = -1);
-   PlaylistItem(KListView* list, KListViewItem* after, const MRL&);
+   PlaylistItem(TDEListView* list, TDEListViewItem* after, const MRL&);
    virtual ~PlaylistItem();
 
    MRL toMRL() const;
diff --git a/kaffeine/src/input/audiobrowser/urllistview.cpp b/kaffeine/src/input/audiobrowser/urllistview.cpp
index ca87dc6..250e55f 100644
--- a/kaffeine/src/input/audiobrowser/urllistview.cpp
+++ b/kaffeine/src/input/audiobrowser/urllistview.cpp
@@ -37,10 +37,10 @@
 #include "urllistview.moc"
 
 
-UrlListView::UrlListView(TQWidget *parent, const char *name ) : KListView(parent,name),
+UrlListView::UrlListView(TQWidget *parent, const char *name ) : TDEListView(parent,name),
  m_listCleared(true), m_itemOfContextMenu(NULL)
 {
-  m_contextMenu = new KPopupMenu(this);
+  m_contextMenu = new TDEPopupMenu(this);
   m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play"), this, TQT_SLOT(slotPlayItem()));
   m_contextMenu->insertItem(i18n("Play Next/Add to Queue"), this, TQT_SLOT(slotPlayNext()));
   m_contextMenu->insertSeparator();
@@ -85,7 +85,7 @@ UrlListView::~UrlListView()
 
 bool UrlListView::acceptDrag(TQDropEvent* event) const
 {
- return TQUriDrag::canDecode(event) || TQTextDrag::canDecode(event) || KListView::acceptDrag(event);
+ return TQUriDrag::canDecode(event) || TQTextDrag::canDecode(event) || TDEListView::acceptDrag(event);
 }
 
 TQDragObject* UrlListView::dragObject()
@@ -113,7 +113,7 @@ void UrlListView::resizeEvent(TQResizeEvent* rev)
   setColumnWidth(4, m_column4Track);  /* track */
   setColumnWidth(5, m_column5Width);  /* width of "length" column */
 
-  KListView::resizeEvent(rev);
+  TDEListView::resizeEvent(rev);
 }
 
 void UrlListView::clear()
@@ -121,7 +121,7 @@ void UrlListView::clear()
   m_listCleared = true;
   m_itemOfContextMenu = NULL;
   setSorting(-1);
-  KListView::clear();
+  TDEListView::clear();
 }
 
 void UrlListView::setCleared(bool cl)
diff --git a/kaffeine/src/input/audiobrowser/urllistview.h b/kaffeine/src/input/audiobrowser/urllistview.h
index 526f752..9712d55 100644
--- a/kaffeine/src/input/audiobrowser/urllistview.h
+++ b/kaffeine/src/input/audiobrowser/urllistview.h
@@ -27,14 +27,14 @@
 
 #include <klistview.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 class TQWidget;
 class TQDragObject;
 class PlaylistItem;
 class MRL;
 class TDEIO::Job;
 
-class UrlListView : public KListView
+class UrlListView : public TDEListView
 {
    Q_OBJECT
   
@@ -84,7 +84,7 @@ private:
   int m_column4Track;  /* width of the fourth column */
 
   PlaylistItem* m_itemOfContextMenu;
-  KPopupMenu* m_contextMenu;
+  TDEPopupMenu* m_contextMenu;
   TDEIO::Job *openSubJob;
   TQByteArray openSubJobBuf;
 
diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp
index 5d6121f..15d7681 100644
--- a/kaffeine/src/input/disc/disc.cpp
+++ b/kaffeine/src/input/disc/disc.cpp
@@ -59,7 +59,7 @@ void MLabel::paintEvent( TQPaintEvent *pe )
 	setPaletteBackgroundColor( TQColor(r, g, b) );
 }
 
-MListView::MListView( TQWidget *parent ) : KListView( parent )
+MListView::MListView( TQWidget *parent ) : TDEListView( parent )
 {
 }
 
@@ -70,7 +70,7 @@ void MListView::resizeEvent( TQResizeEvent *rev )
 	setColumnWidth(1, width-90);  /* title */
 	setColumnWidth(2, 50);  /* duration */
 
-	KListView::resizeEvent(rev);
+	TDEListView::resizeEvent(rev);
 }
 
 Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name)
@@ -266,9 +266,9 @@ TQWidget* Disc::inputMainWidget()
 
 void Disc::setupActions()
 {
-	new KAction(i18n("Open &DVD"), "dvd_unmount", 0, this, TQT_SLOT(startDVD()), actionCollection(), "file_open_dvd");
-	new KAction(i18n("Open &VCD"), "cdrom_unmount", 0, this, TQT_SLOT(startVCD()), actionCollection(), "file_open_vcd");
-	new KAction(i18n("Open &Audio-CD"), "cdaudio_unmount", 0, this, TQT_SLOT(startCD()), actionCollection(), "file_open_audiocd");
+	new TDEAction(i18n("Open &DVD"), "dvd_unmount", 0, this, TQT_SLOT(startDVD()), actionCollection(), "file_open_dvd");
+	new TDEAction(i18n("Open &VCD"), "cdrom_unmount", 0, this, TQT_SLOT(startVCD()), actionCollection(), "file_open_vcd");
+	new TDEAction(i18n("Open &Audio-CD"), "cdaudio_unmount", 0, this, TQT_SLOT(startCD()), actionCollection(), "file_open_audiocd");
 }
 
 void Disc::playerStopped()
@@ -392,7 +392,7 @@ void Disc::startCD( const TQString &device, bool rip )
 	bool init=false;
 	TQValueList<int> qvl;
 	int i;
-	KListViewItem *it;
+	TDEListViewItem *it;
 	MRL mrl;
 	TQStringList dcopList, devList;
 	bool ok=false;
@@ -463,7 +463,7 @@ void Disc::startCD( const TQString &device, bool rip )
 			artistLab->setText( cddb->artist() );
 			albumLab->setText( cddb->title() );
 			for ( i=0; i<para->getTracks(); i++ ) {
-				it = new KListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) );
+				it = new TDEListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) );
 				if ( i==0 ) {
 					mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
 					mrl.setTitle( cddb->track(i) );
@@ -479,7 +479,7 @@ void Disc::startCD( const TQString &device, bool rip )
 				artistLab->setText( cddb->artist() );
 				albumLab->setText( cddb->title() );
 				for ( i=0; i<para->getTracks(); i++ ) {
-					it = new KListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) );
+					it = new TDEListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) );
 					if ( i==0 ) {
 						mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
 						mrl.setTitle( cddb->track(i) );
@@ -493,7 +493,7 @@ void Disc::startCD( const TQString &device, bool rip )
 				artistLab->setText( i18n("Unknown") );
 				albumLab->setText( i18n("Unknown") );
 				for ( i=0; i<para->getTracks(); i++ ) {
-					it = new KListViewItem( list, TQString().sprintf("%02d", i+1), i18n("Track")+TQString().sprintf("%02d", i+1), para->trackTime(i) );
+					it = new TDEListViewItem( list, TQString().sprintf("%02d", i+1), i18n("Track")+TQString().sprintf("%02d", i+1), para->trackTime(i) );
 					if ( i==0 ) {
 						mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
 						mrl.setTitle( i18n("Track")+TQString().sprintf("%02d", i+1) );
diff --git a/kaffeine/src/input/disc/disc.h b/kaffeine/src/input/disc/disc.h
index dae99e3..cf4bfe6 100644
--- a/kaffeine/src/input/disc/disc.h
+++ b/kaffeine/src/input/disc/disc.h
@@ -55,7 +55,7 @@ protected:
 
 
 
-class MListView : public KListView
+class MListView : public TDEListView
 {
 	Q_OBJECT
   
diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
index d138acc..e2c0d9d 100644
--- a/kaffeine/src/input/dvb/dvbpanel.cpp
+++ b/kaffeine/src/input/dvb/dvbpanel.cpp
@@ -83,7 +83,7 @@ void DIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDragItem> &
 
 
 
-DListView::DListView( TQWidget *parent ) : KListView( parent )
+DListView::DListView( TQWidget *parent ) : TDEListView( parent )
 {
 	visibleItems = 0;
 }
@@ -435,19 +435,19 @@ bool DvbPanel::execTarget( const TQString &target )
 
 void DvbPanel::setupActions()
 {
-	new KAction(i18n("OSD Next Channel"), "next", CTRL+SHIFT+Key_W, this, TQT_SLOT(dvbOSDNext()), actionCollection(), "dvb_browse_next");
-	new KAction(i18n("OSD Previous Channel"), "previous", CTRL+SHIFT+Key_Q, this, TQT_SLOT(dvbOSDPrev()), actionCollection(),"dvb_browse_prev");
-	new KAction(i18n("OSD Zap"), "ok", CTRL+SHIFT+Key_E, this, TQT_SLOT(dvbOSDZap()), actionCollection(), "dvb_browse_zap");
-	new KAction(i18n("OSD Next Event"), "down", CTRL+SHIFT+Key_S, this, TQT_SLOT(dvbOSDAdvance()), actionCollection(), "dvb_browse_advance");
-	new KAction(i18n("OSD Previous Event"), "up", CTRL+SHIFT+Key_A, this, TQT_SLOT(dvbOSDRetreat()), actionCollection(), "dvb_browse_retreat");
-	new KAction(i18n("Instant Record"), "filesave", 0, this, TQT_SLOT(setRecord()), actionCollection(), "dvb_instant_record");
-	new KAction(i18n("Recall"), "reload", CTRL+SHIFT+Key_Z, this, TQT_SLOT(recallZap()), actionCollection(), "dvb_recall");
-	new KAction(i18n("Show OSD"), "info", Key_O, this, TQT_SLOT(dvbOSD()), actionCollection(), "dvb_show_osd");
-	new KAction(i18n("EPG..."), "view_text", Key_G, this, TQT_SLOT(showEvents()), actionCollection(), "dvb_show_epg");
-	new KAction(i18n("Timers..."), "date", Key_T, this, TQT_SLOT(showTimers()), actionCollection(), "dvb_show_timers");
-	new KAction(i18n("Broadcasting..."), "network_local", Key_B, this, TQT_SLOT(setBroadcast()), actionCollection(), "dvb_show_broadcast");
-	new KAction(i18n("Channels..."), "kdvbtv", Key_C, this, TQT_SLOT(scanner()), actionCollection(), "dvb_channels");
-	new KAction(i18n("Configure DVB..."), "configure", CTRL|Key_C, this, TQT_SLOT(showConfigDialog()), actionCollection(), "dvb_config");
+	new TDEAction(i18n("OSD Next Channel"), "next", CTRL+SHIFT+Key_W, this, TQT_SLOT(dvbOSDNext()), actionCollection(), "dvb_browse_next");
+	new TDEAction(i18n("OSD Previous Channel"), "previous", CTRL+SHIFT+Key_Q, this, TQT_SLOT(dvbOSDPrev()), actionCollection(),"dvb_browse_prev");
+	new TDEAction(i18n("OSD Zap"), "ok", CTRL+SHIFT+Key_E, this, TQT_SLOT(dvbOSDZap()), actionCollection(), "dvb_browse_zap");
+	new TDEAction(i18n("OSD Next Event"), "down", CTRL+SHIFT+Key_S, this, TQT_SLOT(dvbOSDAdvance()), actionCollection(), "dvb_browse_advance");
+	new TDEAction(i18n("OSD Previous Event"), "up", CTRL+SHIFT+Key_A, this, TQT_SLOT(dvbOSDRetreat()), actionCollection(), "dvb_browse_retreat");
+	new TDEAction(i18n("Instant Record"), "filesave", 0, this, TQT_SLOT(setRecord()), actionCollection(), "dvb_instant_record");
+	new TDEAction(i18n("Recall"), "reload", CTRL+SHIFT+Key_Z, this, TQT_SLOT(recallZap()), actionCollection(), "dvb_recall");
+	new TDEAction(i18n("Show OSD"), "info", Key_O, this, TQT_SLOT(dvbOSD()), actionCollection(), "dvb_show_osd");
+	new TDEAction(i18n("EPG..."), "view_text", Key_G, this, TQT_SLOT(showEvents()), actionCollection(), "dvb_show_epg");
+	new TDEAction(i18n("Timers..."), "date", Key_T, this, TQT_SLOT(showTimers()), actionCollection(), "dvb_show_timers");
+	new TDEAction(i18n("Broadcasting..."), "network_local", Key_B, this, TQT_SLOT(setBroadcast()), actionCollection(), "dvb_show_broadcast");
+	new TDEAction(i18n("Channels..."), "kdvbtv", Key_C, this, TQT_SLOT(scanner()), actionCollection(), "dvb_channels");
+	new TDEAction(i18n("Configure DVB..."), "configure", CTRL|Key_C, this, TQT_SLOT(showConfigDialog()), actionCollection(), "dvb_config");
 }
 
 
@@ -1161,7 +1161,7 @@ void DvbPanel::fillChannelList( ChannelDesc *ch )
 {
 	int i, j;
 	ChannelDesc *chan;
-	KListViewItem *it, *visible=0;
+	TDEListViewItem *it, *visible=0;
 	bool cont=false;
 	TQPtrList<Transponder> trans = getSourcesStatus();
 	trans.setAutoDelete( true );
@@ -1193,7 +1193,7 @@ void DvbPanel::fillChannelList( ChannelDesc *ch )
 		}
 		else if ( currentCategory!="All" && chan->category!=currentCategory )
 			continue;
-		it = new KListViewItem( channelsCb, TQString().sprintf("%05d", chan->num), chan->name, chan->tp.source );
+		it = new TDEListViewItem( channelsCb, TQString().sprintf("%05d", chan->num), chan->name, chan->tp.source );
 		if ( ch && ch==chan )
 			visible = it;
 		it->setDragEnabled( true );
@@ -2123,7 +2123,7 @@ bool DvbPanel::getChannelList()
 	ChannelDesc *chan;
 	TQString src="";
 	int ns;
-	KListViewItem *it;
+	TDEListViewItem *it;
 	TQPixmap pix;
 
 	maxChannelNumber = 0;
@@ -2377,7 +2377,7 @@ bool DvbPanel::getChannelList()
 			}
 
 			chan->pix.load( dvbConfig->dvbConfigIconsDir+chan->name );
-			it = new KListViewItem( channelsCb, TQString().sprintf("%05d", chan->num), chan->name, chan->tp.source );
+			it = new TDEListViewItem( channelsCb, TQString().sprintf("%05d", chan->num), chan->name, chan->tp.source );
 			it->setDragEnabled( true );
 			if ( !chan->pix.isNull() )
 				it->setPixmap( 1, chan->pix );
diff --git a/kaffeine/src/input/dvb/dvbpanel.h b/kaffeine/src/input/dvb/dvbpanel.h
index 49f461b..0223f64 100644
--- a/kaffeine/src/input/dvb/dvbpanel.h
+++ b/kaffeine/src/input/dvb/dvbpanel.h
@@ -53,7 +53,7 @@ class KaffeineDvbPlugin;
 
 
 
-class DListView : public KListView
+class DListView : public TDEListView
 {
 	Q_OBJECT
   
diff --git a/kaffeine/src/input/dvb/kevents.cpp b/kaffeine/src/input/dvb/kevents.cpp
index 746e1b4..239b155 100644
--- a/kaffeine/src/input/dvb/kevents.cpp
+++ b/kaffeine/src/input/dvb/kevents.cpp
@@ -37,7 +37,7 @@
 
 
 
-EListViewItem::EListViewItem( TQListView *parent, TQString chanName, TQString eBegin, TQString eDuration, TQString eTitle, EventDesc *desc ) : KListViewItem( parent, chanName, eBegin, eDuration, eTitle )
+EListViewItem::EListViewItem( TQListView *parent, TQString chanName, TQString eBegin, TQString eDuration, TQString eTitle, EventDesc *desc ) : TDEListViewItem( parent, chanName, eBegin, eDuration, eTitle )
 {
 	event = desc;
 }
@@ -118,12 +118,12 @@ KEvents::KEvents( TQPtrList<ChannelDesc> *chans, TQPtrList<DvbStream> *d, EventT
 
 	grid->addLayout( vbox, 0, 0 );
 
-	listView = new KListView( this, "listView" );
+	listView = new TDEListView( this, "listView" );
 	listView->addColumn( i18n( "Channel" ) );
 	listView->addColumn( i18n( "Begin" ) );
 	listView->addColumn( i18n( "Duration" ) );
 	listView->addColumn( i18n( "Title" ) );
-	listView->setResizePolicy( KListView::AutoOneFit );
+	listView->setResizePolicy( TDEListView::AutoOneFit );
 	listView->setAllColumnsShowFocus( TRUE );
 	listView->setFullWidth( TRUE );
 	grid->addWidget( listView, 1, 0 );
diff --git a/kaffeine/src/input/dvb/kevents.h b/kaffeine/src/input/dvb/kevents.h
index 62a6ce6..9e061b0 100644
--- a/kaffeine/src/input/dvb/kevents.h
+++ b/kaffeine/src/input/dvb/kevents.h
@@ -36,7 +36,7 @@ class EventTable;
 class ChannelDesc;
 
 
-class EListViewItem : public KListViewItem
+class EListViewItem : public TDEListViewItem
 {
 
 public:
@@ -77,7 +77,7 @@ private:
 
 	TQPtrList<DvbStream> *dvb;
 	EventTable *events;
-	KListView *listView;
+	TDEListView *listView;
 	KPushButton *resetBtn, *currentNextBtn, *allBtn, *currentChannelEpgBtn;
 	TQToolButton *searchBtn;
 	TQCheckBox *titleCb,*tvradioCb,*ftaCb;
diff --git a/kaffeine/src/input/dvb/krecord.cpp b/kaffeine/src/input/dvb/krecord.cpp
index ef05fe1..55b70e3 100644
--- a/kaffeine/src/input/dvb/krecord.cpp
+++ b/kaffeine/src/input/dvb/krecord.cpp
@@ -41,13 +41,13 @@ KRecord::KRecord( TQStringList chanList, TQPtrList<RecTimer> *t, TQWidget *paren
 	TQLabel *lab = new TQLabel( i18n("Timers list:"), this );
 	vb->addWidget( lab );
 
-	list = new KListView( this );
+	list = new TDEListView( this );
 	list->addColumn( "" );
 	list->addColumn( i18n( "Name" ) );
 	list->addColumn( i18n( "Channel" ) );
 	list->addColumn( i18n( "Begin" ) );
 	list->addColumn( i18n( "Duration" ) );
-	list->setResizePolicy( KListView::AutoOneFit );
+	list->setResizePolicy( TDEListView::AutoOneFit );
 	list->setAllColumnsShowFocus( true );
 	list->setFullWidth( true );
 	TQListViewItem * item = new TQListViewItem( list, 0 );
@@ -125,7 +125,7 @@ void KRecord::refresh()
 		else s = "";
 		s = s+ti->name;*/
 		s = ti->name;
-		itt = new KListViewItem( (TQListView*)list, "", s, ti->channel, TDEGlobal::locale()->formatDateTime( ti->begin ), ti->duration.toString("hh:mm") );
+		itt = new TDEListViewItem( (TQListView*)list, "", s, ti->channel, TDEGlobal::locale()->formatDateTime( ti->begin ), ti->duration.toString("hh:mm") );
 		if ( ti->mode )
 			itt->setPixmap( 0, yesRepeat );
 		if ( ti->running )
@@ -150,7 +150,7 @@ void KRecord::newTimer()
 	if ( ret==KTimerEditor::Accepted ) {
 		*t = dlg.timer;
 		after = where( t, true );
-		itt = new KListViewItem( (TQListView*)list, "", t->name, t->channel, TDEGlobal::locale()->formatDateTime( t->begin ), t->duration.toString("hh:mm") );
+		itt = new TDEListViewItem( (TQListView*)list, "", t->name, t->channel, TDEGlobal::locale()->formatDateTime( t->begin ), t->duration.toString("hh:mm") );
 		if ( t->mode )
 			itt->setPixmap( 0, yesRepeat );
 		if ( t->running )
diff --git a/kaffeine/src/input/dvb/krecord.h b/kaffeine/src/input/dvb/krecord.h
index 5e21691..eb6e895 100644
--- a/kaffeine/src/input/dvb/krecord.h
+++ b/kaffeine/src/input/dvb/krecord.h
@@ -57,7 +57,7 @@ private:
 	TQListViewItem* where( RecTimer *rt, bool add=false );
 
 	KPushButton *newBtn, *editBtn, *deleteBtn, *okBtn;
-	KListView *list;
+	TDEListView *list;
 	TQPtrList<RecTimer> *timers;
 	TQPixmap isRecording, yesRepeat;
 
diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
index 20c7d85..be0b5fb 100644
--- a/kaffeine/src/kaffeine.cpp
+++ b/kaffeine/src/kaffeine.cpp
@@ -251,7 +251,7 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
 
 	connect( &m_numKeyHideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotRequestForTrackNumber()) );
 
-	KAccel* accel = new KAccel(this);
+	TDEAccel* accel = new TDEAccel(this);
 	accel->insert("Escape Fullscreen", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotEscapeFullscreen()));
 
 	loadConfig();
@@ -664,25 +664,25 @@ void Kaffeine::setupActions()
 {
 	/* file menu */
 	KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), actionCollection(), "file_open");
-	new KAction(i18n("Open &URL..."), "www", CTRL|Key_U, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()), actionCollection(), "file_open_url");
-	new KAction(i18n("Open D&irectory..."), "folder_video", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenDirectory()), actionCollection(), "file_open_directory");
+	new TDEAction(i18n("Open &URL..."), "www", CTRL|Key_U, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()), actionCollection(), "file_open_url");
+	new TDEAction(i18n("Open D&irectory..."), "folder_video", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenDirectory()), actionCollection(), "file_open_directory");
 	m_recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotPlayRecent(const KURL&)), actionCollection(), "file_open_recent");
-	m_sleepAfterPlay = new KToggleAction(i18n("Quit && Shutoff Monitor After This Track"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSleepAfterPlayMenu()), actionCollection(), "sleep_after_play");
-	m_quitAfterPlay = new KToggleAction(i18n("Quit After This Track"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotQuitAfterPlayMenu()), actionCollection(), "quit_after_play");
-	m_quitAfterPlaylist = new KToggleAction(i18n("Quit After Playlist"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotQuitAfterPlaylistMenu()), actionCollection(), "quit_after_playlist");
+	m_sleepAfterPlay = new TDEToggleAction(i18n("Quit && Shutoff Monitor After This Track"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSleepAfterPlayMenu()), actionCollection(), "sleep_after_play");
+	m_quitAfterPlay = new TDEToggleAction(i18n("Quit After This Track"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotQuitAfterPlayMenu()), actionCollection(), "quit_after_play");
+	m_quitAfterPlaylist = new TDEToggleAction(i18n("Quit After Playlist"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotQuitAfterPlaylistMenu()), actionCollection(), "quit_after_playlist");
 	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
 
 	/*view menu */
 	m_fullscreen = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotToggleFullscreen()), actionCollection(), this, "view_fullscreen");
-	m_minimal = new KToggleAction(i18n("&Minimal Mode"), 0, Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotToggleMinimalMode()), actionCollection(), "view_minimal");
-	new KAction(i18n("Toggle &Playlist/Player"), 0, Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotTogglePlaylist()), actionCollection(), "view_toggle_tab");
-	m_originalAspect = new KToggleAction(i18n("Keep &Original Aspect"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOriginalAspect()), actionCollection(), "view_original_aspect");
-	m_autoResizeOff = new KToggleAction(i18n("Off"), 0, ALT|Key_0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoresizeOff()), actionCollection(), "view_auto_resize_off");
-	m_autoResizeOriginal = new KToggleAction(i18n("Original Size"), 0, ALT|Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotAutoresizeOriginal()), actionCollection(), "view_auto_resize_original");
-	m_autoResizeDouble = new KToggleAction(i18n("Double Size"), 0, ALT|Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotAutoresizeDouble()), actionCollection(), "view_auto_resize_double");
-	m_autoResizeTriple = new KToggleAction(i18n("Triple Size"), 0, ALT|Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotAutoresizeTriple()), actionCollection(), "view_auto_resize_triple");
-
-	m_playersMenu = new KActionMenu(i18n("&Player Engine"), actionCollection(), "options_player");
+	m_minimal = new TDEToggleAction(i18n("&Minimal Mode"), 0, Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotToggleMinimalMode()), actionCollection(), "view_minimal");
+	new TDEAction(i18n("Toggle &Playlist/Player"), 0, Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotTogglePlaylist()), actionCollection(), "view_toggle_tab");
+	m_originalAspect = new TDEToggleAction(i18n("Keep &Original Aspect"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOriginalAspect()), actionCollection(), "view_original_aspect");
+	m_autoResizeOff = new TDEToggleAction(i18n("Off"), 0, ALT|Key_0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoresizeOff()), actionCollection(), "view_auto_resize_off");
+	m_autoResizeOriginal = new TDEToggleAction(i18n("Original Size"), 0, ALT|Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotAutoresizeOriginal()), actionCollection(), "view_auto_resize_original");
+	m_autoResizeDouble = new TDEToggleAction(i18n("Double Size"), 0, ALT|Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotAutoresizeDouble()), actionCollection(), "view_auto_resize_double");
+	m_autoResizeTriple = new TDEToggleAction(i18n("Triple Size"), 0, ALT|Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotAutoresizeTriple()), actionCollection(), "view_auto_resize_triple");
+
+	m_playersMenu = new TDEActionMenu(i18n("&Player Engine"), actionCollection(), "options_player");
 	KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
 	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 	KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection(), "options_preferences");
@@ -690,7 +690,7 @@ void Kaffeine::setupActions()
 	/* fill players action menu */
 	TQSignalMapper* mapper = new TQSignalMapper(TQT_TQOBJECT(this));
 	connect(mapper, TQT_SIGNAL(mapped(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotLoadPart(const TQString&)));
-	KAction* action = NULL;
+	TDEAction* action = NULL;
 	TQStringList mediaParts;
 
 	// check for kaffeine parts
@@ -700,7 +700,7 @@ void Kaffeine::setupActions()
 	{
 		KService::Ptr ptr = (*it);
 
-		action = new KAction(ptr->name(), ptr->icon(), 0, mapper, TQT_SLOT(map()), actionCollection());
+		action = new TDEAction(ptr->name(), ptr->icon(), 0, mapper, TQT_SLOT(map()), actionCollection());
 		if (!ptr->comment().isNull())
 			action->setToolTip(ptr->comment());
 		mapper->setMapping(action, ptr->desktopEntryName());
@@ -1294,7 +1294,7 @@ void Kaffeine::mouseMoveEvent(TQMouseEvent* mev)
 void Kaffeine::resizeEvent(TQResizeEvent* rev)
 {
 	/* FIXME: don't really work proper... */
-	KMainWindow::resizeEvent(rev);
+	TDEMainWindow::resizeEvent(rev);
 	if ((!m_noResize) && (!m_fullscreen->isChecked()) && (m_originalAspect->isChecked())
 	        && (m_videoSize.height() != 0) && (m_videoSize.width() != 0))
 	{
diff --git a/kaffeine/src/kaffeine.h b/kaffeine/src/kaffeine.h
index 9594f78..f7d6e4d 100644
--- a/kaffeine/src/kaffeine.h
+++ b/kaffeine/src/kaffeine.h
@@ -34,11 +34,11 @@
 
 #include "kaffeineiface.h"
 
-class KActionMenu;
+class TDEActionMenu;
 class KCmdLineOptions;
-class KRecentFilesAction;
-class KToggleAction;
-class KToggleFullScreenAction;
+class TDERecentFilesAction;
+class TDEToggleAction;
+class TDEToggleFullScreenAction;
 
 class CdWidget;
 class Disc;
@@ -53,7 +53,7 @@ class SystemTray;
 
 extern const KCmdLineOptions cmdLineOptions[];
 
-class Kaffeine : public KMainWindow, private KaffeineIface
+class Kaffeine : public TDEMainWindow, private KaffeineIface
 {
 	Q_OBJECT
   
@@ -249,19 +249,19 @@ private:
 	TQString m_filter;
 	TQStringList m_engineParameters;
 
-	KRecentFilesAction* m_recent;
-	KToggleFullScreenAction* m_fullscreen;
-	KToggleAction* m_minimal;
-	KToggleAction* m_autoResizeOff;
-	KToggleAction* m_autoResizeOriginal;
-	KToggleAction* m_autoResizeDouble;
-	KToggleAction* m_autoResizeTriple;
-	KToggleAction* m_originalAspect;
-	KToggleAction* m_toggleLayout;
-	KActionMenu* m_playersMenu;
-	KToggleAction* m_sleepAfterPlay;
-	KToggleAction* m_quitAfterPlay;
-	KToggleAction* m_quitAfterPlaylist;
+	TDERecentFilesAction* m_recent;
+	TDEToggleFullScreenAction* m_fullscreen;
+	TDEToggleAction* m_minimal;
+	TDEToggleAction* m_autoResizeOff;
+	TDEToggleAction* m_autoResizeOriginal;
+	TDEToggleAction* m_autoResizeDouble;
+	TDEToggleAction* m_autoResizeTriple;
+	TDEToggleAction* m_originalAspect;
+	TDEToggleAction* m_toggleLayout;
+	TDEActionMenu* m_playersMenu;
+	TDEToggleAction* m_sleepAfterPlay;
+	TDEToggleAction* m_quitAfterPlay;
+	TDEToggleAction* m_quitAfterPlaylist;
 	bool m_statusBarVisible;
 
 	TQTimer m_screensaverTimer;
diff --git a/kaffeine/src/player-parts/dummy-part/dummy_part.cpp b/kaffeine/src/player-parts/dummy-part/dummy_part.cpp
index c22b20e..ec933ea 100644
--- a/kaffeine/src/player-parts/dummy-part/dummy_part.cpp
+++ b/kaffeine/src/player-parts/dummy-part/dummy_part.cpp
@@ -114,7 +114,7 @@ void DummyPart::slotMute()
 
 void DummyPart::initActions()
 {
-  new KAction(i18n("Play"), "player_play", 0, this, TQT_SLOT(slotPlay()), actionCollection(), "player_play");
-  new KAction(i18n("Pause"), "player_pause", Key_Space, this, TQT_SLOT(slotTogglePause()), actionCollection(), "player_pause");
-  new KAction(i18n("Stop"), "player_stop", Key_Backspace, this, TQT_SLOT(slotStop()), actionCollection(), "player_stop");
+  new TDEAction(i18n("Play"), "player_play", 0, this, TQT_SLOT(slotPlay()), actionCollection(), "player_play");
+  new TDEAction(i18n("Pause"), "player_pause", Key_Space, this, TQT_SLOT(slotTogglePause()), actionCollection(), "player_pause");
+  new TDEAction(i18n("Stop"), "player_stop", Key_Backspace, this, TQT_SLOT(slotStop()), actionCollection(), "player_stop");
 }
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
index fe904fa..5084a3f 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
@@ -165,7 +165,7 @@ bool GStreamerPart::openURL(const MRL& mrl)
 
 	// FIXME: thats not the right place for that
 	if ( !m_posToolbar ) {
-		m_posToolbar = (KToolBar*)factory()->container( "gstPositionToolBar", this );
+		m_posToolbar = (TDEToolBar*)factory()->container( "gstPositionToolBar", this );
 		if ( m_posToolbar ) {
 			m_posToolbar->setItemAutoSized( m_posToolbar->idAt(0), true ); //set position slider to maximum width
 		}
@@ -641,7 +641,7 @@ void GStreamerPart::slotSetVisualPlugin( const TQString& name )
 void GStreamerPart::slotContextMenu( const TQPoint& pos )
 {
 	if (factory()) {
-		KPopupMenu *pop = (KPopupMenu*)factory()->container("context_menu", this);
+		TDEPopupMenu *pop = (TDEPopupMenu*)factory()->container("context_menu", this);
 		if ( pop )
 			pop->popup(pos);
 	}
@@ -692,31 +692,31 @@ void GStreamerPart::slotPrepareForFullscreen( bool fullscreen )
 
 void GStreamerPart::initActions()
 {
-	new KAction(i18n("Toggle Minimal Mode"), 0, 0, this, TQT_SIGNAL(signalToggleMinimalMode()), actionCollection(), "player_minimal_mode");
-	new KAction(i18n("Play"), "player_play", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlay()), actionCollection(), "player_play");
-	new KAction(i18n("Pause"), "player_pause", Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotTogglePause()), actionCollection(), "player_pause");
-	new KAction(i18n("Stop"), "player_stop", Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "player_stop");
-	new KAction(i18n("&Next"), "player_end", Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotNext()), actionCollection(), "player_next");
-	new KAction(i18n("&Previous"), "player_start", Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotPrevious()), actionCollection(), "player_previous");
+	new TDEAction(i18n("Toggle Minimal Mode"), 0, 0, this, TQT_SIGNAL(signalToggleMinimalMode()), actionCollection(), "player_minimal_mode");
+	new TDEAction(i18n("Play"), "player_play", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlay()), actionCollection(), "player_play");
+	new TDEAction(i18n("Pause"), "player_pause", Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotTogglePause()), actionCollection(), "player_pause");
+	new TDEAction(i18n("Stop"), "player_stop", Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "player_stop");
+	new TDEAction(i18n("&Next"), "player_end", Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotNext()), actionCollection(), "player_next");
+	new TDEAction(i18n("&Previous"), "player_start", Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotPrevious()), actionCollection(), "player_previous");
 
 	m_timer = new Timer();
 	new KWidgetAction(m_timer->getSlider(), i18n("Position"), 0, 0, 0, actionCollection(), "player_position");
 	new KWidgetAction((TQWidget*)m_timer->getLabel(), i18n("Playtime"), 0, 0, 0, actionCollection(), "player_playtime");
 
-	m_audioVisual = new KSelectAction(i18n("Audio &Visualization"), 0, actionCollection(), "audio_visual");
+	m_audioVisual = new TDESelectAction(i18n("Audio &Visualization"), 0, actionCollection(), "audio_visual");
 	connect(m_audioVisual, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotSetVisualPlugin(const TQString&)));
 	m_audioVisualPluginList.prepend("none");
 	m_audioVisual->setItems(m_audioVisualPluginList);
 	m_audioVisual->setCurrentItem(m_audioVisual->items().findIndex(m_visualPluginName));
 
-	new KAction(i18n("&Mute"), "player_mute", Key_U, TQT_TQOBJECT(this), TQT_SLOT(slotMute()), actionCollection(), "audio_mute");
-	new KAction(i18n("&Auto"), "viewmagfit", Key_F5, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioAuto()), actionCollection(), "aspect_auto");
-	new KAction(i18n("&4:3"), "viewmagfit", Key_F6, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatio4_3()), actionCollection(), "aspect_43");
-	new KAction(i18n("A&namorphic"), "viewmagfit", Key_F7, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioAnamorphic()), actionCollection(), "aspect_anamorphic");
-	new KAction(i18n("&DVB"), "viewmagfit", Key_F8, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioDVB()), actionCollection(), "aspect_dvb");
-	new KAction(i18n("&Square"), "viewmagfit", Key_F9, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioSquare()), actionCollection(), "aspect_square");
-	new KAction(i18n("&Video Settings"), "configure", Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotVideoSettings()), actionCollection(), "video_settings");
-	new KAction(i18n("Track &Info"), "info", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actionCollection(), "player_track_info");
+	new TDEAction(i18n("&Mute"), "player_mute", Key_U, TQT_TQOBJECT(this), TQT_SLOT(slotMute()), actionCollection(), "audio_mute");
+	new TDEAction(i18n("&Auto"), "viewmagfit", Key_F5, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioAuto()), actionCollection(), "aspect_auto");
+	new TDEAction(i18n("&4:3"), "viewmagfit", Key_F6, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatio4_3()), actionCollection(), "aspect_43");
+	new TDEAction(i18n("A&namorphic"), "viewmagfit", Key_F7, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioAnamorphic()), actionCollection(), "aspect_anamorphic");
+	new TDEAction(i18n("&DVB"), "viewmagfit", Key_F8, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioDVB()), actionCollection(), "aspect_dvb");
+	new TDEAction(i18n("&Square"), "viewmagfit", Key_F9, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioSquare()), actionCollection(), "aspect_square");
+	new TDEAction(i18n("&Video Settings"), "configure", Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotVideoSettings()), actionCollection(), "video_settings");
+	new TDEAction(i18n("Track &Info"), "info", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actionCollection(), "player_track_info");
 
 	m_volume = new TQSlider(Qt::Horizontal, 0);
 	TQToolTip::add(m_volume, i18n("Volume"));
@@ -726,7 +726,7 @@ void GStreamerPart::initActions()
 	connect(m_volume, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotVolume(int)));
 	slotSetVolume(m_savedVolume);
 	new KWidgetAction(m_volume, i18n("Volume"), 0, 0, 0, actionCollection(), "audio_volume");
-	new KAction(i18n("&GStreamer Engine Parameters"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigDialog()), actionCollection(), "settings_gst_parameter");
+	new TDEAction(i18n("&GStreamer Engine Parameters"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigDialog()), actionCollection(), "settings_gst_parameter");
 
 	connect(m_video, TQT_SIGNAL(signalRightClick(const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(const TQPoint&)));
 }
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h
index 7268774..65afe5a 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h
@@ -115,7 +115,7 @@ private:
 	VideoSettings* m_videoSettings;
 	GStreamerConfig* m_gstConfig;
 	TQSlider* m_volume;
-	KSelectAction* m_audioVisual;
+	TDESelectAction* m_audioVisual;
 
 	MRL m_mrl;
 	TQValueList<MRL> m_playlist;
@@ -149,7 +149,7 @@ private:
 	int m_savedVolume;
 	int muteVolume;
 
-	KToolBar* m_posToolbar;
+	TDEToolBar* m_posToolbar;
 };
 
 #endif /* GSTREAMER_PART_H */
diff --git a/kaffeine/src/player-parts/xine-part/README b/kaffeine/src/player-parts/xine-part/README
index b97bb38..ce98613 100644
--- a/kaffeine/src/player-parts/xine-part/README
+++ b/kaffeine/src/player-parts/xine-part/README
@@ -36,7 +36,7 @@ class MyPlayer : public MainWindow
 
 #include <kaffeine/xine_part.h>
 
-MyPlayer::MyPlayer() : KMainWindow(0)
+MyPlayer::MyPlayer() : TDEMainWindow(0)
 {
   initMyActions();
   createGUI();
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
index 9712279..43f2a1e 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
@@ -1155,7 +1155,7 @@ void XinePart::slotContextMenu(const TQPoint& pos)
 {
 	if (factory())
 	{
-		KPopupMenu *pop = (KPopupMenu*)factory()->container("context_menu", this);
+		TDEPopupMenu *pop = (TDEPopupMenu*)factory()->container("context_menu", this);
 		if (pop)
 			pop->popup(pos);
 	}
@@ -1249,7 +1249,7 @@ void XinePart::slotFinalize()
 {
 	if (factory())
 	{
-		KToolBar *pos = (KToolBar*)factory()->container("positionToolBar", this);
+		TDEToolBar *pos = (TDEToolBar*)factory()->container("positionToolBar", this);
 		if (pos)
 		{
 			// pos->alignItemRight(pos->idAt(1), true); //align time widget right
@@ -1261,8 +1261,8 @@ void XinePart::slotFinalize()
 	else
 	{
 		kdDebug() << "XinePart: no xmlguifactory, will create a simple context menu..." << endl;
-		KAction* action = NULL;
-		m_embeddedContext = new KPopupMenu(0);
+		TDEAction* action = NULL;
+		m_embeddedContext = new TDEPopupMenu(0);
 		m_embeddedContext->insertTitle(instance()->iconLoader()->loadIcon("kaffeine", KIcon::Small), i18n("Kaffeine Player"));
 		actionCollection()->action("player_play")->plug(m_embeddedContext);
 		actionCollection()->action("player_pause")->plug(m_embeddedContext);
@@ -1276,9 +1276,9 @@ void XinePart::slotFinalize()
 		actionCollection()->action("file_save_screenshot")->plug(m_embeddedContext);
 		actionCollection()->action("file_save_stream")->plug(m_embeddedContext);
 		m_embeddedContext->insertSeparator();
-		action = new KAction(i18n("Copy URL to Clipboard"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyToClipboard()), actionCollection(), "copy_to_clipboard");
+		action = new TDEAction(i18n("Copy URL to Clipboard"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyToClipboard()), actionCollection(), "copy_to_clipboard");
 		action->plug(m_embeddedContext);
-		action = new KAction(i18n("Play in Kaffeine Externally"), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(slotLaunchExternally()), actionCollection(), "play_externally");
+		action = new TDEAction(i18n("Play in Kaffeine Externally"), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(slotLaunchExternally()), actionCollection(), "play_externally");
 		action->plug(m_embeddedContext);
 	}
 
@@ -1317,100 +1317,100 @@ void XinePart::slotLaunchDelayed()
 
 void XinePart::initActions()
 {
-	KAction* action = NULL;
+	TDEAction* action = NULL;
 	/* file menu */
-	m_broadcastSend = new KToggleAction(i18n("&Send Broadcast Stream..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleBroadcastSend()), actionCollection(), "network_send");
-	new KAction(i18n("&Receive Broadcast Stream..."), "network", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBroadcastReceive()), actionCollection(), "network_receive");
-	new KAction(i18n("&Save Screenshot..."), "frame_image", CTRL|Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotScreenshot()), actionCollection(), "file_save_screenshot");
-	action = new KAction(i18n("Save Stream..."), "player_record", Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotSaveStream()), actionCollection(), "file_save_stream");
+	m_broadcastSend = new TDEToggleAction(i18n("&Send Broadcast Stream..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleBroadcastSend()), actionCollection(), "network_send");
+	new TDEAction(i18n("&Receive Broadcast Stream..."), "network", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBroadcastReceive()), actionCollection(), "network_receive");
+	new TDEAction(i18n("&Save Screenshot..."), "frame_image", CTRL|Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotScreenshot()), actionCollection(), "file_save_screenshot");
+	action = new TDEAction(i18n("Save Stream..."), "player_record", Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotSaveStream()), actionCollection(), "file_save_stream");
 	action->setWhatsThis(i18n("Saves current stream to harddisc. This feature was disabled for some formats (e.g. Real Media) to prevent potential legal problems."));
 
 	/* player menu */
 
-	new KAction(i18n("Toggle Minimal Mode"), 0, 0, this, TQT_SIGNAL(signalToggleMinimalMode()), actionCollection(), "player_minimal_mode");
+	new TDEAction(i18n("Toggle Minimal Mode"), 0, 0, this, TQT_SIGNAL(signalToggleMinimalMode()), actionCollection(), "player_minimal_mode");
 
-	new KAction(i18n("Play"), "player_play", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlay()), actionCollection(), "player_play");
-	m_pauseButton = new KToggleAction(i18n("Pause"), "player_pause", Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotTogglePause()), actionCollection(), "player_pause");
-	new KAction(i18n("&Next"), "player_end", Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotNext()), actionCollection(), "player_next");
-	new KAction(i18n("&Previous"), "player_start", Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotPrevious()), actionCollection(), "player_previous");
-	new KAction(i18n("Stop"), "player_stop", Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "player_stop");
+	new TDEAction(i18n("Play"), "player_play", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlay()), actionCollection(), "player_play");
+	m_pauseButton = new TDEToggleAction(i18n("Pause"), "player_pause", Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotTogglePause()), actionCollection(), "player_pause");
+	new TDEAction(i18n("&Next"), "player_end", Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotNext()), actionCollection(), "player_next");
+	new TDEAction(i18n("&Previous"), "player_start", Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotPrevious()), actionCollection(), "player_previous");
+	new TDEAction(i18n("Stop"), "player_stop", Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "player_stop");
 
-	new KAction(i18n("&Fast Forward"), "player_fwd", ALT|Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotFastForward()), actionCollection(), "player_ff");
-	new KAction(i18n("Slow &Motion"), 0, ALT|Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotSlowMotion()), actionCollection(), "player_slowmotion");
+	new TDEAction(i18n("&Fast Forward"), "player_fwd", ALT|Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotFastForward()), actionCollection(), "player_ff");
+	new TDEAction(i18n("Slow &Motion"), 0, ALT|Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotSlowMotion()), actionCollection(), "player_slowmotion");
 
-	new KAction(i18n("Skip Forward (20s)"), NULL, Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotPosPlusSmall()), actionCollection(), "player_posplus_small");
-	new KAction(i18n("Skip Backward (20s)"), NULL, Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotPosMinusSmall()), actionCollection(), "player_posminus_small");
-	new KAction(i18n("Skip Forward (1m)"), NULL, CTRL|Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotPosPlusMedium()), actionCollection(), "player_posplus_medium");
-	new KAction(i18n("Skip Backward (1m)"), NULL, CTRL|Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotPosMinusMedium()), actionCollection(), "player_posminus_medium");
-	new KAction(i18n("Skip Forward (10m)"), NULL, ALT|Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotPosPlusLarge()), actionCollection(), "player_posplus_large");
-	new KAction(i18n("Skip Backward (10m)"), NULL, ALT|Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotPosMinusLarge()), actionCollection(), "player_posminus_large");
-	new KAction(i18n("Jump to Position..."), "goto", CTRL|Key_J, TQT_TQOBJECT(this), TQT_SLOT(slotJumpToPosition()), actionCollection(), "player_jump_to");
+	new TDEAction(i18n("Skip Forward (20s)"), NULL, Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotPosPlusSmall()), actionCollection(), "player_posplus_small");
+	new TDEAction(i18n("Skip Backward (20s)"), NULL, Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotPosMinusSmall()), actionCollection(), "player_posminus_small");
+	new TDEAction(i18n("Skip Forward (1m)"), NULL, CTRL|Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotPosPlusMedium()), actionCollection(), "player_posplus_medium");
+	new TDEAction(i18n("Skip Backward (1m)"), NULL, CTRL|Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotPosMinusMedium()), actionCollection(), "player_posminus_medium");
+	new TDEAction(i18n("Skip Forward (10m)"), NULL, ALT|Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotPosPlusLarge()), actionCollection(), "player_posplus_large");
+	new TDEAction(i18n("Skip Backward (10m)"), NULL, ALT|Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotPosMinusLarge()), actionCollection(), "player_posminus_large");
+	new TDEAction(i18n("Jump to Position..."), "goto", CTRL|Key_J, TQT_TQOBJECT(this), TQT_SLOT(slotJumpToPosition()), actionCollection(), "player_jump_to");
 
-	new KAction(i18n("DVD Menu Left"), 0, CTRL|Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuLeft()), actionCollection(), "dvdmenuleft");
-	new KAction(i18n("DVD Menu Right"), 0, CTRL|Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuRight()), actionCollection(), "dvdmenuright");
-	new KAction(i18n("DVD Menu Up"), 0, CTRL|Key_Up, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuUp()), actionCollection(), "dvdmenuup");
-	new KAction(i18n("DVD Menu Down"), 0, CTRL|Key_Down, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuDown()), actionCollection(), "dvdmenudown");
-	new KAction(i18n("DVD Menu Select"), 0, CTRL|Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuSelect()), actionCollection(), "dvdmenuselect");
+	new TDEAction(i18n("DVD Menu Left"), 0, CTRL|Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuLeft()), actionCollection(), "dvdmenuleft");
+	new TDEAction(i18n("DVD Menu Right"), 0, CTRL|Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuRight()), actionCollection(), "dvdmenuright");
+	new TDEAction(i18n("DVD Menu Up"), 0, CTRL|Key_Up, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuUp()), actionCollection(), "dvdmenuup");
+	new TDEAction(i18n("DVD Menu Down"), 0, CTRL|Key_Down, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuDown()), actionCollection(), "dvdmenudown");
+	new TDEAction(i18n("DVD Menu Select"), 0, CTRL|Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotDVDMenuSelect()), actionCollection(), "dvdmenuselect");
 
-	m_audioChannels = new KSelectAction(i18n("Audio Channel"), 0, actionCollection(), "audio_channels");
+	m_audioChannels = new TDESelectAction(i18n("Audio Channel"), 0, actionCollection(), "audio_channels");
 	m_audioChannels->setToolTip(i18n("Select audio channel"));
 	m_audioChannels->setComboWidth( 50 );
 	connect(m_audioChannels, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetAudioChannel(int )));
-	new KAction(i18n("&Next Audio Channel"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotNextAudioChannel()), actionCollection(), "next_audio_channels");
-	m_audioVisual = new KSelectAction(i18n("Audio &Visualization"), 0, actionCollection(), "audio_visualization");
+	new TDEAction(i18n("&Next Audio Channel"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotNextAudioChannel()), actionCollection(), "next_audio_channels");
+	m_audioVisual = new TDESelectAction(i18n("Audio &Visualization"), 0, actionCollection(), "audio_visualization");
 	connect(m_audioVisual, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(m_xine), TQT_SLOT(slotSetVisualPlugin(const TQString&)));
-	new KAction(i18n("&Mute"), "player_mute", Key_U, TQT_TQOBJECT(this), TQT_SLOT(slotMute()), actionCollection(), "audio_mute");
-	new KAction(i18n("Volume Up"), NULL, Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotVolumeUp()), actionCollection(), "volume_increase");
-	new KAction(i18n("Volume Down"), NULL, Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotVolumeDown()), actionCollection(), "volume_decrease");
+	new TDEAction(i18n("&Mute"), "player_mute", Key_U, TQT_TQOBJECT(this), TQT_SLOT(slotMute()), actionCollection(), "audio_mute");
+	new TDEAction(i18n("Volume Up"), NULL, Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotVolumeUp()), actionCollection(), "volume_increase");
+	new TDEAction(i18n("Volume Down"), NULL, Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotVolumeDown()), actionCollection(), "volume_decrease");
 
-	m_deinterlaceEnabled = new KToggleAction(i18n("&Deinterlace"), 0, Key_I, TQT_TQOBJECT(m_xine), TQT_SLOT(slotToggleDeinterlace()), actionCollection(), "video_deinterlace");
+	m_deinterlaceEnabled = new TDEToggleAction(i18n("&Deinterlace"), 0, Key_I, TQT_TQOBJECT(m_xine), TQT_SLOT(slotToggleDeinterlace()), actionCollection(), "video_deinterlace");
 	m_deinterlaceEnabled->setWhatsThis(i18n("Activate this for interlaced streams, some DVD's for example."));
-	new KAction(i18n("&Auto"), "viewmagfit", Key_F5, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatioAuto()), actionCollection(), "aspect_auto");
-	new KAction(i18n("&4:3"), "viewmagfit", Key_F6, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatio4_3()), actionCollection(), "aspect_43");
-	new KAction(i18n("A&namorphic"), "viewmagfit", Key_F7, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatioAnamorphic()), actionCollection(), "aspect_anamorphic");
-	new KAction(i18n("&DVB"), "viewmagfit", Key_F8, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatioDVB()), actionCollection(), "aspect_dvb");
-	new KAction(i18n("&Square"), "viewmagfit", Key_F9, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatioSquare()), actionCollection(), "aspect_square");
+	new TDEAction(i18n("&Auto"), "viewmagfit", Key_F5, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatioAuto()), actionCollection(), "aspect_auto");
+	new TDEAction(i18n("&4:3"), "viewmagfit", Key_F6, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatio4_3()), actionCollection(), "aspect_43");
+	new TDEAction(i18n("A&namorphic"), "viewmagfit", Key_F7, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatioAnamorphic()), actionCollection(), "aspect_anamorphic");
+	new TDEAction(i18n("&DVB"), "viewmagfit", Key_F8, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatioDVB()), actionCollection(), "aspect_dvb");
+	new TDEAction(i18n("&Square"), "viewmagfit", Key_F9, TQT_TQOBJECT(m_xine), TQT_SLOT(slotAspectRatioSquare()), actionCollection(), "aspect_square");
 	KStdAction::zoomIn(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in");
 	KStdAction::zoomOut(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out");
 	KStdAction::fitToPage(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOff()), actionCollection(), "zoom_off");
-	new KAction(i18n("Zoom In Horizontal"), NULL, CTRL|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInX()), actionCollection(), "zoom_in_x");
-	new KAction(i18n("Zoom Out Horizontal"), NULL, CTRL|SHIFT|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutX()), actionCollection(), "zoom_out_x");
-	new KAction(i18n("Zoom In Vertical"), NULL, CTRL|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInY()), actionCollection(), "zoom_in_y");
-	new KAction(i18n("Zoom Out Vertical"), NULL, CTRL|SHIFT|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutY()), actionCollection(), "zoom_out_y");
-	new KAction(i18n("Deinterlace &Quality"), "blend", CTRL|Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotDeinterlaceQuality()), actionCollection(), "video_deinterlace_quality");
-	new KAction(i18n("&Video Settings"), "configure", Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotPictureSettings()), actionCollection(), "video_picture");
-	new KAction(i18n("&Equalizer"), NULL, Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotEqualizer()), actionCollection(), "equalizer");
+	new TDEAction(i18n("Zoom In Horizontal"), NULL, CTRL|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInX()), actionCollection(), "zoom_in_x");
+	new TDEAction(i18n("Zoom Out Horizontal"), NULL, CTRL|SHIFT|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutX()), actionCollection(), "zoom_out_x");
+	new TDEAction(i18n("Zoom In Vertical"), NULL, CTRL|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInY()), actionCollection(), "zoom_in_y");
+	new TDEAction(i18n("Zoom Out Vertical"), NULL, CTRL|SHIFT|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutY()), actionCollection(), "zoom_out_y");
+	new TDEAction(i18n("Deinterlace &Quality"), "blend", CTRL|Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotDeinterlaceQuality()), actionCollection(), "video_deinterlace_quality");
+	new TDEAction(i18n("&Video Settings"), "configure", Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotPictureSettings()), actionCollection(), "video_picture");
+	new TDEAction(i18n("&Equalizer"), NULL, Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotEqualizer()), actionCollection(), "equalizer");
 
 
-	m_subtitles = new KSelectAction(i18n("Subtitle"), 0, actionCollection(), "player_subtitles");
+	m_subtitles = new TDESelectAction(i18n("Subtitle"), 0, actionCollection(), "player_subtitles");
 	m_subtitles->setToolTip(i18n("Select Subtitle"));
 	m_subtitles->setComboWidth( 50 );
 	connect(m_subtitles, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetSubtitle(int)));
-	new KAction(i18n("&Next Subtitle Channel"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotNextSubtitleChannel()), actionCollection(), "next_player_subtitles");
-	new KAction(i18n("Delay Subtitle"), 0, CTRL|ALT|Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotDelaySubTitle()), actionCollection(), "adv_sub");
-	new KAction(i18n("Advance Subtitle"), 0, CTRL|ALT|Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotAdvanceSubTitle()), actionCollection(), "delay_sub");
-	new KAction(i18n("Add subtitle..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSubtitle()), actionCollection(), "add_subtitle");
-
-	new KAction(i18n("&Menu Toggle"), "view_detailed", Key_D, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuToggle()), actionCollection(), "dvd_toggle");
-	new KAction(i18n("&Title"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuTitle()), actionCollection(), "dvd_title");
-	new KAction(i18n("&Root"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuRoot()), actionCollection(), "dvd_root");
-	new KAction(i18n("&Subpicture"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuSubpicture()), actionCollection(), "dvd_subpicture");
-	new KAction(i18n("&Audio"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuAudio()), actionCollection(), "dvd_audio");
-	new KAction(i18n("An&gle"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuAngle()), actionCollection(), "dvd_angle");
-	new KAction(i18n("&Part"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuPart()), actionCollection(), "dvd_part");
-
-	m_dvdTitles = new KSelectAction(i18n("Titles"), 0, actionCollection(), "dvd_title_menu");
+	new TDEAction(i18n("&Next Subtitle Channel"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotNextSubtitleChannel()), actionCollection(), "next_player_subtitles");
+	new TDEAction(i18n("Delay Subtitle"), 0, CTRL|ALT|Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotDelaySubTitle()), actionCollection(), "adv_sub");
+	new TDEAction(i18n("Advance Subtitle"), 0, CTRL|ALT|Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotAdvanceSubTitle()), actionCollection(), "delay_sub");
+	new TDEAction(i18n("Add subtitle..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSubtitle()), actionCollection(), "add_subtitle");
+
+	new TDEAction(i18n("&Menu Toggle"), "view_detailed", Key_D, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuToggle()), actionCollection(), "dvd_toggle");
+	new TDEAction(i18n("&Title"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuTitle()), actionCollection(), "dvd_title");
+	new TDEAction(i18n("&Root"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuRoot()), actionCollection(), "dvd_root");
+	new TDEAction(i18n("&Subpicture"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuSubpicture()), actionCollection(), "dvd_subpicture");
+	new TDEAction(i18n("&Audio"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuAudio()), actionCollection(), "dvd_audio");
+	new TDEAction(i18n("An&gle"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuAngle()), actionCollection(), "dvd_angle");
+	new TDEAction(i18n("&Part"), NULL, 0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotMenuPart()), actionCollection(), "dvd_part");
+
+	m_dvdTitles = new TDESelectAction(i18n("Titles"), 0, actionCollection(), "dvd_title_menu");
 	connect(m_dvdTitles, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotSetDVDTitle(const TQString&)));
-	m_dvdChapters = new KSelectAction(i18n("Chapters"), 0, actionCollection(), "dvd_chapter_menu");
+	m_dvdChapters = new TDESelectAction(i18n("Chapters"), 0, actionCollection(), "dvd_chapter_menu");
 	connect(m_dvdChapters, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotSetDVDChapter(const TQString&)));
-	m_dvdAngles = new KSelectAction(i18n("Angles"), 0, actionCollection(), "dvd_angle_menu");
+	m_dvdAngles = new TDESelectAction(i18n("Angles"), 0, actionCollection(), "dvd_angle_menu");
 	connect(m_dvdAngles, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotSetDVDAngle(const TQString&)));
 
-	new KAction(i18n("Track &Info"), "info", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actionCollection(), "player_track_info");
-	new KAction(i18n("Effect &Plugins..."), "filter", Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotFilterDialog()), actionCollection(), "player_post_filters");
+	new TDEAction(i18n("Track &Info"), "info", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actionCollection(), "player_track_info");
+	new TDEAction(i18n("Effect &Plugins..."), "filter", Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotFilterDialog()), actionCollection(), "player_post_filters");
 
 	/* settings menu */
-	new KAction(i18n("&xine Engine Parameters"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigXine()), actionCollection(), "settings_xine_parameter");
+	new TDEAction(i18n("&xine Engine Parameters"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigXine()), actionCollection(), "settings_xine_parameter");
 
 	m_volume = new VolumeSlider();
 	TQToolTip::add
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.h b/kaffeine/src/player-parts/xine-part/xine_part.h
index 68becc4..a4c212f 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.h
+++ b/kaffeine/src/player-parts/xine-part/xine_part.h
@@ -39,14 +39,14 @@ class TQPushButton;
 class MRL;
 class KXineWidget;
 class TQPoint;
-class KSelectAction;
-class KToggleAction;
+class TDESelectAction;
+class TDEToggleAction;
 class Equalizer;
 class VideoSettings;
 class FilterDialog;
 class PositionSlider;
 class KProgressDialog;
-class KPopupMenu;
+class TDEPopupMenu;
 
 /**
  * Kaffeine Part - xine based player part
@@ -223,15 +223,15 @@ private:
 	TQPushButton* m_playTime;
 	uint currentPosition;
 
-	KSelectAction* m_audioChannels;
-	KSelectAction* m_audioVisual;
-	KSelectAction* m_subtitles;
-	KSelectAction* m_dvdChapters;
-	KSelectAction* m_dvdTitles;
-	KSelectAction* m_dvdAngles;
-	KToggleAction* m_deinterlaceEnabled;
-	KToggleAction* m_broadcastSend;
-	KToggleAction* m_pauseButton;
+	TDESelectAction* m_audioChannels;
+	TDESelectAction* m_audioVisual;
+	TDESelectAction* m_subtitles;
+	TDESelectAction* m_dvdChapters;
+	TDESelectAction* m_dvdTitles;
+	TDESelectAction* m_dvdAngles;
+	TDEToggleAction* m_deinterlaceEnabled;
+	TDEToggleAction* m_broadcastSend;
+	TDEToggleAction* m_pauseButton;
 
 	KXineWidget* m_xine;
 	VideoSettings* m_pictureSettings;
@@ -239,7 +239,7 @@ private:
 	TQWidget* m_deinterlacerConfigWidget;
 	FilterDialog* m_filterDialog;
 
-	KPopupMenu* m_embeddedContext;
+	TDEPopupMenu* m_embeddedContext;
 
 	/*  dvb  */
 public:
diff --git a/kaffeine/src/systemtray.cpp b/kaffeine/src/systemtray.cpp
index 02a77a5..3aaafc9 100644
--- a/kaffeine/src/systemtray.cpp
+++ b/kaffeine/src/systemtray.cpp
@@ -57,11 +57,11 @@ SystemTray::SystemTray(TQWidget *parent, const char *name ) : KSystemTray(parent
 	kdDebug() << "SystemTray: Create System Tray" << endl;
 
 
-	KAction* play = new KAction(i18n("Play / Pause"), "player_play", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalPlay()), actionCollection(), "trayplay");
-	KAction* next = new KAction(i18n("&Next"), "next", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalNext()), actionCollection(), "traynext");
-	KAction* previous = new KAction(i18n("&Previous"), "previous", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevious()), actionCollection(), "trayprevious");
-	KAction* stop = new KAction(i18n("Stop"), "player_stop", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalStop()), actionCollection(), "traystop");
-	KAction* mute = new KAction(i18n("&Mute"), "player_mute", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalMute()), actionCollection(), "traymute");
+	TDEAction* play = new TDEAction(i18n("Play / Pause"), "player_play", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalPlay()), actionCollection(), "trayplay");
+	TDEAction* next = new TDEAction(i18n("&Next"), "next", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalNext()), actionCollection(), "traynext");
+	TDEAction* previous = new TDEAction(i18n("&Previous"), "previous", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevious()), actionCollection(), "trayprevious");
+	TDEAction* stop = new TDEAction(i18n("Stop"), "player_stop", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalStop()), actionCollection(), "traystop");
+	TDEAction* mute = new TDEAction(i18n("&Mute"), "player_mute", 0, TQT_TQOBJECT(this), TQT_SIGNAL(signalMute()), actionCollection(), "traymute");
 
 	play->plug(contextMenu());
 	next->plug(contextMenu());
diff --git a/kaffeine/src/tdemultitabbar.cpp b/kaffeine/src/tdemultitabbar.cpp
index 99799ea..16d769d 100644
--- a/kaffeine/src/tdemultitabbar.cpp
+++ b/kaffeine/src/tdemultitabbar.cpp
@@ -874,7 +874,7 @@ KMultiTabBar::~KMultiTabBar() {
 
 /*int KMultiTabBar::insertButton(TQPixmap pic,int id ,const TQString&)
 {
-  (new KToolbarButton(pic,id,m_internal))->show();
+  (new TDEToolbarButton(pic,id,m_internal))->show();
   return 0;
 }*/