summaryrefslogtreecommitdiffstats
path: root/libkpgp/kpgpbase6.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:34:45 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:34:45 -0600
commit0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 (patch)
tree4138783f7dad757fc5fbfaa8d66a355288d3125e /libkpgp/kpgpbase6.cpp
parent9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (diff)
downloadtdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.tar.gz
tdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'libkpgp/kpgpbase6.cpp')
-rw-r--r--libkpgp/kpgpbase6.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/libkpgp/kpgpbase6.cpp b/libkpgp/kpgpbase6.cpp
index 0972a46e1..0b5073931 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 exitqStatus = 0;
+ int exiStatus = 0;
clear();
input = block.text();
- exitqStatus = run( PGP6 " +batchmode +language=C -f", passphrase);
+ exiStatus = run( PGP6 " +batchmode +language=C -f", passphrase);
if( !output.isEmpty() )
block.setProcessedText( output );
block.setError( error );
- if(exitqStatus == -1) {
+ if(exiStatus == -1) {
errMsg = i18n("error running PGP");
status = RUN_ERR;
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -180,7 +180,7 @@ Base6::decrypt( Block& block, const char *passphrase )
}
}
//kdDebug(5100) << "status = " << status << endl;
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -190,13 +190,13 @@ Base6::readPublicKey( const KeyID& keyID,
const bool readTrust /* = false */,
Key* key /* = 0 */ )
{
- int exitqStatus = 0;
+ int exiStatus = 0;
status = 0;
- exitqStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc "
+ exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc "
"0x" + keyID, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -210,10 +210,10 @@ Base6::readPublicKey( const KeyID& keyID,
if( readTrust )
{
- exitqStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc "
+ exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc "
"0x" + keyID, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -238,13 +238,13 @@ TQStrList
Base6::pubKeys()
{
int index, index2;
- int exitqStatus = 0;
+ int exiStatus = 0;
int compatibleMode = 1;
status = 0;
- exitqStatus = run("pgp +batchmode +language=C -kv -f");
+ exiStatus = run("pgp +batchmode +language=C -kv -f");
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -319,9 +319,9 @@ Base6::pubKeys()
}
// Also look for pgp key groups
- exitqStatus = run("pgp +batchmode +language=C -gv -f");
+ exiStatus = run("pgp +batchmode +language=C -gv -f");
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -352,11 +352,11 @@ Base6::secretKeys( const TQStringList & patterns )
int
Base6::isVersion6()
{
- int exitqStatus = 0;
+ int exiStatus = 0;
- exitqStatus = run( PGP6, 0, true );
+ exiStatus = run( PGP6, 0, true );
- if(exitqStatus == -1) {
+ if(exiStatus == -1) {
errMsg = i18n("error running PGP");
status = RUN_ERR;
return 0;