Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

2 files changed, 48 insertions, 48 deletions

diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index fcf50750..eb963796 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -930,15 +930,15 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package)
        filter = static_cast<CatalogImportPlugin*>(factory->create(0, 0));
 
        // provide progress bar indication
-	connect( filter, TQT_SIGNAL( signalResetProgressBar(TQString,int) ),
-	    this, TQT_SIGNAL( signalResetProgressBar(TQString,int) ));
-	connect( filter, TQT_SIGNAL( signalProgress(int) ),
-	    this, TQT_SIGNAL( signalProgress(int) ));
-	connect( filter, TQT_SIGNAL( signalClearProgressBar() ),
-	    this, TQT_SIGNAL( signalClearProgressBar() ));
-
-	connect( this, TQT_SIGNAL( signalStopActivity() ),
-	    filter, TQT_SLOT( stop() ));
+	connect( filter, TQ_SIGNAL( signalResetProgressBar(TQString,int) ),
+	    this, TQ_SIGNAL( signalResetProgressBar(TQString,int) ));
+	connect( filter, TQ_SIGNAL( signalProgress(int) ),
+	    this, TQ_SIGNAL( signalProgress(int) ));
+	connect( filter, TQ_SIGNAL( signalClearProgressBar() ),
+	    this, TQ_SIGNAL( signalClearProgressBar() ));
+
+	connect( this, TQ_SIGNAL( signalStopActivity() ),
+	    filter, TQ_SLOT( stop() ));
 	    
 	// load in the file (target is always local)
 	d->_active = true;
@@ -1027,15 +1027,15 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons
        filter = static_cast<CatalogImportPlugin*>(factory->create(0, 0));
 
        // provide progress bar indication
-	connect( filter, TQT_SIGNAL( signalResetProgressBar(TQString,int) ),
-	    this, TQT_SIGNAL( signalResetProgressBar(TQString,int) ));
-	connect( filter, TQT_SIGNAL( signalProgress(int) ),
-	    this, TQT_SIGNAL( signalProgress(int) ));
-	connect( filter, TQT_SIGNAL( signalClearProgressBar() ),
-	    this, TQT_SIGNAL( signalClearProgressBar() ));
+	connect( filter, TQ_SIGNAL( signalResetProgressBar(TQString,int) ),
+	    this, TQ_SIGNAL( signalResetProgressBar(TQString,int) ));
+	connect( filter, TQ_SIGNAL( signalProgress(int) ),
+	    this, TQ_SIGNAL( signalProgress(int) ));
+	connect( filter, TQ_SIGNAL( signalClearProgressBar() ),
+	    this, TQ_SIGNAL( signalClearProgressBar() ));
 
-	connect( this, TQT_SIGNAL( signalStopActivity() ),
-	    filter, TQT_SLOT( stop() ));
+	connect( this, TQ_SIGNAL( signalStopActivity() ),
+	    filter, TQ_SLOT( stop() ));
 
 	// load in the file (target is always local)
 	d->_active = true;
@@ -1229,7 +1229,7 @@ bool Catalog::checkUsingTool(KDataTool* tool, bool clearErrors)
 	kdDebug(KBABEL) << "checkUsingTool active" << endl;
 	d->_active=true;
 	d->_stop=false;
-	connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+	connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
 
 	int index = 0;
 	bool hasErrors=false;
@@ -1256,7 +1256,7 @@ bool Catalog::checkUsingTool(KDataTool* tool, bool clearErrors)
 	kdDebug(KBABEL) << "checkUsingTool not active" << endl;
 	d->_active=false;
 	d->_stop=false;
-	disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+	disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
 
 	emit signalClearProgressBar();
 
@@ -1268,7 +1268,7 @@ void Catalog::modifyUsingTool(KDataTool* tool, const TQString& command)
     kdDebug(KBABEL) << "modifyUsingTool active" << endl;
     d->_active=true;
     d->_stop=false;
-    connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+    connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
 
     int index = 0;
     bool modified = false;
@@ -1334,7 +1334,7 @@ void Catalog::modifyUsingTool(KDataTool* tool, const TQString& command)
     kdDebug(KBABEL) << "modifyUsingTool not active" << endl;
     d->_active=false;
     d->_stop=false;
-    disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+    disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
 
     emit signalClearProgressBar();
 }
@@ -2093,15 +2093,15 @@ ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite)
     filter = static_cast<CatalogExportPlugin*>(factory->create(0, 0));
 
     // provide progress bar indication
-    connect( filter, TQT_SIGNAL( signalResetProgressBar(TQString,int) ),
-	    this, TQT_SIGNAL( signalResetProgressBar(TQString,int) ));
-    connect( filter, TQT_SIGNAL( signalProgress(int) ),
-	    this, TQT_SIGNAL( signalProgress(int) ));
-    connect( filter, TQT_SIGNAL( signalClearProgressBar() ),
-	    this, TQT_SIGNAL( signalClearProgressBar() ));
+    connect( filter, TQ_SIGNAL( signalResetProgressBar(TQString,int) ),
+	    this, TQ_SIGNAL( signalResetProgressBar(TQString,int) ));
+    connect( filter, TQ_SIGNAL( signalProgress(int) ),
+	    this, TQ_SIGNAL( signalProgress(int) ));
+    connect( filter, TQ_SIGNAL( signalClearProgressBar() ),
+	    this, TQ_SIGNAL( signalClearProgressBar() ));
 
-    connect( this, TQT_SIGNAL( signalStopActivity() ),
-	    filter, TQT_SLOT( stop() ));
+    connect( this, TQ_SIGNAL( signalStopActivity() ),
+	    filter, TQ_SLOT( stop() ));
 
     // load in the file (target is always local)
     kdDebug(KBABEL) << "writeFile active" << endl;
@@ -2504,7 +2504,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
        kdDebug(KBABEL) << "findNext active" << endl;
 	d->_active=true;
 	d->_stop=false;
-	connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+	connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
 	
 	MiscSettings miscOptions = miscSettings();
 
@@ -2554,7 +2554,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
 		if( d->_stop || endReached)
 		{
 		    kdDebug(KBABEL) << "FindNext: endReached or stopped" << endl;
-		    disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+		    disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
 		    kdDebug(KBABEL) << "findNext not active" << endl;
 		    d->_active=false;
 		    d->_stop=false;
@@ -2763,7 +2763,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
         }
 	}
 
-	disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+	disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
 	kdDebug(KBABEL) << "findNext not active" << endl;
 	d->_active=false;
 	d->_stop=false;
@@ -2779,7 +2779,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
 	kdDebug(KBABEL) << "findPrev active" << endl;
 	d->_active=true;
 	d->_stop=false;
-	connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+	connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
 	
 	MiscSettings miscOptions = miscSettings();
 
@@ -2803,7 +2803,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
 		if( d->_stop || beginReached)
 		{
 		    kdDebug(KBABEL) << "FindNext: endReached or stopped" << endl;
-		    disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+		    disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
 		    kdDebug(KBABEL) << "findPrev active" << endl;
 		    d->_active=false;
 		    d->_stop=false;
@@ -3034,7 +3034,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
         }
 	}
 
-	disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+	disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
 	kdDebug(KBABEL) << "findPrev active" << endl;
 	d->_active=false;
 	d->_stop=false;
@@ -3080,7 +3080,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
         return DiffOk;
     }
 
-    connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+    connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
     kdDebug(KBABEL) << "diffv active" << endl;
     d->_active=true;
     d->_stop=false;
@@ -3159,7 +3159,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
 
 	    if( d->_stop )
 	    {
-		disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+		disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
 		kdDebug
 
 		(KBABEL) << "diffv not active" << endl;
@@ -3199,7 +3199,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
     if( !d->diffCache.insert(entry,s) )
         delete s;
 
-    disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+    disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
     kdDebug(KBABEL) << "diffv not active" << endl;
     d->_active=false;
     d->_stop=false;
@@ -3209,7 +3209,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
 
 void Catalog::setDiffList( const TQValueList<DiffEntry>& list)
 {
-    connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+    connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
     kdDebug(KBABEL) << "setDiffList active" << endl;
     d->_active=true;
     d->_stop=false;
@@ -3259,7 +3259,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list)
 
     emit signalClearProgressBar();
 
-    disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() ));
+    disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() ));
     kdDebug(KBABEL) << "setDiffList not active" << endl;
     d->_active=false;
     d->_stop=false;
diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp
index 5e359a91..d54d0712 100644
--- a/kbabel/common/msgfmt.cpp
+++ b/kbabel/common/msgfmt.cpp
@@ -58,10 +58,10 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
 
    TDEProcess proc;
 
-   connect(&proc,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-            this,TQT_SLOT(addToOutput(TDEProcess*,char *, int )));
-   connect(&proc,TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-            this,TQT_SLOT(addToOutput(TDEProcess*,char *, int)));
+   connect(&proc,TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+            this,TQ_SLOT(addToOutput(TDEProcess*,char *, int )));
+   connect(&proc,TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+            this,TQ_SLOT(addToOutput(TDEProcess*,char *, int)));
 
    // remove last output
    _output="";
@@ -100,10 +100,10 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o
    TDEProcess proc;
    proc.setUseShell(true);
 
-   connect(&proc,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-            this,TQT_SLOT(addToOutput(TDEProcess*,char *, int )));
-   connect(&proc,TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-            this,TQT_SLOT(addToOutput(TDEProcess*,char *, int)));
+   connect(&proc,TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+            this,TQ_SLOT(addToOutput(TDEProcess*,char *, int )));
+   connect(&proc,TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+            this,TQ_SLOT(addToOutput(TDEProcess*,char *, int)));
 
    // remove last output
    _output="";