diff options
Diffstat (limited to 'kmail/kmreadermainwin.cpp')
| -rw-r--r-- | kmail/kmreadermainwin.cpp | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index b3a2dbc3a..db42f3fa9 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -103,8 +103,8 @@ void KMReaderMainWin::initKMReaderMainWin() { toolBar( "mainToolBar" )->hide(); } - connect( kmkernel, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotConfigChanged() ) ); + connect( kmkernel, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotConfigChanged() ) ); } void KMReaderMainWin::setupForwardingActionsList() @@ -156,7 +156,7 @@ void KMReaderMainWin::showMsg( const TQString & encoding, KMMessage *msg, menuBar()->show(); toolBar( "mainToolBar" )->show(); - connect ( msg->parent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) ); + connect ( msg->parent(), TQ_SIGNAL( destroyed( TQObject* ) ), this, TQ_SLOT( slotFolderRemoved( TQObject* ) ) ); } @@ -241,8 +241,8 @@ void KMReaderMainWin::slotForwardInlineMsg() } else { command = new KMForwardInlineCommand( this, mReaderWin->message() ); } - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -256,8 +256,8 @@ void KMReaderMainWin::slotForwardAttachedMsg() } else { command = new KMForwardAttachedCommand( this, mReaderWin->message() ); } - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -271,8 +271,8 @@ void KMReaderMainWin::slotForwardDigestMsg() } else { command = new KMForwardDigestCommand( this, mReaderWin->message() ); } - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -280,8 +280,8 @@ void KMReaderMainWin::slotForwardDigestMsg() void KMReaderMainWin::slotRedirectMsg() { KMCommand *command = new KMRedirectCommand( this, mReaderWin->message() ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -299,7 +299,7 @@ void KMReaderMainWin::slotShowMsgSrc() //----------------------------------------------------------------------------- void KMReaderMainWin::setupForwardActions() { - disconnect( mForwardActionMenu, TQT_SIGNAL( activated() ), 0, 0 ); + disconnect( mForwardActionMenu, TQ_SIGNAL( activated() ), 0, 0 ); mForwardActionMenu->remove( mForwardInlineAction ); mForwardActionMenu->remove( mForwardAttachedAction ); @@ -308,16 +308,16 @@ void KMReaderMainWin::setupForwardActions() mForwardActionMenu->insert( mForwardAttachedAction, 1 ); mForwardInlineAction->setShortcut( Key_F ); mForwardAttachedAction->setShortcut( SHIFT+Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotForwardInlineMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardInlineMsg()) ); } else { mForwardActionMenu->insert( mForwardAttachedAction, 0 ); mForwardActionMenu->insert( mForwardInlineAction, 1 ); mForwardInlineAction->setShortcut( SHIFT+Key_F ); mForwardAttachedAction->setShortcut( Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotForwardAttachedMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardAttachedMsg()) ); } } @@ -336,42 +336,42 @@ void KMReaderMainWin::setupAccel() mMsgActions = new KMail::MessageActions( actionCollection(), this ); mMsgActions->setMessageView( mReaderWin ); - connect( mMsgActions, TQT_SIGNAL( replyActionFinished() ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( mMsgActions, TQ_SIGNAL( replyActionFinished() ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); //----- File Menu - //mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ), + //mOpenAction = KStdAction::open( this, TQ_SLOT( slotOpenMsg() ), // actionCollection() ); //mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save", // TDEStdAccel::shortcut( TDEStdAccel::Save ), - // this, TQT_SLOT( slotSaveMsg() ), + // this, TQ_SLOT( slotSaveMsg() ), // actionCollection(), "file_save_as" ); - mSaveAsAction = KStdAction::saveAs( mReaderWin, TQT_SLOT( slotSaveMsg() ), + mSaveAsAction = KStdAction::saveAs( mReaderWin, TQ_SLOT( slotSaveMsg() ), actionCollection() ); mSaveAsAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Save ) ); - mPrintAction = KStdAction::print( this, TQT_SLOT( slotPrintMsg() ), + mPrintAction = KStdAction::print( this, TQ_SLOT( slotPrintMsg() ), actionCollection() ); - TDEAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() ); + TDEAction *closeAction = KStdAction::close( this, TQ_SLOT( close() ), actionCollection() ); TDEShortcut closeShortcut = closeAction->shortcut(); closeShortcut.append( KKey(Key_Escape)); closeAction->setShortcut(closeShortcut); //----- Edit Menu - KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() ); - KStdAction::selectAll( this, TQT_SLOT( slotMarkAll() ), actionCollection() ); - KStdAction::find( this, TQT_SLOT(slotFind()), actionCollection() ); - KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection() ); + KStdAction::copy( this, TQ_SLOT( slotCopy() ), actionCollection() ); + KStdAction::selectAll( this, TQ_SLOT( slotMarkAll() ), actionCollection() ); + KStdAction::find( this, TQ_SLOT(slotFind()), actionCollection() ); + KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), actionCollection() ); mTrashAction = new TDEAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash", i18n( "Move message to trashcan" ) ), - Key_Delete, this, TQT_SLOT( slotTrashMsg() ), + Key_Delete, this, TQ_SLOT( slotTrashMsg() ), actionCollection(), "move_to_trash" ); //----- View Menu mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, this, - TQT_SLOT(slotShowMsgSrc()), actionCollection(), + TQ_SLOT(slotShowMsgSrc()), actionCollection(), "view_source" ); @@ -380,25 +380,25 @@ void KMReaderMainWin::setupAccel() "message_forward" ); mForwardInlineAction = new TDEAction( i18n("&Inline..."), "mail-forward", SHIFT+Key_F, this, - TQT_SLOT(slotForwardInlineMsg()), + TQ_SLOT(slotForwardInlineMsg()), actionCollection(), "message_forward_inline" ); mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), "mail-forward", Key_F, this, - TQT_SLOT(slotForwardAttachedMsg()), + TQ_SLOT(slotForwardAttachedMsg()), actionCollection(), "message_forward_as_attachment" ); mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), "mail-forward", 0, this, - TQT_SLOT(slotForwardDigestMsg()), + TQ_SLOT(slotForwardDigestMsg()), actionCollection(), "message_forward_as_digest" ); mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), "mail-forward", Key_E, this, - TQT_SLOT(slotRedirectMsg()), + TQ_SLOT(slotRedirectMsg()), actionCollection(), "message_forward_redirect" ); @@ -410,32 +410,32 @@ void KMReaderMainWin::setupAccel() 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& ) ) ); + connect( fontAction, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotFontAction( const TQString& ) ) ); fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(), "text_size" ); fontSizeAction->setFontSize( mReaderWin->cssHelper()->bodyFont().pointSize() ); - connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_SLOT( slotSizeAction( int ) ) ); + connect( fontSizeAction, TQ_SIGNAL( fontSizeChanged( int ) ), + TQ_SLOT( slotSizeAction( int ) ) ); TQAccel *accel = new TQAccel(mReaderWin, "showMsg()"); accel->connectItem(accel->insertItem(Key_Up), - mReaderWin, TQT_SLOT(slotScrollUp())); + mReaderWin, TQ_SLOT(slotScrollUp())); accel->connectItem(accel->insertItem(Key_Down), - mReaderWin, TQT_SLOT(slotScrollDown())); + mReaderWin, TQ_SLOT(slotScrollDown())); accel->connectItem(accel->insertItem(Key_Prior), - mReaderWin, TQT_SLOT(slotScrollPrior())); + mReaderWin, TQ_SLOT(slotScrollPrior())); accel->connectItem(accel->insertItem(Key_Next), - mReaderWin, TQT_SLOT(slotScrollNext())); + mReaderWin, TQ_SLOT(slotScrollNext())); 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&))); - connect(mReaderWin, TQT_SIGNAL(urlClicked(const KURL&,int)), - mReaderWin, TQT_SLOT(slotUrlClicked())); + mReaderWin, TQ_SLOT(slotCopySelectedText())); + connect( mReaderWin, TQ_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), + this, TQ_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); + connect(mReaderWin, TQ_SIGNAL(urlClicked(const KURL&,int)), + mReaderWin, TQ_SLOT(slotUrlClicked())); setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); } @@ -513,7 +513,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo menu->insertSeparator(); mPrintAction->plug( menu ); mSaveAsAction->plug( menu ); - menu->insertItem( i18n("Save Attachments..."), mReaderWin, TQT_SLOT(slotSaveAttachments()) ); + menu->insertItem( i18n("Save Attachments..."), mReaderWin, TQ_SLOT(slotSaveAttachments()) ); mMsgActions->createTodoAction()->plug( menu ); } menu->exec(aPoint, 0); @@ -561,7 +561,7 @@ void KMReaderMainWin::slotEditToolbars() { saveMainWindowSettings( KMKernel::config(), "ReaderWindow" ); KEditToolbar dlg( guiFactory(), this ); - connect( &dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(slotUpdateToolbars()) ); + connect( &dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(slotUpdateToolbars()) ); dlg.exec(); } |