Rename a number of classes to enhance compatibility with KDE4

92 files changed, 866 insertions, 866 deletions

diff --git a/kmail/ChangeLog b/kmail/ChangeLog
index 2f263c27e..066b3489b 100644
--- a/kmail/ChangeLog
+++ b/kmail/ChangeLog
@@ -583,7 +583,7 @@ Sun Sep  6 18:28:45 1998  Markus Wuebben  <markus@kde.org>
 
 	* Warnings: changed warning messages of QPixmap and
 	QPainter to debug messages to avoid lots of message
-	boxes from broken KToolbar code when changing color 
+	boxes from broken TDEToolbar code when changing color 
 	scheme.
 
 	* Composer (email-address-completion)
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 68ba83b91..dc76ac7d2 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -76,13 +76,13 @@ enum Capabilities
   AllCapa    = 0xffffffff
 };
 
-class AccountTypeBox : public KListBox
+class AccountTypeBox : public TDEListBox
 {
   public:
     enum Type { Local, POP3, IMAP, dIMAP, Maildir };
 
     AccountTypeBox( TQWidget *parent )
-      : KListBox( parent, "AccountTypeBox" )
+      : TDEListBox( parent, "AccountTypeBox" )
     {
       mTypeList << i18n( "Local mailbox" );
       mTypeList << i18n( "POP3" );
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index d83a19e1f..92f6e7f13 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -885,7 +885,7 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode,
   mScanProgressText->setText( "" ) ;
   layout->addWidget( mScanProgressText );
 
-  mToolsList = new KListBox( this );
+  mToolsList = new TDEListBox( this );
   mToolsList->hide();
   mToolsList->setSelectionMode( TQListBox::Multi );
   mToolsList->setRowMode( TQListBox::FixedNumber );
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index 031a995af..8f28ea5c8 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -39,7 +39,7 @@
 #include <tqdict.h>
 #include <tqlayout.h>
 
-class KActionCollection;
+class TDEActionCollection;
 class KMFolder;
 class KMFolderTree;
 class TQLabel;
@@ -319,7 +319,7 @@ namespace KMail {
       TQLabel *mIntroText;
       TQLabel *mScanProgressText;
       TQLabel *mSelectionHint;
-      KListBox *mToolsList;
+      TDEListBox *mToolsList;
   };
 
   //---------------------------------------------------------------------------
diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp
index 18e8ddafa..a03cd32f7 100644
--- a/kmail/attachmentlistview.cpp
+++ b/kmail/attachmentlistview.cpp
@@ -49,7 +49,7 @@ namespace KMail {
 AttachmentListView::AttachmentListView( KMail::Composer * composer,
                                         TQWidget* parent,
                                         const char* name )
-  : KListView( parent, name ),
+  : TDEListView( parent, name ),
     mComposer( composer )
 {
   setAcceptDrops( true );
@@ -69,7 +69,7 @@ void AttachmentListView::contentsDragEnterEvent( TQDragEnterEvent* e )
   if( e->provides( MailListDrag::format() ) || KURLDrag::canDecode( e ) )
     e->accept( true );
   else
-    KListView::dragEnterEvent( e );
+    TDEListView::dragEnterEvent( e );
 }
 
 //-----------------------------------------------------------------------------
@@ -79,7 +79,7 @@ void AttachmentListView::contentsDragMoveEvent( TQDragMoveEvent* e )
   if( e->provides( MailListDrag::format() ) || KURLDrag::canDecode( e ) )
     e->accept( true );
   else
-    KListView::dragMoveEvent( e );
+    TDEListView::dragMoveEvent( e );
 }
 
 //-----------------------------------------------------------------------------
@@ -122,7 +122,7 @@ void AttachmentListView::contentsDropEvent( TQDropEvent* e )
     }
   }
   else {
-    KListView::dropEvent( e );
+    TDEListView::dropEvent( e );
   }
 }
 
diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h
index 68e39c2dd..e01fb4ab8 100644
--- a/kmail/attachmentlistview.h
+++ b/kmail/attachmentlistview.h
@@ -27,7 +27,7 @@ namespace KMail {
 
 class Composer;
 
-class AttachmentListView : public KListView
+class AttachmentListView : public TDEListView
 {
   Q_OBJECT
   
diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp
index ea21ca019..e83463a43 100644
--- a/kmail/chiasmuskeyselector.cpp
+++ b/kmail/chiasmuskeyselector.cpp
@@ -19,7 +19,7 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt
   mLabel = new TQLabel( i18n( "Please select the Chiasmus key file to use:" ), page );
   layout->addWidget( mLabel );
 
-  mListBox = new KListBox( page );
+  mListBox = new TDEListBox( page );
   mListBox->insertStringList( keys );
   const int current = keys.findIndex( currentKey );
   mListBox->setSelected( TQMAX( 0, current ), true );
diff --git a/kmail/chiasmuskeyselector.h b/kmail/chiasmuskeyselector.h
index 463497968..7e0d36fb0 100644
--- a/kmail/chiasmuskeyselector.h
+++ b/kmail/chiasmuskeyselector.h
@@ -2,7 +2,7 @@
 #define CHIASMUSKEYSELECTOR_H
 
 #include <kdialogbase.h>
-class KListBox;
+class TDEListBox;
 class KLineEdit;
 class TQLabel;
 
@@ -21,7 +21,7 @@ public:
 
 private:
   TQLabel* mLabel;
-  KListBox* mListBox;
+  TDEListBox* mListBox;
   KLineEdit* mOptions;
 };
 
diff --git a/kmail/colorlistbox.cpp b/kmail/colorlistbox.cpp
index a813a910d..c74819248 100644
--- a/kmail/colorlistbox.cpp
+++ b/kmail/colorlistbox.cpp
@@ -30,7 +30,7 @@
 #include "colorlistbox.h"
 
 ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f )
-  :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
+  :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1)
 {
   connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
   setAcceptDrops( true);
diff --git a/kmail/colorlistbox.h b/kmail/colorlistbox.h
index dd4cee7cf..1e1f48b0f 100644
--- a/kmail/colorlistbox.h
+++ b/kmail/colorlistbox.h
@@ -23,7 +23,7 @@
 
 #include <klistbox.h>
 
-class ColorListBox : public KListBox
+class ColorListBox : public TDEListBox
 {
   Q_OBJECT
   
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 6c9615185..bf8c82fae 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -61,7 +61,7 @@ using KMail::ImapAccountBase;
 #include "kmfolder.h"
 #include "kmmainwidget.h"
 #include "recentaddresses.h"
-using KRecentAddress::RecentAddresses;
+using TDERecentAddress::RecentAddresses;
 #include "completionordereditor.h"
 #include "ldapclient.h"
 #include "index.h"
@@ -297,8 +297,8 @@ IdentityPage::IdentityPage( TQWidget * parent, const char * name )
            TQT_SLOT(slotRenameIdentity(TQListViewItem*,const TQString&,int)) );
   connect( mIdentityList, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
            TQT_SLOT(slotModifyIdentity()) );
-  connect( mIdentityList, TQT_SIGNAL(contextMenu(KListView*,TQListViewItem*,const TQPoint&)),
-           TQT_SLOT(slotContextMenu(KListView*,TQListViewItem*,const TQPoint&)) );
+  connect( mIdentityList, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)),
+           TQT_SLOT(slotContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)) );
   // ### connect dragged(...), ...
 
   hlay->addWidget( mIdentityList, 1 );
@@ -488,7 +488,7 @@ void IdentityPage::slotRenameIdentity( TQListViewItem * i,
   item->redisplay();
 }
 
-void IdentityPage::slotContextMenu( KListView *, TQListViewItem * i,
+void IdentityPage::slotContextMenu( TDEListView *, TQListViewItem * i,
                                     const TQPoint & pos ) {
   IdentityListViewItem * item = dynamic_cast<IdentityListViewItem*>( i );
 
@@ -1585,7 +1585,7 @@ AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char *
   hlay->addWidget( mFontLocationCombo );
   hlay->addStretch( 10 );
   vlay->addSpacing( KDialog::spacingHint() );
-  mFontChooser = new KFontChooser( this, "font", false, TQStringList(),
+  mFontChooser = new TDEFontChooser( this, "font", false, TQStringList(),
                                    false, 4 );
   mFontChooser->setEnabled( false ); // since !mCustomFontCheck->isChecked()
   vlay->addWidget( mFontChooser );
@@ -1639,7 +1639,7 @@ void AppearancePage::FontsTab::slotFontSelectorChanged( int index )
             this, TQT_SLOT( slotEmitChanged( void ) ) );
 
   // Disable Family and Size list if we have selected a quote font:
-  mFontChooser->enableColumn( KFontChooser::FamilyList|KFontChooser::SizeList,
+  mFontChooser->enableColumn( TDEFontChooser::FamilyList|TDEFontChooser::SizeList,
                               fontNames[ index ].enableFamilyAndSize );
 }
 
@@ -2891,7 +2891,7 @@ void ComposerPage::GeneralTab::save() {
 
 void ComposerPage::GeneralTab::slotConfigureRecentAddresses( )
 {
-  KRecentAddress::RecentAddressDialog dlg( this );
+  TDERecentAddress::RecentAddressDialog dlg( this );
   dlg.setAddresses( RecentAddresses::self( KMKernel::config() )->addresses() );
   if ( dlg.exec() ) {
     RecentAddresses::self( KMKernel::config() )->clear();
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index c430171ef..37819739d 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -124,7 +124,7 @@ void NewIdentityDialog::slotEnableOK( const TQString & proposedIdentityName ) {
 
 ListView::ListView( TQWidget *parent, const char *name,
 				     int visibleItem )
-  : KListView( parent, name )
+  : TDEListView( parent, name )
 {
   setVisibleItem(visibleItem);
 }
@@ -132,14 +132,14 @@ ListView::ListView( TQWidget *parent, const char *name,
 
 void ListView::resizeEvent( TQResizeEvent *e )
 {
-  KListView::resizeEvent(e);
+  TDEListView::resizeEvent(e);
   resizeColums();
 }
 
 
 void ListView::showEvent( TQShowEvent *e )
 {
-  KListView::showEvent(e);
+  TDEListView::showEvent(e);
   resizeColums();
 }
 
@@ -291,7 +291,7 @@ ProfileDialog::ProfileDialog( TQWidget * parent, const char * name, bool modal )
   TQWidget * page = makeMainWidget();
   TQVBoxLayout * vlay = new TQVBoxLayout( page, 0, spacingHint() );
 
-  mListView = new KListView( page, "mListView" );
+  mListView = new TDEListView( page, "mListView" );
   mListView->addColumn( i18n("Available Profiles") );
   mListView->addColumn( i18n("Description") );
   mListView->setFullWidth( true );
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 71f044204..1f7d6f58f 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -24,7 +24,7 @@ class TQPushButton;
 class TQLabel;
 class TQCheckBox;
 class KURLRequester;
-class KFontChooser;
+class TDEFontChooser;
 class TQRadioButton;
 class ColorListBox;
 class TQFont;
@@ -52,9 +52,9 @@ class TQVGroupBox;
 #include <tqdict.h>
 class TQLineEdit;
 class KMMsgTagDesc;
-class KListBox;
+class TDEListBox;
 class KColorCombo;
-class KFontRequester;
+class TDEFontRequester;
 class KIconButton;
 class KKeyButton;
 class TQSpinBox;
@@ -171,7 +171,7 @@ private:
   void setup();
 
 private:
-  KListView   *mListView;
+  TDEListView   *mListView;
   TQStringList mProfileList;
 };
 
@@ -287,12 +287,12 @@ private slots:
   void slotModifyIdentity();
   void slotRemoveIdentity();
   /** Connected to @p mRenameButton's clicked() signal. Just does a
-      KListView::rename on the selected item */
+      TDEListView::rename on the selected item */
   void slotRenameIdentity();
   /** connected to @p mIdentityList's renamed() signal. Validates the
       new name and sets it in the KPIM::IdentityManager */
   void slotRenameIdentity( TQListViewItem *, const TQString &, int );
-  void slotContextMenu( KListView*, TQListViewItem *, const TQPoint & );
+  void slotContextMenu( TDEListView*, TQListViewItem *, const TQPoint & );
   void slotSetAsDefault();
   void slotIdentitySelectionChanged();
 
@@ -451,7 +451,7 @@ private:
 private:
   TQCheckBox    *mCustomFontCheck;
   TQComboBox    *mFontLocationCombo;
-  KFontChooser *mFontChooser;
+  TDEFontChooser *mFontChooser;
 
   int          mActiveFontIndex;
   TQFont        mFont[14];
@@ -1086,7 +1086,7 @@ private:
 //
 //
 
-class ListView : public KListView {
+class ListView : public TDEListView {
   Q_OBJECT
   
 public:
diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp
index 14bed9cfe..00d14cc8b 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -89,8 +89,8 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name )
   connect( mType, TQT_SIGNAL( activated( int ) ),
            this, TQT_SLOT( slotTypeActivated( int ) ) );
 
-  connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const KShortcut& ) ),
-           this, TQT_SLOT( slotShortcutCaptured( const KShortcut& ) ) );
+  connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
+           this, TQT_SLOT( slotShortcutCaptured( const TDEShortcut& ) ) );
 
   mReplyPix = KIconLoader().loadIcon( "mail_reply", KIcon::Small );
   mReplyAllPix = KIconLoader().loadIcon( "mail_replyall", KIcon::Small );
@@ -201,7 +201,7 @@ void CustomTemplates::load()
     CTemplates t(*it);
     // TQString typeStr = indexToType( t.type() );
     TQString typeStr;
-    KShortcut shortcut( t.shortcut() );
+    TDEShortcut shortcut( t.shortcut() );
     CustomTemplateItem *vitem =
       new CustomTemplateItem( *it, t.content(),
         shortcut,
@@ -291,7 +291,7 @@ void CustomTemplates::slotAddClicked()
   if ( !str.isEmpty() ) {
     CustomTemplateItem *vitem = mItemList[ str ];
     if ( !vitem ) {
-      vitem = new CustomTemplateItem( str, "", KShortcut::null(), TUniversal,
+      vitem = new CustomTemplateItem( str, "", TDEShortcut::null(), TUniversal,
                                       TQString(), TQString() );
       mItemList.insert( str, vitem );
       TQListViewItem *item =
@@ -357,7 +357,7 @@ void CustomTemplates::slotListSelectionChanged()
     mEdit->clear();
     mToEdit->clear();
     mCCEdit->clear();
-    mKeyButton->setShortcut( KShortcut::null(), false );
+    mKeyButton->setShortcut( TDEShortcut::null(), false );
     mType->setCurrentItem( 0 );
   }
 }
@@ -401,9 +401,9 @@ void CustomTemplates::slotTypeActivated( int index )
     setRecipientsEditsEnabled( false );
 }
 
-void CustomTemplates::slotShortcutCaptured( const KShortcut &shortcut )
+void CustomTemplates::slotShortcutCaptured( const TDEShortcut &shortcut )
 {
-  KShortcut sc( shortcut );
+  TDEShortcut sc( shortcut );
   if ( sc == mKeyButton->shortcut() )
     return;
   if ( sc.isNull() || sc.toString().isEmpty() )
@@ -425,7 +425,7 @@ void CustomTemplates::slotShortcutCaptured( const KShortcut &shortcut )
                     == KMessageBox::Yes );
         if ( assign )
         {
-          (*it)->mShortcut = KShortcut::null();
+          (*it)->mShortcut = TDEShortcut::null();
         }
         customused = true;
       }
diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h
index 09c8c8fb6..9b8da9943 100644
--- a/kmail/customtemplates.h
+++ b/kmail/customtemplates.h
@@ -30,7 +30,7 @@
 
 struct CustomTemplateItem;
 typedef TQDict<CustomTemplateItem> CustomTemplateItemList;
-class KShortcut;
+class TDEShortcut;
 
 class CustomTemplates : public CustomTemplatesBase
 {
@@ -61,7 +61,7 @@ class CustomTemplates : public CustomTemplatesBase
     void slotRemoveClicked();
     void slotListSelectionChanged();
     void slotTypeActivated( int index );
-    void slotShortcutCaptured( const KShortcut &shortcut );
+    void slotShortcutCaptured( const TDEShortcut &shortcut );
   void slotNameChanged( const TQString& );
   signals:
 
@@ -92,14 +92,14 @@ struct CustomTemplateItem
   CustomTemplateItem() {}
   CustomTemplateItem( const TQString &name,
                       const TQString &content,
-                      KShortcut &shortcut,
+                      TDEShortcut &shortcut,
                       CustomTemplates::Type type,
                       TQString to, TQString cc ) :
     mName( name ), mContent( content ), mShortcut(shortcut), mType( type ),
     mTo( to ), mCC( cc ) {}
 
   TQString mName, mContent;
-  KShortcut mShortcut;
+  TDEShortcut mShortcut;
   CustomTemplates::Type mType;
   TQString mTo, mCC;
 };
diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp
index 5dcb81d20..6f367fd1a 100644
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@@ -111,7 +111,7 @@ DistributionListDialog::DistributionListDialog( TQWidget *parent )
   titleLayout->addWidget( mTitleEdit );
   mTitleEdit->setFocus();
   
-  mRecipientsList = new KListView( topFrame );
+  mRecipientsList = new TDEListView( topFrame );
   mRecipientsList->addColumn( TQString() );
   mRecipientsList->addColumn( i18n("Name") );
   mRecipientsList->addColumn( i18n("Email") );
diff --git a/kmail/distributionlistdialog.h b/kmail/distributionlistdialog.h
index 6643557c4..08e4cc074 100644
--- a/kmail/distributionlistdialog.h
+++ b/kmail/distributionlistdialog.h
@@ -26,7 +26,7 @@
 #include "recipientseditor.h"
 
 class TQLineEdit;
-class KListView;
+class TDEListView;
 
 class DistributionListDialog : public KDialogBase
 {
@@ -40,7 +40,7 @@ class DistributionListDialog : public KDialogBase
     
   private:
     TQLineEdit *mTitleEdit;
-    KListView *mRecipientsList;
+    TDEListView *mRecipientsList;
 };
 
 #endif
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index 24a32bb00..a09c19533 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -93,7 +93,7 @@ FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * par
   setDragEnabled( true );
   setAcceptDrops( true );
   setRootIsDecorated( false );
-  setSelectionModeExt( KListView::Single );
+  setSelectionModeExt( TDEListView::Single );
   setSorting( -1 );
   setShowSortIndicator( false );
 
@@ -277,8 +277,8 @@ void FavoriteFolderView::folderTreeSelectionChanged(KMFolder * folder)
   blockSignals( false );
   if ( !found ) {
     clearSelection();
-    setSelectionModeExt( KListView::NoSelection );
-    setSelectionModeExt( KListView::Single );
+    setSelectionModeExt( TDEListView::NoSelection );
+    setSelectionModeExt( TDEListView::Single );
   }
 }
 
@@ -322,7 +322,7 @@ void FavoriteFolderView::contextMenu(TQListViewItem * item, const TQPoint & poin
   assert( ft );
   KMFolderTreeItem *fti = static_cast<KMFolderTreeItem*>( item );
   mContextMenuItem = fti;
-  KPopupMenu contextMenu;
+  TDEPopupMenu contextMenu;
   if ( fti && fti->folder() ) {
     mainWidget()->action("mark_all_as_read")->plug( &contextMenu );
     if ( fti->folder()->folderType() == KMFolderTypeImap || fti->folder()->folderType() == KMFolderTypeCachedImap )
diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp
index 1aee8fa97..c15e9247d 100644
--- a/kmail/filterimporterexporter.cpp
+++ b/kmail/filterimporterexporter.cpp
@@ -53,7 +53,7 @@ FilterSelectionDialog::FilterSelectionDialog( TQWidget * parent )
   TQWidget *w = new TQWidget( this );
   TQVBoxLayout *top = new TQVBoxLayout( w );
 
-  filtersListView = new KListView( w );
+  filtersListView = new TDEListView( w );
   top->addWidget( filtersListView );
   setMainWidget(w);
   filtersListView->setSorting( -1 );
diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h
index 051288f55..37f4aab99 100644
--- a/kmail/filterimporterexporter.h
+++ b/kmail/filterimporterexporter.h
@@ -82,7 +82,7 @@ public slots:
   void slotUnselectAllButton();
   void slotSelectAllButton();
 private:
-  KListView *filtersListView;
+  TDEListView *filtersListView;
   TQValueList<KMFilter*> originalFilters;
   bool wasCancelled;
   KPushButton *selectAllButton;
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 65f656001..27d2f0c7a 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -189,17 +189,17 @@ unsigned int KMail::ACLEntryDialog::permissions() const
   return mButtonGroup->selectedId();
 }
 
-// class KMail::FolderDiaACLTab::ListView : public KListView
+// class KMail::FolderDiaACLTab::ListView : public TDEListView
 // {
 // public:
-//   ListView( TQWidget* parent, const char* name = 0 ) : KListView( parent, name ) {}
+//   ListView( TQWidget* parent, const char* name = 0 ) : TDEListView( parent, name ) {}
 // };
 
-class KMail::FolderDiaACLTab::ListViewItem : public KListViewItem
+class KMail::FolderDiaACLTab::ListViewItem : public TDEListViewItem
 {
 public:
   ListViewItem( TQListView* listview )
-    : KListViewItem( listview, listview->lastItem() ),
+    : TDEListViewItem( listview, listview->lastItem() ),
       mModified( false ), mNew( false ) {}
 
   void load( const ACLListEntry& entry );
@@ -333,7 +333,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
 
   mACLWidget = new TQHBox( mStack );
   mACLWidget->setSpacing( KDialog::spacingHint() );
-  mListView = new KListView( mACLWidget );
+  mListView = new TDEListView( mACLWidget );
   mListView->setAllColumnsShowFocus( true );
   mStack->addWidget( mACLWidget );
   mListView->addColumn( i18n( "User Id" ) );
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index 4f7f3ab4f..6ae09fec9 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -41,7 +41,7 @@ class KPushButton;
 class TQWidgetStack;
 class TQHBox;
 class TQVButtonGroup;
-class KListView;
+class TDEListView;
 namespace TDEIO { class Job; }
 
 namespace KMail {
@@ -107,7 +107,7 @@ private slots:
   void slotReceivedUserRights( KMFolder* folder );
   void slotDirectoryListingFinished(KMFolderImap*);
 
-  // User (KListView) slots
+  // User (TDEListView) slots
   void slotEditACL(TQListViewItem*);
   void slotSelectionChanged(TQListViewItem*);
 
@@ -131,7 +131,7 @@ private:
   TQHBox* mACLWidget;
   //class ListView;
   class ListViewItem;
-  KListView* mListView;
+  TDEListView* mListView;
   KPushButton* mAddACL;
   KPushButton* mEditACL;
   KPushButton* mRemoveACL;
diff --git a/kmail/foldersetselector.h b/kmail/foldersetselector.h
index bd4fce70e..0173327b7 100644
--- a/kmail/foldersetselector.h
+++ b/kmail/foldersetselector.h
@@ -21,7 +21,7 @@
 
 #include <kdialogbase.h>
 
-class KListView;
+class TDEListView;
 class KMFolderTree;
 
 namespace KMail {
@@ -38,7 +38,7 @@ class FolderSetSelector : public KDialogBase
     void setSelectedFolders( const TQValueList<int> &folderIds );
 
   private:
-    KListView *mTreeView;
+    TDEListView *mTreeView;
 };
 
 }
diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp
index 770b6cfc6..169af7aa1 100644
--- a/kmail/foldershortcutdialog.cpp
+++ b/kmail/foldershortcutdialog.cpp
@@ -71,8 +71,8 @@ FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder,
   mKeyButton = new KKeyButton( hb, "FolderShortcutSelector" );
   new TQWidget(hb);
 
-  connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const KShortcut& ) ),
-           this, TQT_SLOT( slotCapturedShortcut( const KShortcut& ) ) );
+  connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
+           this, TQT_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) );
   mKeyButton->setShortcut( folder->shortcut(), false );
 }
 
@@ -80,12 +80,12 @@ FolderShortcutDialog::~FolderShortcutDialog()
 {
 }
 
-void FolderShortcutDialog::slotCapturedShortcut( const KShortcut& sc )
+void FolderShortcutDialog::slotCapturedShortcut( const TDEShortcut& sc )
 {
   if ( sc == mKeyButton->shortcut() ) return;
   if ( sc.toString().isNull() ) {
     // null is fine, that's reset, but sc.іsNull() will be false :/
-    mKeyButton->setShortcut( KShortcut::null(), false );
+    mKeyButton->setShortcut( TDEShortcut::null(), false );
   } else {
     if( !mMainWidget->shortcutIsValid( sc ) ) {
       TQString msg( i18n( "The selected shortcut is already used, "
diff --git a/kmail/foldershortcutdialog.h b/kmail/foldershortcutdialog.h
index c94bce17e..930ac36f6 100644
--- a/kmail/foldershortcutdialog.h
+++ b/kmail/foldershortcutdialog.h
@@ -40,7 +40,7 @@
 #define FOLDERSHORTCUTDIALOG_H
 
 #include <kdialogbase.h> // include for the base class
-class KShortcut;
+class TDEShortcut;
 class KMFolder;
 class KKeyButton;
 class KMMainWidget;
@@ -60,7 +60,7 @@ public:
 
 protected slots:
   void slotOk();
-  void slotCapturedShortcut( const KShortcut& );
+  void slotCapturedShortcut( const TDEShortcut& );
 
 private:
   KMFolder *mFolder;
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index e51eaecf4..5679c8c9e 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -81,7 +81,7 @@ int FolderTreeBase::dndMode(bool alwaysAsk)
     action = DRAG_MOVE;
   } else {
     if ( GlobalSettings::self()->showPopupAfterDnD() || alwaysAsk ) {
-      KPopupMenu menu;
+      TDEPopupMenu menu;
       menu.insertItem( i18n("&Move Here"), DRAG_MOVE, 0 );
       menu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), DRAG_COPY, 1 );
       menu.insertSeparator();
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 26f5957cc..806fba35f 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -43,7 +43,7 @@ using namespace KMail;
 
 // Constuction a new list view item with the given colors and pixmap
 HeaderItem::HeaderItem( TQListView* parent, int msgId, const TQString& key )
-  : KListViewItem( parent ),
+  : TDEListViewItem( parent ),
   mMsgId( msgId ),
   mKey( key ),
   mAboutToBeDeleted( false ),
@@ -54,7 +54,7 @@ HeaderItem::HeaderItem( TQListView* parent, int msgId, const TQString& key )
 
 // Constuction a new list view item with the given parent, colors, & pixmap
 HeaderItem::HeaderItem( TQListViewItem* parent, int msgId, const TQString& key )
-  : KListViewItem( parent ),
+  : TDEListViewItem( parent ),
   mMsgId( msgId ),
   mKey( key ),
   mAboutToBeDeleted( false ),
@@ -435,7 +435,7 @@ void HeaderItem::paintCell( TQPainter * p, const TQColorGroup & cg,
   font.setWeight( weight );
   p->setFont( font );
 
-  KListViewItem::paintCell( p, _cg, column, width, align );
+  TDEListViewItem::paintCell( p, _cg, column, width, align );
 
   if (aboutToBeDeleted()) {
     // strike through
diff --git a/kmail/headeritem.h b/kmail/headeritem.h
index 34dee4de0..7dd3a6434 100644
--- a/kmail/headeritem.h
+++ b/kmail/headeritem.h
@@ -160,7 +160,7 @@ private:
  * the current folder). Each item is paired with a KMail::SortCacheItem. See there as to
  * how they are meant to cooperate. This should be about the visual aspects of
  * displaying an entry only. */
-class HeaderItem : public KListViewItem
+class HeaderItem : public TDEListViewItem
 {
 public:
   HeaderItem( TQListView* parent, int msgId, const TQString& key = TQString() );
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index 9d6c37e55..d626b966b 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -48,12 +48,12 @@
 namespace KMail {
 
 HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
-                                              KListView *listView,
-                                              KActionCollection *actionCollection,
+                                              TDEListView *listView,
+                                              TDEActionCollection *actionCollection,
                                               const char *name )
-  : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mStatus(0),  statusList()
+  : TDEListViewSearchLine(parent, listView, name), mStatusCombo(0), mStatus(0),  statusList()
 {
-  KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),
+  TDEAction *resetQuickSearch = new TDEAction( i18n( "Reset Quick Search" ),
                                            TQApplication::reverseLayout()
                                            ? "clear_left"
                                            : "locationbar_erase",
@@ -89,11 +89,11 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
 
   label->setBuddy( mStatusCombo );
 
-  KToolBarButton * btn = new KToolBarButton( "mail_find", 0, parent,
+  TDEToolBarButton * btn = new TDEToolBarButton( "mail_find", 0, parent,
                                             0, i18n( "Open Full Search" ) );
   connect( btn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( requestFullSearch() ) );
 
-  /* Disable the signal connected by KListViewSearchLine since it will call
+  /* Disable the signal connected by TDEListViewSearchLine since it will call
    * itemAdded during KMHeaders::readSortOrder() which will in turn result
    * in getMsgBaseForItem( item ) wanting to access items which are no longer
    * there. Rather rely on KMHeaders::msgAdded and its signal. */
@@ -153,7 +153,7 @@ bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQStri
   }
 
   // The full email address is not visible, but we still want it to be searchable.
-  // KListViewSearchLine::itemMatches() only searches in visible columns.
+  // TDEListViewSearchLine::itemMatches() only searches in visible columns.
   const HeaderItem *headerItem = static_cast<const HeaderItem*>( item );
   if ( headerItem->from().lower().contains( s.lower() ) ) {
     return true;
@@ -162,7 +162,7 @@ bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQStri
     return true;
   }
 
-  return KListViewSearchLine::itemMatches(item, s);
+  return TDEListViewSearchLine::itemMatches(item, s);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index d4ae8163e..71fb86c2e 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -37,19 +37,19 @@
 #include <tqvaluevector.h>
 class TQComboBox;
 class TQLabel;
-class KListView;
-class KActionCollection;
+class TDEListView;
+class TDEActionCollection;
 
 namespace KMail {
 
-class HeaderListQuickSearch : public KListViewSearchLine
+class HeaderListQuickSearch : public TDEListViewSearchLine
 {
 Q_OBJECT
   
 public:
     HeaderListQuickSearch( TQWidget *parent,
-                                             KListView *listView,
-                                             KActionCollection *actionCollection,
+                                             TDEListView *listView,
+                                             TDEActionCollection *actionCollection,
                                              const char *name = 0 );
     virtual ~HeaderListQuickSearch();
 
diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp
index 7a5134457..c5c9c0597 100644
--- a/kmail/identitylistview.cpp
+++ b/kmail/identitylistview.cpp
@@ -53,12 +53,12 @@ namespace KMail {
   //
 
   IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, const KPIM::Identity & ident )
-    : KListViewItem( parent ), mUOID( ident.uoid() ) {
+    : TDEListViewItem( parent ), mUOID( ident.uoid() ) {
     init( ident );
   }
 
   IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, TQListViewItem * after, const KPIM::Identity & ident )
-    : KListViewItem( parent, after ), mUOID( ident.uoid() ) {
+    : TDEListViewItem( parent, after ), mUOID( ident.uoid() ) {
     init( ident );
   }
 
@@ -96,7 +96,7 @@ namespace KMail {
   //
 
   IdentityListView::IdentityListView( TQWidget * parent, const char * name )
-    : KListView( parent, name )
+    : TDEListView( parent, name )
   {
     setFullWidth( true );
     setDragEnabled( true );
@@ -123,7 +123,7 @@ namespace KMail {
 	  item->setText( 0, ident.identityName() );
       }
     }
-    KListView::rename( i, col );
+    TDEListView::rename( i, col );
   }
 
   bool IdentityListView::acceptDrag( TQDropEvent * e ) const {
diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h
index aa203727a..7d4ebbf6c 100644
--- a/kmail/identitylistview.h
+++ b/kmail/identitylistview.h
@@ -45,7 +45,7 @@ namespace KMail {
   /** @short A TQListViewItem for use in IdentityListView
       @author Marc Mutz <mutz@kde.org>
   **/
-  class IdentityListViewItem : public KListViewItem {
+  class IdentityListViewItem : public TDEListViewItem {
   public:
     IdentityListViewItem( IdentityListView * parent,
 			  const KPIM::Identity & ident );
@@ -66,7 +66,7 @@ namespace KMail {
   /** @short A listview for KPIM::Identity
       @author Marc Mutz <mutz@kde.org>
   **/
-  class IdentityListView : public KListView {
+  class IdentityListView : public TDEListView {
     Q_OBJECT
   
   public:
diff --git a/kmail/klistboxdialog.cpp b/kmail/klistboxdialog.cpp
index 7027edd6d..eaa627bb7 100644
--- a/kmail/klistboxdialog.cpp
+++ b/kmail/klistboxdialog.cpp
@@ -8,7 +8,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-KListBoxDialog::KListBoxDialog( TQString& _selectedString,
+TDEListBoxDialog::TDEListBoxDialog( TQString& _selectedString,
                                 const TQString& caption,
                                 const TQString& labelText,
                                 TQWidget* parent,
@@ -19,7 +19,7 @@ KListBoxDialog::KListBoxDialog( TQString& _selectedString,
 
 {
     if ( !name )
-      setName( "KListBoxDialog" );
+      setName( "TDEListBoxDialog" );
     resize( 400, 180 );
 
     TQFrame *page = makeMainWidget();
@@ -50,12 +50,12 @@ KListBoxDialog::KListBoxDialog( TQString& _selectedString,
 /*
  *  Destroys the object and frees any allocated resources
  */
-KListBoxDialog::~KListBoxDialog()
+TDEListBoxDialog::~TDEListBoxDialog()
 {
     // no need to delete child widgets, TQt does it all for us
 }
 
-void KListBoxDialog::setLabelAbove(const TQString& label)
+void TDEListBoxDialog::setLabelAbove(const TQString& label)
 {
     labelAboveLA->setText( label );
     if( label.isEmpty() )
@@ -64,7 +64,7 @@ void KListBoxDialog::setLabelAbove(const TQString& label)
         labelAboveLA->show();
 }
 
-void KListBoxDialog::setCommentBelow(const TQString& comment)
+void TDEListBoxDialog::setCommentBelow(const TQString& comment)
 {
     commentBelowLA->setText( comment );
     if( comment.isEmpty() )
@@ -75,7 +75,7 @@ void KListBoxDialog::setCommentBelow(const TQString& comment)
 
 
 
-void KListBoxDialog::highlighted( const TQString& txt )
+void TDEListBoxDialog::highlighted( const TQString& txt )
 {
     selectedString = txt;
 }
diff --git a/kmail/klistboxdialog.h b/kmail/klistboxdialog.h
index 1ef8ce28d..30a672860 100644
--- a/kmail/klistboxdialog.h
+++ b/kmail/klistboxdialog.h
@@ -6,19 +6,19 @@
 class TQLabel;
 class TQListBox;
 
-class KListBoxDialog : public KDialogBase
+class TDEListBoxDialog : public KDialogBase
 {
     Q_OBJECT
   
 
 public:
-    KListBoxDialog( TQString& _selectedString,
+    TDEListBoxDialog( TQString& _selectedString,
                     const TQString& caption,
                     const TQString& labelText,
                     TQWidget*    parent = 0,
                     const char* name   = 0,
                     bool        modal  = true );
-    ~KListBoxDialog();
+    ~TDEListBoxDialog();
 
     void setLabelAbove(  const TQString& label  );
     void setCommentBelow(const TQString& comment);
diff --git a/kmail/klistviewindexedsearchline.cpp b/kmail/klistviewindexedsearchline.cpp
index 9f0e26356..b8895ff08 100644
--- a/kmail/klistviewindexedsearchline.cpp
+++ b/kmail/klistviewindexedsearchline.cpp
@@ -38,17 +38,17 @@
 
 using KMail::HeaderListQuickSearch;
 
-KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* parent, KListView* listView, KActionCollection* actionCollection, const char* name ):
+TDEListViewIndexedSearchLine::TDEListViewIndexedSearchLine( TQWidget* parent, TDEListView* listView, TDEActionCollection* actionCollection, const char* name ):
 	HeaderListQuickSearch( parent, listView, actionCollection, name ),
 	mFiltering( false )
 {
 }
 
-KListViewIndexedSearchLine::~KListViewIndexedSearchLine() {
+TDEListViewIndexedSearchLine::~TDEListViewIndexedSearchLine() {
 }
 
 
-void KListViewIndexedSearchLine::updateSearch( const TQString& s ) {
+void TDEListViewIndexedSearchLine::updateSearch( const TQString& s ) {
 	kdDebug( 5006 ) << "updateSearch( -" << s << "- )" << endl;
 	mFiltering = false;
 	if ( !s.isNull() && !s.isEmpty() ) {
@@ -60,10 +60,10 @@ void KListViewIndexedSearchLine::updateSearch( const TQString& s ) {
 			mFiltering = ok;
 		}
 	}
-	KListViewSearchLine::updateSearch( s );
+	TDEListViewSearchLine::updateSearch( s );
 }
 
-bool KListViewIndexedSearchLine::itemMatches( const TQListViewItem* item, const TQString& s ) const {
+bool TDEListViewIndexedSearchLine::itemMatches( const TQListViewItem* item, const TQString& s ) const {
 	if ( mFiltering && 
 			std::binary_search( mResults.begin(), mResults.end(), static_cast<const KMail::HeaderItem*>( item )->msgSerNum() ) )
 		return true;
diff --git a/kmail/klistviewindexedsearchline.h b/kmail/klistviewindexedsearchline.h
index 9dfd227ba..abd6e817f 100644
--- a/kmail/klistviewindexedsearchline.h
+++ b/kmail/klistviewindexedsearchline.h
@@ -37,24 +37,24 @@
 
 #include <vector>
 
-class KListView;
+class TDEListView;
 class TQListViewItem;
 class TQToolButton;
-class KListViewSearchLine;
+class TDEListViewSearchLine;
 
 /**
  * Extends HeaderListQuickSearch to also search inside message bodies using KMMsgIndex
  */
 
-class TDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch
+class TDEUI_EXPORT TDEListViewIndexedSearchLine: public KMail::HeaderListQuickSearch
 {
     Q_OBJECT
   
 
 public:
 
-    explicit KListViewIndexedSearchLine(TQWidget *parent, KListView *listView, KActionCollection* action, const char *name = 0);
-    ~KListViewIndexedSearchLine();
+    explicit TDEListViewIndexedSearchLine(TQWidget *parent, TDEListView *listView, TDEActionCollection* action, const char *name = 0);
+    ~TDEListViewIndexedSearchLine();
 
 public slots:
     /**
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index b7857493b..ff0e0f0c9 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -41,7 +41,7 @@ using KMail::AccountManager;
 #include "sidebarextension.h"
 #include "infoextension.h"
 #include "recentaddresses.h"
-using KRecentAddress::RecentAddresses;
+using TDERecentAddress::RecentAddresses;
 
 #include <kapplication.h>
 #include <tdeparts/mainwindow.h>
@@ -242,9 +242,9 @@ KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *parent )
 {
 }
 
-KMainWindow * KMailStatusBarExtension::mainWindow() const
+TDEMainWindow * KMailStatusBarExtension::mainWindow() const
 {
-  return static_cast<KMainWindow*>( mParent->parentWidget() );
+  return static_cast<TDEMainWindow*>( mParent->parentWidget() );
 }
 
 #include "kmail_part.moc"
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 46f08f68b..34a6e8d55 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -91,7 +91,7 @@ class KMailStatusBarExtension : public KParts::StatusBarExtension
 public:
   KMailStatusBarExtension( KMailPart *parent );
 
-  KMainWindow *mainWindow() const;
+  TDEMainWindow *mainWindow() const;
 
 private:
   KMailPart *mParent;
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 95d6108b8..0b029cdcc 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -1816,7 +1816,7 @@ void FolderShortcutCommand::start()
   mMainWidget->slotSelectFolder( mFolder );
 }
 
-void FolderShortcutCommand::setAction( KAction* action )
+void FolderShortcutCommand::setAction( TDEAction* action )
 {
   mAction = action;
 }
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index dab733cc8..5e8bf9c3c 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -18,8 +18,8 @@
 #include <ktempfile.h>
 
 class TQPopupMenu;
-class KMainWindow;
-class KAction;
+class TDEMainWindow;
+class TDEAction;
 class KProgressDialog;
 class TDEProcess;
 class KMFilter;
@@ -740,12 +740,12 @@ public slots:
   /** Assign a KActio to the command which is used to trigger it. This
    * action will be deleted along with the command, so you don't need to
    * keep track of it separately. */
-  void setAction( KAction* );
+  void setAction( TDEAction* );
 
 private:
   KMMainWidget *mMainWidget;
   KMFolder *mFolder;
-  KAction *mAction;
+  TDEAction *mAction;
 };
 
 
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 636da6d37..ba8d1615b 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -44,7 +44,7 @@ using KPIM::AddresseeSelectorDialog;
 #include <maillistdrag.h>
 using KPIM::MailListDrag;
 #include "recentaddresses.h"
-using KRecentAddress::RecentAddresses;
+using TDERecentAddress::RecentAddresses;
 #include "kleo_util.h"
 #include "stl_util.h"
 #include "recipientseditor.h"
@@ -888,9 +888,9 @@ void KMComposeWin::slotView(void)
 
   //This sucks awfully, but no, I cannot get an activated(int id) from
   // actionContainer()
-  if (!TQT_TQOBJECT_CONST(sender())->isA("KToggleAction"))
+  if (!TQT_TQOBJECT_CONST(sender())->isA("TDEToggleAction"))
     return;
-  KToggleAction *act = (KToggleAction *) sender();
+  TDEToggleAction *act = (TDEToggleAction *) sender();
 
   if (act == mAllFieldsAction)
     id = 0;
@@ -1228,38 +1228,38 @@ void KMComposeWin::getTransportMenu()
 //-----------------------------------------------------------------------------
 void KMComposeWin::setupActions(void)
 {
-  KActionMenu *actActionNowMenu, *actActionLaterMenu;
+  TDEActionMenu *actActionNowMenu, *actActionLaterMenu;
 
   if (kmkernel->msgSender()->sendImmediate()) //default == send now?
   {
     //default = send now, alternative = queue
-    ( void )  new KAction( i18n("&Send Mail"), "mail_send", CTRL+Key_Return,
+    ( void )  new TDEAction( i18n("&Send Mail"), "mail_send", CTRL+Key_Return,
                         TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_default");
 
     // FIXME: change to mail_send_via icon when this exits.
-    actActionNowMenu =  new KActionMenu (i18n("&Send Mail Via"), "mail_send",
+    actActionNowMenu =  new TDEActionMenu (i18n("&Send Mail Via"), "mail_send",
 		    actionCollection(), "send_default_via" );
 
-    (void) new KAction (i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this),
+    (void) new TDEAction (i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this),
 			TQT_SLOT(slotSendLater()), actionCollection(),"send_alternative");
-    actActionLaterMenu = new KActionMenu (i18n("Send &Later Via"), "queue",
+    actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue",
 		    actionCollection(), "send_alternative_via" );
 
   }
   else //no, default = send later
   {
     //default = queue, alternative = send now
-    (void) new KAction (i18n("Send &Later"), "queue",
+    (void) new TDEAction (i18n("Send &Later"), "queue",
                         CTRL+Key_Return,
                         TQT_TQOBJECT(this), TQT_SLOT(slotSendLater()), actionCollection(),"send_default");
-    actActionLaterMenu = new KActionMenu (i18n("Send &Later Via"), "queue",
+    actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue",
 		    actionCollection(), "send_default_via" );
 
-   ( void )  new KAction( i18n("&Send Mail"), "mail_send", 0,
+   ( void )  new TDEAction( i18n("&Send Mail"), "mail_send", 0,
                         TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative");
 
     // FIXME: change to mail_send_via icon when this exits.
-    actActionNowMenu =  new KActionMenu (i18n("&Send Mail Via"), "mail_send",
+    actActionNowMenu =  new TDEActionMenu (i18n("&Send Mail Via"), "mail_send",
 		    actionCollection(), "send_alternative_via" );
 
   }
@@ -1290,37 +1290,37 @@ void KMComposeWin::setupActions(void)
 
 
 
-  (void) new KAction (i18n("Save as &Draft"), "filesave", 0,
+  (void) new TDEAction (i18n("Save as &Draft"), "filesave", 0,
                       TQT_TQOBJECT(this), TQT_SLOT(slotSaveDraft()),
                       actionCollection(), "save_in_drafts");
-  (void) new KAction (i18n("Save as &Template"), "filesave", 0,
+  (void) new TDEAction (i18n("Save as &Template"), "filesave", 0,
                       TQT_TQOBJECT(this), TQT_SLOT(slotSaveTemplate()),
                       actionCollection(), "save_in_templates");
-  (void) new KAction (i18n("&Insert File..."), "fileopen", 0,
+  (void) new TDEAction (i18n("&Insert File..."), "fileopen", 0,
                       TQT_TQOBJECT(this),  TQT_SLOT(slotInsertFile()),
                       actionCollection(), "insert_file");
-  mRecentAction = new KRecentFilesAction (i18n("&Insert File Recent"),
+  mRecentAction = new TDERecentFilesAction (i18n("&Insert File Recent"),
 		      "fileopen", 0,
 		      TQT_TQOBJECT(this),  TQT_SLOT(slotInsertRecentFile(const KURL&)),
 		      actionCollection(), "insert_file_recent");
 
   mRecentAction->loadEntries( KMKernel::config() );
 
-  (void) new KAction (i18n("&Address Book"), "contents",0,
+  (void) new TDEAction (i18n("&Address Book"), "contents",0,
                       TQT_TQOBJECT(this), TQT_SLOT(slotAddrBook()),
                       actionCollection(), "addressbook");
-  (void) new KAction (i18n("&New Composer"), "mail_new",
-                      KStdAccel::shortcut(KStdAccel::New),
+  (void) new TDEAction (i18n("&New Composer"), "mail_new",
+                      TDEStdAccel::shortcut(TDEStdAccel::New),
                       TQT_TQOBJECT(this), TQT_SLOT(slotNewComposer()),
                       actionCollection(), "new_composer");
-  (void) new KAction (i18n("New Main &Window"), "window_new", 0,
+  (void) new TDEAction (i18n("New Main &Window"), "window_new", 0,
                       TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()),
                       actionCollection(), "open_mailreader");
 
   if ( !mClassicalRecipients ) {
-    new KAction( i18n("Select &Recipients..."), CTRL + Key_L, TQT_TQOBJECT(mRecipientsEditor),
+    new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, TQT_TQOBJECT(mRecipientsEditor),
       TQT_SLOT( selectRecipients() ), actionCollection(), "select_recipients" );
-    new KAction( i18n("Save &Distribution List..."), 0, TQT_TQOBJECT(mRecipientsEditor),
+    new TDEAction( i18n("Save &Distribution List..."), 0, TQT_TQOBJECT(mRecipientsEditor),
       TQT_SLOT( saveDistributionList() ), actionCollection(),
       "save_distribution_list" );
   }
@@ -1342,54 +1342,54 @@ void KMComposeWin::setupActions(void)
   KStdAction::replace (TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), actionCollection());
   KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection(), "spellcheck");
 
-  mPasteQuotation = new KAction (i18n("Pa&ste as Quotation"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsQuotation()),
+  mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsQuotation()),
                       actionCollection(), "paste_quoted");
 
-  (void) new KAction (i18n("Paste as Attac&hment"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsAttachment()),
+  (void) new TDEAction (i18n("Paste as Attac&hment"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsAttachment()),
                       actionCollection(), "paste_att");
 
-  KAction * addq = new KAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(this),
+  TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(this),
               TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote");
   connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)),
            addq, TQT_SLOT(setEnabled(bool)) );
 
-  KAction * remq = new KAction(i18n("Re&move Quote Characters"), 0, TQT_TQOBJECT(this),
+  TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, TQT_TQOBJECT(this),
               TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote");
   connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)),
            remq, TQT_SLOT(setEnabled(bool)) );
 
 
-  (void) new KAction (i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanSpace()),
+  (void) new TDEAction (i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanSpace()),
                       actionCollection(), "clean_spaces");
 
-  mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), 0, TQT_TQOBJECT(this),
+  mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, TQT_TQOBJECT(this),
                       TQT_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" );
   mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() );
 
   //these are checkable!!!
-  mUrgentAction = new KToggleAction (i18n("&Urgent"), 0,
+  mUrgentAction = new TDEToggleAction (i18n("&Urgent"), 0,
                                     actionCollection(),
                                     "urgent");
-  mRequestMDNAction = new KToggleAction ( i18n("&Request Disposition Notification"), 0,
+  mRequestMDNAction = new TDEToggleAction ( i18n("&Request Disposition Notification"), 0,
                                          actionCollection(),
                                          "options_request_mdn");
   mRequestMDNAction->setChecked(GlobalSettings::self()->requestMDN());
   //----- Message-Encoding Submenu
-  mEncodingAction = new KSelectAction( i18n( "Se&t Encoding" ), "charset",
+  mEncodingAction = new TDESelectAction( i18n( "Se&t Encoding" ), "charset",
                                       0, TQT_TQOBJECT(this), TQT_SLOT(slotSetCharset() ),
                                       actionCollection(), "charsets" );
-  mWordWrapAction = new KToggleAction (i18n("&Wordwrap"), 0,
+  mWordWrapAction = new TDEToggleAction (i18n("&Wordwrap"), 0,
                       actionCollection(), "wordwrap");
   mWordWrapAction->setChecked(GlobalSettings::self()->wordWrap());
   connect(mWordWrapAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotWordWrapToggled(bool)));
 
-  mSnippetAction = new KToggleAction ( i18n("&Snippets"), 0,
+  mSnippetAction = new TDEToggleAction ( i18n("&Snippets"), 0,
                                        actionCollection(), "snippets");
   connect(mSnippetAction, TQT_SIGNAL(toggled(bool)), mSnippetWidget, TQT_SLOT(setShown(bool)) );
   mSnippetAction->setChecked( GlobalSettings::self()->showSnippetManager() );
 
   mAutoSpellCheckingAction =
-    new KToggleAction( i18n( "&Automatic Spellchecking" ), "spellcheck", 0,
+    new TDEToggleAction( i18n( "&Automatic Spellchecking" ), "spellcheck", 0,
                        actionCollection(), "options_auto_spellchecking" );
   const bool spellChecking = GlobalSettings::self()->autoSpellChecking();
   mAutoSpellCheckingAction->setEnabled( !GlobalSettings::self()->useExternalEditor() );
@@ -1404,74 +1404,74 @@ void KMComposeWin::setupActions(void)
   mEncodingAction->setCurrentItem( -1 );
 
   //these are checkable!!!
-  markupAction = new KToggleAction (i18n("Formatting (HTML)"), 0, TQT_TQOBJECT(this),
+  markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, TQT_TQOBJECT(this),
                                     TQT_SLOT(slotToggleMarkup()),
                       actionCollection(), "html");
 
-  mAllFieldsAction = new KToggleAction (i18n("&All Fields"), 0, TQT_TQOBJECT(this),
+  mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, TQT_TQOBJECT(this),
                                        TQT_SLOT(slotView()),
                                        actionCollection(), "show_all_fields");
-  mIdentityAction = new KToggleAction (i18n("&Identity"), 0, TQT_TQOBJECT(this),
+  mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotView()),
                                       actionCollection(), "show_identity");
-  mDictionaryAction = new KToggleAction (i18n("&Dictionary"), 0, TQT_TQOBJECT(this),
+  mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, TQT_TQOBJECT(this),
                                          TQT_SLOT(slotView()),
                                          actionCollection(), "show_dictionary");
-  mFccAction = new KToggleAction (i18n("&Sent-Mail Folder"), 0, TQT_TQOBJECT(this),
+  mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, TQT_TQOBJECT(this),
                                  TQT_SLOT(slotView()),
                                  actionCollection(), "show_fcc");
-  mTransportAction = new KToggleAction (i18n("&Mail Transport"), 0, TQT_TQOBJECT(this),
+  mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotView()),
                                       actionCollection(), "show_transport");
-  mFromAction = new KToggleAction (i18n("&From"), 0, TQT_TQOBJECT(this),
+  mFromAction = new TDEToggleAction (i18n("&From"), 0, TQT_TQOBJECT(this),
                                   TQT_SLOT(slotView()),
                                   actionCollection(), "show_from");
-  mReplyToAction = new KToggleAction (i18n("&Reply To"), 0, TQT_TQOBJECT(this),
+  mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, TQT_TQOBJECT(this),
                                        TQT_SLOT(slotView()),
                                        actionCollection(), "show_reply_to");
   if ( mClassicalRecipients ) {
-    mToAction = new KToggleAction (i18n("&To"), 0, TQT_TQOBJECT(this),
+    mToAction = new TDEToggleAction (i18n("&To"), 0, TQT_TQOBJECT(this),
                                   TQT_SLOT(slotView()),
                                   actionCollection(), "show_to");
-    mCcAction = new KToggleAction (i18n("&CC"), 0, TQT_TQOBJECT(this),
+    mCcAction = new TDEToggleAction (i18n("&CC"), 0, TQT_TQOBJECT(this),
                                   TQT_SLOT(slotView()),
                                   actionCollection(), "show_cc");
-    mBccAction = new KToggleAction (i18n("&BCC"), 0, TQT_TQOBJECT(this),
+    mBccAction = new TDEToggleAction (i18n("&BCC"), 0, TQT_TQOBJECT(this),
                                    TQT_SLOT(slotView()),
                                    actionCollection(), "show_bcc");
   }
-  mSubjectAction = new KToggleAction (i18n("S&ubject"), 0, TQT_TQOBJECT(this),
+  mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, TQT_TQOBJECT(this),
                                      TQT_SLOT(slotView()),
                                      actionCollection(), "show_subject");
   //end of checkable
 
-  mAppendSignatureAction = new KAction (i18n("Append S&ignature"), 0, TQT_TQOBJECT(this),
+  mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, TQT_TQOBJECT(this),
                       TQT_SLOT(slotAppendSignature()),
                       actionCollection(), "append_signature");
-  mPrependSignatureAction =  new KAction (i18n("Prepend S&ignature"), 0, TQT_TQOBJECT(this),
+  mPrependSignatureAction =  new TDEAction (i18n("Prepend S&ignature"), 0, TQT_TQOBJECT(this),
                       TQT_SLOT(slotPrependSignature()),
                       actionCollection(), "prepend_signature");
 
-  mInsertSignatureAction =  new KAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, TQT_TQOBJECT(this),
+  mInsertSignatureAction =  new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, TQT_TQOBJECT(this),
                       TQT_SLOT(slotInsertSignatureAtCursor()),
                       actionCollection(), "insert_signature_at_cursor_position");
 
-  mAttachPK  = new KAction (i18n("Attach &Public Key..."), 0, TQT_TQOBJECT(this),
+  mAttachPK  = new TDEAction (i18n("Attach &Public Key..."), 0, TQT_TQOBJECT(this),
                            TQT_SLOT(slotInsertPublicKey()),
                            actionCollection(), "attach_public_key");
-  mAttachMPK = new KAction (i18n("Attach &My Public Key"), 0, TQT_TQOBJECT(this),
+  mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, TQT_TQOBJECT(this),
                            TQT_SLOT(slotInsertMyPublicKey()),
                            actionCollection(), "attach_my_public_key");
-  (void) new KAction (i18n("&Attach File..."), "attach",
+  (void) new TDEAction (i18n("&Attach File..."), "attach",
                       0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()),
                       actionCollection(), "attach");
-  mAttachRemoveAction = new KAction (i18n("&Remove Attachment"), 0, TQT_TQOBJECT(this),
+  mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, TQT_TQOBJECT(this),
                       TQT_SLOT(slotAttachRemove()),
                       actionCollection(), "remove");
-  mAttachSaveAction = new KAction (i18n("&Save Attachment As..."), "filesave",0,
+  mAttachSaveAction = new TDEAction (i18n("&Save Attachment As..."), "filesave",0,
                       TQT_TQOBJECT(this), TQT_SLOT(slotAttachSave()),
                       actionCollection(), "attach_save");
-  mAttachPropertiesAction = new KAction (i18n("Attachment Pr&operties"), 0, TQT_TQOBJECT(this),
+  mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, TQT_TQOBJECT(this),
                       TQT_SLOT(slotAttachProperties()),
                       actionCollection(), "attach_properties");
 
@@ -1481,11 +1481,11 @@ void KMComposeWin::setupActions(void)
   KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
   KStdAction::preferences(kmkernel, TQT_SLOT(slotShowConfigurationDialog()), actionCollection());
 
-  (void) new KAction (i18n("&Spellchecker..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheckConfig()),
+  (void) new TDEAction (i18n("&Spellchecker..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheckConfig()),
                       actionCollection(), "setup_spellchecker");
 
   if ( Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) {
-    KToggleAction * a = new KToggleAction( i18n( "Encrypt Message with Chiasmus..." ),
+    TDEToggleAction * a = new TDEToggleAction( i18n( "Encrypt Message with Chiasmus..." ),
                                            "chidecrypted", 0, actionCollection(),
                                            "encrypt_message_chiasmus" );
     a->setCheckedState( KGuiItem( i18n( "Encrypt Message with Chiasmus..." ), "chiencrypted" ) );
@@ -1496,10 +1496,10 @@ void KMComposeWin::setupActions(void)
     mEncryptChiasmusAction = 0;
   }
 
-  mEncryptAction = new KToggleAction (i18n("&Encrypt Message"),
+  mEncryptAction = new TDEToggleAction (i18n("&Encrypt Message"),
                                      "decrypted", 0,
                                      actionCollection(), "encrypt_message");
-  mSignAction = new KToggleAction (i18n("&Sign Message"),
+  mSignAction = new TDEToggleAction (i18n("&Sign Message"),
                                   "signature", 0,
                                   actionCollection(), "sign_message");
   // get PGP user id for the chosen identity
@@ -1546,7 +1546,7 @@ void KMComposeWin::setupActions(void)
   for ( int i = 0 ; i < numCryptoMessageFormats ; ++i )
     l.push_back( Kleo::cryptoMessageFormatToLabel( cryptoMessageFormats[i] ) );
 
-  mCryptoModuleAction = new KSelectAction( i18n( "&Cryptographic Message Format" ), 0,
+  mCryptoModuleAction = new TDESelectAction( i18n( "&Cryptographic Message Format" ), 0,
 					   TQT_TQOBJECT(this), TQT_SLOT(slotSelectCryptoModule()),
 					   actionCollection(), "options_select_crypto" );
   mCryptoModuleAction->setItems( l );
@@ -1563,46 +1563,46 @@ void KMComposeWin::setupActions(void)
   styleItems << i18n( "Ordered List (Alpha lower)" );
   styleItems << i18n( "Ordered List (Alpha upper)" );
 
-  listAction = new KSelectAction( i18n( "Select Style" ), 0, actionCollection(),
+  listAction = new TDESelectAction( i18n( "Select Style" ), 0, actionCollection(),
                                  "text_list" );
   listAction->setItems( styleItems );
   listAction->setToolTip( i18n( "Select a list style" ) );
   connect( listAction, TQT_SIGNAL( activated( const TQString& ) ),
            TQT_SLOT( slotListAction( const TQString& ) ) );
-  fontAction = new KFontAction( "Select Font", 0, actionCollection(),
+  fontAction = new TDEFontAction( "Select Font", 0, actionCollection(),
                                "text_font" );
   fontAction->setToolTip( i18n( "Select a font" ) );
   connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ),
            TQT_SLOT( slotFontAction( const TQString& ) ) );
-  fontSizeAction = new KFontSizeAction( "Select Size", 0, actionCollection(),
+  fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(),
                                        "text_size" );
   fontSizeAction->setToolTip( i18n( "Select a font size" ) );
   connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ),
            TQT_SLOT( slotSizeAction( int ) ) );
 
-  alignLeftAction = new KToggleAction (i18n("Align Left"), "text_left", 0,
+  alignLeftAction = new TDEToggleAction (i18n("Align Left"), "text_left", 0,
                       TQT_TQOBJECT(this), TQT_SLOT(slotAlignLeft()), actionCollection(),
                       "align_left");
   alignLeftAction->setChecked( true );
-  alignRightAction = new KToggleAction (i18n("Align Right"), "text_right", 0,
+  alignRightAction = new TDEToggleAction (i18n("Align Right"), "text_right", 0,
                       TQT_TQOBJECT(this), TQT_SLOT(slotAlignRight()), actionCollection(),
                       "align_right");
-  alignCenterAction = new KToggleAction (i18n("Align Center"), "text_center", 0,
+  alignCenterAction = new TDEToggleAction (i18n("Align Center"), "text_center", 0,
                        TQT_TQOBJECT(this), TQT_SLOT(slotAlignCenter()), actionCollection(),
                        "align_center");
-  textBoldAction = new KToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
+  textBoldAction = new TDEToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
                                      TQT_TQOBJECT(this), TQT_SLOT(slotTextBold()),
                                      actionCollection(), "text_bold");
-  textItalicAction = new KToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I,
+  textItalicAction = new TDEToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I,
                                        TQT_TQOBJECT(this), TQT_SLOT(slotTextItalic()),
                                        actionCollection(), "text_italic");
-  textUnderAction = new KToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U,
+  textUnderAction = new TDEToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U,
                                      TQT_TQOBJECT(this), TQT_SLOT(slotTextUnder()),
                                      actionCollection(), "text_under");
-  actionFormatReset = new KAction( i18n( "Reset Font Settings" ), "eraser", 0,
+  actionFormatReset = new TDEAction( i18n( "Reset Font Settings" ), "eraser", 0,
                                      TQT_TQOBJECT(this), TQT_SLOT( slotFormatReset() ),
                                      actionCollection(), "format_reset");
-  actionFormatColor = new KAction( i18n( "Text Color..." ), "colorize", 0,
+  actionFormatColor = new TDEAction( i18n( "Text Color..." ), "colorize", 0,
                                      TQT_TQOBJECT(this), TQT_SLOT( slotTextColor() ),
                                      actionCollection(), "format_color");
 
@@ -1614,7 +1614,7 @@ void KMComposeWin::setupActions(void)
 
   // In Kontact, this entry would read "Configure Kontact", but bring
   // up KMail's config dialog. That's sensible, though, so fix the label.
-  KAction* configureAction = actionCollection()->action("options_configure" );
+  TDEAction* configureAction = actionCollection()->action("options_configure" );
   if ( configureAction )
     configureAction->setText( i18n("Configure KMail..." ) );
 }
@@ -1664,9 +1664,9 @@ void KMComposeWin::setupEditor(void)
   menu = new TQPopupMenu(this);
   //#ifdef BROKEN
   menu->insertItem(i18n("Undo"),mEditor,
-                   TQT_SLOT(undo()), KStdAccel::shortcut(KStdAccel::Undo));
+                   TQT_SLOT(undo()), TDEStdAccel::shortcut(TDEStdAccel::Undo));
   menu->insertItem(i18n("Redo"),mEditor,
-                   TQT_SLOT(redo()), KStdAccel::shortcut(KStdAccel::Redo));
+                   TQT_SLOT(redo()), TDEStdAccel::shortcut(TDEStdAccel::Redo));
   menu->insertSeparator();
   //#endif //BROKEN
   menu->insertItem(i18n("Cut"), this, TQT_SLOT(slotCut()));
@@ -2961,7 +2961,7 @@ void KMComposeWin::slotInsertFile()
     TQStringList urls = config->readListEntry( "recent-urls" );
     TQStringList encodings = config->readListEntry( "recent-encodings" );
     // Prevent config file from growing without bound
-    // Would be nicer to get this constant from KRecentFilesAction
+    // Would be nicer to get this constant from TDERecentFilesAction
     uint mMaxRecentFiles = 30;
     while (urls.count() > mMaxRecentFiles)
       urls.erase( urls.fromLast() );
@@ -5259,13 +5259,13 @@ void KMComposeWin::alignmentChanged( int a )
 }
 
 namespace {
-  class KToggleActionResetter {
-    KToggleAction * mAction;
+  class TDEToggleActionResetter {
+    TDEToggleAction * mAction;
     bool mOn;
   public:
-    KToggleActionResetter( KToggleAction * action, bool on )
+    TDEToggleActionResetter( TDEToggleAction * action, bool on )
       : mAction( action ),  mOn( on ) {}
-    ~KToggleActionResetter() {
+    ~TDEToggleActionResetter() {
       if ( mAction )
         mAction->setChecked( mOn );
     }
@@ -5279,7 +5279,7 @@ void KMComposeWin::slotEncryptChiasmusToggled( bool on ) {
   if ( !on )
     return;
 
-  KToggleActionResetter resetter( mEncryptChiasmusAction, false );
+  TDEToggleActionResetter resetter( mEncryptChiasmusAction, false );
 
   const Kleo::CryptoBackend::Protocol * chiasmus =
     Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" );
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index eb108b062..35964268d 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -59,19 +59,19 @@ class KMMessage;
 class KMMessagePart;
 class TDEProcess;
 class KDirWatch;
-class KSelectAction;
-class KFontAction;
-class KFontSizeAction;
-class KSelectAction;
+class TDESelectAction;
+class TDEFontAction;
+class TDEFontSizeAction;
+class TDESelectAction;
 class KStatusBar;
-class KAction;
-class KToggleAction;
+class TDEAction;
+class TDEToggleAction;
 class KTempFile;
-class KToolBar;
-class KToggleAction;
-class KSelectColorAction;
+class TDEToolBar;
+class TDEToggleAction;
+class TDESelectColorAction;
 class KURL;
-class KRecentFilesAction;
+class TDERecentFilesAction;
 class SpellingFilter;
 class MessageComposer;
 class RecipientsEditor;
@@ -793,32 +793,32 @@ private:
   uint mId;
   TQString mOldSigText;
 
-  KAction *mAttachPK, *mAttachMPK,
+  TDEAction *mAttachPK, *mAttachMPK,
           *mAttachRemoveAction, *mAttachSaveAction, *mAttachPropertiesAction,
           *mPasteQuotation, *mAddQuoteChars, *mRemQuoteChars;
-  KRecentFilesAction *mRecentAction;
-
-  KAction *mAppendSignatureAction, *mPrependSignatureAction, *mInsertSignatureAction;
-
-  KToggleAction *mSignAction, *mEncryptAction, *mRequestMDNAction;
-  KToggleAction *mUrgentAction, *mAllFieldsAction, *mFromAction;
-  KToggleAction *mReplyToAction, *mToAction, *mCcAction, *mBccAction;
-  KToggleAction *mSubjectAction;
-  KToggleAction *mIdentityAction, *mTransportAction, *mFccAction;
-  KToggleAction *mWordWrapAction, *mFixedFontAction, *mAutoSpellCheckingAction;
-  KToggleAction *mDictionaryAction, *mSnippetAction;
-
-  KSelectAction *listAction;
-  KFontAction *fontAction;
-  KFontSizeAction *fontSizeAction;
-  KToggleAction *alignLeftAction, *alignCenterAction, *alignRightAction;
-  KToggleAction *textBoldAction, *textItalicAction, *textUnderAction;
-  KToggleAction *plainTextAction, *markupAction;
-  KAction *actionFormatColor, *actionFormatReset;
-  KAction *mHtmlToolbar;
-
-  KSelectAction *mEncodingAction;
-  KSelectAction *mCryptoModuleAction;
+  TDERecentFilesAction *mRecentAction;
+
+  TDEAction *mAppendSignatureAction, *mPrependSignatureAction, *mInsertSignatureAction;
+
+  TDEToggleAction *mSignAction, *mEncryptAction, *mRequestMDNAction;
+  TDEToggleAction *mUrgentAction, *mAllFieldsAction, *mFromAction;
+  TDEToggleAction *mReplyToAction, *mToAction, *mCcAction, *mBccAction;
+  TDEToggleAction *mSubjectAction;
+  TDEToggleAction *mIdentityAction, *mTransportAction, *mFccAction;
+  TDEToggleAction *mWordWrapAction, *mFixedFontAction, *mAutoSpellCheckingAction;
+  TDEToggleAction *mDictionaryAction, *mSnippetAction;
+
+  TDESelectAction *listAction;
+  TDEFontAction *fontAction;
+  TDEFontSizeAction *fontSizeAction;
+  TDEToggleAction *alignLeftAction, *alignCenterAction, *alignRightAction;
+  TDEToggleAction *textBoldAction, *textItalicAction, *textUnderAction;
+  TDEToggleAction *plainTextAction, *markupAction;
+  TDEAction *actionFormatColor, *actionFormatReset;
+  TDEAction *mHtmlToolbar;
+
+  TDESelectAction *mEncodingAction;
+  TDESelectAction *mCryptoModuleAction;
 
   TQCString mCharset;
   TQCString mDefCharset;
@@ -899,7 +899,7 @@ private:
   KMail::MessageSender::SendMethod mSendMethod;
   KMComposeWin::SaveIn mSaveIn;
 
-  KToggleAction *mEncryptChiasmusAction;
+  TDEToggleAction *mEncryptChiasmusAction;
   bool mEncryptWithChiasmus;
 
   // This is the temporary object that constructs the message out of the
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index 6f03e87dc..83ed78d56 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -174,7 +174,7 @@ void KMEdit::contentsDropEvent(TQDropEvent *e)
     else if( KURLDrag::canDecode( e ) ) {
         KURL::List urlList;
         if( KURLDrag::decode( e, urlList ) ) {
-            KPopupMenu p;
+            TDEPopupMenu p;
             p.insertItem( i18n("Add as Text"), 0 );
             p.insertItem( i18n("Add as Attachment"), 1 );
             int id = p.exec( mapToGlobal( e->pos() ) );
@@ -505,7 +505,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
       //Continue if this word was misspelled
       if( !word.isEmpty() && mReplacements.contains( word ) )
       {
-        KPopupMenu p;
+        TDEPopupMenu p;
 
         //Add the suggestions to the popup menu
         TQStringList reps = mReplacements[word];
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index 2898990d3..1a98963e2 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -246,7 +246,7 @@ void KMFilter::readConfig(TDEConfig* config)
     bConfigureShortcut = config->readBoolEntry("ConfigureShortcut", false);
     TQString shortcut( config->readEntry( "Shortcut" ) );
     if ( !shortcut.isEmpty() ) {
-      KShortcut sc( shortcut );
+      TDEShortcut sc( shortcut );
       setShortcut( sc );
     }
     bConfigureToolbar = config->readBoolEntry("ConfigureToolbar", false);
diff --git a/kmail/kmfilter.h b/kmail/kmfilter.h
index 109e491eb..87c59528f 100644
--- a/kmail/kmfilter.h
+++ b/kmail/kmfilter.h
@@ -240,12 +240,12 @@ public:
       or toolbar. Default is no shortcut.
       @see setConfigureShortcut setConfigureToolbar
   */
-  void setShortcut( const KShortcut & shortcut ) { mShortcut = shortcut; };
+  void setShortcut( const TDEShortcut & shortcut ) { mShortcut = shortcut; };
 
   /** @return The shortcut assigned to the filter.
       @see setShortcut
   */
-  const KShortcut & shortcut() const { return mShortcut; }
+  const TDEShortcut & shortcut() const { return mShortcut; }
 
   /** Set the icon to be used if plugged into the filter menu
       or toolbar. Default is the gear icon.
@@ -297,7 +297,7 @@ private:
   TQValueList<int> mAccounts;
   KMPopFilterAction mAction;
   TQString mIcon;
-  KShortcut mShortcut;
+  TDEShortcut mShortcut;
   bool bPopFilter : 1;
   bool bApplyOnInbound : 1;
   bool bApplyOnOutbound : 1;
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index b5010cc31..83342d43d 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -213,7 +213,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
       vbl3->addWidget( mApplyOnForChecked );
       vbl3->addStretch( 2 );
 
-      mAccountList = new KListView( adv_w, "accountList" );
+      mAccountList = new TDEListView( adv_w, "accountList" );
       mAccountList->addColumn( i18n("Account Name") );
       mAccountList->addColumn( i18n("Type") );
       mAccountList->setAllColumnsShowFocus( true );
@@ -302,8 +302,8 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
     connect( mConfigureShortcut, TQT_SIGNAL(toggled(bool)),
 	     this, TQT_SLOT(slotConfigureShortcutButtonToggled(bool)) );
 
-    connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const KShortcut& ) ),
-             this, TQT_SLOT( slotCapturedShortcutChanged( const KShortcut& ) ) );
+    connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
+             this, TQT_SLOT( slotCapturedShortcutChanged( const TDEShortcut& ) ) );
 
     connect( mConfigureToolbar, TQT_SIGNAL(toggled(bool)),
 	     this, TQT_SLOT(slotConfigureToolbarButtonToggled(bool)) );
@@ -403,7 +403,7 @@ void KMFilterDlg::slotFilterSelected( KMFilter* aFilter )
     const bool configureShortcut = aFilter->configureShortcut();
     const bool configureToolbar = aFilter->configureToolbar();
     const TQString icon = aFilter->icon();
-    const KShortcut shortcut( aFilter->shortcut() );
+    const TDEShortcut shortcut( aFilter->shortcut() );
 
     mApplyOnIn->setChecked( applyOnIn );
     mApplyOnForAll->setEnabled( applyOnIn );
@@ -517,12 +517,12 @@ void KMFilterDlg::slotConfigureShortcutButtonToggled( bool aChecked )
   }
 }
 
-void KMFilterDlg::slotCapturedShortcutChanged( const KShortcut& sc )
+void KMFilterDlg::slotCapturedShortcutChanged( const TDEShortcut& sc )
 {
-  KShortcut mySc(sc);
+  TDEShortcut mySc(sc);
   if ( mySc == mKeyButton->shortcut() ) return;
   // FIXME work around a problem when reseting the shortcut via the shortcut dialog
-  // somehow the returned shortcut does not evaluate to true in KShortcut::isNull(),
+  // somehow the returned shortcut does not evaluate to true in TDEShortcut::isNull(),
   // so we additionally have to check for an empty string
   if ( mySc.isNull() || mySc.toString().isEmpty() )
     mySc.clear();
diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h
index 4742ff40b..3801d8be9 100644
--- a/kmail/kmfilterdlg.h
+++ b/kmail/kmfilterdlg.h
@@ -30,7 +30,7 @@ class TQWidgetStack;
 class TQCheckBox;
 class KIconButton;
 class KKeyButton;
-class KListView;
+class TDEListView;
 
 
 /** This is a complex widget that is used to manipulate KMail's filter
@@ -368,7 +368,7 @@ protected slots:
   void slotApplicableAccountsChanged();
   void slotStopProcessingButtonToggled( bool aChecked );
   void slotConfigureShortcutButtonToggled( bool aChecked );
-  void slotCapturedShortcutChanged( const KShortcut& );
+  void slotCapturedShortcutChanged( const TDEShortcut& );
   void slotConfigureToolbarButtonToggled( bool aChecked );
   void slotFilterActionIconChanged( TQString icon );
   void slotReset();
@@ -408,7 +408,7 @@ protected:
       this filter to all accounts or to selected accounts only. */
   TQRadioButton *mApplyOnForAll, *mApplyOnForTraditional, *mApplyOnForChecked;
   /** ListView that shows the accounts in the advanced tab */
-  KListView *mAccountList;
+  TDEListView *mAccountList;
 
   TQCheckBox *mStopProcessingHere;
   TQCheckBox *mConfigureShortcut;
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index 88338a057..33118ca4b 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -192,7 +192,7 @@ void KMFolder::readConfig( TDEConfig* config )
 
   TQString shortcut( config->readEntry( "Shortcut" ) );
   if ( !shortcut.isEmpty() ) {
-    KShortcut sc( shortcut );
+    TDEShortcut sc( shortcut );
     setShortcut( sc );
   }
 }
@@ -868,7 +868,7 @@ void KMFolder::reallyAddCopyOfMsg( KMMessage* aMsg )
   mStorage->reallyAddCopyOfMsg( aMsg );
 }
 
-void KMFolder::setShortcut( const KShortcut &sc )
+void KMFolder::setShortcut( const TDEShortcut &sc )
 {
   if ( mShortcut != sc ) {
     mShortcut = sc;
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index 87be58407..da406e3bf 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -526,8 +526,8 @@ public:
   bool ignoreNewMail() const { return mIgnoreNewMail; }
   void setIgnoreNewMail( bool b ) { mIgnoreNewMail = b; }
 
-  const KShortcut &shortcut() const { return mShortcut; }
-  void setShortcut( const KShortcut& );
+  const TDEShortcut &shortcut() const { return mShortcut; }
+  void setShortcut( const TDEShortcut& );
 
   /** Returns true if this folder can be moved */
   bool isMoveable() const;
@@ -676,7 +676,7 @@ private:
   bool mIgnoreNewMail;
 
   /** shortcut associated with this folder or null, if none is configured. */
-  KShortcut mShortcut;
+  TDEShortcut mShortcut;
 };
 
 
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index 44d2a1530..321ed3158 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -64,7 +64,7 @@ void KMFolderMgr::expireAll() {
   int                 ret = KMessageBox::Continue;
 
   if (config->readBoolEntry("warn-before-expire", true)) {
-    ret = KMessageBox::warningContinueCancel(KMainWindow::memberList->first(),
+    ret = KMessageBox::warningContinueCancel(TDEMainWindow::memberList->first(),
 			 i18n("Are you sure you want to expire old messages?"),
 			 i18n("Expire Old Messages?"), i18n("Expire"));
   }
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 9a7cd4771..9d18e4c02 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -403,7 +403,7 @@ KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent,
   // popup to switch columns
   header()->setClickEnabled(true);
   header()->installEventFilter(this);
-  mPopup = new KPopupMenu(this);
+  mPopup = new TDEPopupMenu(this);
   mPopup->insertTitle(i18n("View Columns"));
   mPopup->setCheckable(true);
   mUnreadPop = mPopup->insertItem(i18n("Unread Column"), this, TQT_SLOT(slotToggleUnreadColumn()));
@@ -1050,7 +1050,7 @@ void KMFolderTree::resizeEvent(TQResizeEvent* e)
   TDEConfigGroupSaver saver(conf, "Geometry");
   conf->writeEntry(name(), size().width());
 
-  KListView::resizeEvent(e);
+  TDEListView::resizeEvent(e);
 }
 
 //-----------------------------------------------------------------------------
@@ -1073,7 +1073,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
   if (!fti )
     return;
 
-  KPopupMenu *folderMenu = new KPopupMenu;
+  TDEPopupMenu *folderMenu = new TDEPopupMenu;
   bool multiFolder = selectedFolders().count() > 1;
   if (fti->folder()) folderMenu->insertTitle(fti->folder()->label());
 
@@ -1211,7 +1211,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
 void KMFolderTree::contentsMousePressEvent(TQMouseEvent * e)
 {
   // KFolderTree messes around with the selection mode
-  KListView::contentsMousePressEvent( e );
+  TDEListView::contentsMousePressEvent( e );
 }
 
 // If middle button and folder holds mailing-list, create a message to that list
@@ -1695,7 +1695,7 @@ void KMFolderTree::toggleColumn(int column, bool openFolders)
       addUnreadColumn( i18n("Unread"), 70 );
       reload();
     }
-    // toggle KPopupMenu
+    // toggle TDEPopupMenu
     mPopup->setItemChecked( mUnreadPop, isUnreadActive() );
 
   } else if (column == total) {
@@ -1719,7 +1719,7 @@ void KMFolderTree::toggleColumn(int column, bool openFolders)
       addSizeColumn( i18n("Size"), 70 );
       reload( openFolders );
     }
-    // toggle KPopupMenu
+    // toggle TDEPopupMenu
     mPopup->setItemChecked( mSizePop, isSizeActive() );
 
   } else kdDebug(5006) << "unknown column:" << column << endl;
@@ -2128,9 +2128,9 @@ void KMFolderTree::pasteFolder()
 
 void KMFolderTree::updateCopyActions()
 {
-  KAction *copy = mMainWidget->action("copy_folder");
-  KAction *cut = mMainWidget->action("cut_folder");
-  KAction *paste = mMainWidget->action("paste_folder");
+  TDEAction *copy = mMainWidget->action("copy_folder");
+  TDEAction *cut = mMainWidget->action("cut_folder");
+  TDEAction *paste = mMainWidget->action("paste_folder");
   KMFolderTreeItem *item = static_cast<KMFolderTreeItem*>( currentItem() );
 
   if ( !item ||  !item->folder() ) {
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index 696c7cca0..1c6b6b6a1 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -32,7 +32,7 @@ class TQDropEvent;
 class TQPixmap;
 class TQPainter;
 class TQPopupMenu;
-class KPopupMenu;
+class TDEPopupMenu;
 class KMFolder;
 class KMFolderDir;
 class KMFolderImap;
@@ -342,7 +342,7 @@ private:
   TQListViewItemIterator mUpdateIterator;
 
   /** popup for unread/total */
-  KPopupMenu* mPopup;
+  TDEPopupMenu* mPopup;
   int mUnreadPop;
   int mTotalPop;
   int mSizePop;
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 6910ad6ef..740dde839 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -94,7 +94,7 @@ TQPixmap* KMHeaders::pixReadFwdReplied = 0;
 //-----------------------------------------------------------------------------
 KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent,
                      const char *name) :
-  KListView( parent, name ),
+  TDEListView( parent, name ),
   mIgnoreSortOrderChanges( false )
 {
   static bool pixmapsLoaded = false;
@@ -126,7 +126,7 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent,
   // popup-menu
   header()->setClickEnabled(true);
   header()->installEventFilter(this);
-  mPopup = new KPopupMenu(this);
+  mPopup = new TDEPopupMenu(this);
   mPopup->insertTitle(i18n("View Columns"));
   mPopup->setCheckable(true);
   mPopup->insertItem(i18n("Status"),          KPaintInfo::COL_STATUS);
@@ -252,7 +252,7 @@ bool KMHeaders::eventFilter ( TQObject *o, TQEvent *e )
     mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() );
     return true;
   }
-  return KListView::eventFilter(o, e);
+  return TDEListView::eventFilter(o, e);
 }
 
 //-----------------------------------------------------------------------------
@@ -414,7 +414,7 @@ void KMHeaders::paintEmptyArea( TQPainter * p, const TQRect & rect )
 
 bool KMHeaders::event(TQEvent *e)
 {
-  bool result = KListView::event(e);
+  bool result = TDEListView::event(e);
   if (e->type() == TQEvent::ApplicationPaletteChange)
   {
      readColorConfig();
@@ -559,7 +559,7 @@ void KMHeaders::readConfig (void)
 //-----------------------------------------------------------------------------
 void KMHeaders::restoreColumnLayout( TDEConfig *config, const TQString &group )
 {
-  // KListView::restoreLayout() will call setSorting(), which is reimplemented by us.
+  // TDEListView::restoreLayout() will call setSorting(), which is reimplemented by us.
   // We don't want to change the sort order, so we set a flag here that is checked in
   // setSorting().
   mIgnoreSortOrderChanges = true;
@@ -1054,7 +1054,7 @@ void KMHeaders::msgAdded(int id)
   }
   if (mSortInfo.fakeSort) {
     TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int)));
-    KListView::setSorting(mSortCol, !mSortDescending );
+    TDEListView::setSorting(mSortCol, !mSortDescending );
     mSortInfo.fakeSort = 0;
   }
   appendItemToSortFile(hi); //inserted into sorted list
@@ -1139,7 +1139,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
       item->setTempKey( key + item->key( mSortCol, !mSortDescending ));
       if (mSortInfo.fakeSort) {
         TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int)));
-        KListView::setSorting(mSortCol, !mSortDescending );
+        TDEListView::setSorting(mSortCol, !mSortDescending );
         mSortInfo.fakeSort = 0;
       }
     }
@@ -1385,7 +1385,7 @@ void KMHeaders::setStyleDependantFrameWidth()
 void KMHeaders::styleChange( TQStyle& oldStyle )
 {
   setStyleDependantFrameWidth();
-  KListView::styleChange( oldStyle );
+  TDEListView::styleChange( oldStyle );
 }
 
 //-----------------------------------------------------------------------------
@@ -1711,7 +1711,7 @@ void KMHeaders::setSelected( TQListViewItem *item, bool selected )
     return;
 
   if ( item->isVisible() )
-    KListView::setSelected( item, selected );
+    TDEListView::setSelected( item, selected );
 
   // If the item is the parent of a closed thread recursively select
   // children .
@@ -2190,7 +2190,7 @@ void KMHeaders::updateMessageList( bool set_selection, bool forceJumpToUnread )
   clear();
   mItems.resize(0); // will contain deleted pointers
   noRepaint = false;
-  KListView::setSorting( mSortCol, !mSortDescending );
+  TDEListView::setSorting( mSortCol, !mSortDescending );
   if (!mFolder) {
     repaint();
     return;
@@ -2251,7 +2251,7 @@ void KMHeaders::keyPressEvent( TQKeyEvent * e )
       case Key_Next:
       case Key_Prior:
       case Key_Escape:
-        KListView::keyPressEvent( e );
+        TDEListView::keyPressEvent( e );
       }
       if (!shft)
         connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)),
@@ -2302,7 +2302,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
   }
 
   // let klistview do it's thing, expanding/collapsing, selection/deselection
-  KListView::contentsMousePressEvent(e);
+  TDEListView::contentsMousePressEvent(e);
   /* TQListView's shift-select selects also invisible items. Until that is
      fixed, we have to deselect hidden items here manually, so the quick
      search doesn't mess things up. */
@@ -2367,7 +2367,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
 void KMHeaders::contentsMouseReleaseEvent(TQMouseEvent* e)
 {
   if (e->button() != Qt::RightButton)
-    KListView::contentsMouseReleaseEvent(e);
+    TDEListView::contentsMouseReleaseEvent(e);
 
   mMousePressed = false;
 }
@@ -2507,7 +2507,7 @@ void KMHeaders::slotRMB()
   menu->insertSeparator();
   mOwner->messageActions()->createTodoAction()->plug( menu );
 
-  KAcceleratorManager::manage(menu);
+  TDEAcceleratorManager::manage(menu);
   kmkernel->setContextMenuShown( true );
   menu->exec(TQCursor::pos(), 0);
   kmkernel->setContextMenuShown( false );
@@ -2648,7 +2648,7 @@ void KMHeaders::setSorting( int column, bool ascending )
       colText = colText + i18n( " (Status)" );
     setColumnText( mPaintInfo.subCol, colText);
   }
-  KListView::setSorting( column, ascending );
+  TDEListView::setSorting( column, ascending );
   ensureCurrentItemVisible();
   // Make sure the config and .sorted file are updated, otherwise stale info
   // is read on new imap mail. ( folder->folderComplete() -> readSortOrder() ).
@@ -3108,7 +3108,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
             fread(&sorted_count, sizeof(sorted_count), 1, sortStream);
 
             //Hackyness to work around qlistview problems
-            KListView::setSorting(-1);
+            TDEListView::setSorting(-1);
             header()->setSortIndicator(column, ascending);
             TQObject::connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int)));
             //setup mSortInfo here now, as above may change it
@@ -3228,7 +3228,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
         mSortInfo.ascending = ascending = !mSortDescending;
         threaded = (isThreaded());
         sorted_count = discovered_count = appended = 0;
-        KListView::setSorting( mSortCol, !mSortDescending );
+        TDEListView::setSorting( mSortCol, !mSortDescending );
     }
     //fill in empty holes
     if((sorted_count + discovered_count - deleted_count) < mFolder->count()) {
@@ -3566,9 +3566,9 @@ void KMHeaders::pasteMessages()
 
 void KMHeaders::updateActions()
 {
-  KAction *copy = owner()->action( "copy_messages" );
-  KAction *cut = owner()->action( "cut_messages" );
-  KAction *paste = owner()->action( "paste_messages" );
+  TDEAction *copy = owner()->action( "copy_messages" );
+  TDEAction *cut = owner()->action( "cut_messages" );
+  TDEAction *paste = owner()->action( "paste_messages" );
 
   if ( selectedItems().isEmpty() ) {
     copy->setEnabled( false );
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index b894b0c7f..7312189fe 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -25,7 +25,7 @@ class KMMessage;
 class KMMsgBase;
 class KMCommand;
 class KMMainWidget;
-class KPopupMenu;
+class TDEPopupMenu;
 class TQPalette;
 class TQPixmap;
 class TQIconSet;
@@ -45,7 +45,7 @@ enum NestingPolicy { AlwaysOpen = 0, DefaultOpen, DefaultClosed, OpenUnread };
 #define KMAIL_RESERVED 3
 
 /** The widget that shows the contents of folders */
-class KMHeaders : public KListView
+class KMHeaders : public TDEListView
 {
   Q_OBJECT
   
@@ -135,9 +135,9 @@ public:
   virtual void readColorConfig(void);
 
   /**
-   * Same as KListView::restoreLayout(), only that this does _not_ restore the sort order.
+   * Same as TDEListView::restoreLayout(), only that this does _not_ restore the sort order.
    * This is useful since restoreLayout() doesn't restore the sort order correctly, as
-   * KListView doesn't know about our extended sort order like date of arrival.
+   * TDEListView doesn't know about our extended sort order like date of arrival.
    *
    * Note that if you want to restore the sort order correctly, call readConfig().
    */
@@ -223,7 +223,7 @@ signals:
   void messageListUpdated();
 
   /** emitted after a new item has been fully built and added to the
-   * list view. We can't use KListView::itemAdded, as that is emitted
+   * list view. We can't use TDEListView::itemAdded, as that is emitted
    * from the ctor of the item, at which point the building of the item
    * is not yet far enough along to update the quick search, which is
    * what is connected to this signal. */
@@ -467,7 +467,7 @@ private:
   bool mReaderWindowActive;
 
   /** popup to switch columns */
-  KPopupMenu* mPopup;
+  TDEPopupMenu* mPopup;
 
   // copied messages
   TQValueList<TQ_UINT32> mCopiedMessages;
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 423c04a70..05571bf3c 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -36,7 +36,7 @@ using KMail::AccountManager;
 #include "kmmainwidget.h"
 #include "kmfoldertree.h"
 #include "recentaddresses.h"
-using KRecentAddress::RecentAddresses;
+using TDERecentAddress::RecentAddresses;
 #include "kmmsgdict.h"
 #include <libkpimidentities/identity.h>
 #include <libkpimidentities/identitymanager.h>
@@ -351,12 +351,12 @@ void KMKernel::saveToProfile( const TQString& ) const
 void KMKernel::openReader( bool onlyCheck )
 {
   mWin = 0;
-  KMainWindow *ktmw = 0;
+  TDEMainWindow *ktmw = 0;
   kdDebug(5006) << "KMKernel::openReader called" << endl;
 
-  if (KMainWindow::memberList)
-    for (ktmw = KMainWindow::memberList->first(); ktmw;
-         ktmw = KMainWindow::memberList->next())
+  if (TDEMainWindow::memberList)
+    for (ktmw = TDEMainWindow::memberList->first(); ktmw;
+         ktmw = TDEMainWindow::memberList->next())
       if (ktmw->isA("KMMainWin"))
         break;
 
@@ -1124,13 +1124,13 @@ void KMKernel::raise()
 bool KMKernel::showMail( TQ_UINT32 serialNumber, TQString /* messageId */ )
 {
   KMMainWidget *mainWidget = 0;
-  if (KMainWindow::memberList) {
-    KMainWindow *win = 0;
+  if (TDEMainWindow::memberList) {
+    TDEMainWindow *win = 0;
     TQObjectList *l;
 
-    // First look for a KMainWindow.
-    for (win = KMainWindow::memberList->first(); win;
-         win = KMainWindow::memberList->next()) {
+    // First look for a TDEMainWindow.
+    for (win = TDEMainWindow::memberList->first(); win;
+         win = TDEMainWindow::memberList->next()) {
       // Then look for a KMMainWidget.
       l	= win->queryList("KMMainWidget");
       if (l && l->first()) {
@@ -1745,9 +1745,9 @@ bool KMKernel::doSessionManagement()
 
 void KMKernel::closeAllKMailWindows()
 {
-  if (!KMainWindow::memberList) return;
-  TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList);
-  KMainWindow *window = 0;
+  if (!TDEMainWindow::memberList) return;
+  TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList);
+  TDEMainWindow *window = 0;
   while ((window = it.current()) != 0) {
     ++it;
     if (window->isA("KMMainWindow") ||
@@ -1921,8 +1921,8 @@ bool KMKernel::transferMail( TQString & destinationDir )
 
 void KMKernel::ungrabPtrKb(void)
 {
-  if(!KMainWindow::memberList) return;
-  TQWidget* widg = KMainWindow::memberList->first();
+  if(!TDEMainWindow::memberList) return;
+  TQWidget* widg = TDEMainWindow::memberList->first();
   Display* dpy;
 
   if (!widg) return;
@@ -1964,10 +1964,10 @@ void KMKernel::dumpDeadLetters()
     return; //All documents should be saved before shutting down is set!
 
   // make all composer windows autosave their contents
-  if ( !KMainWindow::memberList )
+  if ( !TDEMainWindow::memberList )
     return;
 
-  for ( TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList) ; it.current() != 0; ++it ) {
+  for ( TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList) ; it.current() != 0; ++it ) {
     if ( KMail::Composer * win = ::tqqt_cast<KMail::Composer*>( it.current() ) ) {
       win->autoSaveMessage();
       // saving the message has to be finished right here, we are called from a dtor,
@@ -2234,29 +2234,29 @@ KMMsgIndex *KMKernel::msgIndex()
     return the_msgIndex;
 }
 
-KMainWindow* KMKernel::mainWin()
+TDEMainWindow* KMKernel::mainWin()
 {
-  if (KMainWindow::memberList) {
-    KMainWindow *kmWin = 0;
+  if (TDEMainWindow::memberList) {
+    TDEMainWindow *kmWin = 0;
 
     // First look for a KMMainWin.
-    for (kmWin = KMainWindow::memberList->first(); kmWin;
-         kmWin = KMainWindow::memberList->next())
+    for (kmWin = TDEMainWindow::memberList->first(); kmWin;
+         kmWin = TDEMainWindow::memberList->next())
       if (kmWin->isA("KMMainWin"))
         return kmWin;
 
-    // There is no KMMainWin. Use any other KMainWindow instead (e.g. in
+    // There is no KMMainWin. Use any other TDEMainWindow instead (e.g. in
     // case we are running inside Kontact) because we anyway only need
     // it for modal message boxes and for KNotify events.
-    kmWin = KMainWindow::memberList->first();
+    kmWin = TDEMainWindow::memberList->first();
     if ( kmWin )
       return kmWin;
   }
 
-  // There's not a single KMainWindow. Create a KMMainWin.
+  // There's not a single TDEMainWindow. Create a KMMainWin.
   // This could happen if we want to pop up an error message
   // while we are still doing the startup wizard and no other
-  // KMainWindow is running.
+  // TDEMainWindow is running.
   mWin = new KMMainWin;
   return mWin;
 }
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 748ec6809..0a3c4a9e7 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -64,7 +64,7 @@ class TQTimer;
 class KProgress;
 class KPassivePopup;
 class KMMainWin;
-class KMainWindow;
+class TDEMainWindow;
 class KMailICalIfaceImpl;
 class KMReaderWin;
 class KSystemTray;
@@ -357,7 +357,7 @@ public:
   TQTextCodec *networkCodec() { return netCodec; }
 
   /** returns a reference to the first Mainwin or a temporary Mainwin */
-  KMainWindow* mainWin();
+  TDEMainWindow* mainWin();
 
   // ### The mContextMenuShown flag is necessary to work around bug# 56693
   // ### (kmail freeze with the complete desktop while pinentry-qt appears)
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index 7916c1be7..9d07a9c6b 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -75,7 +75,7 @@ void KMLineEdit::insertEmails( const TQStringList & emails )
     return;
   }
   //multiple emails, let the user choose one
-  KPopupMenu menu( this, "Addresschooser" );
+  TDEPopupMenu menu( this, "Addresschooser" );
   for ( TQStringList::const_iterator it = emails.begin(), end = emails.end() ; it != end; ++it )
     menu.insertItem( *it );
   const int result = menu.exec( TQCursor::pos() );
@@ -164,14 +164,14 @@ TQPopupMenu *KMLineEdit::createPopupMenu()
 
 void KMLineEdit::editRecentAddresses()
 {
-  KRecentAddress::RecentAddressDialog dlg( this );
-  dlg.setAddresses( KRecentAddress::RecentAddresses::self( KMKernel::config() )->addresses() );
+  TDERecentAddress::RecentAddressDialog dlg( this );
+  dlg.setAddresses( TDERecentAddress::RecentAddresses::self( KMKernel::config() )->addresses() );
   if ( !dlg.exec() )
     return;
-  KRecentAddress::RecentAddresses::self( KMKernel::config() )->clear();
+  TDERecentAddress::RecentAddresses::self( KMKernel::config() )->clear();
   const TQStringList addrList = dlg.addresses();
   for ( TQStringList::const_iterator it = addrList.begin(), end = addrList.end() ; it != end ; ++it )
-    KRecentAddress::RecentAddresses::self( KMKernel::config() )->add( *it );
+    TDERecentAddress::RecentAddresses::self( KMKernel::config() )->add( *it );
   loadContacts();
 }
 
@@ -184,7 +184,7 @@ void KMLineEdit::loadContacts()
   if ( GlobalSettings::self()->showRecentAddressesInComposer() ){
     if ( KMKernel::self() ) {
       TQStringList recent =
-        KRecentAddress::RecentAddresses::self( KMKernel::config() )->addresses();
+        TDERecentAddress::RecentAddresses::self( KMKernel::config() )->addresses();
       TQStringList::Iterator it = recent.begin();
       TQString name, email;
 
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index bf63dab28..94d0e6741 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -137,7 +137,7 @@ static KStaticDeleter<TQValueList<KMMainWidget*> > mwlsd;
 //-----------------------------------------------------------------------------
 KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
                            KXMLGUIClient *aGUIClient,
-                           KActionCollection *actionCollection, TDEConfig* config ) :
+                           TDEActionCollection *actionCollection, TDEConfig* config ) :
     TQWidget(parent, name),
     mFavoritesCheckMailAction( 0 ),
     mFavoriteFolderView( 0 ),
@@ -184,7 +184,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
 
   // FIXME This should become a line separator as soon as the API
   // is extended in tdelibs.
-  mToolbarActionSeparator = new KActionSeparator( actionCollection );
+  mToolbarActionSeparator = new TDEActionSeparator( actionCollection );
 
   if( !s_mainWidgetList )
     mwlsd.setObject( s_mainWidgetList, new TQValueList<KMMainWidget*>() );
@@ -246,7 +246,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
   mStartupDone = true;
 
 
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
+  TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget());
   KStatusBar *sb =  mainWin ? mainWin->statusBar() : 0;
   mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb );
   mVacationScriptIndicator->hide();
@@ -595,7 +595,7 @@ void KMMainWidget::createWidgets(void)
   headerParent->dumpObjectTree();
 #endif
   mSearchAndHeaders = new TQVBox( headerParent );
-  mSearchToolBar = new KToolBar( mSearchAndHeaders, "search toolbar");
+  mSearchToolBar = new TDEToolBar( mSearchAndHeaders, "search toolbar");
   mSearchToolBar->setMovingEnabled(false);
   mSearchToolBar->boxLayout()->setSpacing( KDialog::spacingHint() );
   TQLabel *label = new TQLabel( i18n("S&earch:"), mSearchToolBar, "kde toolbar widget" );
@@ -603,7 +603,7 @@ void KMMainWidget::createWidgets(void)
 
   mHeaders = new KMHeaders(this, mSearchAndHeaders, "headers");
 #ifdef HAVE_INDEXLIB
-  mQuickSearchLine = new KListViewIndexedSearchLine( mSearchToolBar, mHeaders,
+  mQuickSearchLine = new TDEListViewIndexedSearchLine( mSearchToolBar, mHeaders,
                                                     actionCollection(), "headers quick search line" );
 #else
   mQuickSearchLine = new HeaderListQuickSearch( mSearchToolBar, mHeaders,
@@ -659,19 +659,19 @@ void KMMainWidget::createWidgets(void)
     mMsgView = NULL;
   }
 
-  KAction *action;
+  TDEAction *action;
 
-  mMoveMsgToFolderAction = new KAction( i18n("Move Message to Folder"), Key_M, TQT_TQOBJECT(this),
+  mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, TQT_TQOBJECT(this),
                TQT_SLOT(slotMoveMsg()), actionCollection(),
                "move_message_to_folder" );
   mMoveMsgToFolderAction->plugAccel( actionCollection()->kaccel() );
 
-  action = new KAction( i18n("Copy Message to Folder"), Key_C, TQT_TQOBJECT(this),
+  action = new TDEAction( i18n("Copy Message to Folder"), Key_C, TQT_TQOBJECT(this),
                TQT_SLOT(slotCopyMsg()), actionCollection(),
                "copy_message_to_folder" );
   action->plugAccel( actionCollection()->kaccel() );
 
-  action = new KAction( i18n("Jump to Folder"), Key_J, TQT_TQOBJECT(this),
+  action = new TDEAction( i18n("Jump to Folder"), Key_J, TQT_TQOBJECT(this),
                TQT_SLOT(slotJumpToFolder()), actionCollection(),
                "jump_to_folder" );
   action->plugAccel( actionCollection()->kaccel() );
@@ -713,42 +713,42 @@ void KMMainWidget::createWidgets(void)
   }
 
   //Commands not worthy of menu items, but that deserve configurable keybindings
-  mRemoveDuplicatesAction = new KAction(
+  mRemoveDuplicatesAction = new TDEAction(
     i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, TQT_TQOBJECT(this),
     TQT_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages");
   action->plugAccel( actionCollection()->kaccel() );
 
-  action = new KAction(
+  action = new TDEAction(
     i18n("Abort Current Operation"), Key_Escape, ProgressManager::instance(),
     TQT_SLOT(slotAbortAll()), actionCollection(), "cancel" );
   action->plugAccel( actionCollection()->kaccel() );
 
-  action = new KAction(
+  action = new TDEAction(
    i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(mFolderTree),
    TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder");
   action->plugAccel( actionCollection()->kaccel() );
 
-  action = new KAction(
+  action = new TDEAction(
    i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(mFolderTree),
    TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder");
   action->plugAccel( actionCollection()->kaccel() );
 
-  action = new KAction(
+  action = new TDEAction(
    i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(mFolderTree),
    TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder");
   action->plugAccel( actionCollection()->kaccel() );
 
-  action = new KAction(
+  action = new TDEAction(
     i18n("Focus on Next Message"), ALT+Key_Right, TQT_TQOBJECT(mHeaders),
     TQT_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message");
   action->plugAccel( actionCollection()->kaccel() );
 
-  action = new KAction(
+  action = new TDEAction(
     i18n("Focus on Previous Message"), ALT+Key_Left, TQT_TQOBJECT(mHeaders),
     TQT_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message");
   action->plugAccel( actionCollection()->kaccel() );
 
-  action = new KAction(
+  action = new TDEAction(
     i18n("Select Message with Focus"), ALT+Key_Space, TQT_TQOBJECT(mHeaders),
     TQT_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message");
   action->plugAccel( actionCollection()->kaccel() );
@@ -1325,7 +1325,7 @@ void KMMainWidget::slotExpireAll() {
   TDEConfigGroupSaver saver(config, "General");
 
   if (config->readBoolEntry("warn-before-expire", true)) {
-    ret = KMessageBox::warningContinueCancel(KMainWindow::memberList->first(),
+    ret = KMessageBox::warningContinueCancel(TDEMainWindow::memberList->first(),
 			 i18n("Are you sure you want to expire all old messages?"),
 			 i18n("Expire Old Messages?"), i18n("Expire"));
     if (ret != KMessageBox::Continue) {
@@ -2356,7 +2356,7 @@ void KMMainWidget::slotMarkAll()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotMsgPopup(KMMessage&, const KURL &aUrl, const TQPoint& aPoint)
 {
-  KPopupMenu * menu = new KPopupMenu;
+  TDEPopupMenu * menu = new TDEPopupMenu;
   updateMessageMenu();
   mUrlCurrent = aUrl;
 
@@ -2453,7 +2453,7 @@ void KMMainWidget::slotMsgPopup(KMMessage&, const KURL &aUrl, const TQPoint& aPo
     menu->insertSeparator();
     mMsgActions->createTodoAction()->plug( menu );
   }
-  KAcceleratorManager::manage(menu);
+  TDEAcceleratorManager::manage(menu);
   menu->exec(aPoint, 0);
   delete menu;
 }
@@ -2488,7 +2488,7 @@ void KMMainWidget::getTransportMenu()
 void KMMainWidget::updateCustomTemplateMenus()
 {
   if ( !mCustomTemplateActions.isEmpty() ) {
-    TQPtrList<KAction>::iterator ait = mCustomTemplateActions.begin();
+    TQPtrList<TDEAction>::iterator ait = mCustomTemplateActions.begin();
     for ( ; ait != mCustomTemplateActions.end() ; ++ait ) {
       (*ait)->unplugAll();
       delete (*ait);
@@ -2505,7 +2505,7 @@ void KMMainWidget::updateCustomTemplateMenus()
   delete mCustomForwardMapper;
 
   mCustomForwardActionMenu =
-    new KActionMenu( i18n("Forward With Custom Template"),
+    new TDEActionMenu( i18n("Forward With Custom Template"),
                      "mail_custom_forward",
                      actionCollection(), "custom_forward" );
   TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
@@ -2514,7 +2514,7 @@ void KMMainWidget::updateCustomTemplateMenus()
   mForwardActionMenu->insert( mCustomForwardActionMenu );
 
   mCustomReplyActionMenu =
-    new KActionMenu( i18n("Reply With Custom Template"), "mail_custom_reply",
+    new TDEActionMenu( i18n("Reply With Custom Template"), "mail_custom_reply",
                      actionCollection(), "custom_reply" );
   TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
   connect( mCustomReplyMapper, TQT_SIGNAL( mapped( int ) ),
@@ -2522,7 +2522,7 @@ void KMMainWidget::updateCustomTemplateMenus()
   mMsgActions->replyMenu()->insert( mCustomReplyActionMenu );
 
   mCustomReplyAllActionMenu =
-    new KActionMenu( i18n("Reply to All With Custom Template"),
+    new TDEActionMenu( i18n("Reply to All With Custom Template"),
                      "mail_custom_reply_all",
                      actionCollection(), "custom_reply_all" );
   TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
@@ -2542,11 +2542,11 @@ void KMMainWidget::updateCustomTemplateMenus()
     CTemplates t( *it );
     mCustomTemplates.append( *it );
 
-    KAction *action;
+    TDEAction *action;
     switch ( t.type() ) {
     case CustomTemplates::TReply:
-      action = new KAction( (*it).replace( "&", "&&" ),
-                            KShortcut( t.shortcut() ),
+      action = new TDEAction( (*it).replace( "&", "&&" ),
+                            TDEShortcut( t.shortcut() ),
                             mCustomReplyMapper,
                             TQT_SLOT( map() ),
                             actionCollection(),
@@ -2557,8 +2557,8 @@ void KMMainWidget::updateCustomTemplateMenus()
       ++replyc;
       break;
     case CustomTemplates::TReplyAll:
-      action = new KAction( (*it).replace( "&", "&&" ),
-                            KShortcut( t.shortcut() ),
+      action = new TDEAction( (*it).replace( "&", "&&" ),
+                            TDEShortcut( t.shortcut() ),
                             mCustomReplyAllMapper,
                             TQT_SLOT( map() ),
                             actionCollection(),
@@ -2569,8 +2569,8 @@ void KMMainWidget::updateCustomTemplateMenus()
       ++replyallc;
       break;
     case CustomTemplates::TForward:
-      action = new KAction( (*it).replace( "&", "&&" ),
-                            KShortcut( t.shortcut() ),
+      action = new TDEAction( (*it).replace( "&", "&&" ),
+                            TDEShortcut( t.shortcut() ),
                             mCustomForwardMapper,
                             TQT_SLOT( map() ),
                             actionCollection(),
@@ -2581,8 +2581,8 @@ void KMMainWidget::updateCustomTemplateMenus()
       ++forwardc;
       break;
     case CustomTemplates::TUniversal:
-      action = new KAction( (*it).replace( "&", "&&" ),
-                            KShortcut::null(),
+      action = new TDEAction( (*it).replace( "&", "&&" ),
+                            TDEShortcut::null(),
                             mCustomReplyMapper,
                             TQT_SLOT( map() ),
                             actionCollection(),
@@ -2591,8 +2591,8 @@ void KMMainWidget::updateCustomTemplateMenus()
       mCustomReplyActionMenu->insert( action, idx );
       mCustomTemplateActions.append( action );
       ++replyc;
-      action = new KAction( (*it).replace( "&", "&&" ),
-                            KShortcut::null(),
+      action = new TDEAction( (*it).replace( "&", "&&" ),
+                            TDEShortcut::null(),
                             mCustomReplyAllMapper,
                             TQT_SLOT( map() ),
                             actionCollection(),
@@ -2601,8 +2601,8 @@ void KMMainWidget::updateCustomTemplateMenus()
       mCustomReplyAllActionMenu->insert( action, idx );
       mCustomTemplateActions.append( action );
       ++replyallc;
-      action = new KAction( (*it).replace( "&", "&&" ),
-                            KShortcut::null(),
+      action = new TDEAction( (*it).replace( "&", "&&" ),
+                            TDEShortcut::null(),
                             mCustomForwardMapper,
                             TQT_SLOT( map() ),
                             actionCollection(),
@@ -2642,41 +2642,41 @@ void KMMainWidget::setupActions()
   mMsgActions->setMessageView( mMsgView );
 
   //----- File Menu
-  mSaveAsAction = new KAction( i18n("Save &As..."), "filesave",
-    KStdAccel::shortcut(KStdAccel::Save),
+  mSaveAsAction = new TDEAction( i18n("Save &As..."), "filesave",
+    TDEStdAccel::shortcut(TDEStdAccel::Save),
     TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" );
 
   mOpenAction = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenMsg() ),
                                   actionCollection() );
 
-  (void) new KAction( i18n("&Compact All Folders"), 0,
+  (void) new TDEAction( i18n("&Compact All Folders"), 0,
 		      TQT_TQOBJECT(this), TQT_SLOT(slotCompactAll()),
 		      actionCollection(), "compact_all_folders" );
 
-  (void) new KAction( i18n("&Expire All Folders"), 0,
+  (void) new TDEAction( i18n("&Expire All Folders"), 0,
 		      TQT_TQOBJECT(this), TQT_SLOT(slotExpireAll()),
 		      actionCollection(), "expire_all_folders" );
 
-  (void) new KAction( i18n("&Refresh Local IMAP Cache"), "refresh",
+  (void) new TDEAction( i18n("&Refresh Local IMAP Cache"), "refresh",
 		      TQT_TQOBJECT(this), TQT_SLOT(slotInvalidateIMAPFolders()),
 		      actionCollection(), "file_invalidate_imap_cache" );
 
-  (void) new KAction( i18n("Empty All &Trash Folders"), 0,
+  (void) new TDEAction( i18n("Empty All &Trash Folders"), 0,
 		      KMKernel::self(), TQT_SLOT(slotEmptyTrash()),
 		      actionCollection(), "empty_trash" );
 
-  (void) new KAction( i18n("Check &Mail"), "mail_get", CTRL+Key_L,
+  (void) new TDEAction( i18n("Check &Mail"), "mail_get", CTRL+Key_L,
 		      TQT_TQOBJECT(this), TQT_SLOT(slotCheckMail()),
 		      actionCollection(), "check_mail" );
 
-  mFavoritesCheckMailAction = new KAction( i18n("Check Mail in Favorite Folders"),
+  mFavoritesCheckMailAction = new TDEAction( i18n("Check Mail in Favorite Folders"),
               "mail_get", CTRL+SHIFT+Key_L, 0, 0,
               actionCollection(), "favorite_check_mail" );
   if ( mFavoriteFolderView )
     connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) );
 
-  KActionMenu *actActionMenu = new
-    KActionMenu( i18n("Check Mail &In"), "mail_get", actionCollection(),
+  TDEActionMenu *actActionMenu = new
+    TDEActionMenu( i18n("Check Mail &In"), "mail_get", actionCollection(),
 				   	"check_mail_in" );
   actActionMenu->setDelayed(true); //needed for checking "all accounts"
 
@@ -2686,14 +2686,14 @@ void KMMainWidget::setupActions()
   connect(mActMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotCheckOneAccount(int)));
   connect(mActMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getAccountMenu()));
 
-  (void) new KAction( i18n("&Send Queued Messages"), "mail_send", 0, TQT_TQOBJECT(this),
+  (void) new TDEAction( i18n("&Send Queued Messages"), "mail_send", 0, TQT_TQOBJECT(this),
 		     TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued");
 
-  (void) new KAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this),
+  (void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this),
                      TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status");
 
-  KActionMenu *sendActionMenu = new
-    KActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(),
+  TDEActionMenu *sendActionMenu = new
+    TDEActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(),
                                        "send_queued_via" );
   sendActionMenu->setDelayed(true);
 
@@ -2701,153 +2701,153 @@ void KMMainWidget::setupActions()
   connect(mSendMenu,TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendQueuedVia(int)));
   connect(mSendMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getTransportMenu()));
 
-  KAction *act;
+  TDEAction *act;
   //----- Tools menu
   if (parent()->inherits("KMMainWin")) {
-    act =  new KAction( i18n("&Address Book..."), "contents", 0, TQT_TQOBJECT(this),
+    act =  new TDEAction( i18n("&Address Book..."), "contents", 0, TQT_TQOBJECT(this),
 			TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" );
     if (TDEStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false);
   }
 
-  act = new KAction( i18n("Certificate Manager..."), "pgp-keys", 0, TQT_TQOBJECT(this),
+  act = new TDEAction( i18n("Certificate Manager..."), "pgp-keys", 0, TQT_TQOBJECT(this),
 		     TQT_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman");
   // disable action if no certman binary is around
   if (TDEStandardDirs::findExe("kleopatra").isEmpty()) act->setEnabled(false);
 
-  act = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this),
+  act = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this),
 		     TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
   // disable action if no kwatchgnupg binary is around
   if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) act->setEnabled(false);
 
-  act = new KAction( i18n("&Import Messages..."), "fileopen", 0, TQT_TQOBJECT(this),
+  act = new TDEAction( i18n("&Import Messages..."), "fileopen", 0, TQT_TQOBJECT(this),
 		     TQT_SLOT(slotImport()), actionCollection(), "import" );
   if (TDEStandardDirs::findExe("kmailcvt").isEmpty()) act->setEnabled(false);
 
 #if !defined(NDEBUG)
-  (void) new KAction( i18n("&Debug Sieve..."),
+  (void) new TDEAction( i18n("&Debug Sieve..."),
 		      "idea", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugSieve()),
 		      actionCollection(), "tools_debug_sieve" );
 #endif
 
   if ( GlobalSettings::allowOutOfOfficeSettings() ) {
-      (void) new KAction( i18n("Edit \"Out of Office\" Replies..."),
+      (void) new TDEAction( i18n("Edit \"Out of Office\" Replies..."),
               "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditVacation()),
               actionCollection(), "tools_edit_vacation" );
 
   }
 
-  (void) new KAction( i18n("Filter &Log Viewer..."), 0, TQT_TQOBJECT(this),
+  (void) new TDEAction( i18n("Filter &Log Viewer..."), 0, TQT_TQOBJECT(this),
  		      TQT_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" );
 
-  (void) new KAction( i18n("&Anti-Spam Wizard..."), 0, TQT_TQOBJECT(this),
+  (void) new TDEAction( i18n("&Anti-Spam Wizard..."), 0, TQT_TQOBJECT(this),
  		      TQT_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" );
-  (void) new KAction( i18n("&Anti-Virus Wizard..."), 0, TQT_TQOBJECT(this),
+  (void) new TDEAction( i18n("&Anti-Virus Wizard..."), 0, TQT_TQOBJECT(this),
  		      TQT_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" );
 
   //----- Edit Menu
-  mTrashAction = new KAction( KGuiItem( i18n("&Move to Trash"), "edittrash",
+  mTrashAction = new TDEAction( KGuiItem( i18n("&Move to Trash"), "edittrash",
                                        i18n("Move message to trashcan") ),
                              Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashMsg()),
                              actionCollection(), "move_to_trash" );
 
   /* The delete action is nowhere in the gui, by default, so we need to make
-   * sure it is plugged into the KAccel now, since that won't happen on
+   * sure it is plugged into the TDEAccel now, since that won't happen on
    * XMLGui construction or manual ->plug(). This is only a problem when run
    * as a part, though. */
-  mDeleteAction = new KAction( i18n("&Delete"), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
+  mDeleteAction = new TDEAction( i18n("&Delete"), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
                               TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" );
   mDeleteAction->plugAccel( actionCollection()->kaccel() );
 
-  mTrashThreadAction = new KAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash",
+  mTrashThreadAction = new TDEAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash",
                                        i18n("Move thread to trashcan") ),
                              CTRL+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashThread()),
                              actionCollection(), "move_thread_to_trash" );
 
-  mDeleteThreadAction = new KAction( i18n("Delete T&hread"), "editdelete", CTRL+SHIFT+Key_Delete, TQT_TQOBJECT(this),
+  mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "editdelete", CTRL+SHIFT+Key_Delete, TQT_TQOBJECT(this),
                               TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" );
 
 
-  (void) new KAction( i18n("&Find Messages..."), "mail_find", Key_S, TQT_TQOBJECT(this),
+  (void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" );
 
-  mFindInMessageAction = new KAction( i18n("&Find in Message..."), "find", KStdAccel::shortcut(KStdAccel::Find), TQT_TQOBJECT(this),
+  mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "find", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this),
 		      TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" );
 
-  (void) new KAction( i18n("Select &All Messages"), KStdAccel::selectAll(), TQT_TQOBJECT(this),
+  (void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), TQT_TQOBJECT(this),
 		      TQT_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" );
 
   //----- Folder Menu
-  mNewFolderAction = new KAction( i18n("&New Folder..."), "folder_new", 0, TQT_TQOBJECT(mFolderTree),
+  mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder_new", 0, TQT_TQOBJECT(mFolderTree),
 		      TQT_SLOT(addChildFolder()), actionCollection(), "new_folder" );
 
-  mModifyFolderAction = new KAction( i18n("&Properties"), "configure", 0, TQT_TQOBJECT(this),
+  mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotModifyFolder()), actionCollection(), "modify" );
 
-  mFolderMailingListPropertiesAction = new KAction( i18n("&Mailing List Management..."),
+  mFolderMailingListPropertiesAction = new TDEAction( i18n("&Mailing List Management..."),
       /*"folder_mailinglist_properties",*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderMailingListProperties() ),
       actionCollection(), "folder_mailinglist_properties" );
 
-  mFolderShortCutCommandAction = new KAction( i18n("&Assign Shortcut..."), "configure_shortcuts",
+  mFolderShortCutCommandAction = new TDEAction( i18n("&Assign Shortcut..."), "configure_shortcuts",
                       0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderShortcutCommand() ), actionCollection(),
                       "folder_shortcut_command" );
 
 
-  mMarkAllAsReadAction = new KAction( i18n("Mark All Messages as &Read"), "goto", 0, TQT_TQOBJECT(this),
+  mMarkAllAsReadAction = new TDEAction( i18n("Mark All Messages as &Read"), "goto", 0, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" );
 
-  mExpireFolderAction = new KAction(i18n("&Expiration Settings"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpireFolder()),
+  mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpireFolder()),
 				   actionCollection(), "expire");
 
-  mCompactFolderAction = new KAction( i18n("&Compact Folder"), 0, TQT_TQOBJECT(this),
+  mCompactFolderAction = new TDEAction( i18n("&Compact Folder"), 0, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotCompactFolder()), actionCollection(), "compact" );
 
-  mRefreshFolderAction = new KAction( i18n("Check Mail &in This Folder"), "reload",
-                                      KStdAccel::shortcut( KStdAccel::Reload ), TQT_TQOBJECT(this),
+  mRefreshFolderAction = new TDEAction( i18n("Check Mail &in This Folder"), "reload",
+                                      TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this),
                                       TQT_SLOT(slotRefreshFolder()),
                                       actionCollection(), "refresh_folder" );
   mTroubleshootFolderAction = 0; // set in initializeIMAPActions
 
-  mEmptyFolderAction = new KAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, TQT_TQOBJECT(this),
+  mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotEmptyFolder()), actionCollection(), "empty" );
 
-  mRemoveFolderAction = new KAction( "foo" /*set in updateFolderMenu*/, "editdelete", 0, TQT_TQOBJECT(this),
+  mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "editdelete", 0, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" );
 
-  mArchiveFolderAction = new KAction( i18n( "&Archive Folder..." ), "filesave", 0, TQT_TQOBJECT(this),
+  mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "filesave", 0, TQT_TQOBJECT(this),
                                       TQT_SLOT( slotArchiveFolder() ), actionCollection(),
                                       "archive_folder" );
 
-  mPreferHtmlAction = new KToggleAction( i18n("Prefer &HTML to Plain Text"), 0, TQT_TQOBJECT(this),
+  mPreferHtmlAction = new TDEToggleAction( i18n("Prefer &HTML to Plain Text"), 0, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" );
 
-  mPreferHtmlLoadExtAction = new KToggleAction( i18n("Load E&xternal References"), 0, TQT_TQOBJECT(this),
+  mPreferHtmlLoadExtAction = new TDEToggleAction( i18n("Load E&xternal References"), 0, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" );
 
-  mThreadMessagesAction = new KToggleAction( i18n("&Thread Messages"), 0, TQT_TQOBJECT(this),
+  mThreadMessagesAction = new TDEToggleAction( i18n("&Thread Messages"), 0, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" );
 
-  mThreadBySubjectAction = new KToggleAction( i18n("Thread Messages also by &Subject"), 0, TQT_TQOBJECT(this),
+  mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" );
 
-  new KAction( i18n("Copy Folder"), "editcopy", SHIFT+CTRL+Key_C, TQT_TQOBJECT(folderTree()),
+  new TDEAction( i18n("Copy Folder"), "editcopy", SHIFT+CTRL+Key_C, TQT_TQOBJECT(folderTree()),
                TQT_SLOT(copyFolder()), actionCollection(), "copy_folder" );
-  new KAction( i18n("Cut Folder"), "editcut", SHIFT+CTRL+Key_X, TQT_TQOBJECT(folderTree()),
+  new TDEAction( i18n("Cut Folder"), "editcut", SHIFT+CTRL+Key_X, TQT_TQOBJECT(folderTree()),
                TQT_SLOT(cutFolder()), actionCollection(), "cut_folder" );
-  new KAction( i18n("Paste Folder"), "editpaste", SHIFT+CTRL+Key_V, TQT_TQOBJECT(folderTree()),
+  new TDEAction( i18n("Paste Folder"), "editpaste", SHIFT+CTRL+Key_V, TQT_TQOBJECT(folderTree()),
                TQT_SLOT(pasteFolder()), actionCollection(), "paste_folder" );
 
-  new KAction( i18n("Copy Messages"), "editcopy", ALT+CTRL+Key_C, TQT_TQOBJECT(headers()),
+  new TDEAction( i18n("Copy Messages"), "editcopy", ALT+CTRL+Key_C, TQT_TQOBJECT(headers()),
                TQT_SLOT(copyMessages()), actionCollection(), "copy_messages" );
-  new KAction( i18n("Cut Messages"), "editcut", ALT+CTRL+Key_X, TQT_TQOBJECT(headers()),
+  new TDEAction( i18n("Cut Messages"), "editcut", ALT+CTRL+Key_X, TQT_TQOBJECT(headers()),
                TQT_SLOT(cutMessages()), actionCollection(), "cut_messages" );
-  new KAction( i18n("Paste Messages"), "editpaste", ALT+CTRL+Key_V, TQT_TQOBJECT(headers()),
+  new TDEAction( i18n("Paste Messages"), "editpaste", ALT+CTRL+Key_V, TQT_TQOBJECT(headers()),
                TQT_SLOT(pasteMessages()), actionCollection(), "paste_messages" );
 
   //----- Message Menu
-  (void) new KAction( i18n("&New Message..."), "mail_new", KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this),
+  (void) new TDEAction( i18n("&New Message..."), "mail_new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this),
 		      TQT_SLOT(slotCompose()), actionCollection(), "new_message" );
   mTemplateMenu =
-    new KActionMenu( i18n("New Message From &Template"), "filenew",
+    new TDEActionMenu( i18n("New Message From &Template"), "filenew",
                      actionCollection(), "new_from_template" );
   mTemplateMenu->setDelayed( true );
   connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this),
@@ -2855,34 +2855,34 @@ void KMMainWidget::setupActions()
   connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this),
            TQT_SLOT( slotNewFromTemplate(int) ) );
 
-  KAction* newToML = new KAction( i18n("New Message t&o Mailing-List..."), "mail_post_to",
+  TDEAction* newToML = new TDEAction( i18n("New Message t&o Mailing-List..."), "mail_post_to",
                       CTRL+SHIFT+Key_N, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotPostToML()), actionCollection(), "post_message" );
   newToML->plugAccel( actionCollection()->kaccel() );
 
-  mForwardActionMenu = new KActionMenu( i18n("Message->","&Forward"),
+  mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"),
 					"mail_forward", actionCollection(),
 					"message_forward" );
 
-      mForwardInlineAction = new KAction( i18n("&Inline..."),
+      mForwardInlineAction = new TDEAction( i18n("&Inline..."),
                                       "mail_forward", 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotForwardInlineMsg()),
                                       actionCollection(),
                                       "message_forward_inline" );
 
-      mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."),
+      mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
                                         "mail_forward", 0, TQT_TQOBJECT(this),
                                         TQT_SLOT(slotForwardAttachedMsg()),
                                         actionCollection(),
                                         "message_forward_as_attachment" );
 
-      mForwardDigestAction = new KAction( i18n("Message->Forward->","As Di&gest..."),
+      mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
                                       "mail_forward", 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotForwardDigestMsg()),
                                       actionCollection(),
                                       "message_forward_as_digest" );
 
-      mRedirectAction = new KAction( i18n("Message->Forward->","&Redirect..."),
+      mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
                                  "mail_forward", Key_E, TQT_TQOBJECT(this),
                                  TQT_SLOT(slotRedirectMsg()),
                                  actionCollection(),
@@ -2894,222 +2894,222 @@ void KMMainWidget::setupActions()
       mForwardActionMenu->insert( mForwardDigestAction );
       mForwardActionMenu->insert( mRedirectAction );
 
-  mSendAgainAction = new KAction( i18n("Send A&gain..."), 0, TQT_TQOBJECT(this),
+  mSendAgainAction = new TDEAction( i18n("Send A&gain..."), 0, TQT_TQOBJECT(this),
 		      TQT_SLOT(slotResendMsg()), actionCollection(), "send_again" );
 
 
   //----- Create filter actions
-  mFilterMenu = new KActionMenu( i18n("&Create Filter"), "filter", actionCollection(), "create_filter" );
+  mFilterMenu = new TDEActionMenu( i18n("&Create Filter"), "filter", actionCollection(), "create_filter" );
   connect( mFilterMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this),
 	   TQT_SLOT(slotFilter()) );
-  mSubjectFilterAction = new KAction( i18n("Filter on &Subject..."), 0, TQT_TQOBJECT(this),
+  mSubjectFilterAction = new TDEAction( i18n("Filter on &Subject..."), 0, TQT_TQOBJECT(this),
 				      TQT_SLOT(slotSubjectFilter()),
 				      actionCollection(), "subject_filter");
   mFilterMenu->insert( mSubjectFilterAction );
 
-  mFromFilterAction = new KAction( i18n("Filter on &From..."), 0, TQT_TQOBJECT(this),
+  mFromFilterAction = new TDEAction( i18n("Filter on &From..."), 0, TQT_TQOBJECT(this),
 				   TQT_SLOT(slotFromFilter()),
 				   actionCollection(), "from_filter");
   mFilterMenu->insert( mFromFilterAction );
 
-  mToFilterAction = new KAction( i18n("Filter on &To..."), 0, TQT_TQOBJECT(this),
+  mToFilterAction = new TDEAction( i18n("Filter on &To..."), 0, TQT_TQOBJECT(this),
 				 TQT_SLOT(slotToFilter()),
 				 actionCollection(), "to_filter");
   mFilterMenu->insert( mToFilterAction );
 
-  mListFilterAction = new KAction( i18n("Filter on Mailing-&List..."), 0, TQT_TQOBJECT(this),
+  mListFilterAction = new TDEAction( i18n("Filter on Mailing-&List..."), 0, TQT_TQOBJECT(this),
                                    TQT_SLOT(slotMailingListFilter()), actionCollection(),
                                    "mlist_filter");
   mFilterMenu->insert( mListFilterAction );
 
   mPrintAction = KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), actionCollection());
 
-  mUseAction = new KAction( i18n("New Message From &Template"), "filenew",
+  mUseAction = new TDEAction( i18n("New Message From &Template"), "filenew",
                             Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotUseTemplate() ),
                             actionCollection(), "use_template" );
   mUseAction->plugAccel( actionCollection()->kaccel() );
 
   //----- "Mark Thread" submenu
-  mThreadStatusMenu = new KActionMenu ( i18n( "Mark &Thread" ),
+  mThreadStatusMenu = new TDEActionMenu ( i18n( "Mark &Thread" ),
                                        actionCollection(), "thread_status" );
 
-  mMarkThreadAsReadAction = new KAction(KGuiItem(i18n("Mark Thread as &Read"), "kmmsgread",
+  mMarkThreadAsReadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Read"), "kmmsgread",
                                                 i18n("Mark all messages in the selected thread as read")),
                                                 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusRead()),
                                                 actionCollection(), "thread_read");
   mThreadStatusMenu->insert( mMarkThreadAsReadAction );
 
-  mMarkThreadAsNewAction = new KAction(KGuiItem(i18n("Mark Thread as &New"), "kmmsgnew",
+  mMarkThreadAsNewAction = new TDEAction(KGuiItem(i18n("Mark Thread as &New"), "kmmsgnew",
                                                i18n("Mark all messages in the selected thread as new")),
                                                0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusNew()),
                                                actionCollection(), "thread_new");
   mThreadStatusMenu->insert( mMarkThreadAsNewAction );
 
-  mMarkThreadAsUnreadAction = new KAction(KGuiItem(i18n("Mark Thread as &Unread"), "kmmsgunseen",
+  mMarkThreadAsUnreadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Unread"), "kmmsgunseen",
                                                 i18n("Mark all messages in the selected thread as unread")),
                                                 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusUnread()),
                                                 actionCollection(), "thread_unread");
   mThreadStatusMenu->insert( mMarkThreadAsUnreadAction );
 
-  mThreadStatusMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) );
+  mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
 
   //----- "Mark Thread" toggle actions
-  mToggleThreadFlagAction = new KToggleAction(i18n("Mark Thread as &Important"), "mail_flag",
+  mToggleThreadFlagAction = new TDEToggleAction(i18n("Mark Thread as &Important"), "mail_flag",
                                        0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusFlag()),
                                        actionCollection(), "thread_flag");
   mToggleThreadFlagAction->setCheckedState( i18n("Remove &Important Thread Mark") );
   mThreadStatusMenu->insert( mToggleThreadFlagAction );
 
-  mToggleThreadTodoAction = new KToggleAction(i18n("Mark Thread as &Action Item"), "mail_todo",
+  mToggleThreadTodoAction = new TDEToggleAction(i18n("Mark Thread as &Action Item"), "mail_todo",
                                        0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusTodo()),
                                        actionCollection(), "thread_todo");
   mToggleThreadTodoAction->setCheckedState( i18n("Remove &Action Item Thread Mark") );
   mThreadStatusMenu->insert( mToggleThreadTodoAction );
 
   //------- "Watch and ignore thread" actions
-  mWatchThreadAction = new KToggleAction(i18n("&Watch Thread"), "kmmsgwatched",
+  mWatchThreadAction = new TDEToggleAction(i18n("&Watch Thread"), "kmmsgwatched",
                                        0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusWatched()),
                                        actionCollection(), "thread_watched");
 
-  mIgnoreThreadAction = new KToggleAction(i18n("&Ignore Thread"), "mail_ignore",
+  mIgnoreThreadAction = new TDEToggleAction(i18n("&Ignore Thread"), "mail_ignore",
                                        0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusIgnored()),
                                        actionCollection(), "thread_ignored");
 
-  mThreadStatusMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) );
+  mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
   mThreadStatusMenu->insert( mWatchThreadAction );
   mThreadStatusMenu->insert( mIgnoreThreadAction );
 
-  mSaveAttachmentsAction = new KAction( i18n("Save A&ttachments..."), "attach",
+  mSaveAttachmentsAction = new TDEAction( i18n("Save A&ttachments..."), "attach",
                                 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()),
                                 actionCollection(), "file_save_attachments" );
 
-  mMoveActionMenu = new KActionMenu( i18n("&Move To" ),
+  mMoveActionMenu = new TDEActionMenu( i18n("&Move To" ),
                                     actionCollection(), "move_to" );
 
-  mCopyActionMenu = new KActionMenu( i18n("&Copy To" ),
+  mCopyActionMenu = new TDEActionMenu( i18n("&Copy To" ),
                                     actionCollection(), "copy_to" );
 
-  mApplyAllFiltersAction = new KAction( i18n("Appl&y All Filters"), "filter",
+  mApplyAllFiltersAction = new TDEAction( i18n("Appl&y All Filters"), "filter",
 				    CTRL+Key_J, TQT_TQOBJECT(this),
 				    TQT_SLOT(slotApplyFilters()),
 				    actionCollection(), "apply_filters" );
 
-  mApplyFilterActionsMenu = new KActionMenu( i18n("A&pply Filter" ),
+  mApplyFilterActionsMenu = new TDEActionMenu( i18n("A&pply Filter" ),
 					    actionCollection(),
 					    "apply_filter_actions" );
 
   //----- View Menu
   // Unread Submenu
-  KActionMenu * unreadMenu =
-    new KActionMenu( i18n("View->", "&Unread Count"),
+  TDEActionMenu * unreadMenu =
+    new TDEActionMenu( i18n("View->", "&Unread Count"),
 		     actionCollection(), "view_unread" );
   unreadMenu->setToolTip( i18n("Choose how to display the count of unread messages") );
 
-  mUnreadColumnToggle = new KRadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, TQT_TQOBJECT(this),
+  mUnreadColumnToggle = new TDERadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, TQT_TQOBJECT(this),
 			       TQT_SLOT(slotToggleUnread()),
 			       actionCollection(), "view_unread_column" );
   mUnreadColumnToggle->setExclusiveGroup( "view_unread_group" );
   unreadMenu->insert( mUnreadColumnToggle );
 
-  mUnreadTextToggle = new KRadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, TQT_TQOBJECT(this),
+  mUnreadTextToggle = new TDERadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, TQT_TQOBJECT(this),
 			       TQT_SLOT(slotToggleUnread()),
 			       actionCollection(), "view_unread_text" );
   mUnreadTextToggle->setExclusiveGroup( "view_unread_group" );
   unreadMenu->insert( mUnreadTextToggle );
 
   // toggle for total column
-  mTotalColumnToggle = new KToggleAction( i18n("View->", "&Total Column"), 0, TQT_TQOBJECT(this),
+  mTotalColumnToggle = new TDEToggleAction( i18n("View->", "&Total Column"), 0, TQT_TQOBJECT(this),
 			       TQT_SLOT(slotToggleTotalColumn()),
 			       actionCollection(), "view_columns_total" );
   mTotalColumnToggle->setToolTip( i18n("Toggle display of column showing the "
                                       "total number of messages in folders.") );
-  mSizeColumnToggle = new KToggleAction( i18n("View->", "&Size Column"), 0, TQT_TQOBJECT(this),
+  mSizeColumnToggle = new TDEToggleAction( i18n("View->", "&Size Column"), 0, TQT_TQOBJECT(this),
 			       TQT_SLOT(slotToggleSizeColumn()),
 			       actionCollection(), "view_columns_size" );
   mSizeColumnToggle->setToolTip( i18n("Toggle display of column showing the "
                                       "total size of messages in folders.") );
 
-  (void)new KAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(),
+  (void)new TDEAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(),
 			       i18n("Expand the current thread") ),
 		     Key_Period, TQT_TQOBJECT(this),
 		     TQT_SLOT(slotExpandThread()),
 		     actionCollection(), "expand_thread" );
 
-  (void)new KAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(),
+  (void)new TDEAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(),
 			       i18n("Collapse the current thread") ),
 		     Key_Comma, TQT_TQOBJECT(this),
 		     TQT_SLOT(slotCollapseThread()),
 		     actionCollection(), "collapse_thread" );
 
-  (void)new KAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString(),
+  (void)new TDEAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString(),
 			       i18n("Expand all threads in the current folder") ),
 		     CTRL+Key_Period, TQT_TQOBJECT(this),
 		     TQT_SLOT(slotExpandAllThreads()),
 		     actionCollection(), "expand_all_threads" );
 
-  (void)new KAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString(),
+  (void)new TDEAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString(),
 			       i18n("Collapse all threads in the current folder") ),
 		     CTRL+Key_Comma, TQT_TQOBJECT(this),
 		     TQT_SLOT(slotCollapseAllThreads()),
 		     actionCollection(), "collapse_all_threads" );
 
-  mViewSourceAction = new KAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this),
+  mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this),
                                    TQT_SLOT(slotShowMsgSrc()), actionCollection(),
                                    "view_source" );
 
-  KAction* dukeOfMonmoth = new KAction( i18n("&Display Message"), Key_Return, TQT_TQOBJECT(this),
+  TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, TQT_TQOBJECT(this),
                         TQT_SLOT( slotDisplayCurrentMessage() ), actionCollection(),
                         "display_message" );
   dukeOfMonmoth->plugAccel( actionCollection()->kaccel() );
 
   //----- Go Menu
-  new KAction( KGuiItem( i18n("&Next Message"), TQString(),
+  new TDEAction( KGuiItem( i18n("&Next Message"), TQString(),
                          i18n("Go to the next message") ),
                          "N;Right", TQT_TQOBJECT(this), TQT_SLOT(slotNextMessage()),
                          actionCollection(), "go_next_message" );
 
-  new KAction( KGuiItem( i18n("Next &Unread Message"),
+  new TDEAction( KGuiItem( i18n("Next &Unread Message"),
                          TQApplication::reverseLayout() ? "previous" : "next",
                          i18n("Go to the next unread message") ),
                          Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadMessage()),
                          actionCollection(), "go_next_unread_message" );
 
   /* ### needs better support from folders:
-  new KAction( KGuiItem( i18n("Next &Important Message"), TQString(),
+  new TDEAction( KGuiItem( i18n("Next &Important Message"), TQString(),
                          i18n("Go to the next important message") ),
                          0, TQT_TQOBJECT(this), TQT_SLOT(slotNextImportantMessage()),
                          actionCollection(), "go_next_important_message" );
   */
 
-  new KAction( KGuiItem( i18n("&Previous Message"), TQString(),
+  new TDEAction( KGuiItem( i18n("&Previous Message"), TQString(),
                          i18n("Go to the previous message") ),
                          "P;Left", TQT_TQOBJECT(this), TQT_SLOT(slotPrevMessage()),
                          actionCollection(), "go_prev_message" );
 
-  new KAction( KGuiItem( i18n("Previous Unread &Message"),
+  new TDEAction( KGuiItem( i18n("Previous Unread &Message"),
                          TQApplication::reverseLayout() ? "next" : "previous",
                          i18n("Go to the previous unread message") ),
                          Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadMessage()),
                          actionCollection(), "go_prev_unread_message" );
 
   /* needs better support from folders:
-  new KAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(),
+  new TDEAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(),
                          i18n("Go to the previous important message") ),
                          0, TQT_TQOBJECT(this), TQT_SLOT(slotPrevImportantMessage()),
                          actionCollection(), "go_prev_important_message" );
   */
 
-  KAction *action =
-    new KAction( KGuiItem( i18n("Next Unread &Folder"), TQString(),
+  TDEAction *action =
+    new TDEAction( KGuiItem( i18n("Next Unread &Folder"), TQString(),
                            i18n("Go to the next folder with unread messages") ),
                            ALT+Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadFolder()),
                            actionCollection(), "go_next_unread_folder" );
-  KShortcut shortcut = action->shortcut();
+  TDEShortcut shortcut = action->shortcut();
   shortcut.append( KKey( CTRL+Key_Plus ) );
   action->setShortcut( shortcut );
 
   action =
-    new KAction( KGuiItem( i18n("Previous Unread F&older"), TQString(),
+    new TDEAction( KGuiItem( i18n("Previous Unread F&older"), TQString(),
                            i18n("Go to the previous folder with unread messages") ),
                            ALT+Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadFolder()),
                            actionCollection(), "go_prev_unread_folder" );
@@ -3117,7 +3117,7 @@ void KMMainWidget::setupActions()
   shortcut.append( KKey( CTRL+Key_Minus ) );
   action->setShortcut( shortcut );
 
-  new KAction( KGuiItem( i18n("Go->","Next Unread &Text"), TQString(),
+  new TDEAction( KGuiItem( i18n("Go->","Next Unread &Text"), TQString(),
                          i18n("Go to the next unread text"),
                          i18n("Scroll down current message. "
                               "If at end of current message, "
@@ -3126,33 +3126,33 @@ void KMMainWidget::setupActions()
                          actionCollection(), "go_next_unread_text" );
 
   //----- Settings Menu
-  mToggleShowQuickSearchAction = new KToggleAction(i18n("Show Quick Search"), TQString(),
+  mToggleShowQuickSearchAction = new TDEToggleAction(i18n("Show Quick Search"), TQString(),
                                        0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowQuickSearch()),
                                        actionCollection(), "show_quick_search");
   mToggleShowQuickSearchAction->setChecked( GlobalSettings::self()->quickSearchActive() );
   mToggleShowQuickSearchAction->setWhatsThis(
         i18n( GlobalSettings::self()->quickSearchActiveItem()->whatsThis().utf8() ) );
 
-  (void) new KAction( i18n("Configure &Filters..."), 0, TQT_TQOBJECT(this),
+  (void) new TDEAction( i18n("Configure &Filters..."), 0, TQT_TQOBJECT(this),
  		      TQT_SLOT(slotFilter()), actionCollection(), "filter" );
-  (void) new KAction( i18n("Configure &POP Filters..."), 0, TQT_TQOBJECT(this),
+  (void) new TDEAction( i18n("Configure &POP Filters..."), 0, TQT_TQOBJECT(this),
  		      TQT_SLOT(slotPopFilter()), actionCollection(), "popFilter" );
-  (void) new KAction( i18n("Manage &Sieve Scripts..."), 0, TQT_TQOBJECT(this),
+  (void) new TDEAction( i18n("Manage &Sieve Scripts..."), 0, TQT_TQOBJECT(this),
                       TQT_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" );
 
-  (void) new KAction( KGuiItem( i18n("KMail &Introduction"), 0,
+  (void) new TDEAction( KGuiItem( i18n("KMail &Introduction"), 0,
 				i18n("Display KMail's Welcome Page") ),
 		      0, TQT_TQOBJECT(this), TQT_SLOT(slotIntro()),
 		      actionCollection(), "help_kmail_welcomepage" );
 
   // ----- Standard Actions
 //  KStdAction::configureNotifications(this, TQT_SLOT(slotEditNotifications()), actionCollection());
-  (void) new KAction( i18n("Configure &Notifications..."),
+  (void) new TDEAction( i18n("Configure &Notifications..."),
 		      "knotify", 0, TQT_TQOBJECT(this),
  		      TQT_SLOT(slotEditNotifications()), actionCollection(),
 		      "kmail_configure_notifications" );
 //  KStdAction::preferences(this, TQT_SLOT(slotSettings()), actionCollection());
-  (void) new KAction( i18n("&Configure KMail..."),
+  (void) new TDEAction( i18n("&Configure KMail..."),
 		      "configure", 0, kmkernel,
                       TQT_SLOT(slotShowConfigurationDialog()), actionCollection(),
                       "kmail_configure_kmail" );
@@ -3174,7 +3174,7 @@ void KMMainWidget::setupActions()
 
 void KMMainWidget::setupForwardingActionsList()
 {
-  TQPtrList<KAction> mForwardActionList;
+  TQPtrList<TDEAction> mForwardActionList;
   if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
       mGUIClient->unplugActionList( "forward_action_list" );
       mForwardActionList.append( mForwardInlineAction );
@@ -3704,7 +3704,7 @@ void KMMainWidget::initializeFilterActions()
 {
   TQString filterName, normalizedName;
   KMMetaFilterActionCommand *filterCommand;
-  KAction *filterAction = 0;
+  TDEAction *filterAction = 0;
 
   clearFilterActions();
   mApplyAllFiltersAction->plug(mApplyFilterActionsMenu->popupMenu());
@@ -3722,13 +3722,13 @@ void KMMainWidget::initializeFilterActions()
       TQString icon = (*it)->icon();
       if ( icon.isEmpty() )
         icon = "gear";
-      filterAction = new KAction(as, icon, (*it)->shortcut(), filterCommand,
+      filterAction = new TDEAction(as, icon, (*it)->shortcut(), filterCommand,
                                  TQT_SLOT(start()), actionCollection(),
                                  normalizedName.local8Bit());
       if(!addedSeparator) {
         mApplyFilterActionsMenu->popupMenu()->insertSeparator();
         addedSeparator = !addedSeparator;
-        mFilterMenuActions.append( new KActionSeparator());
+        mFilterMenuActions.append( new TDEActionSeparator());
       }
       filterAction->plug( mApplyFilterActionsMenu->popupMenu() );
       mFilterMenuActions.append(filterAction);
@@ -3768,7 +3768,7 @@ void KMMainWidget::initializeIMAPActions( bool setState /* false the first time,
     factory->removeClient( mGUIClient );
 
   if ( !mTroubleshootFolderAction ) {
-    mTroubleshootFolderAction = new KAction( i18n("&Troubleshoot IMAP Cache..."), "wizard", 0,
+    mTroubleshootFolderAction = new TDEAction( i18n("&Troubleshoot IMAP Cache..."), "wizard", 0,
      TQT_TQOBJECT(this), TQT_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" );
     if ( setState )
       updateFolderMenu(); // set initial state of the action
@@ -3781,10 +3781,10 @@ void KMMainWidget::initializeIMAPActions( bool setState /* false the first time,
     factory->addClient( mGUIClient );
 }
 
-bool KMMainWidget::shortcutIsValid( const KShortcut &sc ) const
+bool KMMainWidget::shortcutIsValid( const TDEShortcut &sc ) const
 {
-  KActionPtrList actions = actionCollection()->actions();
-  KActionPtrList::Iterator it( actions.begin() );
+  TDEActionPtrList actions = actionCollection()->actions();
+  TDEActionPtrList::Iterator it( actions.begin() );
   for ( ; it != actions.end(); it++ ) {
     if ( (*it)->shortcut() == sc ) return false;
   }
@@ -3804,8 +3804,8 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder )
   TQString actionlabel = TQString( "FolderShortcut %1").arg( folder->prettyURL() );
   TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() );
   TQString normalizedName = actionname.replace(" ", "_");
-  KAction* action =
-    new KAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()),
+  TDEAction* action =
+    new TDEAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()),
                 actionCollection(), normalizedName.local8Bit());
   action->setIcon( folder->unreadIconPath() );
   c->setAction( action ); // will be deleted along with the command
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index 959d581dc..67290cf36 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -37,11 +37,11 @@ class TQVBoxLayout;
 class TQSplitter;
 class TQSignalMapper;
 
-class KActionMenu;
-class KActionCollection;
+class TDEActionMenu;
+class TDEActionCollection;
 class TDEConfig;
-class KRadioAction;
-class KToggleAction;
+class TDERadioAction;
+class TDEToggleAction;
 class KMenuBar;
 class KStatusBarLabel;
 
@@ -87,7 +87,7 @@ class KDE_EXPORT KMMainWidget : public TQWidget
 public:
   KMMainWidget(TQWidget *parent, const char *name,
                KXMLGUIClient *aGUIClient,
-               KActionCollection *actionCollection,
+               TDEActionCollection *actionCollection,
          TDEConfig*config = KMKernel::config() );
   virtual ~KMMainWidget();
   void destruct();
@@ -114,40 +114,40 @@ public:
 
   static void cleanup();
 
-  KAction *action( const char *name ) { return mActionCollection->action( name ); }
-  KActionMenu *customReplyAction() const { return mCustomReplyActionMenu; }
-  KActionMenu *customReplyAllAction() const { return mCustomReplyAllActionMenu; }
-  KActionMenu *forwardMenu() const { return mForwardActionMenu; }
-  KAction *forwardInlineAction() const { return mForwardInlineAction; }
-  KAction *forwardAttachedAction() const { return mForwardAttachedAction; }
-  KAction *forwardDigestAction() const { return mForwardDigestAction; }
-  KAction *redirectAction() const { return mRedirectAction; }
-  KActionMenu *customForwardAction() const { return mCustomForwardActionMenu; }
-  KActionMenu *filterMenu() const { return mFilterMenu; }
-  KAction *printAction() const { return mPrintAction; }
-  KAction *trashAction() const { return mTrashAction; }
-  KAction *deleteAction() const { return mDeleteAction; }
-  KAction *trashThreadAction() const { return mTrashThreadAction; }
-  KAction *deleteThreadAction() const { return mDeleteThreadAction; }
-  KAction *saveAsAction() const { return mSaveAsAction; }
-  KAction *editAction() const { return mMsgActions->editAction(); }
-  KAction *useAction() const { return mUseAction; }
-  KAction *sendAgainAction() const { return mSendAgainAction; }
-  KAction *applyAllFiltersAction() const { return mApplyAllFiltersAction; }
-  KAction *findInMessageAction() const { return mFindInMessageAction; }
-  KAction *saveAttachmentsAction() const { return mSaveAttachmentsAction; }
-  KAction *openAction() const { return mOpenAction; }
-  KAction *viewSourceAction() const { return mViewSourceAction; }
+  TDEAction *action( const char *name ) { return mActionCollection->action( name ); }
+  TDEActionMenu *customReplyAction() const { return mCustomReplyActionMenu; }
+  TDEActionMenu *customReplyAllAction() const { return mCustomReplyAllActionMenu; }
+  TDEActionMenu *forwardMenu() const { return mForwardActionMenu; }
+  TDEAction *forwardInlineAction() const { return mForwardInlineAction; }
+  TDEAction *forwardAttachedAction() const { return mForwardAttachedAction; }
+  TDEAction *forwardDigestAction() const { return mForwardDigestAction; }
+  TDEAction *redirectAction() const { return mRedirectAction; }
+  TDEActionMenu *customForwardAction() const { return mCustomForwardActionMenu; }
+  TDEActionMenu *filterMenu() const { return mFilterMenu; }
+  TDEAction *printAction() const { return mPrintAction; }
+  TDEAction *trashAction() const { return mTrashAction; }
+  TDEAction *deleteAction() const { return mDeleteAction; }
+  TDEAction *trashThreadAction() const { return mTrashThreadAction; }
+  TDEAction *deleteThreadAction() const { return mDeleteThreadAction; }
+  TDEAction *saveAsAction() const { return mSaveAsAction; }
+  TDEAction *editAction() const { return mMsgActions->editAction(); }
+  TDEAction *useAction() const { return mUseAction; }
+  TDEAction *sendAgainAction() const { return mSendAgainAction; }
+  TDEAction *applyAllFiltersAction() const { return mApplyAllFiltersAction; }
+  TDEAction *findInMessageAction() const { return mFindInMessageAction; }
+  TDEAction *saveAttachmentsAction() const { return mSaveAttachmentsAction; }
+  TDEAction *openAction() const { return mOpenAction; }
+  TDEAction *viewSourceAction() const { return mViewSourceAction; }
   KMail::MessageActions *messageActions() const { return mMsgActions; }
 
-  KActionMenu *statusMenu()  const{ return mMsgActions->messageStatusMenu(); }
-  KActionMenu *threadStatusMenu() const { return mThreadStatusMenu; }
-  KActionMenu *moveActionMenu() const{ return mMoveActionMenu; }
-  KActionMenu *mopyActionMenu() const { return mCopyActionMenu; }
-  KActionMenu *applyFilterActionsMenu() const { return mApplyFilterActionsMenu; }
+  TDEActionMenu *statusMenu()  const{ return mMsgActions->messageStatusMenu(); }
+  TDEActionMenu *threadStatusMenu() const { return mThreadStatusMenu; }
+  TDEActionMenu *moveActionMenu() const{ return mMoveActionMenu; }
+  TDEActionMenu *mopyActionMenu() const { return mCopyActionMenu; }
+  TDEActionMenu *applyFilterActionsMenu() const { return mApplyFilterActionsMenu; }
 
-  KToggleAction *watchThreadAction() const { return mWatchThreadAction; }
-  KToggleAction *ignoreThreadAction() const { return mIgnoreThreadAction; }
+  TDEToggleAction *watchThreadAction() const { return mWatchThreadAction; }
+  TDEToggleAction *ignoreThreadAction() const { return mIgnoreThreadAction; }
 
   KMHeaders *headers() const { return mHeaders; }
   void toggleSystemTray();
@@ -162,7 +162,7 @@ public:
 
   /** Checks a shortcut against the actioncollection and returns whether it
    * is already used and therefor not valid or not. */
-  bool shortcutIsValid( const KShortcut& ) const;
+  bool shortcutIsValid( const TDEShortcut& ) const;
 
 
   void modifyFolder( KMFolderTreeItem* folderItem );
@@ -260,7 +260,7 @@ protected:
   void updateFileMenu();
   void newFromTemplate( KMMessage *msg );
 
-  KActionCollection * actionCollection() const { return mActionCollection; }
+  TDEActionCollection * actionCollection() const { return mActionCollection; }
 
   /** @return the correct config dialog depending on whether the parent of the mainWidget
    *          is a KPart or a KMMainWindow. When dealing with geometries, use this pointer
@@ -451,25 +451,25 @@ private slots:
 
 private:
   // Message actions
-  KAction *mTrashAction, *mDeleteAction, *mTrashThreadAction,
+  TDEAction *mTrashAction, *mDeleteAction, *mTrashThreadAction,
     *mDeleteThreadAction, *mSaveAsAction, *mUseAction,
     *mSendAgainAction, *mApplyAllFiltersAction, *mFindInMessageAction,
     *mSaveAttachmentsAction, *mOpenAction, *mViewSourceAction,
     *mFavoritesCheckMailAction,
     *mMoveMsgToFolderAction;
   // Composition actions
-  KAction *mPrintAction,
+  TDEAction *mPrintAction,
     *mForwardInlineAction, *mForwardAttachedAction, *mForwardDigestAction,
     *mRedirectAction;
-  KActionMenu *mForwardActionMenu;
+  TDEActionMenu *mForwardActionMenu;
   // Filter actions
-  KActionMenu *mFilterMenu;
-  KAction *mSubjectFilterAction, *mFromFilterAction, *mToFilterAction,
+  TDEActionMenu *mFilterMenu;
+  TDEAction *mSubjectFilterAction, *mFromFilterAction, *mToFilterAction,
       *mListFilterAction;
-  KActionMenu *mTemplateMenu;
+  TDEActionMenu *mTemplateMenu;
 
   // Custom template actions menu
-  KActionMenu *mCustomReplyActionMenu,
+  TDEActionMenu *mCustomReplyActionMenu,
               *mCustomReplyAllActionMenu,
               *mCustomForwardActionMenu;
   // Signal mappers for custom template actions
@@ -477,23 +477,23 @@ private:
                 *mCustomReplyAllMapper,
                 *mCustomForwardMapper;
 
-  KActionMenu *mThreadStatusMenu,
+  TDEActionMenu *mThreadStatusMenu,
     *mMoveActionMenu, *mCopyActionMenu, *mApplyFilterActionsMenu;
-  KAction *mMarkThreadAsNewAction;
-  KAction *mMarkThreadAsReadAction;
-  KAction *mMarkThreadAsUnreadAction;
-  KToggleAction *mToggleThreadTodoAction;
-  KToggleAction *mToggleThreadFlagAction;
+  TDEAction *mMarkThreadAsNewAction;
+  TDEAction *mMarkThreadAsReadAction;
+  TDEAction *mMarkThreadAsUnreadAction;
+  TDEToggleAction *mToggleThreadTodoAction;
+  TDEToggleAction *mToggleThreadFlagAction;
 
-  KToggleAction *mWatchThreadAction, *mIgnoreThreadAction;
+  TDEToggleAction *mWatchThreadAction, *mIgnoreThreadAction;
 
-  /** we need to access those KToggleActions from the foldertree-popup */
-  KRadioAction* mUnreadColumnToggle;
-  KRadioAction* mUnreadTextToggle;
-  KToggleAction* mTotalColumnToggle;
-  KToggleAction* mSizeColumnToggle;
+  /** we need to access those TDEToggleActions from the foldertree-popup */
+  TDERadioAction* mUnreadColumnToggle;
+  TDERadioAction* mUnreadTextToggle;
+  TDEToggleAction* mTotalColumnToggle;
+  TDEToggleAction* mSizeColumnToggle;
 
-  KToggleAction *mToggleShowQuickSearchAction;
+  TDEToggleAction *mToggleShowQuickSearchAction;
 
   KMFolderTree *mFolderTree;
   KMail::FavoriteFolderView *mFavoriteFolderView;
@@ -504,12 +504,12 @@ private:
   TQSplitter    *mFolderViewSplitter;
   KMHeaders    *mHeaders;
   TQVBox        *mSearchAndHeaders;
-  KToolBar     *mSearchToolBar;
+  TDEToolBar     *mSearchToolBar;
   KMail::HeaderListQuickSearch *mQuickSearchLine;
   TQGuardedPtr<KMFolder> mFolder;
   KMFolder     *mTemplateFolder;
   TQPopupMenu   *mViewMenu, *mBodyPartsMenu;
-  KAction       *mlistFilterAction;
+  TDEAction       *mlistFilterAction;
   bool		mIntegrated;
   bool          mBeepOnNew;
   bool          mConfirmEmpty;
@@ -534,14 +534,14 @@ private:
 //  TQPopupMenu *mMessageMenu;
   KMail::SearchWindow *mSearchWin;
 
-  KAction *mNewFolderAction, *mModifyFolderAction, *mRemoveFolderAction, *mExpireFolderAction,
+  TDEAction *mNewFolderAction, *mModifyFolderAction, *mRemoveFolderAction, *mExpireFolderAction,
       *mCompactFolderAction, *mRefreshFolderAction, *mEmptyFolderAction,
       *mMarkAllAsReadAction, *mFolderMailingListPropertiesAction,
       *mFolderShortCutCommandAction, *mTroubleshootFolderAction,
       *mRemoveDuplicatesAction, *mArchiveFolderAction;
-  KToggleAction *mPreferHtmlAction, *mPreferHtmlLoadExtAction, *mThreadMessagesAction;
-  KToggleAction *mThreadBySubjectAction;
-  KToggleAction *mFolderAction, *mHeaderAction, *mMimeAction;
+  TDEToggleAction *mPreferHtmlAction, *mPreferHtmlLoadExtAction, *mThreadMessagesAction;
+  TDEToggleAction *mThreadBySubjectAction;
+  TDEToggleAction *mFolderAction, *mHeaderAction, *mMimeAction;
 
   TQTimer *menutimer;
   TQTimer *mShowBusySplashTimer;
@@ -550,18 +550,18 @@ private:
 #if !defined(NDEBUG)
   TQGuardedPtr<KMail::SieveDebugDialog> mSieveDebugDialog;
 #endif
-  KActionCollection *mActionCollection;
-  KActionSeparator  *mToolbarActionSeparator;
+  TDEActionCollection *mActionCollection;
+  TDEActionSeparator  *mToolbarActionSeparator;
   TQVBoxLayout *mTopLayout;
   bool mDestructed, mForceJumpToUnread, mShowingOfflineScreen;
-  TQPtrList<KAction> mFilterMenuActions;
-  TQPtrList<KAction> mFilterTBarActions;
+  TQPtrList<TDEAction> mFilterMenuActions;
+  TQPtrList<TDEAction> mFilterTBarActions;
   TQPtrList<KMMetaFilterActionCommand> mFilterCommands;
   TQDict<FolderShortcutCommand> mFolderShortcutCommands;
   TQGuardedPtr <KMail::FolderJob> mJob;
 
   TQValueVector<TQString> mCustomTemplates;
-  TQPtrList<KAction> mCustomTemplateActions;
+  TQPtrList<TDEAction> mCustomTemplateActions;
 
   KMSystemTray  *mSystemTray;
   TDEConfig *mConfig;
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index ee7858017..9f6f497aa 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -26,7 +26,7 @@
 #include "kmmainwin.moc"
 
 KMMainWin::KMMainWin(TQWidget *)
-    : KMainWindow( 0, "kmail-mainwindow#" ),
+    : TDEMainWindow( 0, "kmail-mainwindow#" ),
       mReallyClose( false )
 {
   // Set this to be the group leader for all subdialogs - this means
@@ -35,7 +35,7 @@ KMMainWin::KMMainWin(TQWidget *)
 
   kapp->ref();
 
-  (void) new KAction( i18n("New &Window"), "window_new", 0,
+  (void) new TDEAction( i18n("New &Window"), "window_new", 0,
 		      TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()),
 		      actionCollection(), "new_mail_client" );
 
@@ -91,7 +91,7 @@ KMMainWin::~KMMainWin()
   if ( !kmkernel->haveSystemTrayApplet() ) {
     // Check if this was the last KMMainWin
     int not_withdrawn = 0;
-    TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList);
+    TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList);
     for (it.toFirst(); it.current(); ++it){
       if ( !it.current()->isHidden() &&
            it.current()->isTopLevel() &&
diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h
index aa5452441..ae930b55f 100644
--- a/kmail/kmmainwin.h
+++ b/kmail/kmmainwin.h
@@ -32,7 +32,7 @@ namespace KPIM {
 using KPIM::StatusbarProgressWidget;
 using KPIM::ProgressDialog;
 
-class KMMainWin : public KMainWindow
+class KMMainWin : public TDEMainWindow
 {
   Q_OBJECT
   
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 484568249..3b17b16dd 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -57,7 +57,7 @@
 KMMimePartTree::KMMimePartTree( KMReaderWin* readerWin,
                                 TQWidget* parent,
                                 const char* name )
-    : KListView(  parent, name ),
+    : TDEListView(  parent, name ),
       mReaderWin( readerWin ), mSizeColumn(0)
 {
     setStyleDependantFrameWidth();
@@ -228,7 +228,7 @@ void KMMimePartTree::setStyleDependantFrameWidth()
 void KMMimePartTree::styleChange( TQStyle& oldStyle )
 {
   setStyleDependantFrameWidth();
-  KListView::styleChange( oldStyle );
+  TDEListView::styleChange( oldStyle );
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h
index 606c515f6..182f2689a 100644
--- a/kmail/kmmimeparttree.h
+++ b/kmail/kmmimeparttree.h
@@ -44,7 +44,7 @@ class partNode;
 class KMReaderWin;
 class KMMimePartTreeItem;
 
-class KMMimePartTree : public KListView
+class KMMimePartTree : public TDEListView
 {
   Q_OBJECT
   
diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp
index fa9faafb0..e07c77081 100644
--- a/kmail/kmpopfiltercnfrmdlg.cpp
+++ b/kmail/kmpopfiltercnfrmdlg.cpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////
 ///  view
 KMPopHeadersView::KMPopHeadersView(TQWidget *aParent, KMPopFilterCnfrmDlg *aDialog)
-      : KListView(aParent)
+      : TDEListView(aParent)
 {
   mDialog=aDialog;
   int mDownIndex=addColumn(TQIconSet(TQPixmap(mDown)), TQString(), 24);
@@ -233,7 +233,7 @@ const char *KMPopHeadersView::mDel[19] = {
 /////////////////////////////////////////
 /////////////////////////////////////////
 KMPopHeadersViewItem::KMPopHeadersViewItem(KMPopHeadersView *aParent, KMPopFilterAction aAction)
-      : KListViewItem(aParent)
+      : TDEListViewItem(aParent)
 {
   mParent = aParent;
   mAction = NoAction;
diff --git a/kmail/kmpopfiltercnfrmdlg.h b/kmail/kmpopfiltercnfrmdlg.h
index 98a277e58..1bb3c9466 100644
--- a/kmail/kmpopfiltercnfrmdlg.h
+++ b/kmail/kmpopfiltercnfrmdlg.h
@@ -33,7 +33,7 @@ class KMPopFilterCnfrmDlg;
 /**
   * @author Heiko Hund
   */
-class KMPopHeadersView : public KListView
+class KMPopHeadersView : public TDEListView
 {
   Q_OBJECT
   
@@ -60,7 +60,7 @@ private:
 
 
 
-class KMPopHeadersViewItem : public KListViewItem
+class KMPopHeadersViewItem : public TDEListViewItem
 {
 public:
   KMPopHeadersViewItem(KMPopHeadersView *aParent, KMPopFilterAction aAction);
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index 92ab049ca..8cef9ce36 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -16,7 +16,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 //
-// A toplevel KMainWindow derived class for displaying
+// A toplevel TDEMainWindow derived class for displaying
 // single messages or single message parts.
 //
 // Could be extended to include support for normal main window
@@ -109,7 +109,7 @@ void KMReaderMainWin::initKMReaderMainWin() {
 
 void KMReaderMainWin::setupForwardingActionsList()
 {
-  TQPtrList<KAction> mForwardActionList;
+  TQPtrList<TDEAction> mForwardActionList;
   if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
       unplugActionList( "forward_action_list" );
       mForwardActionList.append( mForwardInlineAction );
@@ -343,19 +343,19 @@ void KMReaderMainWin::setupAccel()
   //mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ),
   //                                actionCollection() );
 
-  //mSaveAsAction = new KAction( i18n("Save &As..."), "filesave",
-  //                             KStdAccel::shortcut( KStdAccel::Save ),
+  //mSaveAsAction = new TDEAction( i18n("Save &As..."), "filesave",
+  //                             TDEStdAccel::shortcut( TDEStdAccel::Save ),
   //                             this, TQT_SLOT( slotSaveMsg() ),
   //                             actionCollection(), "file_save_as" );
 
   mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(mReaderWin), TQT_SLOT( slotSaveMsg() ),
 				      actionCollection() );
-  mSaveAsAction->setShortcut( KStdAccel::shortcut( KStdAccel::Save ) );
+  mSaveAsAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Save ) );
   mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrintMsg() ),
                                     actionCollection() );
 
-  KAction *closeAction = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
-  KShortcut closeShortcut = closeAction->shortcut();
+  TDEAction *closeAction = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+  TDEShortcut closeShortcut = closeAction->shortcut();
   closeShortcut.append( KKey(Key_Escape));
   closeAction->setShortcut(closeShortcut);
 
@@ -364,39 +364,39 @@ void KMReaderMainWin::setupAccel()
   KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotMarkAll() ), actionCollection() );
   KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection() );
   KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), actionCollection() );
-  mTrashAction = new KAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash",
+  mTrashAction = new TDEAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash",
                               i18n( "Move message to trashcan" ) ),
                               Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotTrashMsg() ),
                               actionCollection(), "move_to_trash" );
 
   //----- View Menu
-  mViewSourceAction = new KAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this),
+  mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this),
                                    TQT_SLOT(slotShowMsgSrc()), actionCollection(),
                                    "view_source" );
 
 
-  mForwardActionMenu = new KActionMenu( i18n("Message->","&Forward"),
+  mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"),
 					"mail_forward", actionCollection(),
 					"message_forward" );
-      mForwardInlineAction = new KAction( i18n("&Inline..."),
+      mForwardInlineAction = new TDEAction( i18n("&Inline..."),
                                       "mail_forward", SHIFT+Key_F, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotForwardInlineMsg()),
                                       actionCollection(),
                                       "message_forward_inline" );
 
-      mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."),
+      mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
                                         "mail_forward", Key_F, TQT_TQOBJECT(this),
                                         TQT_SLOT(slotForwardAttachedMsg()),
                                         actionCollection(),
                                         "message_forward_as_attachment" );
 
-      mForwardDigestAction = new KAction( i18n("Message->Forward->","As Di&gest..."),
+      mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
                                       "mail_forward", 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotForwardDigestMsg()),
                                       actionCollection(),
                                       "message_forward_as_digest" );
 
-      mRedirectAction = new KAction( i18n("Message->Forward->","&Redirect..."),
+      mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
                                  "mail_forward", Key_E, TQT_TQOBJECT(this),
                                  TQT_SLOT(slotRedirectMsg()),
                                  actionCollection(),
@@ -407,12 +407,12 @@ void KMReaderMainWin::setupAccel()
   mForwardActionMenu->insert( mForwardDigestAction );
   mForwardActionMenu->insert( mRedirectAction );
 
-  fontAction = new KFontAction( "Select Font", 0, actionCollection(),
+  fontAction = new TDEFontAction( "Select Font", 0, actionCollection(),
                                "text_font" );
   fontAction->setFont( mReaderWin->cssHelper()->bodyFont().family() );
   connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ),
            TQT_SLOT( slotFontAction( const TQString& ) ) );
-  fontSizeAction = new KFontSizeAction( "Select Size", 0, actionCollection(),
+  fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(),
                                        "text_size" );
   fontSizeAction->setFontSize( mReaderWin->cssHelper()->bodyFont().pointSize() );
   connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ),
@@ -427,7 +427,7 @@ void KMReaderMainWin::setupAccel()
                      mReaderWin, TQT_SLOT(slotScrollPrior()));
   accel->connectItem(accel->insertItem(Key_Next),
                      mReaderWin, TQT_SLOT(slotScrollNext()));
-  accel->connectItem(accel->insertItem(KStdAccel::shortcut(KStdAccel::Copy)),
+  accel->connectItem(accel->insertItem(TDEStdAccel::shortcut(TDEStdAccel::Copy)),
                      mReaderWin, TQT_SLOT(slotCopySelectedText()));
   connect( mReaderWin, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)),
 	  this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&)));
@@ -441,7 +441,7 @@ void KMReaderMainWin::setupAccel()
 
 void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPoint& aPoint)
 {
-  KPopupMenu * menu = new KPopupMenu;
+  TDEPopupMenu * menu = new TDEPopupMenu;
   mUrl = aUrl;
   mMsg = &aMsg;
   bool urlMenuAdded=false;
diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h
index ca4f29e73..2fa3462f6 100644
--- a/kmail/kmreadermainwin.h
+++ b/kmail/kmreadermainwin.h
@@ -10,12 +10,12 @@
 class KMReaderWin;
 class KMMessage;
 class KMMessagePart;
-class KAction;
-class KActionMenu;
+class TDEAction;
+class TDEActionMenu;
 class KMFolderIndex;
 class KMFolder;
-class KFontAction;
-class KFontSizeAction;
+class TDEFontAction;
+class TDEFontSizeAction;
 template <typename T, typename S> class TQMap;
 
 namespace KMail {
@@ -97,12 +97,12 @@ private:
   KURL mUrl;
   TQMap<int,KMFolder*> mMenuToFolder;
   // a few actions duplicated from kmmainwidget
-  KAction *mTrashAction, *mPrintAction, *mSaveAsAction, *mForwardInlineAction,
+  TDEAction *mTrashAction, *mPrintAction, *mSaveAsAction, *mForwardInlineAction,
           *mForwardAttachedAction, *mForwardDigestAction, *mRedirectAction,
           *mViewSourceAction;
-  KActionMenu *mForwardActionMenu;
-  KFontAction *fontAction;
-  KFontSizeAction *fontSizeAction;
+  TDEActionMenu *mForwardActionMenu;
+  TDEFontAction *fontAction;
+  TDEFontSizeAction *fontSizeAction;
   KMail::MessageActions *mMsgActions;
 
 };
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index d1c6c0a12..31f7356b6 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -403,7 +403,7 @@ const int KMReaderWin::delay = 150;
 //-----------------------------------------------------------------------------
 KMReaderWin::KMReaderWin(TQWidget *aParent,
 			 TQWidget *mainWindow,
-			 KActionCollection* actionCollection,
+			 TDEActionCollection* actionCollection,
                          const char *aName,
                          int aFlags )
   : TQWidget(aParent, aName, aFlags | TQt::WDestructiveClose),
@@ -475,56 +475,56 @@ KMReaderWin::KMReaderWin(TQWidget *aParent,
 
 }
 
-void KMReaderWin::createActions( KActionCollection * ac ) {
+void KMReaderWin::createActions( TDEActionCollection * ac ) {
   if ( !ac )
       return;
 
-  KRadioAction *raction = 0;
+  TDERadioAction *raction = 0;
 
   // header style
-  KActionMenu *headerMenu =
-    new KActionMenu( i18n("View->", "&Headers"), ac, "view_headers" );
+  TDEActionMenu *headerMenu =
+    new TDEActionMenu( i18n("View->", "&Headers"), ac, "view_headers" );
   headerMenu->setToolTip( i18n("Choose display style of message headers") );
 
   connect( headerMenu, TQT_SIGNAL(activated()),
            TQT_TQOBJECT(this), TQT_SLOT(slotCycleHeaderStyles()) );
 
-  raction = new KRadioAction( i18n("View->headers->", "&Enterprise Headers"), 0,
+  raction = new TDERadioAction( i18n("View->headers->", "&Enterprise Headers"), 0,
                               TQT_TQOBJECT(this), TQT_SLOT(slotEnterpriseHeaders()),
                               ac, "view_headers_enterprise" );
   raction->setToolTip( i18n("Show the list of headers in Enterprise style") );
   raction->setExclusiveGroup( "view_headers_group" );
   headerMenu->insert(raction);
 
-  raction = new KRadioAction( i18n("View->headers->", "&Fancy Headers"), 0,
+  raction = new TDERadioAction( i18n("View->headers->", "&Fancy Headers"), 0,
                               TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()),
                               ac, "view_headers_fancy" );
   raction->setToolTip( i18n("Show the list of headers in a fancy format") );
   raction->setExclusiveGroup( "view_headers_group" );
   headerMenu->insert( raction );
 
-  raction = new KRadioAction( i18n("View->headers->", "&Brief Headers"), 0,
+  raction = new TDERadioAction( i18n("View->headers->", "&Brief Headers"), 0,
                               TQT_TQOBJECT(this), TQT_SLOT(slotBriefHeaders()),
                               ac, "view_headers_brief" );
   raction->setToolTip( i18n("Show brief list of message headers") );
   raction->setExclusiveGroup( "view_headers_group" );
   headerMenu->insert( raction );
 
-  raction = new KRadioAction( i18n("View->headers->", "&Standard Headers"), 0,
+  raction = new TDERadioAction( i18n("View->headers->", "&Standard Headers"), 0,
                               TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()),
                               ac, "view_headers_standard" );
   raction->setToolTip( i18n("Show standard list of message headers") );
   raction->setExclusiveGroup( "view_headers_group" );
   headerMenu->insert( raction );
 
-  raction = new KRadioAction( i18n("View->headers->", "&Long Headers"), 0,
+  raction = new TDERadioAction( i18n("View->headers->", "&Long Headers"), 0,
                               TQT_TQOBJECT(this), TQT_SLOT(slotLongHeaders()),
                               ac, "view_headers_long" );
   raction->setToolTip( i18n("Show long list of message headers") );
   raction->setExclusiveGroup( "view_headers_group" );
   headerMenu->insert( raction );
 
-  raction = new KRadioAction( i18n("View->headers->", "&All Headers"), 0,
+  raction = new TDERadioAction( i18n("View->headers->", "&All Headers"), 0,
                               TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()),
                               ac, "view_headers_all" );
   raction->setToolTip( i18n("Show all message headers") );
@@ -532,41 +532,41 @@ void KMReaderWin::createActions( KActionCollection * ac ) {
   headerMenu->insert( raction );
 
   // attachment style
-  KActionMenu *attachmentMenu =
-    new KActionMenu( i18n("View->", "&Attachments"), ac, "view_attachments" );
+  TDEActionMenu *attachmentMenu =
+    new TDEActionMenu( i18n("View->", "&Attachments"), ac, "view_attachments" );
   attachmentMenu->setToolTip( i18n("Choose display style of attachments") );
   connect( attachmentMenu, TQT_SIGNAL(activated()),
            TQT_TQOBJECT(this), TQT_SLOT(slotCycleAttachmentStrategy()) );
 
-  raction = new KRadioAction( i18n("View->attachments->", "&As Icons"), 0,
+  raction = new TDERadioAction( i18n("View->attachments->", "&As Icons"), 0,
                               TQT_TQOBJECT(this), TQT_SLOT(slotIconicAttachments()),
                               ac, "view_attachments_as_icons" );
   raction->setToolTip( i18n("Show all attachments as icons. Click to see them.") );
   raction->setExclusiveGroup( "view_attachments_group" );
   attachmentMenu->insert( raction );
 
-  raction = new KRadioAction( i18n("View->attachments->", "&Smart"), 0,
+  raction = new TDERadioAction( i18n("View->attachments->", "&Smart"), 0,
                               TQT_TQOBJECT(this), TQT_SLOT(slotSmartAttachments()),
                               ac, "view_attachments_smart" );
   raction->setToolTip( i18n("Show attachments as suggested by sender.") );
   raction->setExclusiveGroup( "view_attachments_group" );
   attachmentMenu->insert( raction );
 
-  raction = new KRadioAction( i18n("View->attachments->", "&Inline"), 0,
+  raction = new TDERadioAction( i18n("View->attachments->", "&Inline"), 0,
                               TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()),
                               ac, "view_attachments_inline" );
   raction->setToolTip( i18n("Show all attachments inline (if possible)") );
   raction->setExclusiveGroup( "view_attachments_group" );
   attachmentMenu->insert( raction );
 
-  raction = new KRadioAction( i18n("View->attachments->", "&Hide"), 0,
+  raction = new TDERadioAction( i18n("View->attachments->", "&Hide"), 0,
                               TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()),
                               ac, "view_attachments_hide" );
   raction->setToolTip( i18n("Do not show attachments in the message viewer") );
   raction->setExclusiveGroup( "view_attachments_group" );
   attachmentMenu->insert( raction );
 
-  mHeaderOnlyAttachmentsAction = new KRadioAction( i18n( "View->attachments->", "In Header &Only" ), 0,
+  mHeaderOnlyAttachmentsAction = new TDERadioAction( i18n( "View->attachments->", "In Header &Only" ), 0,
                               TQT_TQOBJECT(this), TQT_SLOT( slotHeaderOnlyAttachments() ),
                               ac, "view_attachments_headeronly" );
   mHeaderOnlyAttachmentsAction->setToolTip( i18n( "Show Attachments only in the header of the mail" ) );
@@ -574,7 +574,7 @@ void KMReaderWin::createActions( KActionCollection * ac ) {
   attachmentMenu->insert( mHeaderOnlyAttachmentsAction );
 
   // Set Encoding submenu
-  mSelectEncodingAction = new KSelectAction( i18n( "&Set Encoding" ), "charset", 0,
+  mSelectEncodingAction = new TDESelectAction( i18n( "&Set Encoding" ), "charset", 0,
                                  TQT_TQOBJECT(this), TQT_SLOT( slotSetEncoding() ),
                                  ac, "encoding" );
   TQStringList encodings = KMMsgBase::supportedEncodings( false );
@@ -582,45 +582,45 @@ void KMReaderWin::createActions( KActionCollection * ac ) {
   mSelectEncodingAction->setItems( encodings );
   mSelectEncodingAction->setCurrentItem( 0 );
 
-  mMailToComposeAction = new KAction( i18n("New Message To..."), "mail_new",
+  mMailToComposeAction = new TDEAction( i18n("New Message To..."), "mail_new",
                                       0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoCompose()), ac,
                                       "mailto_compose" );
-  mMailToReplyAction = new KAction( i18n("Reply To..."), "mail_reply",
+  mMailToReplyAction = new TDEAction( i18n("Reply To..."), "mail_reply",
                                     0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoReply()), ac,
 				    "mailto_reply" );
-  mMailToForwardAction = new KAction( i18n("Forward To..."), "mail_forward",
+  mMailToForwardAction = new TDEAction( i18n("Forward To..."), "mail_forward",
                                       0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoForward()), ac,
                                       "mailto_forward" );
-  mAddAddrBookAction = new KAction( i18n("Add to Address Book"),
+  mAddAddrBookAction = new TDEAction( i18n("Add to Address Book"),
 				    0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoAddAddrBook()),
 				    ac, "add_addr_book" );
-  mOpenAddrBookAction = new KAction( i18n("Open in Address Book"),
+  mOpenAddrBookAction = new TDEAction( i18n("Open in Address Book"),
                                      0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoOpenAddrBook()),
                                      ac, "openin_addr_book" );
   mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), ac, "kmail_copy");
-  mSelectAllAction = new KAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, TQT_TQOBJECT(this),
+  mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, TQT_TQOBJECT(this),
                                   TQT_SLOT(selectAll()), ac, "mark_all_text" );
-  mCopyURLAction = new KAction( i18n("Copy Link Address"), 0, TQT_TQOBJECT(this),
+  mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, TQT_TQOBJECT(this),
 				TQT_SLOT(slotUrlCopy()), ac, "copy_url" );
-  mUrlOpenAction = new KAction( i18n("Open URL"), 0, TQT_TQOBJECT(this),
+  mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, TQT_TQOBJECT(this),
                                 TQT_SLOT(slotUrlOpen()), ac, "open_url" );
-  mAddBookmarksAction = new KAction( i18n("Bookmark This Link"),
+  mAddBookmarksAction = new TDEAction( i18n("Bookmark This Link"),
                                      "bookmark_add",
                                      0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmarks()),
                                      ac, "add_bookmarks" );
-  mUrlSaveAsAction = new KAction( i18n("Save Link As..."), 0, TQT_TQOBJECT(this),
+  mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, TQT_TQOBJECT(this),
                                   TQT_SLOT(slotUrlSave()), ac, "saveas_url" );
 
-  mToggleFixFontAction = new KToggleAction( i18n("Use Fi&xed Font"),
+  mToggleFixFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"),
                                             Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()),
                                             ac, "toggle_fixedfont" );
 
-  mStartIMChatAction = new KAction( i18n("Chat &With..."), 0, TQT_TQOBJECT(this),
+  mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, TQT_TQOBJECT(this),
 				    TQT_SLOT(slotIMChat()), ac, "start_im_chat" );
 }
 
 // little helper function
-KRadioAction *KMReaderWin::actionForHeaderStyle( const HeaderStyle * style, const HeaderStrategy * strategy ) {
+TDERadioAction *KMReaderWin::actionForHeaderStyle( const HeaderStyle * style, const HeaderStrategy * strategy ) {
   if ( !mActionCollection )
     return 0;
   const char * actionName = 0;
@@ -639,12 +639,12 @@ KRadioAction *KMReaderWin::actionForHeaderStyle( const HeaderStyle * style, cons
       actionName = "view_headers_all";
   }
   if ( actionName )
-    return static_cast<KRadioAction*>(mActionCollection->action(actionName));
+    return static_cast<TDERadioAction*>(mActionCollection->action(actionName));
   else
     return 0;
 }
 
-KRadioAction *KMReaderWin::actionForAttachmentStrategy( const AttachmentStrategy * as ) {
+TDERadioAction *KMReaderWin::actionForAttachmentStrategy( const AttachmentStrategy * as ) {
   if ( !mActionCollection )
     return 0;
   const char * actionName = 0;
@@ -660,7 +660,7 @@ KRadioAction *KMReaderWin::actionForAttachmentStrategy( const AttachmentStrategy
     actionName = "view_attachments_headeronly";
 
   if ( actionName )
-    return static_cast<KRadioAction*>(mActionCollection->action(actionName));
+    return static_cast<TDERadioAction*>(mActionCollection->action(actionName));
   else
     return 0;
 }
@@ -742,7 +742,7 @@ void KMReaderWin::slotCycleHeaderStyles() {
   }
 
   if ( actionName )
-    static_cast<KRadioAction*>( mActionCollection->action( actionName ) )->setChecked( true );
+    static_cast<TDERadioAction*>( mActionCollection->action( actionName ) )->setChecked( true );
 }
 
 
@@ -768,7 +768,7 @@ void KMReaderWin::slotHeaderOnlyAttachments() {
 
 void KMReaderWin::slotCycleAttachmentStrategy() {
   setAttachmentStrategy( attachmentStrategy()->next() );
-  KRadioAction * action = actionForAttachmentStrategy( attachmentStrategy() );
+  TDERadioAction * action = actionForAttachmentStrategy( attachmentStrategy() );
   assert( action );
   action->setChecked( true );
 }
@@ -894,7 +894,7 @@ void KMReaderWin::readConfig(void)
 
   setHeaderStyleAndStrategy( HeaderStyle::create( reader.readEntry( "header-style", "fancy" ) ),
 			     HeaderStrategy::create( reader.readEntry( "header-set-displayed", "rich" ) ) );
-  KRadioAction *raction = actionForHeaderStyle( headerStyle(), headerStrategy() );
+  TDERadioAction *raction = actionForHeaderStyle( headerStyle(), headerStrategy() );
   if ( raction )
     raction->setChecked( true );
 
@@ -1965,7 +1965,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo
 {
   mAtmCurrent = id;
   mAtmCurrentName = name;
-  KPopupMenu *menu = new KPopupMenu();
+  TDEPopupMenu *menu = new TDEPopupMenu();
   menu->insertItem(SmallIcon("fileopen"),i18n("to open", "Open"), 1);
   menu->insertItem(i18n("Open With..."), 2);
   menu->insertItem(i18n("to view something", "View"), 3);
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index 961994526..6251a4849 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -28,12 +28,12 @@ class TQTextCodec;
 class DwHeaders;
 class DwMediaType;
 
-class KActionCollection;
-class KAction;
-class KActionMenu;
-class KSelectAction;
-class KRadioAction;
-class KToggleAction;
+class TDEActionCollection;
+class TDEAction;
+class TDEActionMenu;
+class TDESelectAction;
+class TDERadioAction;
+class TDEToggleAction;
 class TDEConfigBase;
 class TDEHTMLPart;
 class KURL;
@@ -88,7 +88,7 @@ class KMReaderWin: public TQWidget, public KMail::Interface::Observer {
 public:
   KMReaderWin( TQWidget *parent,
 	       TQWidget *mainWindow,
-	       KActionCollection *actionCollection,
+	       TDEActionCollection *actionCollection,
                const char *name=0,
 	       int f=0 );
   virtual ~KMReaderWin();
@@ -244,19 +244,19 @@ public:
 
   // Action to reply to a message
   // but action( "some_name" ) some name could be used instead.
-  KToggleAction *toggleFixFontAction() { return mToggleFixFontAction; }
-  KAction *mailToComposeAction() { return mMailToComposeAction; }
-  KAction *mailToReplyAction() { return mMailToReplyAction; }
-  KAction *mailToForwardAction() { return mMailToForwardAction; }
-  KAction *addAddrBookAction() { return mAddAddrBookAction; }
-  KAction *openAddrBookAction() { return mOpenAddrBookAction; }
-  KAction *copyAction() { return mCopyAction; }
-  KAction *selectAllAction() { return mSelectAllAction; }
-  KAction *copyURLAction() { return mCopyURLAction; }
-  KAction *urlOpenAction() { return mUrlOpenAction; }
-  KAction *urlSaveAsAction() { return mUrlSaveAsAction; }
-  KAction *addBookmarksAction() { return mAddBookmarksAction;}
-  KAction *startImChatAction() { return mStartIMChatAction; }
+  TDEToggleAction *toggleFixFontAction() { return mToggleFixFontAction; }
+  TDEAction *mailToComposeAction() { return mMailToComposeAction; }
+  TDEAction *mailToReplyAction() { return mMailToReplyAction; }
+  TDEAction *mailToForwardAction() { return mMailToForwardAction; }
+  TDEAction *addAddrBookAction() { return mAddAddrBookAction; }
+  TDEAction *openAddrBookAction() { return mOpenAddrBookAction; }
+  TDEAction *copyAction() { return mCopyAction; }
+  TDEAction *selectAllAction() { return mSelectAllAction; }
+  TDEAction *copyURLAction() { return mCopyURLAction; }
+  TDEAction *urlOpenAction() { return mUrlOpenAction; }
+  TDEAction *urlSaveAsAction() { return mUrlSaveAsAction; }
+  TDEAction *addBookmarksAction() { return mAddBookmarksAction;}
+  TDEAction *startImChatAction() { return mStartIMChatAction; }
   // This function returns the complete data that were in this
   // message parts - *after* all encryption has been removed that
   // could be removed.
@@ -528,12 +528,12 @@ private slots:
 private:
   void adjustLayout();
   void createWidgets();
-  void createActions( KActionCollection * ac );
+  void createActions( TDEActionCollection * ac );
   void saveSplitterSizes( TDEConfigBase & c ) const;
 
-  KRadioAction * actionForHeaderStyle( const KMail::HeaderStyle *,
+  TDERadioAction * actionForHeaderStyle( const KMail::HeaderStyle *,
                                        const KMail::HeaderStrategy * );
-  KRadioAction * actionForAttachmentStrategy( const KMail::AttachmentStrategy * );
+  TDERadioAction * actionForAttachmentStrategy( const KMail::AttachmentStrategy * );
   /** Read override codec from configuration */
   void readGlobalOverrideCodec();
 
@@ -585,13 +585,13 @@ private:
   partNode* mRootNode;
   TQString mIdOfLastViewedMessage;
   TQWidget *mMainWindow;
-  KActionCollection *mActionCollection;
-  KAction *mMailToComposeAction, *mMailToReplyAction, *mMailToForwardAction,
+  TDEActionCollection *mActionCollection;
+  TDEAction *mMailToComposeAction, *mMailToReplyAction, *mMailToForwardAction,
       *mAddAddrBookAction, *mOpenAddrBookAction, *mCopyAction, *mCopyURLAction,
       *mUrlOpenAction, *mUrlSaveAsAction, *mAddBookmarksAction, *mStartIMChatAction, *mSelectAllAction;
-  KToggleAction *mHeaderOnlyAttachmentsAction;
-  KSelectAction *mSelectEncodingAction;
-  KToggleAction *mToggleFixFontAction;
+  TDEToggleAction *mHeaderOnlyAttachmentsAction;
+  TDESelectAction *mSelectEncodingAction;
+  TDEToggleAction *mToggleFixFontAction;
 
   KURL mHoveredUrl;
   KURL mClickedUrl;
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 4c432a514..f75b53a07 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -111,13 +111,13 @@ void KMSystemTray::buildPopupMenu()
   // Delete any previously created popup menu
   delete mPopupMenu;
 
-  mPopupMenu = new KPopupMenu();
+  mPopupMenu = new TDEPopupMenu();
   KMMainWidget * mainWidget = kmkernel->getKMMainWidget();
   if ( !mainWidget )
     return;
 
   mPopupMenu->insertTitle(*(this->pixmap()), "KMail");
-  KAction * action;
+  TDEAction * action;
   if ( ( action = mainWidget->action("check_mail") ) )
     action->plug( mPopupMenu );
   if ( ( action = mainWidget->action("check_mail_in") ) )
@@ -133,7 +133,7 @@ void KMSystemTray::buildPopupMenu()
     action->plug( mPopupMenu );
   mPopupMenu->insertSeparator();
 
-  KMainWindow *mainWin = ::tqqt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->topLevelWidget());
+  TDEMainWindow *mainWin = ::tqqt_cast<TDEMainWindow*>(kmkernel->getKMMainWidget()->topLevelWidget());
   mPopupMenu->insertItem( SmallIcon("exit"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) );
 }
 
@@ -320,7 +320,7 @@ void KMSystemTray::mousePressEvent(TQMouseEvent *e)
     mPopupFolders.reserve( mFoldersWithUnread.count() );
 
     // Rebuild popup menu at click time to minimize race condition if
-    // the base KMainWidget is closed.
+    // the base TDEMainWidget is closed.
     buildPopupMenu();
 
     if(mNewMessagePopupId != -1)
@@ -330,7 +330,7 @@ void KMSystemTray::mousePressEvent(TQMouseEvent *e)
 
     if(mFoldersWithUnread.count() > 0)
     {
-      KPopupMenu *newMessagesPopup = new KPopupMenu();
+      TDEPopupMenu *newMessagesPopup = new TDEPopupMenu();
 
       TQMap<TQGuardedPtr<KMFolder>, int>::Iterator it = mFoldersWithUnread.begin();
       for(uint i=0; it != mFoldersWithUnread.end(); ++i)
diff --git a/kmail/kmsystemtray.h b/kmail/kmsystemtray.h
index 208dd0c7e..c63fdd1df 100644
--- a/kmail/kmsystemtray.h
+++ b/kmail/kmsystemtray.h
@@ -31,7 +31,7 @@
 class KMFolder;
 class KMMainWidget;
 class TQMouseEvent;
-class KPopupMenu;
+class TDEPopupMenu;
 class TQPoint;
 
 /**
@@ -82,7 +82,7 @@ private:
   int mCount;
   int mNewMessagePopupId;
 
-  KPopupMenu * mPopupMenu;
+  TDEPopupMenu * mPopupMenu;
   TQPixmap mDefaultIcon;
   TQImage mLightIconImage;
 
diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp
index b60ada927..1bb2b1448 100644
--- a/kmail/mailinglistpropertiesdialog.cpp
+++ b/kmail/mailinglistpropertiesdialog.cpp
@@ -112,7 +112,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
   groupLayout->addWidget( mAddressCombo, 6, 1 );
   mAddressCombo->setEnabled( false );
 
-  //FIXME: if the mailing list actions have either KAction's or toolbar buttons
+  //FIXME: if the mailing list actions have either TDEAction's or toolbar buttons
   //       associated with them - remove this button since it's really silly
   //       here
   TQPushButton *handleButton = new TQPushButton( i18n( "Invoke Handler" ), mlGroup );
diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp
index c1f569925..2e1aac7f6 100644
--- a/kmail/messageactions.cpp
+++ b/kmail/messageactions.cpp
@@ -32,82 +32,82 @@
 
 using namespace KMail;
 
-MessageActions::MessageActions( KActionCollection *ac, TQWidget * parent ) :
+MessageActions::MessageActions( TDEActionCollection *ac, TQWidget * parent ) :
     TQObject( parent ),
     mParent( parent ),
     mActionCollection( ac ),
     mCurrentMessage( 0 ),
     mMessageView( 0 )
 {
-    mReplyActionMenu = new KActionMenu( i18n("Message->","&Reply"),
+    mReplyActionMenu = new TDEActionMenu( i18n("Message->","&Reply"),
                                       "mail_reply", mActionCollection,
                                       "message_reply_menu" );
   connect( mReplyActionMenu, TQT_SIGNAL(activated()), this,
            TQT_SLOT(slotReplyToMsg()) );
 
-  mReplyAction = new KAction( i18n("&Reply..."), "mail_reply", Key_R, this,
+  mReplyAction = new TDEAction( i18n("&Reply..."), "mail_reply", Key_R, this,
                               TQT_SLOT(slotReplyToMsg()), mActionCollection, "reply" );
   mReplyActionMenu->insert( mReplyAction );
 
-  mReplyAuthorAction = new KAction( i18n("Reply to A&uthor..."), "mail_reply",
+  mReplyAuthorAction = new TDEAction( i18n("Reply to A&uthor..."), "mail_reply",
                                     SHIFT+Key_A, this,
                                     TQT_SLOT(slotReplyAuthorToMsg()),
                                     mActionCollection, "reply_author" );
   mReplyActionMenu->insert( mReplyAuthorAction );
 
-  mReplyAllAction = new KAction( i18n("Reply to &All..."), "mail_replyall",
+  mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail_replyall",
                                  Key_A, this, TQT_SLOT(slotReplyAllToMsg()),
                                  mActionCollection, "reply_all" );
   mReplyActionMenu->insert( mReplyAllAction );
 
-  mReplyListAction = new KAction( i18n("Reply to Mailing-&List..."),
+  mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."),
                                   "mail_replylist", Key_L, this,
                                   TQT_SLOT(slotReplyListToMsg()), mActionCollection,
                                   "reply_list" );
   mReplyActionMenu->insert( mReplyListAction );
 
-  mNoQuoteReplyAction = new KAction( i18n("Reply Without &Quote..."), SHIFT+Key_R,
+  mNoQuoteReplyAction = new TDEAction( i18n("Reply Without &Quote..."), SHIFT+Key_R,
     this, TQT_SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" );
 
 
-  mCreateTodoAction = new KAction( i18n("Create Task/Reminder..."), "mail_todo",
+  mCreateTodoAction = new TDEAction( i18n("Create Task/Reminder..."), "mail_todo",
                                    0, this, TQT_SLOT(slotCreateTodo()), mActionCollection,
                                    "create_todo" );
 
 
-  mStatusMenu = new KActionMenu ( i18n( "Mar&k Message" ),
+  mStatusMenu = new TDEActionMenu ( i18n( "Mar&k Message" ),
                                   mActionCollection, "set_status" );
 
-  mStatusMenu->insert(new KAction(KGuiItem(i18n("Mark Message as &Read"), "kmmsgread",
+  mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &Read"), "kmmsgread",
                                           i18n("Mark selected messages as read")),
                                  0, this, TQT_SLOT(slotSetMsgStatusRead()),
                                  mActionCollection, "status_read"));
 
-  mStatusMenu->insert(new KAction(KGuiItem(i18n("Mark Message as &New"), "kmmsgnew",
+  mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &New"), "kmmsgnew",
                                           i18n("Mark selected messages as new")),
                                  0, this, TQT_SLOT(slotSetMsgStatusNew()),
                                  mActionCollection, "status_new" ));
 
-  mStatusMenu->insert(new KAction(KGuiItem(i18n("Mark Message as &Unread"), "kmmsgunseen",
+  mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &Unread"), "kmmsgunseen",
                                           i18n("Mark selected messages as unread")),
                                  0, this, TQT_SLOT(slotSetMsgStatusUnread()),
                                  mActionCollection, "status_unread"));
 
-  mStatusMenu->insert( new KActionSeparator( this ) );
+  mStatusMenu->insert( new TDEActionSeparator( this ) );
 
-  mToggleFlagAction = new KToggleAction(i18n("Mark Message as &Important"), "mail_flag",
+  mToggleFlagAction = new TDEToggleAction(i18n("Mark Message as &Important"), "mail_flag",
                                  0, this, TQT_SLOT(slotSetMsgStatusFlag()),
                                  mActionCollection, "status_flag");
   mToggleFlagAction->setCheckedState( i18n("Remove &Important Message Mark") );
   mStatusMenu->insert( mToggleFlagAction );
 
-  mToggleTodoAction = new KToggleAction(i18n("Mark Message as &Action Item"), "mail_todo",
+  mToggleTodoAction = new TDEToggleAction(i18n("Mark Message as &Action Item"), "mail_todo",
                                  0, this, TQT_SLOT(slotSetMsgStatusTodo()),
                                  mActionCollection, "status_todo");
   mToggleTodoAction->setCheckedState( i18n("Remove &Action Item Message Mark") );
   mStatusMenu->insert( mToggleTodoAction );
 
-  mEditAction = new KAction( i18n("&Edit Message"), "edit", Key_T, this,
+  mEditAction = new TDEAction( i18n("&Edit Message"), "edit", Key_T, this,
                             TQT_SLOT(editCurrentMessage()), mActionCollection, "edit" );
   mEditAction->plugAccel( mActionCollection->kaccel() );
 
diff --git a/kmail/messageactions.h b/kmail/messageactions.h
index e2256123b..5e46489b3 100644
--- a/kmail/messageactions.h
+++ b/kmail/messageactions.h
@@ -26,9 +26,9 @@
 #include <tqvaluelist.h>
 
 class TQWidget;
-class KAction;
-class KActionMenu;
-class KActionCollection;
+class TDEAction;
+class TDEActionMenu;
+class TDEActionCollection;
 class KMMessage;
 
 namespace KMail {
@@ -41,20 +41,20 @@ class MessageActions : public TQObject
   Q_OBJECT
   
   public:
-    MessageActions( KActionCollection* ac, TQWidget *parent );
+    MessageActions( TDEActionCollection* ac, TQWidget *parent );
     void setMessageView( KMReaderWin *msgView );
 
     void setCurrentMessage( KMMessage *msg );
     void setSelectedSernums( const TQValueList<TQ_UINT32> &sernums );
     void setSelectedVisibleSernums( const TQValueList<TQ_UINT32> &sernums );
 
-    KActionMenu* replyMenu() const { return mReplyActionMenu; }
-    KAction* replyListAction() const { return mReplyListAction; }
-    KAction* createTodoAction() const { return mCreateTodoAction; }
+    TDEActionMenu* replyMenu() const { return mReplyActionMenu; }
+    TDEAction* replyListAction() const { return mReplyListAction; }
+    TDEAction* createTodoAction() const { return mCreateTodoAction; }
 
-    KActionMenu* messageStatusMenu() const { return mStatusMenu; }
+    TDEActionMenu* messageStatusMenu() const { return mStatusMenu; }
 
-    KAction* editAction() const { return mEditAction; }
+    TDEAction* editAction() const { return mEditAction; }
 
   signals:
 
@@ -87,19 +87,19 @@ class MessageActions : public TQObject
 
   private:
     TQWidget *mParent;
-    KActionCollection *mActionCollection;
+    TDEActionCollection *mActionCollection;
     KMMessage* mCurrentMessage;
     TQValueList<TQ_UINT32> mSelectedSernums;
     TQValueList<TQ_UINT32> mVisibleSernums;
     KMReaderWin *mMessageView;
 
-    KActionMenu *mReplyActionMenu;
-    KAction *mReplyAction, *mReplyAllAction, *mReplyAuthorAction,
+    TDEActionMenu *mReplyActionMenu;
+    TDEAction *mReplyAction, *mReplyAllAction, *mReplyAuthorAction,
             *mReplyListAction, *mNoQuoteReplyAction;
-    KAction *mCreateTodoAction;
-    KActionMenu *mStatusMenu;
-    KToggleAction *mToggleFlagAction, *mToggleTodoAction;
-    KAction *mEditAction;
+    TDEAction *mCreateTodoAction;
+    TDEActionMenu *mStatusMenu;
+    TDEToggleAction *mToggleFlagAction, *mToggleTodoAction;
+    TDEAction *mEditAction;
 };
 
 }
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index 0d938bde2..8b320d720 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -211,8 +211,8 @@ TQString RecipientItem::recipientType() const
 }
 
 
-RecipientViewItem::RecipientViewItem( RecipientItem *item, KListView *listView )
-  : KListViewItem( listView ), mRecipientItem( item )
+RecipientViewItem::RecipientViewItem( RecipientItem *item, TDEListView *listView )
+  : TDEListViewItem( listView ), mRecipientItem( item )
 {
   setText( 0, item->recipientType() );
   setText( 1, item->name() );
@@ -228,7 +228,7 @@ RecipientItem *RecipientViewItem::recipientItem() const
 
 
 RecipientsListToolTip::RecipientsListToolTip( TQWidget *parent,
-  KListView *listView )
+  TDEListView *listView )
   : TQToolTip( parent )
 {
   mListView = listView;
@@ -327,8 +327,8 @@ TQString RecipientsCollection::id() const
   return mId;
 }
 
-SearchLine::SearchLine( TQWidget *parent, KListView *listView )
-  : KListViewSearchLine( parent, listView )
+SearchLine::SearchLine( TQWidget *parent, TDEListView *listView )
+  : TDEListViewSearchLine( parent, listView )
 {
 }
 
@@ -336,7 +336,7 @@ void SearchLine::keyPressEvent( TQKeyEvent *ev )
 {
   if ( ev->key() == Key_Down ) emit downPressed();
 
-  KListViewSearchLine::keyPressEvent( ev );
+  TDEListViewSearchLine::keyPressEvent( ev );
 }
 
 
@@ -380,7 +380,7 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent )
   label = new TQLabel( i18n("&Search:"), this );
   searchLayout->addWidget( label );
 
-  mRecipientList = new KListView( this );
+  mRecipientList = new TDEListView( this );
   mRecipientList->setSelectionMode( TQListView::Extended );
   mRecipientList->setAllColumnsShowFocus( true );
   mRecipientList->setFullWidth( true );
@@ -579,7 +579,7 @@ void RecipientsPicker::insertRecentAddresses()
 
   TDEConfig config( "kmailrc" );
   KABC::Addressee::List recents =
-    KRecentAddress::RecentAddresses::self( &config )->kabcAddresses();
+    TDERecentAddress::RecentAddresses::self( &config )->kabcAddresses();
 
   KABC::Addressee::List::ConstIterator it;
   for( it = recents.begin(); it != recents.end(); ++it ) {
diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h
index 85f7432a4..ede82ba85 100644
--- a/kmail/recipientspicker.h
+++ b/kmail/recipientspicker.h
@@ -103,10 +103,10 @@ class RecipientItem
     TQString mKey;
 };
 
-class RecipientViewItem : public KListViewItem
+class RecipientViewItem : public TDEListViewItem
 {
   public:
-    RecipientViewItem( RecipientItem *, KListView * );
+    RecipientViewItem( RecipientItem *, TDEListView * );
 
     RecipientItem *recipientItem() const;
 
@@ -117,13 +117,13 @@ class RecipientViewItem : public KListViewItem
 class RecipientsListToolTip : public TQToolTip
 {
   public:
-    RecipientsListToolTip( TQWidget *parent, KListView * );
+    RecipientsListToolTip( TQWidget *parent, TDEListView * );
 
   protected:
     void maybeTip( const TQPoint &pos );
 
   private:
-    KListView *mListView;
+    TDEListView *mListView;
 };
 
 class RecipientsCollection
@@ -160,12 +160,12 @@ class RecipientsCollection
     TQMap<TQString, RecipientItem *> mKeyMap;
 };
 
-class SearchLine : public KListViewSearchLine
+class SearchLine : public TDEListViewSearchLine
 {
     Q_OBJECT
   
   public:
-    SearchLine( TQWidget *parent, KListView *listView );
+    SearchLine( TQWidget *parent, TDEListView *listView );
 
   signals:
     void downPressed();
@@ -225,8 +225,8 @@ class RecipientsPicker : public TQDialog
     KABC::StdAddressBook *mAddressBook;
 
     TQComboBox *mCollectionCombo;
-    KListView *mRecipientList;
-    KListViewSearchLine *mSearchLine;
+    TDEListView *mRecipientList;
+    TDEListViewSearchLine *mSearchLine;
 
     TQPushButton *mToButton;
     TQPushButton *mCcButton;
diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp
index 88951fcf7..4cd26be0c 100644
--- a/kmail/redirectdialog.cpp
+++ b/kmail/redirectdialog.cpp
@@ -36,7 +36,7 @@
 #include <addressesdialog.h>
 using KPIM::AddressesDialog;
 #include "recentaddresses.h"
-using KRecentAddress::RecentAddresses;
+using TDERecentAddress::RecentAddresses;
 
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 849cba8b1..e5c009516 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -67,12 +67,12 @@ namespace KMail {
 
 const int SearchWindow::MSGID_COLUMN = 4;
 
-// KListView sub-class for dnd support
-class MatchListView : public KListView
+// TDEListView sub-class for dnd support
+class MatchListView : public TDEListView
 {
   public:
     MatchListView( TQWidget *parent, SearchWindow* sw, const char* name = 0 ) :
-      KListView( parent, name ),
+      TDEListView( parent, name ),
       mSearchWindow( sw )
     {}
 
@@ -213,13 +213,13 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
      solves the above problem, but speeds searches with many hits
      up considerably. - till
 
-     TODO: subclass KListViewItem and do proper (and performant)
+     TODO: subclass TDEListViewItem and do proper (and performant)
      comapare functions
   */
   mLbxMatches->setSorting(2, false);
   mLbxMatches->setShowSortIndicator(true);
   mLbxMatches->setAllColumnsShowFocus(true);
-  mLbxMatches->setSelectionModeExt(KListView::Extended);
+  mLbxMatches->setSelectionModeExt(TDEListView::Extended);
   mLbxMatches->addColumn(i18n("Subject"),
                          config->readNumEntry("SubjectWidth", 150));
   mLbxMatches->addColumn(i18n("Sender/Receiver"),
@@ -307,27 +307,27 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
       kdDebug(5006) << "SearchWindow: regExpLineEdit not found" << endl;
 
   //set up actions
-  KActionCollection *ac = actionCollection();
+  TDEActionCollection *ac = actionCollection();
   ac->setWidget( this );
-  mReplyAction = new KAction( i18n("&Reply..."), "mail_reply", 0, TQT_TQOBJECT(this),
+  mReplyAction = new TDEAction( i18n("&Reply..."), "mail_reply", 0, TQT_TQOBJECT(this),
                               TQT_SLOT(slotReplyToMsg()), ac, "search_reply" );
-  mReplyAllAction = new KAction( i18n("Reply to &All..."), "mail_replyall",
+  mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail_replyall",
                                  0, TQT_TQOBJECT(this), TQT_SLOT(slotReplyAllToMsg()),
                                  ac, "search_reply_all" );
-  mReplyListAction = new KAction( i18n("Reply to Mailing-&List..."),
+  mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."),
                                   "mail_replylist", 0, TQT_TQOBJECT(this),
                                   TQT_SLOT(slotReplyListToMsg()), ac,
                                   "search_reply_list" );
-  mForwardActionMenu = new KActionMenu( i18n("Message->","&Forward"),
+  mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"),
                                         "mail_forward", ac,
                                         "search_message_forward" );
   connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
            TQT_SLOT(slotForwardInlineMsg()) );
-  mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."),
+  mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
                                         "mail_forward", 0, TQT_TQOBJECT(this),
                                         TQT_SLOT(slotForwardAttachedMsg()), ac,
                                         "search_message_forward_as_attachment" );
-  mForwardInlineAction = new KAction( i18n("&Inline..."),
+  mForwardInlineAction = new TDEAction( i18n("&Inline..."),
                                       "mail_forward", 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotForwardInlineMsg()), ac,
                                       "search_message_forward_inline" );
@@ -339,22 +339,22 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
     mForwardActionMenu->insert( mForwardInlineAction );
   }
 
-  mForwardDigestAction = new KAction( i18n("Message->Forward->","As Di&gest..."),
+  mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
                                       "mail_forward", 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotForwardDigestMsg()), ac,
                                       "search_message_forward_as_digest" );
   mForwardActionMenu->insert( mForwardDigestAction );
-  mRedirectAction = new KAction( i18n("Message->Forward->","&Redirect..."),
+  mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
                                       "mail_forward", 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotRedirectMsg()), ac,
                                       "search_message_forward_redirect" );
   mForwardActionMenu->insert( mRedirectAction );
   mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" );
-  mSaveAtchAction = new KAction( i18n("Save Attachments..."), "attach", 0,
+  mSaveAtchAction = new TDEAction( i18n("Save Attachments..."), "attach", 0,
                                  TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" );
 
   mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), ac, "search_print" );
-  mClearAction = new KAction( i18n("Clear Selection"), 0, 0, TQT_TQOBJECT(this),
+  mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, TQT_TQOBJECT(this),
                               TQT_SLOT(slotClearSelection()), ac, "search_clear_selection" );
 
   mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" );
@@ -576,7 +576,7 @@ void SearchWindow::slotAddMsg(int idx)
     else
         fName = pFolder->name();
 
-    (void)new KListViewItem(mLbxMatches, mLbxMatches->lastItem(),
+    (void)new TDEListViewItem(mLbxMatches, mLbxMatches->lastItem(),
                             msg->subject(), from, msg->dateIsoStr(),
                             fName,
                             TQString::number(mFolder->serNum(idx)));
diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h
index 0cd5303aa..84684c849 100644
--- a/kmail/searchwindow.h
+++ b/kmail/searchwindow.h
@@ -35,12 +35,12 @@ class TQComboBox;
 class TQGridLayout;
 class TQLabel;
 class TQLineEdit;
-class KListView;
+class TDEListView;
 class TQListViewItem;
 class TQPushButton;
 class TQRadioButton;
-class KAction;
-class KActionMenu;
+class TDEAction;
+class TDEActionMenu;
 class KMFolder;
 class KMFolderSearch;
 class KMFolderImap;
@@ -169,7 +169,7 @@ protected:
   TQPushButton *mBtnSearch;
   TQPushButton *mBtnStop;
   TQCheckBox *mChkSubFolders;
-  KListView* mLbxMatches;
+  TDEListView* mLbxMatches;
   TQLabel *mSearchFolderLbl;
   TQLineEdit *mSearchFolderEdt;
   TQPushButton *mSearchFolderOpenBtn;
@@ -177,11 +177,11 @@ protected:
   KStatusBar* mStatusBar;
   TQWidget* mLastFocus; // to remember the position of the focus
   TQMap<int,KMFolder*> mMenuToFolder;
-  KAction *mReplyAction, *mReplyAllAction, *mReplyListAction, *mSaveAsAction,
+  TDEAction *mReplyAction, *mReplyAllAction, *mReplyListAction, *mSaveAsAction,
     *mForwardInlineAction, *mForwardAttachedAction, *mForwardDigestAction,
     *mRedirectAction, *mPrintAction, *mClearAction, *mSaveAtchAction,
     *mCopyAction, *mCutAction;
-  KActionMenu *mForwardActionMenu;
+  TDEActionMenu *mForwardActionMenu;
   TQValueList<TQGuardedPtr<KMFolder> > mFolders;
   TQTimer mRenameTimer;
 
diff --git a/kmail/secondarywindow.cpp b/kmail/secondarywindow.cpp
index d2296f435..38f6b32dc 100644
--- a/kmail/secondarywindow.cpp
+++ b/kmail/secondarywindow.cpp
@@ -39,7 +39,7 @@ namespace KMail {
 
   //---------------------------------------------------------------------------
   SecondaryWindow::SecondaryWindow( const char * name )
-    : KMainWindow( 0, name )
+    : TDEMainWindow( 0, name )
   {
     // Set this to be the group leader for all subdialogs - this means
     // modal subdialogs will only affect this window, not the other windows
@@ -62,7 +62,7 @@ namespace KMail {
     // if there's a system tray applet then just do what needs to be done if a
     // window is closed.
     if ( kmkernel->haveSystemTrayApplet() ) {
-      // BEGIN of code borrowed from KMainWindow::closeEvent
+      // BEGIN of code borrowed from TDEMainWindow::closeEvent
       // Save settings if auto-save is enabled, and settings have changed
       if ( settingsDirty() && autoSaveSettings() )
         saveAutoSaveSettings();
@@ -70,10 +70,10 @@ namespace KMail {
       if ( queryClose() ) {
         e->accept();
       }
-      // END of code borrowed from KMainWindow::closeEvent
+      // END of code borrowed from TDEMainWindow::closeEvent
     }
     else
-      KMainWindow::closeEvent( e );
+      TDEMainWindow::closeEvent( e );
   }
 
 } // namespace KMail
diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h
index 11d6cbae9..fa37523a1 100644
--- a/kmail/secondarywindow.h
+++ b/kmail/secondarywindow.h
@@ -41,7 +41,7 @@ namespace KMail {
    *  Window class for secondary KMail window like the composer window and
    *  the separate message window.
    */
-  class SecondaryWindow : public KMainWindow
+  class SecondaryWindow : public TDEMainWindow
   {
     Q_OBJECT
   
diff --git a/kmail/simplefoldertree.h b/kmail/simplefoldertree.h
index 6bfc3eb33..308ef4b98 100644
--- a/kmail/simplefoldertree.h
+++ b/kmail/simplefoldertree.h
@@ -179,7 +179,7 @@ template <class T> class SimpleFolderTreeBase : public TreeBase
       } else if ( !e->text().isEmpty() && e->text().length() == 1 && e->text().at( 0 ).isPrint() ) {
         applyFilter( mFilter + e->text() );
       } else {
-        KListView::keyPressEvent( e );
+        TDEListView::keyPressEvent( e );
       }
     }
 
@@ -242,7 +242,7 @@ template <class T> class SimpleFolderTreeBase : public TreeBase
 
 };
 
-typedef SimpleFolderTreeBase<KListViewItem> SimpleFolderTree;
+typedef SimpleFolderTreeBase<TDEListViewItem> SimpleFolderTree;
 
 }
 
diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp
index d2b5c19d3..1c3e40c87 100644
--- a/kmail/snippetdlg.cpp
+++ b/kmail/snippetdlg.cpp
@@ -32,7 +32,7 @@
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl )
+SnippetDlg::SnippetDlg( TDEActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl )
     : SnippetDlgBase( parent, name, modal, fl ), actionCollection( ac )
 {
     if ( !name )
@@ -40,8 +40,8 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* nam
 
     textLabel3 = new TQLabel( this, "textLabel3" );
     keyButton = new KKeyButton( this );
-    connect( keyButton, TQT_SIGNAL( capturedShortcut( const KShortcut& ) ),
-             this, TQT_SLOT( slotCapturedShortcut( const KShortcut& ) ) );
+    connect( keyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ),
+             this, TQT_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) );
 
     btnAdd->setEnabled( false );
     connect( snippetName, TQT_SIGNAL(textChanged(const TQString &)),
@@ -78,23 +78,23 @@ void SnippetDlg::languageChange()
     textLabel3->setText( i18n( "Sh&ortcut:" ) );
 }
 
-static bool shortcutIsValid( const KActionCollection* actionCollection, const KShortcut &sc )
+static bool shortcutIsValid( const TDEActionCollection* actionCollection, const TDEShortcut &sc )
 {
-  KActionPtrList actions = actionCollection->actions();
-  KActionPtrList::Iterator it( actions.begin() );
+  TDEActionPtrList actions = actionCollection->actions();
+  TDEActionPtrList::Iterator it( actions.begin() );
   for ( ; it != actions.end(); it++ ) {
     if ( (*it)->shortcut() == sc ) return false;
   }
   return true;
 }
 
-void SnippetDlg::slotCapturedShortcut( const KShortcut& sc )
+void SnippetDlg::slotCapturedShortcut( const TDEShortcut& sc )
 {
 
     if ( sc == keyButton->shortcut() ) return;
     if ( sc.toString().isNull() ) {
       // null is fine, that's reset, but sc.іsNull() will be false :/
-      keyButton->setShortcut( KShortcut::null(), false );
+      keyButton->setShortcut( TDEShortcut::null(), false );
     } else {
       if( !shortcutIsValid( actionCollection, sc ) ) {
         TQString msg( i18n( "The selected shortcut is already used, "
diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h
index 4aa89c1de..c46e23991 100644
--- a/kmail/snippetdlg.h
+++ b/kmail/snippetdlg.h
@@ -13,8 +13,8 @@
 #include "snippetdlgbase.h"
 
 class KKeyButton;
-class KActionCollection;
-class KShortcut;
+class TDEActionCollection;
+class TDEShortcut;
 
 class SnippetDlg : public SnippetDlgBase
 {
@@ -22,7 +22,7 @@ class SnippetDlg : public SnippetDlgBase
   
 
   public:
-    SnippetDlg( KActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    SnippetDlg( TDEActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~SnippetDlg();
 
     void setShowShortcut( bool show );
@@ -30,7 +30,7 @@ class SnippetDlg : public SnippetDlgBase
     TQLabel* textLabel3;
     TQLabel* textLabelGroup;
     KKeyButton* keyButton;
-    KActionCollection* actionCollection;
+    TDEActionCollection* actionCollection;
 
   protected slots:
     void slotTextChanged( const TQString& );
@@ -38,7 +38,7 @@ class SnippetDlg : public SnippetDlgBase
     virtual void languageChange();
 
   private slots:
-    void slotCapturedShortcut( const KShortcut& );
+    void slotCapturedShortcut( const TDEShortcut& );
 };
 
 #endif // SNIPPETDLG_H
diff --git a/kmail/snippetitem.cpp b/kmail/snippetitem.cpp
index 7839511ae..dc62333cb 100644
--- a/kmail/snippetitem.cpp
+++ b/kmail/snippetitem.cpp
@@ -87,12 +87,12 @@ void SnippetItem::resetParent()
 }
 
 
-KAction* SnippetItem::getAction()
+TDEAction* SnippetItem::getAction()
 {
     return action;
 }
 
-void SnippetItem::setAction(KAction * anAction)
+void SnippetItem::setAction(TDEAction * anAction)
 {
     action = anAction;
 }
diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h
index 3222449a7..395b62cb4 100644
--- a/kmail/snippetitem.h
+++ b/kmail/snippetitem.h
@@ -20,7 +20,7 @@
 #include <tqobject.h>
 
 class TQString;
-class KAction;
+class TDEAction;
 class SnippetGroup;
 
 
@@ -45,8 +45,8 @@ public:
     void resetParent();
     void setText(TQString text);
     void setName(TQString name);
-    void setAction( KAction* );
-    KAction* getAction();
+    void setAction( TDEAction* );
+    TDEAction* getAction();
     static SnippetItem * findItemByName(TQString name, TQPtrList<SnippetItem> &list);
     static SnippetGroup * findGroupById(int id, TQPtrList<SnippetItem> &list);
 signals:
@@ -59,7 +59,7 @@ private:
   TQString strName;
   TQString strText;
   int iParent;
-  KAction *action;
+  TDEAction *action;
 };
 
 /**
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index b7ba16f1b..601174cfd 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -44,14 +44,14 @@
 
 #include <cassert>
 
-SnippetWidget::SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent)
-		: KListView(parent, "snippet widget"), TQToolTip( viewport() ),
+SnippetWidget::SnippetWidget(KMEdit* editor, TDEActionCollection* actionCollection, TQWidget* parent)
+		: TDEListView(parent, "snippet widget"), TQToolTip( viewport() ),
 		mEditor( editor ), mActionCollection( actionCollection )
 {
     // init the TQPtrList
     _list.setAutoDelete(TRUE);
 
-    // init the KListView
+    // init the TDEListView
     setSorting( -1 );
     addColumn( "" );
     setFullWidth(true);
@@ -142,13 +142,13 @@ void SnippetWidget::slotAdd()
     \fn SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text )
     Helper factory method.
  */
-SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut )
+SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const TDEShortcut& shortcut )
 {
     SnippetItem * item = new SnippetItem(parent, name, text);
     const TQString actionName = i18n("Snippet %1").arg(name);
     const TQString normalizedName = TQString(actionName).replace(" ", "_");
     if ( !mActionCollection->action(normalizedName.utf8().data() ) ) {
-        KAction * action = new KAction( actionName, shortcut, item,
+        TDEAction * action = new TDEAction( actionName, shortcut, item,
                                         TQT_SLOT( slotExecute() ), mActionCollection,
                                         normalizedName.utf8() );
         item->setAction(action);
@@ -249,7 +249,7 @@ void SnippetWidget::slotEdit( TQListViewItem* item )
   dlg.cbGroup->setCurrentText(SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName());
 
   if (dlg.exec() == TQDialog::Accepted) {
-    //update the KListView and the SnippetItem
+    //update the TDEListView and the SnippetItem
     item->setText( 0, dlg.snippetName->text() );
     pSnippet->setName( dlg.snippetName->text() );
     pSnippet->setText( dlg.snippetText->text() );
@@ -291,7 +291,7 @@ void SnippetWidget::slotEditGroup()
   dlg.cbGroup->insertItem(i18n("All"));
 
   if (dlg.exec() == TQDialog::Accepted) {
-    //update the KListView and the SnippetGroup
+    //update the TDEListView and the SnippetGroup
     item->setText( 0, dlg.snippetName->text() );
     pGroup->setName( dlg.snippetName->text() );
 
@@ -369,9 +369,9 @@ void SnippetWidget::writeConfig()
       _cfg->writeEntry(strKeyText, item->getText());
       _cfg->writeEntry(strKeyId, item->getParent());
 
-      KAction * action = item->getAction();
+      TDEAction * action = item->getAction();
       assert( action );
-      const KShortcut& sc = action->shortcut();
+      const TDEShortcut& sc = action->shortcut();
       if (!sc.isNull() ) {
           _cfg->writeEntry( TQString("snippetShortcut_%1").arg(iSnipCount), sc.toString() );
       }
@@ -474,7 +474,7 @@ void SnippetWidget::initConfig()
         //kdDebug(5006) << "Read item " << strNameVal << " " << iParentVal << endl;
 
         if (strNameVal != "" && strTextVal != "" && iParentVal != -1) {
-            KShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").arg(i), TQString() ) );
+            TDEShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").arg(i), TQString() ) );
             item = makeItem( SnippetItem::findGroupById(iParentVal, _list), strNameVal, strTextVal, shortcut );
             //kdDebug(5006) << "Created item " << item->getName() << " " << item->getParent() << endl;
             _list.append(item);
@@ -536,7 +536,7 @@ void SnippetWidget::maybeTip( const TQPoint & p )
 */
 void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int )
 {
-    KPopupMenu popup;
+    TDEPopupMenu popup;
 
     SnippetItem * selectedItem = static_cast<SnippetItem *>(item);
     if ( item ) {
@@ -868,7 +868,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
 
 //  fn SnippetWidget::acceptDrag (TQDropEvent *event) const
 /*!
-    Reimplementation from KListView.
+    Reimplementation from TDEListView.
     Check here if the data the user is about to drop fits our restrictions.
     We only accept dropps of plaintext, because from the dropped text
     we will create a snippet.
diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h
index 88a967194..8471f0556 100644
--- a/kmail/snippetwidget.h
+++ b/kmail/snippetwidget.h
@@ -26,7 +26,7 @@
 class KDevProject;
 class SnippetPart;
 class TQPushButton;
-class KListView;
+class TDEListView;
 class TQListViewItem;
 class TQPoint;
 class SnippetDlg;
@@ -34,21 +34,21 @@ class SnippetItem;
 class KTextEdit;
 class TDEConfig;
 class KMEdit;
-class KActionCollection;
+class TDEActionCollection;
 
 /**
 This is the widget which gets added to the right TreeToolView.
-It inherits KListView and TQToolTip which is needed for showing the
+It inherits TDEListView and TQToolTip which is needed for showing the
 tooltips which contains the text of the snippet
 @author Robert Gruber
 */
-class SnippetWidget : public KListView, public TQToolTip
+class SnippetWidget : public TDEListView, public TQToolTip
 {
   Q_OBJECT
   
 
 public:
-    SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent = 0);
+    SnippetWidget(KMEdit* editor, TDEActionCollection* actionCollection, TQWidget* parent = 0);
     ~SnippetWidget();
     TQPtrList<SnippetItem> * getList() { return (&_list); }
     void writeConfig();
@@ -68,14 +68,14 @@ private:
     bool showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQString, TQString> * mapSave,
                             int & iWidth, int & iBasicHeight, int & iOneHeight);
     TQString showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave, TQRect & dlgSize);
-    SnippetItem* makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut );
+    SnippetItem* makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const TDEShortcut& shortcut );
 
     TQPtrList<SnippetItem> _list;
     TQMap<TQString, TQString> _mapSaved;
     TDEConfig * _cfg;
     SnippetConfig _SnippetConfig;
     KMEdit* mEditor;
-    KActionCollection* mActionCollection;
+    TDEActionCollection* mActionCollection;
 
 public slots:
     void slotRemove();
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index f084be379..41a0cb0eb 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -38,282 +38,282 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
   connect( this, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( slotClicked() ) );
 
-  KAction *action;
-  KActionMenu *menu;
+  TDEAction *action;
+  TDEActionMenu *menu;
 
   TQSignalMapper *mapper = new TQSignalMapper( TQT_TQOBJECT(this) );
   connect( mapper, TQT_SIGNAL( mapped(int) ),
            this, TQT_SLOT( slotMapped(int) ) );
 
-  mMenu = new KActionMenu( i18n( "Insert Command..." ), TQT_TQOBJECT(this) );
+  mMenu = new TDEActionMenu( i18n( "Insert Command..." ), TQT_TQOBJECT(this) );
 
   // ******************************************************
-  menu = new KActionMenu( i18n( "Original Message" ), mMenu );
+  menu = new TDEActionMenu( i18n( "Original Message" ), mMenu );
   mMenu->insert( menu );
 
-  action = new KAction( i18n("Quoted Message"),
+  action = new TDEAction( i18n("Quoted Message"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CQuote );
   menu->insert( action );
-  action = new KAction( i18n("Message Text as Is"),
+  action = new TDEAction( i18n("Message Text as Is"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CText );
   menu->insert( action );
-  action = new KAction( i18n("Message Id"),
+  action = new TDEAction( i18n("Message Id"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COMsgId );
   menu->insert( action );
-  action = new KAction( i18n("Date"),
+  action = new TDEAction( i18n("Date"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CODate );
   menu->insert( action );
-  action = new KAction( i18n("Date in Short Format"),
+  action = new TDEAction( i18n("Date in Short Format"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CODateShort );
   menu->insert( action );
-  action = new KAction( i18n("Date in C Locale"),
+  action = new TDEAction( i18n("Date in C Locale"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CODateEn );
   menu->insert( action );
-  action = new KAction( i18n("Day of Week"),
+  action = new TDEAction( i18n("Day of Week"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CODow );
   menu->insert( action );
-  action = new KAction( i18n("Time"),
+  action = new TDEAction( i18n("Time"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COTime );
   menu->insert( action );
-  action = new KAction( i18n("Time in Long Format"),
+  action = new TDEAction( i18n("Time in Long Format"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COTimeLong );
   menu->insert( action );
-  action = new KAction( i18n("Time in C Locale"),
+  action = new TDEAction( i18n("Time in C Locale"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COTimeLongEn );
   menu->insert( action );
-  action = new KAction( i18n("To Field Address"),
+  action = new TDEAction( i18n("To Field Address"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COToAddr );
   menu->insert( action );
-  action = new KAction( i18n("To Field Name"),
+  action = new TDEAction( i18n("To Field Name"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COToName );
   menu->insert( action );
-  action = new KAction( i18n("To Field First Name"),
+  action = new TDEAction( i18n("To Field First Name"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COToFName );
   menu->insert( action );
-  action = new KAction( i18n("To Field Last Name"),
+  action = new TDEAction( i18n("To Field Last Name"),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COToLName );
   menu->insert( action );
-  action = new KAction( i18n( "CC Field Address" ),
+  action = new TDEAction( i18n( "CC Field Address" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COCCAddr );
   menu->insert( action );
-  action = new KAction( i18n( "CC Field Name" ),
+  action = new TDEAction( i18n( "CC Field Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COCCName );
   menu->insert( action );
-  action = new KAction( i18n( "CC Field First Name" ),
+  action = new TDEAction( i18n( "CC Field First Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COCCFName );
   menu->insert( action );
-  action = new KAction( i18n( "CC Field Last Name" ),
+  action = new TDEAction( i18n( "CC Field Last Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COCCLName );
   menu->insert( action );
-  action = new KAction( i18n( "From Field Address" ),
+  action = new TDEAction( i18n( "From Field Address" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COFromAddr );
   menu->insert( action );
-  action = new KAction( i18n( "From Field Name" ),
+  action = new TDEAction( i18n( "From Field Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COFromName );
   menu->insert( action );
-  action = new KAction( i18n( "From Field First Name" ),
+  action = new TDEAction( i18n( "From Field First Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COFromFName );
   menu->insert( action );
-  action = new KAction( i18n( "From Field Last Name" ),
+  action = new TDEAction( i18n( "From Field Last Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COFromLName );
   menu->insert( action );
-  action = new KAction( i18n( "Addresses of all original recipients" ),
+  action = new TDEAction( i18n( "Addresses of all original recipients" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COAddresseesAddr );
-  action = new KAction( i18n( "Subject" ),
+  action = new TDEAction( i18n( "Subject" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COFullSubject );
   menu->insert( action );
-  action = new KAction( i18n( "Quoted Headers" ),
+  action = new TDEAction( i18n( "Quoted Headers" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CTQHeaders );
   menu->insert( action );
-  action = new KAction( i18n( "Headers as Is" ),
+  action = new TDEAction( i18n( "Headers as Is" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CHeaders );
   menu->insert( action );
-  action = new KAction( i18n( "Header Content" ),
+  action = new TDEAction( i18n( "Header Content" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COHeader );
   menu->insert( action );
 
   // ******************************************************
-  menu = new KActionMenu( i18n( "Current Message" ), mMenu );
+  menu = new TDEActionMenu( i18n( "Current Message" ), mMenu );
   mMenu->insert( menu );
 
-  action = new KAction( i18n( "Message Id" ),
+  action = new TDEAction( i18n( "Message Id" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CMsgId );
   menu->insert( action );
-  action = new KAction( i18n( "Date" ),
+  action = new TDEAction( i18n( "Date" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CDate );
   menu->insert( action );
-  action = new KAction( i18n( "Date in Short Format" ),
+  action = new TDEAction( i18n( "Date in Short Format" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CDateShort );
   menu->insert( action );
-  action = new KAction( i18n( "Date in C Locale" ),
+  action = new TDEAction( i18n( "Date in C Locale" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CDateEn );
   menu->insert( action );
-  action = new KAction( i18n( "Day of Week" ),
+  action = new TDEAction( i18n( "Day of Week" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CDow );
   menu->insert( action );
-  action = new KAction( i18n( "Time" ),
+  action = new TDEAction( i18n( "Time" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CTime );
   menu->insert( action );
-  action = new KAction( i18n( "Time in Long Format" ),
+  action = new TDEAction( i18n( "Time in Long Format" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CTimeLong );
   menu->insert( action );
-  action = new KAction( i18n( "Time in C Locale" ),
+  action = new TDEAction( i18n( "Time in C Locale" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CTimeLongEn );
   menu->insert( action );
-  action = new KAction( i18n( "To Field Address" ),
+  action = new TDEAction( i18n( "To Field Address" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CToAddr );
   menu->insert( action );
-  action = new KAction( i18n( "To Field Name" ),
+  action = new TDEAction( i18n( "To Field Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CToName );
   menu->insert( action );
-  action = new KAction( i18n( "To Field First Name" ),
+  action = new TDEAction( i18n( "To Field First Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CToFName );
   menu->insert( action );
-  action = new KAction( i18n( "To Field Last Name" ),
+  action = new TDEAction( i18n( "To Field Last Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CToLName );
   menu->insert( action );
-  action = new KAction( i18n( "CC Field Address" ),
+  action = new TDEAction( i18n( "CC Field Address" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CCCAddr );
   menu->insert( action );
-  action = new KAction( i18n( "CC Field Name" ),
+  action = new TDEAction( i18n( "CC Field Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CCCName );
   menu->insert( action );
-  action = new KAction( i18n( "CC Field First Name" ),
+  action = new TDEAction( i18n( "CC Field First Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CCCFName );
   menu->insert( action );
-  action = new KAction( i18n( "CC Field Last Name" ),
+  action = new TDEAction( i18n( "CC Field Last Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CCCLName );
   menu->insert( action );
-  action = new KAction( i18n( "From Field Address" ),
+  action = new TDEAction( i18n( "From Field Address" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CFromAddr );
   menu->insert( action );
-  action = new KAction( i18n( "From Field Name" ),
+  action = new TDEAction( i18n( "From Field Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CFromName );
   menu->insert( action );
-  action = new KAction( i18n( "From Field First Name" ),
+  action = new TDEAction( i18n( "From Field First Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CFromFName );
   menu->insert( action );
-  action = new KAction( i18n( "From Field Last Name" ),
+  action = new TDEAction( i18n( "From Field Last Name" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CFromLName );
   menu->insert( action );
-  action = new KAction( i18n( "Subject" ),
+  action = new TDEAction( i18n( "Subject" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CFullSubject );
   menu->insert( action );
-  action = new KAction( i18n( "Header Content" ),
+  action = new TDEAction( i18n( "Header Content" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CHeader );
   menu->insert( action );
 
   // ******************************************************
-  menu = new KActionMenu( i18n( "Process With External Programs" ), mMenu );
+  menu = new TDEActionMenu( i18n( "Process With External Programs" ), mMenu );
   mMenu->insert( menu );
 
-  action = new KAction( i18n( "Insert Result of Command" ),
+  action = new TDEAction( i18n( "Insert Result of Command" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CSystem );
   menu->insert( action );
-  action = new KAction( i18n( "Pipe Original Message Body and Insert Result as Quoted Text" ),
+  action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Quoted Text" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CQuotePipe );
   menu->insert( action );
-  action = new KAction( i18n( "Pipe Original Message Body and Insert Result as Is" ),
+  action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Is" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CTextPipe );
   menu->insert( action );
-  action = new KAction( i18n( "Pipe Original Message with Headers and Insert Result as Is" ),
+  action = new TDEAction( i18n( "Pipe Original Message with Headers and Insert Result as Is" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CMsgPipe );
   menu->insert( action );
-  action = new KAction( i18n( "Pipe Current Message Body and Insert Result as Is" ),
+  action = new TDEAction( i18n( "Pipe Current Message Body and Insert Result as Is" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CBodyPipe );
   menu->insert( action );
-  action = new KAction( i18n( "Pipe Current Message Body and Replace with Result" ),
+  action = new TDEAction( i18n( "Pipe Current Message Body and Replace with Result" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CClearPipe );
   menu->insert( action );
 
   // ******************************************************
-  menu = new KActionMenu( i18n( "Miscellaneous" ), mMenu );
+  menu = new TDEActionMenu( i18n( "Miscellaneous" ), mMenu );
   mMenu->insert( menu );
 
-  action = new KAction( i18n( "Set Cursor Position" ),
+  action = new TDEAction( i18n( "Set Cursor Position" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CCursor );
   menu->insert( action );
-  action = new KAction( i18n( "Insert File Content" ),
+  action = new TDEAction( i18n( "Insert File Content" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CInsert );
   menu->insert( action );
-  action = new KAction( i18n( "DNL" ),
+  action = new TDEAction( i18n( "DNL" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CDnl );
   menu->insert( action );
-  action = new KAction( i18n( "Template Comment" ),
+  action = new TDEAction( i18n( "Template Comment" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CRem );
   menu->insert( action );
-  action = new KAction( i18n( "No Operation" ),
+  action = new TDEAction( i18n( "No Operation" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CNop );
   menu->insert( action );
-  action = new KAction( i18n( "Clear Generated Message" ),
+  action = new TDEAction( i18n( "Clear Generated Message" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CClear );
   menu->insert( action );
-  action = new KAction( i18n( "Turn Debug On" ),
+  action = new TDEAction( i18n( "Turn Debug On" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CDebug );
   menu->insert( action );
-  action = new KAction( i18n( "Turn Debug Off" ),
+  action = new TDEAction( i18n( "Turn Debug Off" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, CDebugOff );
   menu->insert( action );
diff --git a/kmail/templatesinsertcommand.h b/kmail/templatesinsertcommand.h
index 26ba889d6..437ad8bdf 100644
--- a/kmail/templatesinsertcommand.h
+++ b/kmail/templatesinsertcommand.h
@@ -25,7 +25,7 @@
 
 #include <tqpushbutton.h>
 
-class KActionMenu;
+class TDEActionMenu;
 
 class TemplatesInsertCommand : public TQPushButton
 {
@@ -57,7 +57,7 @@ class TemplatesInsertCommand : public TQPushButton
     void slotMapped( int cmd );
 
   protected:
-    KActionMenu *mMenu;
+    TDEActionMenu *mMenu;
 };
 
 #endif // TEMPLATESINSERTCOMMAND_H
diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp
index d3e8a045b..bda40c121 100644
--- a/kmail/treebase.cpp
+++ b/kmail/treebase.cpp
@@ -29,7 +29,7 @@ using namespace KMail;
 
 TreeBase::TreeBase( TQWidget *parent, KMFolderTree *folderTree,
         const TQString &preSelection, bool mustBeReadWrite )
-       : KListView( parent ), mFolderTree( folderTree )
+       : TDEListView( parent ), mFolderTree( folderTree )
 {
      Q_UNUSED( preSelection );
      Q_UNUSED( mustBeReadWrite );
@@ -92,7 +92,7 @@ void TreeBase::slotContextMenuRequested( TQListViewItem *lvi,  const TQPoint &p
       if ( !folder || folder->noContent() || folder->noChildren() )
         return;
 
-      KPopupMenu *folderMenu = new KPopupMenu;
+      TDEPopupMenu *folderMenu = new TDEPopupMenu;
       folderMenu->insertTitle( folder->label() );
       folderMenu->insertSeparator();
       folderMenu->insertItem(SmallIconSet("folder_new"),
diff --git a/kmail/treebase.h b/kmail/treebase.h
index 94f0756c5..ff0e68d66 100644
--- a/kmail/treebase.h
+++ b/kmail/treebase.h
@@ -30,7 +30,7 @@ namespace KMail {
 
 class TreeItemBase;
 
-class TreeBase : public KListView
+class TreeBase : public TDEListView
 {
     Q_OBJECT