From e3649f744289c180537d2d8474dc0e39050e654f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:34:45 -0600
Subject: Rename old tq methods that no longer need a unique name (cherry
 picked from commit 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78)

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

(limited to 'libkpgp/kpgpbaseG.cpp')

diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp
index ecb5af19..adbc84b9 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 exitqStatus = 0;
+  int exiStatus = 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();
-  exitqStatus = runGpg(cmd.data(), passphrase);
+  exiStatus = runGpg(cmd.data(), passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if( exitqStatus != 0 )
+  if( exiStatus != 0 )
   {
     // this error message is later hopefully overwritten
     errMsg = i18n( "Unknown error." );
@@ -199,7 +199,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
   }
 
   //kdDebug(5100) << "status = " << status << endl;
-  block.setqStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -208,19 +208,19 @@ int
 BaseG::decrypt( Block& block, const char *passphrase )
 {
   int index, index2;
-  int exitqStatus = 0;
+  int exiStatus = 0;
 
   clear();
   input = block.text();
-  exitqStatus = runGpg("--batch --decrypt", passphrase);
+  exiStatus = runGpg("--batch --decrypt", passphrase);
   if( !output.isEmpty() && ( error.find( "gpg: quoted printable" ) == -1 ) )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exitqStatus == -1) {
+  if(exiStatus == -1) {
     errMsg = i18n("Error running gpg");
     status = RUN_ERR;
-    block.setqStatus( status );
+    block.seStatus( status );
     return status;
   }
 
@@ -361,7 +361,7 @@ BaseG::decrypt( Block& block, const char *passphrase )
     }
   }
   //kdDebug(5100) << "status = " << status << endl;
-  block.setqStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -371,15 +371,15 @@ BaseG::readPublicKey( const KeyID& keyID,
                       const bool readTrust /* = false */,
                       Key* key /* = 0 */ )
 {
-  int exitqStatus = 0;
+  int exiStatus = 0;
 
   status = 0;
   if( readTrust )
-    exitqStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true );
+    exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true );
   else
-    exitqStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true );
+    exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true );
 
-  if(exitqStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -405,7 +405,7 @@ BaseG::readPublicKey( const KeyID& keyID,
 KeyList
 BaseG::publicKeys( const TQStringList & patterns )
 {
-  int exitqStatus = 0;
+  int exiStatus = 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;
-  exitqStatus = runGpg( cmd, 0, true );
+  exiStatus = runGpg( cmd, 0, true );
 
-  if(exitqStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -437,7 +437,7 @@ BaseG::publicKeys( const TQStringList & patterns )
 KeyList
 BaseG::secretKeys( const TQStringList & patterns )
 {
-  int exitqStatus = 0;
+  int exiStatus = 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;
-  exitqStatus = runGpg( cmd, 0, true );
+  exiStatus = runGpg( cmd, 0, true );
 
-  if(exitqStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -470,7 +470,7 @@ int
 BaseG::signKey(const KeyID& keyID, const char *passphrase)
 {
   TQCString cmd;
-  int exitqStatus = 0;
+  int exiStatus = 0;
 
   cmd = "--batch";
   cmd += addUserId();
@@ -478,9 +478,9 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase)
   cmd += keyID;
 
   status = 0;
-  exitqStatus = runGpg(cmd.data(), passphrase);
+  exiStatus = runGpg(cmd.data(), passphrase);
 
-  if (exitqStatus != 0)
+  if (exiStatus != 0)
     status = ERROR;
 
   return status;
@@ -490,15 +490,15 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase)
 TQCString
 BaseG::getAsciiPublicKey(const KeyID& keyID)
 {
-  int exitqStatus = 0;
+  int exiStatus = 0;
 
   if (keyID.isEmpty())
     return TQCString();
 
   status = 0;
-  exitqStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true);
+  exiStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true);
 
-  if(exitqStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return TQCString();
   }
@@ -778,7 +778,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
             else {
               // assume latin1 encoding
               kdDebug(5100) << "Assume latin1 encoding." << endl;
-              uidString = TQString::tqfromLatin1( uid.data() );
+              uidString = TQString::fromLatin1( uid.data() );
             }
           }
           userID->setText( uidString );
-- 
cgit v1.2.3