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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 31 insertions, 31 deletions

diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp
index 23458e022..97db773a7 100644
--- a/libkpgp/kpgpbase2.cpp
+++ b/libkpgp/kpgpbase2.cpp
@@ -66,7 +66,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
                 const char *passphrase )
 {
   TQCString cmd;
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   if(!recipients.isEmpty() && passphrase != 0)
     cmd = PGP2 " +batchmode +language=en +verbose=1 -seat";
@@ -100,12 +100,12 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
 
   clear();
   input = block.text();
-  exiStatus = run(cmd.data(), passphrase);
+  exitqStatus = run(cmd.data(), passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exiStatus != 0)
+  if(exitqStatus != 0)
     status = ERROR;
 
 #if 0
@@ -139,12 +139,12 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
 	  errMsg = i18n("Could not find public keys matching the userid(s)\n"
                         "%1;\n"
                         "the message is not encrypted.")
-                       .arg( badkeys.data() );
+                       .tqarg( badkeys.data() );
         else
           errMsg = i18n("Could not find public keys matching the userid(s)\n"
                         "%1;\n"
                         "these persons will not be able to read the message.")
-                       .arg( badkeys.data() );
+                       .tqarg( badkeys.data() );
         status |= MISSINGKEY;
         status |= ERROR;
       }
@@ -171,13 +171,13 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
                         "for userid(s)\n"
                         "%1.\n"
                         "The message is not encrypted.")
-                       .arg( badkeys.data() );
+                       .tqarg( badkeys.data() );
         else
 	  errMsg = i18n("Public keys not certified with trusted signature "
                         "for userid(s)\n"
                         "%1;\n"
                         "these persons will not be able to read the message.")
-                       .arg( badkeys.data() );
+                       .tqarg( badkeys.data() );
         status |= BADKEYS;
         status |= ERROR;
         return status;
@@ -218,7 +218,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
   }
 
   //kdDebug(5100) << "status = " << status << endl;
-  block.seStatus( status );
+  block.setqStatus( status );
   return status;
 }
 
@@ -227,11 +227,11 @@ int
 Base2::decrypt( Block& block, const char *passphrase )
 {
   int index, index2;
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   clear();
   input = block.text();
-  exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
+  exitqStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
@@ -249,16 +249,16 @@ Base2::decrypt( Block& block, const char *passphrase )
     index1 = input.find('\n', index1);
     index2 = input.find("\n\n", index1);
     input.remove(index1, index2 - index1);
-    exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
+    exitqStatus = run(PGP2 " +batchmode +language=en -f", 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;
   }
 
@@ -448,7 +448,7 @@ Base2::decrypt( Block& block, const char *passphrase )
       index = error.find('\'', index) + 1;
       index2 = error.find('\'', index);
       block.setSignatureUserId( i18n("The keyring file %1 does not exist.\n"
-      "Please check your PGP setup.").arg(TQString(error.mid(index, index2-index))) );
+      "Please check your PGP setup.").tqarg(TQString(error.mid(index, index2-index))) );
     }
     else
     {
@@ -457,7 +457,7 @@ Base2::decrypt( Block& block, const char *passphrase )
     }
   }
   //kdDebug(5100) << "status = " << status << endl;
-  block.seStatus( status );
+  block.setqStatus( status );
   return status;
 }
 
@@ -467,13 +467,13 @@ Base2::readPublicKey( const KeyID& keyID,
                       const bool readTrust /* = false */,
                       Key* key /* = 0 */ )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   status = 0;
-  exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" +
+  exitqStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" +
                     keyID, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -487,10 +487,10 @@ Base2::readPublicKey( const KeyID& keyID,
 
   if( readTrust )
   {
-    exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f",
+    exitqStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f",
                       0, true );
 
-    if(exiStatus != 0) {
+    if(exitqStatus != 0) {
       status = ERROR;
       return 0;
     }
@@ -512,14 +512,14 @@ Base2::publicKeys( const TQStringList & patterns )
 KeyList
 Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
   KeyList publicKeys;
 
   status = 0;
   if ( patterns.isEmpty() ) {
-    exiStatus = run( cmd, 0, true );
+    exitqStatus = run( cmd, 0, true );
 
-    if ( exiStatus != 0 ) {
+    if ( exitqStatus != 0 ) {
       status = ERROR;
       return KeyList();
     }
@@ -533,10 +533,10 @@ Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
 
     for ( TQStringList::ConstIterator it = patterns.begin();
           it != patterns.end(); ++it ) {
-      exiStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(),
+      exitqStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(),
                         0, true );
 
-      if ( exiStatus != 0 ) {
+      if ( exitqStatus != 0 ) {
         status = ERROR;
         return KeyList();
       }
@@ -576,16 +576,16 @@ int
 Base2::signKey(const KeyID& keyID, const char *passphrase)
 {
   TQCString cmd;
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   cmd = PGP2 " +batchmode +language=en -ks -f ";
   cmd += addUserId();
   cmd += " 0x" + keyID;
 
   status = 0;
-  exiStatus = run(cmd.data(),passphrase);
+  exitqStatus = run(cmd.data(),passphrase);
 
-  if (exiStatus != 0)
+  if (exitqStatus != 0)
     status = ERROR;
 
   return status;
@@ -594,16 +594,16 @@ Base2::signKey(const KeyID& keyID, const char *passphrase)
 
 TQCString Base2::getAsciiPublicKey(const KeyID& keyID)
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   if (keyID.isEmpty())
     return TQCString();
 
   status = 0;
-  exiStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID,
+  exitqStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID,
                     0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return TQCString();
   }