Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 26 insertions, 26 deletions

diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp
index 63880c9..7fe35c1 100644
--- a/kgpg/keyservers.cpp
+++ b/kgpg/keyservers.cpp
@@ -68,17 +68,17 @@ keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClos
 	currentKey = TQString();
 	hashMap.clear();
 
-        connect(page->Buttonimport,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotImport()));
-        connect(page->Buttonsearch,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotSearch()));
-        connect(page->Buttonexport,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotPreExport()));
-        connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotOk()));
+        connect(page->Buttonimport,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotImport()));
+        connect(page->Buttonsearch,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotSearch()));
+        connect(page->Buttonexport,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotPreExport()));
+        connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotOk()));
 
 	if (KgpgInterface::getGpgVersion() < 210 ) { // was removed in 2.1
-		connect(page->cBproxyI,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableProxyI(bool)));
-		connect(page->cBproxyE,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableProxyE(bool)));
+		connect(page->cBproxyI,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableProxyI(bool)));
+		connect(page->cBproxyE,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableProxyE(bool)));
 	}
 
-	connect(page->kLEimportid,  TQT_SIGNAL( textChanged ( const TQString & )), this,  TQT_SLOT( slotTextChanged( const TQString &)));
+	connect(page->kLEimportid,  TQ_SIGNAL( textChanged ( const TQString & )), this,  TQ_SLOT( slotTextChanged( const TQString &)));
 	if (KgpgInterface::getGpgVersion() < 210 ) { // was removed in 2.1
 		page->cBproxyI->setChecked(KGpgSettings::useProxy());
 		page->cBproxyE->setChecked(KGpgSettings::useProxy());
@@ -93,8 +93,8 @@ keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClos
 
         KProcIO *encid=new KProcIO(TQTextCodec::codecForLocale());
         *encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys";
-        TQObject::connect(encid, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotprocresult(TDEProcess *)));
-        TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *)));
+        TQObject::connect(encid, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotprocresult(TDEProcess *)));
+        TQObject::connect(encid, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotprocread(KProcIO *)));
         encid->start(TDEProcess::NotifyOnExit,true);
         page->Buttonimport->setEnabled( !page->kLEimportid->text().isEmpty());
         page->Buttonsearch->setEnabled( !page->kLEimportid->text().isEmpty());
@@ -237,12 +237,12 @@ void keyServer::slotSearch()
 	listpop->kLVsearch->setColumnWidth(0,150);
 	listpop->kLVsearch->setColumnWidth(1,130);
         listpop->statusText->setText(i18n("Connecting to the server..."));
-        connect(listpop->kLVsearch,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(transferKeyID()));
-        connect(dialogServer,TQT_SIGNAL(okClicked()),this,TQT_SLOT(preimport()));
-        connect(listpop->kLVsearch,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),dialogServer,TQT_SIGNAL(okClicked()));
+        connect(listpop->kLVsearch,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(transferKeyID()));
+        connect(dialogServer,TQ_SIGNAL(okClicked()),this,TQ_SLOT(preimport()));
+        connect(listpop->kLVsearch,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),dialogServer,TQ_SIGNAL(okClicked()));
 
-        connect(dialogServer,TQT_SIGNAL(closeClicked()),this,TQT_SLOT(handleQuit()));
-        connect( listpop , TQT_SIGNAL( destroyed() ) , this, TQT_SLOT( abortSearch()));
+        connect(dialogServer,TQ_SIGNAL(closeClicked()),this,TQ_SLOT(handleQuit()));
+        connect( listpop , TQ_SIGNAL( destroyed() ) , this, TQ_SLOT( abortSearch()));
 
         searchproc=new KProcIO(TQTextCodec::codecForLocale());
         TQString keyserv=page->kCBimportks->currentText();
@@ -262,8 +262,8 @@ void keyServer::slotSearch()
 
         keyNumbers=0;
 	TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor));
-        TQObject::connect(searchproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotsearchresult(TDEProcess *)));
-        TQObject::connect(searchproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotsearchread(KProcIO *)));
+        TQObject::connect(searchproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotsearchresult(TDEProcess *)));
+        TQObject::connect(searchproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotsearchread(KProcIO *)));
 	searchproc->setUsePty(TDEProcess::Stdout,false); // EKO: very important line - it took me a day to find out why I should use it
         searchproc->start(TDEProcess::NotifyOnExit,true);
 
@@ -532,8 +532,8 @@ void keyServer::slotExport(TQStringList keyIds)
 	}
 	*exportproc << "--status-fd=2" << "--keyserver" << keyserv << "--send-keys" << keyIds;
 
-        TQObject::connect(exportproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotexportresult(TDEProcess *)));
-        TQObject::connect(exportproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotimportread(KProcIO *)));
+        TQObject::connect(exportproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotexportresult(TDEProcess *)));
+        TQObject::connect(exportproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotimportread(KProcIO *)));
         exportproc->start(TDEProcess::NotifyOnExit,true);
 	TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor));
         importpop = new TQDialog( this,0,true,TQt::WDestructiveClose);
@@ -546,8 +546,8 @@ void keyServer::slotExport(TQStringList keyIds)
         importpop->setMinimumWidth(250);
         importpop->adjustSize();
         importpop->show();
-        connect(importpop,TQT_SIGNAL(destroyed ()),this,TQT_SLOT(abortExport()));
-	connect(Buttonabort,TQT_SIGNAL(clicked ()),importpop,TQT_SLOT(close()));
+        connect(importpop,TQ_SIGNAL(destroyed ()),this,TQ_SLOT(abortExport()));
+	connect(Buttonabort,TQ_SIGNAL(clicked ()),importpop,TQ_SLOT(close()));
 }
 
 void keyServer::abortExport()
@@ -631,8 +631,8 @@ void keyServer::slotImport()
 			keyNames=keyNames.stripWhiteSpace();
 			*searchproc<< TQString(TQFile::encodeName(fkeyNames));
 		}
-		TQObject::connect(searchproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotksearchprocresult(TDEProcess *)));
-		TQObject::connect(searchproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotsearchread(KProcIO *)));
+		TQObject::connect(searchproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotksearchprocresult(TDEProcess *)));
+		TQObject::connect(searchproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotsearchread(KProcIO *)));
 		TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor));
 		searchproc->setUsePty(TDEProcess::Stdout,false); // EKO: very important line - it took me a day to find out why I should use it
 		searchproc->start(TDEProcess::Block,true);
@@ -663,8 +663,8 @@ void keyServer::slotImport()
 		*importproc<< (*it) ;
 	}
 
-	TQObject::connect(importproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotimportresult(TDEProcess *)));
-	TQObject::connect(importproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotimportread(KProcIO *)));
+	TQObject::connect(importproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotimportresult(TDEProcess *)));
+	TQObject::connect(importproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotimportread(KProcIO *)));
 
         importproc->start(TDEProcess::NotifyOnExit,true);
 	importproc->closeWhenDone();
@@ -679,8 +679,8 @@ void keyServer::slotImport()
         importpop->setMinimumWidth(250);
         importpop->adjustSize();
         importpop->show();
-	connect(Buttonabort,TQT_SIGNAL(clicked()),importpop,TQT_SLOT(close()));
-	connect(importpop,TQT_SIGNAL(destroyed ()),this,TQT_SLOT(abortImport()));
+	connect(Buttonabort,TQ_SIGNAL(clicked()),importpop,TQ_SLOT(close()));
+	connect(importpop,TQ_SIGNAL(destroyed ()),this,TQ_SLOT(abortImport()));
 }
 
 void keyServer::abortImport()