Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit ba3b5b77e1a430dc7197df20872ba46ce2fb6fa7)

1 files changed, 43 insertions, 43 deletions

diff --git a/tdeui/tdespell.cpp b/tdeui/tdespell.cpp
index e5d21d45b..05f5c09d4 100644
--- a/tdeui/tdespell.cpp
+++ b/tdeui/tdespell.cpp
@@ -97,10 +97,10 @@ public:
 
 
 //  Connects a slot to KProcIO's output signal
-#define OUTPUT(x) (connect (proc, TQT_SIGNAL (readReady(KProcIO *)), this, TQT_SLOT (x(KProcIO *))))
+#define OUTPUT(x) (connect (proc, TQ_SIGNAL (readReady(KProcIO *)), this, TQ_SLOT (x(KProcIO *))))
 
 // Disconnect a slot from...
-#define NOOUTPUT(x) (disconnect (proc, TQT_SIGNAL (readReady(KProcIO *)), this, TQT_SLOT (x(KProcIO *))))
+#define NOOUTPUT(x) (disconnect (proc, TQ_SIGNAL (readReady(KProcIO *)), this, TQ_SLOT (x(KProcIO *))))
 
 
 
@@ -296,11 +296,11 @@ KSpell::startIspell()
 
   if (trystart == 0) //don't connect these multiple times
   {
-    connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-             this, TQT_SLOT(ispellErrors(TDEProcess *, char *, int)) );
+    connect( proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+             this, TQ_SLOT(ispellErrors(TDEProcess *, char *, int)) );
 
-    connect( proc, TQT_SIGNAL(processExited(TDEProcess *)),
-             this, TQT_SLOT(ispellExit (TDEProcess *)) );
+    connect( proc, TQ_SIGNAL(processExited(TDEProcess *)),
+             this, TQ_SLOT(ispellExit (TDEProcess *)) );
 
     OUTPUT(KSpell2);
   }
@@ -308,7 +308,7 @@ KSpell::startIspell()
   if ( !proc->start() )
   {
     m_status = Error;
-    TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()));
+    TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()));
   }
 }
 
@@ -331,14 +331,14 @@ void KSpell::KSpell2( KProcIO * )
 
   if ( proc->readln( line, true ) == -1 )
   {
-     TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) );
+     TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) );
      return;
   }
 
 
   if ( line[0] != '@' ) //@ indicates that ispell is working fine
   {
-     TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) );
+     TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) );
      return;
   }
 
@@ -346,7 +346,7 @@ void KSpell::KSpell2( KProcIO * )
   if ( !ignore("kde") )
   {
      kdDebug(750) << "@KDE was false" << endl;
-     TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) );
+     TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) );
      return;
   }
 
@@ -354,7 +354,7 @@ void KSpell::KSpell2( KProcIO * )
   if ( !ignore("linux") )
   {
      kdDebug(750) << "@Linux was false" << endl;
-     TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) );
+     TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) );
      return;
   }
 
@@ -375,10 +375,10 @@ KSpell::setUpDialog( bool reallyuseprogressbar )
                          progressbar && reallyuseprogressbar, modaldlg );
   ksdlg->setCaption( caption );
 
-  connect( ksdlg, TQT_SIGNAL(command(int)),
-           this, TQT_SLOT(slotStopCancel(int)) );
-  connect( this, TQT_SIGNAL(progress(unsigned int)),
-	   ksdlg, TQT_SLOT(slotProgress(unsigned int)) );
+  connect( ksdlg, TQ_SIGNAL(command(int)),
+           this, TQ_SLOT(slotStopCancel(int)) );
+  connect( this, TQ_SIGNAL(progress(unsigned int)),
+	   ksdlg, TQ_SLOT(slotProgress(unsigned int)) );
 
 #ifdef Q_WS_X11 // FIXME(E): Implement for Qt/Embedded
   KWin::setIcons( ksdlg->winId(), kapp->icon(), kapp->miniIcon() );
@@ -488,7 +488,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog )
     return false;
   }
   ///set the dialog signal handler
-  dialog3slot = TQT_SLOT(checkWord3());
+  dialog3slot = TQ_SLOT(checkWord3());
 
   usedialog = _usedialog;
   setUpDialog( false );
@@ -503,7 +503,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog )
   while (proc->readln( blank_line, true ) != -1); // eat spurious blanks
 
   OUTPUT(checkWord2);
-  //  connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3()));
+  //  connect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkWord3()));
 
   proc->writeStdin(TQString("%")); // turn off terse mode
   proc->writeStdin( buffer ); // send the word to ispell
@@ -532,7 +532,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest )
 
   ///set the dialog signal handler
   if ( !suggest ) {
-    dialog3slot = TQT_SLOT(checkWord3());
+    dialog3slot = TQ_SLOT(checkWord3());
     usedialog = _usedialog;
     setUpDialog( false );
     if ( _usedialog )
@@ -547,7 +547,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest )
   while (proc->readln( blank_line, true ) != -1); // eat spurious blanks
 
   OUTPUT(checkWord2);
-  //  connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3()));
+  //  connect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkWord3()));
 
   proc->writeStdin(TQString("%")); // turn off terse mode
   proc->writeStdin( buffer ); // send the word to ispell
@@ -578,7 +578,7 @@ void KSpell::checkWord2( KProcIO* )
   if ( mistake && usedialog )
   {
     cwword = word;
-    dialog( word, sugg, TQT_SLOT(checkWord3()) );
+    dialog( word, sugg, TQ_SLOT(checkWord3()) );
     d->checkNextTimer->start( 0, true );
     return;
   }
@@ -626,14 +626,14 @@ void KSpell::suggestWord( KProcIO * )
   if ( mistake && usedialog )
   {
     cwword=word;
-    dialog( word, sugg, TQT_SLOT(checkWord3()) );
+    dialog( word, sugg, TQ_SLOT(checkWord3()) );
     return;
   }
 }
 
 void KSpell::checkWord3()
 {
-  disconnect( this, TQT_SIGNAL(dialog3()), this, TQT_SLOT(checkWord3()) );
+  disconnect( this, TQ_SIGNAL(dialog3()), this, TQ_SLOT(checkWord3()) );
 
   emit corrected( cwword, replacement(), 0L );
 }
@@ -792,7 +792,7 @@ bool KSpell::checkList (TQStringList *_wordlist, bool _usedialog)
   setUpDialog();
 
   //set the dialog signal handler
-  dialog3slot = TQT_SLOT (checkList4 ());
+  dialog3slot = TQ_SLOT (checkList4 ());
 
   proc->writeStdin (TQString("%")); // turn off terse mode & check one word at a time
 
@@ -883,7 +883,7 @@ void KSpell::checkList3a (KProcIO *)
           cwword = word;
           dlgon = true;
           // show the dialog
-          dialog( word, sugg, TQT_SLOT(checkList4()) );
+          dialog( word, sugg, TQ_SLOT(checkList4()) );
           return;
         }
         else
@@ -930,7 +930,7 @@ void KSpell::checkList4 ()
   dlgon=false;
   TQString old;
 
-  disconnect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkList4()));
+  disconnect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkList4()));
 
   //others should have been processed by dialog() already
   switch (dlgresult)
@@ -980,7 +980,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog )
   usedialog = _usedialog;
   setUpDialog();
   //set the dialog signal handler
-  dialog3slot = TQT_SLOT(check3());
+  dialog3slot = TQ_SLOT(check3());
 
   kdDebug(750) << "KS: check" << endl;
   origbuffer = _buffer;
@@ -1090,7 +1090,7 @@ void KSpell::check2( KProcIO * )
           //kdDebug(750) << "(Before dialog) word=[" << word << "] cwword =[" << cwword << "]\n" << endl;
           if ( usedialog ) {
             // show the word in the dialog
-            dialog( word, sugg, TQT_SLOT(check3()) );
+            dialog( word, sugg, TQ_SLOT(check3()) );
           } else {
             // No dialog, just emit misspelling and continue
             d->m_bNoMisspellingsEncountered = false;
@@ -1152,7 +1152,7 @@ void KSpell::check2( KProcIO * )
 void KSpell::check3 ()
   // evaluates the return value of the dialog
 {
-  disconnect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (check3()));
+  disconnect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (check3()));
   kdDebug(750) << "check3 [" << cwword << "] [" << replacement() << "] " << dlgresult << endl;
 
   //others should have been processed by dialog() already
@@ -1199,7 +1199,7 @@ KSpell::slotStopCancel (int result)
     if (!dialog3slot.isEmpty())
     {
       dlgresult=result;
-      connect (this, TQT_SIGNAL (dialog3()), this, dialog3slot.ascii());
+      connect (this, TQ_SIGNAL (dialog3()), this, dialog3slot.ascii());
       emit dialog3();
     }
 }
@@ -1211,7 +1211,7 @@ void KSpell::dialog( const TQString & word, TQStringList & sugg, const char *_sl
 
   dialog3slot = _slot;
   dialogwillprocess = true;
-  connect( ksdlg, TQT_SIGNAL(command(int)), this, TQT_SLOT(dialog2(int)) );
+  connect( ksdlg, TQ_SIGNAL(command(int)), this, TQ_SLOT(dialog2(int)) );
   TQString tmpBuf = newbuffer;
   kdDebug(750)<<" position = "<<lastpos<<endl;
 
@@ -1238,7 +1238,7 @@ void KSpell::dialog2( int result )
 {
   TQString qs;
 
-  disconnect( ksdlg, TQT_SIGNAL(command(int)), this, TQT_SLOT(dialog2(int)) );
+  disconnect( ksdlg, TQ_SIGNAL(command(int)), this, TQ_SLOT(dialog2(int)) );
   dialogwillprocess = false;
   dlgresult = result;
   ksdlg->standby();
@@ -1277,7 +1277,7 @@ void KSpell::dialog2( int result )
     break;
   }
 
-  connect( this, TQT_SIGNAL(dialog3()), this, dialog3slot.ascii() );
+  connect( this, TQ_SIGNAL(dialog3()), this, dialog3slot.ascii() );
   emit dialog3();
 }
 
@@ -1334,7 +1334,7 @@ void KSpell::ispellExit( TDEProcess* )
      return; // Dead already
 
   kdDebug(750) << "Death" << endl;
-  TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) );
 }
 
 // This is always called from the event loop to make
@@ -1423,12 +1423,12 @@ void KSpell::slotModalReady()
   //kdDebug(750) << "MODAL READY------------------" << endl;
 
   Q_ASSERT( m_status == Running );
-  connect( this, TQT_SIGNAL( done( const TQString & ) ),
-           this, TQT_SLOT( slotModalDone( const TQString & ) ) );
-  TQObject::connect( this, TQT_SIGNAL( corrected( const TQString&, const TQString&, unsigned int ) ),
-                    this, TQT_SLOT( slotSpellCheckerCorrected( const TQString&, const TQString &, unsigned int ) ) );
-  TQObject::connect( this, TQT_SIGNAL( death() ),
-                    this, TQT_SLOT( slotModalSpellCheckerFinished( ) ) );
+  connect( this, TQ_SIGNAL( done( const TQString & ) ),
+           this, TQ_SLOT( slotModalDone( const TQString & ) ) );
+  TQObject::connect( this, TQ_SIGNAL( corrected( const TQString&, const TQString&, unsigned int ) ),
+                    this, TQ_SLOT( slotSpellCheckerCorrected( const TQString&, const TQString &, unsigned int ) ) );
+  TQObject::connect( this, TQ_SIGNAL( death() ),
+                    this, TQ_SLOT( slotModalSpellCheckerFinished( ) ) );
   check( modaltext );
 }
 
@@ -1463,8 +1463,8 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption,
   d->checking = false;
   d->aspellV6 = false;
   d->checkNextTimer = new TQTimer( this );
-  connect( d->checkNextTimer, TQT_SIGNAL( timeout() ),
-	   this, TQT_SLOT( checkNext() ));
+  connect( d->checkNextTimer, TQ_SIGNAL( timeout() ),
+	   this, TQ_SLOT( checkNext() ));
   autoDelete = false;
   modaldlg = _modal;
   progressbar = _progressbar;
@@ -1559,10 +1559,10 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption,
 
   if ( obj && slot )
       // caller wants to know when tdespell is ready
-      connect( this, TQT_SIGNAL(ready(KSpell *)), obj, slot);
+      connect( this, TQ_SIGNAL(ready(KSpell *)), obj, slot);
   else
       // Hack for modal spell checking
-      connect( this, TQT_SIGNAL(ready(KSpell *)), this, TQT_SLOT(slotModalReady()) );
+      connect( this, TQ_SIGNAL(ready(KSpell *)), this, TQ_SLOT(slotModalReady()) );
 
   proc = new KProcIO( codec );