From 716a5de8870d7c02bb4d0aed72f30291b17b763a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 19 Dec 2011 11:59:01 -0600
Subject: Remove additional unneeded tq method conversions

---
 libkpgp/kpgpbaseG.cpp | 54 +++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'libkpgp/kpgpbaseG.cpp')

diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp
index adbc84b98..a6af30538 100644
--- a/libkpgp/kpgpbaseG.cpp
+++ b/libkpgp/kpgpbaseG.cpp
@@ -73,7 +73,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
                 const char *passphrase )
 {
   TQCString cmd;
-  int exiStatus = 0;
+  int exitStatus = 0;
 
   if(!recipients.isEmpty() && passphrase != 0)
     cmd = "--batch --armor --sign --encrypt --textmode";
@@ -109,12 +109,12 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
 
   clear();
   input = block.text();
-  exiStatus = runGpg(cmd.data(), passphrase);
+  exitStatus = runGpg(cmd.data(), passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if( exiStatus != 0 )
+  if( exitStatus != 0 )
   {
     // this error message is later hopefully overwritten
     errMsg = i18n( "Unknown error." );
@@ -153,12 +153,12 @@ BaseG::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.")
-                     .tqarg( badkeys.data() );
+                     .arg( 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.")
-                     .tqarg( badkeys.data() );
+                     .arg( badkeys.data() );
       status |= MISSINGKEY;
       status |= ERROR;
     }
@@ -199,7 +199,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
   }
 
   //kdDebug(5100) << "status = " << status << endl;
-  block.seStatus( status );
+  block.setStatus( status );
   return status;
 }
 
@@ -208,19 +208,19 @@ int
 BaseG::decrypt( Block& block, const char *passphrase )
 {
   int index, index2;
-  int exiStatus = 0;
+  int exitStatus = 0;
 
   clear();
   input = block.text();
-  exiStatus = runGpg("--batch --decrypt", passphrase);
+  exitStatus = runGpg("--batch --decrypt", passphrase);
   if( !output.isEmpty() && ( error.find( "gpg: quoted printable" ) == -1 ) )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exiStatus == -1) {
+  if(exitStatus == -1) {
     errMsg = i18n("Error running gpg");
     status = RUN_ERR;
-    block.seStatus( status );
+    block.setStatus( status );
     return status;
   }
 
@@ -361,7 +361,7 @@ BaseG::decrypt( Block& block, const char *passphrase )
     }
   }
   //kdDebug(5100) << "status = " << status << endl;
-  block.seStatus( status );
+  block.setStatus( status );
   return status;
 }
 
@@ -371,15 +371,15 @@ BaseG::readPublicKey( const KeyID& keyID,
                       const bool readTrust /* = false */,
                       Key* key /* = 0 */ )
 {
-  int exiStatus = 0;
+  int exitStatus = 0;
 
   status = 0;
   if( readTrust )
-    exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true );
+    exitStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true );
   else
-    exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true );
+    exitStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -405,7 +405,7 @@ BaseG::readPublicKey( const KeyID& keyID,
 KeyList
 BaseG::publicKeys( const TQStringList & patterns )
 {
-  int exiStatus = 0;
+  int exitStatus = 0;
 
   // the option --with-colons should be used for interprocess communication
   // with gpg (according to Werner Koch)
@@ -417,9 +417,9 @@ BaseG::publicKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exiStatus = runGpg( cmd, 0, true );
+  exitStatus = runGpg( cmd, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -437,7 +437,7 @@ BaseG::publicKeys( const TQStringList & patterns )
 KeyList
 BaseG::secretKeys( const TQStringList & patterns )
 {
-  int exiStatus = 0;
+  int exitStatus = 0;
 
   // the option --with-colons should be used for interprocess communication
   // with gpg (according to Werner Koch)
@@ -449,9 +449,9 @@ BaseG::secretKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exiStatus = runGpg( cmd, 0, true );
+  exitStatus = runGpg( cmd, 0, true );
 
-  if(exiStatus != 0) {
+  if(exitStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -470,7 +470,7 @@ int
 BaseG::signKey(const KeyID& keyID, const char *passphrase)
 {
   TQCString cmd;
-  int exiStatus = 0;
+  int exitStatus = 0;
 
   cmd = "--batch";
   cmd += addUserId();
@@ -478,9 +478,9 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase)
   cmd += keyID;
 
   status = 0;
-  exiStatus = runGpg(cmd.data(), passphrase);
+  exitStatus = runGpg(cmd.data(), passphrase);
 
-  if (exiStatus != 0)
+  if (exitStatus != 0)
     status = ERROR;
 
   return status;
@@ -490,15 +490,15 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase)
 TQCString
 BaseG::getAsciiPublicKey(const KeyID& keyID)
 {
-  int exiStatus = 0;
+  int exitStatus = 0;
 
   if (keyID.isEmpty())
     return TQCString();
 
   status = 0;
-  exiStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true);
+  exitStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true);
 
-  if(exiStatus != 0) {
+  if(exitStatus != 0) {
     status = ERROR;
     return TQCString();
   }
-- 
cgit v1.2.1