Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

14 files changed, 180 insertions, 180 deletions

diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 5423bca9..7280bbbd 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -82,8 +82,8 @@ SearchEngine (parent, name)
     dbOpened = false;
     dbname = "";
     lasterror = i18n ("No error");
-    connect (this, TQT_SIGNAL (hasError (const TQString &)),
-	     TQT_SLOT (setLastError (const TQString &)));
+    connect (this, TQ_SIGNAL (hasError (const TQString &)),
+	     TQ_SLOT (setLastError (const TQString &)));
 
     IAmReady = true;		//  I don't know if it is a good idea, no DB loaded!!!
 
@@ -548,9 +548,9 @@ KDBSearchEngine::repeat ()
 	new TQProgressDialog (i18n ("Looking for repetitions"), i18n ("Stop"),
 			     100);
 
-    connect (this, TQT_SIGNAL (progress (int)), pd, TQT_SLOT (setProgress (int)));
-    connect (this, TQT_SIGNAL (finished ()), pd, TQT_SLOT (close ()));
-    connect (pd, TQT_SIGNAL (cancelled ()), this, TQT_SLOT (stopSearch ()));
+    connect (this, TQ_SIGNAL (progress (int)), pd, TQ_SLOT (setProgress (int)));
+    connect (this, TQ_SIGNAL (finished ()), pd, TQ_SLOT (close ()));
+    connect (pd, TQ_SIGNAL (cancelled ()), this, TQ_SLOT (stopSearch ()));
 
 
     TQString txt = "// %1 repetitions, %2 translation(s)\ni18n(\"%3\");\n";
@@ -1208,15 +1208,15 @@ KDBSearchEngine::preferencesWidget (TQWidget * parent)
 
     pw = new PreferencesWidget (parent);
     setSettings ();
-    connect (pw, TQT_SIGNAL (restoreNow ()), this, TQT_SLOT (setSettings ()));
-    connect (pw, TQT_SIGNAL (applyNow ()), this, TQT_SLOT (updateSettings ()));
-    connect (pw, TQT_SIGNAL (destroyed ()), this, TQT_SLOT (prefDestr ()));
-    connect (pw->dbpw->scanPB_2, TQT_SIGNAL (clicked ()), this, TQT_SLOT (scan ()));
-    connect (pw->dbpw->scanrecPB, TQT_SIGNAL (clicked ()), this,
-	     TQT_SLOT (scanRecur ()));
-    connect (pw->dbpw->scanFilePB, TQT_SIGNAL (clicked ()), this,
-	     TQT_SLOT (scanFile ()));
-    connect (pw->dbpw->repeatPB, TQT_SIGNAL (clicked ()), this, TQT_SLOT (repeat ()));
+    connect (pw, TQ_SIGNAL (restoreNow ()), this, TQ_SLOT (setSettings ()));
+    connect (pw, TQ_SIGNAL (applyNow ()), this, TQ_SLOT (updateSettings ()));
+    connect (pw, TQ_SIGNAL (destroyed ()), this, TQ_SLOT (prefDestr ()));
+    connect (pw->dbpw->scanPB_2, TQ_SIGNAL (clicked ()), this, TQ_SLOT (scan ()));
+    connect (pw->dbpw->scanrecPB, TQ_SIGNAL (clicked ()), this,
+	     TQ_SLOT (scanRecur ()));
+    connect (pw->dbpw->scanFilePB, TQ_SIGNAL (clicked ()), this,
+	     TQ_SLOT (scanFile ()));
+    connect (pw->dbpw->repeatPB, TQ_SIGNAL (clicked ()), this, TQ_SLOT (repeat ()));
 
 
     return pw;
@@ -1246,32 +1246,32 @@ KDBSearchEngine::scanRecur ()
       }
     if (pw)
       {
-	  connect (sca, TQT_SIGNAL (patternProgress (int)), pw->dbpw->totalPB,
-		   TQT_SLOT (setProgress (int)));
-	  connect (sca, TQT_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB,
-		   TQT_SLOT (setProgress (int)));
-	  connect (sca, TQT_SIGNAL (fileProgress (int)), pw->dbpw->processPB,
-		   TQT_SLOT (setProgress (int)));
+	  connect (sca, TQ_SIGNAL (patternProgress (int)), pw->dbpw->totalPB,
+		   TQ_SLOT (setProgress (int)));
+	  connect (sca, TQ_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB,
+		   TQ_SLOT (setProgress (int)));
+	  connect (sca, TQ_SIGNAL (fileProgress (int)), pw->dbpw->processPB,
+		   TQ_SLOT (setProgress (int)));
       }
 
-    connect (sca, TQT_SIGNAL (patternProgress (int)), TQT_SIGNAL (progress (int)));	//Kbabel progress bar
+    connect (sca, TQ_SIGNAL (patternProgress (int)), TQ_SIGNAL (progress (int)));	//Kbabel progress bar
 
-    connect (sca, TQT_SIGNAL (added (int)), pw, TQT_SLOT (setEntries (int)));
-    connect (sca, TQT_SIGNAL (filename (TQString)), pw, TQT_SLOT (setName (TQString)));
+    connect (sca, TQ_SIGNAL (added (int)), pw, TQ_SLOT (setEntries (int)));
+    connect (sca, TQ_SIGNAL (filename (TQString)), pw, TQ_SLOT (setName (TQString)));
 
 
     progressStarts (i18n ("Scanning folder %1").arg (cvsdir));
-    connect (sca, TQT_SIGNAL (patternFinished ()), TQT_SIGNAL (progressEnds ()));
+    connect (sca, TQ_SIGNAL (patternFinished ()), TQ_SIGNAL (progressEnds ()));
 
     sca->scanPattern (cvsdir, "*.po", true);
-    disconnect (this, TQT_SIGNAL (progress (int)));
-//disconnect(TQT_SIGNAL(patternStarted()),this,TQT_SIGNAL(started()) );
-    disconnect (this, TQT_SIGNAL (progressEnds ()));
+    disconnect (this, TQ_SIGNAL (progress (int)));
+//disconnect(TQ_SIGNAL(patternStarted()),this,TQ_SIGNAL(started()) );
+    disconnect (this, TQ_SIGNAL (progressEnds ()));
     if (pw)
       {
-	  disconnect (pw->dbpw->totalPB, TQT_SLOT (setProgress (int)));
-	  disconnect (pw->dbpw->loadingPB, TQT_SLOT (setProgress (int)));
-	  disconnect (pw->dbpw->processPB, TQT_SLOT (setProgress (int)));
+	  disconnect (pw->dbpw->totalPB, TQ_SLOT (setProgress (int)));
+	  disconnect (pw->dbpw->loadingPB, TQ_SLOT (setProgress (int)));
+	  disconnect (pw->dbpw->processPB, TQ_SLOT (setProgress (int)));
       }
     totalRecord = dm->count ();
 
@@ -1304,32 +1304,32 @@ KDBSearchEngine::scan ()
       }
     if (pw)
       {
-	  connect (sca, TQT_SIGNAL (patternProgress (int)), pw->dbpw->totalPB,
-		   TQT_SLOT (setProgress (int)));
-	  connect (sca, TQT_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB,
-		   TQT_SLOT (setProgress (int)));
-	  connect (sca, TQT_SIGNAL (fileProgress (int)), pw->dbpw->processPB,
-		   TQT_SLOT (setProgress (int)));
+	  connect (sca, TQ_SIGNAL (patternProgress (int)), pw->dbpw->totalPB,
+		   TQ_SLOT (setProgress (int)));
+	  connect (sca, TQ_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB,
+		   TQ_SLOT (setProgress (int)));
+	  connect (sca, TQ_SIGNAL (fileProgress (int)), pw->dbpw->processPB,
+		   TQ_SLOT (setProgress (int)));
       }
-    connect (sca, TQT_SIGNAL (patternProgress (int)), TQT_SIGNAL (progress (int)));
+    connect (sca, TQ_SIGNAL (patternProgress (int)), TQ_SIGNAL (progress (int)));
     progressStarts (i18n ("Scanning folder %1").arg (cvsdir));
-    connect (sca, TQT_SIGNAL (patternFinished ()), TQT_SIGNAL (progressEnds ()));
+    connect (sca, TQ_SIGNAL (patternFinished ()), TQ_SIGNAL (progressEnds ()));
 
-    connect (sca, TQT_SIGNAL (added (int)), pw, TQT_SLOT (setEntries (int)));
-    connect (sca, TQT_SIGNAL (filename (TQString)), pw, TQT_SLOT (setName (TQString)));
+    connect (sca, TQ_SIGNAL (added (int)), pw, TQ_SLOT (setEntries (int)));
+    connect (sca, TQ_SIGNAL (filename (TQString)), pw, TQ_SLOT (setName (TQString)));
 
 
 
     sca->scanPattern (cvsdir, "*.po", false);
 
-    disconnect (this, TQT_SIGNAL (progress (int)));
-//disconnect(TQT_SIGNAL(patternStarted()),this,TQT_SIGNAL(started()) );
-    disconnect (this, TQT_SIGNAL (progressEnds ()));
+    disconnect (this, TQ_SIGNAL (progress (int)));
+//disconnect(TQ_SIGNAL(patternStarted()),this,TQ_SIGNAL(started()) );
+    disconnect (this, TQ_SIGNAL (progressEnds ()));
     if (pw)
       {
-	  disconnect (pw->dbpw->totalPB, TQT_SLOT (setProgress (int)));
-	  disconnect (pw->dbpw->loadingPB, TQT_SLOT (setProgress (int)));
-	  disconnect (pw->dbpw->processPB, TQT_SLOT (setProgress (int)));
+	  disconnect (pw->dbpw->totalPB, TQ_SLOT (setProgress (int)));
+	  disconnect (pw->dbpw->loadingPB, TQ_SLOT (setProgress (int)));
+	  disconnect (pw->dbpw->processPB, TQ_SLOT (setProgress (int)));
       }
     totalRecord = dm->count ();
 
@@ -1363,31 +1363,31 @@ KDBSearchEngine::scanFile ()
       }
     if (pw)
       {
-	  connect (sca, TQT_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB,
-		   TQT_SLOT (setProgress (int)));
-	  connect (sca, TQT_SIGNAL (fileProgress (int)), pw->dbpw->processPB,
-		   TQT_SLOT (setProgress (int)));
+	  connect (sca, TQ_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB,
+		   TQ_SLOT (setProgress (int)));
+	  connect (sca, TQ_SIGNAL (fileProgress (int)), pw->dbpw->processPB,
+		   TQ_SLOT (setProgress (int)));
       }
-    connect (sca, TQT_SIGNAL (fileProgress (int)), TQT_SIGNAL (progress (int)));
+    connect (sca, TQ_SIGNAL (fileProgress (int)), TQ_SIGNAL (progress (int)));
     progressStarts (i18n ("Scanning file %1").arg (directory (cvsdir, 0)));
-    connect (sca, TQT_SIGNAL (fileFinished ()), TQT_SIGNAL (progressEnds ()));
+    connect (sca, TQ_SIGNAL (fileFinished ()), TQ_SIGNAL (progressEnds ()));
 
-    connect (sca, TQT_SIGNAL (added (int)), pw, TQT_SLOT (setEntries (int)));
-    connect (sca, TQT_SIGNAL (filename (TQString)), pw, TQT_SLOT (setName (TQString)));
+    connect (sca, TQ_SIGNAL (added (int)), pw, TQ_SLOT (setEntries (int)));
+    connect (sca, TQ_SIGNAL (filename (TQString)), pw, TQ_SLOT (setName (TQString)));
 
 
 
     sca->scanFile (cvsdir);
 
-    sca->disconnect (TQT_SIGNAL (fileProgress (int)), this,
-		     TQT_SIGNAL (progress (int)));
-//disconnect(TQT_SIGNAL(patternStarted()),this,TQT_SIGNAL(started()) );
-    sca->disconnect (TQT_SIGNAL (fileFinished ()), this,
-		     TQT_SIGNAL (progressEnds ()));
+    sca->disconnect (TQ_SIGNAL (fileProgress (int)), this,
+		     TQ_SIGNAL (progress (int)));
+//disconnect(TQ_SIGNAL(patternStarted()),this,TQ_SIGNAL(started()) );
+    sca->disconnect (TQ_SIGNAL (fileFinished ()), this,
+		     TQ_SIGNAL (progressEnds ()));
     if (pw)
       {
-	  disconnect (pw->dbpw->loadingPB, TQT_SLOT (setProgress (int)));
-	  disconnect (pw->dbpw->processPB, TQT_SLOT (setProgress (int)));
+	  disconnect (pw->dbpw->loadingPB, TQ_SLOT (setProgress (int)));
+	  disconnect (pw->dbpw->processPB, TQ_SLOT (setProgress (int)));
       }
 
     totalRecord = dm->count ();
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
index 183b1e4d..c8b46db4 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
@@ -121,7 +121,7 @@ Catalog * catalog=new Catalog(this,"ScanPoCatalog");
   
 
 TQString location=fileName.right(fileName.length()-fileName.findRev("/")-1);
-connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int)));
+connect(catalog,TQ_SIGNAL(signalProgress(int)),this,TQ_SIGNAL(fileLoading(int)));
 emit filename(location);
 emit fileProgress(0);
 emit fileLoading(0);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
index e87294e4..06f9939b 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
@@ -27,7 +27,7 @@ PreferencesWidget::PreferencesWidget(TQWidget *parent, const char* name)
 	layout->addWidget(dbpw);
 	resize(TQSize(200,200).expandedTo(minimumSizeHint()));
 
-//    connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1()));
+//    connect(dbpw->browseTB_3,TQ_SIGNAL(clicked()),TQ_SLOT(browse1()));
 
     emit restoreNow();   //Fill with actual params.			
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
index 2d564267..25ef4819 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
@@ -55,7 +55,7 @@ KDBSearchEngine2::KDBSearchEngine2(TQObject *parent,const char*name)
     
     di=0;   //Database Interface is not yet initialized
     
-    connect(this,TQT_SIGNAL(hasError(TQString)),TQT_SLOT(setLastError(TQString)));
+    connect(this,TQ_SIGNAL(hasError(TQString)),TQ_SLOT(setLastError(TQString)));
     
     searching=false;  // i'm not searching
     iAmReady=true;  //there are no reason to say I'm not ready.
@@ -134,8 +134,8 @@ bool KDBSearchEngine2::startSearch(TQString str)
 	strategy.addAlgorithm(&wbyw);
 
 
-	connect(&strategy,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SLOT(receiveResult(QueryResult)));
-	strategy.exec(searchingString);	disconnect(&strategy,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SLOT(receiveResult(QueryResult)));
+	connect(&strategy,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SLOT(receiveResult(QueryResult)));
+	strategy.exec(searchingString);	disconnect(&strategy,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SLOT(receiveResult(QueryResult)));
 
 
 	kdDebug(0) << "End of search for " << searchingString  << endl;
@@ -230,7 +230,7 @@ bool KDBSearchEngine2::init()
     else
     {
 	di = new DataBaseInterface(dbDirectory,&settings);
-	connect(di,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SLOT(receiveResult(QueryResult)));
+	connect(di,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SLOT(receiveResult(QueryResult)));
 	//FIXME: what wbout ready()
 	if(!di->mainOk()) return false;  //check if the main DB is OK.
 
@@ -261,16 +261,16 @@ PrefWidget * KDBSearchEngine2::preferencesWidget(TQWidget *parent)
     pw =  new KDB2PreferencesWidget(parent);
     kdDebug(0) << "new KDB2 preferences widget" << endl;
     setSettings();
-    connect(pw,TQT_SIGNAL(restoreNow()),this,TQT_SLOT(setSettings()));
-    connect(pw,TQT_SIGNAL(applyNow()),this,TQT_SLOT(updateSettings()));
-    connect(pw,TQT_SIGNAL(destroyed()),this,TQT_SLOT(prefDestr()));
+    connect(pw,TQ_SIGNAL(restoreNow()),this,TQ_SLOT(setSettings()));
+    connect(pw,TQ_SIGNAL(applyNow()),this,TQ_SLOT(updateSettings()));
+    connect(pw,TQ_SIGNAL(destroyed()),this,TQ_SLOT(prefDestr()));
 
     
-    connect(pw->dbpw->scanAll,TQT_SIGNAL(clicked()),this,TQT_SLOT(scanAllPressed()));
-    connect(pw->dbpw->scanSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(scanNowPressed()));
-    connect(pw->dbpw->addSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(addSource()));
-    connect(pw->dbpw->editSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(editSource()));
-    connect(pw->dbpw->removeSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeSource()));
+    connect(pw->dbpw->scanAll,TQ_SIGNAL(clicked()),this,TQ_SLOT(scanAllPressed()));
+    connect(pw->dbpw->scanSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(scanNowPressed()));
+    connect(pw->dbpw->addSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(addSource()));
+    connect(pw->dbpw->editSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(editSource()));
+    connect(pw->dbpw->removeSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeSource()));
     
     
     return pw;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp
index 466b68e5..fc3fd048 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp
@@ -42,12 +42,12 @@ DataBaseInterface::ResultList GenericSearchAlgorithm::exec(const TQString& query
     uint countResults=0;
     for(TQValueList<AbstractSearchAlgorithm *>::iterator algoit = algoChain.begin(); algoit!=algoChain.end() && countResults < maxResults; algoit++)
 	{
-	connect(*algoit,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SIGNAL(newResult(QueryResult)));
+	connect(*algoit,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SIGNAL(newResult(QueryResult)));
 	kdDebug(0) << "Algo pointer" << (*algoit) << endl;
 	res+=(*algoit)->exec(query);
 	countResults=res.count();
 	kdDebug(0) << "Count = " << countResults << endl;
-	disconnect(*algoit,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SIGNAL(newResult(QueryResult)));
+	disconnect(*algoit,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SIGNAL(newResult(QueryResult)));
     }
     return res;
 }
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
index 2fe4ae98..db7ac4ee 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
@@ -205,7 +205,7 @@ Catalog * catalog=new Catalog(this,"ScanPoCatalog");
 TQString pretty=u.prettyURL();
 TQString location=pretty.right(pretty.length()-pretty.findRev("/")-1);
 
-connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int)));
+connect(catalog,TQ_SIGNAL(signalProgress(int)),this,TQ_SIGNAL(fileLoading(int)));
 emit filename(location);
 emit fileProgress(0);
 emit fileLoading(0);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
index 0b332eef..b413c8b2 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
@@ -30,7 +30,7 @@ KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *parent, const char* name)
 
 	standard();
 
-//    connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1()));
+//    connect(dbpw->browseTB_3,TQ_SIGNAL(clicked()),TQ_SLOT(browse1()));
 
     emit restoreNow();   //Fill with actual params.			
 
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
index 815e025f..aa85f267 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
@@ -64,7 +64,7 @@ PoAuxiliary::PoAuxiliary(TQObject *parent, const char *name)
     ignoreFuzzy=true;
 
     loadTimer = new TQTimer(this);
-    connect(loadTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(loadAuxiliary()));
+    connect(loadTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(loadAuxiliary()));
 
     msgidDict.setAutoDelete(true);
 }
@@ -127,9 +127,9 @@ void PoAuxiliary::readSettings(TDEConfigBase *config)
 PrefWidget *PoAuxiliary::preferencesWidget(TQWidget *parent)
 {
     prefWidget = new AuxiliaryPreferencesWidget(parent,"pocompendium_prefwidget");
-    connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings()));
-    connect(prefWidget, TQT_SIGNAL(restoreSettings())
-                    , this, TQT_SLOT(restoreSettings()));
+    connect(prefWidget, TQ_SIGNAL(applySettings()), this, TQ_SLOT(applySettings()));
+    connect(prefWidget, TQ_SIGNAL(restoreSettings())
+                    , this, TQ_SLOT(restoreSettings()));
 
     restoreSettings();
     
@@ -424,8 +424,8 @@ void PoAuxiliary::loadAuxiliary()
     }
         
     emit progressStarts(i18n("Loading PO auxiliary"));
-    connect(catalog, TQT_SIGNAL(signalProgress(int))
-                        , this, TQT_SIGNAL(progress(int)));
+    connect(catalog, TQ_SIGNAL(signalProgress(int))
+                        , this, TQ_SIGNAL(progress(int)));
       
     ConversionStatus stat = catalog->openURL(u);
     if( stat != OK && stat != RECOVERED_PARSE_ERROR)
@@ -476,8 +476,8 @@ void PoAuxiliary::loadAuxiliary()
         auxTranslator = catalog->lastTranslator();
     }
 
-    disconnect(catalog, TQT_SIGNAL(signalProgress(int))
-                        , this, TQT_SIGNAL(progress(int)));
+    disconnect(catalog, TQ_SIGNAL(signalProgress(int))
+                        , this, TQ_SIGNAL(progress(int)));
 
     emit progressEnds();
 
diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
index 378b1830..ddf63616 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
@@ -53,8 +53,8 @@ AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *parent, const c
     layout->addWidget(prefWidget);
 
 
-    connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&))
-                    , this, TQT_SLOT(setChanged()));
+    connect(prefWidget->urlInput->lineEdit(),TQ_SIGNAL(textChanged(const TQString&))
+                    , this, TQ_SLOT(setChanged()));
 }
 
 AuxiliaryPreferencesWidget::~AuxiliaryPreferencesWidget()
diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
index 22598cbf..9c6f96a5 100644
--- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
@@ -77,12 +77,12 @@ bool CompendiumData::load(KURL url)
     
 
     emit progressStarts(i18n("Loading PO compendium"));
-    connect(_catalog, TQT_SIGNAL(signalProgress(int)), this, TQT_SIGNAL(progress(int)));
+    connect(_catalog, TQ_SIGNAL(signalProgress(int)), this, TQ_SIGNAL(progress(int)));
 
     ConversionStatus stat=_catalog->openURL(url);
         
-    disconnect(_catalog, TQT_SIGNAL(signalProgress(int))
-            , this, TQT_SIGNAL(progress(int)));
+    disconnect(_catalog, TQ_SIGNAL(signalProgress(int))
+            , this, TQ_SIGNAL(progress(int)));
         
 
     if( stat!= OK && stat != RECOVERED_PARSE_ERROR)
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index 9d1f6440..6045612b 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -88,7 +88,7 @@ PoCompendium::PoCompendium(TQObject *parent, const char *name)
 
 
     loadTimer = new TQTimer(this);
-    connect(loadTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotLoadCompendium()));
+    connect(loadTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotLoadCompendium()));
 }
 
 PoCompendium::~PoCompendium()
@@ -164,9 +164,9 @@ PrefWidget *PoCompendium::preferencesWidget(TQWidget *parent)
 {
     prefWidget = new CompendiumPreferencesWidget(parent,"pocompendium_prefwidget");
     kdDebug(KBABEL_SEARCH) << "PreferencesWidget is " << prefWidget << endl;
-    connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings()));
-    connect(prefWidget, TQT_SIGNAL(restoreSettings())
-                    , this, TQT_SLOT(restoreSettings()));
+    connect(prefWidget, TQ_SIGNAL(applySettings()), this, TQ_SLOT(applySettings()));
+    connect(prefWidget, TQ_SIGNAL(restoreSettings())
+                    , this, TQ_SLOT(restoreSettings()));
 
     restoreSettings();
     
@@ -828,7 +828,7 @@ void PoCompendium::slotLoadCompendium()
         }
         else
         {
-            connect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData()));
+            connect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData()));
         }
     }
     else
@@ -847,7 +847,7 @@ void PoCompendium::recheckData()
 {
     if(data)
     {
-        disconnect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData()));
+        disconnect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData()));
 
         error = data->hasErrors();
         errorMsg = data->errorMsg();
@@ -1153,14 +1153,14 @@ void PoCompendium::unregisterData()
 {
     if(data)
     { 
-        disconnect(data, TQT_SIGNAL(progressStarts(const TQString&)), this
-            , TQT_SIGNAL(progressStarts(const TQString&)));
-        disconnect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds()));
-        disconnect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int)));
+        disconnect(data, TQ_SIGNAL(progressStarts(const TQString&)), this
+            , TQ_SIGNAL(progressStarts(const TQString&)));
+        disconnect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds()));
+        disconnect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int)));
 
         if(data->active())
         {
-            disconnect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(recheckData()));
+            disconnect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(recheckData()));
         }
 
         if(data->unregisterObject(this))
@@ -1171,7 +1171,7 @@ void PoCompendium::unregisterData()
             }
             else
             {
-                connect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(removeData()));
+                connect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(removeData()));
             }
         }
 
@@ -1195,11 +1195,11 @@ void PoCompendium::registerData()
         emit progressStarts(i18n("Loading PO compendium"));
     }
     
-    connect(data, TQT_SIGNAL(
+    connect(data, TQ_SIGNAL(
     progressStarts(const TQString&)), this
-            , TQT_SIGNAL(progressStarts(const TQString&)));
-    connect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds()));
-    connect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int)));
+            , TQ_SIGNAL(progressStarts(const TQString&)));
+    connect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds()));
+    connect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int)));
 }
 
 void PoCompendium::removeData()
diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
index 4ecb2886..d152e3b1 100644
--- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
@@ -53,36 +53,36 @@ CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *parent, const
 	prefWidget = new CompendiumPWidget(this);
 	layout->addWidget(prefWidget);
 
-	connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
-	connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
-	connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
-	connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
-	connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
-	connect(prefWidget->fuzzyBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
-	connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
-	connect(prefWidget->wholeBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
+	connect(prefWidget->caseBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
+	connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
+	connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
+	connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
+	connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
+	connect(prefWidget->fuzzyBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
+	connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
+	connect(prefWidget->wholeBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
 	
-	connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&))
-					, this, TQT_SLOT(setChanged()));
-
-	connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(equalBtnToggled(bool)));
-	connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(ngramBtnToggled(bool)));
-	connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(isContainedBtnToggled(bool)));
-	connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(containsBtnToggled(bool)));
-	connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(hasWordBtnToggled(bool)));
+	connect(prefWidget->urlInput->lineEdit(),TQ_SIGNAL(textChanged(const TQString&))
+					, this, TQ_SLOT(setChanged()));
+
+	connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(equalBtnToggled(bool)));
+	connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(ngramBtnToggled(bool)));
+	connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(isContainedBtnToggled(bool)));
+	connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(containsBtnToggled(bool)));
+	connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(hasWordBtnToggled(bool)));
 
 
 	TQString whatsthis=i18n("<qt><p><b>Parameters</b></p>"
diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
index 9b4cde15..a4ba2cb4 100644
--- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
@@ -55,34 +55,34 @@ TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *parent,
 	prefWidget = new TmxCompendiumPWidget(this);
 	layout->addWidget(prefWidget);
 
-	connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
-	connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
-	connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
-	connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
-	connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
-	connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
-	connect(prefWidget->wholeBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(setChanged()));
+	connect(prefWidget->caseBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
+	connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
+	connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
+	connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
+	connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
+	connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
+	connect(prefWidget->wholeBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(setChanged()));
 	
-	connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&))
-					, this, TQT_SLOT(setChanged()));
-
-	connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(equalBtnToggled(bool)));
-	connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(ngramBtnToggled(bool)));
-	connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(isContainedBtnToggled(bool)));
-	connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(containsBtnToggled(bool)));
-	connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool))
-					, this, TQT_SLOT(hasWordBtnToggled(bool)));
+	connect(prefWidget->urlInput->lineEdit(),TQ_SIGNAL(textChanged(const TQString&))
+					, this, TQ_SLOT(setChanged()));
+
+	connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(equalBtnToggled(bool)));
+	connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(ngramBtnToggled(bool)));
+	connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(isContainedBtnToggled(bool)));
+	connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(containsBtnToggled(bool)));
+	connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool))
+					, this, TQ_SLOT(hasWordBtnToggled(bool)));
 
 
 	TQString whatsthis=i18n("<qt><p><b>Parameters</b></p>"
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 6ce92e84..2c2f5220 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -82,7 +82,7 @@ TmxCompendium::TmxCompendium(TQObject *parent, const char *name)
 
 
     loadTimer = new TQTimer(this);
-    connect(loadTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotLoadCompendium()));
+    connect(loadTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotLoadCompendium()));
 }
 
 TmxCompendium::~TmxCompendium()
@@ -155,9 +155,9 @@ void TmxCompendium::readSettings(TDEConfigBase *config)
 PrefWidget *TmxCompendium::preferencesWidget(TQWidget *parent)
 {
     prefWidget = new TmxCompendiumPreferencesWidget(parent,"tmxcompendium_prefwidget");
-    connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings()));
-    connect(prefWidget, TQT_SIGNAL(restoreSettings())
-                    , this, TQT_SLOT(restoreSettings()));
+    connect(prefWidget, TQ_SIGNAL(applySettings()), this, TQ_SLOT(applySettings()));
+    connect(prefWidget, TQ_SIGNAL(restoreSettings())
+                    , this, TQ_SLOT(restoreSettings()));
 
     restoreSettings();
     
@@ -718,7 +718,7 @@ void TmxCompendium::slotLoadCompendium()
         }
         else
         {
-            connect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData()));
+            connect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData()));
         }
     }
     else
@@ -737,7 +737,7 @@ void TmxCompendium::recheckData()
 {
     if(data)
     {
-        disconnect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData()));
+        disconnect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData()));
 
         error = data->hasErrors();
         errorMsg = data->errorMsg();
@@ -915,14 +915,14 @@ void TmxCompendium::unregisterData()
 {
     if(data)
     { 
-        disconnect(data, TQT_SIGNAL(progressStarts(const TQString&)), this
-            , TQT_SIGNAL(progressStarts(const TQString&)));
-        disconnect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds()));
-        disconnect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int)));
+        disconnect(data, TQ_SIGNAL(progressStarts(const TQString&)), this
+            , TQ_SIGNAL(progressStarts(const TQString&)));
+        disconnect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds()));
+        disconnect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int)));
 
         if(data->active())
         {
-            disconnect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(recheckData()));
+            disconnect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(recheckData()));
         }
 
         if(data->unregisterObject(this))
@@ -933,7 +933,7 @@ void TmxCompendium::unregisterData()
             }
             else
             {
-                connect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(removeData()));
+                connect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(removeData()));
             }
         }
 
@@ -957,10 +957,10 @@ void TmxCompendium::registerData()
         emit progressStarts(i18n("Loading PO compendium"));
     }
     
-    connect(data, TQT_SIGNAL(progressStarts(const TQString&)), this
-            , TQT_SIGNAL(progressStarts(const TQString&)));
-    connect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds()));
-    connect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int)));
+    connect(data, TQ_SIGNAL(progressStarts(const TQString&)), this
+            , TQ_SIGNAL(progressStarts(const TQString&)));
+    connect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds()));
+    connect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int)));
 }
 
 void TmxCompendium::removeData()