summaryrefslogtreecommitdiffstats
path: root/libkpgp/kpgpbase2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libkpgp/kpgpbase2.cpp')
-rw-r--r--libkpgp/kpgpbase2.cpp62
1 files changed, 31 insertions, 31 deletions
diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp
index 97db773a7..23458e022 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 exitqStatus = 0;
+ int exiStatus = 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();
- exitqStatus = run(cmd.data(), passphrase);
+ exiStatus = run(cmd.data(), passphrase);
if( !output.isEmpty() )
block.setProcessedText( output );
block.setError( error );
- if(exitqStatus != 0)
+ if(exiStatus != 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.")
- .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;
}
@@ -171,13 +171,13 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
"for userid(s)\n"
"%1.\n"
"The message is not encrypted.")
- .tqarg( badkeys.data() );
+ .arg( 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.")
- .tqarg( badkeys.data() );
+ .arg( 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.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -227,11 +227,11 @@ int
Base2::decrypt( Block& block, const char *passphrase )
{
int index, index2;
- int exitqStatus = 0;
+ int exiStatus = 0;
clear();
input = block.text();
- exitqStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
+ exiStatus = 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);
- exitqStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
+ exiStatus = run(PGP2 " +batchmode +language=en -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;
}
@@ -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.").tqarg(TQString(error.mid(index, index2-index))) );
+ "Please check your PGP setup.").arg(TQString(error.mid(index, index2-index))) );
}
else
{
@@ -457,7 +457,7 @@ Base2::decrypt( Block& block, const char *passphrase )
}
}
//kdDebug(5100) << "status = " << status << endl;
- block.setqStatus( status );
+ block.seStatus( status );
return status;
}
@@ -467,13 +467,13 @@ Base2::readPublicKey( const KeyID& keyID,
const bool readTrust /* = false */,
Key* key /* = 0 */ )
{
- int exitqStatus = 0;
+ int exiStatus = 0;
status = 0;
- exitqStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" +
+ exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" +
keyID, 0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -487,10 +487,10 @@ Base2::readPublicKey( const KeyID& keyID,
if( readTrust )
{
- exitqStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f",
+ exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f",
0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return 0;
}
@@ -512,14 +512,14 @@ Base2::publicKeys( const TQStringList & patterns )
KeyList
Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
{
- int exitqStatus = 0;
+ int exiStatus = 0;
KeyList publicKeys;
status = 0;
if ( patterns.isEmpty() ) {
- exitqStatus = run( cmd, 0, true );
+ exiStatus = run( cmd, 0, true );
- if ( exitqStatus != 0 ) {
+ if ( exiStatus != 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 ) {
- exitqStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(),
+ exiStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(),
0, true );
- if ( exitqStatus != 0 ) {
+ if ( exiStatus != 0 ) {
status = ERROR;
return KeyList();
}
@@ -576,16 +576,16 @@ int
Base2::signKey(const KeyID& keyID, const char *passphrase)
{
TQCString cmd;
- int exitqStatus = 0;
+ int exiStatus = 0;
cmd = PGP2 " +batchmode +language=en -ks -f ";
cmd += addUserId();
cmd += " 0x" + keyID;
status = 0;
- exitqStatus = run(cmd.data(),passphrase);
+ exiStatus = run(cmd.data(),passphrase);
- if (exitqStatus != 0)
+ if (exiStatus != 0)
status = ERROR;
return status;
@@ -594,16 +594,16 @@ Base2::signKey(const KeyID& keyID, const char *passphrase)
TQCString Base2::getAsciiPublicKey(const KeyID& keyID)
{
- int exitqStatus = 0;
+ int exiStatus = 0;
if (keyID.isEmpty())
return TQCString();
status = 0;
- exitqStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID,
+ exiStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID,
0, true );
- if(exitqStatus != 0) {
+ if(exiStatus != 0) {
status = ERROR;
return TQCString();
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-04 21:36:12 +0000