Adapted to new KPasswordEdit::password() signature.

This relates to bug 2961.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 19 insertions, 19 deletions

diff --git a/libkpgp/kpgpbase.h b/libkpgp/kpgpbase.h
index 14f849cc8..3f99073a4 100644
--- a/libkpgp/kpgpbase.h
+++ b/libkpgp/kpgpbase.h
@@ -41,14 +41,14 @@ public:
   virtual int encrypt( Block& , const KeyIDList& ) { return OK; }
 
   /** Clearsigns the message with the currently set key. */
-  virtual int clearsign( Block& , const char *) { return OK; }
+  virtual int clearsign( Block& , const TQString& ) { return OK; }
 
   /** Encrypts and signs the message with the given keys. */
   virtual int encsign( Block& , const KeyIDList& ,
-                      const char * = 0) { return OK; }
+                      const TQString& = 0) { return OK; }
 
   /** Decrypts the message. */
-  virtual int decrypt( Block& , const char * = 0) { return OK; }
+  virtual int decrypt( Block& , const TQString& = 0) { return OK; }
 
   /** Verifies the message. */
   virtual int verify( Block& block ) { return decrypt( block, 0 ); }
@@ -77,7 +77,7 @@ public:
 
   /** Signs the given key with the currently set user key. This is currently
       not implemented. */
-  virtual int signKey(const KeyID& , const char *) { return OK; }
+  virtual int signKey(const KeyID& , const TQString& ) { return OK; }
 
 
   /** Returns an error message if an error occurred during the last
@@ -86,9 +86,9 @@ public:
 
 
 protected:
-  virtual int run( const char *cmd, const char *passphrase = 0,
+  virtual int run( const char *cmd, const TQString& passphrase = 0,
                    bool onlyReadFromPGP = false );
-  virtual int runGpg( const char *cmd, const char *passphrase = 0,
+  virtual int runGpg( const char *cmd, const TQString& passphrase = 0,
                       bool onlyReadFromGnuPG = false );
   virtual void clear();
 
@@ -115,10 +115,10 @@ public:
   virtual ~Base2();
 
   virtual int encrypt( Block& block, const KeyIDList& recipients );
-  virtual int clearsign( Block& block, const char *passphrase );
+  virtual int clearsign( Block& block, const TQString& passphrase );
   virtual int encsign( Block& block, const KeyIDList& recipients,
-                       const char *passphrase = 0 );
-  virtual int decrypt( Block& block, const char *passphrase = 0 );
+                       const TQString& passphrase = 0 );
+  virtual int decrypt( Block& block, const TQString& passphrase = 0 );
   virtual int verify( Block& block ) { return decrypt( block, 0 ); }
 
   virtual Key* readPublicKey( const KeyID& keyID,
@@ -127,7 +127,7 @@ public:
   virtual KeyList publicKeys( const TQStringList & patterns = TQStringList() );
   virtual KeyList secretKeys( const TQStringList & patterns = TQStringList() );
   virtual TQCString getAsciiPublicKey( const KeyID& keyID );
-  virtual int signKey( const KeyID& keyID, const char *passphrase );
+  virtual int signKey( const KeyID& keyID, const TQString& passphrase );
 
 protected:
   KeyList doGetPublicKeys( const TQCString & cmd,
@@ -147,10 +147,10 @@ public:
   virtual ~BaseG();
 
   virtual int encrypt( Block& block, const KeyIDList& recipients );
-  virtual int clearsign( Block& block, const char *passphrase );
+  virtual int clearsign( Block& block, const TQString& passphrase );
   virtual int encsign( Block& block, const KeyIDList& recipients,
-                       const char *passphrase = 0 );
-  virtual int decrypt( Block& block, const char *passphrase = 0 );
+                       const TQString& passphrase = 0 );
+  virtual int decrypt( Block& block, const TQString& passphrase = 0 );
   virtual int verify( Block& block ) { return decrypt( block, 0 ); }
 
   virtual Key* readPublicKey( const KeyID& keyID,
@@ -159,7 +159,7 @@ public:
   virtual KeyList publicKeys( const TQStringList & patterns = TQStringList() );
   virtual KeyList secretKeys( const TQStringList & patterns = TQStringList() );
   virtual TQCString getAsciiPublicKey( const KeyID& keyID );
-  virtual int signKey( const KeyID& keyID, const char *passphrase );
+  virtual int signKey( const KeyID& keyID, const TQString& passphrase );
 
 private:
   Key* parseKeyData( const TQCString& output, int& offset, Key* key = 0 );
@@ -175,10 +175,10 @@ public:
   virtual ~Base5();
 
   virtual int encrypt( Block& block, const KeyIDList& recipients );
-  virtual int clearsign( Block& block, const char *passphrase );
+  virtual int clearsign( Block& block, const TQString& passphrase );
   virtual int encsign( Block& block, const KeyIDList& recipients,
-                       const char *passphrase = 0 );
-  virtual int decrypt( Block& block, const char *passphrase = 0 );
+                       const TQString& passphrase = 0 );
+  virtual int decrypt( Block& block, const TQString& passphrase = 0 );
   virtual int verify( Block& block ) { return decrypt( block, 0 ); }
 
   virtual Key* readPublicKey( const KeyID& keyID,
@@ -187,7 +187,7 @@ public:
   virtual KeyList publicKeys( const TQStringList & patterns = TQStringList() );
   virtual KeyList secretKeys( const TQStringList & patterns = TQStringList() );
   virtual TQCString getAsciiPublicKey( const KeyID& keyID );
-  virtual int signKey( const KeyID& keyID, const char *passphrase );
+  virtual int signKey( const KeyID& keyID, const TQString& passphrase );
 
 private:
   Key* parseKeyData( const TQCString& output, int& offset, Key* key = 0 );
@@ -204,7 +204,7 @@ public:
   Base6();
   virtual ~Base6();
 
-  virtual int decrypt( Block& block, const char *passphrase = 0 );
+  virtual int decrypt( Block& block, const TQString& passphrase = 0 );
   virtual int verify( Block& block ) { return decrypt( block, 0 ); }
 
   virtual Key* readPublicKey( const KeyID& keyID,