From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmail/kmreadermainwin.cpp | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'kmail/kmreadermainwin.cpp') diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index 375234c0..84060817 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -156,15 +156,15 @@ 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->tqparent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) ); } void KMReaderMainWin::slotFolderRemoved( TQObject* folderPtr ) { assert(mMsg); - assert(folderPtr == mMsg->parent()); - if( mMsg && folderPtr == mMsg->parent() ) + assert(folderPtr == mMsg->tqparent()); + if( mMsg && folderPtr == mMsg->tqparent() ) mMsg->setParent( 0 ); } @@ -181,18 +181,18 @@ void KMReaderMainWin::slotTrashMsg() if ( !mMsg ) return; // find the real msg by its sernum - KMFolder* parent; + KMFolder* tqparent; int index; - KMMsgDict::instance()->getLocation( mMsg->getMsgSerNum(), &parent, &index ); - if ( parent && !parent->isTrash() ) { + KMMsgDict::instance()->getLocation( mMsg->getMsgSerNum(), &tqparent, &index ); + if ( tqparent && !tqparent->isTrash() ) { // open the folder (ref counted) - parent->open("trashmsg"); - KMMessage *msg = parent->getMsg( index ); + tqparent->open("trashmsg"); + KMMessage *msg = tqparent->getMsg( index ); if (msg) { - KMDeleteMsgCommand *command = new KMDeleteMsgCommand( parent, msg ); + KMDeleteMsgCommand *command = new KMDeleteMsgCommand( tqparent, msg ); command->start(); } - parent->close("trashmsg"); + tqparent->close("trashmsg"); } close(); } @@ -235,9 +235,9 @@ void KMReaderMainWin::slotPrintMsg() void KMReaderMainWin::slotForwardInlineMsg() { KMCommand *command = 0; - if ( mReaderWin->message() && mReaderWin->message()->parent() ) { + if ( mReaderWin->message() && mReaderWin->message()->tqparent() ) { command = new KMForwardInlineCommand( this, mReaderWin->message(), - mReaderWin->message()->parent()->identity() ); + mReaderWin->message()->tqparent()->identity() ); } else { command = new KMForwardInlineCommand( this, mReaderWin->message() ); } @@ -250,9 +250,9 @@ void KMReaderMainWin::slotForwardInlineMsg() void KMReaderMainWin::slotForwardAttachedMsg() { KMCommand *command = 0; - if ( mReaderWin->message() && mReaderWin->message()->parent() ) { + if ( mReaderWin->message() && mReaderWin->message()->tqparent() ) { command = new KMForwardAttachedCommand( this, mReaderWin->message(), - mReaderWin->message()->parent()->identity() ); + mReaderWin->message()->tqparent()->identity() ); } else { command = new KMForwardAttachedCommand( this, mReaderWin->message() ); } @@ -265,9 +265,9 @@ void KMReaderMainWin::slotForwardAttachedMsg() void KMReaderMainWin::slotForwardDigestMsg() { KMCommand *command = 0; - if ( mReaderWin->message() && mReaderWin->message()->parent() ) { + if ( mReaderWin->message() && mReaderWin->message()->tqparent() ) { command = new KMForwardDigestCommand( this, mReaderWin->message(), - mReaderWin->message()->parent()->identity() ); + mReaderWin->message()->tqparent()->identity() ); } else { command = new KMForwardDigestCommand( this, mReaderWin->message() ); } @@ -362,8 +362,8 @@ void KMReaderMainWin::setupAccel() //----- Edit Menu KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() ); KStdAction::selectAll( this, TQT_SLOT( slotMarkAll() ), actionCollection() ); - KStdAction::find( this, TQT_SLOT(slotFind()), actionCollection() ); - KStdAction::tqfindNext( this, TQT_SLOT( slotFindNext() ), actionCollection() ); + KStdAction::tqfind( this, TQT_SLOT(slotFind()), actionCollection() ); + KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection() ); mTrashAction = new KAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash", i18n( "Move message to trashcan" ) ), Key_Delete, this, TQT_SLOT( slotTrashMsg() ), @@ -487,9 +487,9 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo return; } - if ( ! ( aMsg.parent() && ( aMsg.parent()->isSent() || - aMsg.parent()->isDrafts() || - aMsg.parent()->isTemplates() ) ) ) { + if ( ! ( aMsg.tqparent() && ( aMsg.tqparent()->isSent() || + aMsg.tqparent()->isDrafts() || + aMsg.tqparent()->isTemplates() ) ) ) { // add the reply and forward actions only if we are not in a sent-mail, // templates or drafts folder // -- cgit v1.2.3