Rename a number of classes to enhance compatibility with KDE4

1 files changed, 161 insertions, 161 deletions

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