Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 30 insertions, 30 deletions

diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp
index 1f7d67326..288957399 100644
--- a/libkpgp/kpgpbase5.cpp
+++ b/libkpgp/kpgpbase5.cpp
@@ -66,7 +66,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
                 const char *passphrase )
 {
   TQCString cmd;
-  int exiStatus = 0;
+  int exitqStatus = 0;
   int index;
   // used to work around a bug in pgp5. pgp5 treats files
   // with non ascii chars (umlauts, etc...) as binary files, but
@@ -116,10 +116,10 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
   }
   //We have to do this otherwise it's all in vain
 
-  exiStatus = run(cmd.data(), passphrase);
+  exitqStatus = run(cmd.data(), passphrase);
   block.setError( error );
 
-  if(exiStatus != 0)
+  if(exitqStatus != 0)
     status = ERROR;
 
   // now parse the returned info
@@ -156,7 +156,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
       else
 	errMsg = i18n("The following key(s) are not trusted:\n%1\n"
                       "Their owner(s) will not be able to decrypt the message.")
-		     .arg(TQString(aStr));
+		     .tqarg(TQString(aStr));
       status |= ERROR;
       status |= BADKEYS;
     }
@@ -167,9 +167,9 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
     int index2 = error.find('\n',index);
 
     errMsg = i18n("Missing encryption key(s) for:\n%1")
-      .arg(TQString(error.mid(index,index2-index)));
+      .tqarg(TQString(error.mid(index,index2-index)));
 //    errMsg = TQString("Missing encryption key(s) for: %1")
-//      .arg(error.mid(index,index2-index));
+//      .tqarg(error.mid(index,index2-index));
     status |= ERROR;
     status |= MISSINGKEY;
   }
@@ -185,7 +185,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
   }
 
   block.setProcessedText( output );
-  block.seStatus( status );
+  block.setqStatus( status );
   return status;
 }
 
@@ -193,19 +193,19 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
 int
 Base5::decrypt( Block& block, const char *passphrase )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   clear();
   input = block.text();
-  exiStatus = run("pgpv -f +batchmode=1", passphrase);
+  exitqStatus = run("pgpv -f +batchmode=1", passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exiStatus == -1) {
+  if(exitqStatus == -1) {
     errMsg = i18n("Error running PGP");
     status = RUN_ERR;
-    block.seStatus( status );
+    block.setqStatus( status );
     return status;
   }
 
@@ -313,7 +313,7 @@ Base5::decrypt( Block& block, const char *passphrase )
   }
 
   //kdDebug(5100) << "status = " << status << endl;
-  block.seStatus( status );
+  block.setqStatus( status );
   return status;
 }
 
@@ -321,12 +321,12 @@ Base5::decrypt( Block& block, const char *passphrase )
 Key*
 Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   status = 0;
-  exiStatus = run( "pgpk -ll 0x" + keyId, 0, true );
+  exitqStatus = run( "pgpk -ll 0x" + keyId, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -340,9 +340,9 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
 
   if( readTrust )
   {
-    exiStatus = run( "pgpk -c 0x" + keyId, 0, true );
+    exitqStatus = run( "pgpk -c 0x" + keyId, 0, true );
 
-    if(exiStatus != 0) {
+    if(exitqStatus != 0) {
       status = ERROR;
       return 0;
     }
@@ -357,7 +357,7 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
 KeyList
 Base5::publicKeys( const TQStringList & patterns )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   TQCString cmd = "pgpk -ll";
   for ( TQStringList::ConstIterator it = patterns.begin();
@@ -366,9 +366,9 @@ Base5::publicKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exiStatus = run( cmd, 0, true );
+  exitqStatus = run( cmd, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -386,7 +386,7 @@ Base5::publicKeys( const TQStringList & patterns )
 KeyList
 Base5::secretKeys( const TQStringList & patterns )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   status = 0;
   TQCString cmd = "pgpk -ll";
@@ -396,9 +396,9 @@ Base5::secretKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exiStatus = run( cmd, 0, true );
+  exitqStatus = run( cmd, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -415,15 +415,15 @@ Base5::secretKeys( const TQStringList & patterns )
 
 TQCString Base5::getAsciiPublicKey(const KeyID& keyID)
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   if (keyID.isEmpty())
     return TQCString();
 
   status = 0;
-  exiStatus = run( "pgpk -xa 0x" + keyID, 0, true );
+  exitqStatus = run( "pgpk -xa 0x" + keyID, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return TQCString();
   }
@@ -436,7 +436,7 @@ int
 Base5::signKey(const KeyID& keyID, const char *passphrase)
 {
   TQCString cmd;
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   if(passphrase == 0) return false;
 
@@ -445,9 +445,9 @@ Base5::signKey(const KeyID& keyID, const char *passphrase)
   cmd += addUserId();
 
   status = 0;
-  exiStatus = run(cmd.data(), passphrase);
+  exitqStatus = run(cmd.data(), passphrase);
 
-  if (exiStatus != 0)
+  if (exitqStatus != 0)
     status = ERROR;
 
   return status;
@@ -579,7 +579,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
           TQDateTime dt( TQDate( year, month, day ), TQTime( 00, 00 ) );
           subkey->setCreationDate( epoch.secsTo( dt ) );
           // has the key already expired?
-          if( TQDateTime::currentDateTime() >= dt )
+          if( TQDateTime::tqcurrentDateTime() >= dt )
           {
             subkey->setExpired( true );
             key->setExpired( true );