Rename a number of classes to enhance compatibility with KDE4

1 files changed, 18 insertions, 18 deletions

diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index 92ab049ca..8cef9ce36 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -16,7 +16,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 //
-// A toplevel KMainWindow derived class for displaying
+// A toplevel TDEMainWindow derived class for displaying
 // single messages or single message parts.
 //
 // Could be extended to include support for normal main window
@@ -109,7 +109,7 @@ void KMReaderMainWin::initKMReaderMainWin() {
 
 void KMReaderMainWin::setupForwardingActionsList()
 {
-  TQPtrList<KAction> mForwardActionList;
+  TQPtrList<TDEAction> mForwardActionList;
   if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
       unplugActionList( "forward_action_list" );
       mForwardActionList.append( mForwardInlineAction );
@@ -343,19 +343,19 @@ void KMReaderMainWin::setupAccel()
   //mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ),
   //                                actionCollection() );
 
-  //mSaveAsAction = new KAction( i18n("Save &As..."), "filesave",
-  //                             KStdAccel::shortcut( KStdAccel::Save ),
+  //mSaveAsAction = new TDEAction( i18n("Save &As..."), "filesave",
+  //                             TDEStdAccel::shortcut( TDEStdAccel::Save ),
   //                             this, TQT_SLOT( slotSaveMsg() ),
   //                             actionCollection(), "file_save_as" );
 
   mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(mReaderWin), TQT_SLOT( slotSaveMsg() ),
 				      actionCollection() );
-  mSaveAsAction->setShortcut( KStdAccel::shortcut( KStdAccel::Save ) );
+  mSaveAsAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Save ) );
   mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrintMsg() ),
                                     actionCollection() );
 
-  KAction *closeAction = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
-  KShortcut closeShortcut = closeAction->shortcut();
+  TDEAction *closeAction = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+  TDEShortcut closeShortcut = closeAction->shortcut();
   closeShortcut.append( KKey(Key_Escape));
   closeAction->setShortcut(closeShortcut);
 
@@ -364,39 +364,39 @@ void KMReaderMainWin::setupAccel()
   KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotMarkAll() ), actionCollection() );
   KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection() );
   KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), actionCollection() );
-  mTrashAction = new KAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash",
+  mTrashAction = new TDEAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash",
                               i18n( "Move message to trashcan" ) ),
                               Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotTrashMsg() ),
                               actionCollection(), "move_to_trash" );
 
   //----- View Menu
-  mViewSourceAction = new KAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this),
+  mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this),
                                    TQT_SLOT(slotShowMsgSrc()), actionCollection(),
                                    "view_source" );
 
 
-  mForwardActionMenu = new KActionMenu( i18n("Message->","&Forward"),
+  mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"),
 					"mail_forward", actionCollection(),
 					"message_forward" );
-      mForwardInlineAction = new KAction( i18n("&Inline..."),
+      mForwardInlineAction = new TDEAction( i18n("&Inline..."),
                                       "mail_forward", SHIFT+Key_F, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotForwardInlineMsg()),
                                       actionCollection(),
                                       "message_forward_inline" );
 
-      mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."),
+      mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
                                         "mail_forward", Key_F, TQT_TQOBJECT(this),
                                         TQT_SLOT(slotForwardAttachedMsg()),
                                         actionCollection(),
                                         "message_forward_as_attachment" );
 
-      mForwardDigestAction = new KAction( i18n("Message->Forward->","As Di&gest..."),
+      mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
                                       "mail_forward", 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotForwardDigestMsg()),
                                       actionCollection(),
                                       "message_forward_as_digest" );
 
-      mRedirectAction = new KAction( i18n("Message->Forward->","&Redirect..."),
+      mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
                                  "mail_forward", Key_E, TQT_TQOBJECT(this),
                                  TQT_SLOT(slotRedirectMsg()),
                                  actionCollection(),
@@ -407,12 +407,12 @@ void KMReaderMainWin::setupAccel()
   mForwardActionMenu->insert( mForwardDigestAction );
   mForwardActionMenu->insert( mRedirectAction );
 
-  fontAction = new KFontAction( "Select Font", 0, actionCollection(),
+  fontAction = new TDEFontAction( "Select Font", 0, actionCollection(),
                                "text_font" );
   fontAction->setFont( mReaderWin->cssHelper()->bodyFont().family() );
   connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ),
            TQT_SLOT( slotFontAction( const TQString& ) ) );
-  fontSizeAction = new KFontSizeAction( "Select Size", 0, actionCollection(),
+  fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(),
                                        "text_size" );
   fontSizeAction->setFontSize( mReaderWin->cssHelper()->bodyFont().pointSize() );
   connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ),
@@ -427,7 +427,7 @@ void KMReaderMainWin::setupAccel()
                      mReaderWin, TQT_SLOT(slotScrollPrior()));
   accel->connectItem(accel->insertItem(Key_Next),
                      mReaderWin, TQT_SLOT(slotScrollNext()));
-  accel->connectItem(accel->insertItem(KStdAccel::shortcut(KStdAccel::Copy)),
+  accel->connectItem(accel->insertItem(TDEStdAccel::shortcut(TDEStdAccel::Copy)),
                      mReaderWin, TQT_SLOT(slotCopySelectedText()));
   connect( mReaderWin, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)),
 	  this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&)));
@@ -441,7 +441,7 @@ void KMReaderMainWin::setupAccel()
 
 void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPoint& aPoint)
 {
-  KPopupMenu * menu = new KPopupMenu;
+  TDEPopupMenu * menu = new TDEPopupMenu;
   mUrl = aUrl;
   mMsg = &aMsg;
   bool urlMenuAdded=false;