Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

4 files changed, 16 insertions, 16 deletions

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.