Rename a number of classes to enhance compatibility with KDE4

1 files changed, 39 insertions, 39 deletions

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