From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 13 Apr 2011 00:46:47 +0000
Subject: Initial conversion of kdepim to TQt This will probably require some
 tweaking before it will build under Qt4, however Qt3 builds are OK.  Any
 alterations this commit makes to kdepim behaviour under Qt3 are unintentional
 and should be fixed.

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 libkpgp/kpgp.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'libkpgp/kpgp.h')

diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h
index ec937015..da6c02e1 100644
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@@ -258,7 +258,7 @@ public:
       corresponding key is selected.
   */
   KeyID selectSecretKey( const TQString& title,
-                         const TQString& text = TQString::null,
+                         const TQString& text = TQString(),
                          const KeyID& keyId = KeyID() );
 
   /** Shows a key selection dialog with all public keys and the given title
@@ -268,9 +268,9 @@ public:
       <em>mode</em> specifies which keys can be selected.
   */
   KeyID selectPublicKey( const TQString& title,
-                         const TQString& text = TQString::null,
+                         const TQString& text = TQString(),
                          const KeyID& oldKeyId = KeyID(),
-                         const TQString& address = TQString::null,
+                         const TQString& address = TQString(),
                          const unsigned int allowedKeys = AllKeys );
 
   /** Shows a key selection dialog with all public keys and the given title
@@ -280,9 +280,9 @@ public:
       <em>mode</em> specifies which keys can be selected.
   */
   KeyIDList selectPublicKeys( const TQString& title,
-                              const TQString& text = TQString::null,
+                              const TQString& text = TQString(),
                               const KeyIDList& oldKeyIds = KeyIDList(),
-                              const TQString& address = TQString::null,
+                              const TQString& address = TQString(),
                               const unsigned int allowedKeys = AllKeys );
 
   // FIXME: key management
@@ -308,7 +308,7 @@ public:
 
   /** Parses the given message and splits it into OpenPGP blocks and
       Non-OpenPGP blocks.
-      Returns TRUE if the message tqcontains at least one OpenPGP block and
+      Returns TRUE if the message contains at least one OpenPGP block and
       FALSE otherwise.
       The format is then:
       <pre>
@@ -356,7 +356,7 @@ private:
    */
   KeyID selectKey( const KeyList& keys,
                    const TQString& title,
-                   const TQString& text = TQString::null,
+                   const TQString& text = TQString(),
                    const KeyID& keyId = KeyID(),
                    const unsigned int allowedKeys = AllKeys );
 
@@ -364,7 +364,7 @@ private:
    */
   KeyIDList selectKeys( const KeyList& keys,
                         const TQString& title,
-                        const TQString& text = TQString::null,
+                        const TQString& text = TQString(),
                         const KeyIDList& keyIds = KeyIDList(),
                         const unsigned int allowedKeys = AllKeys );
 
@@ -375,7 +375,7 @@ private:
   KeyID selectKey( bool& rememberChoice,
                    const KeyList& keys,
                    const TQString& title,
-                   const TQString& text = TQString::null,
+                   const TQString& text = TQString(),
                    const KeyID& keyId = KeyID(),
                    const unsigned int allowedKeys = AllKeys );
 
@@ -386,7 +386,7 @@ private:
   KeyIDList selectKeys( bool& rememberChoice,
                         const KeyList& keys,
                         const TQString& title,
-                        const TQString& text = TQString::null,
+                        const TQString& text = TQString(),
                         const KeyIDList& keyIds = KeyIDList(),
                         const unsigned int allowedKeys = AllKeys );
 
-- 
cgit v1.2.3