Rename a number of classes to enhance compatibility with KDE4

17 files changed, 101 insertions, 101 deletions

diff --git a/src/example_kjsembed.js b/src/example_kjsembed.js
index 3412398..adc23cc 100644
--- a/src/example_kjsembed.js
+++ b/src/example_kjsembed.js
@@ -5,7 +5,7 @@
  */
 
 // Create main view
-var mw = new KMainWindow();
+var mw = new TDEMainWindow();
 var box = new QVBox( mw );
 mw.setCentralWidget(box);
 
diff --git a/src/kmplayer.h b/src/kmplayer.h
index 3e80d72..b2d8a91 100644
--- a/src/kmplayer.h
+++ b/src/kmplayer.h
@@ -55,7 +55,7 @@ namespace KMPlayer {
 } // namespace
 
 
-class KMPlayerApp : public KMainWindow
+class KMPlayerApp : public TDEMainWindow
 {
     Q_OBJECT
   
@@ -67,7 +67,7 @@ public:
     void addURL (const KURL& url);
     KMPlayer::PartBase * player () const { return m_player; }
     void resizePlayer (int percentage);
-    KDE_NO_EXPORT KRecentFilesAction * recentFiles () const { return fileOpenRecent; }
+    KDE_NO_EXPORT TDERecentFilesAction * recentFiles () const { return fileOpenRecent; }
     KDE_NO_EXPORT KMPlayer::View *view () const { return m_view; }
     bool broadcasting () const;
     void showBroadcastConfig ();
@@ -152,25 +152,25 @@ private:
     KMPlayer::NodePtr playlist;
     KMPlayer::NodePtrW manip_node;
 
-    KAction * fileNewWindow;
-    KAction * fileOpen;
-    KRecentFilesAction * fileOpenRecent;
-    KAction * fileClose;
-    KAction * fileQuit;
-    KAction * editVolumeInc;
-    KAction * editVolumeDec;
-    KAction * toggleView;
-    KAction * viewSyncEditMode;
+    TDEAction * fileNewWindow;
+    TDEAction * fileOpen;
+    TDERecentFilesAction * fileOpenRecent;
+    TDEAction * fileClose;
+    TDEAction * fileQuit;
+    TDEAction * editVolumeInc;
+    TDEAction * editVolumeDec;
+    TDEAction * toggleView;
+    TDEAction * viewSyncEditMode;
 #if KDE_IS_VERSION(3,1,90)
-    KToggleAction * viewFullscreen;
+    TDEToggleAction * viewFullscreen;
 #else
-    KAction * viewFullscreen;
+    TDEAction * viewFullscreen;
 #endif
-    KToggleAction * viewEditMode;
-    KToggleAction * viewToolBar;
-    KToggleAction * viewStatusBar;
-    KToggleAction * viewMenuBar;
-    KToggleAction * viewKeepRatio;
+    TDEToggleAction * viewEditMode;
+    TDEToggleAction * viewToolBar;
+    TDEToggleAction * viewStatusBar;
+    TDEToggleAction * viewMenuBar;
+    TDEToggleAction * viewKeepRatio;
     TQMenuItem * m_sourcemenu;
     TQPopupMenu * m_dvdmenu;
     TQPopupMenu * m_dvdnavmenu;
diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp
index 5cffa49..67f40b3 100644
--- a/src/kmplayer_part.cpp
+++ b/src/kmplayer_part.cpp
@@ -160,11 +160,11 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char *
             m_browserextension,
             TQT_SLOT (slotRequestOpenURL (const KURL &, const TQString &)));
 #endif
-    /*KAction *playact =*/ new KAction(i18n("P&lay"), TQString ("player_play"), KShortcut (), this, TQT_SLOT(play ()), actionCollection (), "play");
-    /*KAction *pauseact =*/ new KAction(i18n("&Pause"), TQString ("player_pause"), KShortcut (), this, TQT_SLOT(pause ()), actionCollection (), "pause");
-    /*KAction *stopact =*/ new KAction(i18n("&Stop"), TQString ("player_stop"), KShortcut (), this, TQT_SLOT(stop ()), actionCollection (), "stop");
-    new KAction (i18n ("Increase Volume"), TQString ("player_volume"), KShortcut (), this, TQT_SLOT (increaseVolume ()), actionCollection (), "edit_volume_up");
-    new KAction (i18n ("Decrease Volume"), TQString ("player_volume"), KShortcut (), this, TQT_SLOT (decreaseVolume ()), actionCollection (), "edit_volume_down");
+    /*TDEAction *playact =*/ new TDEAction(i18n("P&lay"), TQString ("player_play"), TDEShortcut (), this, TQT_SLOT(play ()), actionCollection (), "play");
+    /*TDEAction *pauseact =*/ new TDEAction(i18n("&Pause"), TQString ("player_pause"), TDEShortcut (), this, TQT_SLOT(pause ()), actionCollection (), "pause");
+    /*TDEAction *stopact =*/ new TDEAction(i18n("&Stop"), TQString ("player_stop"), TDEShortcut (), this, TQT_SLOT(stop ()), actionCollection (), "stop");
+    new TDEAction (i18n ("Increase Volume"), TQString ("player_volume"), TDEShortcut (), this, TQT_SLOT (increaseVolume ()), actionCollection (), "edit_volume_up");
+    new TDEAction (i18n ("Decrease Volume"), TQString ("player_volume"), TDEShortcut (), this, TQT_SLOT (decreaseVolume ()), actionCollection (), "edit_volume_down");
     Source * urlsource = m_sources ["urlsource"];
     KMPlayer::ControlPanel * panel = m_view->controlPanel ();
     TQStringList::const_iterator it = args.begin ();
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
index 65a3d45..bfb05d1 100644
--- a/src/kmplayerapp.cpp
+++ b/src/kmplayerapp.cpp
@@ -497,7 +497,7 @@ KDE_NO_EXPORT KMPlayer::NodePtr HtmlObject::childFromTag (const TQString & tag)
 }
 
 KDE_NO_CDTOR_EXPORT KMPlayerApp::KMPlayerApp(TQWidget* , const char* name)
-    : KMainWindow(0, name),
+    : TDEMainWindow(0, name),
       config (kapp->config ()),
       m_systray (0L),
       m_player (new KMPlayer::PartBase (this, 0L, 0L, 0L, config)),
@@ -573,46 +573,46 @@ KDE_NO_CDTOR_EXPORT KMPlayerApp::~KMPlayerApp () {
 
 
 KDE_NO_EXPORT void KMPlayerApp::initActions () {
-    KActionCollection * ac = actionCollection ();
-    fileNewWindow = new KAction(i18n("New &Window"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewWindow()), ac, "new_window");
+    TDEActionCollection * ac = actionCollection ();
+    fileNewWindow = new TDEAction(i18n("New &Window"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewWindow()), ac, "new_window");
     fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), ac, "open");
     fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), ac, "open_recent");
     KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT (slotSaveAs ()), ac, "save_as");
-    new KAction (i18n ("Clear &History"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (slotClearHistory ()), ac, "clear_history");
+    new TDEAction (i18n ("Clear &History"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (slotClearHistory ()), ac, "clear_history");
     fileClose = KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT (slotFileClose ()), ac);
     fileQuit = KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT (slotFileQuit ()), ac);
-    new KAction (i18n ("&Open DVD"), TQString ("dvd_mount"), KShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openDVD ()), ac, "opendvd");
-    new KAction (i18n ("&Open VCD"), TQString ("cdrom_mount"), KShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openVCD ()), ac, "openvcd");
-    new KAction (i18n ("&Open Audio CD"), TQString ("cdrom_mount"), KShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openAudioCD ()), ac, "openaudiocd");
-    new KAction (i18n ("&Open Pipe..."), TQString ("pipe"), KShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openPipe ()), ac, "source_pipe");
+    new TDEAction (i18n ("&Open DVD"), TQString ("dvd_mount"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openDVD ()), ac, "opendvd");
+    new TDEAction (i18n ("&Open VCD"), TQString ("cdrom_mount"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openVCD ()), ac, "openvcd");
+    new TDEAction (i18n ("&Open Audio CD"), TQString ("cdrom_mount"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openAudioCD ()), ac, "openaudiocd");
+    new TDEAction (i18n ("&Open Pipe..."), TQString ("pipe"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openPipe ()), ac, "source_pipe");
     //TDEGlobal::iconLoader ()->loadIconSet (TQString ("tv"), KIcon::Small, 0,true)
-    new KAction (i18n ("&Connect"), TQString ("connect_established"), KShortcut (), TQT_TQOBJECT(this), TQT_SLOT (openVDR ()), ac, "vdr_connect");
-    editVolumeInc = new KAction (i18n ("Increase Volume"), TQString ("player_volume"), KShortcut (), m_player, TQT_SLOT (increaseVolume ()), ac, "edit_volume_up");
-    editVolumeDec = new KAction (i18n ("Decrease Volume"), TQString ("player_volume"), KShortcut (), m_player, TQT_SLOT(decreaseVolume ()), ac, "edit_volume_down");
-    toggleView = new KAction (i18n ("C&onsole"), TQString ("konsole"), KShortcut (), TQT_TQOBJECT(m_player->view()), TQT_SLOT (toggleVideoConsoleWindow ()), ac, "view_video");
-    //new KAction (i18n ("V&ideo"), TQString ("video"), KShortcut (), m_view, TQT_SLOT (toggleVideoConsoleWindow ()), ac, "view_video");
-    new KAction (i18n ("Pla&y List"), TQString ("player_playlist"), KShortcut (), m_player, TQT_SLOT (showPlayListWindow ()), ac, "view_playlist");
-    new KAction (i18n ("Minimal mode"), TQString ("empty"), KShortcut (), TQT_TQOBJECT(this), TQT_SLOT (slotMinimalMode ()), ac, "view_minimal");
-    new KAction (i18n ("50%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom50 ()), ac, "view_zoom_50");
-    new KAction (i18n ("100%"), TQString ("viewmagfit"), KShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom100 ()), ac, "view_zoom_100");
-    new KAction (i18n ("150%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom150 ()), ac, "view_zoom_150");
-    new KAction (i18n ("200%"), 0, KShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom200 ()), ac, "view_zoom_200");
-    new KAction (i18n ("300%"), 0, KShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom300 ()), ac, "view_zoom_300");
-    viewEditMode = new KToggleAction (i18n ("&Edit mode"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (editMode ()), ac, "edit_mode");
-    viewSyncEditMode = new KAction (i18n ("Sync &with playlist"), TQString ("reload"), KShortcut (), TQT_TQOBJECT(this), TQT_SLOT (syncEditMode ()), ac, "sync_edit_mode");
+    new TDEAction (i18n ("&Connect"), TQString ("connect_established"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (openVDR ()), ac, "vdr_connect");
+    editVolumeInc = new TDEAction (i18n ("Increase Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT (increaseVolume ()), ac, "edit_volume_up");
+    editVolumeDec = new TDEAction (i18n ("Decrease Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT(decreaseVolume ()), ac, "edit_volume_down");
+    toggleView = new TDEAction (i18n ("C&onsole"), TQString ("konsole"), TDEShortcut (), TQT_TQOBJECT(m_player->view()), TQT_SLOT (toggleVideoConsoleWindow ()), ac, "view_video");
+    //new TDEAction (i18n ("V&ideo"), TQString ("video"), TDEShortcut (), m_view, TQT_SLOT (toggleVideoConsoleWindow ()), ac, "view_video");
+    new TDEAction (i18n ("Pla&y List"), TQString ("player_playlist"), TDEShortcut (), m_player, TQT_SLOT (showPlayListWindow ()), ac, "view_playlist");
+    new TDEAction (i18n ("Minimal mode"), TQString ("empty"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (slotMinimalMode ()), ac, "view_minimal");
+    new TDEAction (i18n ("50%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom50 ()), ac, "view_zoom_50");
+    new TDEAction (i18n ("100%"), TQString ("viewmagfit"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom100 ()), ac, "view_zoom_100");
+    new TDEAction (i18n ("150%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom150 ()), ac, "view_zoom_150");
+    new TDEAction (i18n ("200%"), 0, TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom200 ()), ac, "view_zoom_200");
+    new TDEAction (i18n ("300%"), 0, TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom300 ()), ac, "view_zoom_300");
+    viewEditMode = new TDEToggleAction (i18n ("&Edit mode"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (editMode ()), ac, "edit_mode");
+    viewSyncEditMode = new TDEAction (i18n ("Sync &with playlist"), TQString ("reload"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (syncEditMode ()), ac, "sync_edit_mode");
     viewSyncEditMode->setEnabled (false);
-    new KAction (i18n ("Show Popup Menu"), KShortcut (), TQT_TQOBJECT(m_view->controlPanel ()), TQT_SLOT (showPopupMenu ()), ac, "view_show_popup_menu");
-    new KAction (i18n ("Show Language Menu"), KShortcut (TQt::Key_L), TQT_TQOBJECT(m_view->controlPanel ()), TQT_SLOT (showLanguageMenu ()), ac, "view_show_lang_menu");
-    viewKeepRatio = new KToggleAction (i18n ("&Keep Width/Height Ratio"), 0, TQT_TQOBJECT(this), TQT_SLOT (keepSizeRatio ()), ac, "view_keep_ratio");
+    new TDEAction (i18n ("Show Popup Menu"), TDEShortcut (), TQT_TQOBJECT(m_view->controlPanel ()), TQT_SLOT (showPopupMenu ()), ac, "view_show_popup_menu");
+    new TDEAction (i18n ("Show Language Menu"), TDEShortcut (TQt::Key_L), TQT_TQOBJECT(m_view->controlPanel ()), TQT_SLOT (showLanguageMenu ()), ac, "view_show_lang_menu");
+    viewKeepRatio = new TDEToggleAction (i18n ("&Keep Width/Height Ratio"), 0, TQT_TQOBJECT(this), TQT_SLOT (keepSizeRatio ()), ac, "view_keep_ratio");
 #if KDE_IS_VERSION(3,1,90)
     viewFullscreen = KStdAction::fullScreen (TQT_TQOBJECT(this), TQT_SLOT(fullScreen ()), ac, 0, "view_fullscreen");
 #else
-    viewFullscreen = new KAction (i18n("&Full Screen"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(fullScreen ()), ac, "view_fullscreen");
+    viewFullscreen = new TDEAction (i18n("&Full Screen"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(fullScreen ()), ac, "view_fullscreen");
 #endif
-    /*KAction *playact =*/ new KAction (i18n ("P&lay"), TQString ("player_play"), KShortcut (), m_player, TQT_SLOT (play ()), ac, "play");
-    /*KAction *pauseact =*/ new KAction (i18n ("&Pause"), TQString ("player_pause"), KShortcut (), m_player, TQT_SLOT (pause ()), ac, "pause");
-    /*KAction *stopact =*/ new KAction (i18n ("&Stop"), TQString ("player_stop"), KShortcut (), m_player, TQT_SLOT (stop ()), ac, "stop");
-    /*KAction *artsctrl =*/ new KAction (i18n ("&Arts Control"), TQString ("player_volume"), KShortcut (), TQT_TQOBJECT(this), TQT_SLOT (startArtsControl ()), ac, "view_arts_control");
+    /*TDEAction *playact =*/ new TDEAction (i18n ("P&lay"), TQString ("player_play"), TDEShortcut (), m_player, TQT_SLOT (play ()), ac, "play");
+    /*TDEAction *pauseact =*/ new TDEAction (i18n ("&Pause"), TQString ("player_pause"), TDEShortcut (), m_player, TQT_SLOT (pause ()), ac, "pause");
+    /*TDEAction *stopact =*/ new TDEAction (i18n ("&Stop"), TQString ("player_stop"), TDEShortcut (), m_player, TQT_SLOT (stop ()), ac, "stop");
+    /*TDEAction *artsctrl =*/ new TDEAction (i18n ("&Arts Control"), TQString ("player_volume"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (startArtsControl ()), ac, "view_arts_control");
     viewToolBar = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewToolBar()), ac, "showtoolbar");
     viewStatusBar =KStdAction::showStatusbar(TQT_TQOBJECT(this),TQT_SLOT(slotViewStatusBar()),ac, "showstatusbar");
     viewMenuBar = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotViewMenuBar()), ac, "showmenu");
@@ -664,8 +664,8 @@ KDE_NO_EXPORT void KMPlayerApp::initView () {
     //m_view->docArea ()->readDockConfig (config, TQString ("Window Layout"));
     m_player->connectPanel (m_view->controlPanel ());
     initMenu ();
-    new KAction (i18n ("Increase Volume"), editVolumeInc->shortcut (), m_player, TQT_SLOT (increaseVolume ()), m_view->viewArea ()->actionCollection (), "edit_volume_up");
-    new KAction (i18n ("Decrease Volume"), editVolumeDec->shortcut (), m_player, TQT_SLOT(decreaseVolume ()), m_view->viewArea ()->actionCollection (), "edit_volume_down");
+    new TDEAction (i18n ("Increase Volume"), editVolumeInc->shortcut (), m_player, TQT_SLOT (increaseVolume ()), m_view->viewArea ()->actionCollection (), "edit_volume_up");
+    new TDEAction (i18n ("Decrease Volume"), editVolumeDec->shortcut (), m_player, TQT_SLOT(decreaseVolume ()), m_view->viewArea ()->actionCollection (), "edit_volume_down");
     connect (m_player->settings (), TQT_SIGNAL (configChanged ()),
              TQT_TQOBJECT(this), TQT_SLOT (configChanged ()));
     connect (m_player, TQT_SIGNAL (loading (int)),
@@ -1193,8 +1193,8 @@ KDE_NO_EXPORT void KMPlayerApp::readOptions() {
     config->setGroup("General Options");
 
     // bar position settings
-    KToolBar::BarPosition toolBarPos;
-    toolBarPos=(KToolBar::BarPosition) config->readNumEntry("ToolBarPos", KToolBar::Top);
+    TDEToolBar::BarPosition toolBarPos;
+    toolBarPos=(TDEToolBar::BarPosition) config->readNumEntry("ToolBarPos", TDEToolBar::Top);
     toolBar("mainToolBar")->setBarPos(toolBarPos);
 
     // bar status settings
@@ -1436,7 +1436,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotFileQuit()
         tqApp->quit ();
     // close the first window, the list makes the next one the first again.
     // This ensures that queryClose() is called on each window to ask for closing
-    /*KMainWindow* w;
+    /*TDEMainWindow* w;
     if(memberList)
     {
         for(w=memberList->first(); w!=0; w=memberList->first())
@@ -1501,8 +1501,8 @@ KDE_NO_EXPORT void KMPlayerApp::slotStatusMsg (const TQString &text) {
 }
 
 KDE_NO_EXPORT void KMPlayerApp::fullScreen () {
-//    if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender ()))->metaObject ()->inherits ("KAction"))
-    if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender ()))->inherits ("KAction"))
+//    if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender ()))->metaObject ()->inherits ("TDEAction"))
+    if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender ()))->inherits ("TDEAction"))
         m_view->fullScreen();
 #if KDE_IS_VERSION(3,1,90)
     viewFullscreen->setChecked (m_view->isFullScreen ());
diff --git a/src/kmplayercontrolpanel.cpp b/src/kmplayercontrolpanel.cpp
index 9ebda28..ab35702 100644
--- a/src/kmplayercontrolpanel.cpp
+++ b/src/kmplayercontrolpanel.cpp
@@ -282,7 +282,7 @@ KDE_NO_EXPORT void KMPlayerMenuButton::enterEvent (TQEvent *) {
 //-----------------------------------------------------------------------------
 
 KDE_NO_CDTOR_EXPORT KMPlayerPopupMenu::KMPlayerPopupMenu (TQWidget * parent)
- : KPopupMenu (parent, "kde_kmplayer_popupmenu") {}
+ : TDEPopupMenu (parent, "kde_kmplayer_popupmenu") {}
 
 KDE_NO_EXPORT void KMPlayerPopupMenu::leaveEvent (TQEvent *) {
     emit mouseLeft ();
diff --git a/src/kmplayercontrolpanel.h b/src/kmplayercontrolpanel.h
index 845ed8f..56cce42 100644
--- a/src/kmplayercontrolpanel.h
+++ b/src/kmplayercontrolpanel.h
@@ -32,7 +32,7 @@ class TQSlider;
 //class TQPushButton;
 class TQBoxLayout;
 class TQStringList;
-class KPopupMenu;
+class TDEPopupMenu;
 
 namespace KMPlayer {
 
@@ -56,7 +56,7 @@ protected:
 /*
  * The pop down menu from the controlpanel
  */
-class KMPLAYER_EXPORT KMPlayerPopupMenu : public KPopupMenu {
+class KMPLAYER_EXPORT KMPlayerPopupMenu : public TDEPopupMenu {
     Q_OBJECT
   
 public:
@@ -132,7 +132,7 @@ public:
     KDE_NO_EXPORT TQPushButton * broadcastButton () const { return m_buttons[button_broadcast]; }
     KDE_NO_EXPORT VolumeBar * volumeBar () const { return m_volume; }
     KDE_NO_EXPORT KMPlayerPopupMenu * popupMenu () const { return m_popupMenu; }
-    KDE_NO_EXPORT KPopupMenu * bookmarkMenu () const { return m_bookmarkMenu; }
+    KDE_NO_EXPORT TDEPopupMenu * bookmarkMenu () const { return m_bookmarkMenu; }
     KDE_NO_EXPORT TQPopupMenu * zoomMenu () const { return m_zoomMenu; }
     KDE_NO_EXPORT TQPopupMenu * playerMenu () const { return m_playerMenu; }
     KDE_NO_EXPORT TQPopupMenu * colorMenu () const { return m_colorMenu; }
diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
index d6c9409..80c8f11 100644
--- a/src/kmplayerpartbase.cpp
+++ b/src/kmplayerpartbase.cpp
@@ -166,7 +166,7 @@ KDE_NO_EXPORT void PartBase::addBookMark (const TQString & t, const TQString & u
     m_bookmark_manager->emitChanged (b);
 }
 
-void PartBase::init (KActionCollection * action_collection) {
+void PartBase::init (TDEActionCollection * action_collection) {
     KParts::Part::setWidget (m_view);
     m_view->init (action_collection);
 #ifdef HAVE_NSPR
@@ -179,7 +179,7 @@ void PartBase::init (KActionCollection * action_collection) {
     connect (m_view, TQT_SIGNAL (urlDropped (const KURL::List &)), this, TQT_SLOT (openURL (const KURL::List &)));
     connectPlaylist (m_view->playList ());
     connectInfoPanel (m_view->infoPanel ());
-    new KAction (i18n ("Edit playlist &item"), 0, 0, TQT_TQOBJECT(m_view->playList ()), TQT_SLOT (editCurrent ()), action_collection, "edit_playlist_item");
+    new TDEAction (i18n ("Edit playlist &item"), 0, 0, TQT_TQOBJECT(m_view->playList ()), TQT_SLOT (editCurrent ()), action_collection, "edit_playlist_item");
 }
 
 void PartBase::connectPanel (ControlPanel * panel) {
diff --git a/src/kmplayerpartbase.h b/src/kmplayerpartbase.h
index 81f4092..80e0f37 100644
--- a/src/kmplayerpartbase.h
+++ b/src/kmplayerpartbase.h
@@ -38,7 +38,7 @@
 
 class TDEAboutData;
 class TDEInstance;
-class KActionCollection;
+class TDEActionCollection;
 class KBookmarkMenu;
 class TDEConfig;
 class TQIODevice;
@@ -120,7 +120,7 @@ public:
     typedef TQMap <TQString, Process *> ProcessMap;
     PartBase (TQWidget * parent,  const char * wname,TQObject * objectParent, const char * name, TDEConfig *);
     ~PartBase ();
-    void init (KActionCollection * = 0L);
+    void init (TDEActionCollection * = 0L);
     virtual KMediaPlayer::View* view ();
     static TDEAboutData* createAboutData ();
 
diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp
index 3f126c1..5100883 100644
--- a/src/kmplayervdr.cpp
+++ b/src/kmplayervdr.cpp
@@ -80,7 +80,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::KMPlayerPrefSourcePageVDR (TQWidg
     //KURLRequester * v4ldevice;
     TQVBoxLayout *layout = new TQVBoxLayout (this, 5, 2);
     TQGridLayout *gridlayout = new TQGridLayout (1, 2);
-    xv_port = new KListView (this);
+    xv_port = new TDEListView (this);
     xv_port->addColumn (TQString());
     xv_port->header()->hide ();
     xv_port->setTreeStepSize (15);
@@ -140,7 +140,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerVDRSource::KMPlayerVDRSource (KMPlayerApp * app)
    finish_timer (0),
    tcp_port (0),
    m_stored_volume (0) {
-    memset (m_actions, 0, sizeof (KAction *) * int (act_last));
+    memset (m_actions, 0, sizeof (TDEAction *) * int (act_last));
     m_player->settings ()->addPage (this);
     connect (m_socket, TQT_SIGNAL (connectionClosed()), this, TQT_SLOT(disconnected()));
     connect (m_socket, TQT_SIGNAL (connected ()), this, TQT_SLOT (connected ()));
@@ -229,15 +229,15 @@ KDE_NO_EXPORT void KMPlayerVDRSource::processStarted () {
 }
 
 #define DEF_ACT(i,text,pix,scut,slot,name) \
-    m_actions [i] = new KAction (text, TQString (pix), KShortcut (scut), this, slot, m_app->actionCollection (), name); \
-    m_fullscreen_actions [i] = new KAction (text, KShortcut (scut), this, slot, m_app->view ()->viewArea ()->actionCollection (), name)
+    m_actions [i] = new TDEAction (text, TQString (pix), TDEShortcut (scut), this, slot, m_app->actionCollection (), name); \
+    m_fullscreen_actions [i] = new TDEAction (text, TDEShortcut (scut), this, slot, m_app->view ()->viewArea ()->actionCollection (), name)
 
 KDE_NO_EXPORT void KMPlayerVDRSource::connected () {
     queueCommand (cmd_list_channels);
     queueCommand (cmd_volume_query);
     killTimer (channel_timer);
     channel_timer = startTimer (3000);
-    KAction * action = m_app->actionCollection ()->action ("vdr_connect");
+    TDEAction * action = m_app->actionCollection ()->action ("vdr_connect");
     action->setIcon (TQString ("connect_no"));
     action->setText (i18n ("Dis&connect"));
     DEF_ACT (act_up, i18n ("VDR Key Up"), "up", , TQT_SLOT (keyUp ()), "vdr_key_up");
@@ -284,7 +284,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::disconnected () {
     if (channel_timer && m_player->source () == this)
         m_player->process ()->quit ();
     deleteCommands ();
-    KAction * action = m_app->actionCollection ()->action ("vdr_connect");
+    TDEAction * action = m_app->actionCollection ()->action ("vdr_connect");
     action->setIcon (TQString ("connect_established"));
     action->setText (i18n ("&Connect"));
     m_app->guiFactory ()->removeClient (m_app);// crash w/ m_actions[i]->unplugAll (); in for loop below
diff --git a/src/kmplayervdr.h b/src/kmplayervdr.h
index 6f81313..c0c3899 100644
--- a/src/kmplayervdr.h
+++ b/src/kmplayervdr.h
@@ -40,10 +40,10 @@ class TQButtonGroup;
 class TQMenuItem;
 class TQCheckBox;
 class TQLineEdit;
-class KAction;
+class TDEAction;
 class TQSocket;
 class TQTimerEvent;
-class KListView;
+class TDEListView;
 
 /*
  * Preference page for VDR
@@ -55,7 +55,7 @@ public:
     KMPlayerPrefSourcePageVDR (TQWidget * parent, KMPlayer::PartBase * player);
     ~KMPlayerPrefSourcePageVDR ();
     KURLRequester * vcddevice;
-    KListView * xv_port;
+    TDEListView * xv_port;
     TQLineEdit * tcp_port;
     TQButtonGroup * scale;
 protected:
@@ -144,8 +144,8 @@ private:
     void jump (const TQString & channel);
     KMPlayerApp * m_app;
     KMPlayerPrefSourcePageVDR * m_configpage;
-    KAction * m_actions [act_last];
-    KAction * m_fullscreen_actions [act_last];
+    TDEAction * m_actions [act_last];
+    TDEAction * m_fullscreen_actions [act_last];
     TQSocket * m_socket;
     VDRCommand * commands;
     TQString m_request_jump;
diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp
index 2c265e4..d52060e 100644
--- a/src/kmplayerview.cpp
+++ b/src/kmplayerview.cpp
@@ -171,7 +171,7 @@ KDE_NO_EXPORT void View::dragEnterEvent (TQDragEnterEvent* dee) {
         dee->accept ();
 }
 
-KDE_NO_EXPORT void View::init (KActionCollection * action_collection) {
+KDE_NO_EXPORT void View::init (TDEActionCollection * action_collection) {
     setBackgroundMode(TQt::NoBackground); // prevents flashing
     //m_dockarea->setEraseColor (TQColor (0, 0, 0));
     TQPalette pal (TQColor (64, 64,64), TQColor (32, 32, 32));
diff --git a/src/kmplayerview.h b/src/kmplayerview.h
index 861324b..654dd08 100644
--- a/src/kmplayerview.h
+++ b/src/kmplayerview.h
@@ -40,9 +40,9 @@ class TQPaintDevice;
 class TQPainter;
 class TQSlider;
 class TQLabel;
-class KActionCollection;
-class KAction;
-class KShortcut;
+class TDEActionCollection;
+class TDEAction;
+class TDEShortcut;
 class KStatusBar;
 class KFindDialog;
 
@@ -106,7 +106,7 @@ public:
     ~View();
 
     void addText (const TQString &, bool eol=false);
-    void init (KActionCollection * ac);
+    void init (TDEActionCollection * ac);
     void reset ();
     //void print(TQPrinter *pPrinter);
 
diff --git a/src/playlistview.cpp b/src/playlistview.cpp
index 2eae2ae..ce664c3 100644
--- a/src/playlistview.cpp
+++ b/src/playlistview.cpp
@@ -106,8 +106,8 @@ KDE_NO_CDTOR_EXPORT void RootPlayListItem::paintCell (TQPainter * p, const TQCol
 
 //-----------------------------------------------------------------------------
 
-KDE_NO_CDTOR_EXPORT PlayListView::PlayListView (TQWidget * parent, View * view, KActionCollection * ac)
- : KListView (parent, "kde_kmplayer_playlist"),
+KDE_NO_CDTOR_EXPORT PlayListView::PlayListView (TQWidget * parent, View * view, TDEActionCollection * ac)
+ : TDEListView (parent, "kde_kmplayer_playlist"),
    m_view (view),
    m_find_dialog (0L),
    m_active_color (30, 0, 255),
@@ -337,7 +337,7 @@ KDE_NO_EXPORT TQDragObject * PlayListView::dragObject () {
 
 KDE_NO_EXPORT void PlayListView::setFont (const TQFont & fnt) {
     setTreeStepSize (TQFontMetrics (fnt).boundingRect ('m').width ());
-    KListView::setFont (fnt);
+    TDEListView::setFont (fnt);
 }
 
 KDE_NO_EXPORT void PlayListView::contextMenuItem (TQListViewItem * vi, const TQPoint & p, int) {
@@ -530,14 +530,14 @@ KDE_NO_EXPORT void PlayListView::rename (TQListViewItem * qitem, int c) {
     if (rootItem (qitem)->show_all_nodes && item && item->m_attr) {
         PlayListItem * pi = static_cast <PlayListItem *> (qitem->parent ());
         if (pi && pi->node && pi->node->isEditable ())
-            KListView::rename (item, c);
+            TDEListView::rename (item, c);
     } else if (item && item->node && item->node->isEditable ()) {
         if (!rootItem (qitem)->show_all_nodes &&
                 item->node->isPlayable () &&
                 item->node->mrl ()->pretty_name.isEmpty ())
             // populate() has crippled src, restore for editing 
             item->setText (0, item->node->mrl ()->src);
-        KListView::rename (item, c);
+        TDEListView::rename (item, c);
     }
 }
 
diff --git a/src/playlistview.h b/src/playlistview.h
index 3fbb3ba..4d93a3e 100644
--- a/src/playlistview.h
+++ b/src/playlistview.h
@@ -75,7 +75,7 @@ public:
 /*
  * The playlist GUI
  */
-class KMPLAYER_EXPORT PlayListView : public KListView {
+class KMPLAYER_EXPORT PlayListView : public TDEListView {
     Q_OBJECT
   
 public:
@@ -84,7 +84,7 @@ public:
         InPlaceEdit = 0x04, TreeEdit = 0x08,
         Moveable = 0x10, Deleteable = 0x20
     };
-    PlayListView (TQWidget * parent, View * view, KActionCollection * ac);
+    PlayListView (TQWidget * parent, View * view, TDEActionCollection * ac);
     ~PlayListView ();
     void selectItem (const TQString & txt);
     void showAllNodes (RootPlayListItem *, bool show=true);
@@ -136,8 +136,8 @@ private:
     SharedPtr <TreeUpdate> tree_update;
     View * m_view;
     TQPopupMenu * m_itemmenu;
-    KAction * m_find;
-    KAction * m_find_next;
+    TDEAction * m_find;
+    TDEAction * m_find_next;
     KFindDialog * m_find_dialog;
     TQPixmap folder_pix;
     TQPixmap auxiliary_pix;
diff --git a/src/pref.cpp b/src/pref.cpp
index 600fac1..3ff8956 100644
--- a/src/pref.cpp
+++ b/src/pref.cpp
@@ -319,8 +319,8 @@ KDE_NO_EXPORT void PrefGeneralPageLooks::fontItemChanged (int f) {
 KDE_NO_EXPORT void PrefGeneralPageLooks::fontClicked () {
     if (fontscombo->currentItem () < int (FontSetting::last_target)) {
         TQFont myfont = fonts [fontscombo->currentItem ()].newfont;
-        int res = KFontDialog::getFont (myfont, false, this);
-        if (res == KFontDialog::Accepted) {
+        int res = TDEFontDialog::getFont (myfont, false, this);
+        if (res == TDEFontDialog::Accepted) {
             fonts [fontscombo->currentItem ()].newfont = myfont;
             fontbutton->setFont (myfont);
         }
diff --git a/src/viewarea.cpp b/src/viewarea.cpp
index 858f3d7..439a20e 100644
--- a/src/viewarea.cpp
+++ b/src/viewarea.cpp
@@ -1342,7 +1342,7 @@ KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (TQWidget * parent, View * view)
  : TQWidget (parent, "kde_kmplayer_viewarea", WResizeNoErase | WRepaintNoErase),
    m_parent (parent),
    m_view (view),
-   m_collection (new KActionCollection (this)),
+   m_collection (new TDEActionCollection (this)),
    surface (new ViewSurface (this)),
    m_mouse_invisible_timer (0),
    m_repaint_timer (0),
@@ -1353,7 +1353,7 @@ KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (TQWidget * parent, View * view)
    m_minimal (false) {
     setEraseColor (TQColor (0, 0, 0));
     setAcceptDrops (true);
-    new KAction (i18n ("Fullscreen"), KShortcut (TQt::Key_F), TQT_TQOBJECT(this), TQT_SLOT (accelActivated ()), m_collection, "view_fullscreen_toggle");
+    new TDEAction (i18n ("Fullscreen"), TDEShortcut (TQt::Key_F), TQT_TQOBJECT(this), TQT_SLOT (accelActivated ()), m_collection, "view_fullscreen_toggle");
     setMouseTracking (true);
     if (!image_data_map)
         imageCacheDeleter.setObject (image_data_map, new ImageDataMap);
diff --git a/src/viewarea.h b/src/viewarea.h
index 7de38d8..de3b32d 100644
--- a/src/viewarea.h
+++ b/src/viewarea.h
@@ -22,7 +22,7 @@
 
 #include <tqwidget.h>
 
-class KActionCollection;
+class TDEActionCollection;
 
 namespace KMPlayer {
 
@@ -40,7 +40,7 @@ public:
     ~ViewArea ();
     KDE_NO_EXPORT bool isFullScreen () const { return m_fullscreen; }
     KDE_NO_EXPORT bool isMinimalMode () const { return m_minimal; }
-    KDE_NO_EXPORT KActionCollection * actionCollection () const { return m_collection; }
+    KDE_NO_EXPORT TDEActionCollection * actionCollection () const { return m_collection; }
     KDE_NO_EXPORT TQRect topWindowRect () const { return m_topwindow_rect; }
     SurfacePtr getSurface (NodePtr node);
     void setAudioVideoGeometry (const IRect &rect, unsigned int * bg);
@@ -70,7 +70,7 @@ private:
     ViewAreaPrivate * d;
     TQWidget * m_parent;
     View * m_view;
-    KActionCollection * m_collection;
+    TDEActionCollection * m_collection;
     SurfacePtr surface;
     NodePtrW video_node;
     TQRect m_av_geometry;