summaryrefslogtreecommitdiffstats
path: root/kmail/kmreaderwin.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmreaderwin.cpp')
-rw-r--r--kmail/kmreaderwin.cpp88
1 files changed, 44 insertions, 44 deletions
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 01486496..0692ec7b 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -470,13 +470,13 @@ KMReaderWin::KMReaderWin(TQWidget *aParent,
mLevelQuote = GlobalSettings::self()->collapseQuoteLevelSpin() - 1;
connect( &mUpdateReaderWinTimer, TQT_SIGNAL(timeout()),
- TQT_TQOBJECT(this), TQT_SLOT(updateReaderWin()) );
+ this, TQT_SLOT(updateReaderWin()) );
connect( &mResizeTimer, TQT_SIGNAL(timeout()),
- TQT_TQOBJECT(this), TQT_SLOT(slotDelayedResize()) );
+ this, TQT_SLOT(slotDelayedResize()) );
connect( &mDelayedMarkTimer, TQT_SIGNAL(timeout()),
- TQT_TQOBJECT(this), TQT_SLOT(slotTouchMessage()) );
+ this, TQT_SLOT(slotTouchMessage()) );
connect( &mHeaderRefreshTimer, TQT_SIGNAL(timeout()),
- TQT_TQOBJECT(this), TQT_SLOT(updateHeader()) );
+ this, TQT_SLOT(updateHeader()) );
}
@@ -492,45 +492,45 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
headerMenu->setToolTip( i18n("Choose display style of message headers") );
connect( headerMenu, TQT_SIGNAL(activated()),
- TQT_TQOBJECT(this), TQT_SLOT(slotCycleHeaderStyles()) );
+ this, TQT_SLOT(slotCycleHeaderStyles()) );
raction = new TDERadioAction( i18n("View->headers->", "&Enterprise Headers"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotEnterpriseHeaders()),
+ 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 TDERadioAction( i18n("View->headers->", "&Fancy Headers"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()),
+ 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 TDERadioAction( i18n("View->headers->", "&Brief Headers"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotBriefHeaders()),
+ 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 TDERadioAction( i18n("View->headers->", "&Standard Headers"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()),
+ 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 TDERadioAction( i18n("View->headers->", "&Long Headers"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotLongHeaders()),
+ 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 TDERadioAction( i18n("View->headers->", "&All Headers"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()),
+ this, TQT_SLOT(slotAllHeaders()),
ac, "view_headers_all" );
raction->setToolTip( i18n("Show all message headers") );
raction->setExclusiveGroup( "view_headers_group" );
@@ -541,38 +541,38 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
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()) );
+ this, TQT_SLOT(slotCycleAttachmentStrategy()) );
raction = new TDERadioAction( i18n("View->attachments->", "&As Icons"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotIconicAttachments()),
+ 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 TDERadioAction( i18n("View->attachments->", "&Smart"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSmartAttachments()),
+ 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 TDERadioAction( i18n("View->attachments->", "&Inline"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()),
+ 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 TDERadioAction( i18n("View->attachments->", "&Hide"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()),
+ 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 TDERadioAction( i18n( "View->attachments->", "In Header &Only" ), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotHeaderOnlyAttachments() ),
+ this, TQT_SLOT( slotHeaderOnlyAttachments() ),
ac, "view_attachments_headeronly" );
mHeaderOnlyAttachmentsAction->setToolTip( i18n( "Show Attachments only in the header of the mail" ) );
mHeaderOnlyAttachmentsAction->setExclusiveGroup( "view_attachments_group" );
@@ -580,7 +580,7 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
// Set Encoding submenu
mSelectEncodingAction = new TDESelectAction( i18n( "&Set Encoding" ), "charset", 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotSetEncoding() ),
+ this, TQT_SLOT( slotSetEncoding() ),
ac, "encoding" );
TQStringList encodings = KMMsgBase::supportedEncodings( false );
encodings.prepend( i18n( "Auto" ) );
@@ -588,44 +588,44 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
mSelectEncodingAction->setCurrentItem( 0 );
mMailToComposeAction = new TDEAction( i18n("New Message To..."), "mail-message-new",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoCompose()), ac,
+ 0, this, TQT_SLOT(slotMailtoCompose()), ac,
"mailto_compose" );
mMailToReplyAction = new TDEAction( i18n("Reply To..."), "mail-reply-sender",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoReply()), ac,
+ 0, this, TQT_SLOT(slotMailtoReply()), ac,
"mailto_reply" );
mMailToForwardAction = new TDEAction( i18n("Forward To..."), "mail-forward",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoForward()), ac,
+ 0, this, TQT_SLOT(slotMailtoForward()), ac,
"mailto_forward" );
mAddAddrBookAction = new TDEAction( i18n("Add to Address Book"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoAddAddrBook()),
+ 0, this, TQT_SLOT(slotMailtoAddAddrBook()),
ac, "add_addr_book" );
mOpenAddrBookAction = new TDEAction( i18n("Open in Address Book"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoOpenAddrBook()),
+ 0, this, TQT_SLOT(slotMailtoOpenAddrBook()),
ac, "openin_addr_book" );
- mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), ac, "kmail_copy");
- mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, TQT_TQOBJECT(this),
+ mCopyAction = KStdAction::copy( this, TQT_SLOT(slotCopySelectedText()), ac, "kmail_copy");
+ mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, this,
TQT_SLOT(selectAll()), ac, "mark_all_text" );
- mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, TQT_TQOBJECT(this),
+ mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, this,
TQT_SLOT(slotUrlCopy()), ac, "copy_url" );
- mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, TQT_TQOBJECT(this),
+ mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, this,
TQT_SLOT(slotUrlOpen()), ac, "open_url" );
mAddBookmarksAction = new TDEAction( i18n("Bookmark This Link"),
"bookmark_add",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmarks()),
+ 0, this, TQT_SLOT(slotAddBookmarks()),
ac, "add_bookmarks" );
- mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, TQT_TQOBJECT(this),
+ mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, this,
TQT_SLOT(slotUrlSave()), ac, "saveas_url" );
mToggleFixFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"),
- Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()),
+ Key_X, this, TQT_SLOT(slotToggleFixedFont()),
ac, "toggle_fixedfont" );
mToggleMimePartTreeAction = new TDEToggleAction( i18n("Show Message Structure"),
0, ac, "toggle_mimeparttree" );
connect(mToggleMimePartTreeAction, TQT_SIGNAL(toggled(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(slotToggleMimePartTree()));
+ this, TQT_SLOT(slotToggleMimePartTree()));
- mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, TQT_TQOBJECT(this),
+ mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, this,
TQT_SLOT(slotIMChat()), ac, "start_im_chat" );
}
@@ -1029,9 +1029,9 @@ void KMReaderWin::initHtmlWidget(void)
connect(mViewer,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),
TQT_SLOT(slotUrlPopup(const TQString &, const TQPoint &)));
connect( kmkernel->imProxy(), TQT_SIGNAL( sigContactPresenceChanged( const TQString & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( contactStatusChanged( const TQString & ) ) );
+ this, TQT_SLOT( contactStatusChanged( const TQString & ) ) );
connect( kmkernel->imProxy(), TQT_SIGNAL( sigPresenceInfoExpired() ),
- TQT_TQOBJECT(this), TQT_SLOT( updateReaderWin() ) );
+ this, TQT_SLOT( updateReaderWin() ) );
}
void KMReaderWin::contactStatusChanged( const TQString &uid)
@@ -1497,7 +1497,7 @@ void KMReaderWin::displayMessage() {
htmlWriter()->queue("</body></html>");
htmlWriter()->flush();
- TQTimer::singleShot( 1, TQT_TQOBJECT(this), TQT_SLOT(injectAttachments()) );
+ TQTimer::singleShot( 1, this, TQT_SLOT(injectAttachments()) );
}
static bool message_was_saved_decrypted_before( const KMMessage * msg ) {
@@ -2065,7 +2065,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo
menu->insertItem( i18n("Scroll To"), 10 );
}
- connect(menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHandleAttachment(int)));
+ connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHandleAttachment(int)));
menu->exec( p ,0 );
delete menu;
}
@@ -2106,7 +2106,7 @@ void KMReaderWin::slotHandleAttachment( int choice )
node, message(), mAtmCurrent, mAtmCurrentName,
KMHandleAttachmentCommand::AttachmentAction( choice ), 0, this );
connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) );
+ this, TQT_SLOT( slotAtmView( int, const TQString& ) ) );
command->start();
} else if ( choice == 7 ) {
slotDeleteAttachment( node );
@@ -2394,7 +2394,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
message(), mAtmCurrent, mAtmCurrentName, KMHandleAttachmentCommand::Save,
offer, this );
connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) );
+ this, TQT_SLOT( slotAtmView( int, const TQString& ) ) );
command->start();
}
else if( choice == KMessageBox::No ) { // Open
@@ -2404,7 +2404,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node,
message(), mAtmCurrent, mAtmCurrentName, action, offer, this );
connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) );
+ this, TQT_SLOT( slotAtmView( int, const TQString& ) ) );
command->start();
} else { // Cancel
kdDebug(5006) << "Canceled opening attachment" << endl;
@@ -2802,7 +2802,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
// case we started a drag. If the event is missed, the HTML view gets into a wrong
// state, in which funny things like unsolicited drags start to happen.
TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), TQt::NoButton, TQt::NoButton );
- TQT_TQOBJECT( mViewer->view() )->eventFilter( mViewer->view()->viewport(),
+ static_cast<TQObject*>(mViewer->view())->eventFilter( mViewer->view()->viewport(),
&mouseEvent );
return true;
}
@@ -2854,9 +2854,9 @@ void KMReaderWin::slotDeleteAttachment(partNode * node)
KMDeleteAttachmentCommand* command = new KMDeleteAttachmentCommand( nodeId, msg, this );
command->start();
connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- TQT_TQOBJECT(this), TQT_SLOT( updateReaderWin() ) );
+ this, TQT_SLOT( updateReaderWin() ) );
connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- TQT_TQOBJECT(this), TQT_SLOT( disconnectMsgAdded() ) );
+ this, TQT_SLOT( disconnectMsgAdded() ) );
// ### HACK: Since the command will do delete + add, a new message will arrive. However, we don't
// want the selection to change. Therefore, as soon as a new message arrives, select it, and then
@@ -2865,7 +2865,7 @@ void KMReaderWin::slotDeleteAttachment(partNode * node)
// And it won't work properly with multiple main windows
const KMHeaders * const headers = KMKernel::self()->getKMMainWidget()->headers();
connect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
- TQT_TQOBJECT(this), TQT_SLOT( msgAdded( TQListViewItem* ) ) );
+ this, TQT_SLOT( msgAdded( TQListViewItem* ) ) );
}
// If we are operating on a copy of parts of the message, make sure to update the copy as well.
@@ -2891,7 +2891,7 @@ void KMReaderWin::disconnectMsgAdded()
{
const KMHeaders *const headers = KMKernel::self()->getKMMainWidget()->headers();
disconnect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
- TQT_TQOBJECT(this), TQT_SLOT( msgAdded( TQListViewItem* ) ) );
+ this, TQT_SLOT( msgAdded( TQListViewItem* ) ) );
}
void KMReaderWin::slotEditAttachment(partNode * node)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 13:52:29 +0000