Rename a number of classes to enhance compatibility with KDE4

66 files changed, 371 insertions, 371 deletions

diff --git a/tdeio/Mainpage.dox b/tdeio/Mainpage.dox
index 2de4b3157..464faf7a6 100644
--- a/tdeio/Mainpage.dox
+++ b/tdeio/Mainpage.dox
@@ -39,7 +39,7 @@
  * its building blocks and some other widgets, making use of the file dialog.
  *
  * The file dialog provides different views; there is a vertically scrolling
- * view based on KListView, showing things like filename, file size,
+ * view based on TDEListView, showing things like filename, file size,
  * permissions etc. in separate columns. And there is a horizontally scrolling
  * view based on KIconView. Additionally, there are some compound views,
  * like a view using the icon-view for files on the right side and another
@@ -55,7 +55,7 @@
  * to them is KDirOperator. It allows the user to switch between different
  * views.
  *
- * KFileTreeView is a KListView based widget that displays files and/or
+ * KFileTreeView is a TDEListView based widget that displays files and/or
  * directories as a tree. It does not implement the KFileView interface,
  * however, so it can't be used with KDirOperator.
  *
@@ -100,7 +100,7 @@
  * The KFileView based on KIconView.
  *
  * KFileDetailView:
- * The KFileView based on KListView.
+ * The KFileView based on TDEListView.
  *
  * KFilePreview:
  * The KFileView, combining a widget showing preview for a selected file
diff --git a/tdeio/bookmarks/kbookmarkbar.cc b/tdeio/bookmarks/kbookmarkbar.cc
index e73801808..b1ebb94fa 100644
--- a/tdeio/bookmarks/kbookmarkbar.cc
+++ b/tdeio/bookmarks/kbookmarkbar.cc
@@ -45,10 +45,10 @@
 class KBookmarkBarPrivate : public dPtrTemplate<KBookmarkBar, KBookmarkBarPrivate>
 {
 public:
-    TQPtrList<KAction> m_actions;
+    TQPtrList<TDEAction> m_actions;
     bool m_readOnly;
     KBookmarkManager* m_filteredMgr;
-    KToolBar* m_sepToolBar;
+    TDEToolBar* m_sepToolBar;
     int m_sepIndex;
     bool m_atFirst;
     TQString m_dropAddress;
@@ -85,8 +85,8 @@ private:
 };
 
 KBookmarkBar::KBookmarkBar( KBookmarkManager* mgr,
-                            KBookmarkOwner *_owner, KToolBar *_toolBar,
-                            KActionCollection *coll,
+                            KBookmarkOwner *_owner, TDEToolBar *_toolBar,
+                            TDEActionCollection *coll,
                             TQObject *parent, const char *name )
     : TQObject( parent, name ), m_pOwner(_owner), m_toolBar(_toolBar),
       m_actionCollection( coll ), m_pManager(mgr)
@@ -150,7 +150,7 @@ KBookmarkBar::~KBookmarkBar()
 
 void KBookmarkBar::clear()
 {
-    TQPtrListIterator<KAction> it( dptr()->m_actions );
+    TQPtrListIterator<TDEAction> it( dptr()->m_actions );
     m_toolBar->clear();
     for (; it.current(); ++it ) {
         (*it)->unplugAll();
@@ -199,9 +199,9 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent)
                 m_toolBar->insertLineSeparator();
             else
             {
-                KAction *action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
-                connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )),
-                        this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) ));
+                TDEAction *action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
+                connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
+                        this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
 
                 action->setProperty( "url", bm.url().url() );
                 action->setProperty( "address", bm.address() );
@@ -215,7 +215,7 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent)
         }
         else
         {
-            KActionMenu *action = new KBookmarkActionMenu( text, bm.icon(),
+            TDEActionMenu *action = new KBookmarkActionMenu( text, bm.icon(),
                                                            m_actionCollection,
                                                            "bookmarkbar-actionmenu");
             action->setProperty( "address", bm.address() );
@@ -252,11 +252,11 @@ bool KBookmarkBar::isReadOnly() const
     return dptr()->m_readOnly;
 }
 
-void KBookmarkBar::slotBookmarkSelected( KAction::ActivationReason /*reason*/, TQt::ButtonState state )
+void KBookmarkBar::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/, TQt::ButtonState state )
 {
     if (!m_pOwner) return; // this view doesn't handle bookmarks...
 
-    const KAction* action = dynamic_cast<const KAction *>(sender());
+    const TDEAction* action = dynamic_cast<const TDEAction *>(sender());
     if(action)
     {
         const TQString & url = sender()->property("url").toString();
@@ -267,7 +267,7 @@ void KBookmarkBar::slotBookmarkSelected( KAction::ActivationReason /*reason*/, T
 
 void KBookmarkBar::slotBookmarkSelected()
 {
-    slotBookmarkSelected(KAction::ToolBarActivation, Qt::NoButton);
+    slotBookmarkSelected(TDEAction::ToolBarActivation, Qt::NoButton);
 }
 
 static const int const_sepId = -9999; // FIXME this is ugly,
@@ -282,9 +282,9 @@ static void removeTempSep(KBookmarkBarPrivate* p)
     }
 }
 
-static KAction* findPluggedAction(TQPtrList<KAction> actions, KToolBar *tb, int id)
+static TDEAction* findPluggedAction(TQPtrList<TDEAction> actions, TDEToolBar *tb, int id)
 {
-    TQPtrListIterator<KAction> it( actions );
+    TQPtrListIterator<TDEAction> it( actions );
     for (; (*it); ++it )
         if ((*it)->isPlugged(tb, id))
             return (*it);
@@ -302,19 +302,19 @@ static KAction* findPluggedAction(TQPtrList<KAction> actions, KToolBar *tb, int
  *        returned action was dropped on
  */
 static TQString handleToolbarDragMoveEvent(
-    KBookmarkBarPrivate *p, KToolBar *tb, TQPoint pos, TQPtrList<KAction> actions,
+    KBookmarkBarPrivate *p, TDEToolBar *tb, TQPoint pos, TQPtrList<TDEAction> actions,
     bool &atFirst, KBookmarkManager *mgr
 ) {
     Q_UNUSED( mgr );
-    Q_ASSERT( actions.isEmpty() || (tb == dynamic_cast<KToolBar*>(actions.first()->container(0))) );
+    Q_ASSERT( actions.isEmpty() || (tb == dynamic_cast<TDEToolBar*>(actions.first()->container(0))) );
     p->m_sepToolBar = tb;
     p->m_sepToolBar->removeItemDelayed(const_sepId);
 
     int index = 0;
-    KToolBarButton* b;
+    TDEToolBarButton* b;
 
-    b = dynamic_cast<KToolBarButton*>(tb->childAt(pos));
-    KAction *a = 0;
+    b = dynamic_cast<TDEToolBarButton*>(tb->childAt(pos));
+    TDEAction *a = 0;
     TQString address;
     atFirst = false;
 
@@ -382,23 +382,23 @@ skipact:
 }
 
 // TODO - document!!!!
-static KAction* handleToolbarMouseButton(TQPoint pos, TQPtrList<KAction> actions,
+static TDEAction* handleToolbarMouseButton(TQPoint pos, TQPtrList<TDEAction> actions,
 	                                     KBookmarkManager * /*mgr*/, TQPoint & pt)
 {
-    KAction *act = actions.first();
+    TDEAction *act = actions.first();
     if (!act) {
         return 0;
     }
 
-    KToolBar *tb = dynamic_cast<KToolBar*>(act->container(0));
+    TDEToolBar *tb = dynamic_cast<TDEToolBar*>(act->container(0));
     Q_ASSERT(tb);
 
-    KToolBarButton *b;
-    b = dynamic_cast<KToolBarButton*>(tb->childAt(pos));
+    TDEToolBarButton *b;
+    b = dynamic_cast<TDEToolBarButton*>(tb->childAt(pos));
     if (!b)
         return 0;
 
-    KAction *a = 0;
+    TDEAction *a = 0;
     a = findPluggedAction(actions, tb, b->id());
     Q_ASSERT(a);
     pt = tb->mapToGlobal(pos);
@@ -454,7 +454,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
         TQMouseEvent *mev = (TQMouseEvent*)e;
 
         TQPoint pt;
-        KAction *_a;
+        TDEAction *_a;
 
         // FIXME, see how this holds up on an empty toolbar
         _a = handleToolbarMouseButton( mev->pos(), dptr()->m_actions, m_pManager, pt );
@@ -463,7 +463,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
             dptr()->m_highlightedAddress = _a->property("address").toString();
             KBookmark bookmark = m_pManager->findByAddress( dptr()->m_highlightedAddress );
             RMB::begin_rmb_action(this);
-            KPopupMenu *pm = new KPopupMenu;
+            TDEPopupMenu *pm = new TDEPopupMenu;
             rmbSelf(this)->fillContextMenu( pm, dptr()->m_highlightedAddress, 0 );
             emit aboutToShowContextMenu( rmbSelf(this)->atAddress( dptr()->m_highlightedAddress ), pm );
             rmbSelf(this)->fillContextMenu2( pm, dptr()->m_highlightedAddress, 0 );
@@ -510,7 +510,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
             return false;
         bool _atFirst;
         TQString dropAddress;
-        KToolBar *tb = (KToolBar*)o;
+        TDEToolBar *tb = (TDEToolBar*)o;
         dropAddress = handleToolbarDragMoveEvent(dptr(), tb, dme->pos(), dptr()->m_actions, _atFirst, m_pManager);
         if (!dropAddress.isNull())
         {
diff --git a/tdeio/bookmarks/kbookmarkbar.h b/tdeio/bookmarks/kbookmarkbar.h
index 1f100d183..2f5495cda 100644
--- a/tdeio/bookmarks/kbookmarkbar.h
+++ b/tdeio/bookmarks/kbookmarkbar.h
@@ -27,11 +27,11 @@
 #include <kbookmark.h>
 #include <kaction.h>
 
-class KToolBar;
+class TDEToolBar;
 class KBookmarkMenu;
 class KBookmarkOwner;
-class KActionCollection;
-class KAction;
+class TDEActionCollection;
+class TDEAction;
 class TQPopupMenu;
 
 /**
@@ -52,14 +52,14 @@ public:
      * @param owner implementation of the KBookmarkOwner interface (callbacks)
      * @param toolBar toolbar to fill
      * 
-     * The KActionCollection pointer argument is now obsolete.
+     * The TDEActionCollection pointer argument is now obsolete.
      *
      * @param parent the parent widget for the bookmark toolbar
      * @param name the internal name for the bookmark toolbar
      */
     KBookmarkBar( KBookmarkManager* manager,
-                  KBookmarkOwner *owner, KToolBar *toolBar,
-                  KActionCollection *,
+                  KBookmarkOwner *owner, TDEToolBar *toolBar,
+                  TDEActionCollection *,
                   TQObject *parent = 0L, const char *name = 0L);
 
     virtual ~KBookmarkBar();
@@ -98,7 +98,7 @@ public slots:
     /**
      * @since 3.4
      */
-    void slotBookmarkSelected( KAction::ActivationReason reason, TQt::ButtonState state );
+    void slotBookmarkSelected( TDEAction::ActivationReason reason, TQt::ButtonState state );
     
     /// @since 3.2
     void slotRMBActionRemove( int );
@@ -119,8 +119,8 @@ private:
     KBookmarkGroup getToolbar();
 
     KBookmarkOwner *m_pOwner;
-    TQGuardedPtr<KToolBar> m_toolBar;
-    KActionCollection *m_actionCollection;
+    TQGuardedPtr<TDEToolBar> m_toolBar;
+    TDEActionCollection *m_actionCollection;
     KBookmarkManager *m_pManager;
     TQPtrList<KBookmarkMenu> m_lstSubMenus;
 
diff --git a/tdeio/bookmarks/kbookmarkimporter.h b/tdeio/bookmarks/kbookmarkimporter.h
index cc87b2004..6a038e03b 100644
--- a/tdeio/bookmarks/kbookmarkimporter.h
+++ b/tdeio/bookmarks/kbookmarkimporter.h
@@ -31,7 +31,7 @@
 /**
  * A class for importing NS bookmarks
  * KEditBookmarks uses it to insert bookmarks into its DOM tree,
- * and KActionMenu uses it to create actions directly.
+ * and TDEActionMenu uses it to create actions directly.
  * @since 3.2
  */
 class TDEIO_EXPORT KBookmarkImporterBase : public TQObject
diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc
index a4d88ae57..ff9f8d4ec 100644
--- a/tdeio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cc
@@ -77,8 +77,8 @@ static TQString makeTextNodeMod(KBookmark bk, const TQString &m_nodename, const
 /********************************************************************/
 
 KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
-                              KBookmarkOwner * _owner, KPopupMenu * _parentMenu,
-                              KActionCollection *collec, bool _isRoot, bool _add,
+                              KBookmarkOwner * _owner, TDEPopupMenu * _parentMenu,
+                              TDEActionCollection *collec, bool _isRoot, bool _add,
                               const TQString & parentAddress )
   : TQObject(),
     m_bIsRoot(_isRoot), m_bAddBookmark(_add),
@@ -96,9 +96,9 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
   if (m_actionCollection)
   {
     m_actionCollection->setHighlightingEnabled(true);
-    disconnect( m_actionCollection, TQT_SIGNAL( actionHighlighted( KAction * ) ), 0, 0 );
-    connect( m_actionCollection, TQT_SIGNAL( actionHighlighted( KAction * ) ),
-             this, TQT_SLOT( slotActionHighlighted( KAction * ) ) );
+    disconnect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ), 0, 0 );
+    connect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ),
+             this, TQT_SLOT( slotActionHighlighted( TDEAction * ) ) );
   }
 
   m_bNSBookmark = m_parentAddress.isNull();
@@ -112,8 +112,8 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
     if ( KBookmarkSettings::self()->m_contextmenu )
     {
       (void) _parentMenu->contextMenu();
-      connect( _parentMenu, TQT_SIGNAL( aboutToShowContextMenu(KPopupMenu*, int, TQPopupMenu*) ),
-               this, TQT_SLOT( slotAboutToShowContextMenu(KPopupMenu*, int, TQPopupMenu*) ));
+      connect( _parentMenu, TQT_SIGNAL( aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ),
+               this, TQT_SLOT( slotAboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ));
     }
 
     if ( m_bIsRoot )
@@ -142,7 +142,7 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
 KBookmarkMenu::~KBookmarkMenu()
 {
   //kdDebug(7043) << "KBookmarkMenu::~KBookmarkMenu() " << this << endl;
-  TQPtrListIterator<KAction> it( m_actions );
+  TQPtrListIterator<TDEAction> it( m_actions );
   for (; it.current(); ++it )
     it.current()->unplugAll();
 
@@ -169,7 +169,7 @@ TQString KBookmarkMenu::s_highlightedAddress;
 TQString KBookmarkMenu::s_highlightedImportType;
 TQString KBookmarkMenu::s_highlightedImportLocation;
 
-void KBookmarkMenu::slotActionHighlighted( KAction* action )
+void KBookmarkMenu::slotActionHighlighted( TDEAction* action )
 {
   if (action->isA("KBookmarkActionMenu") || action->isA("KBookmarkAction"))
   {
@@ -231,12 +231,12 @@ KBookmark RMB::atAddress(const TQString & address)
   return bookmark;
 }
 
-void KBookmarkMenu::slotAboutToShowContextMenu( KPopupMenu*, int, TQPopupMenu* contextMenu )
+void KBookmarkMenu::slotAboutToShowContextMenu( TDEPopupMenu*, int, TQPopupMenu* contextMenu )
 {
   //kdDebug(7043) << "KBookmarkMenu::slotAboutToShowContextMenu" << s_highlightedAddress << endl;
   if (s_highlightedAddress.isNull())
   {
-    KPopupMenu::contextMenuFocus()->hideContextMenu();
+    TDEPopupMenu::contextMenuFocus()->hideContextMenu();
     return;
   }
   contextMenu->clear();
@@ -411,7 +411,7 @@ void RMB::slotRMBActionCopyLocation( int val )
 }
 
 void RMB::hidePopup() {
-  KPopupMenu::contextMenuFocus()->hideContextMenu();
+  TDEPopupMenu::contextMenuFocus()->hideContextMenu();
 }
 
 /********************************************************************/
@@ -467,7 +467,7 @@ void KBookmarkMenu::refill()
   //kdDebug(7043) << "KBookmarkMenu::refill()" << endl;
   m_lstSubMenus.clear();
 
-  TQPtrListIterator<KAction> it( m_actions );
+  TQPtrListIterator<TDEAction> it( m_actions );
   for (; it.current(); ++it )
     it.current()->unplug( m_parentMenu );
 
@@ -480,12 +480,12 @@ void KBookmarkMenu::refill()
 
 void KBookmarkMenu::addAddBookmarksList()
 {
-  if (!kapp->authorizeKAction("bookmarks"))
+  if (!kapp->authorizeTDEAction("bookmarks"))
      return;
 
   TQString title = i18n( "Bookmark Tabs as Folder..." );
 
-  KAction * paAddBookmarksList = new KAction( title,
+  TDEAction * paAddBookmarksList = new TDEAction( title,
                                           "bookmarks_list_add",
                                           0,
                                           this,
@@ -500,14 +500,14 @@ void KBookmarkMenu::addAddBookmarksList()
 
 void KBookmarkMenu::addAddBookmark()
 {
-  if (!kapp->authorizeKAction("bookmarks"))
+  if (!kapp->authorizeTDEAction("bookmarks"))
      return;
 
   TQString title = i18n( "Add Bookmark" );
 
-  KAction * paAddBookmarks = new KAction( title,
+  TDEAction * paAddBookmarks = new TDEAction( title,
                                           "bookmark_add",
-                                          m_bIsRoot && m_bAddShortcuts ? KStdAccel::addBookmark() : KShortcut(),
+                                          m_bIsRoot && m_bAddShortcuts ? TDEStdAccel::addBookmark() : TDEShortcut(),
                                           this,
                                           TQT_SLOT( slotAddBookmark() ),
                                           m_actionCollection, m_bIsRoot ? "add_bookmark" : 0 );
@@ -520,10 +520,10 @@ void KBookmarkMenu::addAddBookmark()
 
 void KBookmarkMenu::addEditBookmarks()
 {
-  if (!kapp->authorizeKAction("bookmarks"))
+  if (!kapp->authorizeTDEAction("bookmarks"))
      return;
 
-  KAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQT_SLOT( slotEditBookmarks() ),
+  TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQT_SLOT( slotEditBookmarks() ),
                                                              m_actionCollection, "edit_bookmarks" );
   m_paEditBookmarks->plug( m_parentMenu );
   m_paEditBookmarks->setToolTip( i18n( "Edit your bookmark collection in a separate window" ) );
@@ -532,7 +532,7 @@ void KBookmarkMenu::addEditBookmarks()
 
 void KBookmarkMenu::addNewFolder()
 {
-  if (!kapp->authorizeKAction("bookmarks"))
+  if (!kapp->authorizeTDEAction("bookmarks"))
      return;
 
   TQString title = i18n( "&New Bookmark Folder..." );
@@ -540,7 +540,7 @@ void KBookmarkMenu::addNewFolder()
   while ( ( p = title.find( '&' ) ) >= 0 )
     title.remove( p, 1 );
 
-  KAction * paNewFolder = new KAction( title,
+  TDEAction * paNewFolder = new TDEAction( title,
                                        "folder_new", //"folder",
                                        0,
                                        this,
@@ -555,7 +555,7 @@ void KBookmarkMenu::addNewFolder()
 
 void KBookmarkMenu::fillBookmarkMenu()
 {
-  if (!kapp->authorizeKAction("bookmarks"))
+  if (!kapp->authorizeTDEAction("bookmarks"))
      return;
 
   if ( m_bIsRoot )
@@ -594,7 +594,7 @@ void KBookmarkMenu::fillBookmarkMenu()
           haveSep = true;
        }
 
-       KActionMenu * actionMenu;
+       TDEActionMenu * actionMenu;
        actionMenu = new KImportedBookmarksActionMenu(
                               info.name, info.type,
                               m_actionCollection, "kbookmarkmenu" );
@@ -638,9 +638,9 @@ void KBookmarkMenu::fillBookmarkMenu()
       else
       {
         //kdDebug(7043) << "Creating URL bookmark menu item for " << bm.text() << endl;
-        KAction * action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
-        connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )),
-                this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) ));
+        TDEAction * action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
+        connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
+                this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
 
         action->setProperty( "url", bm.url().url() );
         action->setProperty( "address", bm.address() );
@@ -654,7 +654,7 @@ void KBookmarkMenu::fillBookmarkMenu()
     else
     {
       //kdDebug(7043) << "Creating bookmark submenu named " << bm.text() << endl;
-      KActionMenu * actionMenu = new KBookmarkActionMenu( text, bm.icon(),
+      TDEActionMenu * actionMenu = new KBookmarkActionMenu( text, bm.icon(),
                                                           m_actionCollection,
                                                           "kbookmarkmenu" );
       actionMenu->setProperty( "address", bm.address() );
@@ -681,7 +681,7 @@ void KBookmarkMenu::fillBookmarkMenu()
 
     if ( KBookmarkSettings::self()->m_quickactions )
     {
-      KActionMenu * actionMenu = new KActionMenu( i18n("Quick Actions"), m_actionCollection, 0L );
+      TDEActionMenu * actionMenu = new TDEActionMenu( i18n("Quick Actions"), m_actionCollection, 0L );
       fillContextMenu( actionMenu->popupMenu(), m_parentAddress, 1 );
       actionMenu->plug( m_parentMenu );
       m_actions.append( actionMenu );
@@ -743,11 +743,11 @@ void KBookmarkMenu::slotNewFolder()
   }
 }
 
-void KBookmarkMenu::slotBookmarkSelected( KAction::ActivationReason /*reason*/, TQt::ButtonState state )
+void KBookmarkMenu::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/, TQt::ButtonState state )
 {
   kdDebug(7043) << "KBookmarkMenu::slotBookmarkSelected()" << endl;
   if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
-  const KAction* action =  dynamic_cast<const KAction *>(sender());
+  const TDEAction* action =  dynamic_cast<const TDEAction *>(sender());
   if(action)
   {
       const TQString& url = sender()->property("url").toString();
@@ -758,7 +758,7 @@ void KBookmarkMenu::slotBookmarkSelected( KAction::ActivationReason /*reason*/,
 
 void KBookmarkMenu::slotBookmarkSelected()
 {
-    slotBookmarkSelected(KAction::PopupMenuActivation, Qt::NoButton);
+    slotBookmarkSelected(TDEAction::PopupMenuActivation, Qt::NoButton);
 }
 
 KExtendedBookmarkOwner* KBookmarkMenu::extOwner()
@@ -1057,9 +1057,9 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin
 {
   TQString _text = KStringHandler::csqueeze(text);
   _text.replace( '&', "&&" );
-  KAction * action = new KBookmarkAction(_text, "html", 0, 0, "", m_actionCollection, 0);
-  connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )),
-          m_menu, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) ));
+  TDEAction * action = new KBookmarkAction(_text, "html", 0, 0, "", m_actionCollection, 0);
+  connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
+          m_menu, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
   action->setProperty( "url", url );
   action->setToolTip( url );
   action->plug( mstack.top()->m_parentMenu );
@@ -1070,7 +1070,7 @@ void KBookmarkMenuNSImporter::newFolder( const TQString & text, bool, const TQSt
 {
   TQString _text = KStringHandler::csqueeze(text);
   _text.replace( '&', "&&" );
-  KActionMenu * actionMenu = new KActionMenu( _text, "folder", m_actionCollection, 0L );
+  TDEActionMenu * actionMenu = new TDEActionMenu( _text, "folder", m_actionCollection, 0L );
   actionMenu->plug( mstack.top()->m_parentMenu );
   mstack.top()->m_actions.append( actionMenu );
   KBookmarkMenu *subMenu = new KBookmarkMenu( m_pManager, m_menu->m_pOwner, actionMenu->popupMenu(),
diff --git a/tdeio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h
index 35e6191e3..003077202 100644
--- a/tdeio/bookmarks/kbookmarkmenu.h
+++ b/tdeio/bookmarks/kbookmarkmenu.h
@@ -43,18 +43,18 @@ class TQListView;
 class KLineEdit;
 class KBookmark;
 class KBookmarkGroup;
-class KAction;
-class KActionMenu;
-class KActionCollection;
+class TDEAction;
+class TDEActionMenu;
+class TDEActionCollection;
 class KBookmarkOwner;
 class KBookmarkMenu;
-class KPopupMenu;
+class TDEPopupMenu;
 
 namespace TDEIO { class Job; }
 
 /**
  * This class provides a bookmark menu.  It is typically used in
- * cooperation with KActionMenu but doesn't have to be.
+ * cooperation with TDEActionMenu but doesn't have to be.
  *
  * If you use this class by itself, then it will use KDE defaults for
  * everything -- the bookmark path, bookmark editor, bookmark launcher..
@@ -66,7 +66,7 @@ namespace TDEIO { class Job; }
  *
  * Using this class is very simple:
  *
- * 1) Create a popup menu (either KActionMenu or KPopupMenu will do)
+ * 1) Create a popup menu (either TDEActionMenu or TDEPopupMenu will do)
  * 2) Instantiate a new KBookmarkMenu object using the above popup
  *    menu as a parameter
  * 3) Insert your (now full) popup menu wherever you wish
@@ -90,7 +90,7 @@ public:
    * @param mgr The bookmark manager to use (i.e. for reading and writing)
    * @param owner implementation of the KBookmarkOwner callback interface.
    * @param parentMenu menu to be filled
-   * @param collec parent collection for the KActions. 
+   * @param collec parent collection for the TDEActions. 
    *  Only used for other menus than the toplevel one.
    * @param root true for the toplevel menu
    * @param add true to show the "Add Bookmark" and "New Folder" entries
@@ -102,8 +102,8 @@ public:
    * An _empty_ parentAddress denotes the toplevel bookmark menu
    */
   KBookmarkMenu( KBookmarkManager* mgr,
-                 KBookmarkOwner * owner, KPopupMenu * parentMenu,
-                 KActionCollection * collec, bool root, bool add = true,
+                 KBookmarkOwner * owner, TDEPopupMenu * parentMenu,
+                 TDEActionCollection * collec, bool root, bool add = true,
                  const TQString & parentAddress = "" );
 
   ~KBookmarkMenu();
@@ -169,8 +169,8 @@ public slots: // public for bookmark bar
 
 protected slots:
   void slotAboutToShow();
-  void slotAboutToShowContextMenu( KPopupMenu *, int, TQPopupMenu * );
-  void slotActionHighlighted( KAction * );
+  void slotAboutToShowContextMenu( TDEPopupMenu *, int, TQPopupMenu * );
+  void slotActionHighlighted( TDEAction * );
 
   void slotRMBActionRemove( int );
   void slotRMBActionInsert( int );
@@ -182,7 +182,7 @@ protected slots:
   /**
    * @ since 3.4
    */
-  void slotBookmarkSelected( KAction::ActivationReason reason, TQt::ButtonState state );
+  void slotBookmarkSelected( TDEAction::ActivationReason reason, TQt::ButtonState state );
   void slotAddBookmarksList();
   void slotAddBookmark();
   void slotNewFolder();
@@ -214,16 +214,16 @@ protected:
    * The menu in which we plug our actions.
    * Supplied in the constructor.
    */
-  KPopupMenu * m_parentMenu;
+  TDEPopupMenu * m_parentMenu;
   /**
    * List of our sub menus
    */
   TQPtrList<KBookmarkMenu> m_lstSubMenus;
-  KActionCollection * m_actionCollection;
+  TDEActionCollection * m_actionCollection;
   /**
    * List of our actions.
    */
-  TQPtrList<KAction> m_actions;
+  TQPtrList<TDEAction> m_actions;
   /**
    * Parent bookmark for this menu.
    */
@@ -236,13 +236,13 @@ protected:
 };
 
 /**
- * A class connected to KNSBookmarkImporter, to fill KActionMenus.
+ * A class connected to KNSBookmarkImporter, to fill TDEActionMenus.
  */
 class TDEIO_EXPORT KBookmarkMenuNSImporter : public TQObject
 {
   Q_OBJECT
 public:
-  KBookmarkMenuNSImporter( KBookmarkManager* mgr, KBookmarkMenu * menu, KActionCollection * act ) :
+  KBookmarkMenuNSImporter( KBookmarkManager* mgr, KBookmarkMenu * menu, TDEActionCollection * act ) :
      m_menu(menu), m_actionCollection(act), m_pManager(mgr) {}
 
   void openNSBookmarks();
@@ -258,7 +258,7 @@ protected slots:
 protected:
   TQPtrStack<KBookmarkMenu> mstack;
   KBookmarkMenu * m_menu;
-  KActionCollection * m_actionCollection;
+  TDEActionCollection * m_actionCollection;
   KBookmarkManager* m_pManager;
 };
 
diff --git a/tdeio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h
index cb88607fe..dff3e6f30 100644
--- a/tdeio/bookmarks/kbookmarkmenu_p.h
+++ b/tdeio/bookmarks/kbookmarkmenu_p.h
@@ -44,15 +44,15 @@ class TQListView;
 class KLineEdit;
 class KBookmark;
 class KBookmarkGroup;
-class KAction;
-class KActionMenu;
-class KActionCollection;
+class TDEAction;
+class TDEActionMenu;
+class TDEActionCollection;
 class KBookmarkOwner;
 class KBookmarkMenu;
 class KBookmarkBar;
-class KPopupMenu;
+class TDEPopupMenu;
 
-class KImportedBookmarksActionMenu : public KActionMenu {
+class KImportedBookmarksActionMenu : public TDEActionMenu {
   Q_OBJECT
   TQ_PROPERTY( TQString type READ type WRITE setType )
   TQ_PROPERTY( TQString location READ location WRITE setLocation )
@@ -67,13 +67,13 @@ private:
 public:
   KImportedBookmarksActionMenu( 
     const TQString &text, const TQString& sIconName,
-    KActionCollection* parent, const char* name)
-  : KActionMenu(text, sIconName, parent, name) {
+    TDEActionCollection* parent, const char* name)
+  : TDEActionMenu(text, sIconName, parent, name) {
      ;
   }
 };
 
-class KBookmarkActionMenu : public KActionMenu {
+class KBookmarkActionMenu : public TDEActionMenu {
   Q_OBJECT
   TQ_PROPERTY( TQString url READ url WRITE setUrl )
   TQ_PROPERTY( TQString address READ address WRITE setAddress )
@@ -92,13 +92,13 @@ private:
 public:
   KBookmarkActionMenu( 
     const TQString &text, const TQString& sIconName,
-    KActionCollection* parent, const char* name)
-  : KActionMenu(text, sIconName, parent, name) {
+    TDEActionCollection* parent, const char* name)
+  : TDEActionMenu(text, sIconName, parent, name) {
      ;
   }
 };
 
-class KBookmarkAction : public KAction {
+class KBookmarkAction : public TDEAction {
   Q_OBJECT
   TQ_PROPERTY( TQString url READ url WRITE setUrl )
   TQ_PROPERTY( TQString address READ address WRITE setAddress )
@@ -113,15 +113,15 @@ private:
 public:
   // KDE4: remove
   KBookmarkAction(
-    const TQString& text, const TQString& sIconName, const KShortcut& cut,
+    const TQString& text, const TQString& sIconName, const TDEShortcut& cut,
     const TQObject* receiver, const char* slot,
-    KActionCollection* parent, const char* name)
-  : KAction(text, sIconName, cut, receiver, slot, parent, name) {
+    TDEActionCollection* parent, const char* name)
+  : TDEAction(text, sIconName, cut, receiver, slot, parent, name) {
   }
   KBookmarkAction(
-    const TQString& text, const TQString& sIconName, const KShortcut& cut,
-    KActionCollection* parent, const char* name)
-  : KAction(text, sIconName, cut, parent, name) {
+    const TQString& text, const TQString& sIconName, const TDEShortcut& cut,
+    TDEActionCollection* parent, const char* name)
+  : TDEAction(text, sIconName, cut, parent, name) {
   }
 };
 
diff --git a/tdeio/misc/tdewalletd/tdewalletd.desktop b/tdeio/misc/tdewalletd/tdewalletd.desktop
index 1e65fe0df..1f92976e7 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.desktop
+++ b/tdeio/misc/tdewalletd/tdewalletd.desktop
@@ -61,7 +61,7 @@ Name[ru]=Служба бумажника
 Name[rw]=Igice Dayimoni KUruhago
 Name[se]=KWallet-bálvámoduvla
 Name[sk]=Modul démona KWallet
-Name[sl]=Modul demona KListnica
+Name[sl]=Modul demona TDEListnica
 Name[sq]=Demoni për Modulin KWallet
 Name[sr]=KWallet демон модул
 Name[sr@Latn]=KWallet demon modul
@@ -132,7 +132,7 @@ Comment[ru]=Управление бумажником TDE
 Comment[rw]=Igice cya dayimoni KUruhago cya KDED
 Comment[se]=KDED:a KWallet-bálvámoduvla
 Comment[sk]=Modul démona KWallet pre KDED
-Comment[sl]=Modul demona KListnica za KDED
+Comment[sl]=Modul demona TDEListnica za KDED
 Comment[sr]=KWallet демон модул за KDED
 Comment[sr@Latn]=KWallet demon modul za KDED
 Comment[sv]=Kwallet-demonmodul för KDED
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 8a9c7f21e..4f4b720f5 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -94,7 +94,7 @@ class UIServerSystemTray:public KSystemTray
       UIServerSystemTray(UIServer* uis)
          :KSystemTray(uis)
       {
-         KPopupMenu* pop= contextMenu();
+         TDEPopupMenu* pop= contextMenu();
          pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure()));
          pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
          setPixmap(loadIcon("filesave"));
@@ -118,7 +118,7 @@ class ProgressConfigDialog:public KDialogBase
       TQCheckBox *m_statusBarCb;
       TQCheckBox *m_headerCb;
       TQCheckBox *m_fixedWidthCb;
-      KListView *m_columns;
+      TDEListView *m_columns;
       TQCheckListItem *(m_items[ListProgress::TB_MAX]);
 };
 
@@ -134,7 +134,7 @@ ProgressConfigDialog::ProgressConfigDialog(TQWidget *parent)
    m_statusBarCb=new TQCheckBox(i18n("Show statusbar"), plainPage());
    m_fixedWidthCb=new TQCheckBox(i18n("Column widths are user adjustable"), plainPage());
    TQLabel *label=new TQLabel(i18n("Show information:"), plainPage());
-   m_columns=new KListView(plainPage());
+   m_columns=new TDEListView(plainPage());
 
    m_columns->addColumn("info");
    m_columns->setSorting(-1);
@@ -455,7 +455,7 @@ void ProgressItem::updateVisibility()
 
 //-----------------------------------------------------------------------------
 ListProgress::ListProgress (TQWidget *parent, const char *name)
-: KListView (parent, name)
+: TDEListView (parent, name)
 {
 
   // enable selection of more than one item
@@ -584,7 +584,7 @@ void ListProgress::writeSettings() {
 
 
 UIServer::UIServer()
-:KMainWindow(0, "")
+:TDEMainWindow(0, "")
 ,DCOPObject("UIServer")
 ,m_shuttingDown(false)
 ,m_configDialog(0)
@@ -602,7 +602,7 @@ UIServer::UIServer()
                           TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
                           TQT_SLOT(slotConfigure()), true, i18n("Settings..."));
 
-  toolBar()->setBarPos( KToolBar::Left );
+  toolBar()->setBarPos( TDEToolBar::Left );
 
   // setup statusbar
   statusBar()->insertItem( i18n(" Files: %1 ").arg( 0 ), ID_TOTAL_FILES);
@@ -619,8 +619,8 @@ UIServer::UIServer()
            TQT_SLOT( slotSelection() ) );
   connect( listProgress, TQT_SIGNAL( executed( TQListViewItem* ) ),
            TQT_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) );
-  connect( listProgress, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem *, const TQPoint &)),
-           TQT_SLOT(slotShowContextMenu(KListView*, TQListViewItem *, const TQPoint&)));
+  connect( listProgress, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)),
+           TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
 
 
   // setup animation timer
@@ -671,7 +671,7 @@ void UIServer::applySettings()
      toolBar()->show();
 }
 
-void UIServer::slotShowContextMenu(KListView*, TQListViewItem* item, const TQPoint& pos)
+void UIServer::slotShowContextMenu(TDEListView*, TQListViewItem* item, const TQPoint& pos)
 {
    if (m_contextMenu==0)
    {
@@ -1355,7 +1355,7 @@ void UIServer::slotCancelCurrent() {
 
 void UIServer::resizeEvent(TQResizeEvent* e)
 {
-   KMainWindow::resizeEvent(e);
+   TDEMainWindow::resizeEvent(e);
    writeSettings();
 }
 
diff --git a/tdeio/misc/uiserver.h b/tdeio/misc/uiserver.h
index baf495dfe..c86886bac 100644
--- a/tdeio/misc/uiserver.h
+++ b/tdeio/misc/uiserver.h
@@ -55,7 +55,7 @@ struct ListProgressColumnConfig
 * List view in the UIServer.
 * @internal
 */
-class TDEIO_EXPORT ListProgress : public KListView {
+class TDEIO_EXPORT ListProgress : public TDEListView {
 
   Q_OBJECT
 
@@ -214,7 +214,7 @@ class UIServerSystemTray;
  *
  * @internal
  */
-class TDEIO_EXPORT UIServer : public KMainWindow, public DCOPObject {
+class TDEIO_EXPORT UIServer : public TDEMainWindow, public DCOPObject {
 
   K_DCOP
   Q_OBJECT
@@ -382,7 +382,7 @@ protected slots:
 
   void slotJobCanceled( ProgressItem * );
   void slotApplyConfig();
-  void slotShowContextMenu(KListView*, TQListViewItem *item, const TQPoint& pos);
+  void slotShowContextMenu(TDEListView*, TQListViewItem *item, const TQPoint& pos);
 
 protected:
 
@@ -396,7 +396,7 @@ protected:
   TQTimer* updateTimer;
   ListProgress* listProgress;
 
-  KToolBar::BarPosition toolbarPos;
+  TDEToolBar::BarPosition toolbarPos;
   TQString properties;
 
   void applySettings();
diff --git a/tdeio/tdefile/ChangeLog b/tdeio/tdefile/ChangeLog
index 79ac59808..ccfb45ab5 100644
--- a/tdeio/tdefile/ChangeLog
+++ b/tdeio/tdefile/ChangeLog
@@ -62,7 +62,7 @@ Tue Feb 15 14:21:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	
 	* kdiroperator.cpp (setSorting): 
 	added setSorting() and sorting() to keep sorting when switching views
-	a few cosmetic and KAction changes
+	a few cosmetic and TDEAction changes
 
 Sun Feb 13 00:45:12 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
@@ -87,7 +87,7 @@ Fri Feb 11 12:17:59 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 Thu Feb 10 17:06:36 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 	* kdiroperator.cpp (connectView): 
-	- Now that KToggleAction is fixed, I can commit the new stuff:
+	- Now that TDEToggleAction is fixed, I can commit the new stuff:
 	  Offer Actions for all the common functionality, i.e. sorting, setting
 	  the view, home(), cdUp(), back, forward, etc.
 	  All actions are exposed through a QActionCollection
diff --git a/tdeio/tdefile/NOTES b/tdeio/tdefile/NOTES
index ad99065be..e2037e382 100644
--- a/tdeio/tdefile/NOTES
+++ b/tdeio/tdefile/NOTES
@@ -82,7 +82,7 @@ konqueror versions of the views.
 
 This class inherits KParts::ReadOnlyPart, and provides a BrowserExtension.
 It integrates KonqFileManagerWidget as its KParts widget, and provides
-KActions for it.
+TDEActions for it.
 
 Important :
 
diff --git a/tdeio/tdefile/kacleditwidget.cpp b/tdeio/tdefile/kacleditwidget.cpp
index 94ee0d4c4..01eb8bcb8 100644
--- a/tdeio/tdefile/kacleditwidget.cpp
+++ b/tdeio/tdefile/kacleditwidget.cpp
@@ -143,7 +143,7 @@ KACLListViewItem::KACLListViewItem( TQListView* parent,
                                     KACLListView::EntryType _type,
                                     unsigned short _value, bool defaults,
                                     const TQString& _qualifier )
- : KListViewItem( parent, parent->lastItem() ), // we want to append
+ : TDEListViewItem( parent, parent->lastItem() ), // we want to append
    type( _type ), value( _value ), isDefault( defaults ),
    qualifier( _qualifier ), isPartial( false )
 {
@@ -204,7 +204,7 @@ void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg,
         mycg.setColor( TQColorGroup::Text, TQColor( 100, 100, 100 ) );
         p->setFont( font );
     }
-    KListViewItem::paintCell( p, mycg, column, width, alignment );
+    TDEListViewItem::paintCell( p, mycg, column, width, alignment );
 
     KACLListViewItem *below =0;
     if ( itemBelow() )
@@ -556,7 +556,7 @@ void EditACLEntryDialog::slotSelectionChanged( int id )
 
 
 KACLListView::KACLListView( TQWidget* parent, const char* name )
- : KListView( parent, name ),
+ : TDEListView( parent, name ),
    m_hasMask( false ), m_allowDefaults( false )
 {
     // Add the columns
@@ -753,7 +753,7 @@ void KACLListView::contentsMousePressEvent( TQMouseEvent * e )
     if ( !clickedItem ) return;
     // if the click is on an as yet unselected item, select it first
     if ( !clickedItem->isSelected() )
-        KListView::contentsMousePressEvent( e );
+        TDEListView::contentsMousePressEvent( e );
 
     if ( !currentItem() ) return;
     int column = header()->sectionAt( e->x() );
@@ -770,7 +770,7 @@ void KACLListView::contentsMousePressEvent( TQMouseEvent * e )
             perm = ACL_EXECUTE;
             break;
         default:
-            return KListView::contentsMousePressEvent( e );
+            return TDEListView::contentsMousePressEvent( e );
     }
     KACLListViewItem* referenceItem = static_cast<KACLListViewItem*>( clickedItem );
     unsigned short referenceHadItSet = referenceItem->value & perm;
diff --git a/tdeio/tdefile/kacleditwidget_p.h b/tdeio/tdefile/kacleditwidget_p.h
index dc7e4c811..9ea5e3203 100644
--- a/tdeio/tdefile/kacleditwidget_p.h
+++ b/tdeio/tdefile/kacleditwidget_p.h
@@ -47,7 +47,7 @@ class TQCheckBox;
 /**
 @author Sean Harmer
 */
-class KACLListView : public KListView
+class KACLListView : public TDEListView
 {
     Q_OBJECT
     
@@ -168,7 +168,7 @@ private:
 };
 
 
-class KACLListViewItem : public KListViewItem
+class KACLListViewItem : public TDEListViewItem
 {
 public:
     KACLListViewItem( TQListView* parent, KACLListView::EntryType type,
diff --git a/tdeio/tdefile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp
index bc3d43384..ae408c8e2 100644
--- a/tdeio/tdefile/kcombiview.cpp
+++ b/tdeio/tdefile/kcombiview.cpp
@@ -319,7 +319,7 @@ void KCombiView::writeConfig( TDEConfig *config, const TQString& group )
         right->writeConfig( config, group );
 }
 
-KActionCollection * KCombiView::actionCollection() const
+TDEActionCollection * KCombiView::actionCollection() const
 {
     return focusView( right )->actionCollection();
 }
diff --git a/tdeio/tdefile/kcombiview.h b/tdeio/tdefile/kcombiview.h
index 8da3da3fb..995b80ffc 100644
--- a/tdeio/tdefile/kcombiview.h
+++ b/tdeio/tdefile/kcombiview.h
@@ -98,7 +98,7 @@ public:
 
     void ensureItemVisible( const KFileItem * );
 
-    virtual KActionCollection * actionCollection() const;
+    virtual TDEActionCollection * actionCollection() const;
 
     virtual void setAcceptDrops(bool b);
 
diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp
index 48c911e30..244e22e84 100644
--- a/tdeio/tdefile/kcustommenueditor.cpp
+++ b/tdeio/tdefile/kcustommenueditor.cpp
@@ -90,7 +90,7 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent)
 {
     d = new KCustomMenuEditorPrivate;
    TQHBox *page = makeHBoxMainWidget();
-   m_listView = new KListView(page);
+   m_listView = new TDEListView(page);
    m_listView->addColumn(i18n("Menu"));
    m_listView->setFullWidth(true);
    m_listView->setSorting(-1);
diff --git a/tdeio/tdefile/kcustommenueditor.h b/tdeio/tdefile/kcustommenueditor.h
index 108e9c477..cb43c606f 100644
--- a/tdeio/tdefile/kcustommenueditor.h
+++ b/tdeio/tdefile/kcustommenueditor.h
@@ -21,7 +21,7 @@
 
 #include <kdialogbase.h>
 
-class KListView;
+class TDEListView;
 class TDEConfigBase;
 
  /*
@@ -58,7 +58,7 @@ public slots:
 
 protected:
     class Item;
-    KListView *m_listView;
+    TDEListView *m_listView;
 
     class KCustomMenuEditorPrivate;
     KCustomMenuEditorPrivate *d;
diff --git a/tdeio/tdefile/kdiroperator.cpp b/tdeio/tdefile/kdiroperator.cpp
index ea3183f78..dcb457662 100644
--- a/tdeio/tdefile/kdiroperator.cpp
+++ b/tdeio/tdefile/kdiroperator.cpp
@@ -87,7 +87,7 @@ public:
     TQString lastURL; // used for highlighting a directory on cdUp
     bool onlyDoubleClickSelectsFiles;
     TQTimer *progressDelayTimer;
-    KActionSeparator *viewActionSeparator;
+    TDEActionSeparator *viewActionSeparator;
     int dropOptions;
 
     TDEConfig *config;
@@ -192,10 +192,10 @@ void KDirOperator::insertViewDependentActions()
    {
       if (viewActionCollection)
       {
-         disconnect( viewActionCollection, TQT_SIGNAL( inserted( KAction * )),
-               this, TQT_SLOT( slotViewActionAdded( KAction * )));
-         disconnect( viewActionCollection, TQT_SIGNAL( removed( KAction * )),
-               this, TQT_SLOT( slotViewActionRemoved( KAction * )));
+         disconnect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )),
+               this, TQT_SLOT( slotViewActionAdded( TDEAction * )));
+         disconnect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )),
+               this, TQT_SLOT( slotViewActionRemoved( TDEAction * )));
       }
 
       viewActionMenu->popupMenu()->clear();
@@ -223,24 +223,24 @@ void KDirOperator::insertViewDependentActions()
          TQStringList groups = viewActionCollection->groups();
          groups.prepend( TQString::null ); // actions without group
          TQStringList::ConstIterator git = groups.begin();
-         KActionPtrList list;
-         KAction *sep = actionCollection()->action("separator");
+         TDEActionPtrList list;
+         TDEAction *sep = actionCollection()->action("separator");
          for ( ; git != groups.end(); ++git )
          {
             if ( git != groups.begin() )
                viewActionMenu->insert( sep );
 
             list = viewActionCollection->actions( *git );
-            KActionPtrList::ConstIterator it = list.begin();
+            TDEActionPtrList::ConstIterator it = list.begin();
             for ( ; it != list.end(); ++it )
                viewActionMenu->insert( *it );
          }
       }
 
-      connect( viewActionCollection, TQT_SIGNAL( inserted( KAction * )),
-               TQT_SLOT( slotViewActionAdded( KAction * )));
-      connect( viewActionCollection, TQT_SIGNAL( removed( KAction * )),
-               TQT_SLOT( slotViewActionRemoved( KAction * )));
+      connect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )),
+               TQT_SLOT( slotViewActionAdded( TDEAction * )));
+      connect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )),
+               TQT_SLOT( slotViewActionRemoved( TDEAction * )));
    }
 }
 
@@ -271,7 +271,7 @@ void KDirOperator::setPreviewWidget(const TQWidget *w)
     delete myPreview;
     myPreview = w;
 
-    KToggleAction *preview = static_cast<KToggleAction*>(myActionCollection->action("preview"));
+    TDEToggleAction *preview = static_cast<TDEToggleAction*>(myActionCollection->action("preview"));
     preview->setEnabled( w != 0L );
     preview->setChecked( w != 0L );
     setView( static_cast<KFile::FileView>(m_viewKind) );
@@ -326,7 +326,7 @@ void KDirOperator::slotDefaultPreview()
     m_viewKind = m_viewKind | KFile::PreviewContents;
     if ( !myPreview ) {
         myPreview = new KFileMetaPreview( this );
-        (static_cast<KToggleAction*>( myActionCollection->action("preview") ))->setChecked(true);
+        (static_cast<TDEToggleAction*>( myActionCollection->action("preview") ))->setChecked(true);
     }
 
     setView( static_cast<KFile::FileView>(m_viewKind) );
@@ -555,12 +555,12 @@ TDEIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
     return 0L;
 }
 
-void KDirOperator::trashSelected(KAction::ActivationReason reason, TQt::ButtonState state)
+void KDirOperator::trashSelected(TDEAction::ActivationReason reason, TQt::ButtonState state)
 {
     if ( !m_fileView )
         return;
 
-    if ( reason == KAction::PopupMenuActivation && ( state & ShiftButton ) ) {
+    if ( reason == TDEAction::PopupMenuActivation && ( state & ShiftButton ) ) {
         deleteSelected();
 	return;
     }
@@ -809,7 +809,7 @@ void KDirOperator::setMimeFilter( const TQStringList& mimetypes )
 
 bool KDirOperator::checkPreviewSupport()
 {
-    KToggleAction *previewAction = static_cast<KToggleAction*>( myActionCollection->action( "preview" ));
+    TDEToggleAction *previewAction = static_cast<TDEToggleAction*>( myActionCollection->action( "preview" ));
 
     bool hasPreviewSupport = false;
     TDEConfig *kc = TDEGlobal::config();
@@ -1253,9 +1253,9 @@ void KDirOperator::slotCompletionMatch(const TQString& match)
 
 void KDirOperator::setupActions()
 {
-    myActionCollection = new KActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" );
+    myActionCollection = new TDEActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" );
 
-    actionMenu = new KActionMenu( i18n("Menu"), myActionCollection, "popupMenu" );
+    actionMenu = new TDEActionMenu( i18n("Menu"), myActionCollection, "popupMenu" );
     upAction = KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT( cdUp() ), myActionCollection, "up" );
     upAction->setText( i18n("Parent Folder") );
     backAction = KStdAction::back( TQT_TQOBJECT(this), TQT_SLOT( back() ), myActionCollection, "back" );
@@ -1263,33 +1263,33 @@ void KDirOperator::setupActions()
     homeAction = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( home() ), myActionCollection, "home" );
     homeAction->setText(i18n("Home Folder"));
     reloadAction = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(rereadDir()), myActionCollection, "reload" );
-    actionSeparator = new KActionSeparator( myActionCollection, "separator" );
-    d->viewActionSeparator = new KActionSeparator( myActionCollection,
+    actionSeparator = new TDEActionSeparator( myActionCollection, "separator" );
+    d->viewActionSeparator = new TDEActionSeparator( myActionCollection,
                                                    "viewActionSeparator" );
-    mkdirAction = new KAction( i18n("New Folder..."), 0,
+    mkdirAction = new TDEAction( i18n("New Folder..."), 0,
                                  TQT_TQOBJECT(this), TQT_SLOT( mkdir() ), myActionCollection, "mkdir" );
-    KAction* trash = new KAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" );
-    connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ),
-	     this, TQT_SLOT( trashSelected( KAction::ActivationReason, TQt::ButtonState ) ) );
-    new KAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
+    TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" );
+    connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+	     this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+    new TDEAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
                   TQT_SLOT( deleteSelected() ), myActionCollection, "delete" );
     mkdirAction->setIcon( TQString::fromLatin1("folder_new") );
     reloadAction->setText( i18n("Reload") );
-    reloadAction->setShortcut( KStdAccel::shortcut( KStdAccel::Reload ));
+    reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload ));
 
 
     // the sort menu actions
-    sortActionMenu = new KActionMenu( i18n("Sorting"), myActionCollection, "sorting menu");
-    byNameAction = new KRadioAction( i18n("By Name"), 0,
+    sortActionMenu = new TDEActionMenu( i18n("Sorting"), myActionCollection, "sorting menu");
+    byNameAction = new TDERadioAction( i18n("By Name"), 0,
                                      TQT_TQOBJECT(this), TQT_SLOT( slotSortByName() ),
                                      myActionCollection, "by name" );
-    byDateAction = new KRadioAction( i18n("By Date"), 0,
+    byDateAction = new TDERadioAction( i18n("By Date"), 0,
                                      TQT_TQOBJECT(this), TQT_SLOT( slotSortByDate() ),
                                      myActionCollection, "by date" );
-    bySizeAction = new KRadioAction( i18n("By Size"), 0,
+    bySizeAction = new TDERadioAction( i18n("By Size"), 0,
                                      TQT_TQOBJECT(this), TQT_SLOT( slotSortBySize() ),
                                      myActionCollection, "by size" );
-    reverseAction = new KToggleAction( i18n("Reverse"), 0,
+    reverseAction = new TDEToggleAction( i18n("Reverse"), 0,
                                        TQT_TQOBJECT(this), TQT_SLOT( slotSortReversed() ),
                                        myActionCollection, "reversed" );
 
@@ -1299,9 +1299,9 @@ void KDirOperator::setupActions()
     bySizeAction->setExclusiveGroup( sortGroup );
 
 
-    dirsFirstAction = new KToggleAction( i18n("Folders First"), 0,
+    dirsFirstAction = new TDEToggleAction( i18n("Folders First"), 0,
                                          myActionCollection, "dirs first");
-    caseInsensitiveAction = new KToggleAction(i18n("Case Insensitive"), 0,
+    caseInsensitiveAction = new TDEToggleAction(i18n("Case Insensitive"), 0,
                                               myActionCollection, "case insensitive" );
 
     connect( dirsFirstAction, TQT_SIGNAL( toggled( bool ) ),
@@ -1312,24 +1312,24 @@ void KDirOperator::setupActions()
 
 
     // the view menu actions
-    viewActionMenu = new KActionMenu( i18n("&View"), myActionCollection, "view menu" );
+    viewActionMenu = new TDEActionMenu( i18n("&View"), myActionCollection, "view menu" );
     connect( viewActionMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ),
              TQT_SLOT( insertViewDependentActions() ));
 
-    shortAction = new KRadioAction( i18n("Short View"), "view_multicolumn",
-                                    KShortcut(), myActionCollection, "short view" );
-    detailedAction = new KRadioAction( i18n("Detailed View"), "view_detailed",
-                                       KShortcut(), myActionCollection, "detailed view" );
+    shortAction = new TDERadioAction( i18n("Short View"), "view_multicolumn",
+                                    TDEShortcut(), myActionCollection, "short view" );
+    detailedAction = new TDERadioAction( i18n("Detailed View"), "view_detailed",
+                                       TDEShortcut(), myActionCollection, "detailed view" );
 
-    showHiddenAction = new KToggleAction( i18n("Show Hidden Files"), KShortcut(),
+    showHiddenAction = new TDEToggleAction( i18n("Show Hidden Files"), TDEShortcut(),
                                           myActionCollection, "show hidden" );
 //    showHiddenAction->setCheckedState( i18n("Hide Hidden Files") );
-    separateDirsAction = new KToggleAction( i18n("Separate Folders"), KShortcut(),
+    separateDirsAction = new TDEToggleAction( i18n("Separate Folders"), TDEShortcut(),
                                             TQT_TQOBJECT(this),
                                             TQT_SLOT(slotSeparateDirs()),
                                             myActionCollection, "separate dirs" );
-    KToggleAction *previewAction = new KToggleAction(i18n("Show Preview"),
-                                                     "thumbnail", KShortcut(),
+    TDEToggleAction *previewAction = new TDEToggleAction(i18n("Show Preview"),
+                                                     "thumbnail", TDEShortcut(),
                                                      myActionCollection,
                                                      "preview" );
     previewAction->setCheckedState(i18n("Hide Preview"));
@@ -1348,7 +1348,7 @@ void KDirOperator::setupActions()
     connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ),
              TQT_SLOT( slotToggleHidden( bool ) ));
 
-    new KAction( i18n("Properties"), KShortcut(ALT+Key_Return), TQT_TQOBJECT(this),
+    new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), TQT_TQOBJECT(this),
                  TQT_SLOT(slotProperties()), myActionCollection, "properties" );
 }
 
@@ -1533,7 +1533,7 @@ void KDirOperator::writeConfig( TDEConfig *kc, const TQString& group )
             kc->writeEntry( TQString::fromLatin1("Separate Directories"),
                             separateDirsAction->isChecked() );
 
-        KToggleAction *previewAction = static_cast<KToggleAction*>(myActionCollection->action("preview"));
+        TDEToggleAction *previewAction = static_cast<TDEToggleAction*>(myActionCollection->action("preview"));
         if ( previewAction->isEnabled() ) {
             bool hasPreview = previewAction->isChecked();
             kc->writeEntry( TQString::fromLatin1("Show Preview"), hasPreview );
@@ -1633,7 +1633,7 @@ void KDirOperator::clearHistory()
     forwardAction->setEnabled( false );
 }
 
-void KDirOperator::slotViewActionAdded( KAction *action )
+void KDirOperator::slotViewActionAdded( TDEAction *action )
 {
     if ( viewActionMenu->popupMenu()->count() == 5 ) // need to add a separator
 	viewActionMenu->insert( d->viewActionSeparator );
@@ -1641,7 +1641,7 @@ void KDirOperator::slotViewActionAdded( KAction *action )
     viewActionMenu->insert( action );
 }
 
-void KDirOperator::slotViewActionRemoved( KAction *action )
+void KDirOperator::slotViewActionRemoved( TDEAction *action )
 {
     viewActionMenu->remove( action );
 
diff --git a/tdeio/tdefile/kdiroperator.h b/tdeio/tdefile/kdiroperator.h
index 418bb20c8..5d806eee2 100644
--- a/tdeio/tdefile/kdiroperator.h
+++ b/tdeio/tdefile/kdiroperator.h
@@ -34,11 +34,11 @@
 class TQPopupMenu;
 class TQTimer;
 
-class KAction;
+class TDEAction;
 class KDirLister;
-class KToggleAction;
-class KActionSeparator;
-class KActionMenu;
+class TDEToggleAction;
+class TDEActionSeparator;
+class TDEActionMenu;
 class TQWidgetStack;
 class KProgress;
 namespace TDEIO {
@@ -345,7 +345,7 @@ class TDEIO_EXPORT KDirOperator : public TQWidget
     /**
      * an accessor to a collection of all available Actions. The actions
      * are static, they will be there all the time (no need to connect to
-     * the signals KActionCollection::inserted() or removed().
+     * the signals TDEActionCollection::inserted() or removed().
      *
      * There are the following actions:
      *
@@ -387,7 +387,7 @@ class TDEIO_EXPORT KDirOperator : public TQWidget
      *
      * @returns all available Actions
      */
-    KActionCollection * actionCollection() const { return myActionCollection; }
+    TDEActionCollection * actionCollection() const { return myActionCollection; }
 
     /**
      * Sets the config object and the to be used group in KDirOperator. This
@@ -710,7 +710,7 @@ public slots:
      * @since 3.4
      */
 	// ### KDE4: make virtual
-    void trashSelected(KAction::ActivationReason, TQt::ButtonState);
+    void trashSelected(TDEAction::ActivationReason, TQt::ButtonState);
 
 protected slots:
     /**
@@ -873,32 +873,32 @@ private:
 
     // actions for the popupmenus
     // ### clean up all those -- we have them all in the actionMenu!
-    KActionMenu *actionMenu;
-
-    KAction 	*backAction;
-    KAction 	*forwardAction;
-    KAction 	*homeAction;
-    KAction 	*upAction;
-    KAction 	*reloadAction;
-    KActionSeparator *actionSeparator;
-    KAction 	*mkdirAction;
-
-    KActionMenu *sortActionMenu;
-    KRadioAction *byNameAction;
-    KRadioAction *byDateAction;
-    KRadioAction *bySizeAction;
-    KToggleAction *reverseAction;
-    KToggleAction *dirsFirstAction;
-    KToggleAction *caseInsensitiveAction;
-
-    KActionMenu *viewActionMenu;
-    KRadioAction *shortAction;
-    KRadioAction *detailedAction;
-    KToggleAction *showHiddenAction;
-    KToggleAction *separateDirsAction;
-
-    KActionCollection *myActionCollection;
-    KActionCollection *viewActionCollection;
+    TDEActionMenu *actionMenu;
+
+    TDEAction 	*backAction;
+    TDEAction 	*forwardAction;
+    TDEAction 	*homeAction;
+    TDEAction 	*upAction;
+    TDEAction 	*reloadAction;
+    TDEActionSeparator *actionSeparator;
+    TDEAction 	*mkdirAction;
+
+    TDEActionMenu *sortActionMenu;
+    TDERadioAction *byNameAction;
+    TDERadioAction *byDateAction;
+    TDERadioAction *bySizeAction;
+    TDEToggleAction *reverseAction;
+    TDEToggleAction *dirsFirstAction;
+    TDEToggleAction *caseInsensitiveAction;
+
+    TDEActionMenu *viewActionMenu;
+    TDERadioAction *shortAction;
+    TDERadioAction *detailedAction;
+    TDEToggleAction *showHiddenAction;
+    TDEToggleAction *separateDirsAction;
+
+    TDEActionCollection *myActionCollection;
+    TDEActionCollection *viewActionCollection;
 
 private slots:
     /**
@@ -926,8 +926,8 @@ private slots:
     void slotCanceled();
     void slotRedirected( const KURL& );
 
-    void slotViewActionAdded( KAction * );
-    void slotViewActionRemoved( KAction * );
+    void slotViewActionAdded( TDEAction * );
+    void slotViewActionRemoved( TDEAction * );
     void slotViewSortingChanged( TQDir::SortSpec );
 
     void slotClearView();
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index 6a13920fd..a540c57ef 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -122,10 +122,10 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
              TQT_SLOT( slotComboTextChanged( const TQString& ) ));
 
     m_contextMenu = new TQPopupMenu( this );
-    KAction* newFolder = new KAction( i18n("New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this));
+    TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this));
     newFolder->plug(m_contextMenu);
     m_contextMenu->insertSeparator();
-    m_showHiddenFolders = new KToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this),
+    m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this),
                                         TQT_SLOT( slotShowHiddenFoldersToggled() ), TQT_TQOBJECT(this));
     m_showHiddenFolders->plug(m_contextMenu);
 
@@ -153,8 +153,8 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
 
     connect( m_treeView, TQT_SIGNAL( currentChanged( TQListViewItem * )),
              TQT_SLOT( slotCurrentChanged() ));
-    connect( m_treeView, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & )),
-             TQT_SLOT( slotContextMenu( KListView *, TQListViewItem *, const TQPoint & )));
+    connect( m_treeView, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & )),
+             TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & )));
 
     connect( d->urlCombo, TQT_SIGNAL( activated( const TQString& )),
              TQT_SLOT( slotURLActivated( const TQString& )));
@@ -307,7 +307,7 @@ void KDirSelectDialog::accept()
         if ( !item->isDir() )
             dir = dir.upURL();
 
-        KRecentDirs::add(d->recentDirClass, dir.url());
+        TDERecentDirs::add(d->recentDirClass, dir.url());
     }
 
     d->urlCombo->addToHistory( item->url().prettyURL() );
@@ -395,7 +395,7 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text )
     }
 }
 
-void KDirSelectDialog::slotContextMenu( KListView *, TQListViewItem *, const TQPoint& pos )
+void KDirSelectDialog::slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint& pos )
 {
     m_contextMenu->popup( pos );
 }
diff --git a/tdeio/tdefile/kdirselectdialog.h b/tdeio/tdefile/kdirselectdialog.h
index 746064c68..400bd3232 100644
--- a/tdeio/tdefile/kdirselectdialog.h
+++ b/tdeio/tdefile/kdirselectdialog.h
@@ -29,7 +29,7 @@ class TDEConfig;
 class KFileTreeBranch;
 class KFileTreeView;
 class KFileTreeViewItem;
-class KToggleAction;
+class TDEToggleAction;
 
 /**
  * A pretty dialog for a KDirSelect control for selecting directories.
@@ -106,7 +106,7 @@ private slots:
     void slotURLActivated( const TQString& );
     void slotNextDirToList( KFileTreeViewItem *dirItem );
     void slotComboTextChanged( const TQString& text );
-    void slotContextMenu( KListView *, TQListViewItem *, const TQPoint & );
+    void slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & );
     void slotShowHiddenFoldersToggled();
     void slotMkdir();
 
@@ -118,7 +118,7 @@ private:
 
     KFileTreeView *m_treeView;
     TQPopupMenu *m_contextMenu;
-    KToggleAction *m_showHiddenFolders;
+    TDEToggleAction *m_showHiddenFolders;
     bool m_localOnly;
 
 protected:
diff --git a/tdeio/tdefile/kencodingfiledialog.cpp b/tdeio/tdefile/kencodingfiledialog.cpp
index b8c90f6ff..569217bee 100644
--- a/tdeio/tdefile/kencodingfiledialog.cpp
+++ b/tdeio/tdefile/kencodingfiledialog.cpp
@@ -44,7 +44,7 @@ KEncodingFileDialog::KEncodingFileDialog(const TQString& startDir, const TQStrin
   
   setOperationMode( type );
     
-  KToolBar *tb = toolBar();
+  TDEToolBar *tb = toolBar();
   tb->insertSeparator();
   int index = tb->insertCombo(TQStringList(), -1 /*id*/, false /*writable*/, 0 /*signal*/, 0 /*receiver*/, 0 /*slot*/ );
   d->encoding = tb->getCombo( tb->idAt( index ) );
@@ -180,7 +180,7 @@ KEncodingFileDialog::Result KEncodingFileDialog::getSaveFileNameAndEncoding(cons
 
     TQString filename = dlg.selectedFile();
     if (!filename.isEmpty())
-        KRecentDocument::add(filename);
+        TDERecentDocument::add(filename);
 
     Result res;
     res.fileNames<<filename;
@@ -204,7 +204,7 @@ KEncodingFileDialog::Result  KEncodingFileDialog::getSaveURLAndEncoding(const TQ
 
     KURL url = dlg.selectedURL();
     if (url.isValid())
-        KRecentDocument::add( url );
+        TDERecentDocument::add( url );
 
     Result res;
     res.URLs<<url;
diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h
index 9bb3210ea..ede51d663 100644
--- a/tdeio/tdefile/knotifydialog.h
+++ b/tdeio/tdefile/knotifydialog.h
@@ -195,7 +195,7 @@ namespace KNotify
                        bool handleAllApps = false );
         ~KNotifyWidget();
 
-        KListView * eventsView() {
+        TDEListView * eventsView() {
             return m_listview;
         }
 
diff --git a/tdeio/tdefile/knotifywidgetbase.ui b/tdeio/tdefile/knotifywidgetbase.ui
index d3c3103ff..023da77d8 100644
--- a/tdeio/tdefile/knotifywidgetbase.ui
+++ b/tdeio/tdefile/knotifywidgetbase.ui
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="KListView">
+        <widget class="TDEListView">
             <column>
                 <property name="text">
                     <string></string>
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index 691487730..8582e31f0 100644
--- a/tdeio/tdefile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -69,7 +69,7 @@
 
 // ----------------------------------------------------------------------
 
-KAppTreeListItem::KAppTreeListItem( KListView* parent, const TQString & name,
+KAppTreeListItem::KAppTreeListItem( TDEListView* parent, const TQString & name,
                                     const TQPixmap& pixmap, bool parse, bool dir, const TQString &p, const TQString &c )
     : TQListViewItem( parent, name )
 {
@@ -145,7 +145,7 @@ bool KAppTreeListItem::isDirectory()
 // ----------------------------------------------------------------------
 
 TDEApplicationTree::TDEApplicationTree( TQWidget *parent )
-    : KListView( parent ), currentitem(0)
+    : TDEListView( parent ), currentitem(0)
 {
     addColumn( i18n("Known Applications") );
     setRootIsDecorated( true );
@@ -281,7 +281,7 @@ void TDEApplicationTree::resizeEvent( TQResizeEvent * e)
 {
     setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent)
                          -2*TQApplication::style().pixelMetric(TQStyle::PM_DefaultFrameWidth));
-    KListView::resizeEvent(e);
+    TDEListView::resizeEvent(e);
 }
 
 // Prune empty directories from the tree
diff --git a/tdeio/tdefile/kopenwith_p.h b/tdeio/tdefile/kopenwith_p.h
index 8231da27d..ca9317fb6 100644
--- a/tdeio/tdefile/kopenwith_p.h
+++ b/tdeio/tdefile/kopenwith_p.h
@@ -51,7 +51,7 @@ protected:
     void init(const TQPixmap& pixmap, bool parse, bool dir, const TQString &_path, const TQString &exec);
 
 public:
-    KAppTreeListItem( KListView* parent, const TQString & name, const TQPixmap& pixmap,
+    KAppTreeListItem( TDEListView* parent, const TQString & name, const TQPixmap& pixmap,
                       bool parse, bool dir, const TQString &p, const TQString &c );
     KAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap,
                       bool parse, bool dir, const TQString &p, const TQString &c );
@@ -69,7 +69,7 @@ protected:
 /**
  * @internal
  */
-class TDEApplicationTree : public KListView
+class TDEApplicationTree : public TDEListView
 {
     Q_OBJECT
 public:
diff --git a/tdeio/tdefile/kpropertiesdesktopbase.ui b/tdeio/tdefile/kpropertiesdesktopbase.ui
index a0894dc70..9c08eef93 100644
--- a/tdeio/tdefile/kpropertiesdesktopbase.ui
+++ b/tdeio/tdefile/kpropertiesdesktopbase.ui
@@ -52,7 +52,7 @@
 &lt;p&gt;If you want to associate this application with one or more mimetypes that are not in this list, click on the button &lt;b&gt;Add&lt;/b&gt; below. If there are one or more filetypes that this application cannot handle, you may want to remove them from the list clicking on the button &lt;b&gt;Remove&lt;/b&gt; below.&lt;/p&gt;&lt;/qt&gt;</string>
             </property>
         </widget>
-        <widget class="KListView" row="7" column="0" rowspan="1" colspan="7">
+        <widget class="TDEListView" row="7" column="0" rowspan="1" colspan="7">
             <column>
                 <property name="text">
                     <string>Mimetype</string>
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 0e9f125a6..fdbef4fea 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -498,7 +498,7 @@ void KPropertiesDialog::insertPages()
     insertPlugin (p);
   }
 
-  if ( kapp->authorizeKAction("sharefile") &&
+  if ( kapp->authorizeTDEAction("sharefile") &&
        KFileSharePropsPlugin::supports( m_items ) )
   {
     KPropsDlgPlugin *p = new KFileSharePropsPlugin( this );
@@ -953,7 +953,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
 
     connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFileType() ));
 
-    if (!kapp->authorizeKAction("editfiletype"))
+    if (!kapp->authorizeTDEAction("editfiletype"))
        button->hide();
 #endif
 
diff --git a/tdeio/tdefile/kpropertiesmimetypebase.ui b/tdeio/tdefile/kpropertiesmimetypebase.ui
index df7c796da..257eaa57c 100644
--- a/tdeio/tdefile/kpropertiesmimetypebase.ui
+++ b/tdeio/tdefile/kpropertiesmimetypebase.ui
@@ -30,7 +30,7 @@
                 <cstring>listView</cstring>
             </property>
         </widget>
-        <widget class="KListView">
+        <widget class="TDEListView">
             <column>
                 <property name="text">
                     <string>Mimetype</string>
diff --git a/tdeio/tdefile/krecentdirs.cpp b/tdeio/tdefile/krecentdirs.cpp
index 6f4a01f3b..0d8d008bd 100644
--- a/tdeio/tdefile/krecentdirs.cpp
+++ b/tdeio/tdefile/krecentdirs.cpp
@@ -69,7 +69,7 @@ static TDEConfig *recentdirs_readList(TQString &key, TQStringList &result, bool
    return config;
 }
 
-TQStringList KRecentDirs::list(const TQString &fileClass)
+TQStringList TDERecentDirs::list(const TQString &fileClass)
 {
    TQString key = fileClass;
    TQStringList result;
@@ -77,13 +77,13 @@ TQStringList KRecentDirs::list(const TQString &fileClass)
    return result;
 }
     
-TQString KRecentDirs::dir(const TQString &fileClass)
+TQString TDERecentDirs::dir(const TQString &fileClass)
 {
    TQStringList result = list(fileClass);
    return result[0];
 }
 
-void KRecentDirs::add(const TQString &fileClass, const TQString &directory)
+void TDERecentDirs::add(const TQString &fileClass, const TQString &directory)
 {
    TQString key = fileClass;
    TQStringList result;
diff --git a/tdeio/tdefile/krecentdirs.h b/tdeio/tdefile/krecentdirs.h
index 774655e51..cc9be16b4 100644
--- a/tdeio/tdefile/krecentdirs.h
+++ b/tdeio/tdefile/krecentdirs.h
@@ -47,7 +47,7 @@
  * a single ':' the file-class is specific to the current application.
  * If the file-class starts with '::' it is global to all applications.
  */
-class TDEIO_EXPORT KRecentDirs
+class TDEIO_EXPORT TDERecentDirs
 {
 public:
     /**
diff --git a/tdeio/tdefile/krecentdocument.cpp b/tdeio/tdefile/krecentdocument.cpp
index 1ec4a98c8..85af01c46 100644
--- a/tdeio/tdefile/krecentdocument.cpp
+++ b/tdeio/tdefile/krecentdocument.cpp
@@ -42,13 +42,13 @@
 #include <sys/types.h>
 #include <utime.h>
 
-TQString KRecentDocument::recentDocumentDirectory()
+TQString TDERecentDocument::recentDocumentDirectory()
 {
     // need to change this path, not sure where
     return locateLocal("data", TQString::fromLatin1("RecentDocuments/"));
 }
 
-TQStringList KRecentDocument::recentDocuments()
+TQStringList TDERecentDocument::recentDocuments()
 {
     TQDir d(recentDocumentDirectory(), "*.desktop", TQDir::Time,
            TQDir::Files | TQDir::Readable | TQDir::Hidden);
@@ -72,12 +72,12 @@ TQStringList KRecentDocument::recentDocuments()
     return fullList;
 }
 
-void KRecentDocument::add(const KURL& url)
+void TDERecentDocument::add(const KURL& url)
 {
-    KRecentDocument::add(url, tqApp->argv()[0]); // ### argv[0] might not match the service filename!
+    TDERecentDocument::add(url, tqApp->argv()[0]); // ### argv[0] might not match the service filename!
 }
 
-void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
+void TDERecentDocument::add(const KURL& url, const TQString& desktopEntryName)
 {
 	if ( url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/"))
 		return;
@@ -85,7 +85,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
     TQString openStr = url.url();
     openStr.replace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded
 
-    kdDebug(250) << "KRecentDocument::add for " << openStr << endl;
+    kdDebug(250) << "TDERecentDocument::add for " << openStr << endl;
     TDEConfig *config = TDEGlobal::config();
     TQString oldGrp = config->group();
     config->setGroup(TQString::fromLatin1("RecentDocuments"));
@@ -148,7 +148,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
     conf.writeEntry( TQString::fromLatin1("Icon"), KMimeType::iconForURL( url ) );
 }
 
-void KRecentDocument::add(const TQString &openStr, bool isUrl)
+void TDERecentDocument::add(const TQString &openStr, bool isUrl)
 {
     if( isUrl ) {
         add( KURL( openStr ) );
@@ -159,7 +159,7 @@ void KRecentDocument::add(const TQString &openStr, bool isUrl)
     }
 }
 
-void KRecentDocument::clear()
+void TDERecentDocument::clear()
 {
   TQStringList list = recentDocuments();
   TQDir dir;
@@ -167,7 +167,7 @@ void KRecentDocument::clear()
     dir.remove(*it);
 }
 
-int KRecentDocument::maximumItems()
+int TDERecentDocument::maximumItems()
 {
     TDEConfig *config = TDEGlobal::config();
     TDEConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments"));
diff --git a/tdeio/tdefile/krecentdocument.h b/tdeio/tdefile/krecentdocument.h
index 968559968..b788c0dc2 100644
--- a/tdeio/tdefile/krecentdocument.h
+++ b/tdeio/tdefile/krecentdocument.h
@@ -47,7 +47,7 @@
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
-class TDEIO_EXPORT KRecentDocument
+class TDEIO_EXPORT TDERecentDocument
 {
 public:
 
diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp
index e142845e1..2642926a1 100644
--- a/tdeio/tdefile/kurlbar.cpp
+++ b/tdeio/tdefile/kurlbar.cpp
@@ -406,7 +406,7 @@ void KURLBar::setListBox( KURLBarListBox *view )
         m_listBox->resize( width(), height() );
     }
 
-    m_listBox->setSelectionMode( KListBox::Single );
+    m_listBox->setSelectionMode( TDEListBox::Single );
     paletteChange( palette() );
     m_listBox->setFocusPolicy( TQ_TabFocus );
 
@@ -829,7 +829,7 @@ bool KURLBar::editItem( KURLBarItem *item )
 
 
 KURLBarListBox::KURLBarListBox( TQWidget *parent, const char *name )
-    : KListBox( parent, name )
+    : TDEListBox( parent, name )
 {
     m_toolTip = new KURLBarToolTip( this );
     setAcceptDrops( true );
@@ -1043,7 +1043,7 @@ void KURLBar::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void KURLBarListBox::virtual_hook( int id, void* data )
-{ KListBox::virtual_hook( id, data ); }
+{ TDEListBox::virtual_hook( id, data ); }
 
 
 #include "kurlbar.moc"
diff --git a/tdeio/tdefile/kurlbar.h b/tdeio/tdefile/kurlbar.h
index 32c05ec58..7470ec82a 100644
--- a/tdeio/tdefile/kurlbar.h
+++ b/tdeio/tdefile/kurlbar.h
@@ -483,14 +483,14 @@ class TQDragObject;
 class KURLBarToolTip;
 
 /**
- * This is the listbox used in KURLBar. It is a subclass of KListBox to support
+ * This is the listbox used in KURLBar. It is a subclass of TDEListBox to support
  * drag & drop and to set up the row / column mode.
  *
  * The widget has just one row or one column, depending on orientation().
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class TDEIO_EXPORT KURLBarListBox : public KListBox
+class TDEIO_EXPORT KURLBarListBox : public TDEListBox
 {
     Q_OBJECT
 
diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index cca8c0529..88b34ea6b 100644
--- a/tdeio/tdefile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -226,8 +226,8 @@ void KURLRequester::init()
     myCompletion = new KURLCompletion();
     d->setCompletionObject( myCompletion );
 
-    KAccel *accel = new KAccel( this );
-    accel->insert( KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() ));
+    TDEAccel *accel = new TDEAccel( this );
+    accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() ));
     accel->readSettings();
 }
 
diff --git a/tdeio/tdefile/kurlrequester.h b/tdeio/tdefile/kurlrequester.h
index 55bc0fd83..5655efa5b 100644
--- a/tdeio/tdefile/kurlrequester.h
+++ b/tdeio/tdefile/kurlrequester.h
@@ -269,7 +269,7 @@ private:
 protected slots:
     /**
      * Called when the button is pressed to open the filedialog.
-     * Also called when KStdAccel::Open (default is Ctrl-O) is pressed.
+     * Also called when TDEStdAccel::Open (default is Ctrl-O) is pressed.
      */
     void slotOpenDialog();
 
diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp
index 7524ea149..2459f984f 100644
--- a/tdeio/tdefile/kurlrequesterdlg.cpp
+++ b/tdeio/tdefile/kurlrequesterdlg.cpp
@@ -115,7 +115,7 @@ KURL KURLRequesterDlg::getURL(const TQString& dir, TQWidget *parent,
 
     const KURL& url = dlg.selectedURL();
     if (url.isValid())
-        KRecentDocument::add(url);
+        TDERecentDocument::add(url);
 
     return url;
 }
diff --git a/tdeio/tdefile/tdefilebookmarkhandler.cpp b/tdeio/tdefile/tdefilebookmarkhandler.cpp
index ea97b8661..ef1f2a37b 100644
--- a/tdeio/tdefile/tdefilebookmarkhandler.cpp
+++ b/tdeio/tdefile/tdefilebookmarkhandler.cpp
@@ -32,7 +32,7 @@ KFileBookmarkHandler::KFileBookmarkHandler( KFileDialog *dialog )
       KBookmarkOwner(),
       m_dialog( dialog )
 {
-    m_menu = new KPopupMenu( dialog, "bookmark menu" );
+    m_menu = new TDEPopupMenu( dialog, "bookmark menu" );
 
     TQString file = locate( "data", "tdefile/bookmarks.xml" );
     if ( file.isEmpty() )
diff --git a/tdeio/tdefile/tdefilebookmarkhandler.h b/tdeio/tdefile/tdefilebookmarkhandler.h
index 6535bf961..e13e0673b 100644
--- a/tdeio/tdefile/tdefilebookmarkhandler.h
+++ b/tdeio/tdefile/tdefilebookmarkhandler.h
@@ -23,7 +23,7 @@
 #include <kbookmarkmenu.h>
 
 class TQTextStream;
-class KPopupMenu;
+class TDEPopupMenu;
 
 
 class TDEIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner
@@ -40,7 +40,7 @@ public:
     virtual void openBookmarkURL( const TQString& url ) { emit openURL( url ); }
     virtual TQString currentURL() const;
 
-    KPopupMenu *menu() const { return m_menu; }
+    TDEPopupMenu *menu() const { return m_menu; }
 
 signals:
     void openURL( const TQString& url );
@@ -49,7 +49,7 @@ private:
     void importOldBookmarks( const TQString& path, KBookmarkManager *manager );
 
     KFileDialog *m_dialog;
-    KPopupMenu *m_menu;
+    TDEPopupMenu *m_menu;
     KBookmarkMenu *m_bookmarkMenu;
 
 protected:
diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp
index b989104e8..68691bf6b 100644
--- a/tdeio/tdefile/tdefiledetailview.cpp
+++ b/tdeio/tdefile/tdefiledetailview.cpp
@@ -56,7 +56,7 @@ public:
 };
 
 KFileDetailView::KFileDetailView(TQWidget *parent, const char *name)
-    : KListView(parent, name), KFileView(), d(new KFileDetailViewPrivate())
+    : TDEListView(parent, name), KFileView(), d(new KFileDetailViewPrivate())
 {
     // this is always the static section, not the index depending on column order
     m_sortingCol = COL_NAME; 
@@ -149,7 +149,7 @@ void KFileDetailView::setSelected( const KFileItem *info, bool enable )
     KFileListViewItem *item = (KFileListViewItem*)info->extraData( this );
 
     if ( item )
-	KListView::setSelected( item, enable );
+	TDEListView::setSelected( item, enable );
 }
 
 void KFileDetailView::setCurrentItem( const KFileItem *item )
@@ -158,7 +158,7 @@ void KFileDetailView::setCurrentItem( const KFileItem *item )
         return;
     KFileListViewItem *it = (KFileListViewItem*) item->extraData( this );
     if ( it )
-        KListView::setCurrentItem( it );
+        TDEListView::setCurrentItem( it );
 }
 
 KFileItem * KFileDetailView::currentFileItem() const
@@ -172,7 +172,7 @@ KFileItem * KFileDetailView::currentFileItem() const
 
 void KFileDetailView::clearSelection()
 {
-    KListView::clearSelection();
+    TDEListView::clearSelection();
 }
 
 void KFileDetailView::selectAll()
@@ -181,12 +181,12 @@ void KFileDetailView::selectAll()
         KFileView::selectionMode() == KFile::Single)
 	return;
 
-    KListView::selectAll( true );
+    TDEListView::selectAll( true );
 }
 
 void KFileDetailView::invertSelection()
 {
-    KListView::invertSelection();
+    TDEListView::invertSelection();
 }
 
 void KFileDetailView::slotActivateMenu (TQListViewItem *item,const TQPoint& pos )
@@ -202,7 +202,7 @@ void KFileDetailView::slotActivateMenu (TQListViewItem *item,const TQPoint& pos
 void KFileDetailView::clearView()
 {
     m_resolver->m_lstPendingMimeIconItems.clear();
-    KListView::clear();
+    TDEListView::clear();
 }
 
 void KFileDetailView::insertItem( KFileItem *i )
@@ -415,8 +415,8 @@ void KFileDetailView::slotSortingChanged( int col )
         }
     }
 
-    KListView::setSorting( m_sortingCol, !reversed );
-    KListView::sort();
+    TDEListView::setSorting( m_sortingCol, !reversed );
+    TDEListView::sort();
 
     if ( !m_blockSortingSignal )
         sig->changeSorting( static_cast<TQDir::SortSpec>( sortSpec ) );
@@ -459,7 +459,7 @@ void KFileDetailView::ensureItemVisible( const KFileItem *i )
     KFileListViewItem *item = (KFileListViewItem*) i->extraData( this );
 
     if ( item )
-        KListView::ensureItemVisible( item );
+        TDEListView::ensureItemVisible( item );
 }
 
 // we're in multiselection mode
@@ -504,7 +504,7 @@ KFileItem * KFileDetailView::prevItem( const KFileItem *fileItem ) const
 
 void KFileDetailView::keyPressEvent( TQKeyEvent *e )
 {
-    KListView::keyPressEvent( e );
+    TDEListView::keyPressEvent( e );
 
     if ( e->key() == Key_Return || e->key() == Key_Enter ) {
         if ( e->state() & ControlButton )
@@ -680,7 +680,7 @@ void KFileListViewItem::init()
 
 
 void KFileDetailView::virtual_hook( int id, void* data )
-{ KListView::virtual_hook( id, data );
+{ TDEListView::virtual_hook( id, data );
   KFileView::virtual_hook( id, data ); }
 
 #include "tdefiledetailview.moc"
diff --git a/tdeio/tdefile/tdefiledetailview.h b/tdeio/tdefile/tdefiledetailview.h
index 0f17b3ca9..1e2d19a6b 100644
--- a/tdeio/tdefile/tdefiledetailview.h
+++ b/tdeio/tdefile/tdefiledetailview.h
@@ -34,12 +34,12 @@ class TQKeyEvent;
  * An item for the listiew, that has a reference to its corresponding
  * KFileItem.
  */
-class TDEIO_EXPORT KFileListViewItem : public KListViewItem
+class TDEIO_EXPORT KFileListViewItem : public TDEListViewItem
 {
 public:
     KFileListViewItem( TQListView *parent, const TQString &text,
 		       const TQPixmap &icon, KFileItem *fi )
-	: KListViewItem( parent, text ), inf( fi ) {
+	: TDEListViewItem( parent, text ), inf( fi ) {
         setPixmap( 0, icon );
         setText( 0, text );
     }
@@ -48,14 +48,14 @@ public:
      * @since 3.1
      */
     KFileListViewItem( TQListView *parent, KFileItem *fi )
-        : KListViewItem( parent ), inf( fi ) {
+        : TDEListViewItem( parent ), inf( fi ) {
         init();
     }
 
     KFileListViewItem( TQListView *parent, const TQString &text,
 		       const TQPixmap &icon, KFileItem *fi,
 		       TQListViewItem *after)
-	: KListViewItem( parent, after ), inf( fi ) {
+	: TDEListViewItem( parent, after ), inf( fi ) {
         setPixmap( 0, icon );
         setText( 0, text );
     }
@@ -106,7 +106,7 @@ private:
  * @see KCombiView
  * @see KFileIconView
  */
-class TDEIO_EXPORT KFileDetailView : public KListView, public KFileView
+class TDEIO_EXPORT KFileDetailView : public TDEListView, public KFileView
 {
     Q_OBJECT
 
@@ -193,9 +193,9 @@ private slots:
     void slotAutoOpen();
 
 private:
-    virtual void insertItem(TQListViewItem *i) { KListView::insertItem(i); }
-    virtual void setSorting(int i, bool b) { KListView::setSorting(i, b); }
-    virtual void setSelected(TQListViewItem *i, bool b) { KListView::setSelected(i, b); }
+    virtual void insertItem(TQListViewItem *i) { TDEListView::insertItem(i); }
+    virtual void setSorting(int i, bool b) { TDEListView::setSorting(i, b); }
+    virtual void setSelected(TQListViewItem *i, bool b) { TDEListView::setSelected(i, b); }
 
     inline KFileListViewItem * viewItem( const KFileItem *item ) const {
         if ( item )
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index 4fb399716..f60692c88 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -153,7 +153,7 @@ struct KFileDialogPrivate
     bool hasDefaultFilter :1; // necessary for the operationMode
     KFileDialog::OperationMode operationMode;
 
-    // The file class used for KRecentDirs
+    // The file class used for TDERecentDirs
     TQString fileClass;
 
     KFileBookmarkHandler *bookmarkHandler;
@@ -648,7 +648,7 @@ void KFileDialog::accept()
 
     *lastDirectory = ops->url();
     if (!d->fileClass.isEmpty())
-       KRecentDirs::add(d->fileClass, ops->url().url());
+       TDERecentDirs::add(d->fileClass, ops->url().url());
 
     // clear the topmost item, we insert it as full path later on as item 1
     locationEdit->changeItem( TQString::null, 0 );
@@ -832,7 +832,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     d->urlBar = 0; // delayed loading
 
     TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
-    toolbar = new KToolBar( d->mainWidget, "KFileDialog::toolbar", true);
+    toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true);
     toolbar->setFlat(true);
     tqInstallMsgHandler( oldHandler );
 
@@ -905,7 +905,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     ops->setupMenu(KDirOperator::SortActions |
                    KDirOperator::FileActions |
                    KDirOperator::ViewActions);
-    KActionCollection *coll = ops->actionCollection();
+    TDEActionCollection *coll = ops->actionCollection();
 
     // plug nav items into the toolbar
     coll->action( "up" )->plug( toolbar );
@@ -922,19 +922,19 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     coll->action( "mkdir" )->plug( toolbar );
     coll->action( "mkdir" )->setWhatsThis(i18n("Click this button to create a new folder."));
 
-    KToggleAction *showSidebarAction =
-        new KToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar");
+    TDEToggleAction *showSidebarAction =
+        new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar");
     showSidebarAction->setCheckedState(i18n("Hide Quick Access Navigation Panel"));
     connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ),
              TQT_SLOT( toggleSpeedbar( bool )) );
 
-    KToggleAction *showBookmarksAction =
-            new KToggleAction(i18n("Show Bookmarks"), 0, coll, "toggleBookmarks");
+    TDEToggleAction *showBookmarksAction =
+            new TDEToggleAction(i18n("Show Bookmarks"), 0, coll, "toggleBookmarks");
     showBookmarksAction->setCheckedState(i18n("Hide Bookmarks"));
     connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ),
              TQT_SLOT( toggleBookmarks( bool )) );
 
-    KActionMenu *menu = new KActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" );
+    TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" );
     menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. "
                             "Various options can be accessed from this menu including: <ul>"
                             "<li>how files are sorted in the list</li>"
@@ -965,15 +965,15 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     menu->plug( toolbar );
 
     //Insert a separator.
-    KToolBarSeparator* spacerWidget = new KToolBarSeparator(Qt::Horizontal, false /*no line*/,
+    TDEToolBarSeparator* spacerWidget = new TDEToolBarSeparator(Qt::Horizontal, false /*no line*/,
                                                             toolbar);
     d->m_pathComboIndex = toolbar->insertWidget(-1, -1, spacerWidget);
     toolbar->insertWidget(PATH_COMBO, 0, d->pathCombo);
 
 
     toolbar->setItemAutoSized (PATH_COMBO);
-    toolbar->setIconText(KToolBar::IconOnly);
-    toolbar->setBarPos(KToolBar::Top);
+    toolbar->setIconText(TDEToolBar::IconOnly);
+    toolbar->setBarPos(TDEToolBar::Top);
     toolbar->setMovingEnabled(false);
     toolbar->adjustSize();
 
@@ -1609,7 +1609,7 @@ TQString KFileDialog::getSaveFileName(const TQString& dir, const TQString& filte
 
     TQString filename = dlg.selectedFile();
     if (!filename.isEmpty())
-        KRecentDocument::add(filename);
+        TDERecentDocument::add(filename);
 
     return filename;
 }
@@ -1638,7 +1638,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi
 
     TQString filename = dlg.selectedFile();
     if (!filename.isEmpty())
-        KRecentDocument::add(filename);
+        TDERecentDocument::add(filename);
 
     return filename;
 }
@@ -1658,7 +1658,7 @@ KURL KFileDialog::getSaveURL(const TQString& dir, const TQString& filter,
 
     KURL url = dlg.selectedURL();
     if (url.isValid())
-        KRecentDocument::add( url );
+        TDERecentDocument::add( url );
 
     return url;
 }
@@ -2189,7 +2189,7 @@ void KFileDialog::addToRecentDocuments()
         TQStringList files = selectedFiles();
         TQStringList::ConstIterator it = files.begin();
         for ( ; it != files.end(); ++it )
-            KRecentDocument::add( *it );
+            TDERecentDocument::add( *it );
     }
 
     else { // urls
@@ -2197,12 +2197,12 @@ void KFileDialog::addToRecentDocuments()
         KURL::List::ConstIterator it = urls.begin();
         for ( ; it != urls.end(); ++it ) {
             if ( (*it).isValid() )
-                KRecentDocument::add( *it );
+                TDERecentDocument::add( *it );
         }
     }
 }
 
-KActionCollection * KFileDialog::actionCollection() const
+TDEActionCollection * KFileDialog::actionCollection() const
 {
     return ops->actionCollection();
 }
@@ -2251,7 +2251,7 @@ void KFileDialog::toggleSpeedbar( bool show )
             ops->actionCollection()->action( "home" )->plug( toolbar, 3 );
     }
 
-    static_cast<KToggleAction *>(actionCollection()->action("toggleSpeedbar"))->setChecked( show );
+    static_cast<TDEToggleAction *>(actionCollection()->action("toggleSpeedbar"))->setChecked( show );
 }
 
 void KFileDialog::toggleBookmarks(bool show)
@@ -2286,7 +2286,7 @@ void KFileDialog::toggleBookmarks(bool show)
         toolbar->removeItem(HOTLIST_BUTTON);
     }
 
-    static_cast<KToggleAction *>(actionCollection()->action("toggleBookmarks"))->setChecked( show );
+    static_cast<TDEToggleAction *>(actionCollection()->action("toggleBookmarks"))->setChecked( show );
 }
 
 int KFileDialog::pathComboIndex()
@@ -2318,7 +2318,7 @@ KURL KFileDialog::getStartURL( const TQString& startDir,
         if (startDir[0] == ':')
         {
             recentDirClass = startDir;
-            ret = KURL::fromPathOrURL( KRecentDirs::dir(recentDirClass) );
+            ret = KURL::fromPathOrURL( TDERecentDirs::dir(recentDirClass) );
         }
         else
         {
diff --git a/tdeio/tdefile/tdefiledialog.h b/tdeio/tdefile/tdefiledialog.h
index ae591b21a..b7310b599 100644
--- a/tdeio/tdefile/tdefiledialog.h
+++ b/tdeio/tdefile/tdefiledialog.h
@@ -40,7 +40,7 @@ class TQLabel;
 class TQPopupMenu;
 class TQVBoxLayout;
 
-class KActionCollection;
+class TDEActionCollection;
 class KDirOperator;
 class KURLBar;
 class KURLComboBox;
@@ -48,7 +48,7 @@ class KFileFilterCombo;
 class KFileView;
 class KFileItem;
 class KPushButton;
-class KToolBar;
+class TDEToolBar;
 class KPreviewWidgetBase;
 
 struct KFileDialogPrivate;
@@ -713,13 +713,13 @@ public:
      * You can use this to insert custom
      * items into it, e.g.:
      * \code
-     *      yourAction = new KAction( i18n("Your Action"), 0,
+     *      yourAction = new TDEAction( i18n("Your Action"), 0,
      *                                this, TQT_SLOT( yourSlot() ),
      *                                this, "action name" );
      *      yourAction->plug( tdefileDialog->toolBar() );
      * \endcode
      */
-    KToolBar *toolBar() const { return toolbar; }
+    TDEToolBar *toolBar() const { return toolbar; }
 
     /**
      * @returns a pointer to the OK-Button in the filedialog. You may use it
@@ -752,9 +752,9 @@ public:
 
     /**
      * @returns a pointer to the action collection, holding all the used
-     * KActions.
+     * TDEActions.
      */
-    KActionCollection *actionCollection() const;
+    TDEActionCollection *actionCollection() const;
 
     /**
      * @returns the index of the path combobox so when inserting widgets into
@@ -769,7 +769,7 @@ public:
      * @param startDir A url/directory, to be used. May use the ':' and '::' syntax
      *        as documented in the KFileDialog() constructor.
      * @param recentDirClass If the ':' or '::' syntax is used, recentDirClass
-     *        will contain the string to be used later for KRecentDir::dir()
+     *        will contain the string to be used later for TDERecentDir::dir()
      * @return The URL that should be listed by default (e.g. by KFileDialog or
      *         KDirSelectDialog).
      * @since 3.1
@@ -820,7 +820,7 @@ signals:
     void filterChanged( const TQString& filter );
 
 protected:
-    KToolBar *toolbar;
+    TDEToolBar *toolbar;
 
     static KURL *lastDirectory;
 
diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index 474364042..d42373893 100644
--- a/tdeio/tdefile/tdefileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -60,12 +60,12 @@ public:
 
         noArrangement = false;
 	ignoreMaximumSize = false;
-	smallColumns = new KRadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent),
+	smallColumns = new TDERadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent),
 					 TQT_SLOT( slotSmallColumns() ),
 					 parent->actionCollection(),
 					 "small columns" );
 
-	largeRows = new KRadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent),
+	largeRows = new TDERadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent),
 				      TQT_SLOT( slotLargeRows() ),
 				      parent->actionCollection(),
 				      "large rows" );
@@ -73,7 +73,7 @@ public:
 	smallColumns->setExclusiveGroup(TQString::fromLatin1("IconView mode"));
 	largeRows->setExclusiveGroup(TQString::fromLatin1("IconView mode"));
 
-        previews = new KToggleAction( i18n("Thumbnail Previews"), 0,
+        previews = new TDEToggleAction( i18n("Thumbnail Previews"), 0,
                                       parent->actionCollection(),
                                       "show previews" );
         zoomIn = KStdAction::zoomIn( TQT_TQOBJECT(parent), TQT_SLOT( zoomIn() ),
@@ -99,9 +99,9 @@ public:
             job->kill();
     }
 
-    KRadioAction *smallColumns, *largeRows;
-    KAction *zoomIn, *zoomOut;
-    KToggleAction *previews;
+    TDERadioAction *smallColumns, *largeRows;
+    TDEAction *zoomIn, *zoomOut;
+    TDEToggleAction *previews;
     TDEIO::PreviewJob *job;
     KFileIconViewItem *dropItem;
     TQTimer previewTimer;
diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp
index 4e9365361..4b336afee 100644
--- a/tdeio/tdefile/tdefilepreview.cpp
+++ b/tdeio/tdefile/tdefilepreview.cpp
@@ -254,7 +254,7 @@ KFileItem * KFilePreview::prevItem( const KFileItem *item ) const
     return left->prevItem( item );
 }
 
-KActionCollection * KFilePreview::actionCollection() const
+TDEActionCollection * KFilePreview::actionCollection() const
 {
     if ( left )
         return left->actionCollection();
diff --git a/tdeio/tdefile/tdefilepreview.h b/tdeio/tdefile/tdefilepreview.h
index 5bc59dba5..16cfa281b 100644
--- a/tdeio/tdefile/tdefilepreview.h
+++ b/tdeio/tdefile/tdefilepreview.h
@@ -89,10 +89,10 @@ public:
     /**
      * This overrides KFileView::actionCollection() by returning
      * the actionCollection() of the KFileView (member left) it contains.
-     * This means that KFilePreview will never create a KActionCollection
+     * This means that KFilePreview will never create a TDEActionCollection
      * object of its own.
      */
-    virtual KActionCollection * actionCollection() const;
+    virtual TDEActionCollection * actionCollection() const;
 
     void ensureItemVisible(const KFileItem *);
 
diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp
index 480c58ec3..fd7d630e1 100644
--- a/tdeio/tdefile/tdefiletreeview.cpp
+++ b/tdeio/tdefile/tdefiletreeview.cpp
@@ -40,12 +40,12 @@
 #include "tdefiletreeviewitem.h"
 
 KFileTreeView::KFileTreeView( TQWidget *parent, const char *name )
-    : KListView( parent, name ),
+    : TDEListView( parent, name ),
       m_wantOpenFolderPixmaps( true ),
       m_toolTip( this )
 {
     setDragEnabled(true);
-    setSelectionModeExt( KListView::Single );
+    setSelectionModeExt( TDEListView::Single );
 
     m_animationTimer = new TQTimer( this );
     connect( m_animationTimer, TQT_SIGNAL( timeout() ),
@@ -235,8 +235,8 @@ bool KFileTreeView::acceptDrag(TQDropEvent* e ) const
    // kdDebug(250) << "canDecode: " << KURLDrag::canDecode(e) << endl;
    // kdDebug(250) << "action: " << e->action() << endl;
 
-   /*  KListView::acceptDrag(e);  */
-   /* this is what KListView does:
+   /*  TDEListView::acceptDrag(e);  */
+   /* this is what TDEListView does:
     * acceptDrops() && itemsMovable() && (e->source()==viewport());
     * ask acceptDrops and itemsMovable, but not the third
     */
@@ -672,6 +672,6 @@ void KFileTreeViewToolTip::maybeTip( const TQPoint & )
 }
 
 void KFileTreeView::virtual_hook( int id, void* data )
-{ KListView::virtual_hook( id, data ); }
+{ TDEListView::virtual_hook( id, data ); }
 
 #include "tdefiletreeview.moc"
diff --git a/tdeio/tdefile/tdefiletreeview.h b/tdeio/tdefile/tdefiletreeview.h
index 11d695288..3d6e039f5 100644
--- a/tdeio/tdefile/tdefiletreeview.h
+++ b/tdeio/tdefile/tdefiletreeview.h
@@ -63,7 +63,7 @@ private:
  * 3. retrieve the root item with KFileTreeBranch::root() and set it open
  *    if desired. That starts the listing.
  */
-class TDEIO_EXPORT KFileTreeView : public KListView
+class TDEIO_EXPORT KFileTreeView : public TDEListView
 {
     Q_OBJECT
 public:
diff --git a/tdeio/tdefile/tdefiletreeviewitem.cpp b/tdeio/tdefile/tdefiletreeviewitem.cpp
index 4df2daaa1..3f7e5a485 100644
--- a/tdeio/tdefile/tdefiletreeviewitem.cpp
+++ b/tdeio/tdefile/tdefiletreeviewitem.cpp
@@ -29,7 +29,7 @@
 KFileTreeViewItem::KFileTreeViewItem( KFileTreeViewItem *parent,
 				      KFileItem* item,
 				      KFileTreeBranch *brnch )
-   : KListViewItem( parent ),
+   : TDEListViewItem( parent ),
      m_tdefileitem( item ),
      m_branch( brnch ),
      m_wasListed(false)
@@ -42,7 +42,7 @@ KFileTreeViewItem::KFileTreeViewItem( KFileTreeViewItem *parent,
 KFileTreeViewItem::KFileTreeViewItem( KFileTreeView* parent,
 				      KFileItem* item,
 				      KFileTreeBranch *brnch )
-   :KListViewItem( (TQListView*)parent ),
+   :TDEListViewItem( (TQListView*)parent ),
     m_tdefileitem(item ),
     m_branch( brnch ),
     m_wasListed(false)
diff --git a/tdeio/tdefile/tdefiletreeviewitem.h b/tdeio/tdefile/tdefiletreeviewitem.h
index 8fdb2789c..4455bff78 100644
--- a/tdeio/tdefile/tdefiletreeviewitem.h
+++ b/tdeio/tdefile/tdefiletreeviewitem.h
@@ -37,7 +37,7 @@ class KFileTreeItem;
 /**
  * An item for a KFileTreeView that knows about its own KFileItem.
  */
-class TDEIO_EXPORT KFileTreeViewItem : public KListViewItem
+class TDEIO_EXPORT KFileTreeViewItem : public TDEListViewItem
 {
 public:
    KFileTreeViewItem( KFileTreeViewItem*, KFileItem*, KFileTreeBranch * );
diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp
index 558053cc8..01bc5e6b0 100644
--- a/tdeio/tdefile/tdefileview.cpp
+++ b/tdeio/tdefile/tdefileview.cpp
@@ -55,7 +55,7 @@ public:
         }
     }
 
-    TQGuardedPtr<KActionCollection> actions;
+    TQGuardedPtr<TDEActionCollection> actions;
     int dropOptions;
 };
 
@@ -362,10 +362,10 @@ void KFileView::listingCompleted()
     // empty default impl.
 }
 
-KActionCollection * KFileView::actionCollection() const
+TDEActionCollection * KFileView::actionCollection() const
 {
     if ( !d->actions )
-        d->actions = new KActionCollection( widget(), "KFileView::d->actions" );
+        d->actions = new TDEActionCollection( widget(), "KFileView::d->actions" );
     return d->actions;
 }
 
diff --git a/tdeio/tdefile/tdefileview.h b/tdeio/tdefile/tdefileview.h
index 79aa1b478..b80c16f0f 100644
--- a/tdeio/tdefile/tdefileview.h
+++ b/tdeio/tdefile/tdefileview.h
@@ -23,7 +23,7 @@
 #define TDEFILEVIEW_H
 
 class TQPoint;
-class KActionCollection;
+class TDEActionCollection;
 
 #include <tqwidget.h>
 
@@ -342,7 +342,7 @@ public:
      * add its actions here (if it has any) to make them available to
      * e.g. the KDirOperator's popup-menu.
      */
-    virtual KActionCollection * actionCollection() const;
+    virtual TDEActionCollection * actionCollection() const;
 
     KFileViewSignaler * signaler() const { return sig; }
 
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
index b74468fda..008edb827 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
@@ -33,7 +33,7 @@
 
 #include "tdefiletreeviewtest.moc"
 
-testFrame::testFrame():KMainWindow(0,"Test FileTreeView"),
+testFrame::testFrame():TDEMainWindow(0,"Test FileTreeView"),
 		       dirOnlyMode(false)
 
 {
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.h b/tdeio/tdefile/tests/tdefiletreeviewtest.h
index 05f41fcfb..0375f8d11 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.h
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.h
@@ -20,7 +20,7 @@
 #ifndef TDEFILETREEVIEWTEST
 #define TDEFILETREEVIEWTEST
 
-class testFrame: public KMainWindow
+class testFrame: public TDEMainWindow
 {
    Q_OBJECT
 public:
diff --git a/tdeio/tdeio/kdatatool.cpp b/tdeio/tdeio/kdatatool.cpp
index 3f4f0a865..5ec790aa7 100644
--- a/tdeio/tdeio/kdatatool.cpp
+++ b/tdeio/tdeio/kdatatool.cpp
@@ -217,7 +217,7 @@ bool KDataToolInfo::isValid() const
  *************************************************/
 KDataToolAction::KDataToolAction( const TQString & text, const KDataToolInfo & info, const TQString & command,
                                     TQObject * parent, const char * name )
-    : KAction( text, info.iconName(), 0, parent, name ),
+    : TDEAction( text, info.iconName(), 0, parent, name ),
       m_command( command ),
       m_info( info )
 {
@@ -228,13 +228,13 @@ void KDataToolAction::slotActivated()
     emit toolActivated( m_info, m_command );
 }
 
-TQPtrList<KAction> KDataToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot )
+TQPtrList<TDEAction> KDataToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot )
 {
-    TQPtrList<KAction> actionList;
+    TQPtrList<TDEAction> actionList;
     if ( tools.isEmpty() )
         return actionList;
 
-    actionList.append( new KActionSeparator() );
+    actionList.append( new TDEActionSeparator() );
     TQValueList<KDataToolInfo>::ConstIterator entry = tools.begin();
     for( ; entry != tools.end(); ++entry )
     {
@@ -277,7 +277,7 @@ TDEInstance* KDataTool::instance() const
 }
 
 void KDataToolAction::virtual_hook( int id, void* data )
-{ KAction::virtual_hook( id, data ); }
+{ TDEAction::virtual_hook( id, data ); }
 
 void KDataTool::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
diff --git a/tdeio/tdeio/kdatatool.h b/tdeio/tdeio/kdatatool.h
index 6cb9353a8..bd787dcd5 100644
--- a/tdeio/tdeio/kdatatool.h
+++ b/tdeio/tdeio/kdatatool.h
@@ -191,7 +191,7 @@ private:
  * The slot defined for step 2 is called when the action is activated, and
  * that's where the tool should be created and run.
  */
-class TDEIO_EXPORT KDataToolAction : public KAction
+class TDEIO_EXPORT KDataToolAction : public TDEAction
 {
     Q_OBJECT
     
@@ -215,9 +215,9 @@ public:
      * @param tools the list of data tool descriptions
      * @param receiver the receiver for toolActivated() signals
      * @param slot the slot that will receive the toolActivated() signals
-     * @return the KActions
+     * @return the TDEActions
      */
-    static TQPtrList<KAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot );
+    static TQPtrList<TDEAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot );
 
 signals:
     /**
diff --git a/tdeio/tdeio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp
index 51db75fe1..7c74a9a41 100644
--- a/tdeio/tdeio/kmimetypechooser.cpp
+++ b/tdeio/tdeio/kmimetypechooser.cpp
@@ -37,7 +37,7 @@
 class KMimeTypeChooserPrivate
 {
   public:
-    KListView *lvMimeTypes;
+    TDEListView *lvMimeTypes;
     TQPushButton *btnEditMimeType;
 
     TQString defaultgroup;
@@ -70,7 +70,7 @@ KMimeTypeChooser::KMimeTypeChooser( const TQString &text,
     new TQLabel( text, this );
   }
 
-  d->lvMimeTypes = new KListView( this );
+  d->lvMimeTypes = new TDEListView( this );
 
   d->lvMimeTypes->addColumn( i18n("Mime Type") );
 //   d->lvMimeTypes->setColumnWidthMode( 0, TQListView::Manual );
diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index b243671b4..dd6de164c 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -211,7 +211,7 @@ bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles )
 
 bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles, const TQString& suggestedFileName )
 {
-    if (kapp && !kapp->authorizeKAction("openwith"))
+    if (kapp && !kapp->authorizeTDEAction("openwith"))
     {
        // TODO: Better message, i18n freeze :-(
        KMessageBox::sorry(0L, i18n("You are not authorized to open this file."));
@@ -780,8 +780,8 @@ pid_t KRun::run( const KService& _service, const KURL::List& _urls, TQWidget* wi
       // Remember we opened those urls, for the "recent documents" menu in kicker
       KURL::List::ConstIterator it = _urls.begin();
       for(; it != _urls.end(); ++it) {
-          //kdDebug(7010) << "KRecentDocument::adding " << (*it).url() << endl;
-          KRecentDocument::add( *it, _service.desktopEntryName() );
+          //kdDebug(7010) << "TDERecentDocument::adding " << (*it).url() << endl;
+          TDERecentDocument::add( *it, _service.desktopEntryName() );
       }
   }
 
diff --git a/tdeio/tdeio/paste.h b/tdeio/tdeio/paste.h
index 6fdf1b2a4..aff67934c 100644
--- a/tdeio/tdeio/paste.h
+++ b/tdeio/tdeio/paste.h
@@ -114,7 +114,7 @@ namespace TDEIO {
   /**
    * Returns the text to use for the Paste action, when the application supports
    * pasting files, urls, and clipboard data, using pasteClipboard().
-   * @return a string suitable for KAction::setText, or an empty string if pasting
+   * @return a string suitable for TDEAction::setText, or an empty string if pasting
    * isn't possible right now.
    *
    * @since 3.5
diff --git a/tdeio/tdeio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp
index c0aad7d38..01bcde298 100644
--- a/tdeio/tdeio/scheduler.cpp
+++ b/tdeio/tdeio/scheduler.cpp
@@ -130,7 +130,7 @@ Scheduler::Scheduler()
            coSlaveTimer(0, "Scheduler::coSlaveTimer"),
            cleanupTimer(0, "Scheduler::cleanupTimer")
 {
-    checkOnHold = true; // !! Always check with KLauncher for the first request.
+    checkOnHold = true; // !! Always check with TDELauncher for the first request.
     slaveOnHold = 0;
     protInfoDict = new ProtocolInfoDict;
     slaveList = new SlaveList;
diff --git a/tdeio/tdeio/scheduler.h b/tdeio/tdeio/scheduler.h
index 08efafc32..3b9b23d92 100644
--- a/tdeio/tdeio/scheduler.h
+++ b/tdeio/tdeio/scheduler.h
@@ -175,7 +175,7 @@ namespace TDEIO {
         { self()->_removeSlaveOnHold(); }
 
         /**
-         * Send the slave that was put on hold back to KLauncher. This
+         * Send the slave that was put on hold back to TDELauncher. This
          * allows another process to take over the slave and resume the job
          * that was started.
          */
@@ -231,7 +231,7 @@ namespace TDEIO {
         { return self()->_disconnectSlave(slave); }
 
         /**
-         * Send the slave that was put on hold back to KLauncher. This
+         * Send the slave that was put on hold back to TDELauncher. This
          * allows another process to take over the slave and resume the job
          * the that was started.
          * Register the mainwindow @p wid with the KIO subsystem
@@ -273,9 +273,9 @@ namespace TDEIO {
         { return TQObject::connect(sender, signal, member); }
 
         /**
-         * When true, the next job will check whether KLauncher has a slave 
+         * When true, the next job will check whether TDELauncher has a slave 
          * on hold that is suitable for the job.
-	 * @param b true when KLauncher has a job on hold
+	 * @param b true when TDELauncher has a job on hold
          */
         static void checkSlaveOnHold(bool b) { self()->_checkSlaveOnHold(b); }
 
diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp
index dfd6d6bb3..380be2058 100644
--- a/tdeio/tdeio/slave.cpp
+++ b/tdeio/tdeio/slave.cpp
@@ -233,7 +233,7 @@ void Slave::hold(const KURL &url)
       emit slaveDied(this);
    }
    deref();
-   // Call KLauncher::waitForSlave(pid);
+   // Call TDELauncher::waitForSlave(pid);
    {
       DCOPClient *client = kapp->dcopClient();
       if (!client->isAttached())
diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp
index 5fa19073c..26534b840 100644
--- a/tdeio/tests/tdeioslavetest.cpp
+++ b/tdeio/tests/tdeioslavetest.cpp
@@ -29,7 +29,7 @@
 using namespace TDEIO;
 
 KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr )
-  : KMainWindow(0, "")
+  : TDEMainWindow(0, "")
 {
 
   job = 0L;
diff --git a/tdeio/tests/tdeioslavetest.h b/tdeio/tests/tdeioslavetest.h
index f2cb32af1..667cb2856 100644
--- a/tdeio/tests/tdeioslavetest.h
+++ b/tdeio/tests/tdeioslavetest.h
@@ -26,7 +26,7 @@
 #include "tdeio/statusbarprogress.h"
 #include "tdeio/slave.h"
 
-class KioslaveTest : public KMainWindow {
+class KioslaveTest : public TDEMainWindow {
   Q_OBJECT
 
 public: