diff options
Diffstat (limited to 'kmail/kmcomposewin.cpp')
-rw-r--r-- | kmail/kmcomposewin.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index a161070df..12c2e6147 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -199,7 +199,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mHeadersToEditorSplitter = new TQSplitter( Qt::Vertical, mMainWidget, "mHeadersToEditorSplitter" ); mHeadersToEditorSplitter->setChildrenCollapsible( false ); mHeadersArea = new TQWidget( mHeadersToEditorSplitter ); - mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->tqsizePolicy().horData(), TQSizePolicy::Maximum ); + mHeadersArea->setSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum ); TQVBoxLayout *v = new TQVBoxLayout( mMainWidget ); v->addWidget( mHeadersToEditorSplitter ); mIdentity = new KPIM::IdentityCombo(kmkernel->identityManager(), mHeadersArea); @@ -341,7 +341,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) TQHBoxLayout *hbox = new TQHBoxLayout( vbox ); { mSignatureStateIndicator = new TQLabel( editorAndCryptoStateIndicators ); - mSignatureStateIndicator->tqsetAlignment( TQt::AlignHCenter ); + mSignatureStateIndicator->setAlignment( TQt::AlignHCenter ); hbox->addWidget( mSignatureStateIndicator ); KConfigGroup reader( KMKernel::config(), "Reader" ); @@ -353,7 +353,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mSignatureStateIndicator->setPalette( p ); mEncryptionStateIndicator = new TQLabel( editorAndCryptoStateIndicators ); - mEncryptionStateIndicator->tqsetAlignment( TQt::AlignHCenter ); + mEncryptionStateIndicator->setAlignment( TQt::AlignHCenter ); hbox->addWidget( mEncryptionStateIndicator ); p.setColor( TQColorGroup::Background, reader.readColorEntry( "PGPMessageEncr" , &defaultEncryptedColor ) ); mEncryptionStateIndicator->setPalette( p ); @@ -965,7 +965,7 @@ int KMComposeWin::calcColumnWidth(int which, long allShowing, int width) w->setBuddy( mEditor ); // set dummy so we don't calculate width of '&' for this label. w->adjustSize(); w->show(); - return TQMAX( width, w->tqsizeHint().width() ); + return TQMAX( width, w->sizeHint().width() ); } void KMComposeWin::rethinkFields(bool fromSlot) @@ -1111,7 +1111,7 @@ void KMComposeWin::rethinkFields(bool fromSlot) resize(this->size()); tqrepaint(); - mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() ); + mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() ); mGrid->activate(); mHeadersArea->show(); @@ -1182,7 +1182,7 @@ void KMComposeWin::rethinkHeaderLine(int aValue, int aMask, int& aRow, if (aValue & aMask) { aLbl->adjustSize(); - aLbl->resize((int)aLbl->tqsizeHint().width(),aLbl->tqsizeHint().height() + 6); + aLbl->resize((int)aLbl->sizeHint().width(),aLbl->sizeHint().height() + 6); aLbl->setMinimumSize(aLbl->size()); aLbl->show(); aLbl->setBuddy(aCbx); @@ -1193,7 +1193,7 @@ void KMComposeWin::rethinkHeaderLine(int aValue, int aMask, int& aRow, mGrid->addWidget(aCbx, aRow, 1); if ( aChk ) { mGrid->addWidget(aChk, aRow, 2); - aChk->setFixedSize(aChk->tqsizeHint().width(), aLbl->height()); + aChk->setFixedSize(aChk->sizeHint().width(), aLbl->height()); aChk->show(); } aRow++; @@ -2277,17 +2277,17 @@ bool KMComposeWin::userForgotAttachment() if ( attachWordsList.isEmpty() ) { // default value (FIXME: this is duplicated in configuredialog.cpp) - attachWordsList << TQString::tqfromLatin1("attachment") - << TQString::tqfromLatin1("attached"); - if ( TQString::tqfromLatin1("attachment") != i18n("attachment") ) + attachWordsList << TQString::fromLatin1("attachment") + << TQString::fromLatin1("attached"); + if ( TQString::fromLatin1("attachment") != i18n("attachment") ) attachWordsList << i18n("attachment"); - if ( TQString::tqfromLatin1("attached") != i18n("attached") ) + if ( TQString::fromLatin1("attached") != i18n("attached") ) attachWordsList << i18n("attached"); } - TQRegExp rx ( TQString::tqfromLatin1("\\b") + + TQRegExp rx ( TQString::fromLatin1("\\b") + attachWordsList.join("\\b|\\b") + - TQString::tqfromLatin1("\\b") ); + TQString::fromLatin1("\\b") ); rx.setCaseSensitive( false ); bool gotMatch = false; @@ -3681,7 +3681,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment() TQMimeSource *mimeSource = TQApplication::tqclipboard()->data(); if ( TQImageDrag::canDecode(mimeSource) ) { - slotAttachPNGImageData(mimeSource->tqencodedData("image/png")); + slotAttachPNGImageData(mimeSource->encodedData("image/png")); } else { bool ok; @@ -3773,7 +3773,7 @@ void KMComposeWin::slotRemoveQuotes() //----------------------------------------------------------------------------- void KMComposeWin::slotUndo() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if ( ::tqqt_cast<KEdit*>(fw) ) @@ -3784,7 +3784,7 @@ void KMComposeWin::slotUndo() void KMComposeWin::slotRedo() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (::tqqt_cast<KEdit*>(fw)) @@ -3796,7 +3796,7 @@ void KMComposeWin::slotRedo() //----------------------------------------------------------------------------- void KMComposeWin::slotCut() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (::tqqt_cast<KEdit*>(fw)) @@ -3809,7 +3809,7 @@ void KMComposeWin::slotCut() //----------------------------------------------------------------------------- void KMComposeWin::slotCopy() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; #ifdef KeyPress @@ -3829,12 +3829,12 @@ void KMComposeWin::slotPasteClipboard() void KMComposeWin::paste( TQClipboard::Mode mode ) { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; TQMimeSource *mimeSource = TQApplication::tqclipboard()->data( mode ); if ( mimeSource->provides("image/png") ) { - slotAttachPNGImageData(mimeSource->tqencodedData("image/png")); + slotAttachPNGImageData(mimeSource->encodedData("image/png")); } else if ( KURLDrag::canDecode( mimeSource ) ) { KURL::List urlList; if( KURLDrag::decode( mimeSource, urlList ) ) { @@ -3872,7 +3872,7 @@ void KMComposeWin::paste( TQClipboard::Mode mode ) //----------------------------------------------------------------------------- void KMComposeWin::slotMarkAll() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (::tqqt_cast<TQLineEdit*>(fw)) @@ -4780,10 +4780,10 @@ void KMComposeWin::slotSpellcheckDone(int result) statusBar()->changeItem(i18n(" Spell check complete."),0); break; } - TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneCleartqStatus()) ); + TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneClearStatus()) ); } -void KMComposeWin::slotSpellcheckDoneCleartqStatus() +void KMComposeWin::slotSpellcheckDoneClearStatus() { statusBar()->changeItem("", 0); } @@ -4829,7 +4829,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid ) // of the identity, we assume that since the user typed it // they want to keep it if ( mEdtBcc->text() != ident.bcc() && !mEdtBcc->text().isEmpty() ) { - TQString temp_string( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() ); + TQString temp_string( mEdtBcc->text() + TQString::fromLatin1(",") + ident.bcc() ); mEdtBcc->setText( temp_string ); } else { // if the user typed the same address as the preset BCC @@ -4843,7 +4843,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid ) // allowing the user to keep all addresses if( mEdtBcc && mEdtBcc->edited() && !ident.bcc().isEmpty() ) { if( !mEdtBcc->text().isEmpty() ) { - TQString temp_string ( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() ); + TQString temp_string ( mEdtBcc->text() + TQString::fromLatin1(",") + ident.bcc() ); mEdtBcc->setText( temp_string ); } else { mEdtBcc->setText( ident.bcc() ); @@ -5177,19 +5177,19 @@ void KMComposeWin::slotSizeAction( int size ) void KMComposeWin::slotAlignLeft() { toggleMarkup(true); - mEditor->TQTextEdit::tqsetAlignment( AlignLeft ); + mEditor->TQTextEdit::setAlignment( AlignLeft ); } void KMComposeWin::slotAlignCenter() { toggleMarkup(true); - mEditor->TQTextEdit::tqsetAlignment( AlignHCenter ); + mEditor->TQTextEdit::setAlignment( AlignHCenter ); } void KMComposeWin::slotAlignRight() { toggleMarkup(true); - mEditor->TQTextEdit::tqsetAlignment( AlignRight ); + mEditor->TQTextEdit::setAlignment( AlignRight ); } void KMComposeWin::slotTextBold() @@ -5404,6 +5404,6 @@ void KMComposeWin::recipientEditorSizeHintChanged() void KMComposeWin::setMaximumHeaderSize() { - mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() ); + mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() ); } |