From 716a5de8870d7c02bb4d0aed72f30291b17b763a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:01 -0600 Subject: Remove additional unneeded tq method conversions --- libkpgp/kpgp.cpp | 28 +++++++++++------------ libkpgp/kpgp.h | 2 +- libkpgp/kpgpbase2.cpp | 62 +++++++++++++++++++++++++-------------------------- libkpgp/kpgpbase5.cpp | 58 +++++++++++++++++++++++------------------------ libkpgp/kpgpbase6.cpp | 36 +++++++++++++++--------------- libkpgp/kpgpbaseG.cpp | 54 ++++++++++++++++++++++---------------------- libkpgp/kpgpblock.cpp | 4 ++-- libkpgp/kpgpblock.h | 6 ++--- libkpgp/kpgpui.cpp | 20 ++++++++--------- 9 files changed, 135 insertions(+), 135 deletions(-) (limited to 'libkpgp') diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp index 6035112c..08557a72 100644 --- a/libkpgp/kpgp.cpp +++ b/libkpgp/kpgp.cpp @@ -313,7 +313,7 @@ Module::clearsign( Block& block, Kpgp::Result Module::encrypt( Block& block, - const TQStringList& tqreceivers, const KeyID& keyId, + const TQStringList& receivers, const KeyID& keyId, bool sign, const TQCString& charset ) { KeyIDList encryptionKeyIds; // list of keys which are used for encryption @@ -324,8 +324,8 @@ Module::encrypt( Block& block, setUser( keyId ); - if( !tqreceivers.empty() ) { - Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, tqreceivers, + if( !receivers.empty() ) { + Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, receivers, keyId ); if( Kpgp::Ok != result ) { return result; @@ -371,7 +371,7 @@ Module::encrypt( Block& block, TQString str = i18n("%1 = 'signing failed' error message", "%1\nDo you want to send the message unsigned, " "or cancel sending the message?") - .tqarg( pgp->lastErrorMessage() ); + .arg( pgp->lastErrorMessage() ); TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) ); int ret = KMessageBox::warningContinueCancel( 0, str, i18n("PGP Warning"), @@ -389,7 +389,7 @@ Module::encrypt( Block& block, TQString str = i18n("%1 = 'bad keys' error message", "%1\nDo you want to encrypt anyway, leave the " "message as-is, or cancel sending the message?") - .tqarg( pgp->lastErrorMessage() ); + .arg( pgp->lastErrorMessage() ); TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) ); int ret = KMessageBox::warningYesNoCancel( 0, str, @@ -416,7 +416,7 @@ Module::encrypt( Block& block, TQString str = i18n("%1 = 'missing keys' error message", "%1\nDo you want to leave the message as-is, " "or cancel sending the message?") - .tqarg( pgp->lastErrorMessage() ); + .arg( pgp->lastErrorMessage() ); TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) ); int ret = KMessageBox::warningContinueCancel( 0, str, i18n("PGP Warning"), @@ -432,10 +432,10 @@ Module::encrypt( Block& block, if( status & ERROR ) { // show error dialog errMsg = i18n( "The following error occurred:\n%1" ) - .tqarg( pgp->lastErrorMessage() ); + .arg( pgp->lastErrorMessage() ); TQString details = i18n( "This is the error message of %1:\n%2" ) - .tqarg( ( pgpType == tGPG ) ? "GnuPG" : "PGP" ) - .tqarg( block.error().data() ); + .arg( ( pgpType == tGPG ) ? "GnuPG" : "PGP" ) + .arg( block.error().data() ); TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) ); KMessageBox::detailedSorry( 0, errMsg, details ); TQApplication::restoreOverrideCursor(); @@ -1216,7 +1216,7 @@ Module::getEncryptionKeys( const TQString& person ) "encryption key(s) for \"%1\".\n\n" "Please re-select the key(s) which should " "be used for this recipient." - ).tqarg(person), + ).arg(person), keyIds, allowedKeys ); if( !keyIds.isEmpty() ) { @@ -1280,7 +1280,7 @@ Module::getEncryptionKeys( const TQString& person ) "found for \"%1\".\n\n" "Select the key(s) which should " "be used for this recipient." - ).tqarg(person), + ).arg(person), KeyIDList(), allowedKeys ); if( !keyIds.isEmpty() ) { @@ -1305,7 +1305,7 @@ Module::getEncryptionKeys( const TQString& person ) "More than one key matches \"%1\".\n\n" "Select the key(s) which should " "be used for this recipient." - ).tqarg(person), + ).arg(person), KeyIDList(), allowedKeys ); if( !keyIds.isEmpty() ) { @@ -1744,7 +1744,7 @@ Module::readAddressData() addressDataDict.clear(); for( int i=1; i<=num; i++ ) { - KConfigGroup addrGroup( config, TQString("Address #%1").tqarg(i).local8Bit() ); + KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() ); address = addrGroup.readEntry( "Address" ); data.keyIds = KeyIDList::fromStringList( addrGroup.readListEntry( "Key IDs" ) ); data.encrPref = (EncryptPref) addrGroup.readNumEntry( "EncryptionPreference", @@ -1769,7 +1769,7 @@ Module::writeAddressData() for ( i=1, it = addressDataDict.begin(); it != addressDataDict.end(); ++it, i++ ) { - KConfigGroup addrGroup( config, TQString("Address #%1").tqarg(i).local8Bit() ); + KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() ); addrGroup.writeEntry( "Address", it.key() ); addrGroup.writeEntry( "Key IDs", it.data().keyIds.toStringList() ); addrGroup.writeEntry( "EncryptionPreference", it.data().encrPref ); diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h index f9f49236..967254b6 100644 --- a/libkpgp/kpgp.h +++ b/libkpgp/kpgp.h @@ -123,7 +123,7 @@ public: Ok if everything is o.k. */ Kpgp::Result encrypt( Block& block, - const TQStringList& tqreceivers, const KeyID& keyId, + const TQStringList& receivers, const KeyID& keyId, bool sign, const TQCString& charset = 0 ); /** Determines the keys which should be used for encrypting the message diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp index 4ba4043f..fdafa130 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 exiStatus = 0; + int exitStatus = 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(); - exiStatus = run(cmd.data(), passphrase); + exitStatus = run(cmd.data(), passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); - if(exiStatus != 0) + if(exitStatus != 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.seStatus( status ); + block.setStatus( status ); return status; } @@ -227,11 +227,11 @@ int Base2::decrypt( Block& block, const char *passphrase ) { int index, index2; - int exiStatus = 0; + int exitStatus = 0; clear(); input = block.text(); - exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase); + exitStatus = 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); - exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase); + exitStatus = run(PGP2 " +batchmode +language=en -f", passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); } - if(exiStatus == -1) { + if(exitStatus == -1) { errMsg = i18n("error running PGP"); status = RUN_ERR; - block.seStatus( status ); + block.setStatus( 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.seStatus( status ); + block.setStatus( status ); return status; } @@ -467,13 +467,13 @@ Base2::readPublicKey( const KeyID& keyID, const bool readTrust /* = false */, Key* key /* = 0 */ ) { - int exiStatus = 0; + int exitStatus = 0; status = 0; - exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" + + exitStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" + keyID, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -487,10 +487,10 @@ Base2::readPublicKey( const KeyID& keyID, if( readTrust ) { - exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f", + exitStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f", 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -512,14 +512,14 @@ Base2::publicKeys( const TQStringList & patterns ) KeyList Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns ) { - int exiStatus = 0; + int exitStatus = 0; KeyList publicKeys; status = 0; if ( patterns.isEmpty() ) { - exiStatus = run( cmd, 0, true ); + exitStatus = run( cmd, 0, true ); - if ( exiStatus != 0 ) { + if ( exitStatus != 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 ) { - exiStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(), + exitStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(), 0, true ); - if ( exiStatus != 0 ) { + if ( exitStatus != 0 ) { status = ERROR; return KeyList(); } @@ -576,16 +576,16 @@ int Base2::signKey(const KeyID& keyID, const char *passphrase) { TQCString cmd; - int exiStatus = 0; + int exitStatus = 0; cmd = PGP2 " +batchmode +language=en -ks -f "; cmd += addUserId(); cmd += " 0x" + keyID; status = 0; - exiStatus = run(cmd.data(),passphrase); + exitStatus = run(cmd.data(),passphrase); - if (exiStatus != 0) + if (exitStatus != 0) status = ERROR; return status; @@ -594,16 +594,16 @@ Base2::signKey(const KeyID& keyID, const char *passphrase) TQCString Base2::getAsciiPublicKey(const KeyID& keyID) { - int exiStatus = 0; + int exitStatus = 0; if (keyID.isEmpty()) return TQCString(); status = 0; - exiStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID, + exitStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return TQCString(); } diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp index 52a70f01..0e583732 100644 --- a/libkpgp/kpgpbase5.cpp +++ b/libkpgp/kpgpbase5.cpp @@ -66,7 +66,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients, const char *passphrase ) { TQCString cmd; - int exiStatus = 0; + int exitStatus = 0; int index; // used to work around a bug in pgp5. pgp5 treats files // with non ascii chars (umlauts, etc...) as binary files, but @@ -116,10 +116,10 @@ Base5::encsign( Block& block, const KeyIDList& recipients, } //We have to do this otherwise it's all in vain - exiStatus = run(cmd.data(), passphrase); + exitStatus = run(cmd.data(), passphrase); block.setError( error ); - if(exiStatus != 0) + if(exitStatus != 0) status = ERROR; // now parse the returned info @@ -156,7 +156,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients, else errMsg = i18n("The following key(s) are not trusted:\n%1\n" "Their owner(s) will not be able to decrypt the message.") - .tqarg(TQString(aStr)); + .arg(TQString(aStr)); status |= ERROR; status |= BADKEYS; } @@ -167,9 +167,9 @@ Base5::encsign( Block& block, const KeyIDList& recipients, int index2 = error.find('\n',index); errMsg = i18n("Missing encryption key(s) for:\n%1") - .tqarg(TQString(error.mid(index,index2-index))); + .arg(TQString(error.mid(index,index2-index))); // errMsg = TQString("Missing encryption key(s) for: %1") -// .tqarg(error.mid(index,index2-index)); +// .arg(error.mid(index,index2-index)); status |= ERROR; status |= MISSINGKEY; } @@ -185,7 +185,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients, } block.setProcessedText( output ); - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -193,19 +193,19 @@ Base5::encsign( Block& block, const KeyIDList& recipients, int Base5::decrypt( Block& block, const char *passphrase ) { - int exiStatus = 0; + int exitStatus = 0; clear(); input = block.text(); - exiStatus = run("pgpv -f +batchmode=1", passphrase); + exitStatus = run("pgpv -f +batchmode=1", passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); - if(exiStatus == -1) { + if(exitStatus == -1) { errMsg = i18n("Error running PGP"); status = RUN_ERR; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -313,7 +313,7 @@ Base5::decrypt( Block& block, const char *passphrase ) } //kdDebug(5100) << "status = " << status << endl; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -321,12 +321,12 @@ Base5::decrypt( Block& block, const char *passphrase ) Key* Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key ) { - int exiStatus = 0; + int exitStatus = 0; status = 0; - exiStatus = run( "pgpk -ll 0x" + keyId, 0, true ); + exitStatus = run( "pgpk -ll 0x" + keyId, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -340,9 +340,9 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key ) if( readTrust ) { - exiStatus = run( "pgpk -c 0x" + keyId, 0, true ); + exitStatus = run( "pgpk -c 0x" + keyId, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -357,7 +357,7 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key ) KeyList Base5::publicKeys( const TQStringList & patterns ) { - int exiStatus = 0; + int exitStatus = 0; TQCString cmd = "pgpk -ll"; for ( TQStringList::ConstIterator it = patterns.begin(); @@ -366,9 +366,9 @@ Base5::publicKeys( const TQStringList & patterns ) cmd += KProcess::quote( *it ).local8Bit(); } status = 0; - exiStatus = run( cmd, 0, true ); + exitStatus = run( cmd, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return KeyList(); } @@ -386,7 +386,7 @@ Base5::publicKeys( const TQStringList & patterns ) KeyList Base5::secretKeys( const TQStringList & patterns ) { - int exiStatus = 0; + int exitStatus = 0; status = 0; TQCString cmd = "pgpk -ll"; @@ -396,9 +396,9 @@ Base5::secretKeys( const TQStringList & patterns ) cmd += KProcess::quote( *it ).local8Bit(); } status = 0; - exiStatus = run( cmd, 0, true ); + exitStatus = run( cmd, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return KeyList(); } @@ -415,15 +415,15 @@ Base5::secretKeys( const TQStringList & patterns ) TQCString Base5::getAsciiPublicKey(const KeyID& keyID) { - int exiStatus = 0; + int exitStatus = 0; if (keyID.isEmpty()) return TQCString(); status = 0; - exiStatus = run( "pgpk -xa 0x" + keyID, 0, true ); + exitStatus = run( "pgpk -xa 0x" + keyID, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return TQCString(); } @@ -436,7 +436,7 @@ int Base5::signKey(const KeyID& keyID, const char *passphrase) { TQCString cmd; - int exiStatus = 0; + int exitStatus = 0; if(passphrase == 0) return false; @@ -445,9 +445,9 @@ Base5::signKey(const KeyID& keyID, const char *passphrase) cmd += addUserId(); status = 0; - exiStatus = run(cmd.data(), passphrase); + exitStatus = run(cmd.data(), passphrase); - if (exiStatus != 0) + if (exitStatus != 0) status = ERROR; return status; diff --git a/libkpgp/kpgpbase6.cpp b/libkpgp/kpgpbase6.cpp index 0b507393..7fada7cc 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 exitStatus = 0; clear(); input = block.text(); - exiStatus = run( PGP6 " +batchmode +language=C -f", passphrase); + exitStatus = run( PGP6 " +batchmode +language=C -f", passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); - if(exiStatus == -1) { + if(exitStatus == -1) { errMsg = i18n("error running PGP"); status = RUN_ERR; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -180,7 +180,7 @@ Base6::decrypt( Block& block, const char *passphrase ) } } //kdDebug(5100) << "status = " << status << endl; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -190,13 +190,13 @@ Base6::readPublicKey( const KeyID& keyID, const bool readTrust /* = false */, Key* key /* = 0 */ ) { - int exiStatus = 0; + int exitStatus = 0; status = 0; - exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc " + exitStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc " "0x" + keyID, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 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 " + exitStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc " "0x" + keyID, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -238,13 +238,13 @@ TQStrList Base6::pubKeys() { int index, index2; - int exiStatus = 0; + int exitStatus = 0; int compatibleMode = 1; status = 0; - exiStatus = run("pgp +batchmode +language=C -kv -f"); + exitStatus = run("pgp +batchmode +language=C -kv -f"); - if(exiStatus != 0) { + if(exitStatus != 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"); + exitStatus = run("pgp +batchmode +language=C -gv -f"); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -352,11 +352,11 @@ Base6::secretKeys( const TQStringList & patterns ) int Base6::isVersion6() { - int exiStatus = 0; + int exitStatus = 0; - exiStatus = run( PGP6, 0, true ); + exitStatus = run( PGP6, 0, true ); - if(exiStatus == -1) { + if(exitStatus == -1) { errMsg = i18n("error running PGP"); status = RUN_ERR; return 0; diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp index adbc84b9..a6af3053 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(); } diff --git a/libkpgp/kpgpblock.cpp b/libkpgp/kpgpblock.cpp index ba1d8fec..f1c6a5ae 100644 --- a/libkpgp/kpgpblock.cpp +++ b/libkpgp/kpgpblock.cpp @@ -122,7 +122,7 @@ Block::clearsign( const TQCString& keyId, const TQCString& charset ) } Kpgp::Result -Block::encrypt( const TQStringList& tqreceivers, const TQCString& keyId, +Block::encrypt( const TQStringList& receivers, const TQCString& keyId, const bool sign, const TQCString& charset ) { Kpgp::Module *pgp = Kpgp::Module::getKpgp(); @@ -130,7 +130,7 @@ Block::encrypt( const TQStringList& tqreceivers, const TQCString& keyId, if( pgp == 0 ) return Kpgp::Failure; - return pgp->encrypt( *this, tqreceivers, keyId, sign, charset ); + return pgp->encrypt( *this, receivers, keyId, sign, charset ); } } // namespace Kpgp diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h index c5af0241..82001a1d 100644 --- a/libkpgp/kpgpblock.h +++ b/libkpgp/kpgpblock.h @@ -103,7 +103,7 @@ class KDE_EXPORT Block void setProcessedText( const TQCString& str ); int status() const; - void seStatus( const int status ); + void setStatus( const int status ); BlockType type(); @@ -169,7 +169,7 @@ class KDE_EXPORT Block false if there was an unresolvable error or if encryption was canceled true if everything is o.k. */ - Kpgp::Result encrypt( const TQStringList& tqreceivers, const TQCString& keyId, + Kpgp::Result encrypt( const TQStringList& receivers, const TQCString& keyId, const bool sign, const TQCString& charset = TQCString() ); private: @@ -235,7 +235,7 @@ Block::status() const } inline void -Block::seStatus( const int status ) +Block::setStatus( const int status ) { mStatus = status; } diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index a9c62d83..19323854 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -76,7 +76,7 @@ PassphraseDialog::PassphraseDialog( TQWidget *parent, if (keyID.isNull()) label = new TQLabel(i18n("Please enter your OpenPGP passphrase:"),rightArea); else - label = new TQLabel(i18n("Please enter the OpenPGP passphrase for\n\"%1\":").tqarg(keyID), + label = new TQLabel(i18n("Please enter the OpenPGP passphrase for\n\"%1\":").arg(keyID), rightArea); lineedit = new KPasswordEdit( rightArea ); lineedit->setEchoMode(TQLineEdit::Password); @@ -461,7 +461,7 @@ void KeySelectionDialog::initKeylist( const KeyList& keyList, childItem = new TQListViewItem( primaryUserID, "", i18n( "Fingerprint: %1" ) - .tqarg( beautifyFingerprint( (*it)->primaryFingerprint() ) ) ); + .arg( beautifyFingerprint( (*it)->primaryFingerprint() ) ) ); if( primaryUserID->isSelected() && mListView->isMultiSelection() ) { mListView->setSelected( childItem, true ); } @@ -543,15 +543,15 @@ TQString KeySelectionDialog::keyInfo( const Kpgp::Key *key ) const if( remark.isEmpty() ) { return " " + i18n("creation date and status of an OpenPGP key", "Creation date: %1, Status: %2") - .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) ) - .tqarg( status ); + .arg( KGlobal::locale()->formatDate( dt.date(), true ) ) + .arg( status ); } else { return " " + i18n("creation date, status and remark of an OpenPGP key", "Creation date: %1, Status: %2 (%3)") - .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) ) - .tqarg( status ) - .tqarg( remark ); + .arg( KGlobal::locale()->formatDate( dt.date(), true ) ) + .arg( status ) + .arg( remark ); } } @@ -1014,7 +1014,7 @@ bool KeySelectionDialog::checkKeys( const TQValueList& keys ) c ++it ) { kdDebug(5100) << "Checking key 0x" << getKeyId( *it ) << "...\n"; pProgressDlg->setLabel( i18n("Checking key 0x%1...") - .tqarg( TQString( getKeyId( *it ) ) ) ); + .arg( TQString( getKeyId( *it ) ) ) ); kapp->processEvents(); keysAllowed = keysAllowed && ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) ); pProgressDlg->progressBar()->advance( 1 ); @@ -1543,7 +1543,7 @@ KeyApprovalDialog::slotChangeEncryptionKey( int nr ) "Select the key(s) which should " "be used to encrypt the message " "for\n%1") - .tqarg( mAddressLabels[nr-1]->text() ), + .arg( mAddressLabels[nr-1]->text() ), keyIds, mAddressLabels[nr-1]->text(), mAllowedKeys ); @@ -1670,7 +1670,7 @@ void CipherTextDialog::setMinimumSize() gc.readBoolEntry("XineramaPlacementEnabled", true)) { maxWidth = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(parentWidget())).width()-100; } else { - maxWidth = TQApplication::desktop()->tqgeometry().width()-100; + maxWidth = TQApplication::desktop()->geometry().width()-100; } #endif -- cgit v1.2.3