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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 18 insertions, 18 deletions

diff --git a/libkpgp/kpgpbase6.cpp b/libkpgp/kpgpbase6.cpp
index 0b5073931..0972a46e1 100644
--- a/libkpgp/kpgpbase6.cpp
+++ b/libkpgp/kpgpbase6.cpp
@@ -49,19 +49,19 @@ int
 Base6::decrypt( Block& block, const char *passphrase )
 {
   int index, index2;
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   clear();
   input = block.text();
-  exiStatus = run( PGP6 " +batchmode +language=C -f", passphrase);
+  exitqStatus = run( PGP6 " +batchmode +language=C -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;
   }
 
@@ -180,7 +180,7 @@ Base6::decrypt( Block& block, const char *passphrase )
     }
   }
   //kdDebug(5100) << "status = " << status << endl;
-  block.seStatus( status );
+  block.setqStatus( status );
   return status;
 }
 
@@ -190,13 +190,13 @@ Base6::readPublicKey( const KeyID& keyID,
                       const bool readTrust /* = false */,
                       Key* key /* = 0 */ )
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
   status = 0;
-  exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc "
+  exitqStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc "
                     "0x" + keyID, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -210,10 +210,10 @@ Base6::readPublicKey( const KeyID& keyID,
 
   if( readTrust )
   {
-    exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc "
+    exitqStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc "
                       "0x" + keyID, 0, true );
 
-    if(exiStatus != 0) {
+    if(exitqStatus != 0) {
       status = ERROR;
       return 0;
     }
@@ -238,13 +238,13 @@ TQStrList
 Base6::pubKeys()
 {
   int index, index2;
-  int exiStatus = 0;
+  int exitqStatus = 0;
   int compatibleMode = 1;
 
   status = 0;
-  exiStatus = run("pgp +batchmode +language=C -kv -f");
+  exitqStatus = run("pgp +batchmode +language=C -kv -f");
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -319,9 +319,9 @@ Base6::pubKeys()
   }
 
   // Also look for pgp key groups
-  exiStatus = run("pgp +batchmode +language=C -gv -f");
+  exitqStatus = run("pgp +batchmode +language=C -gv -f");
 
-  if(exiStatus != 0) {
+  if(exitqStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -352,11 +352,11 @@ Base6::secretKeys( const TQStringList & patterns )
 int
 Base6::isVersion6()
 {
-  int exiStatus = 0;
+  int exitqStatus = 0;
 
-  exiStatus = run( PGP6, 0, true );
+  exitqStatus = run( PGP6, 0, true );
 
-  if(exiStatus == -1) {
+  if(exitqStatus == -1) {
     errMsg = i18n("error running PGP");
     status = RUN_ERR;
     return 0;