1 files changed, 10 insertions, 11 deletions
diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h
index 8442e3c3..26f56cc8 100644
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@@ -36,7 +36,7 @@
 #include <kdialogbase.h>
 
 #include "kpgpkey.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQLineEdit;
 class TQCursor;
@@ -78,7 +78,7 @@ enum Result
 class Base;
 class Block;
 
-class KDE_EXPORT Module
+class TDE_EXPORT Module
 {
   friend class Block;
 
@@ -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
@@ -332,7 +332,7 @@ private:
   KeyIDList getEncryptionKeys( const TQString& person );
 
   /** Set pass phrase */
-  bool setPassPhrase(const char* pass);
+  bool setPassPhrase(const TQString &pass);
 
   /** test if the PGP executable is found and if there is a passphrase
       set or given. Returns:
@@ -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(); }
@@ -431,8 +431,7 @@ private:
   bool mSecretKeysCached : 1; // did we already read the secret keys?
 
   bool storePass : 1;
-  char * passphrase;
-  size_t passphrase_buffer_len;
+  TQString passphrase;
 
   TQString errMsg;