Rename many classes and header files to avoid conflicts with KDE4

1 files changed, 23 insertions, 23 deletions

diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 94d0e6741..155e00be6 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -25,10 +25,10 @@
 
 #include <kopenwith.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
-#include <kaccelmanager.h>
+#include <tdepopupmenu.h>
+#include <tdeaccelmanager.h>
 #include <kglobalsettings.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kkeydialog.h>
 #include <kcharsets.h>
 #include <knotifyclient.h>
@@ -40,7 +40,7 @@
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 #include <kaddrbook.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kstringhandler.h>
 
 #include "globalsettings.h"
@@ -94,7 +94,7 @@ using KMail::AntiSpamWizard;
 #include "filterlogdlg.h"
 using KMail::FilterLogDialog;
 #include <headerlistquicksearch.h>
-#include "klistviewindexedsearchline.h"
+#include "tdelistviewindexedsearchline.h"
 using KMail::HeaderListQuickSearch;
 #include "kmheaders.h"
 #include "mailinglistpropertiesdialog.h"
@@ -114,7 +114,7 @@ using KMail::HeaderListQuickSearch;
 #include <assert.h>
 #include <kstatusbar.h>
 #include <kstaticdeleter.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <kmime_mdn.h>
 #include <kmime_header_parsing.h>
@@ -625,7 +625,7 @@ void KMMainWidget::createWidgets(void)
           this, TQT_SLOT(slotMsgActivated(KMMessage*)));
   connect( mHeaders, TQT_SIGNAL( selectionChanged() ),
            TQT_SLOT( startUpdateMessageActionsTimer() ) );
-  TQAccel *accel = actionCollection()->kaccel();
+  TQAccel *accel = actionCollection()->tdeaccel();
   accel->connectItem(accel->insertItem(SHIFT+Key_Left),
                      mHeaders, TQT_SLOT(selectPrevMessage()));
   accel->connectItem(accel->insertItem(SHIFT+Key_Right),
@@ -664,17 +664,17 @@ void KMMainWidget::createWidgets(void)
   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() );
+  mMoveMsgToFolderAction->plugAccel( actionCollection()->tdeaccel() );
 
   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->plugAccel( actionCollection()->tdeaccel() );
 
   action = new TDEAction( i18n("Jump to Folder"), Key_J, TQT_TQOBJECT(this),
                TQT_SLOT(slotJumpToFolder()), actionCollection(),
                "jump_to_folder" );
-  action->plugAccel( actionCollection()->kaccel() );
+  action->plugAccel( actionCollection()->tdeaccel() );
 
   // create list of folders
   mFolderViewSplitter = new TQSplitter( Qt::Vertical, mFolderViewParent );
@@ -716,42 +716,42 @@ void KMMainWidget::createWidgets(void)
   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->plugAccel( actionCollection()->tdeaccel() );
 
   action = new TDEAction(
     i18n("Abort Current Operation"), Key_Escape, ProgressManager::instance(),
     TQT_SLOT(slotAbortAll()), actionCollection(), "cancel" );
-  action->plugAccel( actionCollection()->kaccel() );
+  action->plugAccel( actionCollection()->tdeaccel() );
 
   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->plugAccel( actionCollection()->tdeaccel() );
 
   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->plugAccel( actionCollection()->tdeaccel() );
 
   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->plugAccel( actionCollection()->tdeaccel() );
 
   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->plugAccel( actionCollection()->tdeaccel() );
 
   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->plugAccel( actionCollection()->tdeaccel() );
 
   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() );
+  action->plugAccel( actionCollection()->tdeaccel() );
 
   connect( kmkernel->outboxFolder(), TQT_SIGNAL( msgRemoved(int, TQString) ),
            TQT_SLOT( startUpdateMessageActionsTimer() ) );
@@ -2756,7 +2756,7 @@ void KMMainWidget::setupActions()
    * as a part, though. */
   mDeleteAction = new TDEAction( i18n("&Delete"), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
                               TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" );
-  mDeleteAction->plugAccel( actionCollection()->kaccel() );
+  mDeleteAction->plugAccel( actionCollection()->tdeaccel() );
 
   mTrashThreadAction = new TDEAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash",
                                        i18n("Move thread to trashcan") ),
@@ -2858,7 +2858,7 @@ void KMMainWidget::setupActions()
   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() );
+  newToML->plugAccel( actionCollection()->tdeaccel() );
 
   mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"),
 					"mail_forward", actionCollection(),
@@ -2927,7 +2927,7 @@ void KMMainWidget::setupActions()
   mUseAction = new TDEAction( i18n("New Message From &Template"), "filenew",
                             Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotUseTemplate() ),
                             actionCollection(), "use_template" );
-  mUseAction->plugAccel( actionCollection()->kaccel() );
+  mUseAction->plugAccel( actionCollection()->tdeaccel() );
 
   //----- "Mark Thread" submenu
   mThreadStatusMenu = new TDEActionMenu ( i18n( "Mark &Thread" ),
@@ -3060,7 +3060,7 @@ void KMMainWidget::setupActions()
   TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, TQT_TQOBJECT(this),
                         TQT_SLOT( slotDisplayCurrentMessage() ), actionCollection(),
                         "display_message" );
-  dukeOfMonmoth->plugAccel( actionCollection()->kaccel() );
+  dukeOfMonmoth->plugAccel( actionCollection()->tdeaccel() );
 
   //----- Go Menu
   new TDEAction( KGuiItem( i18n("&Next Message"), TQString(),
@@ -3938,7 +3938,7 @@ void KMMainWidget::updateFileMenu()
 //-----------------------------------------------------------------------------
 void KMMainWidget::setAccelsEnabled( bool enabled )
 {
-  actionCollection()->kaccel()->setEnabled( enabled );
+  actionCollection()->tdeaccel()->setEnabled( enabled );
 }