Rename a number of classes to enhance compatibility with KDE4

1 files changed, 80 insertions, 80 deletions

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" );