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

1 files changed, 7 insertions, 6 deletions

diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index 4c8587be3..f02cca901 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -19,11 +19,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -55,6 +55,7 @@ class IdentityManager : public ConfigManager, public DCOPObject
 #undef IdentityManager
 {
   Q_OBJECT
+//  TQ_OBJECT
   K_DCOP
 
 public:
@@ -65,7 +66,7 @@ public:
    * This means in particular that if there is no identity configured,
    * the default identity created here will not be saved.
    */
-  IdentityManager( bool readonly = false, TQObject * parent=0, const char * name=0 );
+  IdentityManager( bool readonly = false, TQObject * tqparent=0, const char * name=0 );
   virtual ~IdentityManager();
 
 public:
@@ -101,7 +102,7 @@ public:
   **/
   const Identity & identityForAddress( const TQString & addresses ) const;
 
-  /** @return true if @p addressList tqcontains any of our addresses,
+  /** @return true if @p addressList contains any of our addresses,
       false otherwise.
       @see #identityForAddress
   **/
@@ -177,7 +178,7 @@ public:
   Identity & newFromScratch( const TQString & name );
   Identity & newFromControlCenter( const TQString & name );
   Identity & newFromExisting( const Identity & other,
-				const TQString & name=TQString::null );
+				const TQString & name=TQString() );
 
   /** Returns the list of all email addresses (only name@host) from all identities */
   TQStringList allEmails() const;