Rename a number of classes to enhance compatibility with KDE4

44 files changed, 166 insertions, 166 deletions

diff --git a/noatun/FILES b/noatun/FILES
index 7f0c67d7..d3cb385a 100644
--- a/noatun/FILES
+++ b/noatun/FILES
@@ -2,7 +2,7 @@ cmodule: Each panel in the settings window
 controls: those widgets that appear in the toolbars TODOLATER
 downloader: unused broken class for getting files
 engine: the only class that communicates to aRts
-klistview_t: like a KListView, but with more functionality, especially DnD TODOSLOWLY
+klistview_t: like a TDEListView, but with more functionality, especially DnD TODOSLOWLY
 noatun: all the actions, makes toolbars, e.g., main window
 noatunpref: the main settings box (semi-unused) TODOLATER
 noatunview.cpp: The main view within the main view, which only contains the videoframe
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index 29478e7b..1f05502a 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -367,7 +367,7 @@ NoatunStdAction::PluginActionMenu *NoatunApp::pluginActionMenu()
 	return mPluginActionMenu;
 }
 
-KPopupMenu *NoatunApp::pluginMenu()
+TDEPopupMenu *NoatunApp::pluginMenu()
 {
 	if(!mPluginMenu)
 		mPluginMenu = pluginActionMenu()->popupMenu();
diff --git a/noatun/library/cmodule.h b/noatun/library/cmodule.h
index f7fbcd0d..52682084 100644
--- a/noatun/library/cmodule.h
+++ b/noatun/library/cmodule.h
@@ -5,7 +5,7 @@
 #include <klistview.h>
 #include "noatun/pref.h"
 
-class KListView;
+class TDEListView;
 class TQSplitter;
 class TQListViewItem;
 class NoatunLibraryInfo;
diff --git a/noatun/library/controls.cpp b/noatun/library/controls.cpp
index 4fbc0a19..4a6ca9a8 100644
--- a/noatun/library/controls.cpp
+++ b/noatun/library/controls.cpp
@@ -53,7 +53,7 @@ void L33tSlider::wheelEvent(TQWheelEvent *e)
 
 SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver,
                                  const char *member, TQObject* parent, const char* name )
-	: KAction( text, accel, parent, name )
+	: TDEAction( text, accel, parent, name )
 {
 	m_receiver = receiver;
 	m_member = member;
@@ -61,10 +61,10 @@ SliderAction::SliderAction(const TQString& text, int accel, const TQObject *rece
 
 int SliderAction::plug( TQWidget *w, int index )
 {
-	if (!w->inherits("KToolBar")) return -1;
+	if (!w->inherits("TDEToolBar")) return -1;
 
-	KToolBar *toolBar = (KToolBar *)w;
-	int id = KAction::getToolButtonID();
+	TDEToolBar *toolBar = (TDEToolBar *)w;
+	int id = TDEAction::getToolButtonID();
 	
 	//Create it.
 	m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar);
@@ -76,20 +76,20 @@ int SliderAction::plug( TQWidget *w, int index )
 	connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 	toolBar->setItemAutoSized( id, true );
 
-	if (w->inherits( "KToolBar" ))
-		connect(toolBar, TQT_SIGNAL(moved(KToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(KToolBar::BarPosition)));
+	if (w->inherits( "TDEToolBar" ))
+		connect(toolBar, TQT_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(TDEToolBar::BarPosition)));
 	
 	emit plugged();
 
 	return containerCount() - 1;
 }
 
-void SliderAction::toolbarMoved(KToolBar::BarPosition)
+void SliderAction::toolbarMoved(TDEToolBar::BarPosition)
 {
 // I wish this worked :)
 return;	
 /*
-	if (pos == KToolBar::Left || pos == KToolBar::Right)
+	if (pos == TDEToolBar::Left || pos == TDEToolBar::Right)
 	{
 		m_slider->setOrientationVertical);
 		m_slider->setFixedWidth(m_slider->height());
@@ -104,7 +104,7 @@ return;
 
 void SliderAction::unplug( TQWidget *w )
 {
-	KToolBar *toolBar = (KToolBar *)w;
+	TDEToolBar *toolBar = (TDEToolBar *)w;
 	int idx = findContainer( w );
 
 	toolBar->removeItem( menuId( idx ) );
diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp
index cd9e7d93..5d40e37e 100644
--- a/noatun/library/effectview.cpp
+++ b/noatun/library/effectview.cpp
@@ -56,7 +56,7 @@ private:
 };
 
 EffectList::EffectList(TQWidget *parent)
-	: KListView(parent)
+	: TDEListView(parent)
 {
 }
 
diff --git a/noatun/library/effectview.h b/noatun/library/effectview.h
index 718a2e82..5c45fa40 100644
--- a/noatun/library/effectview.h
+++ b/noatun/library/effectview.h
@@ -72,7 +72,7 @@ private:
 	EffectList *active;
 };
 
-class EffectList : public KListView
+class EffectList : public TDEListView
 {
 Q_OBJECT
   
diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp
index c243a349..69acf562 100644
--- a/noatun/library/equalizerview.cpp
+++ b/noatun/library/equalizerview.cpp
@@ -31,7 +31,7 @@
 // PresetList
 
 PresetList::PresetList(TQWidget *parent, const char *name)
-	: KListView(parent, name)
+	: TDEListView(parent, name)
 {
 	setItemsRenameable(true);
 	setRenameable(0, true);
@@ -55,7 +55,7 @@ void PresetList::rename(TQListViewItem *item, int c)
 	if (!TQFileInfo(item->text(1)).isWritable())
 		return;
 
-	KListView::rename(item, c);
+	TDEListView::rename(item, c);
 }
 
 ////////////////////////////////////////////////
@@ -143,7 +143,7 @@ void EqualizerView::show()
 		connect(mWidget->addPresetButton, TQT_SIGNAL(clicked()), TQT_SLOT(create()));
 		connect(mWidget->resetEqButton, TQT_SIGNAL(clicked()), TQT_SLOT(reset()));
 
-		new KListViewItem(mPresets, i18n("Custom"));
+		new TDEListViewItem(mPresets, i18n("Custom"));
 
 		connect(mPresets, TQT_SIGNAL(currentChanged(TQListViewItem*)),
 			this, TQT_SLOT(select(TQListViewItem*)));
@@ -250,7 +250,7 @@ void EqualizerView::created(VPreset p)
 	// store the filename in TQListViewItem::text(0)
 	TQString n = p.name();
 	TQString f = p.file();
-	new KListViewItem(mPresets, n, f);
+	new TDEListViewItem(mPresets, n, f);
 }
 
 void EqualizerView::renamed(VPreset p)
diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h
index 2c27b45e..ed495a23 100644
--- a/noatun/library/equalizerview.h
+++ b/noatun/library/equalizerview.h
@@ -34,7 +34,7 @@ private:
 };
 
 
-class PresetList : public KListView
+class PresetList : public TDEListView
 {
 Q_OBJECT
   
diff --git a/noatun/library/mimetypetree.cpp b/noatun/library/mimetypetree.cpp
index 0370b048..c89842d0 100644
--- a/noatun/library/mimetypetree.cpp
+++ b/noatun/library/mimetypetree.cpp
@@ -5,7 +5,7 @@
 
 
 MimeTypeTree::MimeTypeTree(TQWidget *parent)
-	: KListView(parent)
+	: TDEListView(parent)
 {
 	KMimeType::List list=KMimeType::allMimeTypes();
 	TQDict<TQListViewItem> map;
diff --git a/noatun/library/mimetypetree.h b/noatun/library/mimetypetree.h
index 42df2b72..67135c57 100644
--- a/noatun/library/mimetypetree.h
+++ b/noatun/library/mimetypetree.h
@@ -16,7 +16,7 @@
 
 #include <klistview.h>
 
-class MimeTypeTree : public KListView
+class MimeTypeTree : public TDEListView
 {
 Q_OBJECT
   
diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h
index e337ddd9..49ea0064 100644
--- a/noatun/library/noatun/app.h
+++ b/noatun/library/noatun/app.h
@@ -6,7 +6,7 @@
 class Playlist;
 class Player;
 class LibraryLoader;
-class KPopupMenu;
+class TDEPopupMenu;
 class NoatunPreferences;
 class Downloader;
 class Effects;
@@ -181,7 +181,7 @@ public: //options
 	void setDisplayRemaining(bool);
 
 	/**
-	 * To insert items use KActions and insert() them into pluginActionMenu().
+	 * To insert items use TDEActions and insert() them into pluginActionMenu().
 	 * @return pointer to the actionmenu
 	 */
 	NoatunStdAction::PluginActionMenu *pluginActionMenu();
@@ -207,7 +207,7 @@ public: //options
 	 * Use pluginActionMenu() instead
 	 * @return pointer to the plugin menu
 	 */
-	KPopupMenu *pluginMenu();
+	TDEPopupMenu *pluginMenu();
 
 protected:
 	virtual int newInstance();
@@ -246,7 +246,7 @@ private:
 private:
 	Player *mPlayer;
 	LibraryLoader *mLibraryLoader;
-	KPopupMenu *mPluginMenu;
+	TDEPopupMenu *mPluginMenu;
 	NoatunStdAction::PluginActionMenu *mPluginActionMenu;
 	Downloader *mDownloader;
 	struct Private;
diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h
index 3e5f00c4..dbe249ba 100644
--- a/noatun/library/noatun/controls.h
+++ b/noatun/library/noatun/controls.h
@@ -54,7 +54,7 @@ private:
  * @author Charles Samuels
  * @version 2.3
  **/
-class SliderAction : public KAction
+class SliderAction : public TDEAction
 {
 Q_OBJECT
   
@@ -69,7 +69,7 @@ signals:
 	void plugged();
 
 public slots:
-	void toolbarMoved(KToolBar::BarPosition pos);
+	void toolbarMoved(TDEToolBar::BarPosition pos);
 
 private:
 	TQGuardedPtr<TQSlider> m_slider;
diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h
index 9f9b639e..2a5ad401 100644
--- a/noatun/library/noatun/stdaction.h
+++ b/noatun/library/noatun/stdaction.h
@@ -4,7 +4,7 @@
 #include <kaction.h>
 #include <kactionclasses.h>
 #include <kdemacros.h>
-class KPopupMenu;
+class TDEPopupMenu;
 
 /**
  * Holds all noatun related actions
@@ -17,7 +17,7 @@ namespace NoatunStdAction
 /**
  * An action starting noatun playback
  **/
-class PlayAction : public KAction
+class PlayAction : public TDEAction
 {
 Q_OBJECT
   
@@ -31,7 +31,7 @@ private slots:
 /**
  * An action starting/stopping noatun playback
  **/
-class PlaylistAction : public KToggleAction
+class PlaylistAction : public TDEToggleAction
 {
 Q_OBJECT
   
@@ -46,7 +46,7 @@ private slots:
  * actionmenu that holds all plugin defined actions
  * @author Stefan Gehn
  */
-class PluginActionMenu : public KActionMenu
+class PluginActionMenu : public TDEActionMenu
 {
 Q_OBJECT
   
@@ -57,11 +57,11 @@ public:
 	 * @param action the action to insert
 	 * @param index defines the place where the action gets displayed in
 	 */
-	virtual void insert (KAction *action, int index=-1);
+	virtual void insert (TDEAction *action, int index=-1);
 	/**
 	 * removes the given @p action into the action-menu
 	 */
-	virtual void remove(KAction *action);
+	virtual void remove(TDEAction *action);
 	/**
 	 * Wrapper method for old Noatun API
 	 * <b>DON'T USE</b>
@@ -80,7 +80,7 @@ private:
  * actionmenu that holds all vis-plugins for easier enabling/disabling
  * @author Stefan Gehn
  */
-class VisActionMenu : public KActionMenu
+class VisActionMenu : public TDEActionMenu
 {
 Q_OBJECT
   
@@ -98,7 +98,7 @@ private:
  * actionmenu that holds all looping modes
  * @author Stefan Gehn
  */
-class LoopActionMenu : public KActionMenu
+class LoopActionMenu : public TDEActionMenu
 {
 Q_OBJECT
   
@@ -111,43 +111,43 @@ private slots:
 	void loopPlaylistSelected();
 	void loopRandomSelected();
 private:
-	KRadioAction *mLoopNone;
-	KRadioAction *mLoopSong;
-	KRadioAction *mLoopPlaylist;
-	KRadioAction *mLoopRandom;
+	TDERadioAction *mLoopNone;
+	TDERadioAction *mLoopSong;
+	TDERadioAction *mLoopPlaylist;
+	TDERadioAction *mLoopRandom;
 };
 
 
 /**
- * @return pointer to a KAction which opens the effects dialog on activation
+ * @return pointer to a TDEAction which opens the effects dialog on activation
  */
-KDE_EXPORT KAction *effects(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *effects(TQObject *parent = 0, const char *name = 0);
 
 /**
- * @return pointer to a KAction which opens the equalizer dialog on activation
+ * @return pointer to a TDEAction which opens the equalizer dialog on activation
  */
-KDE_EXPORT KAction *equalizer(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *equalizer(TQObject *parent = 0, const char *name = 0);
 
 /**
- * @return pointer to a KAction which goes back one track on activation
+ * @return pointer to a TDEAction which goes back one track on activation
  */
-KDE_EXPORT KAction *back(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *back(TQObject *parent = 0, const char *name = 0);
 /**
- * @return pointer to a KAction which stops playback on activation
+ * @return pointer to a TDEAction which stops playback on activation
  */
-KDE_EXPORT KAction *stop(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *stop(TQObject *parent = 0, const char *name = 0);
 /**
- * @return pointer to a KAction which starts/pauses playback on activation
+ * @return pointer to a TDEAction which starts/pauses playback on activation
  */
-KDE_EXPORT KAction *playpause(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *playpause(TQObject *parent = 0, const char *name = 0);
 /**
- * @return pointer to a KAction which advances one track on activation
+ * @return pointer to a TDEAction which advances one track on activation
  */
-KDE_EXPORT KAction *forward(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *forward(TQObject *parent = 0, const char *name = 0);
 /**
- * @return pointer to a KToggleAction which shows/hides the playlist
+ * @return pointer to a TDEToggleAction which shows/hides the playlist
  */
-KDE_EXPORT KToggleAction *playlist(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEToggleAction *playlist(TQObject *parent = 0, const char *name = 0);
 
 /**
  * loop action
@@ -157,12 +157,12 @@ KDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name);
 /**
  * play action
  */
-KDE_EXPORT KAction *play(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *play(TQObject *parent = 0, const char *name = 0);
 
 /**
  * pause action
  */
-KDE_EXPORT KAction *pause(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT TDEAction *pause(TQObject *parent = 0, const char *name = 0);
 
 /**
  * @return pointer to the global PluginActionMenu object (there is only one instance)
@@ -181,7 +181,7 @@ KDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name
 class KDE_EXPORT ContextMenu
 {
 public:
-	static KPopupMenu *createContextMenu(TQWidget *p);
+	static TDEPopupMenu *createContextMenu(TQWidget *p);
 
 	/**
 	 * One menu to show them all, One menu to find them
@@ -189,7 +189,7 @@ public:
 	 *
 	 * In the land of Noatun where the oceans die
 	 */
-	static KPopupMenu *contextMenu();
+	static TDEPopupMenu *contextMenu();
 
 	/**
 	 * Show the context menu at point
@@ -201,7 +201,7 @@ public:
 	 **/
 	static void showContextMenu();
 private:
-	static KPopupMenu *mContextMenu;
+	static TDEPopupMenu *mContextMenu;
 };
 
 }
diff --git a/noatun/library/noatun/stereobuttonaction.h b/noatun/library/noatun/stereobuttonaction.h
index 6e5312f9..d3bad3f9 100644
--- a/noatun/library/noatun/stereobuttonaction.h
+++ b/noatun/library/noatun/stereobuttonaction.h
@@ -10,7 +10,7 @@ namespace NoatunStdAction
  * No, I never owned StereoButtonAction, but I'm tired
  * and PlayAction is already taken.
  */
-class StereoButtonAction : public KAction
+class StereoButtonAction : public TDEAction
 {
 Q_OBJECT
   
diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp
index d37adefb..b99c8ef5 100644
--- a/noatun/library/noatunstdaction.cpp
+++ b/noatun/library/noatunstdaction.cpp
@@ -22,7 +22,7 @@ namespace NoatunStdAction
 {
 /////////////////////////////////////////////////////
 PlayAction::PlayAction(TQObject *parent, const char *name)
-	: KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name)
+	: TDEAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name)
 {
 	connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing()));
 	connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(notplaying()));
@@ -47,7 +47,7 @@ void PlayAction::notplaying()
 /////////////////////////////////////////////////////
 
 PlaylistAction::PlaylistAction(TQObject *parent, const char *name)
-	: KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name)
+	: TDEToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name)
 {
         setCheckedState(i18n("Hide Playlist"));
 	connect(napp->player(), TQT_SIGNAL(playlistShown()),  TQT_SLOT(shown()));
@@ -68,25 +68,25 @@ void PlaylistAction::hidden()
 ////////////////////////////////////////////////////
 
 PluginActionMenu::PluginActionMenu(TQObject *parent, const char *name)
-	: KActionMenu(i18n("&Actions"), parent, name)
+	: TDEActionMenu(i18n("&Actions"), parent, name)
 {
 // 	kdDebug(66666) << k_funcinfo << "called" << endl;
 	setEnabled(false);
 	mCount=0;
 }
 
-void PluginActionMenu::insert (KAction *action, int index)
+void PluginActionMenu::insert (TDEAction *action, int index)
 {
 // 	kdDebug(66666) << k_funcinfo << "called" << endl;
-	KActionMenu::insert(action,index);
+	TDEActionMenu::insert(action,index);
 	setEnabled(true);
 	mCount++;
 }
 
-void PluginActionMenu::remove(KAction *action)
+void PluginActionMenu::remove(TDEAction *action)
 {
 // 	kdDebug(66666) << k_funcinfo << "called" << endl;
-	KActionMenu::remove(action);
+	TDEActionMenu::remove(action);
 	mCount--;
 	if(mCount==0)
 		setEnabled(false);
@@ -112,7 +112,7 @@ void PluginActionMenu::menuRemove(int id)
 ////////////////////////////////////////////////////
 
 VisActionMenu::VisActionMenu(TQObject *parent, const char *name)
-	: KActionMenu(i18n("&Visualizations"), parent, name)
+	: TDEActionMenu(i18n("&Visualizations"), parent, name)
 {
 	connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup()));
 	connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(toggleVisPlugin(int)));
@@ -160,24 +160,24 @@ void VisActionMenu::toggleVisPlugin(int id)
 ////////////////////////////////////////////////////
 
 LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name)
-	: KActionMenu(i18n("&Loop"), parent, name)
+	: TDEActionMenu(i18n("&Loop"), parent, name)
 {
-	mLoopNone = new KRadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"),
+	mLoopNone = new TDERadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"),
 		0, TQT_TQOBJECT(this), TQT_SLOT(loopNoneSelected()), TQT_TQOBJECT(this), "loop_none");
 	mLoopNone->setExclusiveGroup("loopType");
 	insert(mLoopNone);
 
-	mLoopSong = new KRadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"),
+	mLoopSong = new TDERadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"),
 		0, TQT_TQOBJECT(this), TQT_SLOT(loopSongSelected()), TQT_TQOBJECT(this), "loop_song");
 	mLoopSong->setExclusiveGroup("loopType");
 	insert(mLoopSong);
 
-	mLoopPlaylist = new KRadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"),
+	mLoopPlaylist = new TDERadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"),
 		0, TQT_TQOBJECT(this), TQT_SLOT(loopPlaylistSelected()), TQT_TQOBJECT(this), "loop_playlist");
 	mLoopPlaylist->setExclusiveGroup("loopType");
 	insert(mLoopPlaylist);
 
-	mLoopRandom = new KRadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"),
+	mLoopRandom = new TDERadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"),
 		0, TQT_TQOBJECT(this), TQT_SLOT(loopRandomSelected()), TQT_TQOBJECT(this), "loop_random");
 	mLoopRandom->setExclusiveGroup("loopType");
 	insert(mLoopRandom);
@@ -232,27 +232,27 @@ void LoopActionMenu::loopRandomSelected()
 
 ////////////////////////////////////////////////////
 
-KAction *playpause(TQObject *parent, const char *name)
+TDEAction *playpause(TQObject *parent, const char *name)
 {
 	return new PlayAction(parent, name);
 }
 
-KAction *effects(TQObject *parent, const char *name)
+TDEAction *effects(TQObject *parent, const char *name)
 {
-	return new KAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), parent, name);
+	return new TDEAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), parent, name);
 }
 
-KAction *equalizer(TQObject *parent, const char *name)
+TDEAction *equalizer(TQObject *parent, const char *name)
 {
-	return new KAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), parent, name);
+	return new TDEAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), parent, name);
 }
 
-KAction *back(TQObject *parent, const char *name)
+TDEAction *back(TQObject *parent, const char *name)
 {
-	return new KAction(i18n("&Back"), "player_start", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), parent, name);
+	return new TDEAction(i18n("&Back"), "player_start", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), parent, name);
 }
 
-KAction *stop(TQObject *parent, const char *name)
+TDEAction *stop(TQObject *parent, const char *name)
 {
 	StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), parent, name);
 	TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
@@ -265,12 +265,12 @@ KAction *stop(TQObject *parent, const char *name)
 	return action;
 }
 
-KAction *forward(TQObject *parent, const char *name)
+TDEAction *forward(TQObject *parent, const char *name)
 {
-	return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), parent, name);
+	return new TDEAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), parent, name);
 }
 
-KAction *play(TQObject *parent, const char *name)
+TDEAction *play(TQObject *parent, const char *name)
 {
 	StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
 	TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(disable()));
@@ -283,7 +283,7 @@ KAction *play(TQObject *parent, const char *name)
 	return action;
 }
 
-KAction *pause(TQObject *parent, const char *name)
+TDEAction *pause(TQObject *parent, const char *name)
 {
 	StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
 	TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
@@ -312,26 +312,26 @@ VisActionMenu *visualizations(TQObject *parent, const char *name)
 	return new VisActionMenu(parent, name);
 }
 
-KToggleAction *playlist(TQObject *parent, const char *name)
+TDEToggleAction *playlist(TQObject *parent, const char *name)
 {
 	return new PlaylistAction(parent, name);
 }
 
-KPopupMenu *ContextMenu::mContextMenu = 0;
+TDEPopupMenu *ContextMenu::mContextMenu = 0;
 
-KPopupMenu *ContextMenu::contextMenu()
+TDEPopupMenu *ContextMenu::contextMenu()
 {
 	if(!mContextMenu) mContextMenu = createContextMenu(0);
 
 	return mContextMenu;
 }
 
-KPopupMenu *ContextMenu::createContextMenu(TQWidget *p)
+TDEPopupMenu *ContextMenu::createContextMenu(TQWidget *p)
 {
-	KPopupMenu *contextMenu = new KPopupMenu(p, "NoatunContextMenu");
+	TDEPopupMenu *contextMenu = new TDEPopupMenu(p, "NoatunContextMenu");
 
 	KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false);
-	KActionCollection* actions = new KActionCollection(helpmenu);
+	TDEActionCollection* actions = new TDEActionCollection(helpmenu);
 
 	KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actions)->plug(contextMenu);
 	KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actions)->plug(contextMenu);
diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp
index dd30111e..72f58c9b 100644
--- a/noatun/library/pluginmodule.cpp
+++ b/noatun/library/pluginmodule.cpp
@@ -69,7 +69,7 @@ void PluginListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int a, int
 }
 
 PluginListView::PluginListView(unsigned _min, unsigned _max, TQWidget *_parent, const char *_name)
-	: KListView(_parent, _name)
+	: TDEListView(_parent, _name)
 	, hasMaximum(true)
 	, max(_max)
 	, min(_min <= _max ? _min : _max)
@@ -78,7 +78,7 @@ PluginListView::PluginListView(unsigned _min, unsigned _max, TQWidget *_parent,
 }
 
 PluginListView::PluginListView(unsigned _min, TQWidget *_parent, const char *_name)
-	: KListView(_parent, _name)
+	: TDEListView(_parent, _name)
 	, hasMaximum(false)
 	, min(_min)
 	, count(0)
@@ -86,7 +86,7 @@ PluginListView::PluginListView(unsigned _min, TQWidget *_parent, const char *_na
 }
 
 PluginListView::PluginListView(TQWidget *_parent, const char *_name)
-	: KListView(_parent, _name)
+	: TDEListView(_parent, _name)
 	, hasMaximum(false)
 	, min(0)
 	, count(0)
@@ -96,7 +96,7 @@ PluginListView::PluginListView(TQWidget *_parent, const char *_name)
 void PluginListView::clear()
 {
 	count = 0;
-	KListView::clear();
+	TDEListView::clear();
 }
 
 void PluginListView::stateChanged(PluginListItem *item, bool b)
diff --git a/noatun/library/pluginmodule.h b/noatun/library/pluginmodule.h
index d29fe1d1..52113f62 100644
--- a/noatun/library/pluginmodule.h
+++ b/noatun/library/pluginmodule.h
@@ -48,7 +48,7 @@ private:
 	bool exclusive;
 };
 
-class PluginListView : public KListView
+class PluginListView : public TDEListView
 {
 Q_OBJECT
   
diff --git a/noatun/library/stereobuttonaction.cpp b/noatun/library/stereobuttonaction.cpp
index e8df0046..27011708 100644
--- a/noatun/library/stereobuttonaction.cpp
+++ b/noatun/library/stereobuttonaction.cpp
@@ -4,27 +4,27 @@ namespace NoatunStdAction
 {
 
 StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* parent, const char* name )
-	: KAction(text, accel, parent, name)
+	: TDEAction(text, accel, parent, name)
 {}
 
 StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name )
-	: KAction(text, accel, receiver, slot, parent, name)
+	: TDEAction(text, accel, receiver, slot, parent, name)
 {}
 
 StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* parent, const char* name )
-	: KAction(text, pix, accel, parent, name)
+	: TDEAction(text, pix, accel, parent, name)
 {}
 
 StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* parent, const char* name )
-	: KAction(text, pix, accel, parent, name)
+	: TDEAction(text, pix, accel, parent, name)
 {}
 
 StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name )
-	: KAction(text, pix, accel, receiver, slot, parent, name)
+	: TDEAction(text, pix, accel, receiver, slot, parent, name)
 {}
 
 StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name )
-	: KAction(text, pix, accel, receiver, slot, parent, name)
+	: TDEAction(text, pix, accel, receiver, slot, parent, name)
 {}
 
 void StereoButtonAction::disable(void)
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index f1f64a22..7d6c4bfd 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -62,7 +62,7 @@
 #include <tqvbox.h>
 
 Excellent::Excellent()
-	: KMainWindow(0, "NoatunExcellent")
+	: TDEMainWindow(0, "NoatunExcellent")
 	, UserInterface()
 {
 	setAcceptDrops(true);
@@ -82,7 +82,7 @@ Excellent::Excellent()
 	NoatunStdAction::forward(actionCollection(), "forward");
 	NoatunStdAction::playlist(actionCollection(), "show_playlist");
 
-	volumeAction = new KToggleAction(i18n("Show &Volume Control"), 0, TQT_TQOBJECT(this), TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
+	volumeAction = new TDEToggleAction(i18n("Show &Volume Control"), 0, TQT_TQOBJECT(this), TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
 	volumeAction->setCheckedState(i18n("Hide &Volume Control"));
 	NoatunStdAction::effects(actionCollection(), "effects");
 	NoatunStdAction::equalizer(actionCollection(), "equalizer");
@@ -210,7 +210,7 @@ void Excellent::showEvent(TQShowEvent *e)
 	config->writeEntry("mappingState", NET::Visible);
 	config->sync();
 
-	KMainWindow::showEvent(e);
+	TDEMainWindow::showEvent(e);
 }
 
 void Excellent::hideEvent(TQHideEvent *e)
@@ -220,7 +220,7 @@ void Excellent::hideEvent(TQHideEvent *e)
 	config->writeEntry("mappingState", NET::Withdrawn);
 	config->sync();
 
-	KMainWindow::hideEvent(e);
+	TDEMainWindow::hideEvent(e);
 }
 
 void Excellent::closeEvent(TQCloseEvent *)
diff --git a/noatun/modules/excellent/userinterface.h b/noatun/modules/excellent/userinterface.h
index 0cd172a6..c47f05f1 100644
--- a/noatun/modules/excellent/userinterface.h
+++ b/noatun/modules/excellent/userinterface.h
@@ -32,22 +32,22 @@
 #include <noatun/stdaction.h>
 #include <kmainwindow.h>
 
-class KAction;
-class KPopupMenu;
+class TDEAction;
+class TDEPopupMenu;
 class KStatusBar;
 class Player;
 class TQHBox;
 class TQLabel;
 class TQSlider;
 class L33tSlider;
-class KToggleAction;
+class TDEToggleAction;
 
 /**
  * @short Main window class
  * @author Neil Stevens <multivac@fcmail.com>
  * @author Charles Samuels <charles@kde.org>
  */
-class Excellent : public KMainWindow, public UserInterface
+class Excellent : public TDEMainWindow, public UserInterface
 {
 Q_OBJECT
   
@@ -94,7 +94,7 @@ private:
 
 	TQHBox *mainFrame;
 
-	KToggleAction *volumeAction, *menubarAction;
+	TDEToggleAction *volumeAction, *menubarAction;
 	L33tSlider *volumeSlider, *slider;
 	TQLabel *elapsed, *total;
 };
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index ab6c9194..27746b69 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -17,7 +17,7 @@ HTMLExport::HTMLExport(): TQObject(0, "HTMLExport"), Plugin()
 {
 	NOATUNPLUGINC(HTMLExport);
 
-	mAction = new KAction(i18n("&Export Playlist..."), "filesaveas", 0,
+	mAction = new TDEAction(i18n("&Export Playlist..."), "filesaveas", 0,
 		this, TQT_SLOT(slotExport()), this, "exportlist");
 	napp->pluginActionMenu()->insert(mAction);
 
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index 304092fb..0c3de125 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -29,7 +29,7 @@
 #include <noatun/pref.h>
 #include <noatun/plugin.h>
 
-class KAction;
+class TDEAction;
 
 class HTMLExport : public TQObject, public Plugin
 {
@@ -45,7 +45,7 @@ private:
 	TQString htmlEscape(const TQString &source);
 	TQString getColorByEntry(TQString s);
 	TDEConfig *config;
-	KAction *mAction;
+	TDEAction *mAction;
 
 private slots:
 	void slotExport();
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index 36d6a8fb..a504b977 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -60,7 +60,7 @@ IRPrefs::IRPrefs(TQObject *parent)
 	TQLabel *label = new TQLabel(i18n("Remote control &commands:"), this);
 	layout->addMultiCellWidget(label, 0, 0, 0, 4);
 
-	label->setBuddy(m_commands = new KListView(this));
+	label->setBuddy(m_commands = new TDEListView(this));
 	layout->addMultiCellWidget(m_commands, 1, 1, 0, 4);
 
 	label = new TQLabel(i18n("&Action:"), this);
diff --git a/noatun/modules/infrared/irprefs.h b/noatun/modules/infrared/irprefs.h
index 3554ae01..6646456e 100644
--- a/noatun/modules/infrared/irprefs.h
+++ b/noatun/modules/infrared/irprefs.h
@@ -7,7 +7,7 @@
 
 class TQCheckBox;
 class TQListViewItem;
-class KListView;
+class TDEListView;
 class KComboBox;
 class KIntSpinBox;
 class Lirc;
@@ -45,7 +45,7 @@ private slots:
 private:
 	static void readConfig();
 
-	KListView *m_commands;
+	TDEListView *m_commands;
 	KComboBox *m_action;
 	TQCheckBox *m_repeat;
 	KIntSpinBox *m_interval;
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index cdee37c0..4d74d858 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -39,7 +39,7 @@ KaimanPrefDlg::KaimanPrefDlg(TQObject *parent )
     TQLabel *label = new TQLabel( i18n("Kaiman Skins"), this, "label" );
     topLayout->addWidget( label );
 
-    _skinList = new KListBox( this, "skinList" );
+    _skinList = new TDEListBox( this, "skinList" );
     topLayout->addWidget( _skinList, 1 );
 	reopen();
 }
diff --git a/noatun/modules/kaiman/pref.h b/noatun/modules/kaiman/pref.h
index 19895bff..50ab3808 100644
--- a/noatun/modules/kaiman/pref.h
+++ b/noatun/modules/kaiman/pref.h
@@ -21,7 +21,7 @@
 
 #include <noatun/pref.h>
 
-class KListBox;
+class TDEListBox;
 class TQLabel;
 
 class KaimanPrefDlg : public CModule
@@ -42,7 +42,7 @@ class KaimanPrefDlg : public CModule
     private:
 	void readSkinDir( const TQString &dir );
 
-	KListBox *_skinList;
+	TDEListBox *_skinList;
 };
 
 #endif
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index 56eb389e..ef6d30ce 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -65,7 +65,7 @@ Kaiman* Kaiman::kaiman=0;
 const char Kaiman::DEFAULT_SKIN[]="car-preset";
 
 Kaiman::Kaiman()
-	: KMainWindow(0, "NoatunKaiman"), UserInterface()
+	: TDEMainWindow(0, "NoatunKaiman"), UserInterface()
 {
 	NOATUNPLUGINC(Kaiman);
 	kaiman=this;
@@ -531,7 +531,7 @@ void Kaiman::newSong()
 #undef None
 void Kaiman::toggleLoop()
 {
-	KPopupMenu *loopMenu = new KPopupMenu(this, "loopMenu");
+	TDEPopupMenu *loopMenu = new TDEPopupMenu(this, "loopMenu");
 	int selectedItem = 0;
 
 	loopMenu->setCheckable(true);
diff --git a/noatun/modules/kaiman/userinterface.h b/noatun/modules/kaiman/userinterface.h
index aac209f3..aa681c3c 100644
--- a/noatun/modules/kaiman/userinterface.h
+++ b/noatun/modules/kaiman/userinterface.h
@@ -32,7 +32,7 @@ class Player;
  * @author Stefan Schimanski <1Stein@gmx.de>
  * @version 0.1
  */
-class Kaiman : public KMainWindow, public UserInterface
+class Kaiman : public TDEMainWindow, public UserInterface
 {
 Q_OBJECT
   
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp
index 7cdfc0e2..f6c60256 100644
--- a/noatun/modules/kjofol-skin/kjbutton.cpp
+++ b/noatun/modules/kjofol-skin/kjbutton.cpp
@@ -222,7 +222,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
 		napp->player()->toggleListView();
 	else if (mTitle=="repeatbutton")
 	{
-		KPopupMenu *loopMenu = new KPopupMenu(KJWidget::parent(),"loopMenu");
+		TDEPopupMenu *loopMenu = new TDEPopupMenu(KJWidget::parent(),"loopMenu");
 		int selectedItem = 0;
 
 		loopMenu->setCheckable(true);
diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
index 934285fa..244e67a2 100644
--- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui
+++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
@@ -397,7 +397,7 @@
                         <string>Font:</string>
                     </property>
                 </widget>
-                <widget class="KFontCombo" row="1" column="1">
+                <widget class="TDEFontCombo" row="1" column="1">
                     <property name="name">
                         <cstring>cmbSysFont</cstring>
                     </property>
diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index e3faf8b1..71612174 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -69,7 +69,7 @@ static void setPlayStatus( Player *player, int status )
 
 
 Marquis::Marquis()
-	: KMainWindow(0, "Marquis")
+	: TDEMainWindow(0, "Marquis")
 	, SessionManagement()
 {
 	hide();
@@ -78,8 +78,8 @@ Marquis::Marquis()
 // for testing: uncomment this and use
 // dcop `dcop | grep noatun` Marquis activateAction dynamicRestore
 // and dynamicSave accordingly.
-//	(void) new KAction("Restore", 0, this, TQT_SLOT( dynamicRestore() ), actionCollection(), "dynamicRestore" );
-// 	(void) new KAction("Save", 0, this, TQT_SLOT( dynamicSave() ), actionCollection(), "dynamicSave" );
+//	(void) new TDEAction("Restore", 0, this, TQT_SLOT( dynamicRestore() ), actionCollection(), "dynamicRestore" );
+// 	(void) new TDEAction("Save", 0, this, TQT_SLOT( dynamicSave() ), actionCollection(), "dynamicSave" );
 	connect( napp, TQT_SIGNAL( saveYourself() ), TQT_SLOT( dynamicSave() ));
 }
 
diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h
index d07ed297..276ebc9a 100644
--- a/noatun/modules/marquis/marquis.h
+++ b/noatun/modules/marquis/marquis.h
@@ -32,7 +32,7 @@
 
 class Player;
 
-class Marquis : public KMainWindow, public SessionManagement
+class Marquis : public TDEMainWindow, public SessionManagement
 {
 Q_OBJECT
   
diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp
index 5ffa1e6a..db71f715 100644
--- a/noatun/modules/metatag/metatag.cpp
+++ b/noatun/modules/metatag/metatag.cpp
@@ -32,7 +32,7 @@ extern "C"
 
 MetaTagLoader::MetaTagLoader():Plugin()
 {
-	mAction = new KAction(i18n("&Tag Editor..."), "edit", 0, this, TQT_SLOT(editTag()), this, "edittag");
+	mAction = new TDEAction(i18n("&Tag Editor..."), "edit", 0, this, TQT_SLOT(editTag()), this, "edittag");
 	napp->pluginActionMenu()->insert(mAction);
 }
 
diff --git a/noatun/modules/metatag/metatag.h b/noatun/modules/metatag/metatag.h
index af5ed015..43eb9f3c 100644
--- a/noatun/modules/metatag/metatag.h
+++ b/noatun/modules/metatag/metatag.h
@@ -9,7 +9,7 @@
 #include <tqobject.h>
 
 class KFileMetaInfo;
-class KAction;
+class TDEAction;
 
 class MetaTagLoader:public TQObject, public Tags, public Plugin {
   Q_OBJECT
@@ -25,7 +25,7 @@ class MetaTagLoader:public TQObject, public Tags, public Plugin {
   private:
     bool setProperty(KFileMetaInfo &info, PlaylistItem &item, const TQString &key, const TQString &property);
     int menuID;
-	 KAction *mAction;
+	 TDEAction *mAction;
 };
 
 #endif
diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp
index dac87cf2..f7e35778 100644
--- a/noatun/modules/monoscope/monoscope.cpp
+++ b/noatun/modules/monoscope/monoscope.cpp
@@ -40,7 +40,7 @@ Monoscope::~Monoscope()
 
 void Monoscope::init()
 {
-	mAction = new KToggleAction(i18n("Toggle Monoscope"), 0, 0,
+	mAction = new TDEToggleAction(i18n("Toggle Monoscope"), 0, 0,
 		TQT_TQOBJECT(this), TQT_SLOT(toggle()), TQT_TQOBJECT(this), "togglemonoscope");
 	mAction->setChecked(!isHidden());
 	napp->pluginActionMenu()->insert(mAction);
diff --git a/noatun/modules/monoscope/monoscope.h b/noatun/modules/monoscope/monoscope.h
index fbb61153..7fddb26b 100644
--- a/noatun/modules/monoscope/monoscope.h
+++ b/noatun/modules/monoscope/monoscope.h
@@ -3,7 +3,7 @@
 
 #include <noatun/plugin.h>
 
-class KToggleAction;
+class TDEToggleAction;
 
 class Monoscope : public TQWidget,  public MonoScope, public Plugin
 {
@@ -28,7 +28,7 @@ protected:
 
 private:
 	TQRgb mHighColor, mLowColor;
-	KToggleAction *mAction;
+	TDEToggleAction *mAction;
 };
 
 #endif
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index 4cda6fe0..52552be8 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -50,7 +50,7 @@
 #include "volume.xpm"
 
 SimpleUI::SimpleUI()
-     : KMainWindow(0, "NoatunSimpleUI"), UserInterface()
+     : TDEMainWindow(0, "NoatunSimpleUI"), UserInterface()
 {
     setAcceptDrops( true );
     setCaption( i18n("Noatun") );
@@ -127,7 +127,7 @@ SimpleUI::~SimpleUI()
 void SimpleUI::setupActions()
 {
     KStdAction::open( TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection(), "_file_open" );
-    new KAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()),
+    new TDEAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()),
         actionCollection(), "_file_properties" );
     KStdAction::quit( TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection(), "_file_quit");
 
diff --git a/noatun/modules/simple/userinterface.h b/noatun/modules/simple/userinterface.h
index f32fae69..7265fa4e 100644
--- a/noatun/modules/simple/userinterface.h
+++ b/noatun/modules/simple/userinterface.h
@@ -25,7 +25,7 @@
 #include "propertiesdialog.h"
 
 
-class SimpleUI : public KMainWindow, public UserInterface
+class SimpleUI : public TDEMainWindow, public UserInterface
 {
     Q_OBJECT
   
@@ -74,8 +74,8 @@ private:
     L33tSlider *slider;
     int extra_width;
     int extra_height;
-    KToggleAction *menubarAction;
-    KToggleAction *statusbarAction;
+    TDEToggleAction *menubarAction;
+    TDEToggleAction *statusbarAction;
 };
 
 #endif
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index cce64897..8e150cc1 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -49,7 +49,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co
 	addRef();
 	setUrl(text);
 
-	static_cast<KListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
+	static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
 	setOn(true);
 
 	// is this really needed, it makes the listview too wide for me :(
@@ -91,7 +91,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co
 		}
 	}
 
-	static_cast<KListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
+	static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
 	modified();
 
 	if (!streamable() && enqueue(url()))
@@ -345,7 +345,7 @@ void SafeListViewItem::remove()
 }
 
 List::List(View *parent)
-	: KListView(parent), recursiveAddAfter(0), listJob(0)
+	: TDEListView(parent), recursiveAddAfter(0), listJob(0)
 {
 	addColumn(i18n("File"));
 	addColumn(i18n("Time"));
@@ -372,7 +372,7 @@ void List::move()
 
 bool List::acceptDrag(TQDropEvent *event) const
 {
-	return KURLDrag::canDecode(event) || KListView::acceptDrag(event);
+	return KURLDrag::canDecode(event) || TDEListView::acceptDrag(event);
 }
 
 void List::dropEvent(TQDropEvent *event, TQListViewItem *after)
@@ -396,7 +396,7 @@ void List::keyPressEvent(TQKeyEvent *e)
 	{
 		if (currentItem())
 		{
-			emit KListView::executed(currentItem());
+			emit TDEListView::executed(currentItem());
 		}
 
 		return;
@@ -412,7 +412,7 @@ void List::keyPressEvent(TQKeyEvent *e)
 		return;
 	}
 
-	KListView::keyPressEvent(e);
+	TDEListView::keyPressEvent(e);
 
 
 }
@@ -634,7 +634,7 @@ void List::slotRedirection(TDEIO::Job *, const KURL & url)
 /////////////////////////////////
 
 View::View(SplitPlaylist *)
-	: KMainWindow(0, "NoatunSplitplaylistView")
+	: TDEMainWindow(0, "NoatunSplitplaylistView")
 {
 	list=new List(this);
 	setCentralWidget(list);
@@ -642,9 +642,9 @@ View::View(SplitPlaylist *)
 	// connect the click on the header with sorting
 	connect(list->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(headerClicked(int)) );
 
-	mOpen=new KAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
-	(void) new KAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()),  actionCollection(), "add_dir");
-	mDelete=new KAction(i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()),  actionCollection(), "delete");
+	mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
+	(void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()),  actionCollection(), "add_dir");
+	mDelete=new TDEAction(i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()),  actionCollection(), "delete");
 
 	mClose=KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 	mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection());
@@ -655,8 +655,8 @@ View::View(SplitPlaylist *)
 	mSave=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
 	mSaveAs=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
 
-	(void) new KAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle");
-	(void) new KAction(i18n("Clear"), "editclear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear");
+	(void) new TDEAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle");
+	(void) new TDEAction(i18n("Clear"), "editclear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear");
 
 	createGUI("splui.rc");
 
diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h
index 48a0be67..9bff4335 100644
--- a/noatun/modules/splitplaylist/view.h
+++ b/noatun/modules/splitplaylist/view.h
@@ -55,7 +55,7 @@ private:
 	bool removed;
 };
 
-class List : public KListView
+class List : public TDEListView
 {
 Q_OBJECT
   
@@ -100,10 +100,10 @@ protected:
 };
 
 class KFileDialog;
-class KToggleAction;
-class KToolBar;
+class TDEToggleAction;
+class TDEToolBar;
 
-class View : public KMainWindow
+class View : public TDEMainWindow
 {
 Q_OBJECT
   
@@ -155,9 +155,9 @@ signals:
 
 private:
 	List *list;
-	KAction *mOpen, *mDelete, *mSave, *mSaveAs, *mOpenpl, *mOpenNew;
-	KAction *mClose;
-	KAction *mFind;
+	TDEAction *mOpen, *mDelete, *mSave, *mSaveAs, *mOpenpl, *mOpenNew;
+	TDEAction *mClose;
+	TDEAction *mFind;
 	Finder *mFinder;
 
 	KURL mPlaylistFile;
diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp
index a0b545ab..63a467b6 100644
--- a/noatun/modules/systray/kitsystemtray.cpp
+++ b/noatun/modules/systray/kitsystemtray.cpp
@@ -44,11 +44,11 @@
 
 #include <fixx11h.h>
 
-KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name)
+KitSystemTray::KitSystemTray(const TQString &contextMenu, TDEMainWindow *parent, const char *name)
 	: KSystemTray(parent, name)
 {
 	setAlignment(AlignHCenter | AlignVCenter);
-	menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent);
+	menu = (TDEPopupMenu *)parent->guiFactory()->container(contextMenu, parent);
 	menu->insertTitle(SmallIcon("noatun"), TQString(), 0, 0);
 	setAcceptDrops(true);
 }
diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h
index d012853e..13a8b518 100644
--- a/noatun/modules/systray/kitsystemtray.h
+++ b/noatun/modules/systray/kitsystemtray.h
@@ -30,8 +30,8 @@
 
 #include <ksystemtray.h>
 
-class KPopupMenu;
-class KMainWindow;
+class TDEPopupMenu;
+class TDEMainWindow;
 class TQPixmap;
 
 class KitSystemTray : public KSystemTray
@@ -40,7 +40,7 @@ Q_OBJECT
   
 
 public:
-	KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name = 0);
+	KitSystemTray(const TQString &contextMenu, TDEMainWindow *parent, const char *name = 0);
 	void changeTitle(const TQPixmap &, const TQString &);
 protected:
 	virtual void showEvent(TQShowEvent *);
@@ -49,7 +49,7 @@ protected:
 	virtual void dropEvent(TQDropEvent *);
 	virtual void wheelEvent(TQWheelEvent *e);
 
-	KPopupMenu *menu;
+	TDEPopupMenu *menu;
 };
 
 #endif
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 27976429..0cfde28e 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -90,7 +90,7 @@ protected:
 //NoatunSystray *NoatunSystray::self = 0;
 
 
-NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(),
+NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(),
 	mTray(0), trayStatus(0), trayBase(0), mPassivePopup(0L)
 {
 	//self = this;
diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h
index 270bef01..b1dd7aad 100644
--- a/noatun/modules/systray/systray.h
+++ b/noatun/modules/systray/systray.h
@@ -38,7 +38,7 @@ class KitSystemTray;
 class TQTimer;
 class PassivePopup;
 
-class NoatunSystray : public KMainWindow, public Plugin
+class NoatunSystray : public TDEMainWindow, public Plugin
 {
 Q_OBJECT