summaryrefslogtreecommitdiffstats
path: root/libkpgp/kpgpbase2.cpp
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-11-29 19:52:17 +0100
committerSlávek Banko <slavek.banko@axis.cz>2018-11-29 21:48:23 +0100
commit2e5de46030e2354b851ba731f6c76ac30a2e8a3b (patch)
treee48732e76e7d0ceb4e01caab16c1aa2a119c1ad0 /libkpgp/kpgpbase2.cpp
parent2f0c49e8523a4d26b6bb9c7c8a05d68cb023a568 (diff)
downloadtdepim-2e5de46030e2354b851ba731f6c76ac30a2e8a3b.tar.gz
tdepim-2e5de46030e2354b851ba731f6c76ac30a2e8a3b.zip
Adapted to new KPasswordEdit::password() signature.
This relates to bug 2961. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'libkpgp/kpgpbase2.cpp')
-rw-r--r--libkpgp/kpgpbase2.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp
index 2d16951c4..d0d08a0ff 100644
--- a/libkpgp/kpgpbase2.cpp
+++ b/libkpgp/kpgpbase2.cpp
@@ -55,7 +55,7 @@ Base2::encrypt( Block& block, const KeyIDList& recipients )
int
-Base2::clearsign( Block& block, const char *passphrase )
+Base2::clearsign( Block& block, const TQString& passphrase )
{
return encsign( block, KeyIDList(), passphrase );
}
@@ -63,16 +63,16 @@ Base2::clearsign( Block& block, const char *passphrase )
int
Base2::encsign( Block& block, const KeyIDList& recipients,
- const char *passphrase )
+ const TQString& passphrase )
{
TQCString cmd;
int exitStatus = 0;
- if(!recipients.isEmpty() && passphrase != 0)
+ if (!recipients.isEmpty() && !passphrase.isNull())
cmd = PGP2 " +batchmode +language=en +verbose=1 -seat";
else if(!recipients.isEmpty())
cmd = PGP2 " +batchmode +language=en +verbose=1 -eat";
- else if(passphrase != 0)
+ else if (!passphrase.isNull())
cmd = PGP2 " +batchmode +language=en +verbose=1 -sat";
else
{
@@ -80,7 +80,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
return OK;
}
- if(passphrase != 0)
+ if (!passphrase.isNull())
cmd += addUserId();
if(!recipients.isEmpty()) {
@@ -185,7 +185,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
}
}
#endif
- if(passphrase != 0)
+ if (!passphrase.isNull())
{
if(error.find("Pass phrase is good") != -1)
{
@@ -224,7 +224,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
int
-Base2::decrypt( Block& block, const char *passphrase )
+Base2::decrypt( Block& block, const TQString& passphrase )
{
int index, index2;
int exitStatus = 0;
@@ -294,7 +294,7 @@ Base2::decrypt( Block& block, const char *passphrase )
block.setRequiredUserId( error.mid(index, index2 - index) );
//kdDebug(5100) << "Base: key needed is \"" << block.requiredUserId() << "\"!\n";
- if((passphrase != 0) && (error.find("Bad pass phrase") != -1))
+ if ((!passphrase.isNull()) && (error.find("Bad pass phrase") != -1))
{
errMsg = i18n("Bad passphrase; could not decrypt.");
kdDebug(5100) << "Base: passphrase is bad" << endl;
@@ -573,7 +573,7 @@ Base2::secretKeys( const TQStringList & patterns )
int
-Base2::signKey(const KeyID& keyID, const char *passphrase)
+Base2::signKey(const KeyID& keyID, const TQString& passphrase)
{
TQCString cmd;
int exitStatus = 0;