From 6492b716b372d0f929f98a2965e00e10a0355204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 30 Nov 2018 16:17:09 +0100 Subject: Improved previous commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko Signed-off-by: Michele Calgaro --- libkpgp/kpgpbase.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'libkpgp/kpgpbase.h') diff --git a/libkpgp/kpgpbase.h b/libkpgp/kpgpbase.h index 3f99073a4..1dc0acf59 100644 --- a/libkpgp/kpgpbase.h +++ b/libkpgp/kpgpbase.h @@ -45,10 +45,10 @@ public: /** Encrypts and signs the message with the given keys. */ virtual int encsign( Block& , const KeyIDList& , - const TQString& = 0) { return OK; } + const TQString& = TQString::null) { return OK; } /** Decrypts the message. */ - virtual int decrypt( Block& , const TQString& = 0) { return OK; } + virtual int decrypt( Block& , const TQString& = TQString::null) { return OK; } /** Verifies the message. */ virtual int verify( Block& block ) { return decrypt( block, 0 ); } @@ -86,9 +86,9 @@ public: protected: - virtual int run( const char *cmd, const TQString& passphrase = 0, + virtual int run( const char *cmd, const TQString &passphrase = TQString::null, bool onlyReadFromPGP = false ); - virtual int runGpg( const char *cmd, const TQString& passphrase = 0, + virtual int runGpg( const char *cmd, const TQString &passphrase = TQString::null, 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 TQString& passphrase ); + virtual int clearsign( Block& block, const TQString &passphrase ); virtual int encsign( Block& block, const KeyIDList& recipients, - const TQString& passphrase = 0 ); - virtual int decrypt( Block& block, const TQString& passphrase = 0 ); + const TQString &passphrase = TQString::null ); + virtual int decrypt( Block& block, const TQString &passphrase = TQString::null ); 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 TQString& 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 TQString& passphrase ); + virtual int clearsign( Block& block, const TQString &passphrase ); virtual int encsign( Block& block, const KeyIDList& recipients, - const TQString& passphrase = 0 ); - virtual int decrypt( Block& block, const TQString& passphrase = 0 ); + const TQString &passphrase = TQString::null ); + virtual int decrypt( Block& block, const TQString &passphrase = TQString::null ); 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 TQString& 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 TQString& passphrase ); + virtual int clearsign( Block& block, const TQString &passphrase ); virtual int encsign( Block& block, const KeyIDList& recipients, - const TQString& passphrase = 0 ); - virtual int decrypt( Block& block, const TQString& passphrase = 0 ); + const TQString &passphrase = TQString::null ); + virtual int decrypt( Block& block, const TQString &passphrase = TQString::null ); 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 TQString& 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 TQString& passphrase = 0 ); + virtual int decrypt( Block& block, const TQString &passphrase = TQString::null ); virtual int verify( Block& block ) { return decrypt( block, 0 ); } virtual Key* readPublicKey( const KeyID& keyID, -- cgit v1.2.1