Rename obsolete tq methods to standard names

(cherry picked from commit ba2a3ce341c0c71bbbcf350fcbcd60c552220b31)

1 files changed, 9 insertions, 9 deletions

diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 80bd68cde..4729909b2 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -648,8 +648,8 @@ bool KMComposeWin::event(TQEvent *e)
 void KMComposeWin::readColorConfig(void)
 {
   if ( GlobalSettings::self()->useDefaultColors() ) {
-    mForeColor = TQColor(kapp->tqpalette().active().text());
-    mBackColor = TQColor(kapp->tqpalette().active().base());
+    mForeColor = TQColor(kapp->palette().active().text());
+    mBackColor = TQColor(kapp->palette().active().base());
   } else {
     mForeColor = GlobalSettings::self()->foregroundColor();
     mBackColor = GlobalSettings::self()->backgroundColor();
@@ -3665,7 +3665,7 @@ void KMComposeWin::slotPasteClipboardAsQuotation()
 {
     if( mEditor->hasFocus() && msg() )
     {
-        TQString s = TQApplication::tqclipboard()->text();
+        TQString s = TQApplication::clipboard()->text();
         if (!s.isEmpty())
             mEditor->insert(addQuotesToText(s));
     }
@@ -3673,13 +3673,13 @@ void KMComposeWin::slotPasteClipboardAsQuotation()
 
 void KMComposeWin::slotPasteClipboardAsAttachment()
 {
-  KURL url( TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) );
+  KURL url( TQApplication::clipboard()->text( TQClipboard::Clipboard ) );
   if ( url.isValid() ) {
-    addAttach(TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) );
+    addAttach(TQApplication::clipboard()->text( TQClipboard::Clipboard ) );
     return;
   }
 
-  TQMimeSource *mimeSource = TQApplication::tqclipboard()->data();
+  TQMimeSource *mimeSource = TQApplication::clipboard()->data();
   if ( TQImageDrag::canDecode(mimeSource) ) {
     slotAttachPNGImageData(mimeSource->encodedData("image/png"));
   }
@@ -3691,7 +3691,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment()
     KMMessagePart *msgPart = new KMMessagePart;
     msgPart->setName(attName);
     TQValueList<int> dummy;
-    msgPart->setBodyAndGuessCte(TQCString(TQApplication::tqclipboard()->text().latin1()), dummy,
+    msgPart->setBodyAndGuessCte(TQCString(TQApplication::clipboard()->text().latin1()), dummy,
                                 kmkernel->msgSender()->sendQuotedPrintable());
     addAttach(msgPart);
   }
@@ -3832,7 +3832,7 @@ void KMComposeWin::paste( TQClipboard::Mode mode )
   TQWidget* fw = focusWidget();
   if (!fw) return;
 
-  TQMimeSource *mimeSource = TQApplication::tqclipboard()->data( mode );
+  TQMimeSource *mimeSource = TQApplication::clipboard()->data( mode );
   if ( mimeSource->provides("image/png") )  {
     slotAttachPNGImageData(mimeSource->encodedData("image/png"));
   } else if ( KURLDrag::canDecode( mimeSource ) ) {
@@ -4982,7 +4982,7 @@ void KMComposeWin::slotSpellcheckConfig()
   KWin kwin;
   TQTabDialog qtd (this, "tabdialog", true);
   KSpellConfig mKSpellConfig (&qtd);
-  mKSpellConfig.tqlayout()->setMargin( KDialog::marginHint() );
+  mKSpellConfig.layout()->setMargin( KDialog::marginHint() );
 
   qtd.addTab (&mKSpellConfig, i18n("Spellchecker"));
   qtd.setCancelButton ();