summaryrefslogtreecommitdiffstats
path: root/libkpgp
diff options
context:
space:
mode:
Diffstat (limited to 'libkpgp')
-rw-r--r--libkpgp/kpgp.cpp24
-rw-r--r--libkpgp/kpgp.h12
-rw-r--r--libkpgp/kpgpbase2.cpp6
-rw-r--r--libkpgp/kpgpbaseG.cpp4
4 files changed, 23 insertions, 23 deletions
diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp
index bd4193bf..e535abe3 100644
--- a/libkpgp/kpgp.cpp
+++ b/libkpgp/kpgp.cpp
@@ -73,7 +73,7 @@ Module::~Module()
writeAddressData();
if (kpgpObject == this) kpgpObject = kpgpod.setObject( Module::kpgpObject, 0, false );
- clear(TRUE);
+ clear(true);
delete config;
delete pgp;
}
@@ -268,7 +268,7 @@ Module::decrypt( Block& block )
// loop as long as the user enters a wrong passphrase and doesn't abort
// everything ready
if( prepare( true, &block ) != 1 )
- return FALSE;
+ return false;
// ok now try to decrypt the message.
retval = pgp->decrypt( block, passphrase );
// loop on bad passphrase
@@ -678,7 +678,7 @@ Module::signKey(const KeyID& keyId)
if (0 == pgp) assignPGPBase();
if( prepare( true ) != 1 )
- return FALSE;
+ return false;
if(pgp->signKey(keyId, passphrase) & ERROR)
{
errMsg = pgp->lastErrorMessage();
@@ -855,7 +855,7 @@ Module::changePassPhrase()
{
//FIXME...
KMessageBox::information(0,i18n("This feature is\nstill missing"));
- return FALSE;
+ return false;
}
void
@@ -1310,7 +1310,7 @@ Module::checkForPGP(void)
int index = 0;
int lastindex = -1;
- havePgp=FALSE;
+ havePgp=false;
path = getenv("PATH");
while((index = path.find(":",lastindex+1)) != -1)
@@ -1323,7 +1323,7 @@ Module::checkForPGP(void)
TQStrListIterator it(pSearchPaths);
- haveGpg=FALSE;
+ haveGpg=false;
// lets try gpg
for ( it.toFirst() ; it.current() ; ++it )
@@ -1333,14 +1333,14 @@ Module::checkForPGP(void)
if ( !access( path, X_OK ) )
{
kdDebug(5100) << "Kpgp: gpg found" << endl;
- havePgp=TRUE;
- haveGpg=TRUE;
+ havePgp=true;
+ haveGpg=true;
break;
}
}
// search for pgp5.0
- havePGP5=FALSE;
+ havePGP5=false;
for ( it.toFirst() ; it.current() ; ++it )
{
path = (*it);
@@ -1348,8 +1348,8 @@ Module::checkForPGP(void)
if ( !access( path, X_OK ) )
{
kdDebug(5100) << "Kpgp: pgp 5 found" << endl;
- havePgp=TRUE;
- havePGP5=TRUE;
+ havePgp=true;
+ havePGP5=true;
break;
}
}
@@ -1363,7 +1363,7 @@ Module::checkForPGP(void)
if ( !access( path, X_OK ) )
{
kdDebug(5100) << "Kpgp: pgp 2 or 6 found" << endl;
- havePgp=TRUE;
+ havePgp=true;
break;
}
}
diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h
index bb4cc6fa..26f56cc8 100644
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@@ -198,8 +198,8 @@ public:
*/
Validity keyTrust( const TQString& userID );
- /** Returns TRUE if the given key is at least trusted marginally. Otherwise
- FALSE is returned.
+ /** Returns true if the given key is at least trusted marginally. Otherwise
+ false is returned.
*/
bool isTrusted( const KeyID& keyID );
@@ -231,7 +231,7 @@ public:
bool storePassPhrase(void) const;
/** clears everything from memory */
- void clear(const bool erasePassPhrase = FALSE);
+ void clear(const bool erasePassPhrase = false);
/** returns the last error that occurred */
const TQString lastErrorMsg(void) const;
@@ -308,8 +308,8 @@ public:
/** Parses the given message and splits it into OpenPGP blocks and
Non-OpenPGP blocks.
- Returns TRUE if the message contains at least one OpenPGP block and
- FALSE otherwise.
+ Returns true if the message contains at least one OpenPGP block and
+ false otherwise.
The format is then:
<pre>
1st Non-OpenPGP block
@@ -340,7 +340,7 @@ private:
0 (together with some warning message) if something is missing
-1 if the passphrase dialog was canceled
*/
- int prepare(bool needPassPhrase=FALSE, Block* block = 0 );
+ int prepare(bool needPassPhrase=false, Block* block = 0 );
/** cleanup passphrase if it should not be stored. */
void cleanupPass() { if (!storePass) wipePassPhrase(); }
diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp
index 255701a6..7ff0cbaf 100644
--- a/libkpgp/kpgpbase2.cpp
+++ b/libkpgp/kpgpbase2.cpp
@@ -115,7 +115,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
if(!recipients.isEmpty())
{
int index = 0;
- bool bad = FALSE;
+ bool bad = false;
unsigned int num = 0;
TQCString badkeys = "";
if (error.find("Cannot find the public key") != -1)
@@ -125,7 +125,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
while((index = error.find("Cannot find the public key",index))
!= -1)
{
- bad = TRUE;
+ bad = true;
index = error.find('\'',index);
int index2 = error.find('\'',index+1);
if (num++)
@@ -156,7 +156,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
while((index = error.find("skipping userid",index))
!= -1)
{
- bad = TRUE;
+ bad = true;
int index2 = error.find('\n',index+16);
if (num++)
badkeys += ", ";
diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp
index 2e5c916f..cc4e33d5 100644
--- a/libkpgp/kpgpbaseG.cpp
+++ b/libkpgp/kpgpbaseG.cpp
@@ -128,7 +128,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
if(!recipients.isEmpty())
{
int index = 0;
- bool bad = FALSE;
+ bool bad = false;
unsigned int num = 0;
TQCString badkeys = "";
// Examples:
@@ -140,7 +140,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
// (untrusted key, 23456789 is the key Id of the encryption sub key)
while((index = error.find("skipped: ",index)) != -1)
{
- bad = TRUE;
+ bad = true;
index = error.find('\'',index);
int index2 = error.find('\'',index+1);
badkeys += error.mid(index, index2-index+1) + ", ";
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-19 06:02:52 +0000