1 files changed, 53 insertions, 53 deletions

diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index a1ab32d8a..e6ec6f967 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->setSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum );
+  mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum );
   TQVBoxLayout *v = new TQVBoxLayout( mMainWidget );
   v->addWidget( mHeadersToEditorSplitter );
   mIdentity = new KPIM::IdentityCombo(kmkernel->identityManager(), mHeadersArea);
@@ -286,7 +286,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
     connect( mRecipientsEditor,
              TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion ) ),
              TQT_SLOT( slotCompletionModeChanged( KGlobalSettings::Completion ) ) );
-    connect( mRecipientsEditor, TQT_SIGNAL(sizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) );
+    connect( mRecipientsEditor, TQT_SIGNAL(tqsizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) );
 
     mRecipientsEditor->setFocus();
   }
@@ -341,7 +341,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   TQHBoxLayout *hbox = new TQHBoxLayout( vbox );
   {
       mSignatureStateIndicator = new TQLabel( editorAndCryptoStateIndicators );
-      mSignatureStateIndicator->setAlignment( Qt::AlignHCenter );
+      mSignatureStateIndicator->tqsetAlignment( Qt::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->setAlignment( Qt::AlignHCenter );
+      mEncryptionStateIndicator->tqsetAlignment( Qt::AlignHCenter );
       hbox->addWidget( mEncryptionStateIndicator );
       p.setColor( TQColorGroup::Background, reader.readColorEntry( "PGPMessageEncr" , &defaultEncryptedColor ) );
       mEncryptionStateIndicator->setPalette( p );
@@ -965,13 +965,13 @@ 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 QMAX( width, w->sizeHint().width() );
+  return QMAX( width, w->tqsizeHint().width() );
 }
 
 void KMComposeWin::rethinkFields(bool fromSlot)
 {
   //This sucks even more but again no ids. sorry (sven)
-  int mask, row, numRows;
+  int tqmask, row, numRows;
   long showHeaders;
 
   if (mShowHeaders < 0)
@@ -979,8 +979,8 @@ void KMComposeWin::rethinkFields(bool fromSlot)
   else
     showHeaders = mShowHeaders;
 
-  for (mask=1,mNumHeaders=0; mask<=showHeaders; mask<<=1)
-    if ((showHeaders&mask) != 0) mNumHeaders++;
+  for (tqmask=1,mNumHeaders=0; tqmask<=showHeaders; tqmask<<=1)
+    if ((showHeaders&tqmask) != 0) mNumHeaders++;
 
   numRows = mNumHeaders + 1;
 
@@ -1109,9 +1109,9 @@ void KMComposeWin::rethinkFields(bool fromSlot)
   else
     mAtmListView->hide();
   resize(this->size());
-  repaint();
+  tqrepaint();
 
-  mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() );
+  mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().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->sizeHint().width(),aLbl->sizeHint().height() + 6);
+    aLbl->resize((int)aLbl->tqsizeHint().width(),aLbl->tqsizeHint().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->sizeHint().width(), aLbl->height());
+      aChk->setFixedSize(aChk->tqsizeHint().width(), aLbl->height());
       aChk->show();
     }
     aRow++;
@@ -1219,8 +1219,8 @@ void KMComposeWin::getTransportMenu()
   int id = 0;
   for(it = availTransports.begin(); it != availTransports.end() ; ++it, id++)
   {
-    mActNowMenu->insertItem((*it).replace("&", "&&"), id);
-    mActLaterMenu->insertItem((*it).replace("&", "&&"), id);
+    mActNowMenu->insertItem((*it).tqreplace("&", "&&"), id);
+    mActLaterMenu->insertItem((*it).tqreplace("&", "&&"), id);
   }
 }
 
@@ -1337,9 +1337,9 @@ void KMComposeWin::setupActions(void)
   KStdAction::selectAll (this, TQT_SLOT(slotMarkAll()), actionCollection());
 
   KStdAction::find (this, TQT_SLOT(slotFind()), actionCollection());
-  KStdAction::findNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
+  KStdAction::tqfindNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
 
-  KStdAction::replace (this, TQT_SLOT(slotReplace()), actionCollection());
+  KStdAction::tqreplace (this, TQT_SLOT(slotReplace()), actionCollection());
   KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection(), "spellcheck");
 
   mPasteQuotation = new KAction (i18n("Pa&ste as Quotation"),0,this,TQT_SLOT( slotPasteClipboardAsQuotation()),
@@ -1685,7 +1685,7 @@ void KMComposeWin::setupEditor(void)
   connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ),
           this, TQT_SLOT( fontChanged( const TQFont & ) ) );
   connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ),
-          this, TQT_SLOT( alignmentChanged( int ) ) );
+          this, TQT_SLOT( tqalignmentChanged( int ) ) );
 
 }
 
@@ -1695,8 +1695,8 @@ static TQString cleanedUpHeaderString( const TQString & s )
 {
   // remove invalid characters from the header strings
   TQString res( s );
-  res.replace( '\r', "" );
-  res.replace( '\n', " " );
+  res.tqreplace( '\r', "" );
+  res.tqreplace( '\n', " " );
   return res.stripWhiteSpace();
 }
 
@@ -2277,29 +2277,29 @@ bool KMComposeWin::userForgotAttachment()
 
   if ( attachWordsList.isEmpty() ) {
     // default value (FIXME: this is duplicated in configuredialog.cpp)
-    attachWordsList << TQString::fromLatin1("attachment")
-                    << TQString::fromLatin1("attached");
-    if ( TQString::fromLatin1("attachment") != i18n("attachment") )
+    attachWordsList << TQString::tqfromLatin1("attachment")
+                    << TQString::tqfromLatin1("attached");
+    if ( TQString::tqfromLatin1("attachment") != i18n("attachment") )
       attachWordsList << i18n("attachment");
-    if ( TQString::fromLatin1("attached") != i18n("attached") )
+    if ( TQString::tqfromLatin1("attached") != i18n("attached") )
       attachWordsList << i18n("attached");
   }
 
-  TQRegExp rx ( TQString::fromLatin1("\\b") +
+  TQRegExp rx ( TQString::tqfromLatin1("\\b") +
                attachWordsList.join("\\b|\\b") +
-               TQString::fromLatin1("\\b") );
+               TQString::tqfromLatin1("\\b") );
   rx.setCaseSensitive( false );
 
   bool gotMatch = false;
 
-  // check whether the subject contains one of the attachment key words
+  // check whether the subject tqcontains one of the attachment key words
   // unless the message is a reply or a forwarded message
   TQString subj = subject();
   gotMatch =    ( KMMessage::stripOffPrefixes( subj ) == subj )
              && ( rx.search( subj ) >= 0 );
 
   if ( !gotMatch ) {
-    // check whether the non-quoted text contains one of the attachment key
+    // check whether the non-quoted text tqcontains one of the attachment key
     // words
     TQRegExp quotationRx ("^([ \\t]*([|>:}#]|[A-Za-z]+>))+");
     for ( int i = 0; i < mEditor->numLines(); ++i ) {
@@ -3633,7 +3633,7 @@ void KMComposeWin::slotSearchAgain()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotReplace()
 {
-  mEditor->replace();
+  mEditor->tqreplace();
 }
 
 //-----------------------------------------------------------------------------
@@ -3681,7 +3681,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment()
 
   TQMimeSource *mimeSource = TQApplication::clipboard()->data();
   if ( TQImageDrag::canDecode(mimeSource) ) {
-    slotAttachPNGImageData(mimeSource->encodedData("image/png"));
+    slotAttachPNGImageData(mimeSource->tqencodedData("image/png"));
   }
   else {
     bool ok;
@@ -3725,7 +3725,7 @@ TQString KMComposeWin::addQuotesToText(const TQString &inputText)
 {
     TQString answer = TQString( inputText );
     TQString indentStr = quotePrefixName();
-    answer.replace( '\n', '\n' + indentStr);
+    answer.tqreplace( '\n', '\n' + indentStr);
     answer.prepend( indentStr );
     answer += '\n';
     return KMMessage::smartQuote( answer, GlobalSettings::self()->lineWrapWidth() );
@@ -3743,7 +3743,7 @@ TQString KMComposeWin::removeQuotesFromText(const TQString &inputText)
     // now remove all remaining leading quotes
     quotePrefix = '\n' + quotePrefixName();
     rx = quotePrefix;
-    s.replace(rx, "\n");
+    s.tqreplace(rx, "\n");
 
     return s;
 }
@@ -3773,7 +3773,7 @@ void KMComposeWin::slotRemoveQuotes()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotUndo()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if ( ::qt_cast<KEdit*>(fw) )
@@ -3784,7 +3784,7 @@ void KMComposeWin::slotUndo()
 
 void KMComposeWin::slotRedo()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (::qt_cast<KEdit*>(fw))
@@ -3796,7 +3796,7 @@ void KMComposeWin::slotRedo()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotCut()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (::qt_cast<KEdit*>(fw))
@@ -3809,7 +3809,7 @@ void KMComposeWin::slotCut()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotCopy()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
 #ifdef KeyPress
@@ -3829,12 +3829,12 @@ void KMComposeWin::slotPasteClipboard()
 
 void KMComposeWin::paste( QClipboard::Mode mode )
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   TQMimeSource *mimeSource = TQApplication::clipboard()->data( mode );
   if ( mimeSource->provides("image/png") )  {
-    slotAttachPNGImageData(mimeSource->encodedData("image/png"));
+    slotAttachPNGImageData(mimeSource->tqencodedData("image/png"));
   } else if ( KURLDrag::canDecode( mimeSource ) ) {
         KURL::List urlList;
         if( KURLDrag::decode( mimeSource, urlList ) ) {
@@ -3872,7 +3872,7 @@ void KMComposeWin::paste( QClipboard::Mode mode )
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotMarkAll()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (::qt_cast<TQLineEdit*>(fw))
@@ -3918,7 +3918,7 @@ void KMComposeWin::slotUpdWinTitle(const TQString& text)
   // newlines tend to become boxes.
   if (text.isEmpty())
     setCaption("("+i18n("unnamed")+")");
-  else setCaption( s.replace( TQChar('\n'), ' ' ) );
+  else setCaption( s.tqreplace( TQChar('\n'), ' ' ) );
 }
 
 
@@ -4605,15 +4605,15 @@ void KMComposeWin::slotCleanSpace()
 
   // Squeeze tabs and spaces
   TQRegExp squeeze( "[\t ]+" );
-  s.replace( squeeze, TQChar( ' ' ) );
+  s.tqreplace( squeeze, TQChar( ' ' ) );
 
   // Remove trailing whitespace
   TQRegExp trailing( "\\s+$" );
-  s.replace( trailing, TQChar( '\n' ) );
+  s.tqreplace( trailing, TQChar( '\n' ) );
 
   // Single space lines
   TQRegExp singleSpace( "[\n]{2,}" );
-  s.replace( singleSpace, TQChar( '\n' ) );
+  s.tqreplace( singleSpace, TQChar( '\n' ) );
 
   // Restore the signature
   if ( restore )
@@ -4820,7 +4820,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
   // don't overwrite the BCC field under certain circomstances
   // NOT edited and preset BCC from the identity
   if( mEdtBcc && !mEdtBcc->edited() && !ident.bcc().isEmpty() ) {
-    // BCC NOT empty AND contains a diff adress then the preset BCC
+    // BCC NOT empty AND tqcontains a diff adress then the preset BCC
     // of the new identity
     if( !mEdtBcc->text().isEmpty() && mEdtBcc->text() != ident.bcc() && !mEdtBcc->edited() ) {
       mEdtBcc->setText( ident.bcc() );
@@ -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::fromLatin1(",") + ident.bcc() );
+        TQString temp_string( mEdtBcc->text() + TQString::tqfromLatin1(",") + 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::fromLatin1(",") + ident.bcc() );
+      TQString temp_string ( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() );
       mEdtBcc->setText( temp_string );
     } else {
       mEdtBcc->setText( ident.bcc() );
@@ -4935,7 +4935,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
     if ( pos >= 0 && !mOldSigText.isEmpty() ) {
       const int oldLength = mOldSigText.length();
       mOldSigText = "\n\n"+ ident.signature().rawText() + "\n"; // see insertSignature()
-      edtText = edtText.replace( pos, oldLength, mOldSigText );
+      edtText = edtText.tqreplace( pos, oldLength, mOldSigText );
       mEditor->setText( edtText );
     } else {
       insertSignature( Append );
@@ -4982,7 +4982,7 @@ void KMComposeWin::slotSpellcheckConfig()
   KWin kwin;
   TQTabDialog qtd (this, "tabdialog", true);
   KSpellConfig mKSpellConfig (&qtd);
-  mKSpellConfig.layout()->setMargin( KDialog::marginHint() );
+  mKSpellConfig.tqlayout()->setMargin( KDialog::marginHint() );
 
   qtd.addTab (&mKSpellConfig, i18n("Spellchecker"));
   qtd.setCancelButton ();
@@ -4996,7 +4996,7 @@ void KMComposeWin::slotSpellcheckConfig()
 }
 
 //-----------------------------------------------------------------------------
-void KMComposeWin::slotStatusMessage(const TQString &message)
+void KMComposeWin::sloStatusMessage(const TQString &message)
 {
     statusBar()->changeItem( message, 0 );
 }
@@ -5177,19 +5177,19 @@ void KMComposeWin::slotSizeAction( int size )
 void KMComposeWin::slotAlignLeft()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::setAlignment( AlignLeft );
+    mEditor->TQTextEdit::tqsetAlignment( AlignLeft );
 }
 
 void KMComposeWin::slotAlignCenter()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::setAlignment( AlignHCenter );
+    mEditor->TQTextEdit::tqsetAlignment( AlignHCenter );
 }
 
 void KMComposeWin::slotAlignRight()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::setAlignment( AlignRight );
+    mEditor->TQTextEdit::tqsetAlignment( AlignRight );
 }
 
 void KMComposeWin::slotTextBold()
@@ -5252,7 +5252,7 @@ void KMComposeWin::fontChanged( const TQFont &f )
   fontSizeAction->setFontSize( f.pointSize() );
 }
 
-void KMComposeWin::alignmentChanged( int a )
+void KMComposeWin::tqalignmentChanged( int a )
 {
     //toggleMarkup();
     alignLeftAction->setChecked( ( a == AlignAuto ) || ( a & AlignLeft ) );
@@ -5404,6 +5404,6 @@ void KMComposeWin::recipientEditorSizeHintChanged()
 
 void KMComposeWin::setMaximumHeaderSize()
 {
-  mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() );
+  mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() );
 }