From 1f9d00360b9018301630ce062d7dda0c6583edfb Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:56:17 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 252fce5a2a5384702fbcc1c9987284d7bd2e6943.
---
 libkgpgfile/kgpgfile.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'libkgpgfile/kgpgfile.cpp')

diff --git a/libkgpgfile/kgpgfile.cpp b/libkgpgfile/kgpgfile.cpp
index d8b0301..934c772 100644
--- a/libkgpgfile/kgpgfile.cpp
+++ b/libkgpgfile/kgpgfile.cpp
@@ -85,7 +85,7 @@ KGPGFile::~KGPGFile()
 void KGPGFile::init(void)
 {
   setFlags(IO_Sequential);
-  seStatus(IO_Ok);
+  setqStatus(IO_Ok);
   setState(0);
 }
 
@@ -151,19 +151,19 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd)
 
   TQStringList args;
   if(cmdArgs.isEmpty()) {
-    args << "--homedir" << TQString("\"%1\"").arg(m_homedir)
+    args << "--homedir" << TQString("\"%1\"").tqarg(m_homedir)
         << "-q"
         << "--batch";
 
     if(isWritable()) {
       args << "-ea"
           << "-z" << "6"
-          << "--comment" << TQString("\"%1\"").arg(m_comment)
+          << "--comment" << TQString("\"%1\"").tqarg(m_comment)
           << "--trust-model=always"
-          << "-o" << TQString("\"%1\"").arg(m_fn);
+          << "-o" << TQString("\"%1\"").tqarg(m_fn);
       TQValueList<TQCString>::Iterator it;
       for(it = m_recipient.begin(); it != m_recipient.end(); ++it)
-        args << "-r" << TQString("\"%1\"").arg(TQString(*it));
+        args << "-r" << TQString("\"%1\"").tqarg(TQString(*it));
 
       // some versions of GPG had trouble to replace a file
       // so we delete it first
@@ -174,7 +174,7 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd)
         args << "--passphrase-fd" << "0";
       else
         args << "--use-agent";
-      args << "--no-default-recipient" << TQString("\"%1\"").arg(m_fn);
+      args << "--no-default-recipient" << TQString("\"%1\"").tqarg(m_fn);
     }
   } else {
     args = TQStringList::split(" ", cmdArgs);
@@ -218,7 +218,7 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd)
   }
 
   setState( IO_Open );
-  at( 0 );
+  tqat( 0 );
   // qDebug("File open");
   return true;
 }
@@ -253,7 +253,7 @@ bool KGPGFile::startProcess(const TQStringList& args)
   }
 
   // let the process settle and see if it starts and survives ;-)
-  kapp->processEvents(100);
+  kapp->tqprocessEvents(100);
   return true;
 }
 
@@ -444,7 +444,7 @@ void KGPGFile::slotGPGExited(KProcess* )
     if(m_process->normalExit()) {
       m_exitStatus = m_process->exitStatus();
       if(m_exitStatus != 0)
-        seStatus(IO_UnspecifiedError);
+        setqStatus(IO_UnspecifiedError);
     } else {
       m_exitStatus = -1;
     }
@@ -542,7 +542,7 @@ void KGPGFile::publicKeyList(TQStringList& list, const TQString& pattern)
   KGPGFile file;
   TQString args("--list-keys --with-colons");
   if(!pattern.isEmpty())
-    args += TQString(" %1").arg(pattern);
+    args += TQString(" %1").tqarg(pattern);
   file.open(IO_ReadOnly, args, true);
   while((len = file.readBlock(buffer, sizeof(buffer)-1)) != EOF) {
     buffer[len] = 0;
@@ -567,15 +567,15 @@ void KGPGFile::publicKeyList(TQStringList& list, const TQString& pattern)
     TQString val;
     if(fields[0] == "pub") {
       TQDate expiration = TQDate::fromString(fields[6], Qt::ISODate);
-      if(expiration >  TQDate::currentDate()) {
+      if(expiration >  TQDate::tqcurrentDate()) {
         currentKey = fields[4];
-        val = TQString("%1:%2").arg(currentKey).arg(fields[9]);
+        val = TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]);
         map[val] = val;
       } else {
         qDebug("'%s' is expired", fields[9].data());
       }
     } else if(fields[0] == "uid") {
-      val = TQString("%1:%2").arg(currentKey).arg(fields[9]);
+      val = TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]);
       map[val] = val;
     }
   }
@@ -614,9 +614,9 @@ void KGPGFile::secretKeyList(TQStringList& list)
     TQStringList fields = TQStringList::split(":", (*it), true);
     if(fields[0] == "sec") {
       currentKey = fields[4];
-      list << TQString("%1:%2").arg(currentKey).arg(fields[9]);
+      list << TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]);
     } else if(fields[0] == "uid") {
-      list << TQString("%1:%2").arg(currentKey).arg(fields[9]);
+      list << TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]);
     }
   }
 }
-- 
cgit v1.2.1