1 files changed, 11 insertions, 11 deletions

diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index 5442bef40..dbbb53808 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -241,7 +241,7 @@ KMEdit::KMEdit(TQWidget *tqparent, KMComposeWin* composer,
 void KMEdit::createSpellers()
 {
   delete mSpeller;
-  mSpeller = new KMSpell( this, TQT_SLOT( spellerReady( KSpell * ) ), mSpellConfig );
+  mSpeller = new KMSpell( TQT_TQOBJECT(this), TQT_SLOT( spellerReady( KSpell * ) ), mSpellConfig );
 }
 
 void KMEdit::initializeAutoSpellChecking()
@@ -251,7 +251,7 @@ void KMEdit::initializeAutoSpellChecking()
   TQColor defaultColor1( 0x00, 0x80, 0x00 ); // defaults from kmreaderwin.cpp
   TQColor defaultColor2( 0x00, 0x70, 0x00 );
   TQColor defaultColor3( 0x00, 0x60, 0x00 );
-  TQColor defaultForeground( kapp->palette().active().text() );
+  TQColor defaultForeground( kapp->tqpalette().active().text() );
 
   TQColor c = TQt::red;
   KConfigGroup readerConfig( KMKernel::config(), "Reader" );
@@ -281,7 +281,7 @@ TQPopupMenu *KMEdit::createPopupMenu( const TQPoint& pos )
   enum { IdUndo, IdRedo, IdSep1, IdCut, IdCopy, IdPaste, IdClear, IdSep2, IdSelectAll };
 
   TQPopupMenu *menu = KEdit::createPopupMenu( pos );
-  if ( !TQApplication::clipboard()->image().isNull() ) {
+  if ( !TQApplication::tqclipboard()->image().isNull() ) {
     int id = menu->idAt(0);
     menu->setItemEnabled( id - IdPaste, true);
   }
@@ -413,7 +413,7 @@ void KMEdit::spellerReady( KSpell *spell )
 
 bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
 {
-  if (o == this)
+  if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this))
     KCursor::autoHideEventFilter(o, e);
 
   if (e->type() == TQEvent::KeyPress)
@@ -458,7 +458,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
                             i18n("Unable to start external editor.") );
         killExternalEditor();
       } else {
-        mExtEditorTempFileWatcher = new KDirWatch( this, "mExtEditorTempFileWatcher" );
+        mExtEditorTempFileWatcher = new KDirWatch( TQT_TQOBJECT(this), "mExtEditorTempFileWatcher" );
         connect( mExtEditorTempFileWatcher, TQT_SIGNAL(dirty(const TQString&)),
                  TQT_SLOT(slotExternalEditorTempFileChanged(const TQString&)) );
         mExtEditorTempFileWatcher->addFile( mExtEditorTempFile->name() );
@@ -497,7 +497,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
     {
       //Get word right clicked on
       const TQRegExp wordBoundary( "[\\s\\W]" );
-      firstSpace = paraText.findRev( wordBoundary, charPos ) + 1;
+      firstSpace = paraText.tqfindRev( wordBoundary, charPos ) + 1;
       lastSpace = paraText.tqfind( wordBoundary, charPos );
       if( lastSpace == -1 )
         lastSpace = paraText.length();
@@ -570,7 +570,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
       }
     }
   } else if ( e->type() == TQEvent::FocusIn || e->type() == TQEvent::FocusOut ) {
-    TQFocusEvent *fe = static_cast<TQFocusEvent*>(e);
+    TQFocusEvent *fe = TQT_TQFOCUSEVENT(e);
     if(! (fe->reason() == TQFocusEvent::ActiveWindow || fe->reason() == TQFocusEvent::Popup) )
       emit focusChanged( fe->gotFocus() );
   }
@@ -658,7 +658,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( this, i18n("Spellcheck - KMail"), this,
+    mKSpellForDialog = new KSpell( TQT_TQWIDGET(this), i18n("Spellcheck - KMail"), TQT_TQOBJECT(this),
                                    TQT_SLOT(slotSpellcheck2(KSpell*))/*, mSpellConfig*/ );
 //  }
 
@@ -709,7 +709,7 @@ void KMEdit::paste()
 // Roll our own internal flag.
 void KMEdit::contentsMouseReleaseEvent( TQMouseEvent * e )
 {
-  if( e->button() != TQt::MidButton )
+  if( e->button() != Qt::MidButton )
     return KEdit::contentsMouseReleaseEvent( e );
   mPasteMode = TQClipboard::Selection;
   KEdit::contentsMouseReleaseEvent( e );
@@ -719,7 +719,7 @@ void KMEdit::contentsMouseReleaseEvent( TQMouseEvent * e )
 void KMEdit::contentsMouseDoubleClickEvent( TQMouseEvent *e )
 {
   bool handled = false;
-  if ( e->button() == TQt::LeftButton ) {
+  if ( e->button() == Qt::LeftButton ) {
 
     // Get the cursor position for the place where the user clicked to
     int paragraphPos;
@@ -870,7 +870,7 @@ void KMEdit::slotSpellResult(const TQString &s)
 void KMEdit::slotSpellDone()
 {
   kdDebug(5006)<<" void KMEdit::slotSpellDone()\n";
-  KSpell::spelltqStatus status = mKSpellForDialog->status();
+  KSpell::spellStatus status = mKSpellForDialog->status();
   delete mKSpellForDialog;
   mKSpellForDialog = 0;