Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit af0b8f5d1e5e00b1f3b48658d89876c2df28e71c)

1 files changed, 45 insertions, 45 deletions

diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp
index 5d852e6..e113bad 100644
--- a/kgpg/kgpginterface.cpp
+++ b/kgpg/kgpginterface.cpp
@@ -118,8 +118,8 @@ void KgpgInterface::KgpgEncryptFile(TQStringList encryptKeys,KURL srcUrl,KURL de
 		*proc<<TQString(TQFile::encodeName(srcUrl.path()));
 
         /////////  when process ends, update dialog infos
-        TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(encryptfin(TDEProcess *)));
-        TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readencprocess(KProcIO *)));
+        TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(encryptfin(TDEProcess *)));
+        TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readencprocess(KProcIO *)));
         proc->start(TDEProcess::NotifyOnExit,true);
 }
 
@@ -190,8 +190,8 @@ void KgpgInterface::KgpgDecryptFile(KURL srcUrl,KURL destUrl,TQStringList Option
 
                 *proc<<"-d"<<TQString(TQFile::encodeName(srcUrl.path()));
 
-        TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(decryptfin(TDEProcess *)));
-        TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readdecprocess(KProcIO *)));
+        TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(decryptfin(TDEProcess *)));
+        TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readdecprocess(KProcIO *)));
         proc->start(TDEProcess::NotifyOnExit,true);
 }
 
@@ -283,8 +283,8 @@ void KgpgInterface::KgpgEncryptText(TQString text,TQStringList userIDs, TQString
 
         /////////  when process ends, update dialog infos
 
-        TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtencryptfin(TDEProcess *)));
-        TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(txtreadencprocess(KProcIO *)));
+        TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtencryptfin(TDEProcess *)));
+        TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(txtreadencprocess(KProcIO *)));
         proc->start(TDEProcess::NotifyOnExit,false);
 	emit txtencryptionstarted();
 }
@@ -352,9 +352,9 @@ void KgpgInterface::KgpgDecryptText(TQString text,TQStringList Options)
 
   /////////  when process ends, update dialog infos
 
-  TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtdecryptfin(TDEProcess *)));
-  connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(getOutput(TDEProcess *, char *, int)));
-  connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getCmdOutput(TDEProcess *, char *, int)));
+  TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtdecryptfin(TDEProcess *)));
+  connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(getOutput(TDEProcess *, char *, int)));
+  connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(getCmdOutput(TDEProcess *, char *, int)));
   proc->start(TDEProcess::NotifyOnExit,TDEProcess::All);
   proc->writeStdin(text.utf8(), text.length());
 }
@@ -471,8 +471,8 @@ void KgpgInterface::KgpgSignText(TQString text,TQString userIDs, TQStringList Op
 
         /////////  when process ends, update dialog infos
 
-        TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtsignfin(TDEProcess *)));
-        TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(txtsignprocess(KProcIO *)));
+        TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtsignfin(TDEProcess *)));
+        TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(txtsignprocess(KProcIO *)));
 
 	//emit txtsigningstarted();
 
@@ -571,9 +571,9 @@ void KgpgInterface::KgpgDecryptFileToText(KURL srcUrl,TQStringList Options)
 
   /////////  when process ends, update dialog infos
 
-  connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtdecryptfin(TDEProcess *)));
-  connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(getOutput(TDEProcess *, char *, int)));
-  connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getCmdOutput(TDEProcess *, char *, int)));
+  connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtdecryptfin(TDEProcess *)));
+  connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(getOutput(TDEProcess *, char *, int)));
+  connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(getCmdOutput(TDEProcess *, char *, int)));
   proc->start(TDEProcess::NotifyOnExit,TDEProcess::All);
 }
 
@@ -592,8 +592,8 @@ void KgpgInterface::KgpgVerifyText(TQString text)
 		message=TQString();
 		 KProcIO *verifyproc=new KProcIO(TQTextCodec::codecForLocale());
          *verifyproc<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"<<"--verify";
-        	connect(verifyproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotverifyresult(TDEProcess *)));
-        	connect(verifyproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotverifyread(KProcIO *)));
+        	connect(verifyproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotverifyresult(TDEProcess *)));
+        	connect(verifyproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotverifyread(KProcIO *)));
         	verifyproc->start(TDEProcess::NotifyOnExit,true);
 		verifyproc->writeStdin (text);
 		verifyproc->closeWhenDone();
@@ -743,8 +743,8 @@ void KgpgInterface::KgpgSignFile(TQString keyID,KURL srcUrl,TQStringList Options
 	*proc<<"--output"<<TQString(TQFile::encodeName(srcUrl.path()+".sig"));
         *proc<<"--detach-sig"<<TQString(TQFile::encodeName(srcUrl.path()));
 
-        TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(signfin(TDEProcess *)));
-        TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readsignprocess(KProcIO *)));
+        TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(signfin(TDEProcess *)));
+        TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readsignprocess(KProcIO *)));
         proc->start(TDEProcess::NotifyOnExit,true);
 }
 
@@ -819,8 +819,8 @@ void KgpgInterface::KgpgVerifyFile(KURL sigUrl,KURL srcUrl)
                 *proc<<TQString(TQFile::encodeName(srcUrl.path()));
         *proc<<TQString(TQFile::encodeName(sigUrl.path()));
 
-        TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(verifyfin(TDEProcess *)));
-        TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readprocess(KProcIO *)));
+        TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(verifyfin(TDEProcess *)));
+        TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readprocess(KProcIO *)));
         proc->start(TDEProcess::NotifyOnExit,true);
 }
 
@@ -903,8 +903,8 @@ void KgpgInterface::KgpgSignKey(TQString keyID,TQString signKeyID,TQString signK
         *conprocess<<"--edit-key"<<keyID;
 	if (local) *conprocess<<"lsign";
 	else *conprocess<<"sign";
-        TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(sigprocess(KProcIO *)));
-        TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(signover(TDEProcess *)));
+        TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(sigprocess(KProcIO *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(signover(TDEProcess *)));
 	TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor));
         conprocess->start(TDEProcess::NotifyOnExit,true);
 }
@@ -1151,8 +1151,8 @@ void KgpgInterface::KgpgDelSignature(TQString keyID,TQString signKeyID)
         KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
         *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--utf8-strings"<<"--command-fd=0"<<"--status-fd=2";
         *conprocess<<"--edit-key"<<keyID<<"uid 1"<<"delsig";
-        TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(delsigprocess(KProcIO *)));
-        TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(delsignover(TDEProcess *)));
+        TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(delsigprocess(KProcIO *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(delsignover(TDEProcess *)));
 	TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor));
         conprocess->start(TDEProcess::NotifyOnExit,true);
 }
@@ -1242,8 +1242,8 @@ void KgpgInterface::KgpgKeyExpire(TQString keyID,TQDate date,bool unlimited)
         KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
         *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings";
         *conprocess<<"--edit-key"<<keyID<<"expire";
-        TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(expprocess(KProcIO *)));
-        TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(expover(TDEProcess *)));
+        TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(expprocess(KProcIO *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(expover(TDEProcess *)));
         conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput);
 
 }
@@ -1339,8 +1339,8 @@ void KgpgInterface::KgpgTrustExpire(TQString keyID,int keyTrust)
         KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
         *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings";
         *conprocess<<"--edit-key"<<keyID<<"trust";
-        TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(trustprocess(KProcIO *)));
-        TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(trustover(TDEProcess *)));
+        TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(trustprocess(KProcIO *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(trustover(TDEProcess *)));
         conprocess->start(TDEProcess::NotifyOnExit,true);
 
 }
@@ -1398,8 +1398,8 @@ void KgpgInterface::KgpgChangePass(TQString keyID)
         KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
         *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--no-use-agent"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings";
         *conprocess<<"--edit-key"<<keyID<<"passwd";
-        TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(passprocess(KProcIO *)));
-        TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(passover(TDEProcess *)));
+        TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(passprocess(KProcIO *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(passover(TDEProcess *)));
         conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput);
 
 }
@@ -1505,7 +1505,7 @@ TQString KgpgInterface::getKey(TQStringList IDs, bool attributes)
 
         for ( TQStringList::Iterator it = IDs.begin(); it != IDs.end(); ++it )
                 *proc << *it;
-        TQObject::connect(proc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotReadKey(KProcIO *)));
+        TQObject::connect(proc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotReadKey(KProcIO *)));
         proc->start(TDEProcess::Block,false);
         return keyString;
 }
@@ -1533,8 +1533,8 @@ void KgpgInterface::importKeyURL(KURL url)
                 *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--utf8-strings"<<"--import";
                 *conprocess<<"--allow-secret-key-import";
                 *conprocess<<tempKeyFile;
-                TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(importURLover(TDEProcess *)));
-                TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(importprocess(KProcIO *)));
+                TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(importURLover(TDEProcess *)));
+                TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(importprocess(KProcIO *)));
                 conprocess->start(TDEProcess::NotifyOnExit,true);
         }
 }
@@ -1546,8 +1546,8 @@ void KgpgInterface::importKey(TQString keystr)
         KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
         *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--import";
         *conprocess<<"--allow-secret-key-import";
-        TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(importover(TDEProcess *)));
-        TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(importprocess(KProcIO *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(importover(TDEProcess *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(importprocess(KProcIO *)));
         conprocess->start(TDEProcess::NotifyOnExit,true);
         conprocess->writeStdin(keystr, true);
         conprocess->closeWhenDone();
@@ -1653,8 +1653,8 @@ addSuccess=true;
         KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
         *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings";
         *conprocess<<"--edit-key"<<keyID<<"adduid";
-        TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(adduidover(TDEProcess *)));
-        TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(adduidprocess(KProcIO *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(adduidover(TDEProcess *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(adduidprocess(KProcIO *)));
         conprocess->start(TDEProcess::NotifyOnExit,true);
 }
 
@@ -1740,8 +1740,8 @@ userIDs=keyID;
         KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
         *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0";
         *conprocess<<"--with-colon"<<"--list-keys"<<keyID;
-        TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(photoreadover(TDEProcess *)));
-        TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(photoreadprocess(KProcIO *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(photoreadover(TDEProcess *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(photoreadprocess(KProcIO *)));
         conprocess->start(TDEProcess::NotifyOnExit,true);
 }
 
@@ -1793,8 +1793,8 @@ void KgpgInterface::KgpgDeletePhoto(TQString keyID,TQString uid)
         KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
         *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings";
         *conprocess<<"--edit-key"<<keyID<<"uid"<<uid<<"deluid";
-        TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(delphotoover(TDEProcess *)));
-        TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(delphotoprocess(KProcIO *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(delphotoover(TDEProcess *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(delphotoprocess(KProcIO *)));
         conprocess->start(TDEProcess::NotifyOnExit,true);
 }
 
@@ -1859,8 +1859,8 @@ addSuccess=true;
         KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
         *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings";
         *conprocess<<"--edit-key"<<keyID<<"addphoto";
-        TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(addphotoover(TDEProcess *)));
-        TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(addphotoprocess(KProcIO *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(addphotoover(TDEProcess *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(addphotoprocess(KProcIO *)));
         conprocess->start(TDEProcess::NotifyOnExit,true);
 }
 
@@ -1943,8 +1943,8 @@ void KgpgInterface::KgpgRevokeKey(TQString keyID,TQString revokeUrl,int reason,T
         if (!revokeUrl.isEmpty())
                 *conprocess<<"-o"<<revokeUrl;
         *conprocess<<"--gen-revoke"<<keyID;
-        TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(revokeover(TDEProcess *)));
-        TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(revokeprocess(KProcIO *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(revokeover(TDEProcess *)));
+        TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(revokeprocess(KProcIO *)));
         conprocess->start(TDEProcess::NotifyOnExit,true);
 }