Rename a number of classes to enhance compatibility with KDE4

28 files changed, 163 insertions, 163 deletions

diff --git a/smb4k/browser/smb4knetworkbrowser.cpp b/smb4k/browser/smb4knetworkbrowser.cpp
index 45e08cd..21ab903 100644
--- a/smb4k/browser/smb4knetworkbrowser.cpp
+++ b/smb4k/browser/smb4knetworkbrowser.cpp
@@ -38,7 +38,7 @@
 
 
 Smb4KNetworkBrowser::Smb4KNetworkBrowser( TQWidget *parent, const char *name )
-: KListView( parent, name )
+: TDEListView( parent, name )
 {
   setRootIsDecorated( true );
   setAllColumnsShowFocus( false );
@@ -156,7 +156,7 @@ void Smb4KNetworkBrowser::contentsMouseMoveEvent( TQMouseEvent *e )
     }
   }
 
-  KListView::contentsMouseMoveEvent( e );
+  TDEListView::contentsMouseMoveEvent( e );
 }
 
 
diff --git a/smb4k/browser/smb4knetworkbrowser.h b/smb4k/browser/smb4knetworkbrowser.h
index 7fcee48..b62cfbe 100644
--- a/smb4k/browser/smb4knetworkbrowser.h
+++ b/smb4k/browser/smb4knetworkbrowser.h
@@ -37,7 +37,7 @@
 class Smb4KNetworkBrowserItem;
 class Smb4KNetworkBrowserToolTip;
 
-class Smb4KNetworkBrowser : public KListView
+class Smb4KNetworkBrowser : public TDEListView
 {
   Q_OBJECT
   
diff --git a/smb4k/browser/smb4knetworkbrowser_part.cpp b/smb4k/browser/smb4knetworkbrowser_part.cpp
index 8a28079..ba30306 100644
--- a/smb4k/browser/smb4knetworkbrowser_part.cpp
+++ b/smb4k/browser/smb4knetworkbrowser_part.cpp
@@ -138,35 +138,35 @@ Smb4KNetworkBrowserPart::~Smb4KNetworkBrowserPart()
 
 void Smb4KNetworkBrowserPart::setupActions()
 {
-  KAction *rescan =        new KAction( i18n( "Scan Netwo&rk" ), "reload", KShortcut( CTRL+Key_R ),
+  TDEAction *rescan =        new TDEAction( i18n( "Scan Netwo&rk" ), "reload", TDEShortcut( CTRL+Key_R ),
                                         this, TQT_SLOT( slotRescan() ),
                                         actionCollection(), "rescan_action" );
-  KAction *abort =         new KAction( i18n( "&Abort" ) , "stop", KShortcut( CTRL+Key_A ),
+  TDEAction *abort =         new TDEAction( i18n( "&Abort" ) , "stop", TDEShortcut( CTRL+Key_A ),
                                         this, TQT_SLOT( slotAbort() ),
                                         actionCollection(), "abort_action" );
-  KActionSeparator *sep1 = new KActionSeparator( actionCollection(),
+  TDEActionSeparator *sep1 = new TDEActionSeparator( actionCollection(),
                                         "separator_1" );
-  KAction *manual_mount  = new KAction( i18n( "M&ount Manually" ), "connect_creating", KShortcut( CTRL+Key_O ),
+  TDEAction *manual_mount  = new TDEAction( i18n( "M&ount Manually" ), "connect_creating", TDEShortcut( CTRL+Key_O ),
                                         this, TQT_SLOT( slotMountManually() ),
                                         actionCollection(), "mount_manually_action" );
-  KActionSeparator *sep2 = new KActionSeparator( actionCollection(),
+  TDEActionSeparator *sep2 = new TDEActionSeparator( actionCollection(),
                                         "separator_2" );
-  KAction *auth =          new KAction( i18n( "Au&thentication" ), "identity", KShortcut( CTRL+Key_T ),
+  TDEAction *auth =          new TDEAction( i18n( "Au&thentication" ), "identity", TDEShortcut( CTRL+Key_T ),
                                         this, TQT_SLOT( slotAuthentication() ),
                                         actionCollection(), "askpass_action" );
-  KAction *custom =        new KAction( i18n( "&Custom Options" ), "samba", KShortcut( CTRL+Key_C ),
+  TDEAction *custom =        new TDEAction( i18n( "&Custom Options" ), "samba", TDEShortcut( CTRL+Key_C ),
                                         this, TQT_SLOT( slotCustomOptions() ),
                                         actionCollection(), "custom_action" );
-  KAction *bookmark =      new KAction( i18n( "Add &Bookmark" ), "bookmark_add", KShortcut( CTRL+Key_B ),
+  TDEAction *bookmark =      new TDEAction( i18n( "Add &Bookmark" ), "bookmark_add", TDEShortcut( CTRL+Key_B ),
                                         this, TQT_SLOT( slotBookmark() ),
                                         actionCollection(), "bookmark_action" );
-  KAction *preview =       new KAction( i18n( "Pre&view" ), "view_icon", KShortcut( CTRL+Key_V ),
+  TDEAction *preview =       new TDEAction( i18n( "Pre&view" ), "view_icon", TDEShortcut( CTRL+Key_V ),
                                         this, TQT_SLOT( slotPreview() ),
                                         actionCollection(), "preview_action" );
-  KAction *print =         new KAction( i18n( "&Print File" ), "printer1", KShortcut( CTRL+Key_P ),
+  TDEAction *print =         new TDEAction( i18n( "&Print File" ), "printer1", TDEShortcut( CTRL+Key_P ),
                                         this, TQT_SLOT( slotPrint() ),
                                         actionCollection(), "print_action" );
-  KAction *mount =         new KAction( i18n( "&Mount" ), "hdd_mount", KShortcut( CTRL+Key_M ),
+  TDEAction *mount =         new TDEAction( i18n( "&Mount" ), "hdd_mount", TDEShortcut( CTRL+Key_M ),
                                         this, TQT_SLOT( slotMount() ),
                                         actionCollection(), "mount_action" );
 
@@ -182,7 +182,7 @@ void Smb4KNetworkBrowserPart::setupActions()
   mount->setEnabled( false );
 
   // Plug the actions into the action menu:
-  m_menu = new KActionMenu( this, "NetworkActionMenu" );
+  m_menu = new TDEActionMenu( this, "NetworkActionMenu" );
   m_menu->popupMenu()->insertTitle( SmallIcon( "network" ), i18n( "Network" ), 0 );
   m_menu->insert( rescan, 1 );
   m_menu->insert( abort, 2 );
@@ -200,7 +200,7 @@ void Smb4KNetworkBrowserPart::setupActions()
   // is also needed:
   if ( m_mode == KonqPlugin )
   {
-    KAction *unmount =     new KAction( i18n( "&Unmount" ), "hdd_unmount", KShortcut( CTRL+Key_U ),
+    TDEAction *unmount =     new TDEAction( i18n( "&Unmount" ), "hdd_unmount", TDEShortcut( CTRL+Key_U ),
                                         this, TQT_SLOT( slotUnmount() ),
                                         actionCollection(), "konq_umount_action" );
 
@@ -276,7 +276,7 @@ void Smb4KNetworkBrowserPart::customEvent( TQCustomEvent *e )
     }
     case EVENT_SET_FOCUS:
     {
-      KListView *view = static_cast<KListView *>( m_widget );
+      TDEListView *view = static_cast<TDEListView *>( m_widget );
 
       if ( view->childCount() != 0 )
       {
diff --git a/smb4k/browser/smb4knetworkbrowser_part.h b/smb4k/browser/smb4knetworkbrowser_part.h
index c2c8f67..ff7b9e2 100644
--- a/smb4k/browser/smb4knetworkbrowser_part.h
+++ b/smb4k/browser/smb4knetworkbrowser_part.h
@@ -303,7 +303,7 @@ class Smb4KNetworkBrowserPart : public KParts::Part
     /**
      * The action menu
      */
-    KActionMenu *m_menu;
+    TDEActionMenu *m_menu;
 
     /**
      * The network browser widget
diff --git a/smb4k/browser/smb4knetworkbrowseritem.cpp b/smb4k/browser/smb4knetworkbrowseritem.cpp
index dba18ae..313918c 100644
--- a/smb4k/browser/smb4knetworkbrowseritem.cpp
+++ b/smb4k/browser/smb4knetworkbrowseritem.cpp
@@ -34,7 +34,7 @@
 #include "smb4knetworkbrowseritem.h"
 
 Smb4KNetworkBrowserItem::Smb4KNetworkBrowserItem( TQListView *parent, Smb4KWorkgroupItem *item )
-: KListViewItem( parent, item->name() ), m_type( Workgroup ), m_workgroup( *item ),
+: TDEListViewItem( parent, item->name() ), m_type( Workgroup ), m_workgroup( *item ),
 m_mounted( false )
 {
   setIcon();
@@ -42,7 +42,7 @@ m_mounted( false )
 
 
 Smb4KNetworkBrowserItem::Smb4KNetworkBrowserItem( TQListViewItem *parent, Smb4KHostItem *item )
-: KListViewItem( parent, item->name(), TQString(), item->ip(), item->comment()  ),
+: TDEListViewItem( parent, item->name(), TQString(), item->ip(), item->comment()  ),
 m_type( Host ), m_host( *item ), m_mounted( false )
 {
   setIcon();
@@ -50,7 +50,7 @@ m_type( Host ), m_host( *item ), m_mounted( false )
 
 
 Smb4KNetworkBrowserItem::Smb4KNetworkBrowserItem( TQListViewItem *parent, Smb4KShareItem *item )
-: KListViewItem( parent, item->name(), item->plainType(), TQString(), item->comment() ),
+: TDEListViewItem( parent, item->name(), item->plainType(), TQString(), item->comment() ),
 m_type( Share ), m_share( *item ), m_mounted( false )
 {
   setIcon();
diff --git a/smb4k/browser/smb4knetworkbrowseritem.h b/smb4k/browser/smb4knetworkbrowseritem.h
index df36e58..97e8336 100644
--- a/smb4k/browser/smb4knetworkbrowseritem.h
+++ b/smb4k/browser/smb4knetworkbrowseritem.h
@@ -40,7 +40,7 @@
 #include "../core/smb4knetworkitems.h"
 
 class Smb4KNetworkBrowser;
-class Smb4KNetworkBrowserItem : public KListViewItem
+class Smb4KNetworkBrowserItem : public TDEListViewItem
 {
   public:
     /**
diff --git a/smb4k/configdlg/smb4ksambaoptions.cpp b/smb4k/configdlg/smb4ksambaoptions.cpp
index e066d3f..f90e999 100644
--- a/smb4k/configdlg/smb4ksambaoptions.cpp
+++ b/smb4k/configdlg/smb4ksambaoptions.cpp
@@ -374,10 +374,10 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
 
   // FIXME: Set "What's this' texts!!!
 
-  KListView *custom_options =   new KListView( custom_tab, "CustomOptionsList" );
+  TDEListView *custom_options =   new TDEListView( custom_tab, "CustomOptionsList" );
 //   custom_options->setAllColumnsShowFocus( true );
   custom_options->setSelectionMode( TQListView::Single );
-  custom_options->setVScrollBarMode( KListView::Auto );
+  custom_options->setVScrollBarMode( TDEListView::Auto );
   custom_options->addColumn( i18n( "Item" ), -1 );
   custom_options->addColumn( i18n( "Protocol" ), -1 );
 #ifndef __FreeBSD__
@@ -882,7 +882,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
   else
   {
     // Get the list view:
-    KListView *view = static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
+    TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
 
     if ( view )
     {
@@ -1015,7 +1015,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
 
 void Smb4KSambaOptions::slotCustomProtocolChanged( int index )
 {
-  KListView *view =            static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
+  TDEListView *view =            static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
   KComboBox *custom_protocol = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomProtocol", "KComboBox", true )) );
 
   if ( view && view->selectedItem() && custom_protocol )
@@ -1043,7 +1043,7 @@ void Smb4KSambaOptions::slotCustomProtocolChanged( int index )
 #ifndef __FreeBSD__
 void Smb4KSambaOptions::slotCustomFileSystemChanged( int index )
 {
-  KListView *view =              static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
+  TDEListView *view =              static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
   KComboBox *custom_filesystem = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomFileSystem", "KComboBox", true )) );
 
   if ( view && view->selectedItem() && custom_filesystem )
@@ -1075,7 +1075,7 @@ void Smb4KSambaOptions::slotCustomFileSystemChanged( int )
 #ifndef __FreeBSD__
 void Smb4KSambaOptions::slotCustomWriteAccessChanged( int index )
 {
-  KListView *view =      static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
+  TDEListView *view =      static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
   KComboBox *custom_rw = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) );
 
   if ( view && view->selectedItem() && custom_rw )
@@ -1109,7 +1109,7 @@ void Smb4KSambaOptions::slotCustomKerberosChanged( int index )
   // FIXME: Do we need to adjust something here with respect to
   // FreeBSD? It does not know Kerberos for mounting!
 
-  KListView *view =            static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
+  TDEListView *view =            static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
   KComboBox *custom_kerberos = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) );
 
   if ( view && view->selectedItem() && custom_kerberos )
@@ -1136,7 +1136,7 @@ void Smb4KSambaOptions::slotCustomKerberosChanged( int index )
 
 void Smb4KSambaOptions::slotCustomUIDChanged( const TQString &uid )
 {
-  KListView *view = static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
+  TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
 
   if ( view && view->selectedItem() )
   {
@@ -1154,7 +1154,7 @@ void Smb4KSambaOptions::slotCustomUIDChanged( const TQString &uid )
 
 void Smb4KSambaOptions::slotCustomGIDChanged( const TQString &gid )
 {
-  KListView *view = static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
+  TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
 
   if ( view && view->selectedItem() )
   {
@@ -1172,7 +1172,7 @@ void Smb4KSambaOptions::slotCustomGIDChanged( const TQString &gid )
 
 void Smb4KSambaOptions::slotCustomPortChanged( int port )
 {
-  KListView *view = static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
+  TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
 
   if ( view && view->selectedItem() )
   {
@@ -1189,7 +1189,7 @@ void Smb4KSambaOptions::slotCustomPortChanged( int port )
 
 void Smb4KSambaOptions::slotRemoveCustomOption()
 {
-  KListView *view = static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
+  TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
 
   if ( view && view->selectedItem() )
   {
@@ -1208,7 +1208,7 @@ void Smb4KSambaOptions::slotRemoveCustomOption()
 
 void Smb4KSambaOptions::slotRemoveAllCustomOptions()
 {
-  KListView *view = static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
+  TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
 
   if ( view )
   {
diff --git a/smb4k/configdlg/smb4tdeconfigdialog.cpp b/smb4k/configdlg/smb4tdeconfigdialog.cpp
index d603385..3cfba08 100644
--- a/smb4k/configdlg/smb4tdeconfigdialog.cpp
+++ b/smb4k/configdlg/smb4tdeconfigdialog.cpp
@@ -196,7 +196,7 @@ Smb4TDEConfigDialog::~Smb4TDEConfigDialog()
 void Smb4TDEConfigDialog::loadCustomSambaOptions()
 {
   // Get the list view:
-  KListView *custom_list = static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
+  TDEListView *custom_list = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
 
   if ( !custom_list )
   {
@@ -311,7 +311,7 @@ void Smb4TDEConfigDialog::loadCustomSambaOptions()
     }
 
     // Now put the item in the list:
-    KListViewItem *item = new KListViewItem( custom_list );
+    TDEListViewItem *item = new TDEListViewItem( custom_list );
 
     item->setText( Smb4KSambaOptions::ItemName, (*it)->itemName() );
 
@@ -392,7 +392,7 @@ void Smb4TDEConfigDialog::loadCustomSambaOptions()
 void Smb4TDEConfigDialog::saveCustomSambaOptions()
 {
   // Get the list view:
-  KListView *custom_list = static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
+  TDEListView *custom_list = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
 
   if ( !custom_list )
   {
@@ -1010,7 +1010,7 @@ void Smb4TDEConfigDialog::slotCancel()
 void Smb4TDEConfigDialog::slotCustomSambaSettingsChanged()
 {
   // Get the list view and all other input widgets:
-  KListView *view = static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
+  TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
 
   if ( !view )
   {
diff --git a/smb4k/dialogs/smb4kbookmarkeditor.cpp b/smb4k/dialogs/smb4kbookmarkeditor.cpp
index 93b2713..f1d4709 100644
--- a/smb4k/dialogs/smb4kbookmarkeditor.cpp
+++ b/smb4k/dialogs/smb4kbookmarkeditor.cpp
@@ -57,7 +57,7 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name )
   TQGridLayout *layout = new TQGridLayout( frame );
   layout->setSpacing( 5 );
 
-  m_view = new KListView( frame );
+  m_view = new TDEListView( frame );
   m_view->addColumn( i18n( "Bookmark" ), Bookmark );
   m_view->addColumn( i18n( "Workgroup" ), Workgroup );
   m_view->addColumn( i18n( "IP Address" ), IPAddress );
@@ -69,11 +69,11 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name )
   m_view->setRenameable( IPAddress, true );
   m_view->setRenameable( Label, true );
 
-  m_collection = new KActionCollection( this, "BookmarkEditor_ActionCollection", TDEGlobal::instance() );
+  m_collection = new TDEActionCollection( this, "BookmarkEditor_ActionCollection", TDEGlobal::instance() );
 
-  (void) new KAction( i18n( "&Remove" ), "remove", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveClicked() ), m_collection, "remove_bookmark" );
+  (void) new TDEAction( i18n( "&Remove" ), "remove", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveClicked() ), m_collection, "remove_bookmark" );
 
-  (void) new KAction( i18n( "Remove &All" ), "editdelete", CTRL+Key_X, TQT_TQOBJECT(this), TQT_SLOT( slotDeleteAllClicked() ), m_collection, "remove_all_bookmarks" );
+  (void) new TDEAction( i18n( "Remove &All" ), "editdelete", CTRL+Key_X, TQT_TQOBJECT(this), TQT_SLOT( slotDeleteAllClicked() ), m_collection, "remove_all_bookmarks" );
 
   slotLoadBookmarks();
 
@@ -136,11 +136,11 @@ void Smb4KBookmarkEditor::slotRightButtonPressed( TQListViewItem *item, const TQ
     m_collection->action( "remove_all_bookmarks" )->setEnabled( true );
   }
 
-  KActionMenu *menu = static_cast<KActionMenu *>( child( "BookmarkEditorPopupMenu", "KActionMenu", true ) );
+  TDEActionMenu *menu = static_cast<TDEActionMenu *>( child( "BookmarkEditorPopupMenu", "TDEActionMenu", true ) );
 
   if ( !menu )
   {
-    menu = new KActionMenu( TQT_TQOBJECT(this), "BookmarkEditorPopupMenu" );
+    menu = new TDEActionMenu( TQT_TQOBJECT(this), "BookmarkEditorPopupMenu" );
     menu->insert( m_collection->action( "remove_bookmark" ) );
     menu->insert( m_collection->action( "remove_all_bookmarks" ) );
   }
@@ -178,9 +178,9 @@ void Smb4KBookmarkEditor::slotDeleteAllClicked()
 
 void Smb4KBookmarkEditor::slotOkClicked()
 {
-  KActionPtrList list = m_collection->actions( "BookmarkEditor" );
+  TDEActionPtrList list = m_collection->actions( "BookmarkEditor" );
 
-  for ( KActionPtrList::Iterator it = list.begin(); it != list.end(); ++it )
+  for ( TDEActionPtrList::Iterator it = list.begin(); it != list.end(); ++it )
   {
     delete *it;
   }
@@ -212,9 +212,9 @@ void Smb4KBookmarkEditor::slotOkClicked()
 
 void Smb4KBookmarkEditor::slotCancelClicked()
 {
-  KActionPtrList list = m_collection->actions( "BookmarkEditor" );
+  TDEActionPtrList list = m_collection->actions( "BookmarkEditor" );
 
-  for ( KActionPtrList::Iterator it = list.begin(); it != list.end(); ++it )
+  for ( TDEActionPtrList::Iterator it = list.begin(); it != list.end(); ++it )
   {
     m_collection->kaccel()->remove( (*it)->name() );
     m_collection->remove( *it );
@@ -230,7 +230,7 @@ void Smb4KBookmarkEditor::slotLoadBookmarks()
 
   for ( TQValueList<Smb4KBookmark *>::ConstIterator it = bookmarks.begin(); it != bookmarks.end(); ++it )
   {
-    KListViewItem *item = new KListViewItem( m_view );
+    TDEListViewItem *item = new TDEListViewItem( m_view );
     item->setText( Bookmark, (*it)->bookmark() );
     item->setText( Workgroup, (*it)->workgroup() );
     item->setText( IPAddress, (*it)->ip() );
diff --git a/smb4k/dialogs/smb4kbookmarkeditor.h b/smb4k/dialogs/smb4kbookmarkeditor.h
index 0f970b8..c80d414 100644
--- a/smb4k/dialogs/smb4kbookmarkeditor.h
+++ b/smb4k/dialogs/smb4kbookmarkeditor.h
@@ -64,13 +64,13 @@ class Smb4KBookmarkEditor : public KDialogBase
     /**
      * This function returns a pointer to the action collection of this class.
      * You should use it to include the action into the action collection of the
-     * main action collection (e.g. KMainWindow::actionCollection()).
+     * main action collection (e.g. TDEMainWindow::actionCollection()).
      *
      * The entries in this action collection are members of the group "BookmarkEditor".
      *
      * @returns       a pointer to the action collection of this class
      */
-    KActionCollection *action_collection() { return m_collection; }
+    TDEActionCollection *action_collection() { return m_collection; }
 
   protected slots:
     /**
@@ -127,12 +127,12 @@ class Smb4KBookmarkEditor : public KDialogBase
     /**
      * The listview.
      */
-    KListView *m_view;
+    TDEListView *m_view;
 
     /**
      * The action collection of this class.
      */
-    KActionCollection *m_collection;
+    TDEActionCollection *m_collection;
 };
 
 #endif
diff --git a/smb4k/dialogs/smb4kpreviewdialog.cpp b/smb4k/dialogs/smb4kpreviewdialog.cpp
index 79d420d..437362b 100644
--- a/smb4k/dialogs/smb4kpreviewdialog.cpp
+++ b/smb4k/dialogs/smb4kpreviewdialog.cpp
@@ -105,7 +105,7 @@ void Smb4KPreviewDialog::setupView()
   m_view->setAutoArrange( true );
   m_view->setSorting( true, true );
 
-  m_toolbar = new KToolBar( frame, 0, true, false );
+  m_toolbar = new TDEToolBar( frame, 0, true, false );
   m_toolbar->insertButton( "reload", Reload, true, i18n( "Reload" ), 0 );
   m_toolbar->insertButton( "back", Back, false, i18n( "Back" ), 1 );
   m_toolbar->insertButton( "forward", Forward, false, i18n( "Forward" ), 2 );
diff --git a/smb4k/dialogs/smb4kpreviewdialog.h b/smb4k/dialogs/smb4kpreviewdialog.h
index 9291997..d6438ec 100644
--- a/smb4k/dialogs/smb4kpreviewdialog.h
+++ b/smb4k/dialogs/smb4kpreviewdialog.h
@@ -137,7 +137,7 @@ class Smb4KPreviewDialog : public KDialogBase
     /**
      * The toolbar.
      */
-    KToolBar *m_toolbar;
+    TDEToolBar *m_toolbar;
 
     /**
      * The combo box.
diff --git a/smb4k/iconview/smb4ksharesiconview_part.cpp b/smb4k/iconview/smb4ksharesiconview_part.cpp
index 9504a71..6b23455 100644
--- a/smb4k/iconview/smb4ksharesiconview_part.cpp
+++ b/smb4k/iconview/smb4ksharesiconview_part.cpp
@@ -105,24 +105,24 @@ Smb4KSharesIconViewPart::~Smb4KSharesIconViewPart()
 void Smb4KSharesIconViewPart::setupActions()
 {
   // Create the actions:
-  KAction *unmount =   new KAction( i18n( "&Unmount" ), "hdd_unmount", KShortcut( CTRL+Key_U ),
+  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "hdd_unmount", TDEShortcut( CTRL+Key_U ),
                                     this, TQT_SLOT( slotUnmountShare() ),
                                     actionCollection(), "unmount_action" );
 #ifdef __linux__
-  KAction *force =     new KAction( i18n( "&Force Unmounting" ), "hdd_unmount", KShortcut( CTRL+Key_F ),
+  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "hdd_unmount", TDEShortcut( CTRL+Key_F ),
                                     this, TQT_SLOT( slotForceUnmountShare() ),
                                     actionCollection(), "force_unmount_action" );
 #endif
-  KAction *all =       new KAction( i18n( "U&nmount All" ), "gear", KShortcut( CTRL+Key_N ),
+  TDEAction *all =       new TDEAction( i18n( "U&nmount All" ), "gear", TDEShortcut( CTRL+Key_N ),
                                     this, TQT_SLOT( slotUnmountAllShares() ),
                                     actionCollection(), "unmount_all_action" );
-  KAction *sync =      new KAction( i18n( "S&ynchronize" ), "bottom", KShortcut( CTRL+Key_Y ),
+  TDEAction *sync =      new TDEAction( i18n( "S&ynchronize" ), "bottom", TDEShortcut( CTRL+Key_Y ),
                                     this, TQT_SLOT( slotSynchronize() ),
                                     actionCollection(), "synchronize_action" );
-  KAction *konsole =   new KAction( i18n( "Open with Konso&le" ), "terminal", KShortcut( CTRL+Key_L ),
+  TDEAction *konsole =   new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut( CTRL+Key_L ),
                                     this, TQT_SLOT( slotKonsole() ),
                                     actionCollection(), "konsole_action" );
-  KAction *konq =      new KAction( i18n( "Open with &Konqueror" ), "kfm_home", KShortcut( CTRL+Key_K ),
+  TDEAction *konq =      new TDEAction( i18n( "Open with &Konqueror" ), "kfm_home", TDEShortcut( CTRL+Key_K ),
                                     this, TQT_SLOT( slotFilemanager() ),
                                     actionCollection(), "filemanager_action" );
 
@@ -137,7 +137,7 @@ void Smb4KSharesIconViewPart::setupActions()
   konq->setEnabled( false );
 
   // Insert the actions into the menu:
-  m_menu = new KActionMenu( this, "SharesIconViewMenu" );
+  m_menu = new TDEActionMenu( this, "SharesIconViewMenu" );
   m_menu->popupMenu()->insertTitle( SmallIcon( "hdd_mount" ), i18n( "Shares" ), 0 );
   m_menu->insert( unmount, -1 );
 #ifdef __linux__
@@ -238,7 +238,7 @@ void Smb4KSharesIconViewPart::slotContextMenuRequested( TQIconViewItem *item, co
 
 void Smb4KSharesIconViewPart::slotSelectionChanged( TQIconViewItem *item )
 {
-  // NOTE: Here we only enable or disable the KActions. All other things
+  // NOTE: Here we only enable or disable the TDEActions. All other things
   // are done in the Smb4KSharesIconView class.
 
   // This slot is used to enable or disable the actions when the user
@@ -277,7 +277,7 @@ void Smb4KSharesIconViewPart::slotSelectionChanged( TQIconViewItem *item )
 
 void Smb4KSharesIconViewPart::slotMouseButtonPressed( TQIconViewItem *item )
 {
-  // NOTE: Here we only enable or disable the KActions. All other things
+  // NOTE: Here we only enable or disable the TDEActions. All other things
   // are done in the Smb4KSharesIconView class.
 
   // Here we do all the stuff that cannot be done in
diff --git a/smb4k/iconview/smb4ksharesiconview_part.h b/smb4k/iconview/smb4ksharesiconview_part.h
index 88655cd..10f22a6 100644
--- a/smb4k/iconview/smb4ksharesiconview_part.h
+++ b/smb4k/iconview/smb4ksharesiconview_part.h
@@ -183,7 +183,7 @@ class Smb4KSharesIconViewPart : public KParts::Part
     /**
      * The action menu.
      */
-    KActionMenu *m_menu;
+    TDEActionMenu *m_menu;
 };
 
 
diff --git a/smb4k/listview/smb4kshareslistview.cpp b/smb4k/listview/smb4kshareslistview.cpp
index 2d01084..08d2e4c 100644
--- a/smb4k/listview/smb4kshareslistview.cpp
+++ b/smb4k/listview/smb4kshareslistview.cpp
@@ -40,9 +40,9 @@
 #include "../core/smb4ksettings.h"
 
 Smb4KSharesListView::Smb4KSharesListView( TQWidget *parent, const char *name )
-: KListView( parent, name )
+: TDEListView( parent, name )
 {
-  setSelectionModeExt( KListView::Single );
+  setSelectionModeExt( TDEListView::Single );
   setAllColumnsShowFocus( false );
   setItemsMovable( false );
   setAcceptDrops( true );
@@ -113,7 +113,7 @@ void Smb4KSharesListView::startDrag()
     return;
   }
 
-  KListView::startDrag();
+  TDEListView::startDrag();
 }
 
 
@@ -229,7 +229,7 @@ void Smb4KSharesListView::contentsMouseMoveEvent( TQMouseEvent *e )
     }
   }
 
-  KListView::contentsMouseMoveEvent( e );
+  TDEListView::contentsMouseMoveEvent( e );
 }
 
 
diff --git a/smb4k/listview/smb4kshareslistview.h b/smb4k/listview/smb4kshareslistview.h
index 8108039..1cced16 100644
--- a/smb4k/listview/smb4kshareslistview.h
+++ b/smb4k/listview/smb4kshareslistview.h
@@ -43,7 +43,7 @@ class Smb4KSharesListViewToolTip;
  * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
  */
 
-class Smb4KSharesListView : public KListView
+class Smb4KSharesListView : public TDEListView
 {
   Q_OBJECT
   
@@ -129,7 +129,7 @@ class Smb4KSharesListView : public KListView
 
   protected slots:
     /**
-     * This slot is connected to KListView::pressed() and clears the selection
+     * This slot is connected to TDEListView::pressed() and clears the selection
      * if the user clicked on the viewport.
      *
      * @param item            The TQIconViewItem that the user clicked or NULL
diff --git a/smb4k/listview/smb4kshareslistview_part.cpp b/smb4k/listview/smb4kshareslistview_part.cpp
index 76bc1b0..89f35d7 100644
--- a/smb4k/listview/smb4kshareslistview_part.cpp
+++ b/smb4k/listview/smb4kshareslistview_part.cpp
@@ -108,24 +108,24 @@ Smb4KSharesListViewPart::~Smb4KSharesListViewPart()
 void Smb4KSharesListViewPart::setupActions()
 {
   // Create the actions:
-  KAction *unmount =   new KAction( i18n( "&Unmount" ), "hdd_unmount", KShortcut( CTRL+Key_U ),
+  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "hdd_unmount", TDEShortcut( CTRL+Key_U ),
                                     this, TQT_SLOT( slotUnmountShare() ),
                                     actionCollection(), "unmount_action" );
 #ifdef __linux__
-  KAction *force =     new KAction( i18n( "&Force Unmounting" ), "hdd_unmount", KShortcut( CTRL+Key_F ),
+  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "hdd_unmount", TDEShortcut( CTRL+Key_F ),
                                     this, TQT_SLOT( slotForceUnmountShare() ),
                                     actionCollection(), "force_unmount_action" );
 #endif
-  KAction *all =       new KAction( i18n( "U&nmount All" ), "gear", KShortcut( CTRL+Key_N ),
+  TDEAction *all =       new TDEAction( i18n( "U&nmount All" ), "gear", TDEShortcut( CTRL+Key_N ),
                                     this, TQT_SLOT( slotUnmountAllShares() ),
                                     actionCollection(), "unmount_all_action" );
-  KAction *sync =      new KAction( i18n( "S&ynchronize" ), "bottom", KShortcut( CTRL+Key_Y ),
+  TDEAction *sync =      new TDEAction( i18n( "S&ynchronize" ), "bottom", TDEShortcut( CTRL+Key_Y ),
                                     this, TQT_SLOT( slotSynchronize() ),
                                     actionCollection(), "synchronize_action" );
-  KAction *konsole =   new KAction( i18n( "Open with Konso&le" ), "terminal", KShortcut( CTRL+Key_L ),
+  TDEAction *konsole =   new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut( CTRL+Key_L ),
                                     this, TQT_SLOT( slotKonsole() ),
                                     actionCollection(), "konsole_action" );
-  KAction *konq =      new KAction( i18n( "Open with &Konqueror" ), "kfm_home", KShortcut( CTRL+Key_K ),
+  TDEAction *konq =      new TDEAction( i18n( "Open with &Konqueror" ), "kfm_home", TDEShortcut( CTRL+Key_K ),
                                     this, TQT_SLOT( slotFilemanager() ),
                                     actionCollection(), "filemanager_action" );
 
@@ -140,7 +140,7 @@ void Smb4KSharesListViewPart::setupActions()
   konq->setEnabled( false );
 
   // Insert the actions into the menu:
-  m_menu = new KActionMenu( this, "SharesListViewMenu" );
+  m_menu = new TDEActionMenu( this, "SharesListViewMenu" );
   m_menu->popupMenu()->insertTitle( SmallIcon( "hdd_mount" ), i18n( "Shares" ), 0 );
   m_menu->insert( unmount, -1 );
 #ifdef __linux__
@@ -307,7 +307,7 @@ void Smb4KSharesListViewPart::customEvent( TQCustomEvent *e )
     }
     case EVENT_SET_FOCUS:
     {
-      KListView *view = static_cast<KListView *>( m_widget );
+      TDEListView *view = static_cast<TDEListView *>( m_widget );
 
       if ( view->childCount() != 0 )
       {
@@ -352,7 +352,7 @@ void Smb4KSharesListViewPart::slotContextMenuRequested( TQListViewItem *item, co
 
 void Smb4KSharesListViewPart::slotSelectionChanged( TQListViewItem *item )
 {
-  // NOTE: Here we only enable or disable the KActions. All other things
+  // NOTE: Here we only enable or disable the TDEActions. All other things
   // are done in the Smb4KSharesListView class.
 
   // This slot is used to enable or disable the actions when the user
@@ -391,7 +391,7 @@ void Smb4KSharesListViewPart::slotSelectionChanged( TQListViewItem *item )
 
 void Smb4KSharesListViewPart::slotMouseButtonPressed( TQListViewItem *item )
 {
-  // NOTE: Here we only enable or disable the KActions. All other things
+  // NOTE: Here we only enable or disable the TDEActions. All other things
   // are done in the Smb4KSharesListView class.
 
   // Here we do all the stuff that cannot be done in
diff --git a/smb4k/listview/smb4kshareslistview_part.h b/smb4k/listview/smb4kshareslistview_part.h
index abb6e0f..2e16167 100644
--- a/smb4k/listview/smb4kshareslistview_part.h
+++ b/smb4k/listview/smb4kshareslistview_part.h
@@ -185,7 +185,7 @@ class Smb4KSharesListViewPart : public KParts::Part
     /**
      * The action menu.
      */
-    KActionMenu *m_menu;
+    TDEActionMenu *m_menu;
 };
 
 
diff --git a/smb4k/listview/smb4kshareslistviewitem.cpp b/smb4k/listview/smb4kshareslistviewitem.cpp
index a05d969..213bbad 100644
--- a/smb4k/listview/smb4kshareslistviewitem.cpp
+++ b/smb4k/listview/smb4kshareslistviewitem.cpp
@@ -38,7 +38,7 @@
 
 Smb4KSharesListViewItem::Smb4KSharesListViewItem( Smb4KShare *share, bool mountpoint,
                                                   Smb4KSharesListView *parent )
-: KListViewItem( parent ), m_share( *share ), m_mountpoint( mountpoint ),
+: TDEListViewItem( parent ), m_share( *share ), m_mountpoint( mountpoint ),
   m_initial_setup( true )
 {
   setDropEnabled( true );
@@ -293,7 +293,7 @@ void Smb4KSharesListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, i
 
   if ( col != Usage )
   {
-    KListViewItem::paintCell( p, colorgrp, col, width, align );
+    TDEListViewItem::paintCell( p, colorgrp, col, width, align );
 
     return;
   }
diff --git a/smb4k/listview/smb4kshareslistviewitem.h b/smb4k/listview/smb4kshareslistviewitem.h
index a944def..835aec2 100644
--- a/smb4k/listview/smb4kshareslistviewitem.h
+++ b/smb4k/listview/smb4kshareslistviewitem.h
@@ -51,7 +51,7 @@ class Smb4KSharesListView;
  * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
  */
 
-class Smb4KSharesListViewItem : public KListViewItem
+class Smb4KSharesListViewItem : public TDEListViewItem
 {
   public:
     /**
@@ -131,7 +131,7 @@ class Smb4KSharesListViewItem : public KListViewItem
 
   protected:
     /**
-     * Reimplemented from KListViewItem.
+     * Reimplemented from TDEListViewItem.
      *
      * This function paints the icon text and the usage. It uses Smb4KShare::isForeign() to
      * determine the color of the icon text (TRUE: gray, FALSE: the default color).
@@ -153,7 +153,7 @@ class Smb4KSharesListViewItem : public KListViewItem
                     int alignment );
 
     /**
-     * Reimplemented from KListViewItem.
+     * Reimplemented from TDEListViewItem.
      *
      * This function accepts or denies drops according to the contents of @p source.
      *
diff --git a/smb4k/searchdlg/smb4ksearchdialog.cpp b/smb4k/searchdlg/smb4ksearchdialog.cpp
index 83bad5f..f93cc31 100644
--- a/smb4k/searchdlg/smb4ksearchdialog.cpp
+++ b/smb4k/searchdlg/smb4ksearchdialog.cpp
@@ -45,7 +45,7 @@ Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *parent, const char *name )
   layout->setSpacing( 5 );
 
   // Tool bar
-  m_tool_bar = new KToolBar( this, "SearchDialogToolBar", true, true );
+  m_tool_bar = new TDEToolBar( this, "SearchDialogToolBar", true, true );
 
   m_tool_bar->insertCombo( TQStringList(), Combo, true, TQT_SIGNAL( returnPressed() ),
                            TQT_TQOBJECT(this), TQT_SLOT( slotReturnPressed() ), true,
@@ -59,7 +59,7 @@ Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *parent, const char *name )
   m_tool_bar->insertButton( "button_ok", Add, false, i18n( "Add" ) );
 
   // List view
-  m_list_view = new KListView( this, "SearchDialogListView" );
+  m_list_view = new TDEListView( this, "SearchDialogListView" );
   m_list_view->addColumn( i18n( "Search Results" ), -1 );
   m_list_view->header()->hide();
   m_list_view->setSelectionMode( TQListView::Single );
diff --git a/smb4k/searchdlg/smb4ksearchdialog.h b/smb4k/searchdlg/smb4ksearchdialog.h
index 636d731..8357ed6 100644
--- a/smb4k/searchdlg/smb4ksearchdialog.h
+++ b/smb4k/searchdlg/smb4ksearchdialog.h
@@ -89,14 +89,14 @@ class Smb4KSearchDialog : public TQWidget
      *
      * @returns a pointer to the list view of this widget.
      */
-    KListView *listView() { return m_list_view; }
+    TDEListView *listView() { return m_list_view; }
 
     /**
      * This function returns a pointer to the tool bar of this widget.
      *
      * @returns a pointer to the tool bar of this widget.
      */
-    KToolBar *toolBar() { return m_tool_bar; }
+    TDEToolBar *toolBar() { return m_tool_bar; }
 
   signals:
     /**
@@ -163,12 +163,12 @@ class Smb4KSearchDialog : public TQWidget
     /**
      * The list box of this widget
      */
-    KListView *m_list_view;
+    TDEListView *m_list_view;
 
     /**
      * The tool bar of this widget
      */
-    KToolBar *m_tool_bar;
+    TDEToolBar *m_tool_bar;
 };
 
 #endif
diff --git a/smb4k/searchdlg/smb4ksearchdialogitem.cpp b/smb4k/searchdlg/smb4ksearchdialogitem.cpp
index 9b18496..dfc374c 100644
--- a/smb4k/searchdlg/smb4ksearchdialogitem.cpp
+++ b/smb4k/searchdlg/smb4ksearchdialogitem.cpp
@@ -38,8 +38,8 @@
 #include "../core/smb4knetworkitems.h"
 
 
-Smb4KSearchDialogItem::Smb4KSearchDialogItem( KListView *listView, Smb4KHostItem *item, int serial )
-: KListViewItem( listView ), m_item( *item ), m_serial( serial )
+Smb4KSearchDialogItem::Smb4KSearchDialogItem( TDEListView *listView, Smb4KHostItem *item, int serial )
+: TDEListViewItem( listView ), m_item( *item ), m_serial( serial )
 {
   m_is_known = false;
 
diff --git a/smb4k/searchdlg/smb4ksearchdialogitem.h b/smb4k/searchdlg/smb4ksearchdialogitem.h
index 0873d0a..9505cac 100644
--- a/smb4k/searchdlg/smb4ksearchdialogitem.h
+++ b/smb4k/searchdlg/smb4ksearchdialogitem.h
@@ -40,7 +40,7 @@
 
 
 /**
- * This class is an enhanced version of KListViewItem, that is used
+ * This class is an enhanced version of TDEListViewItem, that is used
  * by the search dialog of Smb4K to show the search results. It
  * encapsulates a Smb4KHostItem which carries all the information needed.
  *
@@ -48,7 +48,7 @@
  */
 
 class Smb4KSearchDialog;
-class Smb4KSearchDialogItem : public KListViewItem
+class Smb4KSearchDialogItem : public TDEListViewItem
 {
   public:
     /**
@@ -64,7 +64,7 @@ class Smb4KSearchDialogItem : public KListViewItem
      * @param serial            The user supplied serial number of this item. It
      *                          is used for sorting. See compare() for further information.
      */
-    Smb4KSearchDialogItem( KListView *listView, Smb4KHostItem *item, int serial = 0 );
+    Smb4KSearchDialogItem( TDEListView *listView, Smb4KHostItem *item, int serial = 0 );
 
     /**
      * The destructor
diff --git a/smb4k/smb4k.cpp b/smb4k/smb4k.cpp
index bdb3c77..3926385 100644
--- a/smb4k/smb4k.cpp
+++ b/smb4k/smb4k.cpp
@@ -124,8 +124,8 @@ Smb4KApp::Smb4KApp( TQWidget *parent, const char *name )
   }
 
   // Connections
-  connect( actionCollection(),           TQT_SIGNAL( actionHighlighted( KAction * ) ),
-           this,                         TQT_SLOT( slotActionHighlighted( KAction * ) ) );
+  connect( actionCollection(),           TQT_SIGNAL( actionHighlighted( TDEAction * ) ),
+           this,                         TQT_SLOT( slotActionHighlighted( TDEAction * ) ) );
 
   connect( Smb4KCore::self(),            TQT_SIGNAL( runStateChanged() ),
            this,                         TQT_SLOT( slotRunStateChanged() ) );
@@ -153,14 +153,14 @@ void Smb4KApp::setupActions()
   setStandardToolBarMenuEnabled( true );
   createStandardStatusBarAction();
 
-  KActionMenu *view_modes  = new KActionMenu( i18n( "Shares Vie&w" ), "view_choose",
+  TDEActionMenu *view_modes  = new TDEActionMenu( i18n( "Shares Vie&w" ), "view_choose",
                              actionCollection(), "view_modes_menu" );
 
-  KRadioAction *icon_view  = new KRadioAction( i18n( "&Icon View" ), "view_icon", CTRL+Key_I,
+  TDERadioAction *icon_view  = new TDERadioAction( i18n( "&Icon View" ), "view_icon", CTRL+Key_I,
                              TQT_TQOBJECT(this), TQT_SLOT( slotChangeSharesView() ), actionCollection(), "icon_view_action" );
   icon_view->setExclusiveGroup( "SharesViewActions" );
 
-  KRadioAction *list_view  = new KRadioAction( i18n( "List Vie&w" ), "view_detailed", CTRL+Key_W,
+  TDERadioAction *list_view  = new TDERadioAction( i18n( "List Vie&w" ), "view_detailed", CTRL+Key_W,
                              TQT_TQOBJECT(this), TQT_SLOT( slotChangeSharesView() ), actionCollection(), "list_view_action" );
   list_view->setExclusiveGroup( "SharesViewActions" );
 
@@ -525,7 +525,7 @@ void Smb4KApp::slotChangeSharesView()
     return;
   }
 
-  KRadioAction *shares_view_action = static_cast<KRadioAction *>( m_action );
+  TDERadioAction *shares_view_action = static_cast<TDERadioAction *>( m_action );
 
   // Set the check mark for the action:
   if ( !shares_view_action->isChecked() )
@@ -813,10 +813,10 @@ void Smb4KApp::slotSetupBookmarksMenu()
   {
     unplugActionList( "bookmark_actions" );
 
-    TQPtrList<KAction> bookmark_actions;
+    TQPtrList<TDEAction> bookmark_actions;
 
     // Create the "Edit Bookmarks" action:
-    bookmark_actions.append( new KAction( i18n( "&Edit Bookmarks" ), "bookmark", CTRL+Key_E,
+    bookmark_actions.append( new TDEAction( i18n( "&Edit Bookmarks" ), "bookmark", CTRL+Key_E,
                              TQT_TQOBJECT(this), TQT_SLOT( slotBookmarkEditor() ), actionCollection(),
                              "edit_bookmarks_action" ) );
 
@@ -837,7 +837,7 @@ void Smb4KApp::slotSetupBookmarksMenu()
       }
     }
 
-    bookmark_actions.append( new KActionSeparator() );
+    bookmark_actions.append( new TDEActionSeparator() );
 
     plugActionList( "bookmark_actions", bookmark_actions );
   }
@@ -848,9 +848,9 @@ void Smb4KApp::slotSetupBookmarksMenu()
   // Get the bookmark action list and delete all entries. We could
   // also try to keep those actions that are not obsolete, but I think
   // this is the cleanest way.
-  KActionPtrList list = actionCollection()->actions( "Bookmarks" );
+  TDEActionPtrList list = actionCollection()->actions( "Bookmarks" );
 
-  for ( KActionPtrList::Iterator it = list.begin(); it != list.end(); ++it )
+  for ( TDEActionPtrList::Iterator it = list.begin(); it != list.end(); ++it )
   {
     actionCollection()->remove( *it );
   }
@@ -882,11 +882,11 @@ void Smb4KApp::slotSetupBookmarksMenu()
     display_strings.sort();
 
     // Create the bookmark list and plug it into the menu:
-    TQPtrList<KAction> bookmark_list;
+    TQPtrList<TDEAction> bookmark_list;
 
     for ( TQStringList::ConstIterator it = display_strings.begin(); it != display_strings.end(); ++it )
     {
-      KAction *a = new KAction( *it, "folder", KShortcut::null(), 0, 0, actionCollection(), *it );
+      TDEAction *a = new TDEAction( *it, "folder", TDEShortcut::null(), 0, 0, actionCollection(), *it );
       a->setGroup( "Bookmarks" );
       connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( slotBookmarkActivated() ) );
       bookmark_list.append( a );
@@ -927,13 +927,13 @@ void Smb4KApp::slotBookmarkActivated()
 
 void Smb4KApp::slotShareListUpdated()
 {
-  KActionPtrList list = actionCollection()->actions( "Bookmarks" );
+  TDEActionPtrList list = actionCollection()->actions( "Bookmarks" );
 
   if ( !list.isEmpty() )
   {
     TQString name;
 
-    for ( KActionPtrList::ConstIterator it = list.begin(); it != list.end(); ++it )
+    for ( TDEActionPtrList::ConstIterator it = list.begin(); it != list.end(); ++it )
     {
       if ( !(*it)->plainText().startsWith( "//" ) )
       {
@@ -970,7 +970,7 @@ void Smb4KApp::slotShareListUpdated()
 }
 
 
-void Smb4KApp::slotActionHighlighted( KAction *action )
+void Smb4KApp::slotActionHighlighted( TDEAction *action )
 {
   m_action = action;
 }
diff --git a/smb4k/smb4k.h b/smb4k/smb4k.h
index 79cc597..9385f15 100644
--- a/smb4k/smb4k.h
+++ b/smb4k/smb4k.h
@@ -65,12 +65,12 @@ class Smb4KApp : public KParts::DockMainWindow
 
   protected:
     /**
-     * Reimplemented from KMainWindow.
+     * Reimplemented from TDEMainWindow.
      */
     bool queryExit();
 
     /**
-     * Reimplemented from KMainWindow.
+     * Reimplemented from TDEMainWindow.
      */
     bool queryClose();
 
@@ -139,7 +139,7 @@ class Smb4KApp : public KParts::DockMainWindow
      *
      * @param action        The action that has been highlighted
      */
-    void slotActionHighlighted( KAction *action );
+    void slotActionHighlighted( TDEAction *action );
 
     /**
      * This slot sets the keyboard focus to the network browser and shows it
@@ -211,9 +211,9 @@ class Smb4KApp : public KParts::DockMainWindow
     enum StatusBarItem{ Message = 0, Progress = 1, Version = 2 };
 
     /**
-     * The currently highlighted KAction.
+     * The currently highlighted TDEAction.
      */
-    KAction *m_action;
+    TDEAction *m_action;
 
     /**
      * This holds the config entry of the current shares
diff --git a/smb4k/smb4ksystemtray.cpp b/smb4k/smb4ksystemtray.cpp
index aeef93e..7a59251 100644
--- a/smb4k/smb4ksystemtray.cpp
+++ b/smb4k/smb4ksystemtray.cpp
@@ -64,15 +64,15 @@ Smb4KSystemTray::Smb4KSystemTray( TQWidget *parent, const char *name )
   actionCollection()->setHighlightingEnabled( true );
 
   // Set up the context menu (skeleton):
-  m_shares_menu         = new KActionMenu( i18n( "Mounted Shares" ), "hdd_mount",
+  m_shares_menu         = new TDEActionMenu( i18n( "Mounted Shares" ), "hdd_mount",
                           actionCollection(), "st_mounted_shares_action_menu" );
-  m_bookmarks_menu      = new KActionMenu( i18n( "Bookmarks" ), "bookmark_folder",
+  m_bookmarks_menu      = new TDEActionMenu( i18n( "Bookmarks" ), "bookmark_folder",
                           actionCollection(), "st_bookmark_action_menu" );
-  KActionSeparator *sep = new KActionSeparator( TQT_TQOBJECT(this) );
-  KAction *manual_mount = new KAction( i18n( "M&ount Manually" ), "connect_creating",
+  TDEActionSeparator *sep = new TDEActionSeparator( TQT_TQOBJECT(this) );
+  TDEAction *manual_mount = new TDEAction( i18n( "M&ount Manually" ), "connect_creating",
                           0, TQT_TQOBJECT(this), TQT_SLOT( slotMountManually() ),
                           actionCollection(), "st_mount_manually_action" );
-  KAction *configure    = KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotConfigDialog() ),
+  TDEAction *configure    = KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotConfigDialog() ),
                           actionCollection(), "st_configure_action" );
 
   m_shares_menu->plug( contextMenu() );
@@ -86,8 +86,8 @@ Smb4KSystemTray::Smb4KSystemTray( TQWidget *parent, const char *name )
   slotSetupSharesMenu();
 
   // Connections:
-  connect( actionCollection(),           TQT_SIGNAL( actionHighlighted( KAction * ) ),
-           this,                         TQT_SLOT( slotActionHighlighted( KAction * ) ) );
+  connect( actionCollection(),           TQT_SIGNAL( actionHighlighted( TDEAction * ) ),
+           this,                         TQT_SLOT( slotActionHighlighted( TDEAction * ) ) );
 
   connect( Smb4KCore::bookmarkHandler(), TQT_SIGNAL( bookmarksUpdated() ),
            this,                         TQT_SLOT( slotSetupBookmarksMenu() ) );
@@ -233,13 +233,13 @@ void Smb4KSystemTray::slotSetupBookmarksMenu()
   if ( !actionCollection()->action( "st_edit_bookmarks_action" ) )
   {
     // OK, build the menu from ground up:
-    KAction *edit_bookmarks = new KAction( i18n( "&Edit Bookmarks" ), "bookmark", 0,
+    TDEAction *edit_bookmarks = new TDEAction( i18n( "&Edit Bookmarks" ), "bookmark", 0,
                               TQT_TQOBJECT(this), TQT_SLOT( slotBookmarkEditor() ), actionCollection(),
                               "st_edit_bookmarks_action" );
     edit_bookmarks->setGroup( "BookmarkActions" );
     edit_bookmarks->plug( m_bookmarks_menu->popupMenu() );
 
-    KActionSeparator *sep   = new KActionSeparator( actionCollection(), "st_bookmark_action_separator" );
+    TDEActionSeparator *sep   = new TDEActionSeparator( actionCollection(), "st_bookmark_action_separator" );
     sep->setGroup( "BookmarkActions" );
     sep->plug( m_bookmarks_menu->popupMenu() );
   }
@@ -247,9 +247,9 @@ void Smb4KSystemTray::slotSetupBookmarksMenu()
   // Get the list of bookmark actions and delete all entries. We could
   // also try to keep those actions that are not obsolete, but I think
   // this is the cleanest way.
-  KActionPtrList list = actionCollection()->actions( "Bookmarks" );
+  TDEActionPtrList list = actionCollection()->actions( "Bookmarks" );
 
-  for ( KActionPtrList::Iterator it = list.begin(); it != list.end(); ++it )
+  for ( TDEActionPtrList::Iterator it = list.begin(); it != list.end(); ++it )
   {
     (*it)->unplug( m_bookmarks_menu->popupMenu() );
     actionCollection()->remove( *it );
@@ -289,7 +289,7 @@ void Smb4KSystemTray::slotSetupBookmarksMenu()
   for ( TQStringList::ConstIterator it = display_strings.begin(); it != display_strings.end(); ++it )
   {
     // Create the bookmark action:
-    KAction *a = new KAction( *it, "folder", KShortcut::null(), 0, 0, actionCollection(), "st_"+*it );
+    TDEAction *a = new TDEAction( *it, "folder", TDEShortcut::null(), 0, 0, actionCollection(), "st_"+*it );
     a->setGroup( "Bookmarks" );
     connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( slotBookmarkActivated() ) );
 
@@ -396,10 +396,10 @@ void Smb4KSystemTray::slotBookmarkActivated()
 void Smb4KSystemTray::slotEnableBookmarks()
 {
   // Get the list of bookmarks:
-  KActionPtrList list = actionCollection()->actions( "Bookmarks" );
+  TDEActionPtrList list = actionCollection()->actions( "Bookmarks" );
 
   // Enable/diable the bookmark actions:
-  for ( KActionPtrList::Iterator it = list.begin(); it != list.end(); ++it )
+  for ( TDEActionPtrList::Iterator it = list.begin(); it != list.end(); ++it )
   {
     TQString name;
 
@@ -443,13 +443,13 @@ void Smb4KSystemTray::slotSetupSharesMenu()
   if ( !actionCollection()->action( "st_unmount_all_action" ) )
   {
     // OK, build the menu from ground up:
-    KAction *unmount_all  = new KAction( i18n( "U&nmount All" ), "gear", KShortcut::null(),
+    TDEAction *unmount_all  = new TDEAction( i18n( "U&nmount All" ), "gear", TDEShortcut::null(),
                             TQT_TQOBJECT(this), TQT_SLOT( slotUnmountAllShares() ), actionCollection(),
                             "st_unmount_all_action" );
     unmount_all->setGroup( "ShareActions" );
     unmount_all->plug( m_shares_menu->popupMenu(), 0 );
 
-    KActionSeparator *sep = new KActionSeparator( actionCollection(), "st_shares_action_separator" );
+    TDEActionSeparator *sep = new TDEActionSeparator( actionCollection(), "st_shares_action_separator" );
     sep->setGroup( "ShareActions" );
     sep->plug( m_shares_menu->popupMenu(), 1 );
   }
@@ -458,7 +458,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
   // not delete all entries in the menu, but look for changes.
 
   // Get the list of share actions:
-  KActionPtrList actions_list = actionCollection()->actions( "ShareMenus" );
+  TDEActionPtrList actions_list = actionCollection()->actions( "ShareMenus" );
 
   // Get the list of mounted shares:
   TQValueList<Smb4KShare *> shares_list = Smb4KCore::mounter()->getShares();
@@ -469,7 +469,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
     actionCollection()->action( "st_unmount_all_action" )->setEnabled( true );
 
     // Delete all obsolete actions:
-    for ( KActionPtrList::Iterator it = actions_list.begin(); it != actions_list.end(); ++it )
+    for ( TDEActionPtrList::Iterator it = actions_list.begin(); it != actions_list.end(); ++it )
     {
       // Get the canonical path of the share action:
       TQString action_name = (*it)->name();
@@ -494,7 +494,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
           {
             // Find the "Force Unmount" action and decide if it needs to be
             // enabled/disabled:
-            KAction *force = actionCollection()->action( "st_[force]_"+canonical_path );
+            TDEAction *force = actionCollection()->action( "st_[force]_"+canonical_path );
 
             if ( force )
             {
@@ -506,8 +506,8 @@ void Smb4KSystemTray::slotSetupSharesMenu()
           else
           {
             // First remove all actions that are in the submenu:
-            KAction *action = NULL;
-            KActionMenu *menu = static_cast<KActionMenu *>( *it );
+            TDEAction *action = NULL;
+            TDEActionMenu *menu = static_cast<TDEActionMenu *>( *it );
 
             if ( menu )
             {
@@ -569,8 +569,8 @@ void Smb4KSystemTray::slotSetupSharesMenu()
         else
         {
           // First remove all actions that are in the submenu:
-          KAction *action = NULL;
-          KActionMenu *menu = static_cast<KActionMenu *>( *it );
+          TDEAction *action = NULL;
+          TDEActionMenu *menu = static_cast<TDEActionMenu *>( *it );
 
           if ( menu )
           {
@@ -632,8 +632,8 @@ void Smb4KSystemTray::slotSetupSharesMenu()
       else
       {
         // First remove all actions that are in the submenu:
-        KAction *action = NULL;
-        KActionMenu *menu = static_cast<KActionMenu *>( *it );
+        TDEAction *action = NULL;
+        TDEActionMenu *menu = static_cast<TDEActionMenu *>( *it );
 
         if ( menu )
         {
@@ -729,18 +729,18 @@ void Smb4KSystemTray::slotSetupSharesMenu()
     // there:
     for ( TQValueList<Smb4KShare *>::ConstIterator it = shares_list.begin(); it != shares_list.end(); ++it )
     {
-      KActionMenu *action_menu = NULL;
+      TDEActionMenu *action_menu = NULL;
 
       // Reread the list of share action menus:
-      KActionPtrList new_actions_list = actionCollection()->actions( "ShareMenus" );
+      TDEActionPtrList new_actions_list = actionCollection()->actions( "ShareMenus" );
 
-      for ( KActionPtrList::ConstIterator i = new_actions_list.begin(); i != new_actions_list.end(); ++i )
+      for ( TDEActionPtrList::ConstIterator i = new_actions_list.begin(); i != new_actions_list.end(); ++i )
       {
         TQString item = TQString( "st_[share_menu]_%1" ).arg( TQString((*it)->canonicalPath()) );
 
         if ( TQString::compare( (*i)->name(), item ) == 0 )
         {
-          action_menu = static_cast<KActionMenu *>( *i );
+          action_menu = static_cast<TDEActionMenu *>( *i );
 
           break;
         }
@@ -752,7 +752,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
 
       if ( !action_menu )
       {
-        // Create a new KAction menu:
+        // Create a new TDEAction menu:
         TQIconSet set;
         TQPixmap pix;
         KIconLoader loader;
@@ -780,33 +780,33 @@ void Smb4KSystemTray::slotSetupSharesMenu()
 
         set.reset( pix, TQIconSet::Automatic );
 
-        action_menu = new KActionMenu( Smb4KSettings::showMountPoint() ? (*it)->path() : (*it)->name(),
+        action_menu = new TDEActionMenu( Smb4KSettings::showMountPoint() ? (*it)->path() : (*it)->name(),
                       set, actionCollection(), "st_[share_menu]_"+(*it)->canonicalPath() );
         action_menu->setGroup( "ShareMenus" );
 
 
         // Define the actions that can be performed on a share from within
         // the system tray widget:
-        KAction *umount       = new KAction( i18n( "&Unmount" ), "hdd_unmount", KShortcut::null(), TQT_TQOBJECT(this),
+        TDEAction *umount       = new TDEAction( i18n( "&Unmount" ), "hdd_unmount", TDEShortcut::null(), TQT_TQOBJECT(this),
                                 TQT_SLOT( slotUnmountShare() ), actionCollection(), "st_[unmount]_"+(*it)->canonicalPath() );
         umount->setGroup( "ShareActions" );
 #ifdef __linux__
-        KAction *force_umount = new KAction( i18n( "&Force Unmounting" ), "hdd_unmount", KShortcut::null(), TQT_TQOBJECT(this),
+        TDEAction *force_umount = new TDEAction( i18n( "&Force Unmounting" ), "hdd_unmount", TDEShortcut::null(), TQT_TQOBJECT(this),
                                 TQT_SLOT( slotForceUnmountShare() ), actionCollection(), "st_[force]_"+(*it)->canonicalPath() );
         force_umount->setGroup( "ShareActions" );
         force_umount->setEnabled( Smb4KSettings::useForceUnmount() );
 #endif
-        KAction *synchronize =  new KAction( i18n( "S&ynchronize" ), "bottom", KShortcut::null(), TQT_TQOBJECT(this),
+        TDEAction *synchronize =  new TDEAction( i18n( "S&ynchronize" ), "bottom", TDEShortcut::null(), TQT_TQOBJECT(this),
                                 TQT_SLOT( slotSynchronize() ), actionCollection(), "st_[synchronize]_"+(*it)->canonicalPath() );
         synchronize->setGroup( "ShareActions" );
         synchronize->setEnabled( !Smb4KSettings::rsync().isEmpty() );
 
-        KAction *konsole =      new KAction( i18n( "Open with Konso&le" ), "terminal", KShortcut::null(), TQT_TQOBJECT(this),
+        TDEAction *konsole =      new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut::null(), TQT_TQOBJECT(this),
                                 TQT_SLOT( slotKonsole() ), actionCollection(), "st_[konsole]_"+(*it)->canonicalPath() );
         konsole->setGroup( "ShareActions" );
         konsole->setEnabled( !Smb4KSettings::konsole().isEmpty() );
 
-        KAction *konqueror =    new KAction( i18n( "Open with &Konqueror" ), "kfm_home", KShortcut::null(), TQT_TQOBJECT(this),
+        TDEAction *konqueror =    new TDEAction( i18n( "Open with &Konqueror" ), "kfm_home", TDEShortcut::null(), TQT_TQOBJECT(this),
                                 TQT_SLOT( slotFilemanager() ), actionCollection(), "st_[filemanager]_"+(*it)->canonicalPath() );
         konqueror->setGroup( "ShareActions" );
 
@@ -892,16 +892,16 @@ void Smb4KSystemTray::slotSetupSharesMenu()
   else
   {
     // Remove all share action menus:
-    for ( KActionPtrList::Iterator it = actions_list.begin(); it != actions_list.end(); ++it )
+    for ( TDEActionPtrList::Iterator it = actions_list.begin(); it != actions_list.end(); ++it )
     {
-      KActionMenu *action_menu = static_cast<KActionMenu *>( *it );
+      TDEActionMenu *action_menu = static_cast<TDEActionMenu *>( *it );
 
       // Get the canonical path of the share action:
       TQString action_name = action_menu->name();
       TQString canonical_path = action_name.section( "st_[share_menu]_", 1, -1 );
 
       // Remove all children of the share action menus:
-      KAction *action = NULL;
+      TDEAction *action = NULL;
 
       // Unmount action
       action = actionCollection()->action( "st_[unmount]_"+canonical_path );
@@ -1060,7 +1060,7 @@ void Smb4KSystemTray::slotFilemanager()
 }
 
 
-void Smb4KSystemTray::slotActionHighlighted( KAction *action )
+void Smb4KSystemTray::slotActionHighlighted( TDEAction *action )
 {
   // If the main window is not shown, the last action that
   // is highlighted when the user clicks an action in a
diff --git a/smb4k/smb4ksystemtray.h b/smb4k/smb4ksystemtray.h
index 8c76bb8..6a7fba0 100644
--- a/smb4k/smb4ksystemtray.h
+++ b/smb4k/smb4ksystemtray.h
@@ -186,23 +186,23 @@ class Smb4KSystemTray : public KSystemTray
      *
      * @param action        The currently highlighted action.
      */
-    void slotActionHighlighted( KAction *action );
+    void slotActionHighlighted( TDEAction *action );
 
   private:
     /**
      * The action menu for the bookmarks.
      */
-    KActionMenu *m_bookmarks_menu;
+    TDEActionMenu *m_bookmarks_menu;
 
     /**
      * The action menu for the mounted shares.
      */
-    KActionMenu *m_shares_menu;
+    TDEActionMenu *m_shares_menu;
 
     /**
      * This is the currently highlighted action.
      */
-    KAction *m_action;
+    TDEAction *m_action;
 };
 
 #endif