summaryrefslogtreecommitdiffstats
path: root/libkpgp/kpgpbaseG.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
commit1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch)
treef2defe163a805a9e34a2142dfde4cdb5e49241e7 /libkpgp/kpgpbaseG.cpp
parent67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff)
downloadtdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz
tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkpgp/kpgpbaseG.cpp')
-rw-r--r--libkpgp/kpgpbaseG.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp
index d9adb11a2..b04b31bf2 100644
--- a/libkpgp/kpgpbaseG.cpp
+++ b/libkpgp/kpgpbaseG.cpp
@@ -40,7 +40,7 @@ BaseG::BaseG()
runGpg( "--version", 0 );
int eol = output.tqfind( '\n' );
if( eol > 0 ) {
- int pos = output.findRev( ' ', eol - 1 );
+ int pos = output.tqfindRev( ' ', eol - 1 );
if( pos != -1 ) {
mVersion = output.mid( pos + 1, eol - pos - 1 );
kdDebug(5100) << "found GnuPG " << mVersion << endl;
@@ -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.")
- .arg( badkeys.data() );
+ .tqarg( 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.")
- .arg( badkeys.data() );
+ .tqarg( badkeys.data() );
status |= MISSINGKEY;
status |= ERROR;
}
@@ -262,8 +262,8 @@ BaseG::decrypt( Block& block, const char *passphrase )
else
{
// Search backwards the user ID of the needed key
- index2 = error.findRev('"', index) - 1;
- index = error.findRev(" \"", index2) + 7;
+ index2 = error.tqfindRev('"', index) - 1;
+ index = error.tqfindRev(" \"", index2) + 7;
// The conversion from UTF8 is necessary because gpg stores and
// prints user IDs in UTF8
block.setRequiredUserId( TQString::fromUtf8( error.mid( index, index2 - index + 1 ) ) );
@@ -332,7 +332,7 @@ BaseG::decrypt( Block& block, const char *passphrase )
// get the primary user ID of the signer
index = error.tqfind('"',index);
index2 = error.tqfind('\n',index+1);
- index2 = error.findRev('"', index2-1);
+ index2 = error.tqfindRev('"', index2-1);
block.setSignatureUserId( error.mid( index+1, index2-index-1 ) );
}
else if( error.tqfind("BAD signature", index) != -1 )
@@ -342,7 +342,7 @@ BaseG::decrypt( Block& block, const char *passphrase )
// get the primary user ID of the signer
index = error.tqfind('"',index);
index2 = error.tqfind('\n',index+1);
- index2 = error.findRev('"', index2-1);
+ index2 = error.tqfindRev('"', index2-1);
block.setSignatureUserId( error.mid( index+1, index2-index-1 ) );
}
else if( error.tqfind("Can't find the right public key", index) != -1 )