Initial TQt conversion

36 files changed, 467 insertions, 467 deletions

diff --git a/sip/kabc/address.sip b/sip/kabc/address.sip
index d15d169..f78527d 100644
--- a/sip/kabc/address.sip
+++ b/sip/kabc/address.sip
@@ -34,10 +34,10 @@ class Address
 
 
 public:
-    typedef QValueList<KABC::Address> List;
+    typedef TQValueList<KABC::Address> List;
 
 %If ( KDE_3_1_0 -  )
-    typedef QValueList<int> TypeList;
+    typedef TQValueList<int> TypeList;
 %End
 
 
@@ -62,79 +62,79 @@ public:
 
     bool                 isEmpty () const;
     void                 clear ();
-    void                 setId (const QString&);
-    QString              id () const;
+    void                 setId (const TQString&);
+    TQString              id () const;
     void                 setType (int);
     int                  type () const;
 
 %If ( KDE_3_1_0 -  )
-    QString              typeLabel () const;
+    TQString              typeLabel () const;
 %End
 
-    void                 setPostOfficeBox (const QString&);
-    QString              postOfficeBox () const;
+    void                 setPostOfficeBox (const TQString&);
+    TQString              postOfficeBox () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       postOfficeBoxLabel ();
+    static TQString       postOfficeBoxLabel ();
 %End
 
-    void                 setExtended (const QString&);
-    QString              extended () const;
+    void                 setExtended (const TQString&);
+    TQString              extended () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       extendedLabel ();
+    static TQString       extendedLabel ();
 %End
 
-    void                 setStreet (const QString&);
-    QString              street () const;
+    void                 setStreet (const TQString&);
+    TQString              street () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       streetLabel ();
+    static TQString       streetLabel ();
 %End
 
-    void                 setLocality (const QString&);
-    QString              locality () const;
+    void                 setLocality (const TQString&);
+    TQString              locality () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       localityLabel ();
+    static TQString       localityLabel ();
 %End
 
-    void                 setRegion (const QString&);
-    QString              region () const;
+    void                 setRegion (const TQString&);
+    TQString              region () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       regionLabel ();
+    static TQString       regionLabel ();
 %End
 
-    void                 setPostalCode (const QString&);
-    QString              postalCode () const;
+    void                 setPostalCode (const TQString&);
+    TQString              postalCode () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       postalCodeLabel ();
+    static TQString       postalCodeLabel ();
 %End
 
-    void                 setCountry (const QString&);
-    QString              country () const;
+    void                 setCountry (const TQString&);
+    TQString              country () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       countryLabel ();
+    static TQString       countryLabel ();
 %End
 
-    void                 setLabel (const QString&);
-    QString              label () const;
+    void                 setLabel (const TQString&);
+    TQString              label () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       labelLabel ();
+    static TQString       labelLabel ();
     static KABC::Address::TypeList typeList ();
-    static QString       typeLabel (int);
+    static TQString       typeLabel (int);
 %End
 
     void                 dump () const;
 
 %If ( KDE_3_2_0 -  )
-    QString              formattedAddress (const QString& = QString ::null , const QString& = QString ::null ) const;
-    static QString       countryToISO (const QString&);
-    static QString       ISOtoCountry (const QString&);
+    TQString              formattedAddress (const TQString& = TQString ::null , const TQString& = TQString ::null ) const;
+    static TQString       countryToISO (const TQString&);
+    static TQString       ISOtoCountry (const TQString&);
 %End
 
 
@@ -142,8 +142,8 @@ public:
 
 
 %If ( KDE_3_1_0 -  )
-//igx QDataStream&         operator << (QDataStream&, const KABC::Address&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Address&);
+//igx TQDataStream&         operator << (TQDataStream&, const KABC::Address&);
+//igx TQDataStream&         operator >> (TQDataStream&, KABC::Address&);
 %End
 
 };  // namespace KABC
diff --git a/sip/kabc/addressbook.sip b/sip/kabc/addressbook.sip
index a3fa824..563be99 100644
--- a/sip/kabc/addressbook.sip
+++ b/sip/kabc/addressbook.sip
@@ -26,7 +26,7 @@
 namespace KABC
 {
 
-class AddressBook : QObject
+class AddressBook : TQObject
 {
 %TypeHeaderCode
 #include <resource.h>
@@ -44,7 +44,7 @@ public:
                          AddressBook ();
 
 %If ( KDE_3_2_0 -  )
-                         AddressBook (const QString&);
+                         AddressBook (const TQString&);
 %End
 
     KABC::Ticket*        requestSaveTicket (KABC::Resource* = 0);
@@ -74,29 +74,29 @@ public:
     void                 removeAddressee (const KABC::Addressee&);
 //ig     void                 removeAddressee (const KABC::AddressBook::Iterator&);
 //igx     KABC::AddressBook::Iterator find (const Addressee&);
-    KABC::Addressee      findByUid (const QString&);
+    KABC::Addressee      findByUid (const TQString&);
 
 %If ( KDE_3_2_0 -  )
     KABC::Addressee::List allAddressees ();
 %End
 
-    KABC::Addressee::List findByName (const QString&);
-    KABC::Addressee::List findByEmail (const QString&);
-    KABC::Addressee::List findByCategory (const QString&);
-    virtual QString      identifier ();
+    KABC::Addressee::List findByName (const TQString&);
+    KABC::Addressee::List findByEmail (const TQString&);
+    KABC::Addressee::List findByCategory (const TQString&);
+    virtual TQString      identifier ();
 
 %If ( KDE_3_1_0 -  )
     KABC::Field::List    fields (int = KABC ::Field ::All );
-    bool                 addCustomField (const QString&, int = KABC ::Field ::All , const QString& = QString ::null , const QString& = QString ::null );
+    bool                 addCustomField (const TQString&, int = KABC ::Field ::All , const TQString& = TQString ::null , const TQString& = TQString ::null );
 %End
 
     bool                 addResource (KABC::Resource*);
 
 %If ( KDE_3_1_0 -  )
     bool                 removeResource (KABC::Resource*);
-    QPtrList<KABC::Resource> resources ();
+    TQPtrList<KABC::Resource> resources ();
     void                 setErrorHandler (KABC::ErrorHandler*);
-    void                 error (const QString&);
+    void                 error (const TQString&);
     void                 cleanUp ();
 %End
 
@@ -126,8 +126,8 @@ protected slots:
 %If ( KDE_3_2_0 -  )
     void                 resourceLoadingFinished (KABC::Resource*);
     void                 resourceSavingFinished (KABC::Resource*);
-    void                 resourceLoadingError (KABC::Resource*, const QString&);
-    void                 resourceSavingError (KABC::Resource*, const QString&);
+    void                 resourceLoadingError (KABC::Resource*, const TQString&);
+    void                 resourceSavingError (KABC::Resource*, const TQString&);
 %End
 
 
@@ -149,15 +149,15 @@ protected:
 
 
 %If ( KDE_3_1_0 -  )
-//igx QDataStream&         operator << (QDataStream&, const KABC::AddressBook&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::AddressBook&);
+//igx TQDataStream&         operator << (TQDataStream&, const KABC::AddressBook&);
+//igx TQDataStream&         operator >> (TQDataStream&, KABC::AddressBook&);
 %End
 
 };  // namespace KABC
 
 
 
-%MappedType QPtrList<KABC::Resource>
+%MappedType TQPtrList<KABC::Resource>
 //converts a Python list of KABC::Resource
 {
 %TypeHeaderCode
@@ -177,7 +177,7 @@ protected:
 
     // Get it.
 
-    QPtrList<KABC::Resource> *cpplist = (QPtrList<KABC::Resource> *)sipCpp;
+    TQPtrList<KABC::Resource> *cpplist = (TQPtrList<KABC::Resource> *)sipCpp;
     KABC::Resource *cpp;
     PyObject *inst;
 
@@ -199,7 +199,7 @@ protected:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    QPtrList<KABC::Resource> *cpplist = new QPtrList<KABC::Resource>;
+    TQPtrList<KABC::Resource> *cpplist = new TQPtrList<KABC::Resource>;
 
     PyObject *elem;
     KABC::Resource *cpp;
diff --git a/sip/kabc/addressee.sip b/sip/kabc/addressee.sip
index 803b4d2..c3f62a1 100644
--- a/sip/kabc/addressee.sip
+++ b/sip/kabc/addressee.sip
@@ -34,10 +34,10 @@ class Addressee
 
 
 public:
-//ig     typedef QValueList<KABC::Addressee> List;
+//ig     typedef TQValueList<KABC::Addressee> List;
 
 %If ( KDE_3_4_2 -  )
-    typedef QMap<QString,KABC::Addressee> Map;
+    typedef TQMap<TQString,KABC::Addressee> Map;
 %End
 
                          Addressee ();
@@ -49,204 +49,204 @@ public:
 %End
 
     bool                 isEmpty () const;
-    void                 setUid (const QString&);
-    QString              uid () const;
+    void                 setUid (const TQString&);
+    TQString              uid () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       uidLabel ();
+    static TQString       uidLabel ();
 %End
 
-    void                 setName (const QString&);
-    QString              name () const;
+    void                 setName (const TQString&);
+    TQString              name () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       nameLabel ();
+    static TQString       nameLabel ();
 %End
 
-    void                 setFormattedName (const QString&);
-    QString              formattedName () const;
+    void                 setFormattedName (const TQString&);
+    TQString              formattedName () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       formattedNameLabel ();
+    static TQString       formattedNameLabel ();
 %End
 
-    void                 setFamilyName (const QString&);
-    QString              familyName () const;
+    void                 setFamilyName (const TQString&);
+    TQString              familyName () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       familyNameLabel ();
+    static TQString       familyNameLabel ();
 %End
 
-    void                 setGivenName (const QString&);
-    QString              givenName () const;
+    void                 setGivenName (const TQString&);
+    TQString              givenName () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       givenNameLabel ();
+    static TQString       givenNameLabel ();
 %End
 
-    void                 setAdditionalName (const QString&);
-    QString              additionalName () const;
+    void                 setAdditionalName (const TQString&);
+    TQString              additionalName () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       additionalNameLabel ();
+    static TQString       additionalNameLabel ();
 %End
 
-    void                 setPrefix (const QString&);
-    QString              prefix () const;
+    void                 setPrefix (const TQString&);
+    TQString              prefix () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       prefixLabel ();
+    static TQString       prefixLabel ();
 %End
 
-    void                 setSuffix (const QString&);
-    QString              suffix () const;
+    void                 setSuffix (const TQString&);
+    TQString              suffix () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       suffixLabel ();
+    static TQString       suffixLabel ();
 %End
 
-    void                 setNickName (const QString&);
-    QString              nickName () const;
+    void                 setNickName (const TQString&);
+    TQString              nickName () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       nickNameLabel ();
+    static TQString       nickNameLabel ();
 %End
 
-    void                 setBirthday (const QDateTime&);
-    QDateTime            birthday () const;
+    void                 setBirthday (const TQDateTime&);
+    TQDateTime            birthday () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       birthdayLabel ();
-    static QString       homeAddressStreetLabel ();
-    static QString       homeAddressLocalityLabel ();
-    static QString       homeAddressRegionLabel ();
-    static QString       homeAddressPostalCodeLabel ();
-    static QString       homeAddressCountryLabel ();
-    static QString       homeAddressLabelLabel ();
-    static QString       businessAddressStreetLabel ();
-    static QString       businessAddressLocalityLabel ();
-    static QString       businessAddressRegionLabel ();
-    static QString       businessAddressPostalCodeLabel ();
-    static QString       businessAddressCountryLabel ();
-    static QString       businessAddressLabelLabel ();
-    static QString       homePhoneLabel ();
-    static QString       businessPhoneLabel ();
-    static QString       mobilePhoneLabel ();
-    static QString       homeFaxLabel ();
-    static QString       businessFaxLabel ();
-    static QString       carPhoneLabel ();
-    static QString       isdnLabel ();
-    static QString       pagerLabel ();
-    static QString       emailLabel ();
-%End
-
-    void                 setMailer (const QString&);
-    QString              mailer () const;
+    static TQString       birthdayLabel ();
+    static TQString       homeAddressStreetLabel ();
+    static TQString       homeAddressLocalityLabel ();
+    static TQString       homeAddressRegionLabel ();
+    static TQString       homeAddressPostalCodeLabel ();
+    static TQString       homeAddressCountryLabel ();
+    static TQString       homeAddressLabelLabel ();
+    static TQString       businessAddressStreetLabel ();
+    static TQString       businessAddressLocalityLabel ();
+    static TQString       businessAddressRegionLabel ();
+    static TQString       businessAddressPostalCodeLabel ();
+    static TQString       businessAddressCountryLabel ();
+    static TQString       businessAddressLabelLabel ();
+    static TQString       homePhoneLabel ();
+    static TQString       businessPhoneLabel ();
+    static TQString       mobilePhoneLabel ();
+    static TQString       homeFaxLabel ();
+    static TQString       businessFaxLabel ();
+    static TQString       carPhoneLabel ();
+    static TQString       isdnLabel ();
+    static TQString       pagerLabel ();
+    static TQString       emailLabel ();
+%End
+
+    void                 setMailer (const TQString&);
+    TQString              mailer () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       mailerLabel ();
+    static TQString       mailerLabel ();
 %End
 
     void                 setTimeZone (const KABC::TimeZone&);
     KABC::TimeZone       timeZone () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       timeZoneLabel ();
+    static TQString       timeZoneLabel ();
 %End
 
     void                 setGeo (const KABC::Geo&);
     KABC::Geo            geo () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       geoLabel ();
+    static TQString       geoLabel ();
 %End
 
-    void                 setTitle (const QString&);
-    QString              title () const;
+    void                 setTitle (const TQString&);
+    TQString              title () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       titleLabel ();
+    static TQString       titleLabel ();
 %End
 
-    void                 setRole (const QString&);
-    QString              role () const;
+    void                 setRole (const TQString&);
+    TQString              role () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       roleLabel ();
+    static TQString       roleLabel ();
 %End
 
-    void                 setOrganization (const QString&);
-    QString              organization () const;
+    void                 setOrganization (const TQString&);
+    TQString              organization () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       organizationLabel ();
+    static TQString       organizationLabel ();
 %End
 
-    void                 setNote (const QString&);
-    QString              note () const;
+    void                 setNote (const TQString&);
+    TQString              note () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       noteLabel ();
+    static TQString       noteLabel ();
 %End
 
-    void                 setProductId (const QString&);
-    QString              productId () const;
+    void                 setProductId (const TQString&);
+    TQString              productId () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       productIdLabel ();
+    static TQString       productIdLabel ();
 %End
 
-    void                 setRevision (const QDateTime&);
-    QDateTime            revision () const;
+    void                 setRevision (const TQDateTime&);
+    TQDateTime            revision () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       revisionLabel ();
+    static TQString       revisionLabel ();
 %End
 
-    void                 setSortString (const QString&);
-    QString              sortString () const;
+    void                 setSortString (const TQString&);
+    TQString              sortString () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       sortStringLabel ();
+    static TQString       sortStringLabel ();
 %End
 
     void                 setUrl (const KURL&);
     KURL                 url () const;
 
 %If ( KDE_3_1_0 -  )
-    static QString       urlLabel ();
+    static TQString       urlLabel ();
     void                 setSecrecy (const KABC::Secrecy&);
     KABC::Secrecy        secrecy () const;
-    static QString       secrecyLabel ();
+    static TQString       secrecyLabel ();
     void                 setLogo (const KABC::Picture&);
     KABC::Picture        logo () const;
-    static QString       logoLabel ();
+    static TQString       logoLabel ();
     void                 setPhoto (const KABC::Picture&);
     KABC::Picture        photo () const;
-    static QString       photoLabel ();
+    static TQString       photoLabel ();
     void                 setSound (const KABC::Sound&);
     KABC::Sound          sound () const;
-    static QString       soundLabel ();
+    static TQString       soundLabel ();
     void                 setAgent (const KABC::Agent&);
     KABC::Agent          agent () const;
-    static QString       agentLabel ();
+    static TQString       agentLabel ();
 %End
 
-    void                 setNameFromString (const QString&);
-    QString              realName () const;
+    void                 setNameFromString (const TQString&);
+    TQString              realName () const;
 
 %If ( KDE_3_1_0 -  )
-    QString              assembledName () const;
+    TQString              assembledName () const;
 %End
 
-    QString              fullEmail (const QString& = QString ::null ) const;
-    void                 insertEmail (const QString&, bool = 0);
-    void                 removeEmail (const QString&);
-    QString              preferredEmail () const;
-    QStringList          emails () const;
+    TQString              fullEmail (const TQString& = TQString ::null ) const;
+    void                 insertEmail (const TQString&, bool = 0);
+    void                 removeEmail (const TQString&);
+    TQString              preferredEmail () const;
+    TQStringList          emails () const;
 
 %If ( KDE_3_4_2 -  )
-    void                 setEmails (const QStringList&);
+    void                 setEmails (const TQStringList&);
 %End
 
     void                 insertPhoneNumber (const KABC::PhoneNumber&);
@@ -258,20 +258,20 @@ public:
     KABC::PhoneNumber::List phoneNumbers (int) const;
 %End
 
-    KABC::PhoneNumber    findPhoneNumber (const QString&) const;
+    KABC::PhoneNumber    findPhoneNumber (const TQString&) const;
 
 %If ( KDE_3_1_0 -  )
     void                 insertKey (const KABC::Key&);
     void                 removeKey (const KABC::Key&);
-    KABC::Key            key (int, QString = QString ::null ) const;
+    KABC::Key            key (int, TQString = TQString ::null ) const;
     KABC::Key::List      keys () const;
 
 %If ( KDE_3_4_2 -  )
     void                 setKeys (const KABC::Key::List&);
 %End
 
-    KABC::Key::List      keys (int, QString = QString ::null ) const;
-    KABC::Key            findKey (const QString&) const;
+    KABC::Key::List      keys (int, TQString = TQString ::null ) const;
+    KABC::Key            findKey (const TQString&) const;
 %End
 
     void                 insertAddress (const KABC::Address&);
@@ -283,26 +283,26 @@ public:
     KABC::Address::List  addresses (int) const;
 %End
 
-    KABC::Address        findAddress (const QString&) const;
-    void                 insertCategory (const QString&);
-    void                 removeCategory (const QString&);
-    bool                 hasCategory (const QString&) const;
-    void                 setCategories (const QStringList&);
-    QStringList          categories () const;
-    void                 insertCustom (const QString&, const QString&, const QString&);
-    void                 removeCustom (const QString&, const QString&);
-    QString              custom (const QString&, const QString&) const;
-    void                 setCustoms (const QStringList&);
-    QStringList          customs () const;
+    KABC::Address        findAddress (const TQString&) const;
+    void                 insertCategory (const TQString&);
+    void                 removeCategory (const TQString&);
+    bool                 hasCategory (const TQString&) const;
+    void                 setCategories (const TQStringList&);
+    TQStringList          categories () const;
+    void                 insertCustom (const TQString&, const TQString&, const TQString&);
+    void                 removeCustom (const TQString&, const TQString&);
+    TQString              custom (const TQString&, const TQString&) const;
+    void                 setCustoms (const TQStringList&);
+    TQStringList          customs () const;
 
 %If ( KDE_3_1_0 -  )
-    static void          parseEmailAddress (const QString&, QString&, QString&);
+    static void          parseEmailAddress (const TQString&, TQString&, TQString&);
 %End
 
     void                 dump () const;
 
 %If ( KDE_3_1_0 -  )
-    QString              asString () const;
+    TQString              asString () const;
     void                 setResource (KABC::Resource*);
     KABC::Resource*      resource () const;
     void                 setChanged (bool);
@@ -324,8 +324,8 @@ public:
 
 
 %If ( KDE_3_1_0 -  )
-//igx QDataStream&         operator << (QDataStream&, const KABC::Addressee&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Addressee&);
+//igx TQDataStream&         operator << (TQDataStream&, const KABC::Addressee&);
+//igx TQDataStream&         operator >> (TQDataStream&, KABC::Addressee&);
 %End
 
 };  // namespace KABC
@@ -337,7 +337,7 @@ public:
 {
 %TypeHeaderCode
 #include <qvaluelist.h>
-//typedef QValueList<KABC::Addressee> List;
+//typedef TQValueList<KABC::Addressee> List;
 %End
 
 %ConvertFromTypeCode
@@ -349,11 +349,11 @@ public:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    QValueList<KABC::Addressee> *cpplist = (QValueList<KABC::Addressee> *)sipCpp;
+    TQValueList<KABC::Addressee> *cpplist = (TQValueList<KABC::Addressee> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    QValueList<KABC::Addressee>::Iterator it;
+    TQValueList<KABC::Addressee>::Iterator it;
     for( it = cpplist->begin(); it != cpplist->end(); ++it )
     {
         if (((inst = sipConvertFromNewType(new KABC::Addressee (*it), sipType_KABC_Addressee, NULL)) == NULL)
@@ -372,7 +372,7 @@ public:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    QValueList<KABC::Addressee> *cpplist = new QValueList<KABC::Addressee>;
+    TQValueList<KABC::Addressee> *cpplist = new TQValueList<KABC::Addressee>;
 
     PyObject *elem;
     KABC::Addressee *cpp;
@@ -404,7 +404,7 @@ public:
 {
 %TypeHeaderCode
 #include <qvaluelist.h>
-//typedef QValueList<KABC::Address> List;
+//typedef TQValueList<KABC::Address> List;
 %End
 
 %ConvertFromTypeCode
@@ -416,11 +416,11 @@ public:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    QValueList<KABC::Address> *cpplist = (QValueList<KABC::Address> *)sipCpp;
+    TQValueList<KABC::Address> *cpplist = (TQValueList<KABC::Address> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    QValueList<KABC::Address>::Iterator it;
+    TQValueList<KABC::Address>::Iterator it;
     for( it = cpplist->begin(); it != cpplist->end(); ++it )
     {
         if (((inst = sipConvertFromNewType(new KABC::Address (*it), sipType_KABC_Address, NULL)) == NULL)
@@ -439,7 +439,7 @@ public:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    QValueList<KABC::Address> *cpplist = new QValueList<KABC::Address>;
+    TQValueList<KABC::Address> *cpplist = new TQValueList<KABC::Address>;
 
     PyObject *elem;
     KABC::Address *cpp;
diff --git a/sip/kabc/addresseedialog.sip b/sip/kabc/addresseedialog.sip
index abfd6d2..388d4cc 100644
--- a/sip/kabc/addresseedialog.sip
+++ b/sip/kabc/addresseedialog.sip
@@ -26,7 +26,7 @@
 namespace KABC
 {
 
-class AddresseeItem : QListViewItem
+class AddresseeItem : TQListViewItem
 {
 %TypeHeaderCode
 #include <addresseedialog.h>
@@ -41,9 +41,9 @@ public:
         Email
     };
 
-                         AddresseeItem (QListView*, const KABC::Addressee&);
+                         AddresseeItem (TQListView*, const KABC::Addressee&);
     KABC::Addressee      addressee () const;
-    virtual QString      key (int, bool) const;
+    virtual TQString      key (int, bool) const;
 
 };  // class AddresseeItem
 
@@ -56,11 +56,11 @@ class AddresseeDialog : KDialogBase
 
 
 public:
-                         AddresseeDialog (QWidget* = 0, bool = 0);
+                         AddresseeDialog (TQWidget* = 0, bool = 0);
     KABC::Addressee      addressee ();
     KABC::Addressee::List addressees ();
-    static KABC::Addressee getAddressee (QWidget*);
-    static KABC::Addressee::List getAddressees (QWidget*);
+    static KABC::Addressee getAddressee (TQWidget*);
+    static KABC::Addressee::List getAddressees (TQWidget*);
 
 protected slots:
 
diff --git a/sip/kabc/addresslineedit.sip b/sip/kabc/addresslineedit.sip
index 54606e9..d8ed446 100644
--- a/sip/kabc/addresslineedit.sip
+++ b/sip/kabc/addresslineedit.sip
@@ -36,8 +36,8 @@ class AddressLineEdit : KLineEdit
 
 
 public:
-                         AddressLineEdit (QWidget*, bool = 1, const char* = 0);
-    virtual void         setFont (const QFont&);
+                         AddressLineEdit (TQWidget*, bool = 1, const char* = 0);
+    virtual void         setFont (const TQFont&);
 
 %If ( KDE_3_2_0 -  )
     static KConfig*      config ();
@@ -50,12 +50,12 @@ public slots:
 
 protected:
     virtual void         loadAddresses ();
-    void                 addAddress (const QString&);
-    virtual void         keyPressEvent (QKeyEvent*);
-    virtual void         dropEvent (QDropEvent*);
+    void                 addAddress (const TQString&);
+    virtual void         keyPressEvent (TQKeyEvent*);
+    virtual void         dropEvent (TQDropEvent*);
     virtual void         paste ();
-    virtual void         insert (const QString&);
-    virtual void         mouseReleaseEvent (QMouseEvent*);
+    virtual void         insert (const TQString&);
+    virtual void         mouseReleaseEvent (TQMouseEvent*);
     void                 doCompletion (bool);
 
 };  // class AddressLineEdit
diff --git a/sip/kabc/agent.sip b/sip/kabc/agent.sip
index 4aff028..5842970 100644
--- a/sip/kabc/agent.sip
+++ b/sip/kabc/agent.sip
@@ -37,21 +37,21 @@ class Agent
 
 public:
                          Agent ();
-                         Agent (const QString&);
+                         Agent (const TQString&);
                          Agent (KABC::Addressee*);
     bool                 operator == (const KABC::Agent&) const;
     bool                 operator != (const KABC::Agent&) const;
-    void                 setUrl (const QString&);
+    void                 setUrl (const TQString&);
     void                 setAddressee (KABC::Addressee*);
     bool                 isIntern () const;
-    QString              url () const;
+    TQString              url () const;
     KABC::Addressee*     addressee () const;
-    QString              asString () const;
+    TQString              asString () const;
 
 };  // class Agent
 
-//igx QDataStream&         operator << (QDataStream&, const KABC::Agent&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Agent&);
+//igx TQDataStream&         operator << (TQDataStream&, const KABC::Agent&);
+//igx TQDataStream&         operator >> (TQDataStream&, KABC::Agent&);
 };  // namespace KABC
 
 %End
diff --git a/sip/kabc/distributionlist.sip b/sip/kabc/distributionlist.sip
index a2bddbf..28f10c5 100644
--- a/sip/kabc/distributionlist.sip
+++ b/sip/kabc/distributionlist.sip
@@ -39,22 +39,22 @@ public:
     {
 
     public:
-        typedef QValueList<KABC::DistributionList::Entry> List;
+        typedef TQValueList<KABC::DistributionList::Entry> List;
                              Entry ();
-                             Entry (const KABC::Addressee&, const QString&);
+                             Entry (const KABC::Addressee&, const TQString&);
         KABC::Addressee      addressee;
-        QString              email;
+        TQString              email;
 
     };  // class Entry
 
 
 public:
-                         DistributionList (KABC::DistributionListManager*, const QString&);
-    void                 setName (const QString&);
-    QString              name () const;
-    void                 insertEntry (const KABC::Addressee&, const QString& = QString ::null );
-    void                 removeEntry (const KABC::Addressee&, const QString& = QString ::null );
-    QStringList          emails () const;
+                         DistributionList (KABC::DistributionListManager*, const TQString&);
+    void                 setName (const TQString&);
+    TQString              name () const;
+    void                 insertEntry (const KABC::Addressee&, const TQString& = TQString ::null );
+    void                 removeEntry (const KABC::Addressee&, const TQString& = TQString ::null );
+    TQStringList          emails () const;
     KABC::DistributionList::Entry::List entries () const;
 
 };  // class DistributionList
@@ -69,10 +69,10 @@ class DistributionListManager
 
 public:
                          DistributionListManager (KABC::AddressBook*);
-    KABC::DistributionList* list (const QString&);
+    KABC::DistributionList* list (const TQString&);
     void                 insert (KABC::DistributionList*);
     void                 remove (KABC::DistributionList*);
-    QStringList          listNames ();
+    TQStringList          listNames ();
     bool                 load ();
     bool                 save ();
 
@@ -81,7 +81,7 @@ public:
 
 %If ( KDE_3_1_0 -  )
 
-class DistributionListWatcher : QObject
+class DistributionListWatcher : TQObject
 {
 %TypeHeaderCode
 #include <distributionlist.h>
@@ -122,11 +122,11 @@ protected:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    QValueList<KABC::DistributionList::Entry> *cpplist = (QValueList<KABC::DistributionList::Entry> *)sipCpp;
+    TQValueList<KABC::DistributionList::Entry> *cpplist = (TQValueList<KABC::DistributionList::Entry> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    QValueList<KABC::DistributionList::Entry>::Iterator it;
+    TQValueList<KABC::DistributionList::Entry>::Iterator it;
     for( it = cpplist->begin(); it != cpplist->end(); ++it )
     {
         if (((inst = sipConvertFromNewType(new KABC::DistributionList::Entry (*it), sipType_KABC_DistributionList_Entry, NULL)) == NULL)
@@ -145,7 +145,7 @@ protected:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    QValueList<KABC::DistributionList::Entry> *cpplist = new QValueList<KABC::DistributionList::Entry>;
+    TQValueList<KABC::DistributionList::Entry> *cpplist = new TQValueList<KABC::DistributionList::Entry>;
 
     PyObject *elem;
     KABC::DistributionList::Entry *cpp;
diff --git a/sip/kabc/distributionlistdialog.sip b/sip/kabc/distributionlistdialog.sip
index 720afd0..8aa9f4e 100644
--- a/sip/kabc/distributionlistdialog.sip
+++ b/sip/kabc/distributionlistdialog.sip
@@ -36,7 +36,7 @@ class DistributionListDialog : KDialogBase
 
 
 public:
-                         DistributionListDialog (KABC::AddressBook*, QWidget*);
+                         DistributionListDialog (KABC::AddressBook*, TQWidget*);
 
 };  // class DistributionListDialog
 
@@ -49,14 +49,14 @@ class EmailSelector : KDialogBase
 
 
 public:
-                         EmailSelector (const QStringList&, const QString&, QWidget*);
-    QString              selected ();
-    static QString       getEmail (const QStringList&, const QString&, QWidget*);
+                         EmailSelector (const TQStringList&, const TQString&, TQWidget*);
+    TQString              selected ();
+    static TQString       getEmail (const TQStringList&, const TQString&, TQWidget*);
 
 };  // class EmailSelector
 
 
-class DistributionListEditorWidget : QWidget
+class DistributionListEditorWidget : TQWidget
 {
 %TypeHeaderCode
 #include <distributionlistdialog.h>
@@ -64,7 +64,7 @@ class DistributionListEditorWidget : QWidget
 
 
 public:
-                         DistributionListEditorWidget (KABC::AddressBook*, QWidget*);
+                         DistributionListEditorWidget (KABC::AddressBook*, TQWidget*);
 
 };  // class DistributionListEditorWidget
 
diff --git a/sip/kabc/distributionlisteditor.sip b/sip/kabc/distributionlisteditor.sip
index e97df7f..48ad147 100644
--- a/sip/kabc/distributionlisteditor.sip
+++ b/sip/kabc/distributionlisteditor.sip
@@ -34,14 +34,14 @@ class EmailSelectDialog : KDialogBase
 
 
 public:
-                         EmailSelectDialog (const QStringList&, const QString&, QWidget*);
-    QString              selected ();
-    static QString       getEmail (const QStringList&, const QString&, QWidget*);
+                         EmailSelectDialog (const TQStringList&, const TQString&, TQWidget*);
+    TQString              selected ();
+    static TQString       getEmail (const TQStringList&, const TQString&, TQWidget*);
 
 };  // class EmailSelectDialog
 
 
-//ig class DistributionListEditor : QWidget;
+//ig class DistributionListEditor : TQWidget;
 
 };  // namespace KABC
 
diff --git a/sip/kabc/errorhandler.sip b/sip/kabc/errorhandler.sip
index 9a24483..4f96d34 100644
--- a/sip/kabc/errorhandler.sip
+++ b/sip/kabc/errorhandler.sip
@@ -37,7 +37,7 @@ class ErrorHandler
 
 
 public:
-    virtual void         error (const QString&)  = 0;
+    virtual void         error (const TQString&)  = 0;
 
 };  // class ErrorHandler
 
@@ -51,7 +51,7 @@ class ConsoleErrorHandler : KABC::ErrorHandler
 
 
 public:
-    virtual void         error (const QString&);
+    virtual void         error (const TQString&);
 
 };  // class ConsoleErrorHandler
 
@@ -66,7 +66,7 @@ class GUIErrorHandler : KABC::ErrorHandler
 
 
 public:
-    virtual void         error (const QString&);
+    virtual void         error (const TQString&);
 
 };  // class GUIErrorHandler
 
@@ -84,8 +84,8 @@ class GuiErrorHandler : KABC::ErrorHandler
 
 
 public:
-                         GuiErrorHandler (QWidget*);
-    virtual void         error (const QString&);
+                         GuiErrorHandler (TQWidget*);
+    virtual void         error (const TQString&);
 
 };  // class GuiErrorHandler
 
diff --git a/sip/kabc/field.sip b/sip/kabc/field.sip
index ab4d670..443fa2c 100644
--- a/sip/kabc/field.sip
+++ b/sip/kabc/field.sip
@@ -36,7 +36,7 @@ class Field
 
 
 public:
-    typedef QValueList<KABC::Field*> List;
+    typedef TQValueList<KABC::Field*> List;
 
     enum FieldCategory
     {
@@ -49,26 +49,26 @@ public:
         CustomCategory
     };
 
-    virtual QString      label ();
+    virtual TQString      label ();
     virtual int          category ();
-    static QString       categoryLabel (int);
-    virtual QString      value (const KABC::Addressee&);
-    virtual bool         setValue (KABC::Addressee&, const QString&);
+    static TQString       categoryLabel (int);
+    virtual TQString      value (const KABC::Addressee&);
+    virtual bool         setValue (KABC::Addressee&, const TQString&);
 
 %If ( KDE_3_2_0 -  )
-    QString              sortKey (const KABC::Addressee&);
+    TQString              sortKey (const KABC::Addressee&);
 %End
 
     virtual bool         isCustom ();
     virtual bool         equals (KABC::Field*);
     static KABC::Field::List allFields ();
     static KABC::Field::List defaultFields ();
-    static KABC::Field*  createCustomField (const QString&, int, const QString&, const QString&);
+    static KABC::Field*  createCustomField (const TQString&, int, const TQString&, const TQString&);
     static void          deleteFields ();
-    static void          saveFields (KConfig*, const QString&, const KABC::Field::List&);
-    static void          saveFields (const QString&, const KABC::Field::List&);
-    static KABC::Field::List restoreFields (KConfig*, const QString&);
-    static KABC::Field::List restoreFields (const QString&);
+    static void          saveFields (KConfig*, const TQString&, const KABC::Field::List&);
+    static void          saveFields (const TQString&, const KABC::Field::List&);
+    static KABC::Field::List restoreFields (KConfig*, const TQString&);
+    static KABC::Field::List restoreFields (const TQString&);
 
 protected:
     static void          createField (int, int = 0);
@@ -106,11 +106,11 @@ private:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    QValueList<KABC::Field *> *cpplist = (QValueList<KABC::Field *> *)sipCpp;
+    TQValueList<KABC::Field *> *cpplist = (TQValueList<KABC::Field *> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    QValueList<KABC::Field *>::Iterator it;
+    TQValueList<KABC::Field *>::Iterator it;
     for( it = cpplist->begin(); it != cpplist->end(); ++it )
     {
         if (((inst = sipConvertFromType((KABC::Field *)(*it), sipType_KABC_Field, NULL)) == NULL)
@@ -129,7 +129,7 @@ private:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    QValueList<KABC::Field *> *cpplist = new QValueList<KABC::Field *>;
+    TQValueList<KABC::Field *> *cpplist = new TQValueList<KABC::Field *>;
 
     PyObject *elem;
     KABC::Field *cpp;
diff --git a/sip/kabc/format.sip b/sip/kabc/format.sip
index 30b863b..30e1197 100644
--- a/sip/kabc/format.sip
+++ b/sip/kabc/format.sip
@@ -34,8 +34,8 @@ class Format
 
 
 public:
-    virtual bool         load (KABC::AddressBook*, const QString&)  = 0;
-    virtual bool         save (KABC::AddressBook*, const QString&)  = 0;
+    virtual bool         load (KABC::AddressBook*, const TQString&)  = 0;
+    virtual bool         save (KABC::AddressBook*, const TQString&)  = 0;
 
 };  // class Format
 
diff --git a/sip/kabc/formatfactory.sip b/sip/kabc/formatfactory.sip
index 14ec70c..1eac237 100644
--- a/sip/kabc/formatfactory.sip
+++ b/sip/kabc/formatfactory.sip
@@ -36,9 +36,9 @@ class FormatInfo
 
 
 public:
-    QString              library;
-    QString              nameLabel;
-    QString              descriptionLabel;
+    TQString              library;
+    TQString              nameLabel;
+    TQString              descriptionLabel;
 
 };  // class FormatInfo
 
@@ -52,9 +52,9 @@ class FormatFactory
 
 public:
     static KABC::FormatFactory* self ();
-    KABC::FormatPlugin*  format (const QString&);
-    QStringList          formats ();
-    KABC::FormatInfo*    info (const QString&);
+    KABC::FormatPlugin*  format (const TQString&);
+    TQStringList          formats ();
+    KABC::FormatInfo*    info (const TQString&);
 
 protected:
                          FormatFactory ();
diff --git a/sip/kabc/formatplugin.sip b/sip/kabc/formatplugin.sip
index bb63e8d..1008943 100644
--- a/sip/kabc/formatplugin.sip
+++ b/sip/kabc/formatplugin.sip
@@ -36,11 +36,11 @@ class FormatPlugin : KABC::Plugin
 
 
 public:
-    virtual bool         load (KABC::Addressee&, QFile*)  = 0;
-    virtual bool         loadAll (KABC::AddressBook*, KABC::Resource*, QFile*)  = 0;
-    virtual void         save (const KABC::Addressee&, QFile*)  = 0;
-    virtual void         saveAll (KABC::AddressBook*, KABC::Resource*, QFile*)  = 0;
-    virtual bool         checkFormat (QFile*) const = 0;
+    virtual bool         load (KABC::Addressee&, TQFile*)  = 0;
+    virtual bool         loadAll (KABC::AddressBook*, KABC::Resource*, TQFile*)  = 0;
+    virtual void         save (const KABC::Addressee&, TQFile*)  = 0;
+    virtual void         saveAll (KABC::AddressBook*, KABC::Resource*, TQFile*)  = 0;
+    virtual bool         checkFormat (TQFile*) const = 0;
 
 };  // class FormatPlugin
 
diff --git a/sip/kabc/geo.sip b/sip/kabc/geo.sip
index 48124a7..3ffca2f 100644
--- a/sip/kabc/geo.sip
+++ b/sip/kabc/geo.sip
@@ -47,14 +47,14 @@ public:
     bool                 operator != (const KABC::Geo&) const;
 %End
 
-    QString              asString () const;
+    TQString              asString () const;
 
 };  // class Geo
 
 
 %If ( KDE_3_1_0 -  )
-//igx QDataStream&         operator << (QDataStream&, const KABC::Geo&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Geo&);
+//igx TQDataStream&         operator << (TQDataStream&, const KABC::Geo&);
+//igx TQDataStream&         operator >> (TQDataStream&, KABC::Geo&);
 %End
 
 };  // namespace KABC
diff --git a/sip/kabc/key.sip b/sip/kabc/key.sip
index 2321204..26bee15 100644
--- a/sip/kabc/key.sip
+++ b/sip/kabc/key.sip
@@ -36,8 +36,8 @@ class Key
 
 
 public:
-    typedef QValueList<KABC::Key> List;
-    typedef QValueList<int> TypeList;
+    typedef TQValueList<KABC::Key> List;
+    typedef TQValueList<int> TypeList;
 
     enum Types
     {
@@ -46,27 +46,27 @@ public:
         Custom
     };
 
-                         Key (const QString& = QString ::null , int = PGP );
+                         Key (const TQString& = TQString ::null , int = PGP );
     bool                 operator == (const KABC::Key&) const;
     bool                 operator != (const KABC::Key&) const;
-    void                 setId (const QString&);
-    QString              id () const;
-    void                 setBinaryData (const QByteArray&);
-    QByteArray           binaryData () const;
-    void                 setTextData (const QString&);
-    QString              textData () const;
+    void                 setId (const TQString&);
+    TQString              id () const;
+    void                 setBinaryData (const TQByteArray&);
+    TQByteArray           binaryData () const;
+    void                 setTextData (const TQString&);
+    TQString              textData () const;
     bool                 isBinary () const;
     void                 setType (int);
-    void                 setCustomTypeString (const QString&);
+    void                 setCustomTypeString (const TQString&);
     int                  type () const;
-    QString              customTypeString () const;
+    TQString              customTypeString () const;
     static TypeList      typeList ();
-    static QString       typeLabel (int);
+    static TQString       typeLabel (int);
 
 };  // class Key
 
-//igx QDataStream&         operator << (QDataStream&, const KABC::Key&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Key&);
+//igx TQDataStream&         operator << (TQDataStream&, const KABC::Key&);
+//igx TQDataStream&         operator >> (TQDataStream&, KABC::Key&);
 };  // namespace KABC
 
 %End
@@ -78,7 +78,7 @@ public:
 {
 %TypeHeaderCode
 #include <qvaluelist.h>
-//typedef QValueList<KABC::Key> List;
+//typedef TQValueList<KABC::Key> List;
 %End
 
 %ConvertFromTypeCode
@@ -90,11 +90,11 @@ public:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    QValueList<KABC::Key> *cpplist = (QValueList<KABC::Key> *)sipCpp;
+    TQValueList<KABC::Key> *cpplist = (TQValueList<KABC::Key> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    QValueList<KABC::Key>::Iterator it;
+    TQValueList<KABC::Key>::Iterator it;
     for( it = cpplist->begin(); it != cpplist->end(); ++it )
     {
         if (((inst = sipConvertFromNewType(new KABC::Key(*it), sipType_KABC_Key, NULL)) == NULL)
@@ -113,7 +113,7 @@ public:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    QValueList<KABC::Key> *cpplist = new QValueList<KABC::Key>;
+    TQValueList<KABC::Key> *cpplist = new TQValueList<KABC::Key>;
 
     PyObject *elem;
     KABC::Key *cpp;
diff --git a/sip/kabc/ldapclient.sip b/sip/kabc/ldapclient.sip
index 610749e..c999c85 100644
--- a/sip/kabc/ldapclient.sip
+++ b/sip/kabc/ldapclient.sip
@@ -27,8 +27,8 @@
 %If ( KDE_3_1_0 -  )
 namespace KABC
 {
-//ig typedef QValueList<QByteArray> LdapAttrValue;
-//ig typedef QMap<QString,KABC::LdapAttrValue> LdapAttrMap;
+//ig typedef TQValueList<TQByteArray> LdapAttrValue;
+//ig typedef TQMap<TQString,KABC::LdapAttrValue> LdapAttrMap;
 
 class LdapObject
 {
@@ -41,13 +41,13 @@ public:
                          LdapObject ();
 
 %If ( KDE_3_3_0 -  )
-                         LdapObject (const QString&, KABC::LdapClient*);
+                         LdapObject (const TQString&, KABC::LdapClient*);
 %End
 
                          LdapObject (const KABC::LdapObject&);
-    QString              toString () const;
+    TQString              toString () const;
     void                 clear ();
-    QString              dn;
+    TQString              dn;
 //ig     LdapAttrMap          attrs;
 
 %If ( KDE_3_3_0 -  )
@@ -61,14 +61,14 @@ protected:
 public:
 
 %If (  - KDE_3_3_0 )
-                         LdapObject (QString);
+                         LdapObject (TQString);
 %End
 
 
 };  // class LdapObject
 
 
-class LdapClient : QObject
+class LdapClient : TQObject
 {
 %TypeHeaderCode
 #include <ldapclient.h>
@@ -76,43 +76,43 @@ class LdapClient : QObject
 
 
 public:
-                         LdapClient (QObject* = 0, const char* = 0);
+                         LdapClient (TQObject* = 0, const char* = 0);
     bool                 isActive () const;
 
 signals:
     void                 done ();
-    void                 error (const QString&);
+    void                 error (const TQString&);
     void                 result (const KABC::LdapObject&);
 
 public slots:
-    void                 setHost (const QString&);
-    QString              host () const;
-    void                 setPort (const QString&);
-    QString              port () const;
-    void                 setBase (const QString&);
-    QString              base () const;
+    void                 setHost (const TQString&);
+    TQString              host () const;
+    void                 setPort (const TQString&);
+    TQString              port () const;
+    void                 setBase (const TQString&);
+    TQString              base () const;
 
 %If ( KDE_3_2_0 -  )
-    void                 setBindDN (const QString&);
-    QString              bindDN () const;
-    void                 setPwdBindDN (const QString&);
-    QString              pwdBindDN () const;
+    void                 setBindDN (const TQString&);
+    TQString              bindDN () const;
+    void                 setPwdBindDN (const TQString&);
+    TQString              pwdBindDN () const;
 %End
 
-    void                 setAttrs (const QStringList&);
-    QStringList          attrs () const;
-    void                 setScope (const QString);
-    void                 startQuery (const QString&);
+    void                 setAttrs (const TQStringList&);
+    TQStringList          attrs () const;
+    void                 setScope (const TQString);
+    void                 startQuery (const TQString&);
     void                 cancelQuery ();
 
 protected slots:
-    void                 slotData (KIO::Job*, const QByteArray&);
-    void                 slotInfoMessage (KIO::Job*, const QString&);
+    void                 slotData (KIO::Job*, const TQByteArray&);
+    void                 slotInfoMessage (KIO::Job*, const TQString&);
     void                 slotDone ();
 
 protected:
     void                 startParseLDIF ();
-    void                 parseLDIF (const QByteArray&);
+    void                 parseLDIF (const TQByteArray&);
     void                 endParseLDIF ();
 
 };  // class LdapClient
@@ -128,8 +128,8 @@ class LdapResult
 
 
 public:
-    QString              name;
-    QString              email;
+    TQString              name;
+    TQString              email;
     int                  clientNumber;
 
 };  // class LdapResult
@@ -138,11 +138,11 @@ public:
 
 
 %If ( KDE_3_3_0 -  )
-typedef QValueList<KABC::LdapResult> LdapResultList;
+typedef TQValueList<KABC::LdapResult> LdapResultList;
 %End
 
 
-class LdapSearch : QObject
+class LdapSearch : TQObject
 {
 %TypeHeaderCode
 #include <ldapclient.h>
@@ -151,12 +151,12 @@ class LdapSearch : QObject
 
 public:
                          LdapSearch ();
-    void                 startSearch (const QString&);
+    void                 startSearch (const TQString&);
     void                 cancelSearch ();
     bool                 isAvailable () const;
 
 signals:
-    void                 searchData (const QStringList&);
+    void                 searchData (const TQStringList&);
 
 %If ( KDE_3_3_0 -  )
     void                 searchData (const KABC::LdapResultList&);
@@ -189,11 +189,11 @@ signals:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    QValueList<KABC::LdapResult> *cpplist = (QValueList<KABC::LdapResult> *)sipCpp;
+    TQValueList<KABC::LdapResult> *cpplist = (TQValueList<KABC::LdapResult> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    QValueList<KABC::LdapResult>::Iterator it;
+    TQValueList<KABC::LdapResult>::Iterator it;
     for( it = cpplist->begin(); it != cpplist->end(); ++it )
     {
         if (((inst = sipConvertFromNewType(new KABC::LdapResult(*it), sipType_KABC_LdapResult, NULL)) == NULL)
@@ -212,7 +212,7 @@ signals:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    QValueList<KABC::LdapResult> *cpplist = new QValueList<KABC::LdapResult>;
+    TQValueList<KABC::LdapResult> *cpplist = new TQValueList<KABC::LdapResult>;
 
     PyObject *elem;
     KABC::LdapResult *cpp;
diff --git a/sip/kabc/ldapconfigwidget.sip b/sip/kabc/ldapconfigwidget.sip
index ce1ddb1..928c00a 100644
--- a/sip/kabc/ldapconfigwidget.sip
+++ b/sip/kabc/ldapconfigwidget.sip
@@ -28,7 +28,7 @@
 namespace KABC
 {
 
-class LdapConfigWidget : QWidget
+class LdapConfigWidget : TQWidget
 {
 %TypeHeaderCode
 #include <ldapconfigwidget.h>
@@ -55,28 +55,28 @@ public:
         W_ALL
     };
 
-                         LdapConfigWidget (QWidget* = 0, const char* = 0, WFlags = 0);
-                         LdapConfigWidget (int, QWidget* = 0, const char* = 0, WFlags = 0);
-    void                 setUser (const QString&);
-    QString              user () const;
-    void                 setPassword (const QString&);
-    QString              password () const;
-    void                 setBindDN (const QString&);
-    QString              bindDN () const;
-    void                 setRealm (const QString&);
-    QString              realm () const;
-    void                 setHost (const QString&);
-    QString              host () const;
+                         LdapConfigWidget (TQWidget* = 0, const char* = 0, WFlags = 0);
+                         LdapConfigWidget (int, TQWidget* = 0, const char* = 0, WFlags = 0);
+    void                 setUser (const TQString&);
+    TQString              user () const;
+    void                 setPassword (const TQString&);
+    TQString              password () const;
+    void                 setBindDN (const TQString&);
+    TQString              bindDN () const;
+    void                 setRealm (const TQString&);
+    TQString              realm () const;
+    void                 setHost (const TQString&);
+    TQString              host () const;
     void                 setPort (int);
     int                  port () const;
     void                 setVer (int);
     int                  ver () const;
-    void                 setDn (const QString&);
-    QString              dn () const;
-    void                 setFilter (const QString&);
-    QString              filter () const;
-    void                 setMech (const QString&);
-    QString              mech () const;
+    void                 setDn (const TQString&);
+    TQString              dn () const;
+    void                 setFilter (const TQString&);
+    TQString              filter () const;
+    void                 setMech (const TQString&);
+    TQString              mech () const;
     void                 setSecNO (bool = 1);
     bool                 isSecNO () const;
     void                 setSecTLS (bool = 1);
diff --git a/sip/kabc/ldapurl.sip b/sip/kabc/ldapurl.sip
index d0e6406..605fe6d 100644
--- a/sip/kabc/ldapurl.sip
+++ b/sip/kabc/ldapurl.sip
@@ -41,7 +41,7 @@ public:
     {
 
     public:
-        QString              value;
+        TQString              value;
         bool                 critical;
 
     };  // class Extension
@@ -58,20 +58,20 @@ public:
 
                          LDAPUrl ();
                          LDAPUrl (const KURL&);
-    const QString&       dn () const;
-    void                 setDn (const QString&);
-    const QStringList&   attributes ();
-    void                 setAttributes (const QStringList&);
+    const TQString&       dn () const;
+    void                 setDn (const TQString&);
+    const TQStringList&   attributes ();
+    void                 setAttributes (const TQStringList&);
     KABC::LDAPUrl::Scope scope () const;
     void                 setScope (KABC::LDAPUrl::Scope);
-    const QString&       filter () const;
-    void                 setFilter (QString);
-    bool                 hasExtension (const QString&) const;
-    KABC::LDAPUrl::Extension extension (const QString&) const;
-    QString              extension (const QString&, bool& /Out/) const /PyName=extensionAndCritical/;
-    void                 setExtension (const QString&, const KABC::LDAPUrl::Extension&);
-    void                 setExtension (const QString&, const QString&, bool = 0);
-    void                 removeExtension (const QString&);
+    const TQString&       filter () const;
+    void                 setFilter (TQString);
+    bool                 hasExtension (const TQString&) const;
+    KABC::LDAPUrl::Extension extension (const TQString&) const;
+    TQString              extension (const TQString&, bool& /Out/) const /PyName=extensionAndCritical/;
+    void                 setExtension (const TQString&, const KABC::LDAPUrl::Extension&);
+    void                 setExtension (const TQString&, const TQString&, bool = 0);
+    void                 removeExtension (const TQString&);
     void                 updateQuery ();
 
 protected:
diff --git a/sip/kabc/ldif.sip b/sip/kabc/ldif.sip
index b7deb95..7cc6eab 100644
--- a/sip/kabc/ldif.sip
+++ b/sip/kabc/ldif.sip
@@ -68,27 +68,27 @@ public:
     };
 
                          LDIF ();
-    static QCString      assembleLine (const QString&, const QByteArray&, uint = 0, bool = 0);
-    static QCString      assembleLine (const QString&, const QCString&, uint = 0, bool = 0);
-    static QCString      assembleLine (const QString&, const QString&, uint = 0, bool = 0);
-    static bool          splitLine (const QCString&, QString&, QByteArray&);
-    static bool          splitControl (const QCString&, QString&, bool&, QByteArray&);
+    static TQCString      assembleLine (const TQString&, const TQByteArray&, uint = 0, bool = 0);
+    static TQCString      assembleLine (const TQString&, const TQCString&, uint = 0, bool = 0);
+    static TQCString      assembleLine (const TQString&, const TQString&, uint = 0, bool = 0);
+    static bool          splitLine (const TQCString&, TQString&, TQByteArray&);
+    static bool          splitControl (const TQCString&, TQString&, bool&, TQByteArray&);
     void                 startParsing ();
     KABC::LDIF::ParseVal processLine ();
     KABC::LDIF::ParseVal nextItem ();
-    void                 setLDIF (const QByteArray&);
+    void                 setLDIF (const TQByteArray&);
     void                 endLDIF ();
     KABC::LDIF::EntryType entryType () const;
     int                  modType () const;
-    const QString&       dn () const;
-    const QString&       newRdn () const;
-    const QString&       newSuperior () const;
+    const TQString&       dn () const;
+    const TQString&       newRdn () const;
+    const TQString&       newSuperior () const;
     bool                 delOldRdn () const;
-    const QString&       attr () const;
-    const QByteArray&    val () const;
+    const TQString&       attr () const;
+    const TQByteArray&    val () const;
     bool                 isUrl () const;
     bool                 critical () const;
-    const QString&       oid () const;
+    const TQString&       oid () const;
     uint                 lineNo () const;
 
 };  // class LDIF
diff --git a/sip/kabc/ldifconverter.sip b/sip/kabc/ldifconverter.sip
index 8bc4b52..76fa5c1 100644
--- a/sip/kabc/ldifconverter.sip
+++ b/sip/kabc/ldifconverter.sip
@@ -35,18 +35,18 @@ namespace LDIFConverter
 {
 
 %If ( KDE_3_5_2 -  )
-//ig bool                 LDIFToAddressee (const QString&, AddresseeList&, QDateTime = QDateTime ::currentDateTime ());
-//ig bool                 addresseeToLDIF (const AddresseeList&, QString&);
+//ig bool                 LDIFToAddressee (const TQString&, AddresseeList&, TQDateTime = TQDateTime ::currentDateTime ());
+//ig bool                 addresseeToLDIF (const AddresseeList&, TQString&);
 %End
 
-bool                 addresseeToLDIF (const KABC::Addressee&, QString&);
-QString              makeLDIFfieldString (QString, QString, bool = 1);
-bool                 parseSingleLine (KABC::Addressee&, KABC::Address&, KABC::Address&, QString&);
-bool                 splitLine (QString&, QString&, QString&);
-bool                 evaluatePair (KABC::Addressee&, KABC::Address&, KABC::Address&, QString&, QString&);
+bool                 addresseeToLDIF (const KABC::Addressee&, TQString&);
+TQString              makeLDIFfieldString (TQString, TQString, bool = 1);
+bool                 parseSingleLine (KABC::Addressee&, KABC::Address&, KABC::Address&, TQString&);
+bool                 splitLine (TQString&, TQString&, TQString&);
+bool                 evaluatePair (KABC::Addressee&, KABC::Address&, KABC::Address&, TQString&, TQString&);
 
 %If (  - KDE_3_5_2 )
-bool                 LDIFToAddressee (const QString&, KABC::Addressee::List&, QDateTime = QDateTime ::currentDateTime ());
+bool                 LDIFToAddressee (const TQString&, KABC::Addressee::List&, TQDateTime = TQDateTime ::currentDateTime ());
 %MethodCode
 
     KABC::Addressee::List *xa1 = (KABC::Addressee::List *)a1;
@@ -57,7 +57,7 @@ bool                 LDIFToAddressee (const QString&, KABC::Addressee::List&, QD
 
 %End
 
-bool                 addresseeToLDIF (const KABC::Addressee::List&, QString&);
+bool                 addresseeToLDIF (const KABC::Addressee::List&, TQString&);
 %MethodCode
 
     KABC::Addressee::List *xa0 = (KABC::Addressee::List *)a0;
diff --git a/sip/kabc/lock.sip b/sip/kabc/lock.sip
index 82dbebb..874d29c 100644
--- a/sip/kabc/lock.sip
+++ b/sip/kabc/lock.sip
@@ -28,7 +28,7 @@
 namespace KABC
 {
 
-class Lock : QObject
+class Lock : TQObject
 {
 %TypeHeaderCode
 #include <lock.h>
@@ -36,14 +36,14 @@ class Lock : QObject
 
 
 public:
-                         Lock (const QString&);
+                         Lock (const TQString&);
     virtual bool         lock ();
     virtual bool         unlock ();
-    virtual QString      error () const;
-    QString              lockFileName () const;
-    static bool          readLockFile (const QString&, int&, QString&);
-    static bool          writeLockFile (const QString&);
-    static QString       locksDir ();
+    virtual TQString      error () const;
+    TQString              lockFileName () const;
+    static bool          readLockFile (const TQString&, int&, TQString&);
+    static bool          writeLockFile (const TQString&);
+    static TQString       locksDir ();
 
 signals:
     void                 locked ();
diff --git a/sip/kabc/locknull.sip b/sip/kabc/locknull.sip
index 6c24a38..7e54a1b 100644
--- a/sip/kabc/locknull.sip
+++ b/sip/kabc/locknull.sip
@@ -39,7 +39,7 @@ public:
                          LockNull (bool);
     bool                 lock ();
     bool                 unlock ();
-    QString              error () const;
+    TQString              error () const;
 
 };  // class LockNull
 
diff --git a/sip/kabc/phonenumber.sip b/sip/kabc/phonenumber.sip
index 39f662b..d9ff865 100644
--- a/sip/kabc/phonenumber.sip
+++ b/sip/kabc/phonenumber.sip
@@ -34,10 +34,10 @@ class PhoneNumber
 
 
 public:
-    typedef QValueList<KABC::PhoneNumber> List;
+    typedef TQValueList<KABC::PhoneNumber> List;
 
 %If ( KDE_3_1_0 -  )
-    typedef QValueList<int> TypeList;
+    typedef TQValueList<int> TypeList;
 
     enum Types
     {
@@ -60,26 +60,26 @@ public:
 %End
 
                          PhoneNumber ();
-                         PhoneNumber (const QString&, int = Home );
+                         PhoneNumber (const TQString&, int = Home );
 
 %If ( KDE_3_1_0 -  )
     bool                 operator == (const KABC::PhoneNumber&) const;
     bool                 operator != (const KABC::PhoneNumber&) const;
 %End
 
-    void                 setId (const QString&);
-    QString              id () const;
-    void                 setNumber (const QString&);
-    QString              number () const;
+    void                 setId (const TQString&);
+    TQString              id () const;
+    void                 setNumber (const TQString&);
+    TQString              number () const;
     void                 setType (int);
     int                  type () const;
 
 %If ( KDE_3_1_0 -  )
-    QString              typeLabel () const;
-    QString              label () const;
+    TQString              typeLabel () const;
+    TQString              label () const;
     static TypeList      typeList ();
-    static QString       typeLabel (int);
-    static QString       label (int);
+    static TQString       typeLabel (int);
+    static TQString       label (int);
 %End
 
 
@@ -112,8 +112,8 @@ public:
 
 
 %If ( KDE_3_1_0 -  )
-//igx QDataStream&         operator << (QDataStream&, const KABC::PhoneNumber&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::PhoneNumber&);
+//igx TQDataStream&         operator << (TQDataStream&, const KABC::PhoneNumber&);
+//igx TQDataStream&         operator >> (TQDataStream&, KABC::PhoneNumber&);
 %End
 
 };  // namespace KABC
@@ -125,7 +125,7 @@ public:
 {
 %TypeHeaderCode
 #include <qvaluelist.h>
-//typedef QValueList<KABC::PhoneNumber> List;
+//typedef TQValueList<KABC::PhoneNumber> List;
 %End
 
 %ConvertFromTypeCode
@@ -137,11 +137,11 @@ public:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    QValueList<KABC::PhoneNumber> *cpplist = (QValueList<KABC::PhoneNumber> *)sipCpp;
+    TQValueList<KABC::PhoneNumber> *cpplist = (TQValueList<KABC::PhoneNumber> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    QValueList<KABC::PhoneNumber>::Iterator it;
+    TQValueList<KABC::PhoneNumber>::Iterator it;
     for( it = cpplist->begin(); it != cpplist->end(); ++it )
     {
         if (((inst = sipConvertFromNewType(new KABC::PhoneNumber(*it), sipType_KABC_PhoneNumber, NULL)) == NULL)
@@ -160,7 +160,7 @@ public:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    QValueList<KABC::PhoneNumber> *cpplist = new QValueList<KABC::PhoneNumber>;
+    TQValueList<KABC::PhoneNumber> *cpplist = new TQValueList<KABC::PhoneNumber>;
 
     PyObject *elem;
     KABC::PhoneNumber *cpp;
diff --git a/sip/kabc/picture.sip b/sip/kabc/picture.sip
index 453566e..d715f84 100644
--- a/sip/kabc/picture.sip
+++ b/sip/kabc/picture.sip
@@ -37,23 +37,23 @@ class Picture
 
 public:
                          Picture ();
-                         Picture (const QString&);
-                         Picture (const QImage&);
+                         Picture (const TQString&);
+                         Picture (const TQImage&);
     bool                 operator == (const KABC::Picture&) const;
     bool                 operator != (const KABC::Picture&) const;
-    void                 setUrl (const QString&);
-    void                 setData (const QImage&);
-    void                 setType (const QString&);
+    void                 setUrl (const TQString&);
+    void                 setData (const TQImage&);
+    void                 setType (const TQString&);
     bool                 isIntern () const;
-    QString              url () const;
-    QImage               data () const;
-    QString              type () const;
-    QString              asString () const;
+    TQString              url () const;
+    TQImage               data () const;
+    TQString              type () const;
+    TQString              asString () const;
 
 };  // class Picture
 
-//igx QDataStream&         operator << (QDataStream&, const KABC::Picture&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Picture&);
+//igx TQDataStream&         operator << (TQDataStream&, const KABC::Picture&);
+//igx TQDataStream&         operator >> (TQDataStream&, KABC::Picture&);
 };  // namespace KABC
 
 %End
diff --git a/sip/kabc/plugin.sip b/sip/kabc/plugin.sip
index 4df2c42..cfa9e54 100644
--- a/sip/kabc/plugin.sip
+++ b/sip/kabc/plugin.sip
@@ -37,12 +37,12 @@ class Plugin
 
 public:
                          Plugin ();
-    virtual void         setType (const QString&);
-    virtual QString      type () const;
-    virtual void         setNameLabel (const QString&);
-    virtual QString      nameLabel () const;
-    virtual void         setDescriptionLabel (const QString&);
-    virtual QString      descriptionLabel () const;
+    virtual void         setType (const TQString&);
+    virtual TQString      type () const;
+    virtual void         setNameLabel (const TQString&);
+    virtual TQString      nameLabel () const;
+    virtual void         setDescriptionLabel (const TQString&);
+    virtual TQString      descriptionLabel () const;
 
 };  // class Plugin
 
diff --git a/sip/kabc/resource.sip b/sip/kabc/resource.sip
index 14149cb..336096b 100644
--- a/sip/kabc/resource.sip
+++ b/sip/kabc/resource.sip
@@ -73,18 +73,18 @@ public:
     virtual void         removeAddressee (const KABC::Addressee&);
     virtual bool         save (KABC::Ticket*)  = 0;
     virtual bool         asyncSave (KABC::Ticket*);
-    virtual KABC::Addressee findByUid (const QString&);
-    virtual KABC::Addressee::List findByName (const QString&);
-    virtual KABC::Addressee::List findByEmail (const QString&);
-    virtual KABC::Addressee::List findByCategory (const QString&);
+    virtual KABC::Addressee findByUid (const TQString&);
+    virtual KABC::Addressee::List findByName (const TQString&);
+    virtual KABC::Addressee::List findByEmail (const TQString&);
+    virtual KABC::Addressee::List findByCategory (const TQString&);
     virtual void         clear ();
     void                 setAddressBook (KABC::AddressBook*);
 
 signals:
     void                 loadingFinished (KABC::Resource*);
-    void                 loadingError (KABC::Resource*, const QString&);
+    void                 loadingError (KABC::Resource*, const TQString&);
     void                 savingFinished (KABC::Resource*);
-    void                 savingError (KABC::Resource*, const QString&);
+    void                 savingError (KABC::Resource*, const TQString&);
 
 protected:
     KABC::Ticket*        createTicket (KABC::Resource*);
@@ -111,16 +111,16 @@ public:
     virtual bool         load ();
     virtual bool         save (KABC::Ticket*);
     KABC::AddressBook*   addressBook ();
-    virtual QString      identifier () const;
+    virtual TQString      identifier () const;
     virtual void         removeAddressee (const KABC::Addressee&);
     virtual void         cleanUp ();
     virtual void         setReadOnly (bool);
     virtual bool         readOnly () const;
     virtual void         setFastResource (bool);
     virtual bool         fastResource () const;
-    virtual void         setName (const QString);
-    virtual QString      name () const;
-    static QString       cryptStr (const QString&);
+    virtual void         setName (const TQString);
+    virtual TQString      name () const;
+    static TQString       cryptStr (const TQString&);
 
 protected:
     KABC::Ticket*        createTicket (KABC::Resource*);
diff --git a/sip/kabc/resourcefile.sip b/sip/kabc/resourcefile.sip
index 75786b8..736545e 100644
--- a/sip/kabc/resourcefile.sip
+++ b/sip/kabc/resourcefile.sip
@@ -39,7 +39,7 @@ public:
 
 %If ( KDE_3_3_0 -  )
                          ResourceFile (const KConfig*);
-                         ResourceFile (const QString&, const QString& = "vcard");
+                         ResourceFile (const TQString&, const TQString& = "vcard");
     virtual void         writeConfig (KConfig*);
     virtual bool         doOpen ();
     virtual void         doClose ();
@@ -55,12 +55,12 @@ public:
     virtual bool         asyncSave (KABC::Ticket*);
 %End
 
-    void                 setFileName (const QString&);
-    QString              fileName () const;
+    void                 setFileName (const TQString&);
+    TQString              fileName () const;
 
 %If ( KDE_3_5_1 -  )
-    void                 setFormat (const QString&);
-    QString              format () const;
+    void                 setFormat (const TQString&);
+    TQString              format () const;
 
 %If ( KDE_3_5_2 -  )
     virtual void         removeAddressee (const KABC::Addressee&);
@@ -75,11 +75,11 @@ protected slots:
 protected:
 
 %If ( KDE_3_3_0 -  )
-    void                 init (const QString&, const QString&);
+    void                 init (const TQString&, const TQString&);
 %End
 
-//ig     bool                 lock (const QString&);
-//ig     void                 unlock (const QString&);
+//ig     bool                 lock (const TQString&);
+//ig     void                 unlock (const TQString&);
 
 public:
 
@@ -92,7 +92,7 @@ public:
 
 %If (  - KDE_3_3_0 )
                          ResourceFile (KABC::AddressBook*, const KConfig*);
-                         ResourceFile (KABC::AddressBook*, const QString&, KABC::FormatPlugin* = 0);
+                         ResourceFile (KABC::AddressBook*, const TQString&, KABC::FormatPlugin* = 0);
     bool                 open ();
     void                 close ();
 %End
@@ -108,7 +108,7 @@ public:
     virtual void         cleanUp ();
 %End
 
-    virtual QString      identifier () const;
+    virtual TQString      identifier () const;
 %End
 
 
@@ -130,7 +130,7 @@ public:
 
 %If ( KDE_3_1_0 -  )
                          ResourceFile (KABC::AddressBook*, const KConfig*);
-                         ResourceFile (KABC::AddressBook*, const QString&, KABC::FormatPlugin* = 0);
+                         ResourceFile (KABC::AddressBook*, const TQString&, KABC::FormatPlugin* = 0);
     bool                 open ();
     void                 close ();
 %End
@@ -140,23 +140,23 @@ public:
     bool                 load ();
     bool                 save (KABC::Ticket*);
     virtual void         cleanUp ();
-    void                 setFileName (const QString&);
-    QString              fileName () const;
+    void                 setFileName (const TQString&);
+    TQString              fileName () const;
 
 %If ( KDE_3_1_0 -  )
-    virtual QString      identifier () const;
+    virtual TQString      identifier () const;
     void                 removeAddressee (const KABC::Addressee&);
 %End
 
 
 protected:
-//ig     bool                 lock (const QString&);
-//ig     void                 unlock (const QString&);
+//ig     bool                 lock (const TQString&);
+//ig     void                 unlock (const TQString&);
 
 public:
 
 %If (  - KDE_3_1_0 )
-                         ResourceFile (KABC::AddressBook*, const QString&, KABC::Format* = 0);
+                         ResourceFile (KABC::AddressBook*, const TQString&, KABC::Format* = 0);
     bool                 load (KABC::AddressBook*);
 %End
 
diff --git a/sip/kabc/resourceselectdialog.sip b/sip/kabc/resourceselectdialog.sip
index 9210316..7e58205 100644
--- a/sip/kabc/resourceselectdialog.sip
+++ b/sip/kabc/resourceselectdialog.sip
@@ -38,9 +38,9 @@ class ResourceSelectDialog
 
 
 public:
-                         ResourceSelectDialog (KABC::AddressBook*, QWidget* = 0, const char* = 0);
+                         ResourceSelectDialog (KABC::AddressBook*, TQWidget* = 0, const char* = 0);
     KABC::Resource*      resource ();
-    static KABC::Resource* getResource (KABC::AddressBook*, QWidget* = 0);
+    static KABC::Resource* getResource (KABC::AddressBook*, TQWidget* = 0);
 //force
 
 private:
diff --git a/sip/kabc/secrecy.sip b/sip/kabc/secrecy.sip
index 605db1e..33c6d30 100644
--- a/sip/kabc/secrecy.sip
+++ b/sip/kabc/secrecy.sip
@@ -36,7 +36,7 @@ class Secrecy
 
 
 public:
-    typedef QValueList<int> TypeList;
+    typedef TQValueList<int> TypeList;
 
 %If ( KDE_3_2_0 -  )
 
@@ -61,8 +61,8 @@ public:
     void                 setType (int);
     int                  type () const;
     static TypeList      typeList ();
-    static QString       typeLabel (int);
-    QString              asString () const;
+    static TQString       typeLabel (int);
+    TQString              asString () const;
 
 public:
 
@@ -82,8 +82,8 @@ public:
 
 
 %If ( KDE_3_4_0 -  )
-//igx QDataStream&         operator << (QDataStream&, const KABC::Secrecy&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Secrecy&);
+//igx TQDataStream&         operator << (TQDataStream&, const KABC::Secrecy&);
+//igx TQDataStream&         operator >> (TQDataStream&, KABC::Secrecy&);
 %End
 
 };  // namespace KABC
diff --git a/sip/kabc/sound.sip b/sip/kabc/sound.sip
index b455883..c9c8d4e 100644
--- a/sip/kabc/sound.sip
+++ b/sip/kabc/sound.sip
@@ -37,26 +37,26 @@ class Sound
 
 public:
                          Sound ();
-                         Sound (const QString&);
-                         Sound (const QByteArray&);
+                         Sound (const TQString&);
+                         Sound (const TQByteArray&);
     bool                 operator == (const KABC::Sound&) const;
     bool                 operator != (const KABC::Sound&) const;
-    void                 setUrl (const QString&);
+    void                 setUrl (const TQString&);
 
 %If ( KDE_3_4_0 -  )
     bool                 isEmpty () const;
 %End
 
-    void                 setData (const QByteArray&);
+    void                 setData (const TQByteArray&);
     bool                 isIntern () const;
-    QString              url () const;
-    QByteArray           data () const;
-    QString              asString () const;
+    TQString              url () const;
+    TQByteArray           data () const;
+    TQString              asString () const;
 
 };  // class Sound
 
-//igx QDataStream&         operator << (QDataStream&, const KABC::Sound&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Sound&);
+//igx TQDataStream&         operator << (TQDataStream&, const KABC::Sound&);
+//igx TQDataStream&         operator >> (TQDataStream&, KABC::Sound&);
 };  // namespace KABC
 
 %End
diff --git a/sip/kabc/stdaddressbook.sip b/sip/kabc/stdaddressbook.sip
index e571f47..4de04df 100644
--- a/sip/kabc/stdaddressbook.sip
+++ b/sip/kabc/stdaddressbook.sip
@@ -49,10 +49,10 @@ public:
     static void          handleCrash ();
 %End
 
-    static QString       fileName ();
+    static TQString       fileName ();
 
 %If ( KDE_3_1_0 -  )
-    static QString       directoryName ();
+    static TQString       directoryName ();
     static void          setAutomaticSave (bool);
     static void          close ();
     static bool          automaticSave ();
@@ -101,7 +101,7 @@ protected:
 public:
 
 %If (  - KDE_3_1_0 )
-    QString              identifier ();
+    TQString              identifier ();
 %End
 
 
diff --git a/sip/kabc/timezone.sip b/sip/kabc/timezone.sip
index e095d45..c8f28af 100644
--- a/sip/kabc/timezone.sip
+++ b/sip/kabc/timezone.sip
@@ -45,14 +45,14 @@ public:
     bool                 operator != (const KABC::TimeZone&) const;
 %End
 
-    QString              asString () const;
+    TQString              asString () const;
 
 };  // class TimeZone
 
 
 %If ( KDE_3_1_0 -  )
-//igx QDataStream&         operator << (QDataStream&, const KABC::TimeZone&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::TimeZone&);
+//igx TQDataStream&         operator << (TQDataStream&, const KABC::TimeZone&);
+//igx TQDataStream&         operator >> (TQDataStream&, KABC::TimeZone&);
 %End
 
 };  // namespace KABC
diff --git a/sip/kabc/vcardconverter.sip b/sip/kabc/vcardconverter.sip
index 5276fd0..ff90050 100644
--- a/sip/kabc/vcardconverter.sip
+++ b/sip/kabc/vcardconverter.sip
@@ -50,22 +50,22 @@ public:
                          VCardConverter ();
 
 %If ( KDE_3_2_0 -  )
-    QString              createVCard (const KABC::Addressee&, KABC::VCardConverter::Version = v3_0 );
-    QString              createVCards (KABC::Addressee::List, KABC::VCardConverter::Version = v3_0 );
-    KABC::Addressee      parseVCard (const QString&);
-    KABC::Addressee::List parseVCards (const QString&);
+    TQString              createVCard (const KABC::Addressee&, KABC::VCardConverter::Version = v3_0 );
+    TQString              createVCards (KABC::Addressee::List, KABC::VCardConverter::Version = v3_0 );
+    KABC::Addressee      parseVCard (const TQString&);
+    KABC::Addressee::List parseVCards (const TQString&);
 %End
 
-    bool                 vCardToAddressee (const QString&, KABC::Addressee&, KABC::VCardConverter::Version = v3_0 );
-    bool                 addresseeToVCard (const KABC::Addressee&, QString&, KABC::VCardConverter::Version = v3_0 );
+    bool                 vCardToAddressee (const TQString&, KABC::Addressee&, KABC::VCardConverter::Version = v3_0 );
+    bool                 addresseeToVCard (const KABC::Addressee&, TQString&, KABC::VCardConverter::Version = v3_0 );
 
 };  // class VCardConverter
 
 
 %If ( KDE_3_2_0 -  )
-QString              dateToVCardString (const QDateTime&);
-QString              dateToVCardString (const QDate&);
-QDateTime            VCardStringToDate (const QString&);
+TQString              dateToVCardString (const TQDateTime&);
+TQString              dateToVCardString (const TQDate&);
+TQDateTime            VCardStringToDate (const TQString&);
 %End
 
 };  // namespace KABC
diff --git a/sip/kabc/vcardformat.sip b/sip/kabc/vcardformat.sip
index 91fe090..fa677fc 100644
--- a/sip/kabc/vcardformat.sip
+++ b/sip/kabc/vcardformat.sip
@@ -35,8 +35,8 @@ class VCardFormat : KABC::Format
 
 public:
                          VCardFormat ();
-    bool                 load (KABC::AddressBook*, const QString&);
-    bool                 save (KABC::AddressBook*, const QString&);
+    bool                 load (KABC::AddressBook*, const TQString&);
+    bool                 save (KABC::AddressBook*, const TQString&);
 
 };  // class VCardFormat
 
diff --git a/sip/kabc/vcardformatplugin.sip b/sip/kabc/vcardformatplugin.sip
index f6aeef2..e059f5d 100644
--- a/sip/kabc/vcardformatplugin.sip
+++ b/sip/kabc/vcardformatplugin.sip
@@ -37,11 +37,11 @@ class VCardFormatPlugin : KABC::FormatPlugin
 
 public:
                          VCardFormatPlugin ();
-    bool                 load (KABC::Addressee&, QFile*);
-    bool                 loadAll (KABC::AddressBook*, KABC::Resource*, QFile*);
-    void                 save (const KABC::Addressee&, QFile*);
-    void                 saveAll (KABC::AddressBook*, KABC::Resource*, QFile*);
-    bool                 checkFormat (QFile*) const;
+    bool                 load (KABC::Addressee&, TQFile*);
+    bool                 loadAll (KABC::AddressBook*, KABC::Resource*, TQFile*);
+    void                 save (const KABC::Addressee&, TQFile*);
+    void                 saveAll (KABC::AddressBook*, KABC::Resource*, TQFile*);
+    bool                 checkFormat (TQFile*) const;
 
 };  // class VCardFormatPlugin