Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 12 insertions, 12 deletions

diff --git a/tdenewstuff/security.cpp b/tdenewstuff/security.cpp
index c6f8a4c3b..6952f1ec6 100644
--- a/tdenewstuff/security.cpp
+++ b/tdenewstuff/security.cpp
@@ -50,15 +50,15 @@ void Security::readKeys()
 {
   if (m_gpgRunning)
   {
-    TQTimer::singleShot(5, this, TQT_SLOT(readKeys()));
+    TQTimer::singleShot(5, this, TQ_SLOT(readKeys()));
     return;
   }
   m_runMode = List;
   m_keys.clear();
   KProcIO *readProcess=new KProcIO();
   *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys";
-  connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *)));
-  connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *)));
+  connect(readProcess, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+  connect(readProcess, TQ_SIGNAL(readReady(KProcIO *)) ,this, TQ_SLOT(slotDataArrived(KProcIO *)));
   if (!readProcess->start(TDEProcess::NotifyOnExit, true))
     KMessageBox::error(0L, i18n("<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>gpg</i> is installed, otherwise verification of downloaded resources will not be possible.</qt>"));
   else
@@ -69,14 +69,14 @@ void Security::readSecretKeys()
 {
   if (m_gpgRunning)
   {
-    TQTimer::singleShot(5, this, TQT_SLOT(readSecretKeys()));
+    TQTimer::singleShot(5, this, TQ_SLOT(readSecretKeys()));
     return;
   }
   m_runMode = ListSecret;
   KProcIO *readProcess=new KProcIO();
   *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-secret-keys";
-  connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *)));
-  connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *)));
+  connect(readProcess, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+  connect(readProcess, TQ_SIGNAL(readReady(KProcIO *)) ,this, TQ_SLOT(slotDataArrived(KProcIO *)));
   if (readProcess->start(TDEProcess::NotifyOnExit, true))
     m_gpgRunning = true;  
 }
@@ -206,7 +206,7 @@ void Security::slotCheckValidity()
 {  
   if (!m_keysRead || m_gpgRunning)
   {
-    TQTimer::singleShot(5, this, TQT_SLOT(slotCheckValidity()));
+    TQTimer::singleShot(5, this, TQ_SLOT(slotCheckValidity()));
     return;
   }
   if (m_keys.count() == 0)
@@ -248,8 +248,8 @@ void Security::slotCheckValidity()
   //verify the signature
   KProcIO *verifyProcess=new KProcIO();
   *verifyProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--verify" << f.dirPath() + "/signature"<< m_fileName;
-  connect(verifyProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *)));
-  connect(verifyProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *)));
+  connect(verifyProcess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+  connect(verifyProcess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotDataArrived(KProcIO *)));
   if (verifyProcess->start(TDEProcess::NotifyOnExit,true))
       m_gpgRunning = true;
   else
@@ -270,7 +270,7 @@ void Security::slotSignFile()
 {
   if (!m_keysRead || m_gpgRunning)
   {
-    TQTimer::singleShot(5, this, TQT_SLOT(slotSignFile()));
+    TQTimer::singleShot(5, this, TQ_SLOT(slotSignFile()));
     return;
   }
   
@@ -328,8 +328,8 @@ void Security::slotSignFile()
   //verify the signature
   KProcIO *signProcess=new KProcIO();
   *signProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--no-tty"<<"--detach-sign" << "-u" << m_secretKey << "-o" << f.dirPath() + "/signature" << m_fileName;
-  connect(signProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *)));
-  connect(signProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *)));
+  connect(signProcess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+  connect(signProcess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotDataArrived(KProcIO *)));
   m_runMode = Sign;
   if (signProcess->start(TDEProcess::NotifyOnExit,true))
     m_gpgRunning = true;