summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
Diffstat (limited to 'kmail')
-rw-r--r--kmail/accountdialog.cpp4
-rw-r--r--kmail/configuredialog.cpp2
-rw-r--r--kmail/foldertreebase.cpp2
-rw-r--r--kmail/headerlistquicksearch.cpp2
-rw-r--r--kmail/imapaccountbase.cpp8
-rw-r--r--kmail/kmcomposewin.cpp178
-rw-r--r--kmail/kmedit.cpp6
-rw-r--r--kmail/kmfoldertree.cpp4
-rw-r--r--kmail/kmheaders.cpp6
-rw-r--r--kmail/kmmainwidget.cpp258
-rw-r--r--kmail/kmmainwin.cpp10
-rw-r--r--kmail/kmmsgpartdlg.cpp2
-rw-r--r--kmail/kmreadermainwin.cpp30
-rw-r--r--kmail/kmreaderwin.cpp88
-rw-r--r--kmail/kmsearchpatternedit.cpp2
-rw-r--r--kmail/kmservertest.cpp2
-rw-r--r--kmail/kmtransport.cpp2
-rw-r--r--kmail/regexplineedit.cpp2
-rw-r--r--kmail/rulewidgethandlermanager.cpp26
-rw-r--r--kmail/searchwindow.cpp76
-rw-r--r--kmail/templatesinsertcommand.cpp4
-rw-r--r--kmail/vacationdialog.cpp2
22 files changed, 358 insertions, 358 deletions
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 657624f75..417ec4d17 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -618,7 +618,7 @@ void AccountDialog::makePopAccountPage()
label = new TQLabel( i18n("&Port:"), page1 );
grid->addWidget( label, 4, 0 );
mPop.portEdit = new KLineEdit( page1 );
- mPop.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) );
+ mPop.portEdit->setValidator( new TQIntValidator(this) );
label->setBuddy( mPop.portEdit );
grid->addWidget( mPop.portEdit, 4, 1 );
@@ -891,7 +891,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
label = new TQLabel( i18n("&Port:"), page1 );
grid->addWidget( label, row, 0 );
mImap.portEdit = new KLineEdit( page1 );
- mImap.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) );
+ mImap.portEdit->setValidator( new TQIntValidator(this) );
label->setBuddy( mImap.portEdit );
grid->addWidget( mImap.portEdit, row, 1 );
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 040dba3bd..68c1faf57 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -3376,7 +3376,7 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char *
mMessageIdSuffixEdit = new KLineEdit( this );
// only ASCII letters, digits, plus, minus and dots are allowed
mMessageIdSuffixValidator =
- new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), TQT_TQOBJECT(this) );
+ new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), this );
mMessageIdSuffixEdit->setValidator( mMessageIdSuffixValidator );
label = new TQLabel( mMessageIdSuffixEdit,
i18n("Custom message-&id suffix:"), this );
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 9d18138a9..10d7af2f1 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -235,7 +235,7 @@ void FolderTreeBase::handleMailListDrop(TQDropEvent * event, KMFolder *destinati
else
action = dndMode();
if ( action == DRAG_COPY || action == DRAG_MOVE ) {
- new MessageCopyHelper( serNums, destination, action == DRAG_MOVE, TQT_TQOBJECT(this) );
+ new MessageCopyHelper( serNums, destination, action == DRAG_MOVE, this );
}
}
}
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index 210b91b92..dd93a952a 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -57,7 +57,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
TQApplication::reverseLayout()
? "clear_left"
: "locationbar_erase",
- 0, TQT_TQOBJECT(this),
+ 0, this,
TQT_SLOT( reset() ),
actionCollection,
"reset_quicksearch" );
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 40ff81f76..bc197cee5 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -958,7 +958,7 @@ namespace KMail {
if ( errorCode == TDEIO::ERR_SERVER_TIMEOUT || errorCode == TDEIO::ERR_CONNECTION_BROKEN ) {
msg = i18n("The connection to the server %1 was unexpectedly closed or timed out. It will be re-established automatically if possible.").
arg( name() );
- KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), msg, caption, "kmailConnectionBrokenErrorDialog" );
+ KMessageBox::information( kapp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" );
// Show it in the status bar, in case the user has ticked "don't show again"
if ( errorCode == TDEIO::ERR_CONNECTION_BROKEN )
KPIM::BroadcastStatus::instance()->setStatusMsg(
@@ -968,9 +968,9 @@ namespace KMail {
i18n( "The connection to account %1 timed out." ).arg( name() ) );
} else {
if ( !errors.isEmpty() )
- KMessageBox::detailedError( TQT_TQWIDGET(kapp->activeWindow()), msg, errors.join("\n").prepend("<qt>"), caption );
+ KMessageBox::detailedError( kapp->activeWindow(), msg, errors.join("\n").prepend("<qt>"), caption );
else
- KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()), msg, caption );
+ KMessageBox::error( kapp->activeWindow(), msg, caption );
}
} else { // i.e. we have a chance to continue, ask the user about it
if ( errors.count() >= 3 ) { // there is no detailedWarningContinueCancel... (#86517)
@@ -978,7 +978,7 @@ namespace KMail {
msg = TQString( "<qt>") + context + error + '\n' + errors[2];
caption = errors[0];
}
- int ret = KMessageBox::warningContinueCancel( TQT_TQWIDGET(kapp->activeWindow()), msg, caption );
+ int ret = KMessageBox::warningContinueCancel( kapp->activeWindow(), msg, caption );
if ( ret == KMessageBox::Cancel ) {
jobsKilled = true;
killAllJobs( false );
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 7e02e403a..9815a17b1 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -455,7 +455,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
connect(kmkernel->dimapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)),
TQT_SLOT(slotFolderRemoved(KMFolder*)));
connect( kmkernel, TQT_SIGNAL( configChanged() ),
- TQT_TQOBJECT(this), TQT_SLOT( slotConfigChanged() ) );
+ this, TQT_SLOT( slotConfigChanged() ) );
connect (mEditor, TQT_SIGNAL (spellcheck_done(int)),
this, TQT_SLOT (slotSpellcheckDone (int)));
@@ -816,7 +816,7 @@ void KMComposeWin::autoSaveMessage()
mAutoSaveTimer->stop();
connect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotContinueAutoSave() ) );
+ this, TQT_SLOT( slotContinueAutoSave() ) );
// This method is called when KMail crashed, so don't try signing/encryption
// and don't disable controls because it is also called from a timer and
// then the disabling is distracting.
@@ -828,7 +828,7 @@ void KMComposeWin::autoSaveMessage()
void KMComposeWin::slotContinueAutoSave()
{
disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotContinueAutoSave() ) );
+ this, TQT_SLOT( slotContinueAutoSave() ) );
// Ok, it's done now - continue dead letter saving
if ( mComposedMessages.isEmpty() ) {
@@ -1233,13 +1233,13 @@ void KMComposeWin::setupActions(void)
{
//default = send now, alternative = queue
( void ) new TDEAction( i18n("&Send Mail"), "mail-send", CTRL+Key_Return,
- TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_default");
+ this, TQT_SLOT(slotSendNow()), actionCollection(),"send_default");
// FIXME: change to mail_send_via icon when this exits.
actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send",
actionCollection(), "send_default_via" );
- (void) new TDEAction (i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction (i18n("Send &Later"), "queue", 0, this,
TQT_SLOT(slotSendLater()), actionCollection(),"send_alternative");
actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue",
actionCollection(), "send_alternative_via" );
@@ -1250,12 +1250,12 @@ void KMComposeWin::setupActions(void)
//default = queue, alternative = send now
(void) new TDEAction (i18n("Send &Later"), "queue",
CTRL+Key_Return,
- TQT_TQOBJECT(this), TQT_SLOT(slotSendLater()), actionCollection(),"send_default");
+ this, TQT_SLOT(slotSendLater()), actionCollection(),"send_default");
actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue",
actionCollection(), "send_default_via" );
( void ) new TDEAction( i18n("&Send Mail"), "mail-send", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative");
+ this, TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative");
// FIXME: change to mail_send_via icon when this exits.
actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send",
@@ -1290,78 +1290,78 @@ void KMComposeWin::setupActions(void)
(void) new TDEAction (i18n("Save as &Draft"), "document-save", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSaveDraft()),
+ this, TQT_SLOT(slotSaveDraft()),
actionCollection(), "save_in_drafts");
(void) new TDEAction (i18n("Save as &Template"), "document-save", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSaveTemplate()),
+ this, TQT_SLOT(slotSaveTemplate()),
actionCollection(), "save_in_templates");
(void) new TDEAction (i18n("&Insert File..."), "document-open", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()),
+ this, TQT_SLOT(slotInsertFile()),
actionCollection(), "insert_file");
mRecentAction = new TDERecentFilesAction (i18n("&Insert File Recent"),
"document-open", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotInsertRecentFile(const KURL&)),
+ this, TQT_SLOT(slotInsertRecentFile(const KURL&)),
actionCollection(), "insert_file_recent");
mRecentAction->loadEntries( KMKernel::config() );
(void) new TDEAction (i18n("&Address Book"), "contents",0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAddrBook()),
+ this, TQT_SLOT(slotAddrBook()),
actionCollection(), "addressbook");
(void) new TDEAction (i18n("&New Composer"), "mail-message-new",
TDEStdAccel::shortcut(TDEStdAccel::New),
- TQT_TQOBJECT(this), TQT_SLOT(slotNewComposer()),
+ this, TQT_SLOT(slotNewComposer()),
actionCollection(), "new_composer");
(void) new TDEAction (i18n("New Main &Window"), "window-new", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()),
+ this, TQT_SLOT(slotNewMailReader()),
actionCollection(), "open_mailreader");
if ( !mClassicalRecipients ) {
- new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, TQT_TQOBJECT(mRecipientsEditor),
+ new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, mRecipientsEditor,
TQT_SLOT( selectRecipients() ), actionCollection(), "select_recipients" );
- new TDEAction( i18n("Save &Distribution List..."), 0, TQT_TQOBJECT(mRecipientsEditor),
+ new TDEAction( i18n("Save &Distribution List..."), 0, mRecipientsEditor,
TQT_SLOT( saveDistributionList() ), actionCollection(),
"save_distribution_list" );
}
- //KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(), actionCollection(), "save_message");
- KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection());
- KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection());
+ //KStdAction::save(this, TQT_SLOT(), actionCollection(), "save_message");
+ KStdAction::print (this, TQT_SLOT(slotPrint()), actionCollection());
+ KStdAction::close (this, TQT_SLOT(slotClose()), actionCollection());
- KStdAction::undo (TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection());
- KStdAction::redo (TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection());
- KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection());
- KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection());
- KStdAction::pasteText (TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()), actionCollection());
- KStdAction::selectAll (TQT_TQOBJECT(this), TQT_SLOT(slotMarkAll()), actionCollection());
+ KStdAction::undo (this, TQT_SLOT(slotUndo()), actionCollection());
+ KStdAction::redo (this, TQT_SLOT(slotRedo()), actionCollection());
+ KStdAction::cut (this, TQT_SLOT(slotCut()), actionCollection());
+ KStdAction::copy (this, TQT_SLOT(slotCopy()), actionCollection());
+ KStdAction::pasteText (this, TQT_SLOT(slotPasteClipboard()), actionCollection());
+ KStdAction::selectAll (this, TQT_SLOT(slotMarkAll()), actionCollection());
- KStdAction::find (TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection());
- KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotSearchAgain()), actionCollection());
+ KStdAction::find (this, TQT_SLOT(slotFind()), actionCollection());
+ KStdAction::findNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
- KStdAction::replace (TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), actionCollection());
- KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling");
+ KStdAction::replace (this, TQT_SLOT(slotReplace()), actionCollection());
+ KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling");
- mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsQuotation()),
+ mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,this,TQT_SLOT( slotPasteClipboardAsQuotation()),
actionCollection(), "paste_quoted");
- (void) new TDEAction (i18n("Paste as Attac&hment"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsAttachment()),
+ (void) new TDEAction (i18n("Paste as Attac&hment"),0,this,TQT_SLOT( slotPasteClipboardAsAttachment()),
actionCollection(), "paste_att");
- TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(this),
+ TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, this,
TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote");
connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)),
addq, TQT_SLOT(setEnabled(bool)) );
- TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, TQT_TQOBJECT(this),
+ TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, this,
TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote");
connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)),
remq, TQT_SLOT(setEnabled(bool)) );
- (void) new TDEAction (i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanSpace()),
+ (void) new TDEAction (i18n("Cl&ean Spaces"), 0, this, TQT_SLOT(slotCleanSpace()),
actionCollection(), "clean_spaces");
- mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, TQT_TQOBJECT(this),
+ mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, this,
TQT_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" );
mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() );
@@ -1375,7 +1375,7 @@ void KMComposeWin::setupActions(void)
mRequestMDNAction->setChecked(GlobalSettings::self()->requestMDN());
//----- Message-Encoding Submenu
mEncodingAction = new TDESelectAction( i18n( "Se&t Encoding" ), "charset",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetCharset() ),
+ 0, this, TQT_SLOT(slotSetCharset() ),
actionCollection(), "charsets" );
mWordWrapAction = new TDEToggleAction (i18n("&Wordwrap"), 0,
actionCollection(), "wordwrap");
@@ -1395,7 +1395,7 @@ void KMComposeWin::setupActions(void)
mAutoSpellCheckingAction->setChecked( !GlobalSettings::self()->useExternalEditor() && spellChecking );
slotAutoSpellCheckingToggled( !GlobalSettings::self()->useExternalEditor() && spellChecking );
connect( mAutoSpellCheckingAction, TQT_SIGNAL( toggled( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotAutoSpellCheckingToggled( bool ) ) );
+ this, TQT_SLOT( slotAutoSpellCheckingToggled( bool ) ) );
TQStringList encodings = KMMsgBase::supportedEncodings(true);
encodings.prepend( i18n("Auto-Detect"));
@@ -1403,84 +1403,84 @@ void KMComposeWin::setupActions(void)
mEncodingAction->setCurrentItem( -1 );
//these are checkable!!!
- markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, TQT_TQOBJECT(this),
+ markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, this,
TQT_SLOT(slotToggleMarkup()),
actionCollection(), "html");
- mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, TQT_TQOBJECT(this),
+ mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, this,
TQT_SLOT(slotView()),
actionCollection(), "show_all_fields");
- mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, TQT_TQOBJECT(this),
+ mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, this,
TQT_SLOT(slotView()),
actionCollection(), "show_identity");
- mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, TQT_TQOBJECT(this),
+ mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, this,
TQT_SLOT(slotView()),
actionCollection(), "show_dictionary");
- mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, TQT_TQOBJECT(this),
+ mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, this,
TQT_SLOT(slotView()),
actionCollection(), "show_fcc");
- mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, TQT_TQOBJECT(this),
+ mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, this,
TQT_SLOT(slotView()),
actionCollection(), "show_transport");
- mFromAction = new TDEToggleAction (i18n("&From"), 0, TQT_TQOBJECT(this),
+ mFromAction = new TDEToggleAction (i18n("&From"), 0, this,
TQT_SLOT(slotView()),
actionCollection(), "show_from");
- mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, TQT_TQOBJECT(this),
+ mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, this,
TQT_SLOT(slotView()),
actionCollection(), "show_reply_to");
if ( mClassicalRecipients ) {
- mToAction = new TDEToggleAction (i18n("&To"), 0, TQT_TQOBJECT(this),
+ mToAction = new TDEToggleAction (i18n("&To"), 0, this,
TQT_SLOT(slotView()),
actionCollection(), "show_to");
- mCcAction = new TDEToggleAction (i18n("&CC"), 0, TQT_TQOBJECT(this),
+ mCcAction = new TDEToggleAction (i18n("&CC"), 0, this,
TQT_SLOT(slotView()),
actionCollection(), "show_cc");
- mBccAction = new TDEToggleAction (i18n("&BCC"), 0, TQT_TQOBJECT(this),
+ mBccAction = new TDEToggleAction (i18n("&BCC"), 0, this,
TQT_SLOT(slotView()),
actionCollection(), "show_bcc");
}
- mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, TQT_TQOBJECT(this),
+ mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, this,
TQT_SLOT(slotView()),
actionCollection(), "show_subject");
//end of checkable
- mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, TQT_TQOBJECT(this),
+ mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, this,
TQT_SLOT(slotAppendSignature()),
actionCollection(), "append_signature");
- mPrependSignatureAction = new TDEAction (i18n("Prepend S&ignature"), 0, TQT_TQOBJECT(this),
+ mPrependSignatureAction = new TDEAction (i18n("Prepend S&ignature"), 0, this,
TQT_SLOT(slotPrependSignature()),
actionCollection(), "prepend_signature");
- mInsertSignatureAction = new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, TQT_TQOBJECT(this),
+ mInsertSignatureAction = new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, this,
TQT_SLOT(slotInsertSignatureAtCursor()),
actionCollection(), "insert_signature_at_cursor_position");
- mAttachPK = new TDEAction (i18n("Attach &Public Key..."), 0, TQT_TQOBJECT(this),
+ mAttachPK = new TDEAction (i18n("Attach &Public Key..."), 0, this,
TQT_SLOT(slotInsertPublicKey()),
actionCollection(), "attach_public_key");
- mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, TQT_TQOBJECT(this),
+ mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, this,
TQT_SLOT(slotInsertMyPublicKey()),
actionCollection(), "attach_my_public_key");
(void) new TDEAction (i18n("&Attach File..."), "attach",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()),
+ 0, this, TQT_SLOT(slotAttachFile()),
actionCollection(), "attach");
- mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, TQT_TQOBJECT(this),
+ mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, this,
TQT_SLOT(slotAttachRemove()),
actionCollection(), "remove");
mAttachSaveAction = new TDEAction (i18n("&Save Attachment As..."), "document-save",0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachSave()),
+ this, TQT_SLOT(slotAttachSave()),
actionCollection(), "attach_save");
- mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, TQT_TQOBJECT(this),
+ mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, this,
TQT_SLOT(slotAttachProperties()),
actionCollection(), "attach_properties");
setStandardToolBarMenuEnabled(true);
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
+ KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection());
+ KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection());
KStdAction::preferences(kmkernel, TQT_SLOT(slotShowConfigurationDialog()), actionCollection());
- (void) new TDEAction (i18n("&Spellchecker..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheckConfig()),
+ (void) new TDEAction (i18n("&Spellchecker..."), 0, this, TQT_SLOT(slotSpellcheckConfig()),
actionCollection(), "setup_spellchecker");
if ( Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) {
@@ -1490,7 +1490,7 @@ void KMComposeWin::setupActions(void)
a->setCheckedState( KGuiItem( i18n( "Encrypt Message with Chiasmus..." ), "chiencrypted" ) );
mEncryptChiasmusAction = a;
connect( mEncryptChiasmusAction, TQT_SIGNAL(toggled(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(slotEncryptChiasmusToggled(bool)) );
+ this, TQT_SLOT(slotEncryptChiasmusToggled(bool)) );
} else {
mEncryptChiasmusAction = 0;
}
@@ -1546,7 +1546,7 @@ void KMComposeWin::setupActions(void)
l.push_back( Kleo::cryptoMessageFormatToLabel( cryptoMessageFormats[i] ) );
mCryptoModuleAction = new TDESelectAction( i18n( "&Cryptographic Message Format" ), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSelectCryptoModule()),
+ this, TQT_SLOT(slotSelectCryptoModule()),
actionCollection(), "options_select_crypto" );
mCryptoModuleAction->setItems( l );
mCryptoModuleAction->setCurrentItem( format2cb( ident.preferredCryptoMessageFormat() ) );
@@ -1580,36 +1580,36 @@ void KMComposeWin::setupActions(void)
TQT_SLOT( slotSizeAction( int ) ) );
alignLeftAction = new TDEToggleAction (i18n("Align Left"), "format-text-direction-ltr", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAlignLeft()), actionCollection(),
+ this, TQT_SLOT(slotAlignLeft()), actionCollection(),
"align_left");
alignLeftAction->setChecked( true );
alignRightAction = new TDEToggleAction (i18n("Align Right"), "format-text-direction-rtl", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAlignRight()), actionCollection(),
+ this, TQT_SLOT(slotAlignRight()), actionCollection(),
"align_right");
alignCenterAction = new TDEToggleAction (i18n("Align Center"), "text_center", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotAlignCenter()), actionCollection(),
+ this, TQT_SLOT(slotAlignCenter()), actionCollection(),
"align_center");
textBoldAction = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B,
- TQT_TQOBJECT(this), TQT_SLOT(slotTextBold()),
+ this, TQT_SLOT(slotTextBold()),
actionCollection(), "format-text-bold");
textItalicAction = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I,
- TQT_TQOBJECT(this), TQT_SLOT(slotTextItalic()),
+ this, TQT_SLOT(slotTextItalic()),
actionCollection(), "format-text-italic");
textUnderAction = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U,
- TQT_TQOBJECT(this), TQT_SLOT(slotTextUnder()),
+ this, TQT_SLOT(slotTextUnder()),
actionCollection(), "format-text-underline");
actionFormatReset = new TDEAction( i18n( "Reset Font Settings" ), "eraser", 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotFormatReset() ),
+ this, TQT_SLOT( slotFormatReset() ),
actionCollection(), "format_reset");
actionFormatColor = new TDEAction( i18n( "Text Color..." ), "colorize", 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotTextColor() ),
+ this, TQT_SLOT( slotTextColor() ),
actionCollection(), "format_color");
// editorFocusChanged(false);
createGUI("kmcomposerui.rc");
connect( toolBar("htmlToolBar"), TQT_SIGNAL( visibilityChanged(bool) ),
- TQT_TQOBJECT(this), TQT_SLOT( htmlToolBarVisibilityChanged(bool) ) );
+ this, TQT_SLOT( htmlToolBarVisibilityChanged(bool) ) );
// In Kontact, this entry would read "Configure Kontact", but bring
// up KMail's config dialog. That's sensible, though, so fix the label.
@@ -1682,9 +1682,9 @@ void KMComposeWin::setupEditor(void)
updateCursorPosition();
connect(mEditor,TQT_SIGNAL(CursorPositionChanged()),TQT_SLOT(updateCursorPosition()));
connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( fontChanged( const TQFont & ) ) );
+ this, TQT_SLOT( fontChanged( const TQFont & ) ) );
connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( alignmentChanged( int ) ) );
+ this, TQT_SLOT( alignmentChanged( int ) ) );
}
@@ -1875,14 +1875,14 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign,
// unless the identity is sticky
if ( !stickyIdentity ) {
disconnect(mIdentity,TQT_SIGNAL(identityChanged(uint)),
- TQT_TQOBJECT(this), TQT_SLOT(slotIdentityChanged(uint)));
+ this, TQT_SLOT(slotIdentityChanged(uint)));
}
// load the mId into the gui, sticky or not, without emitting
mIdentity->setCurrentIdentity( mId );
const uint idToApply = mId;
if ( !stickyIdentity ) {
connect(mIdentity,TQT_SIGNAL(identityChanged(uint)),
- TQT_TQOBJECT(this), TQT_SLOT(slotIdentityChanged(uint)));
+ this, TQT_SLOT(slotIdentityChanged(uint)));
} else {
// load the message's state into the mId, without applying it to the gui
// that's so we can detect that the id changed (because a sticky was set)
@@ -2359,7 +2359,7 @@ void KMComposeWin::applyChanges( bool dontSignNorEncrypt, bool dontDisable )
// Make new job and execute it
mComposer = new MessageComposer( this );
connect( mComposer, TQT_SIGNAL( done( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotComposerDone( bool ) ) );
+ this, TQT_SLOT( slotComposerDone( bool ) ) );
// TODO: Add a cancel button for the following operations?
// Disable any input to the window, so that we have a snapshot of the
@@ -2436,9 +2436,9 @@ bool KMComposeWin::addAttach(const KURL aUrl)
mMapAtmLoadData.insert(job, ld);
mAttachJobs[job] = aUrl;
connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
+ this, TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
+ this, TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
return true;
}
@@ -2468,9 +2468,9 @@ void KMComposeWin::addAttach(const KMMessagePart* msgPart)
}
connect( lvi, TQT_SIGNAL( compress( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( compressAttach( int ) ) );
+ this, TQT_SLOT( compressAttach( int ) ) );
connect( lvi, TQT_SIGNAL( uncompress( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( uncompressAttach( int ) ) );
+ this, TQT_SLOT( uncompressAttach( int ) ) );
slotUpdateAttachActions();
}
@@ -3020,9 +3020,9 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
}
mMapAtmLoadData.insert(job, ld);
connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
+ this, TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
+ this, TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
}
@@ -3575,7 +3575,7 @@ void KMComposeWin::editAttach(int index, bool openWith)
KMail::EditorWatcher *watcher =
new KMail::EditorWatcher( KURL( atmTempFile->name() ), contentTypeStr, openWith,
- TQT_TQOBJECT(this), this );
+ this, this );
connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(slotEditDone(KMail::EditorWatcher*)) );
if ( watcher->start() ) {
mEditorMap.insert( watcher, msgPart );
@@ -4083,14 +4083,14 @@ void KMComposeWin::slotPrint()
{
mMessageWasModified = isModified();
connect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) );
+ this, TQT_SLOT( slotContinuePrint( bool ) ) );
applyChanges( true );
}
void KMComposeWin::slotContinuePrint( bool rc )
{
disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) );
+ this, TQT_SLOT( slotContinuePrint( bool ) ) );
if( rc ) {
if ( mComposedMessages.isEmpty() ) {
@@ -4334,7 +4334,7 @@ void KMComposeWin::slotContinueDoSend( bool sentOk )
kdDebug(5006) << "KMComposeWin::slotContinueDoSend( " << sentOk << " )"
<< endl;
disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotContinueDoSend( bool ) ) );
+ this, TQT_SLOT( slotContinueDoSend( bool ) ) );
if ( !sentOk ) {
mDisableBreaking = false;
@@ -4989,7 +4989,7 @@ void KMComposeWin::slotSpellcheckConfig()
{
KDialogBase dlg(KDialogBase::Plain, i18n("Spellchecker"),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,
- TQT_TQWIDGET(this), 0, true, true );
+ this, 0, true, true );
KWin twin;
TQTabDialog qtd (this, "tabdialog", true);
KSpellConfig mKSpellConfig (&qtd);
@@ -5079,7 +5079,7 @@ void KMComposeWin::updateAutoSave()
if ( !mAutoSaveTimer ) {
mAutoSaveTimer = new TQTimer( this, "mAutoSaveTimer" );
connect( mAutoSaveTimer, TQT_SIGNAL( timeout() ),
- TQT_TQOBJECT(this), TQT_SLOT( autoSaveMessage() ) );
+ this, TQT_SLOT( autoSaveMessage() ) );
}
mAutoSaveTimer->start( autoSaveInterval() );
}
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index 960eb4556..6d8f82861 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -240,7 +240,7 @@ KMEdit::KMEdit(TQWidget *parent, KMComposeWin* composer,
void KMEdit::createSpellers()
{
delete mSpeller;
- mSpeller = new KMSpell( TQT_TQOBJECT(this), TQT_SLOT( spellerReady( KSpell * ) ), mSpellConfig );
+ mSpeller = new KMSpell( this, TQT_SLOT( spellerReady( KSpell * ) ), mSpellConfig );
}
void KMEdit::initializeAutoSpellChecking()
@@ -457,7 +457,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
i18n("Unable to start external editor.") );
killExternalEditor();
} else {
- mExtEditorTempFileWatcher = new KDirWatch( TQT_TQOBJECT(this), "mExtEditorTempFileWatcher" );
+ mExtEditorTempFileWatcher = new KDirWatch( this, "mExtEditorTempFileWatcher" );
connect( mExtEditorTempFileWatcher, TQT_SIGNAL(dirty(const TQString&)),
TQT_SLOT(slotExternalEditorTempFileChanged(const TQString&)) );
mExtEditorTempFileWatcher->addFile( mExtEditorTempFile->name() );
@@ -657,7 +657,7 @@ void KMEdit::spellcheck()
// Don't use mSpellConfig here. Reason is that the spell dialog, KSpellDlg, uses its own
// spell config, and therefore the two wouldn't be in sync.
- mKSpellForDialog = new KSpell( TQT_TQWIDGET(this), i18n("Spellcheck - KMail"), TQT_TQOBJECT(this),
+ mKSpellForDialog = new KSpell( this, i18n("Spellcheck - KMail"), this,
TQT_SLOT(slotSpellcheck2(KSpell*))/*, mSpellConfig*/ );
// }
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 312f4febb..64fc7778b 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -1115,13 +1115,13 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
// copy folder
TQPopupMenu *copyMenu = new TQPopupMenu( folderMenu );
- folderToPopupMenu( CopyFolder, TQT_TQOBJECT(this), &mMenuToFolder, copyMenu );
+ folderToPopupMenu( CopyFolder, this, &mMenuToFolder, copyMenu );
folderMenu->insertItem( i18n("&Copy Folder To"), copyMenu );
if ( fti->folder()->isMoveable() && fti->folder()->canDeleteMessages() )
{
TQPopupMenu *moveMenu = new TQPopupMenu( folderMenu );
- folderToPopupMenu( MoveFolder, TQT_TQOBJECT(this), &mMenuToFolder, moveMenu );
+ folderToPopupMenu( MoveFolder, this, &mMenuToFolder, moveMenu );
folderMenu->insertItem( i18n("&Move Folder To"), moveMenu );
}
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index eaf045b46..073efe485 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -2464,7 +2464,7 @@ void KMHeaders::slotRMB()
menu->insertSeparator();
TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu);
- mOwner->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this),
+ mOwner->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this,
&mMenuToFolder, msgCopyMenu );
menu->insertItem(i18n("&Copy To"), msgCopyMenu);
@@ -2473,7 +2473,7 @@ void KMHeaders::slotRMB()
menu->setItemEnabled( id, false );
} else {
TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu);
- mOwner->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, TQT_TQOBJECT(this),
+ mOwner->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, this,
&mMenuToFolder, msgMoveMenu );
menu->insertItem(i18n("&Move To"), msgMoveMenu);
}
@@ -3556,7 +3556,7 @@ void KMHeaders::cutMessages()
void KMHeaders::pasteMessages()
{
- new MessageCopyHelper( mCopiedMessages, folder(), mMoveMessages, TQT_TQOBJECT(this) );
+ new MessageCopyHelper( mCopiedMessages, folder(), mMoveMessages, this );
if ( mMoveMessages ) {
mCopiedMessages.clear();
updateActions();
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 0b5c6d6fd..c6299ec7b 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -203,7 +203,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
activatePanners();
- TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowStartupFolder() ));
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotShowStartupFolder() ));
connect( kmkernel->acctMgr(), TQT_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ),
this, TQT_SLOT( slotMailChecked( bool, bool, const TQMap<TQString, int> & ) ) );
@@ -251,7 +251,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
mVacationScriptIndicator->hide();
connect( mVacationScriptIndicator, TQT_SIGNAL(itemReleased(int)), TQT_SLOT(slotEditVacation()) );
if ( GlobalSettings::checkOutOfOfficeOnStartup() )
- TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckVacation()) );
+ TQTimer::singleShot( 0, this, TQT_SLOT(slotCheckVacation()) );
}
@@ -468,7 +468,7 @@ void KMMainWidget::readConfig(void)
bool check = config->readBoolEntry("checkmail-startup", false);
if (check)
// do it after building the kmmainwin, so that the progressdialog is available
- TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotCheckMail() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotCheckMail() ) );
}
}
@@ -631,7 +631,7 @@ void KMMainWidget::createWidgets(void)
mHeaders, TQT_SLOT(selectNextMessage()));
if (mReaderWindowActive) {
- mMsgView = new KMReaderWin(messageParent, TQT_TQWIDGET(this), actionCollection(), 0 );
+ mMsgView = new KMReaderWin(messageParent, this, actionCollection(), 0 );
if ( mMsgActions ) {
mMsgActions->setMessageView( mMsgView );
}
@@ -660,17 +660,17 @@ void KMMainWidget::createWidgets(void)
TDEAction *action;
- mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, TQT_TQOBJECT(this),
+ mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, this,
TQT_SLOT(slotMoveMsg()), actionCollection(),
"move_message_to_folder" );
mMoveMsgToFolderAction->plugAccel( actionCollection()->tdeaccel() );
- action = new TDEAction( i18n("Copy Message to Folder"), Key_C, TQT_TQOBJECT(this),
+ action = new TDEAction( i18n("Copy Message to Folder"), Key_C, this,
TQT_SLOT(slotCopyMsg()), actionCollection(),
"copy_message_to_folder" );
action->plugAccel( actionCollection()->tdeaccel() );
- action = new TDEAction( i18n("Jump to Folder"), Key_J, TQT_TQOBJECT(this),
+ action = new TDEAction( i18n("Jump to Folder"), Key_J, this,
TQT_SLOT(slotJumpToFolder()), actionCollection(),
"jump_to_folder" );
action->plugAccel( actionCollection()->tdeaccel() );
@@ -713,7 +713,7 @@ void KMMainWidget::createWidgets(void)
//Commands not worthy of menu items, but that deserve configurable keybindings
mRemoveDuplicatesAction = new TDEAction(
- i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, TQT_TQOBJECT(this),
+ i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, this,
TQT_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages");
action->plugAccel( actionCollection()->tdeaccel() );
@@ -723,32 +723,32 @@ void KMMainWidget::createWidgets(void)
action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction(
- i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(mFolderTree),
+ i18n("Focus on Next Folder"), CTRL+Key_Right, mFolderTree,
TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder");
action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction(
- i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(mFolderTree),
+ i18n("Focus on Previous Folder"), CTRL+Key_Left, mFolderTree,
TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder");
action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction(
- i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(mFolderTree),
+ i18n("Select Folder with Focus"), CTRL+Key_Space, mFolderTree,
TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder");
action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction(
- i18n("Focus on Next Message"), ALT+Key_Right, TQT_TQOBJECT(mHeaders),
+ i18n("Focus on Next Message"), ALT+Key_Right, mHeaders,
TQT_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message");
action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction(
- i18n("Focus on Previous Message"), ALT+Key_Left, TQT_TQOBJECT(mHeaders),
+ i18n("Focus on Previous Message"), ALT+Key_Left, mHeaders,
TQT_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message");
action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction(
- i18n("Select Message with Focus"), ALT+Key_Space, TQT_TQOBJECT(mHeaders),
+ i18n("Select Message with Focus"), ALT+Key_Space, mHeaders,
TQT_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message");
action->plugAccel( actionCollection()->tdeaccel() );
@@ -1716,7 +1716,7 @@ void KMMainWidget::slotCheckVacation()
if ( !kmkernel->askToGoOnline() )
return;
- Vacation *vac = new Vacation( TQT_TQOBJECT(this), true /* check only */ );
+ Vacation *vac = new Vacation( this, true /* check only */ );
connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
}
@@ -1729,7 +1729,7 @@ void KMMainWidget::slotEditVacation()
if ( mVacation )
return;
- mVacation = new Vacation( TQT_TQOBJECT(this) );
+ mVacation = new Vacation( this );
connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
if ( mVacation->isUsable() ) {
connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) );
@@ -1847,7 +1847,7 @@ void KMMainWidget::setupForwardActions()
mForwardActionMenu->insert( mForwardAttachedAction, 1 );
mForwardInlineAction->setShortcut( Key_F );
mForwardAttachedAction->setShortcut( SHIFT+Key_F );
- connect( mForwardActionMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this),
+ connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
TQT_SLOT(slotForwardInlineMsg()) );
} else {
@@ -1855,7 +1855,7 @@ void KMMainWidget::setupForwardActions()
mForwardActionMenu->insert( mForwardInlineAction, 1 );
mForwardInlineAction->setShortcut( SHIFT+Key_F );
mForwardAttachedAction->setShortcut( Key_F );
- connect( mForwardActionMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this),
+ connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
TQT_SLOT(slotForwardAttachedMsg()) );
}
}
@@ -2059,7 +2059,7 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread )
// Set a timer to show a splash screen if fetching folder contents
// takes more than the amount of seconds configured in the kmailrc (default 1000 msec)
mShowBusySplashTimer = new TQTimer( this );
- connect( mShowBusySplashTimer, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT( slotShowBusySplash() ) );
+ connect( mShowBusySplashTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotShowBusySplash() ) );
mShowBusySplashTimer->start( GlobalSettings::self()->folderLoadingTimeout(), true );
return;
} else {
@@ -2509,26 +2509,26 @@ void KMMainWidget::updateCustomTemplateMenus()
new TDEActionMenu( i18n("Forward With Custom Template"),
"mail_custom_forward",
actionCollection(), "custom_forward" );
- TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+ TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( this );
connect( mCustomForwardMapper, TQT_SIGNAL( mapped( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotCustomForwardMsg( int ) ) );
+ this, TQT_SLOT( slotCustomForwardMsg( int ) ) );
mForwardActionMenu->insert( mCustomForwardActionMenu );
mCustomReplyActionMenu =
new TDEActionMenu( i18n("Reply With Custom Template"), "mail_custom_reply",
actionCollection(), "custom_reply" );
- TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+ TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( this );
connect( mCustomReplyMapper, TQT_SIGNAL( mapped( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotCustomReplyToMsg( int ) ) );
+ this, TQT_SLOT( slotCustomReplyToMsg( int ) ) );
mMsgActions->replyMenu()->insert( mCustomReplyActionMenu );
mCustomReplyAllActionMenu =
new TDEActionMenu( i18n("Reply to All With Custom Template"),
"mail_custom_reply_all",
actionCollection(), "custom_reply_all" );
- TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+ TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( this );
connect( mCustomReplyAllMapper, TQT_SIGNAL( mapped( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotCustomReplyAllToMsg( int ) ) );
+ this, TQT_SLOT( slotCustomReplyAllToMsg( int ) ) );
mMsgActions->replyMenu()->insert( mCustomReplyAllActionMenu );
mCustomTemplates.clear();
@@ -2645,21 +2645,21 @@ void KMMainWidget::setupActions()
//----- File Menu
mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save",
TDEStdAccel::shortcut(TDEStdAccel::Save),
- TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" );
+ this, TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" );
- mOpenAction = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenMsg() ),
+ mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ),
actionCollection() );
(void) new TDEAction( i18n("&Compact All Folders"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotCompactAll()),
+ this, TQT_SLOT(slotCompactAll()),
actionCollection(), "compact_all_folders" );
(void) new TDEAction( i18n("&Expire All Folders"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotExpireAll()),
+ this, TQT_SLOT(slotExpireAll()),
actionCollection(), "expire_all_folders" );
(void) new TDEAction( i18n("&Refresh Local IMAP Cache"), "refresh",
- TQT_TQOBJECT(this), TQT_SLOT(slotInvalidateIMAPFolders()),
+ this, TQT_SLOT(slotInvalidateIMAPFolders()),
actionCollection(), "file_invalidate_imap_cache" );
(void) new TDEAction( i18n("Empty All &Trash Folders"), 0,
@@ -2667,7 +2667,7 @@ void KMMainWidget::setupActions()
actionCollection(), "empty_trash" );
(void) new TDEAction( i18n("Check &Mail"), "mail_get", CTRL+Key_L,
- TQT_TQOBJECT(this), TQT_SLOT(slotCheckMail()),
+ this, TQT_SLOT(slotCheckMail()),
actionCollection(), "check_mail" );
mFavoritesCheckMailAction = new TDEAction( i18n("Check Mail in Favorite Folders"),
@@ -2687,10 +2687,10 @@ void KMMainWidget::setupActions()
connect(mActMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotCheckOneAccount(int)));
connect(mActMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getAccountMenu()));
- (void) new TDEAction( i18n("&Send Queued Messages"), "mail-send", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("&Send Queued Messages"), "mail-send", 0, this,
TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued");
- (void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, this,
TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status");
TDEActionMenu *sendActionMenu = new
@@ -2699,165 +2699,165 @@ void KMMainWidget::setupActions()
sendActionMenu->setDelayed(true);
mSendMenu = sendActionMenu->popupMenu();
- connect(mSendMenu,TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendQueuedVia(int)));
+ connect(mSendMenu,TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSendQueuedVia(int)));
connect(mSendMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getTransportMenu()));
TDEAction *act;
//----- Tools menu
if (parent()->inherits("KMMainWin")) {
- act = new TDEAction( i18n("&Address Book..."), "contents", 0, TQT_TQOBJECT(this),
+ act = new TDEAction( i18n("&Address Book..."), "contents", 0, this,
TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" );
if (TDEStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false);
}
- act = new TDEAction( i18n("Certificate Manager..."), "pgp-keys", 0, TQT_TQOBJECT(this),
+ act = new TDEAction( i18n("Certificate Manager..."), "pgp-keys", 0, this,
TQT_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman");
// disable action if no certman binary is around
if (TDEStandardDirs::findExe("kleopatra").isEmpty()) act->setEnabled(false);
- act = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this),
+ act = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this,
TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
// disable action if no kwatchgnupg binary is around
if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) act->setEnabled(false);
- act = new TDEAction( i18n("&Import Messages..."), "document-open", 0, TQT_TQOBJECT(this),
+ act = new TDEAction( i18n("&Import Messages..."), "document-open", 0, this,
TQT_SLOT(slotImport()), actionCollection(), "import" );
if (TDEStandardDirs::findExe("kmailcvt").isEmpty()) act->setEnabled(false);
#if !defined(NDEBUG)
(void) new TDEAction( i18n("&Debug Sieve..."),
- "idea", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugSieve()),
+ "idea", 0, this, TQT_SLOT(slotDebugSieve()),
actionCollection(), "tools_debug_sieve" );
#endif
if ( GlobalSettings::allowOutOfOfficeSettings() ) {
(void) new TDEAction( i18n("Edit \"Out of Office\" Replies..."),
- "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditVacation()),
+ "configure", 0, this, TQT_SLOT(slotEditVacation()),
actionCollection(), "tools_edit_vacation" );
}
- (void) new TDEAction( i18n("Filter &Log Viewer..."), 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Filter &Log Viewer..."), 0, this,
TQT_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" );
- (void) new TDEAction( i18n("&Anti-Spam Wizard..."), 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("&Anti-Spam Wizard..."), 0, this,
TQT_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" );
- (void) new TDEAction( i18n("&Anti-Virus Wizard..."), 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("&Anti-Virus Wizard..."), 0, this,
TQT_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" );
//----- Edit Menu
mTrashAction = new TDEAction( KGuiItem( i18n("&Move to Trash"), "edittrash",
i18n("Move message to trashcan") ),
- Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashMsg()),
+ Key_Delete, this, TQT_SLOT(slotTrashMsg()),
actionCollection(), "move_to_trash" );
/* The delete action is nowhere in the gui, by default, so we need to make
* sure it is plugged into the TDEAccel now, since that won't happen on
* XMLGui construction or manual ->plug(). This is only a problem when run
* as a part, though. */
- mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
+ mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", SHIFT+Key_Delete, this,
TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" );
mDeleteAction->plugAccel( actionCollection()->tdeaccel() );
mTrashThreadAction = new TDEAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash",
i18n("Move thread to trashcan") ),
- CTRL+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashThread()),
+ CTRL+Key_Delete, this, TQT_SLOT(slotTrashThread()),
actionCollection(), "move_thread_to_trash" );
- mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "edit-delete", CTRL+SHIFT+Key_Delete, TQT_TQOBJECT(this),
+ mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "edit-delete", CTRL+SHIFT+Key_Delete, this,
TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" );
- (void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, this,
TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" );
- mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "edit-find", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this),
+ mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "edit-find", TDEStdAccel::shortcut(TDEStdAccel::Find), this,
TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" );
- (void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), this,
TQT_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" );
//----- Folder Menu
- mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder-new", 0, TQT_TQOBJECT(mFolderTree),
+ mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder-new", 0, mFolderTree,
TQT_SLOT(addChildFolder()), actionCollection(), "new_folder" );
- mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, TQT_TQOBJECT(this),
+ mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, this,
TQT_SLOT(slotModifyFolder()), actionCollection(), "modify" );
mFolderMailingListPropertiesAction = new TDEAction( i18n("&Mailing List Management..."),
- /*"folder_mailinglist_properties",*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderMailingListProperties() ),
+ /*"folder_mailinglist_properties",*/ 0, this, TQT_SLOT( slotFolderMailingListProperties() ),
actionCollection(), "folder_mailinglist_properties" );
mFolderShortCutCommandAction = new TDEAction( i18n("&Assign Shortcut..."), "configure_shortcuts",
- 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderShortcutCommand() ), actionCollection(),
+ 0, this, TQT_SLOT( slotFolderShortcutCommand() ), actionCollection(),
"folder_shortcut_command" );
- mMarkAllAsReadAction = new TDEAction( i18n("Mark All Messages as &Read"), "goto", 0, TQT_TQOBJECT(this),
+ mMarkAllAsReadAction = new TDEAction( i18n("Mark All Messages as &Read"), "goto", 0, this,
TQT_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" );
- mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpireFolder()),
+ mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, this, TQT_SLOT(slotExpireFolder()),
actionCollection(), "expire");
- mCompactFolderAction = new TDEAction( i18n("&Compact Folder"), 0, TQT_TQOBJECT(this),
+ mCompactFolderAction = new TDEAction( i18n("&Compact Folder"), 0, this,
TQT_SLOT(slotCompactFolder()), actionCollection(), "compact" );
mRefreshFolderAction = new TDEAction( i18n("Check Mail &in This Folder"), "reload",
- TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this),
+ TDEStdAccel::shortcut( TDEStdAccel::Reload ), this,
TQT_SLOT(slotRefreshFolder()),
actionCollection(), "refresh_folder" );
mTroubleshootFolderAction = 0; // set in initializeIMAPActions
- mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, TQT_TQOBJECT(this),
+ mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, this,
TQT_SLOT(slotEmptyFolder()), actionCollection(), "empty" );
- mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edit-delete", 0, TQT_TQOBJECT(this),
+ mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edit-delete", 0, this,
TQT_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" );
- mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "document-save", 0, TQT_TQOBJECT(this),
+ mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "document-save", 0, this,
TQT_SLOT( slotArchiveFolder() ), actionCollection(),
"archive_folder" );
- mPreferHtmlAction = new TDEToggleAction( i18n("Prefer &HTML to Plain Text"), 0, TQT_TQOBJECT(this),
+ mPreferHtmlAction = new TDEToggleAction( i18n("Prefer &HTML to Plain Text"), 0, this,
TQT_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" );
- mPreferHtmlLoadExtAction = new TDEToggleAction( i18n("Load E&xternal References"), 0, TQT_TQOBJECT(this),
+ mPreferHtmlLoadExtAction = new TDEToggleAction( i18n("Load E&xternal References"), 0, this,
TQT_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" );
- mThreadMessagesAction = new TDEToggleAction( i18n("&Thread Messages"), 0, TQT_TQOBJECT(this),
+ mThreadMessagesAction = new TDEToggleAction( i18n("&Thread Messages"), 0, this,
TQT_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" );
- mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, TQT_TQOBJECT(this),
+ mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, this,
TQT_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" );
- new TDEAction( i18n("Copy Folder"), "edit-copy", SHIFT+CTRL+Key_C, TQT_TQOBJECT(folderTree()),
+ new TDEAction( i18n("Copy Folder"), "edit-copy", SHIFT+CTRL+Key_C, folderTree(),
TQT_SLOT(copyFolder()), actionCollection(), "copy_folder" );
- new TDEAction( i18n("Cut Folder"), "edit-cut", SHIFT+CTRL+Key_X, TQT_TQOBJECT(folderTree()),
+ new TDEAction( i18n("Cut Folder"), "edit-cut", SHIFT+CTRL+Key_X, folderTree(),
TQT_SLOT(cutFolder()), actionCollection(), "cut_folder" );
- new TDEAction( i18n("Paste Folder"), "edit-paste", SHIFT+CTRL+Key_V, TQT_TQOBJECT(folderTree()),
+ new TDEAction( i18n("Paste Folder"), "edit-paste", SHIFT+CTRL+Key_V, folderTree(),
TQT_SLOT(pasteFolder()), actionCollection(), "paste_folder" );
- new TDEAction( i18n("Copy Messages"), "edit-copy", ALT+CTRL+Key_C, TQT_TQOBJECT(headers()),
+ new TDEAction( i18n("Copy Messages"), "edit-copy", ALT+CTRL+Key_C, headers(),
TQT_SLOT(copyMessages()), actionCollection(), "copy_messages" );
- new TDEAction( i18n("Cut Messages"), "edit-cut", ALT+CTRL+Key_X, TQT_TQOBJECT(headers()),
+ new TDEAction( i18n("Cut Messages"), "edit-cut", ALT+CTRL+Key_X, headers(),
TQT_SLOT(cutMessages()), actionCollection(), "cut_messages" );
- new TDEAction( i18n("Paste Messages"), "edit-paste", ALT+CTRL+Key_V, TQT_TQOBJECT(headers()),
+ new TDEAction( i18n("Paste Messages"), "edit-paste", ALT+CTRL+Key_V, headers(),
TQT_SLOT(pasteMessages()), actionCollection(), "paste_messages" );
//----- Message Menu
- (void) new TDEAction( i18n("&New Message..."), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("&New Message..."), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), this,
TQT_SLOT(slotCompose()), actionCollection(), "new_message" );
mTemplateMenu =
new TDEActionMenu( i18n("New Message From &Template"), "document-new",
actionCollection(), "new_from_template" );
mTemplateMenu->setDelayed( true );
- connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this),
+ connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), this,
TQT_SLOT( slotShowNewFromTemplate() ) );
- connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this),
+ connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( activated(int) ), this,
TQT_SLOT( slotNewFromTemplate(int) ) );
TDEAction* newToML = new TDEAction( i18n("New Message t&o Mailing-List..."), "mail_post_to",
- CTRL+SHIFT+Key_N, TQT_TQOBJECT(this),
+ CTRL+SHIFT+Key_N, this,
TQT_SLOT(slotPostToML()), actionCollection(), "post_message" );
newToML->plugAccel( actionCollection()->tdeaccel() );
@@ -2866,25 +2866,25 @@ void KMMainWidget::setupActions()
"message_forward" );
mForwardInlineAction = new TDEAction( i18n("&Inline..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
+ "mail-forward", 0, this,
TQT_SLOT(slotForwardInlineMsg()),
actionCollection(),
"message_forward_inline" );
mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
+ "mail-forward", 0, this,
TQT_SLOT(slotForwardAttachedMsg()),
actionCollection(),
"message_forward_as_attachment" );
mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
+ "mail-forward", 0, this,
TQT_SLOT(slotForwardDigestMsg()),
actionCollection(),
"message_forward_as_digest" );
mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
- "mail-forward", Key_E, TQT_TQOBJECT(this),
+ "mail-forward", Key_E, this,
TQT_SLOT(slotRedirectMsg()),
actionCollection(),
"message_forward_redirect" );
@@ -2895,38 +2895,38 @@ void KMMainWidget::setupActions()
mForwardActionMenu->insert( mForwardDigestAction );
mForwardActionMenu->insert( mRedirectAction );
- mSendAgainAction = new TDEAction( i18n("Send A&gain..."), 0, TQT_TQOBJECT(this),
+ mSendAgainAction = new TDEAction( i18n("Send A&gain..."), 0, this,
TQT_SLOT(slotResendMsg()), actionCollection(), "send_again" );
//----- Create filter actions
mFilterMenu = new TDEActionMenu( i18n("&Create Filter"), "filter", actionCollection(), "create_filter" );
- connect( mFilterMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this),
+ connect( mFilterMenu, TQT_SIGNAL(activated()), this,
TQT_SLOT(slotFilter()) );
- mSubjectFilterAction = new TDEAction( i18n("Filter on &Subject..."), 0, TQT_TQOBJECT(this),
+ mSubjectFilterAction = new TDEAction( i18n("Filter on &Subject..."), 0, this,
TQT_SLOT(slotSubjectFilter()),
actionCollection(), "subject_filter");
mFilterMenu->insert( mSubjectFilterAction );
- mFromFilterAction = new TDEAction( i18n("Filter on &From..."), 0, TQT_TQOBJECT(this),
+ mFromFilterAction = new TDEAction( i18n("Filter on &From..."), 0, this,
TQT_SLOT(slotFromFilter()),
actionCollection(), "from_filter");
mFilterMenu->insert( mFromFilterAction );
- mToFilterAction = new TDEAction( i18n("Filter on &To..."), 0, TQT_TQOBJECT(this),
+ mToFilterAction = new TDEAction( i18n("Filter on &To..."), 0, this,
TQT_SLOT(slotToFilter()),
actionCollection(), "to_filter");
mFilterMenu->insert( mToFilterAction );
- mListFilterAction = new TDEAction( i18n("Filter on Mailing-&List..."), 0, TQT_TQOBJECT(this),
+ mListFilterAction = new TDEAction( i18n("Filter on Mailing-&List..."), 0, this,
TQT_SLOT(slotMailingListFilter()), actionCollection(),
"mlist_filter");
mFilterMenu->insert( mListFilterAction );
- mPrintAction = KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), actionCollection());
+ mPrintAction = KStdAction::print (this, TQT_SLOT(slotPrintMsg()), actionCollection());
mUseAction = new TDEAction( i18n("New Message From &Template"), "document-new",
- Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotUseTemplate() ),
+ Key_N, this, TQT_SLOT( slotUseTemplate() ),
actionCollection(), "use_template" );
mUseAction->plugAccel( actionCollection()->tdeaccel() );
@@ -2936,52 +2936,52 @@ void KMMainWidget::setupActions()
mMarkThreadAsReadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Read"), "kmmsgread",
i18n("Mark all messages in the selected thread as read")),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusRead()),
+ 0, this, TQT_SLOT(slotSetThreadStatusRead()),
actionCollection(), "thread_read");
mThreadStatusMenu->insert( mMarkThreadAsReadAction );
mMarkThreadAsNewAction = new TDEAction(KGuiItem(i18n("Mark Thread as &New"), "kmmsgnew",
i18n("Mark all messages in the selected thread as new")),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusNew()),
+ 0, this, TQT_SLOT(slotSetThreadStatusNew()),
actionCollection(), "thread_new");
mThreadStatusMenu->insert( mMarkThreadAsNewAction );
mMarkThreadAsUnreadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Unread"), "kmmsgunseen",
i18n("Mark all messages in the selected thread as unread")),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusUnread()),
+ 0, this, TQT_SLOT(slotSetThreadStatusUnread()),
actionCollection(), "thread_unread");
mThreadStatusMenu->insert( mMarkThreadAsUnreadAction );
- mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
+ mThreadStatusMenu->insert( new TDEActionSeparator( this ) );
//----- "Mark Thread" toggle actions
mToggleThreadFlagAction = new TDEToggleAction(i18n("Mark Thread as &Important"), "mail_flag",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusFlag()),
+ 0, this, TQT_SLOT(slotSetThreadStatusFlag()),
actionCollection(), "thread_flag");
mToggleThreadFlagAction->setCheckedState( i18n("Remove &Important Thread Mark") );
mThreadStatusMenu->insert( mToggleThreadFlagAction );
mToggleThreadTodoAction = new TDEToggleAction(i18n("Mark Thread as &Action Item"), "mail_todo",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusTodo()),
+ 0, this, TQT_SLOT(slotSetThreadStatusTodo()),
actionCollection(), "thread_todo");
mToggleThreadTodoAction->setCheckedState( i18n("Remove &Action Item Thread Mark") );
mThreadStatusMenu->insert( mToggleThreadTodoAction );
//------- "Watch and ignore thread" actions
mWatchThreadAction = new TDEToggleAction(i18n("&Watch Thread"), "kmmsgwatched",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusWatched()),
+ 0, this, TQT_SLOT(slotSetThreadStatusWatched()),
actionCollection(), "thread_watched");
mIgnoreThreadAction = new TDEToggleAction(i18n("&Ignore Thread"), "mail_ignore",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusIgnored()),
+ 0, this, TQT_SLOT(slotSetThreadStatusIgnored()),
actionCollection(), "thread_ignored");
- mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
+ mThreadStatusMenu->insert( new TDEActionSeparator( this ) );
mThreadStatusMenu->insert( mWatchThreadAction );
mThreadStatusMenu->insert( mIgnoreThreadAction );
mSaveAttachmentsAction = new TDEAction( i18n("Save A&ttachments..."), "attach",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()),
+ 0, this, TQT_SLOT(slotSaveAttachments()),
actionCollection(), "file_save_attachments" );
mMoveActionMenu = new TDEActionMenu( i18n("&Move To" ),
@@ -2991,7 +2991,7 @@ void KMMainWidget::setupActions()
actionCollection(), "copy_to" );
mApplyAllFiltersAction = new TDEAction( i18n("Appl&y All Filters"), "filter",
- CTRL+Key_J, TQT_TQOBJECT(this),
+ CTRL+Key_J, this,
TQT_SLOT(slotApplyFilters()),
actionCollection(), "apply_filters" );
@@ -3006,25 +3006,25 @@ void KMMainWidget::setupActions()
actionCollection(), "view_unread" );
unreadMenu->setToolTip( i18n("Choose how to display the count of unread messages") );
- mUnreadColumnToggle = new TDERadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, TQT_TQOBJECT(this),
+ mUnreadColumnToggle = new TDERadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, this,
TQT_SLOT(slotToggleUnread()),
actionCollection(), "view_unread_column" );
mUnreadColumnToggle->setExclusiveGroup( "view_unread_group" );
unreadMenu->insert( mUnreadColumnToggle );
- mUnreadTextToggle = new TDERadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, TQT_TQOBJECT(this),
+ mUnreadTextToggle = new TDERadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, this,
TQT_SLOT(slotToggleUnread()),
actionCollection(), "view_unread_text" );
mUnreadTextToggle->setExclusiveGroup( "view_unread_group" );
unreadMenu->insert( mUnreadTextToggle );
// toggle for total column
- mTotalColumnToggle = new TDEToggleAction( i18n("View->", "&Total Column"), 0, TQT_TQOBJECT(this),
+ mTotalColumnToggle = new TDEToggleAction( i18n("View->", "&Total Column"), 0, this,
TQT_SLOT(slotToggleTotalColumn()),
actionCollection(), "view_columns_total" );
mTotalColumnToggle->setToolTip( i18n("Toggle display of column showing the "
"total number of messages in folders.") );
- mSizeColumnToggle = new TDEToggleAction( i18n("View->", "&Size Column"), 0, TQT_TQOBJECT(this),
+ mSizeColumnToggle = new TDEToggleAction( i18n("View->", "&Size Column"), 0, this,
TQT_SLOT(slotToggleSizeColumn()),
actionCollection(), "view_columns_size" );
mSizeColumnToggle->setToolTip( i18n("Toggle display of column showing the "
@@ -3032,33 +3032,33 @@ void KMMainWidget::setupActions()
(void)new TDEAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(),
i18n("Expand the current thread") ),
- Key_Period, TQT_TQOBJECT(this),
+ Key_Period, this,
TQT_SLOT(slotExpandThread()),
actionCollection(), "expand_thread" );
(void)new TDEAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(),
i18n("Collapse the current thread") ),
- Key_Comma, TQT_TQOBJECT(this),
+ Key_Comma, this,
TQT_SLOT(slotCollapseThread()),
actionCollection(), "collapse_thread" );
(void)new TDEAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString(),
i18n("Expand all threads in the current folder") ),
- CTRL+Key_Period, TQT_TQOBJECT(this),
+ CTRL+Key_Period, this,
TQT_SLOT(slotExpandAllThreads()),
actionCollection(), "expand_all_threads" );
(void)new TDEAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString(),
i18n("Collapse all threads in the current folder") ),
- CTRL+Key_Comma, TQT_TQOBJECT(this),
+ CTRL+Key_Comma, this,
TQT_SLOT(slotCollapseAllThreads()),
actionCollection(), "collapse_all_threads" );
- mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this),
+ mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, this,
TQT_SLOT(slotShowMsgSrc()), actionCollection(),
"view_source" );
- TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, TQT_TQOBJECT(this),
+ TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, this,
TQT_SLOT( slotDisplayCurrentMessage() ), actionCollection(),
"display_message" );
dukeOfMonmoth->plugAccel( actionCollection()->tdeaccel() );
@@ -3066,44 +3066,44 @@ void KMMainWidget::setupActions()
//----- Go Menu
new TDEAction( KGuiItem( i18n("&Next Message"), TQString(),
i18n("Go to the next message") ),
- "N;Right", TQT_TQOBJECT(this), TQT_SLOT(slotNextMessage()),
+ "N;Right", this, TQT_SLOT(slotNextMessage()),
actionCollection(), "go_next_message" );
new TDEAction( KGuiItem( i18n("Next &Unread Message"),
TQApplication::reverseLayout() ? "go-previous" : "go-next",
i18n("Go to the next unread message") ),
- Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadMessage()),
+ Key_Plus, this, TQT_SLOT(slotNextUnreadMessage()),
actionCollection(), "go_next_unread_message" );
/* ### needs better support from folders:
new TDEAction( KGuiItem( i18n("Next &Important Message"), TQString(),
i18n("Go to the next important message") ),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotNextImportantMessage()),
+ 0, this, TQT_SLOT(slotNextImportantMessage()),
actionCollection(), "go_next_important_message" );
*/
new TDEAction( KGuiItem( i18n("&Previous Message"), TQString(),
i18n("Go to the previous message") ),
- "P;Left", TQT_TQOBJECT(this), TQT_SLOT(slotPrevMessage()),
+ "P;Left", this, TQT_SLOT(slotPrevMessage()),
actionCollection(), "go_prev_message" );
new TDEAction( KGuiItem( i18n("Previous Unread &Message"),
TQApplication::reverseLayout() ? "go-next" : "go-previous",
i18n("Go to the previous unread message") ),
- Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadMessage()),
+ Key_Minus, this, TQT_SLOT(slotPrevUnreadMessage()),
actionCollection(), "go_prev_unread_message" );
/* needs better support from folders:
new TDEAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(),
i18n("Go to the previous important message") ),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrevImportantMessage()),
+ 0, this, TQT_SLOT(slotPrevImportantMessage()),
actionCollection(), "go_prev_important_message" );
*/
TDEAction *action =
new TDEAction( KGuiItem( i18n("Next Unread &Folder"), TQString(),
i18n("Go to the next folder with unread messages") ),
- ALT+Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadFolder()),
+ ALT+Key_Plus, this, TQT_SLOT(slotNextUnreadFolder()),
actionCollection(), "go_next_unread_folder" );
TDEShortcut shortcut = action->shortcut();
shortcut.append( KKey( CTRL+Key_Plus ) );
@@ -3112,7 +3112,7 @@ void KMMainWidget::setupActions()
action =
new TDEAction( KGuiItem( i18n("Previous Unread F&older"), TQString(),
i18n("Go to the previous folder with unread messages") ),
- ALT+Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadFolder()),
+ ALT+Key_Minus, this, TQT_SLOT(slotPrevUnreadFolder()),
actionCollection(), "go_prev_unread_folder" );
shortcut = action->shortcut();
shortcut.append( KKey( CTRL+Key_Minus ) );
@@ -3123,33 +3123,33 @@ void KMMainWidget::setupActions()
i18n("Scroll down current message. "
"If at end of current message, "
"go to next unread message.") ),
- Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotReadOn()),
+ Key_Space, this, TQT_SLOT(slotReadOn()),
actionCollection(), "go_next_unread_text" );
//----- Settings Menu
mToggleShowQuickSearchAction = new TDEToggleAction(i18n("Show Quick Search"), TQString(),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowQuickSearch()),
+ 0, this, TQT_SLOT(slotToggleShowQuickSearch()),
actionCollection(), "show_quick_search");
mToggleShowQuickSearchAction->setChecked( GlobalSettings::self()->quickSearchActive() );
mToggleShowQuickSearchAction->setWhatsThis(
i18n( GlobalSettings::self()->quickSearchActiveItem()->whatsThis().utf8() ) );
- (void) new TDEAction( i18n("Configure &Filters..."), 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Configure &Filters..."), 0, this,
TQT_SLOT(slotFilter()), actionCollection(), "filter" );
- (void) new TDEAction( i18n("Configure &POP Filters..."), 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Configure &POP Filters..."), 0, this,
TQT_SLOT(slotPopFilter()), actionCollection(), "popFilter" );
- (void) new TDEAction( i18n("Manage &Sieve Scripts..."), 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Manage &Sieve Scripts..."), 0, this,
TQT_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" );
(void) new TDEAction( KGuiItem( i18n("KMail &Introduction"), 0,
i18n("Display KMail's Welcome Page") ),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotIntro()),
+ 0, this, TQT_SLOT(slotIntro()),
actionCollection(), "help_kmail_welcomepage" );
// ----- Standard Actions
// KStdAction::configureNotifications(this, TQT_SLOT(slotEditNotifications()), actionCollection());
(void) new TDEAction( i18n("Configure &Notifications..."),
- "knotify", 0, TQT_TQOBJECT(this),
+ "knotify", 0, this,
TQT_SLOT(slotEditNotifications()), actionCollection(),
"kmail_configure_notifications" );
// KStdAction::preferences(this, TQT_SLOT(slotSettings()), actionCollection());
@@ -3158,14 +3158,14 @@ void KMMainWidget::setupActions()
TQT_SLOT(slotShowConfigurationDialog()), actionCollection(),
"kmail_configure_kmail" );
- KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection(), "kmail_undo");
+ KStdAction::undo(this, TQT_SLOT(slotUndo()), actionCollection(), "kmail_undo");
- KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() );
+ KStdAction::tipOfDay( this, TQT_SLOT( slotShowTip() ), actionCollection() );
menutimer = new TQTimer( this, "menutimer" );
connect( menutimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateMessageActions() ) );
connect( kmkernel->undoStack(),
- TQT_SIGNAL( undoStackChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateUndo() ));
+ TQT_SIGNAL( undoStackChanged() ), this, TQT_SLOT( slotUpdateUndo() ));
initializeIMAPActions( false ); // don't set state, config not read yet
updateMessageActions();
@@ -3288,9 +3288,9 @@ void KMMainWidget::copySelectedToFolder(int menuId )
void KMMainWidget::updateMessageMenu()
{
mMenuToFolder.clear();
- folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, TQT_TQOBJECT(this),
+ folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, this,
&mMenuToFolder, mMoveActionMenu->popupMenu() );
- folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this),
+ folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this,
&mMenuToFolder, mCopyActionMenu->popupMenu() );
updateMessageActions();
}
@@ -3770,7 +3770,7 @@ void KMMainWidget::initializeIMAPActions( bool setState /* false the first time,
if ( !mTroubleshootFolderAction ) {
mTroubleshootFolderAction = new TDEAction( i18n("&Troubleshoot IMAP Cache..."), "wizard", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" );
+ this, TQT_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" );
if ( setState )
updateFolderMenu(); // set initial state of the action
} else {
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index cdd76a04e..e1a2467d2 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -36,10 +36,10 @@ KMMainWin::KMMainWin(TQWidget *)
kapp->ref();
(void) new TDEAction( i18n("New &Window"), "window-new", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()),
+ this, TQT_SLOT(slotNewMailReader()),
actionCollection(), "new_mail_client" );
- mKMMainWidget = new KMMainWidget( TQT_TQWIDGET(this), "KMMainWidget", this, actionCollection() );
+ mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() );
mKMMainWidget->resize( 450, 600 );
setCentralWidget(mKMMainWidget);
setupStatusBar();
@@ -51,13 +51,13 @@ KMMainWin::KMMainWin(TQWidget *)
setStandardToolBarMenuEnabled(true);
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()),
+ KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()),
actionCollection());
- KStdAction::keyBindings(TQT_TQOBJECT(mKMMainWidget), TQT_SLOT(slotEditKeys()),
+ KStdAction::keyBindings(mKMMainWidget, TQT_SLOT(slotEditKeys()),
actionCollection());
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
+ KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection());
createGUI( "kmmainwin.rc", false );
// Don't use conserveMemory() because this renders dynamic plugging
// of actions unusable!
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index 869ee015c..9df9ff6bc 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -71,7 +71,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
// row 0: Type combobox:
mMimeType = new KComboBox( true, plainPage() );
mMimeType->setInsertionPolicy( TQComboBox::NoInsertion );
- mMimeType->setValidator( new KMimeTypeValidator( TQT_TQOBJECT(mMimeType) ) );
+ mMimeType->setValidator( new KMimeTypeValidator( mMimeType ) );
mMimeType->insertStringList( TQStringList()
<< TQString::fromLatin1("text/html")
<< TQString::fromLatin1("text/plain")
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index 0d74e87ee..b3a2dbc3a 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -348,29 +348,29 @@ void KMReaderMainWin::setupAccel()
// this, TQT_SLOT( slotSaveMsg() ),
// actionCollection(), "file_save_as" );
- mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(mReaderWin), TQT_SLOT( slotSaveMsg() ),
+ mSaveAsAction = KStdAction::saveAs( mReaderWin, TQT_SLOT( slotSaveMsg() ),
actionCollection() );
mSaveAsAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Save ) );
- mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrintMsg() ),
+ mPrintAction = KStdAction::print( this, TQT_SLOT( slotPrintMsg() ),
actionCollection() );
- TDEAction *closeAction = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+ TDEAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() );
TDEShortcut closeShortcut = closeAction->shortcut();
closeShortcut.append( KKey(Key_Escape));
closeAction->setShortcut(closeShortcut);
//----- Edit Menu
- KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), actionCollection() );
- 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() );
+ 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() );
mTrashAction = new TDEAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash",
i18n( "Move message to trashcan" ) ),
- Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotTrashMsg() ),
+ Key_Delete, this, TQT_SLOT( slotTrashMsg() ),
actionCollection(), "move_to_trash" );
//----- View Menu
- mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this),
+ mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, this,
TQT_SLOT(slotShowMsgSrc()), actionCollection(),
"view_source" );
@@ -379,25 +379,25 @@ void KMReaderMainWin::setupAccel()
"mail-forward", actionCollection(),
"message_forward" );
mForwardInlineAction = new TDEAction( i18n("&Inline..."),
- "mail-forward", SHIFT+Key_F, TQT_TQOBJECT(this),
+ "mail-forward", SHIFT+Key_F, this,
TQT_SLOT(slotForwardInlineMsg()),
actionCollection(),
"message_forward_inline" );
mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
- "mail-forward", Key_F, TQT_TQOBJECT(this),
+ "mail-forward", Key_F, this,
TQT_SLOT(slotForwardAttachedMsg()),
actionCollection(),
"message_forward_as_attachment" );
mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
+ "mail-forward", 0, this,
TQT_SLOT(slotForwardDigestMsg()),
actionCollection(),
"message_forward_as_digest" );
mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
- "mail-forward", Key_E, TQT_TQOBJECT(this),
+ "mail-forward", Key_E, this,
TQT_SLOT(slotRedirectMsg()),
actionCollection(),
"message_forward_redirect" );
@@ -435,7 +435,7 @@ void KMReaderMainWin::setupAccel()
mReaderWin, TQT_SLOT(slotUrlClicked()));
setStandardToolBarMenuEnabled(true);
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
+ KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection());
}
@@ -503,7 +503,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo
TQPopupMenu* copyMenu = new TQPopupMenu(menu);
KMMainWidget* mainwin = kmkernel->getKMMainWidget();
if ( mainwin )
- mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this),
+ mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this,
&mMenuToFolder, copyMenu );
menu->insertItem( i18n("&Copy To" ), copyMenu );
menu->insertSeparator();
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 014864961..0692ec7bd 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)
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index ffc968419..4a8c82bd6 100644
--- a/kmail/kmsearchpatternedit.cpp
+++ b/kmail/kmsearchpatternedit.cpp
@@ -116,7 +116,7 @@ void KMSearchRuleWidget::initWidget()
RuleWidgetHandlerManager::instance()->createWidgets( mFunctionStack,
mValueStack,
- TQT_TQOBJECT(this) );
+ this );
// redirect focus to the header field combo box
setFocusProxy( mRuleField );
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index 5c11f0757..9a9fc52ca 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -166,7 +166,7 @@ void KMServerTest::slotSlaveResult(TDEIO::Slave *aSlave, int error,
if ( error )
{
mJob = 0;
- KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()),
+ KMessageBox::error( kapp->activeWindow(),
TDEIO::buildErrorString( error, errorText ),
i18n("Error") );
emit capabilities( mListNormal, mListSSL );
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index 5d6ee830f..7d38aadf8 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -401,7 +401,7 @@ void KMTransportDialog::makeSmtpPage()
label = new TQLabel( i18n("&Port:"), page1 );
grid->addWidget( label, 4, 0 );
mSmtp.portEdit = new KLineEdit( page1 );
- mSmtp.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) );
+ mSmtp.portEdit->setValidator( new TQIntValidator(this) );
TQWhatsThis::add(mSmtp.portEdit,
i18n("The port number that the SMTP server "
"is listening on. The default port is 25."));
diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp
index 1ce0237b7..0b297451b 100644
--- a/kmail/regexplineedit.cpp
+++ b/kmail/regexplineedit.cpp
@@ -120,7 +120,7 @@ namespace KMail {
void RegExpLineEdit::slotEditRegExp()
{
if ( !mRegExpEditDialog )
- mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+ mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
KRegExpEditorInterface *iface =
static_cast<KRegExpEditorInterface *>( mRegExpEditDialog->tqt_cast( "KRegExpEditorInterface" ) );
diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index 2f64abbf9..05844963f 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -251,7 +251,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac
for ( int i = 0;
( w = (*it)->createFunctionWidget( i, functionStack, receiver ) );
++i ) {
- if ( childCount( TQT_TQOBJECT(functionStack), w->name() ) < 2 ) {
+ if ( childCount( functionStack, w->name() ) < 2 ) {
// there wasn't already a widget with this name, so add this widget
functionStack->addWidget( w );
}
@@ -266,7 +266,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac
for ( int i = 0;
( w = (*it)->createValueWidget( i, valueStack, receiver ) );
++i ) {
- if ( childCount( TQT_TQOBJECT(valueStack), w->name() ) < 2 ) {
+ if ( childCount( valueStack, w->name() ) < 2 ) {
// there wasn't already a widget with this name, so add this widget
valueStack->addWidget( w );
}
@@ -646,14 +646,14 @@ namespace {
if ( func == KMSearchRule::FuncIsInAddressbook ||
func == KMSearchRule::FuncIsNotInAddressbook ) {
TQWidget *w =
- TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
+ static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
0, false ) );
valueStack->raiseWidget( w );
}
else if ( func == KMSearchRule::FuncIsInCategory ||
func == KMSearchRule::FuncIsNotInCategory) {
TQComboBox *combo =
- static_cast<TQComboBox*>( TQT_TQWIDGET(valueStack->child( "categoryCombo",
+ static_cast<TQComboBox*>( static_cast<TQWidget*>(valueStack->child( "categoryCombo",
0, false )) );
combo->blockSignals( true );
for ( i = 0; i < combo->count(); ++i )
@@ -692,7 +692,7 @@ namespace {
{
// raise the correct function widget
functionStack->raiseWidget(
- TQT_TQWIDGET( functionStack->child( "textRuleFuncCombo",
+ static_cast<TQWidget*>( functionStack->child( "textRuleFuncCombo",
0, false ) ) );
// raise the correct value widget
@@ -700,13 +700,13 @@ namespace {
if ( func == KMSearchRule::FuncIsInAddressbook ||
func == KMSearchRule::FuncIsNotInAddressbook ) {
valueStack->raiseWidget(
- TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
+ static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
0, false ) ) );
}
else if ( func == KMSearchRule::FuncIsInCategory ||
func == KMSearchRule::FuncIsNotInCategory) {
valueStack->raiseWidget(
- TQT_TQWIDGET( valueStack->child( "categoryCombo",
+ static_cast<TQWidget*>( valueStack->child( "categoryCombo",
0, false ) ) );
}
else {
@@ -947,7 +947,7 @@ namespace {
if ( func == KMSearchRule::FuncHasAttachment ||
func == KMSearchRule::FuncHasNoAttachment ) {
TQWidget *w =
- TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
+ static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
0, false ) );
valueStack->raiseWidget( w );
}
@@ -978,7 +978,7 @@ namespace {
return false;
// raise the correct function widget
functionStack->raiseWidget(
- TQT_TQWIDGET( functionStack->child( "messageRuleFuncCombo",
+ static_cast<TQWidget*>( functionStack->child( "messageRuleFuncCombo",
0, false ) ) );
// raise the correct value widget
@@ -986,7 +986,7 @@ namespace {
if ( func == KMSearchRule::FuncHasAttachment ||
func == KMSearchRule::FuncHasNoAttachment ) {
TQWidget *w =
- TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
+ static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
0, false ) );
valueStack->raiseWidget( w );
}
@@ -1249,12 +1249,12 @@ namespace {
// raise the correct function widget
functionStack->raiseWidget(
- TQT_TQWIDGET( functionStack->child( "statusRuleFuncCombo",
+ static_cast<TQWidget*>( functionStack->child( "statusRuleFuncCombo",
0, false ) ) );
// raise the correct value widget
valueStack->raiseWidget(
- TQT_TQWIDGET( valueStack->child( "statusRuleValueCombo",
+ static_cast<TQWidget*>( valueStack->child( "statusRuleValueCombo",
0, false ) ) );
return true;
}
@@ -1502,7 +1502,7 @@ namespace {
// raise the correct function widget
functionStack->raiseWidget(
- TQT_TQWIDGET( functionStack->child( "numericRuleFuncCombo",
+ static_cast<TQWidget*>( functionStack->child( "numericRuleFuncCombo",
0, false ) ) );
// raise the correct value widget
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 940350590..55f991c23 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -189,7 +189,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
object = list->first();
delete list;
if (!searchFolder && object && ::tqt_cast<TQComboBox*>(object))
- static_cast<TQComboBox*>(TQT_TQWIDGET(object))->setCurrentText(i18n("Subject"));
+ static_cast<TQComboBox*>(object)->setCurrentText(i18n("Subject"));
vbl->addWidget( mPatternEdit );
@@ -199,7 +199,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
connect( mChkbxSpecificFolders, TQT_SIGNAL(toggled(bool)),
mChkSubFolders, TQT_SLOT(setEnabled(bool)) );
connect( mChkbxAllFolders, TQT_SIGNAL(toggled(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(setEnabledSearchButton(bool)) );
+ this, TQT_SLOT(setEnabledSearchButton(bool)) );
mLbxMatches = new MatchListView(searchWidget, this, "Find Messages");
@@ -237,13 +237,13 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
mLbxMatches->setDragEnabled( true );
connect( mLbxMatches, TQT_SIGNAL(clicked(TQListViewItem *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotShowMsg(TQListViewItem *)) );
+ this, TQT_SLOT(slotShowMsg(TQListViewItem *)) );
connect( mLbxMatches, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotViewMsg(TQListViewItem *)) );
+ this, TQT_SLOT(slotViewMsg(TQListViewItem *)) );
connect( mLbxMatches, TQT_SIGNAL(currentChanged(TQListViewItem *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotCurrentChanged(TQListViewItem *)) );
+ this, TQT_SLOT(slotCurrentChanged(TQListViewItem *)) );
connect( mLbxMatches, TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)),
- TQT_TQOBJECT(this), TQT_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) );
+ this, TQT_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) );
vbl->addWidget( mLbxMatches );
TQHBoxLayout *hbl2 = new TQHBoxLayout( vbl, spacingHint(), "kmfs_hbl2" );
@@ -261,16 +261,16 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
mSearchFolderOpenBtn->setEnabled(false);
hbl2->addWidget(mSearchFolderOpenBtn);
connect( mSearchFolderEdt, TQT_SIGNAL( textChanged( const TQString &)),
- TQT_TQOBJECT(this), TQT_SLOT( scheduleRename( const TQString & )));
+ this, TQT_SLOT( scheduleRename( const TQString & )));
connect( &mRenameTimer, TQT_SIGNAL( timeout() ),
- TQT_TQOBJECT(this), TQT_SLOT( renameSearchFolder() ));
+ this, TQT_SLOT( renameSearchFolder() ));
connect( mSearchFolderOpenBtn, TQT_SIGNAL( clicked() ),
- TQT_TQOBJECT(this), TQT_SLOT( openSearchFolder() ));
+ this, TQT_SLOT( openSearchFolder() ));
mSearchResultOpenBtn = new TQPushButton(i18n("Open &Message"), searchWidget);
mSearchResultOpenBtn->setEnabled(false);
hbl2->addWidget(mSearchResultOpenBtn);
connect( mSearchResultOpenBtn, TQT_SIGNAL( clicked() ),
- TQT_TQOBJECT(this), TQT_SLOT( slotViewSelectedMsg() ));
+ this, TQT_SLOT( slotViewSelectedMsg() ));
mStatusBar = new KStatusBar(searchWidget);
mStatusBar->insertFixedItem(i18n("AMiddleLengthText..."), 0, true);
mStatusBar->changeItem(i18n("Ready."), 0);
@@ -294,12 +294,12 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotSearch()));
connect(this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotStop()));
- connect(this, TQT_SIGNAL(finished()), TQT_TQOBJECT(this), TQT_SLOT(deleteLater()));
+ connect(this, TQT_SIGNAL(finished()), this, TQT_SLOT(deleteLater()));
// give focus to the value field of the first search rule
object = mPatternEdit->child( "regExpLineEdit" );
if ( object && object->isWidgetType() ) {
- TQT_TQWIDGET(object)->setFocus();
+ static_cast<TQWidget*>(object)->setFocus();
//kdDebug(5006) << "SearchWindow: focus has been given to widget "
// << object->name() << endl;
}
@@ -309,13 +309,13 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
//set up actions
TDEActionCollection *ac = actionCollection();
ac->setWidget( this );
- mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, TQT_TQOBJECT(this),
+ mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, this,
TQT_SLOT(slotReplyToMsg()), ac, "search_reply" );
mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all",
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplyAllToMsg()),
+ 0, this, TQT_SLOT(slotReplyAllToMsg()),
ac, "search_reply_all" );
mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."),
- "mail_replylist", 0, TQT_TQOBJECT(this),
+ "mail_replylist", 0, this,
TQT_SLOT(slotReplyListToMsg()), ac,
"search_reply_list" );
mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"),
@@ -324,11 +324,11 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
TQT_SLOT(slotForwardInlineMsg()) );
mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
+ "mail-forward", 0, this,
TQT_SLOT(slotForwardAttachedMsg()), ac,
"search_message_forward_as_attachment" );
mForwardInlineAction = new TDEAction( i18n("&Inline..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
+ "mail-forward", 0, this,
TQT_SLOT(slotForwardInlineMsg()), ac,
"search_message_forward_inline" );
if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
@@ -340,32 +340,32 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
}
mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
+ "mail-forward", 0, this,
TQT_SLOT(slotForwardDigestMsg()), ac,
"search_message_forward_as_digest" );
mForwardActionMenu->insert( mForwardDigestAction );
mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
- "mail-forward", 0, TQT_TQOBJECT(this),
+ "mail-forward", 0, this,
TQT_SLOT(slotRedirectMsg()), ac,
"search_message_forward_redirect" );
mForwardActionMenu->insert( mRedirectAction );
- mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" );
+ mSaveAsAction = KStdAction::saveAs( this, TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" );
mSaveAtchAction = new TDEAction( i18n("Save Attachments..."), "attach", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" );
+ this, TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" );
- mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), ac, "search_print" );
- mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, TQT_TQOBJECT(this),
+ mPrintAction = KStdAction::print( this, TQT_SLOT(slotPrintMsg()), ac, "search_print" );
+ mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, this,
TQT_SLOT(slotClearSelection()), ac, "search_clear_selection" );
- mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" );
- mCutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" );
+ mCopyAction = KStdAction::copy( this, TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" );
+ mCutAction = KStdAction::cut( this, TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" );
- connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updStatus()));
+ connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updStatus()));
connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
- TQT_TQOBJECT(this), TQT_SLOT(folderInvalidated(KMFolder*)));
+ this, TQT_SLOT(folderInvalidated(KMFolder*)));
connect(mCbxFolders, TQT_SIGNAL(folderChanged(KMFolder*)),
- TQT_TQOBJECT(this), TQT_SLOT(slotFolderActivated()));
+ this, TQT_SLOT(slotFolderActivated()));
}
@@ -508,17 +508,17 @@ void SearchWindow::slotSearch()
}
mFolder->stopSearch();
disconnect(mFolder, TQT_SIGNAL(msgAdded(int)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int)));
+ this, TQT_SLOT(slotAddMsg(int)));
disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
- TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
+ this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
connect(mFolder, TQT_SIGNAL(msgAdded(int)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int)));
+ this, TQT_SLOT(slotAddMsg(int)));
connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
- TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
+ this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
mSearchFolderEdt->setEnabled(false);
KMSearch *search = new KMSearch();
connect(search, TQT_SIGNAL(finished(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(searchDone()));
+ this, TQT_SLOT(searchDone()));
if (mChkbxAllFolders->isChecked()) {
search->setRecursive(true);
} else {
@@ -543,7 +543,7 @@ void SearchWindow::searchDone()
mTimer->stop();
updStatus();
- TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(enableGUI()));
+ TQTimer::singleShot(0, this, TQT_SLOT(enableGUI()));
if(mLastFocus)
mLastFocus->setFocus();
if (mCloseRequested)
@@ -623,7 +623,7 @@ void SearchWindow::closeEvent(TQCloseEvent *e)
//Cancel search in progress by setting the search folder search to
//the null search
mFolder->setSearch(new KMSearch());
- TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotClose()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotClose()));
} else {
KDialogBase::closeEvent(e);
}
@@ -677,7 +677,7 @@ void SearchWindow::folderInvalidated(KMFolder *folder)
mLbxMatches->clear();
if (mFolder->search())
connect(mFolder->search(), TQT_SIGNAL(finished(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(searchDone()));
+ this, TQT_SLOT(searchDone()));
mTimer->start(200);
enableGUI();
}
@@ -840,10 +840,10 @@ void SearchWindow::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint
mMenuToFolder.clear();
TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu);
mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage,
- TQT_TQOBJECT(this), &mMenuToFolder, msgMoveMenu );
+ this, &mMenuToFolder, msgMoveMenu );
TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu);
mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage,
- TQT_TQOBJECT(this), &mMenuToFolder, msgCopyMenu );
+ this, &mMenuToFolder, msgCopyMenu );
// show most used actions
mReplyAction->plug(menu);
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index 2b195c6d9..d629bc8e3 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -41,11 +41,11 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
TDEAction *action;
TDEActionMenu *menu;
- TQSignalMapper *mapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+ TQSignalMapper *mapper = new TQSignalMapper( this );
connect( mapper, TQT_SIGNAL( mapped(int) ),
this, TQT_SLOT( slotMapped(int) ) );
- mMenu = new TDEActionMenu( i18n( "Insert Command..." ), TQT_TQOBJECT(this) );
+ mMenu = new TDEActionMenu( i18n( "Insert Command..." ), this );
// ******************************************************
menu = new TDEActionMenu( i18n( "Original Message" ), mMenu );
diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp
index 6e74ab5b5..df7f8bb76 100644
--- a/kmail/vacationdialog.cpp
+++ b/kmail/vacationdialog.cpp
@@ -96,7 +96,7 @@ namespace KMail {
mDomainCheck->setChecked( false );
mDomainEdit = new TQLineEdit( plainPage(), "mDomainEdit" );
mDomainEdit->setEnabled( false );
- mDomainEdit->setValidator( new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), TQT_TQOBJECT(mDomainEdit) ) );
+ mDomainEdit->setValidator( new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), mDomainEdit ) );
glay->addWidget( mDomainCheck, row, 0 );
glay->addWidget( mDomainEdit, row, 1 );
connect( mDomainCheck, TQT_SIGNAL(toggled(bool)),
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 07:00:22 +0000