diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kmail/kmcomposewin.cpp | |
parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip |
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/kmcomposewin.cpp')
-rw-r--r-- | kmail/kmcomposewin.cpp | 274 |
1 files changed, 137 insertions, 137 deletions
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 98a5c6e0a..ff4659c86 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -196,10 +196,10 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) setInstance( kmkernel->xmlGuiInstance() ); mMainWidget = new TQWidget(this); // splitter between the headers area and the actual editor - mHeadersToEditorSplitter = new TQSplitter( TQt::Vertical, mMainWidget, "mHeadersToEditorSplitter" ); + mHeadersToEditorSplitter = new TQSplitter( Qt::Vertical, mMainWidget, "mHeadersToEditorSplitter" ); mHeadersToEditorSplitter->setChildrenCollapsible( false ); mHeadersArea = new TQWidget( mHeadersToEditorSplitter ); - mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum ); + mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->tqsizePolicy().horData(), TQSizePolicy::Maximum ); TQVBoxLayout *v = new TQVBoxLayout( mMainWidget ); v->addWidget( mHeadersToEditorSplitter ); mIdentity = new KPIM::IdentityCombo(kmkernel->identityManager(), mHeadersArea); @@ -250,10 +250,10 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) TQToolTip::add( mBtnCc, tip ); TQToolTip::add( mBtnBcc, tip ); - mBtnTo->setFocusPolicy(TQWidget::NoFocus); - mBtnCc->setFocusPolicy(TQWidget::NoFocus); - mBtnBcc->setFocusPolicy(TQWidget::NoFocus); - //mBtnFrom->setFocusPolicy(TQWidget::NoFocus); + mBtnTo->setFocusPolicy(Qt::NoFocus); + mBtnCc->setFocusPolicy(Qt::NoFocus); + mBtnBcc->setFocusPolicy(Qt::NoFocus); + //mBtnFrom->setFocusPolicy(Qt::NoFocus); connect(mBtnTo,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo())); connect(mBtnCc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo())); @@ -331,9 +331,9 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mFixedFontAction = 0; mTempDir = 0; // the attachment view is separated from the editor by a splitter - mSplitter = new TQSplitter( TQt::Vertical, mHeadersToEditorSplitter, "mSplitter" ); + mSplitter = new TQSplitter( Qt::Vertical, mHeadersToEditorSplitter, "mSplitter" ); mSplitter->setChildrenCollapsible( false ); - mSnippetSplitter = new TQSplitter( TQt::Horizontal, mSplitter, "mSnippetSplitter"); + mSnippetSplitter = new TQSplitter( Qt::Horizontal, mSplitter, "mSnippetSplitter"); mSnippetSplitter->setChildrenCollapsible( false ); TQWidget *editorAndCryptoStateIndicators = new TQWidget( mSnippetSplitter ); @@ -386,10 +386,10 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) setCaption( i18n("Composer") ); setMinimumSize(200,200); - mBtnIdentity->setFocusPolicy(TQWidget::NoFocus); - mBtnFcc->setFocusPolicy(TQWidget::NoFocus); - mBtnTransport->setFocusPolicy(TQWidget::NoFocus); - mBtnDictionary->setFocusPolicy( TQWidget::NoFocus ); + mBtnIdentity->setFocusPolicy(Qt::NoFocus); + mBtnFcc->setFocusPolicy(Qt::NoFocus); + mBtnTransport->setFocusPolicy(Qt::NoFocus); + mBtnDictionary->setFocusPolicy( Qt::NoFocus ); mAtmListView = new AttachmentListView( this, mSplitter, "attachment list view" ); @@ -456,7 +456,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) connect(kmkernel->dimapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(slotFolderRemoved(KMFolder*))); connect( kmkernel, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotConfigChanged() ) ); + TQT_TQOBJECT(this), TQT_SLOT( slotConfigChanged() ) ); connect (mEditor, TQT_SIGNAL (spellcheck_done(int)), this, TQT_SLOT (slotSpellcheckDone (int))); @@ -648,8 +648,8 @@ bool KMComposeWin::event(TQEvent *e) void KMComposeWin::readColorConfig(void) { if ( GlobalSettings::self()->useDefaultColors() ) { - mForeColor = TQColor(kapp->palette().active().text()); - mBackColor = TQColor(kapp->palette().active().base()); + mForeColor = TQColor(kapp->tqpalette().active().text()); + mBackColor = TQColor(kapp->tqpalette().active().base()); } else { mForeColor = GlobalSettings::self()->foregroundColor(); mBackColor = GlobalSettings::self()->backgroundColor(); @@ -787,7 +787,7 @@ void KMComposeWin::writeConfig(void) mAutoSpellCheckingAction->isChecked() ); TQStringList transportHistory = GlobalSettings::self()->transportHistory(); transportHistory.remove(mTransport->currentText()); - if (KMTransportInfo::availableTransports().findIndex(mTransport + if (KMTransportInfo::availableTransports().tqfindIndex(mTransport ->currentText()) == -1) { transportHistory.prepend(mTransport->currentText()); } @@ -817,7 +817,7 @@ void KMComposeWin::autoSaveMessage() mAutoSaveTimer->stop(); connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - this, TQT_SLOT( slotContinueAutoSave() ) ); + TQT_TQOBJECT(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. @@ -829,7 +829,7 @@ void KMComposeWin::autoSaveMessage() void KMComposeWin::slotContinueAutoSave() { disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - this, TQT_SLOT( slotContinueAutoSave() ) ); + TQT_TQOBJECT(this), TQT_SLOT( slotContinueAutoSave() ) ); // Ok, it's done now - continue dead letter saving if ( mComposedMessages.isEmpty() ) { @@ -868,7 +868,7 @@ void KMComposeWin::slotContinueAutoSave() i18n("Autosaving the message as %1 " "failed.\n" "Reason: %2" ) - .arg( filename, strerror( status ) ), + .tqarg( filename, strerror( status ) ), i18n("Autosaving Failed") ); mLastAutoSaveErrno = status; } @@ -888,7 +888,7 @@ void KMComposeWin::slotView(void) //This sucks awfully, but no, I cannot get an activated(int id) from // actionContainer() - if (!sender()->isA("KToggleAction")) + if (!TQT_TQOBJECT(sender())->isA("KToggleAction")) return; KToggleAction *act = (KToggleAction *) sender(); @@ -1234,13 +1234,13 @@ void KMComposeWin::setupActions(void) { //default = send now, alternative = queue ( void ) new KAction( i18n("&Send Mail"), "mail_send", CTRL+Key_Return, - this, TQT_SLOT(slotSendNow()), actionCollection(),"send_default"); + TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_default"); // FIXME: change to mail_send_via icon when this exits. actActionNowMenu = new KActionMenu (i18n("&Send Mail Via"), "mail_send", actionCollection(), "send_default_via" ); - (void) new KAction (i18n("Send &Later"), "queue", 0, this, + (void) new KAction (i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSendLater()), actionCollection(),"send_alternative"); actActionLaterMenu = new KActionMenu (i18n("Send &Later Via"), "queue", actionCollection(), "send_alternative_via" ); @@ -1251,12 +1251,12 @@ void KMComposeWin::setupActions(void) //default = queue, alternative = send now (void) new KAction (i18n("Send &Later"), "queue", CTRL+Key_Return, - this, TQT_SLOT(slotSendLater()), actionCollection(),"send_default"); + TQT_TQOBJECT(this), TQT_SLOT(slotSendLater()), actionCollection(),"send_default"); actActionLaterMenu = new KActionMenu (i18n("Send &Later Via"), "queue", actionCollection(), "send_default_via" ); ( void ) new KAction( i18n("&Send Mail"), "mail_send", 0, - this, TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative"); + TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative"); // FIXME: change to mail_send_via icon when this exits. actActionNowMenu = new KActionMenu (i18n("&Send Mail Via"), "mail_send", @@ -1291,78 +1291,78 @@ void KMComposeWin::setupActions(void) (void) new KAction (i18n("Save as &Draft"), "filesave", 0, - this, TQT_SLOT(slotSaveDraft()), + TQT_TQOBJECT(this), TQT_SLOT(slotSaveDraft()), actionCollection(), "save_in_drafts"); (void) new KAction (i18n("Save as &Template"), "filesave", 0, - this, TQT_SLOT(slotSaveTemplate()), + TQT_TQOBJECT(this), TQT_SLOT(slotSaveTemplate()), actionCollection(), "save_in_templates"); (void) new KAction (i18n("&Insert File..."), "fileopen", 0, - this, TQT_SLOT(slotInsertFile()), + TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()), actionCollection(), "insert_file"); mRecentAction = new KRecentFilesAction (i18n("&Insert File Recent"), "fileopen", 0, - this, TQT_SLOT(slotInsertRecentFile(const KURL&)), + TQT_TQOBJECT(this), TQT_SLOT(slotInsertRecentFile(const KURL&)), actionCollection(), "insert_file_recent"); mRecentAction->loadEntries( KMKernel::config() ); (void) new KAction (i18n("&Address Book"), "contents",0, - this, TQT_SLOT(slotAddrBook()), + TQT_TQOBJECT(this), TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook"); (void) new KAction (i18n("&New Composer"), "mail_new", KStdAccel::shortcut(KStdAccel::New), - this, TQT_SLOT(slotNewComposer()), + TQT_TQOBJECT(this), TQT_SLOT(slotNewComposer()), actionCollection(), "new_composer"); (void) new KAction (i18n("New Main &Window"), "window_new", 0, - this, TQT_SLOT(slotNewMailReader()), + TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()), actionCollection(), "open_mailreader"); if ( !mClassicalRecipients ) { - new KAction( i18n("Select &Recipients..."), CTRL + Key_L, mRecipientsEditor, + new KAction( i18n("Select &Recipients..."), CTRL + Key_L, TQT_TQOBJECT(mRecipientsEditor), TQT_SLOT( selectRecipients() ), actionCollection(), "select_recipients" ); - new KAction( i18n("Save &Distribution List..."), 0, mRecipientsEditor, + new KAction( i18n("Save &Distribution List..."), 0, TQT_TQOBJECT(mRecipientsEditor), TQT_SLOT( saveDistributionList() ), actionCollection(), "save_distribution_list" ); } - //KStdAction::save(this, TQT_SLOT(), actionCollection(), "save_message"); - KStdAction::print (this, TQT_SLOT(slotPrint()), actionCollection()); - KStdAction::close (this, TQT_SLOT(slotClose()), actionCollection()); + //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::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::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::tqfind (this, TQT_SLOT(slotFind()), actionCollection()); - KStdAction::findNext(this, TQT_SLOT(slotSearchAgain()), actionCollection()); + KStdAction::find (TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection()); + KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotSearchAgain()), actionCollection()); - KStdAction::tqreplace (this, TQT_SLOT(slotReplace()), actionCollection()); - KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection(), "spellcheck"); + KStdAction::replace (TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), actionCollection()); + KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection(), "spellcheck"); - mPasteQuotation = new KAction (i18n("Pa&ste as Quotation"),0,this,TQT_SLOT( slotPasteClipboardAsQuotation()), + mPasteQuotation = new KAction (i18n("Pa&ste as Quotation"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsQuotation()), actionCollection(), "paste_quoted"); - (void) new KAction (i18n("Paste as Attac&hment"),0,this,TQT_SLOT( slotPasteClipboardAsAttachment()), + (void) new KAction (i18n("Paste as Attac&hment"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsAttachment()), actionCollection(), "paste_att"); - KAction * addq = new KAction(i18n("Add &Quote Characters"), 0, this, + KAction * addq = new KAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)), addq, TQT_SLOT(setEnabled(bool)) ); - KAction * remq = new KAction(i18n("Re&move Quote Characters"), 0, this, + KAction * remq = new KAction(i18n("Re&move Quote Characters"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)), remq, TQT_SLOT(setEnabled(bool)) ); - (void) new KAction (i18n("Cl&ean Spaces"), 0, this, TQT_SLOT(slotCleanSpace()), + (void) new KAction (i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanSpace()), actionCollection(), "clean_spaces"); - mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), 0, this, + mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" ); mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() ); @@ -1376,7 +1376,7 @@ void KMComposeWin::setupActions(void) mRequestMDNAction->setChecked(GlobalSettings::self()->requestMDN()); //----- Message-Encoding Submenu mEncodingAction = new KSelectAction( i18n( "Se&t Encoding" ), "charset", - 0, this, TQT_SLOT(slotSetCharset() ), + 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetCharset() ), actionCollection(), "charsets" ); mWordWrapAction = new KToggleAction (i18n("&Wordwrap"), 0, actionCollection(), "wordwrap"); @@ -1396,7 +1396,7 @@ void KMComposeWin::setupActions(void) mAutoSpellCheckingAction->setChecked( !GlobalSettings::self()->useExternalEditor() && spellChecking ); slotAutoSpellCheckingToggled( !GlobalSettings::self()->useExternalEditor() && spellChecking ); connect( mAutoSpellCheckingAction, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotAutoSpellCheckingToggled( bool ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( slotAutoSpellCheckingToggled( bool ) ) ); TQStringList encodings = KMMsgBase::supportedEncodings(true); encodings.prepend( i18n("Auto-Detect")); @@ -1404,84 +1404,84 @@ void KMComposeWin::setupActions(void) mEncodingAction->setCurrentItem( -1 ); //these are checkable!!! - markupAction = new KToggleAction (i18n("Formatting (HTML)"), 0, this, + markupAction = new KToggleAction (i18n("Formatting (HTML)"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleMarkup()), actionCollection(), "html"); - mAllFieldsAction = new KToggleAction (i18n("&All Fields"), 0, this, + mAllFieldsAction = new KToggleAction (i18n("&All Fields"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_all_fields"); - mIdentityAction = new KToggleAction (i18n("&Identity"), 0, this, + mIdentityAction = new KToggleAction (i18n("&Identity"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_identity"); - mDictionaryAction = new KToggleAction (i18n("&Dictionary"), 0, this, + mDictionaryAction = new KToggleAction (i18n("&Dictionary"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_dictionary"); - mFccAction = new KToggleAction (i18n("&Sent-Mail Folder"), 0, this, + mFccAction = new KToggleAction (i18n("&Sent-Mail Folder"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_fcc"); - mTransportAction = new KToggleAction (i18n("&Mail Transport"), 0, this, + mTransportAction = new KToggleAction (i18n("&Mail Transport"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_transport"); - mFromAction = new KToggleAction (i18n("&From"), 0, this, + mFromAction = new KToggleAction (i18n("&From"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_from"); - mReplyToAction = new KToggleAction (i18n("&Reply To"), 0, this, + mReplyToAction = new KToggleAction (i18n("&Reply To"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_reply_to"); if ( mClassicalRecipients ) { - mToAction = new KToggleAction (i18n("&To"), 0, this, + mToAction = new KToggleAction (i18n("&To"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_to"); - mCcAction = new KToggleAction (i18n("&CC"), 0, this, + mCcAction = new KToggleAction (i18n("&CC"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_cc"); - mBccAction = new KToggleAction (i18n("&BCC"), 0, this, + mBccAction = new KToggleAction (i18n("&BCC"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_bcc"); } - mSubjectAction = new KToggleAction (i18n("S&ubject"), 0, this, + mSubjectAction = new KToggleAction (i18n("S&ubject"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_subject"); //end of checkable - mAppendSignatureAction = new KAction (i18n("Append S&ignature"), 0, this, + mAppendSignatureAction = new KAction (i18n("Append S&ignature"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAppendSignature()), actionCollection(), "append_signature"); - mPrependSignatureAction = new KAction (i18n("Prepend S&ignature"), 0, this, + mPrependSignatureAction = new KAction (i18n("Prepend S&ignature"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrependSignature()), actionCollection(), "prepend_signature"); - mInsertSignatureAction = new KAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, this, + mInsertSignatureAction = new KAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertSignatureAtCursor()), actionCollection(), "insert_signature_at_cursor_position"); - mAttachPK = new KAction (i18n("Attach &Public Key..."), 0, this, + mAttachPK = new KAction (i18n("Attach &Public Key..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertPublicKey()), actionCollection(), "attach_public_key"); - mAttachMPK = new KAction (i18n("Attach &My Public Key"), 0, this, + mAttachMPK = new KAction (i18n("Attach &My Public Key"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertMyPublicKey()), actionCollection(), "attach_my_public_key"); (void) new KAction (i18n("&Attach File..."), "attach", - 0, this, TQT_SLOT(slotAttachFile()), + 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()), actionCollection(), "attach"); - mAttachRemoveAction = new KAction (i18n("&Remove Attachment"), 0, this, + mAttachRemoveAction = new KAction (i18n("&Remove Attachment"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachRemove()), actionCollection(), "remove"); mAttachSaveAction = new KAction (i18n("&Save Attachment As..."), "filesave",0, - this, TQT_SLOT(slotAttachSave()), + TQT_TQOBJECT(this), TQT_SLOT(slotAttachSave()), actionCollection(), "attach_save"); - mAttachPropertiesAction = new KAction (i18n("Attachment Pr&operties"), 0, this, + mAttachPropertiesAction = new KAction (i18n("Attachment Pr&operties"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachProperties()), actionCollection(), "attach_properties"); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection()); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); KStdAction::preferences(kmkernel, TQT_SLOT(slotShowConfigurationDialog()), actionCollection()); - (void) new KAction (i18n("&Spellchecker..."), 0, this, TQT_SLOT(slotSpellcheckConfig()), + (void) new KAction (i18n("&Spellchecker..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheckConfig()), actionCollection(), "setup_spellchecker"); if ( Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) { @@ -1491,7 +1491,7 @@ void KMComposeWin::setupActions(void) a->setCheckedState( KGuiItem( i18n( "Encrypt Message with Chiasmus..." ), "chiencrypted" ) ); mEncryptChiasmusAction = a; connect( mEncryptChiasmusAction, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEncryptChiasmusToggled(bool)) ); + TQT_TQOBJECT(this), TQT_SLOT(slotEncryptChiasmusToggled(bool)) ); } else { mEncryptChiasmusAction = 0; } @@ -1547,7 +1547,7 @@ void KMComposeWin::setupActions(void) l.push_back( Kleo::cryptoMessageFormatToLabel( cryptoMessageFormats[i] ) ); mCryptoModuleAction = new KSelectAction( i18n( "&Cryptographic Message Format" ), 0, - this, TQT_SLOT(slotSelectCryptoModule()), + TQT_TQOBJECT(this), TQT_SLOT(slotSelectCryptoModule()), actionCollection(), "options_select_crypto" ); mCryptoModuleAction->setItems( l ); mCryptoModuleAction->setCurrentItem( format2cb( ident.preferredCryptoMessageFormat() ) ); @@ -1581,36 +1581,36 @@ void KMComposeWin::setupActions(void) TQT_SLOT( slotSizeAction( int ) ) ); alignLeftAction = new KToggleAction (i18n("Align Left"), "text_left", 0, - this, TQT_SLOT(slotAlignLeft()), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT(slotAlignLeft()), actionCollection(), "align_left"); alignLeftAction->setChecked( true ); alignRightAction = new KToggleAction (i18n("Align Right"), "text_right", 0, - this, TQT_SLOT(slotAlignRight()), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT(slotAlignRight()), actionCollection(), "align_right"); alignCenterAction = new KToggleAction (i18n("Align Center"), "text_center", 0, - this, TQT_SLOT(slotAlignCenter()), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT(slotAlignCenter()), actionCollection(), "align_center"); textBoldAction = new KToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B, - this, TQT_SLOT(slotTextBold()), + TQT_TQOBJECT(this), TQT_SLOT(slotTextBold()), actionCollection(), "text_bold"); textItalicAction = new KToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I, - this, TQT_SLOT(slotTextItalic()), + TQT_TQOBJECT(this), TQT_SLOT(slotTextItalic()), actionCollection(), "text_italic"); textUnderAction = new KToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U, - this, TQT_SLOT(slotTextUnder()), + TQT_TQOBJECT(this), TQT_SLOT(slotTextUnder()), actionCollection(), "text_under"); actionFormatReset = new KAction( i18n( "Reset Font Settings" ), "eraser", 0, - this, TQT_SLOT( slotFormatReset() ), + TQT_TQOBJECT(this), TQT_SLOT( slotFormatReset() ), actionCollection(), "format_reset"); actionFormatColor = new KAction( i18n( "Text Color..." ), "colorize", 0, - this, TQT_SLOT( slotTextColor() ), + TQT_TQOBJECT(this), TQT_SLOT( slotTextColor() ), actionCollection(), "format_color"); // editorFocusChanged(false); createGUI("kmcomposerui.rc"); connect( toolBar("htmlToolBar"), TQT_SIGNAL( visibilityChanged(bool) ), - this, TQT_SLOT( htmlToolBarVisibilityChanged(bool) ) ); + TQT_TQOBJECT(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. @@ -1625,9 +1625,9 @@ void KMComposeWin::setupStatusBar(void) statusBar()->insertItem("", 0, 1); statusBar()->setItemAlignment(0, AlignLeft | AlignVCenter); - statusBar()->insertItem(i18n( " Spellcheck: %1 ").arg( " " ), 3, 0, true ); - statusBar()->insertItem(i18n( " Column: %1 ").arg(" "), 2, 0, true); - statusBar()->insertItem(i18n( " Line: %1 ").arg(" "), 1, 0, true); + statusBar()->insertItem(i18n( " Spellcheck: %1 ").tqarg( " " ), 3, 0, true ); + statusBar()->insertItem(i18n( " Column: %1 ").tqarg(" "), 2, 0, true); + statusBar()->insertItem(i18n( " Line: %1 ").tqarg(" "), 1, 0, true); } @@ -1638,9 +1638,9 @@ void KMComposeWin::updateCursorPosition() TQString temp; line = mEditor->currentLine(); col = mEditor->currentColumn(); - temp = i18n(" Line: %1 ").arg(line+1); + temp = i18n(" Line: %1 ").tqarg(line+1); statusBar()->changeItem(temp,1); - temp = i18n(" Column: %1 ").arg(col+1); + temp = i18n(" Column: %1 ").tqarg(col+1); statusBar()->changeItem(temp,2); } @@ -1683,9 +1683,9 @@ void KMComposeWin::setupEditor(void) updateCursorPosition(); connect(mEditor,TQT_SIGNAL(CursorPositionChanged()),TQT_SLOT(updateCursorPosition())); connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), - this, TQT_SLOT( fontChanged( const TQFont & ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( fontChanged( const TQFont & ) ) ); connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ), - this, TQT_SLOT( tqalignmentChanged( int ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( tqalignmentChanged( int ) ) ); } @@ -1876,14 +1876,14 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign, // unless the identity is sticky if ( !stickyIdentity ) { disconnect(mIdentity,TQT_SIGNAL(identityChanged(uint)), - this, TQT_SLOT(slotIdentityChanged(uint))); + TQT_TQOBJECT(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)), - this, TQT_SLOT(slotIdentityChanged(uint))); + TQT_TQOBJECT(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) @@ -2345,7 +2345,7 @@ void KMComposeWin::applyChanges( bool dontSignNorEncrypt, bool dontDisable ) // Make new job and execute it mComposer = new MessageComposer( this ); connect( mComposer, TQT_SIGNAL( done( bool ) ), - this, TQT_SLOT( slotComposerDone( bool ) ) ); + TQT_TQOBJECT(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 @@ -2399,14 +2399,14 @@ bool KMComposeWin::addAttach(const KURL aUrl) if ( !aUrl.isValid() ) { KMessageBox::sorry( this, i18n( "<qt><p>KMail could not recognize the location of the attachment (%1);</p>" "<p>you have to specify the full path if you wish to attach a file.</p></qt>" ) - .arg( aUrl.prettyURL() ) ); + .tqarg( aUrl.prettyURL() ) ); return false; } const int maxAttachmentSize = GlobalSettings::maximumAttachmentSize(); const uint maximumAttachmentSizeInByte = maxAttachmentSize*1024*1024; if ( aUrl.isLocalFile() && TQFileInfo( aUrl.pathOrURL() ).size() > maximumAttachmentSizeInByte ) { - KMessageBox::sorry( this, i18n( "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</p>" ).arg( maxAttachmentSize ) ); + KMessageBox::sorry( this, i18n( "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</p>" ).tqarg( maxAttachmentSize ) ); return false; } @@ -2422,9 +2422,9 @@ bool KMComposeWin::addAttach(const KURL aUrl) mMapAtmLoadData.insert(job, ld); mAttachJobs[job] = aUrl; connect(job, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotAttachFileResult(KIO::Job *))); + TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(KIO::Job *))); connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &))); + TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &))); return true; } @@ -2454,9 +2454,9 @@ void KMComposeWin::addAttach(const KMMessagePart* msgPart) } connect( lvi, TQT_SIGNAL( compress( int ) ), - this, TQT_SLOT( compressAttach( int ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( compressAttach( int ) ) ); connect( lvi, TQT_SIGNAL( uncompress( int ) ), - this, TQT_SLOT( uncompressAttach( int ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( uncompressAttach( int ) ) ); slotUpdateAttachActions(); } @@ -2847,7 +2847,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job) TQString ext; if( !patterns.isEmpty() ) { ext = patterns[0]; - int i = ext.findRev( '.' ); + int i = ext.tqfindRev( '.' ); if( i == -1 ) ext.prepend( '.' ); else if( i > 0 ) @@ -2998,7 +2998,7 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u) KConfigGroupSaver saver( config, "Composer" ); TQStringList urls = config->readListEntry( "recent-urls" ); TQStringList encodings = config->readListEntry( "recent-encodings" ); - int index = urls.findIndex( u.prettyURL() ); + int index = urls.tqfindIndex( u.prettyURL() ); if (index != -1) { TQString encoding = encodings[ index ]; ld.encoding = encoding.latin1(); @@ -3006,9 +3006,9 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u) } mMapAtmLoadData.insert(job, ld); connect(job, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotAttachFileResult(KIO::Job *))); + TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(KIO::Job *))); connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &))); + TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &))); } @@ -3114,7 +3114,7 @@ static void showExportError( TQWidget * w, const GpgME::Error & err ) { const TQString msg = i18n("<qt><p>An error occurred while trying to export " "the key from the backend:</p>" "<p><b>%1</b></p></qt>") - .arg( TQString::fromLocal8Bit( err.asString() ) ); + .tqarg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( w, msg, i18n("Key Export Failed") ); } @@ -3153,7 +3153,7 @@ void KMComposeWin::slotPublicKeyExportResult( const GpgME::Error & err, const TQ // create message part KMMessagePart * msgPart = new KMMessagePart(); - msgPart->setName( i18n("OpenPGP key 0x%1").arg( mFingerprint ) ); + msgPart->setName( i18n("OpenPGP key 0x%1").tqarg( mFingerprint ) ); msgPart->setTypeStr("application"); msgPart->setSubtypeStr("pgp-keys"); TQValueList<int> dummy; @@ -3291,7 +3291,7 @@ void KMComposeWin::compressAttach( int idx ) msgPart = mAtmList.at( i ); TQByteArray array; TQBuffer dev( array ); - KZip zip( &dev ); + KZip zip( &TQT_TQIODEVICE_OBJECT(dev) ); TQByteArray decoded = msgPart->bodyDecodedBinary(); if ( ! zip.open( IO_WriteOnly ) ) { KMessageBox::sorry(0, i18n("KMail could not compress the file.") ); @@ -3370,7 +3370,7 @@ void KMComposeWin::uncompressAttach( int idx ) msgPart = mAtmList.at( i ); TQBuffer dev( msgPart->bodyDecodedBinary() ); - KZip zip( &dev ); + KZip zip( &TQT_TQIODEVICE_OBJECT(dev) ); TQByteArray decoded; decoded = msgPart->bodyDecodedBinary(); @@ -3562,7 +3562,7 @@ void KMComposeWin::editAttach(int index, bool openWith) KMail::EditorWatcher *watcher = new KMail::EditorWatcher( KURL( atmTempFile->name() ), contentTypeStr, openWith, - this, this ); + TQT_TQOBJECT(this), this ); connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(slotEditDone(KMail::EditorWatcher*)) ); if ( watcher->start() ) { mEditorMap.insert( watcher, msgPart ); @@ -3633,7 +3633,7 @@ void KMComposeWin::slotSearchAgain() //----------------------------------------------------------------------------- void KMComposeWin::slotReplace() { - mEditor->tqreplace(); + mEditor->replace(); } //----------------------------------------------------------------------------- @@ -3665,7 +3665,7 @@ void KMComposeWin::slotPasteClipboardAsQuotation() { if( mEditor->hasFocus() && msg() ) { - TQString s = TQApplication::clipboard()->text(); + TQString s = TQApplication::tqclipboard()->text(); if (!s.isEmpty()) mEditor->insert(addQuotesToText(s)); } @@ -3673,13 +3673,13 @@ void KMComposeWin::slotPasteClipboardAsQuotation() void KMComposeWin::slotPasteClipboardAsAttachment() { - KURL url( TQApplication::clipboard()->text( TQClipboard::Clipboard ) ); + KURL url( TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) ); if ( url.isValid() ) { - addAttach(TQApplication::clipboard()->text( TQClipboard::Clipboard ) ); + addAttach(TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) ); return; } - TQMimeSource *mimeSource = TQApplication::clipboard()->data(); + TQMimeSource *mimeSource = TQApplication::tqclipboard()->data(); if ( TQImageDrag::canDecode(mimeSource) ) { slotAttachPNGImageData(mimeSource->tqencodedData("image/png")); } @@ -3691,7 +3691,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment() KMMessagePart *msgPart = new KMMessagePart; msgPart->setName(attName); TQValueList<int> dummy; - msgPart->setBodyAndGuessCte(TQCString(TQApplication::clipboard()->text().latin1()), dummy, + msgPart->setBodyAndGuessCte(TQCString(TQApplication::tqclipboard()->text().latin1()), dummy, kmkernel->msgSender()->sendQuotedPrintable()); addAttach(msgPart); } @@ -3776,9 +3776,9 @@ void KMComposeWin::slotUndo() TQWidget* fw = tqfocusWidget(); if (!fw) return; - if ( ::qt_cast<KEdit*>(fw) ) + if ( ::tqqt_cast<KEdit*>(fw) ) static_cast<TQTextEdit*>(fw)->undo(); - else if (::qt_cast<TQLineEdit*>(fw)) + else if (::tqqt_cast<TQLineEdit*>(fw)) static_cast<TQLineEdit*>(fw)->undo(); } @@ -3787,9 +3787,9 @@ void KMComposeWin::slotRedo() TQWidget* fw = tqfocusWidget(); if (!fw) return; - if (::qt_cast<KEdit*>(fw)) + if (::tqqt_cast<KEdit*>(fw)) static_cast<KEdit*>(fw)->redo(); - else if (::qt_cast<TQLineEdit*>(fw)) + else if (::tqqt_cast<TQLineEdit*>(fw)) static_cast<TQLineEdit*>(fw)->redo(); } @@ -3799,9 +3799,9 @@ void KMComposeWin::slotCut() TQWidget* fw = tqfocusWidget(); if (!fw) return; - if (::qt_cast<KEdit*>(fw)) + if (::tqqt_cast<KEdit*>(fw)) static_cast<KEdit*>(fw)->cut(); - else if (::qt_cast<TQLineEdit*>(fw)) + else if (::tqqt_cast<TQLineEdit*>(fw)) static_cast<TQLineEdit*>(fw)->cut(); } @@ -3817,7 +3817,7 @@ void KMComposeWin::slotCopy() #endif TQKeyEvent k(TQEvent::KeyPress, Key_C, 0, ControlButton); - kapp->notify(fw, &k); + kapp->notify(TQT_TQOBJECT(fw), TQT_TQEVENT(&k)); } @@ -3832,7 +3832,7 @@ void KMComposeWin::paste( TQClipboard::Mode mode ) TQWidget* fw = tqfocusWidget(); if (!fw) return; - TQMimeSource *mimeSource = TQApplication::clipboard()->data( mode ); + TQMimeSource *mimeSource = TQApplication::tqclipboard()->data( mode ); if ( mimeSource->provides("image/png") ) { slotAttachPNGImageData(mimeSource->tqencodedData("image/png")); } else if ( KURLDrag::canDecode( mimeSource ) ) { @@ -3875,9 +3875,9 @@ void KMComposeWin::slotMarkAll() TQWidget* fw = tqfocusWidget(); if (!fw) return; - if (::qt_cast<TQLineEdit*>(fw)) + if (::tqqt_cast<TQLineEdit*>(fw)) static_cast<TQLineEdit*>(fw)->selectAll(); - else if (::qt_cast<KEdit*>(fw)) + else if (::tqqt_cast<KEdit*>(fw)) static_cast<KEdit*>(fw)->selectAll(); } @@ -4070,14 +4070,14 @@ void KMComposeWin::slotPrint() { mMessageWasModified = isModified(); connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - this, TQT_SLOT( slotContinuePrint( bool ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) ); applyChanges( true ); } void KMComposeWin::slotContinuePrint( bool rc ) { disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - this, TQT_SLOT( slotContinuePrint( bool ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) ); if( rc ) { if ( mComposedMessages.isEmpty() ) { @@ -4279,7 +4279,7 @@ bool KMComposeWin::saveDraftOrTemplate( const TQString &folderName, "identify \"%1\" does not exist (anymore); " "therefore, the default drafts or templates " "folder will be used.") - .arg( id.identityName() ) ); + .tqarg( id.identityName() ) ); } } if ( imapTheFolder && imapTheFolder->noContent() ) @@ -4321,7 +4321,7 @@ void KMComposeWin::slotContinueDoSend( bool sentOk ) kdDebug(5006) << "KMComposeWin::slotContinueDoSend( " << sentOk << " )" << endl; disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - this, TQT_SLOT( slotContinueDoSend( bool ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( slotContinueDoSend( bool ) ) ); if ( !sentOk ) { mDisableBreaking = false; @@ -4463,7 +4463,7 @@ bool KMComposeWin::checkRecipientNumber() const GlobalSettings::self()->tooManyRecipients() && mRecipientsEditor->recipients().count() > thresHold ) { if ( KMessageBox::questionYesNo( mMainWidget, - i18n("You are trying to send the mail to more than %1 recipients. Send message anyway?").arg(thresHold), + i18n("You are trying to send the mail to more than %1 recipients. Send message anyway?").tqarg(thresHold), i18n("Too many receipients"), i18n("&Send as Is"), i18n("&Edit Recipients")) == KMessageBox::No ) { @@ -4978,7 +4978,7 @@ void KMComposeWin::slotSpellcheckConfig() { KDialogBase dlg(KDialogBase::Plain, i18n("Spellchecker"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, - this, 0, true, true ); + TQT_TQWIDGET(this), 0, true, true ); KWin kwin; TQTabDialog qtd (this, "tabdialog", true); KSpellConfig mKSpellConfig (&qtd); @@ -5068,7 +5068,7 @@ void KMComposeWin::updateAutoSave() if ( !mAutoSaveTimer ) { mAutoSaveTimer = new TQTimer( this, "mAutoSaveTimer" ); connect( mAutoSaveTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( autoSaveMessage() ) ); + TQT_TQOBJECT(this), TQT_SLOT( autoSaveMessage() ) ); } mAutoSaveTimer->start( autoSaveInterval() ); } |