Rename KABC namespace

38 files changed, 438 insertions, 438 deletions

diff --git a/sip/kabc/address.sip b/sip/kabc/address.sip
index f78527d..aa0918a 100644
--- a/sip/kabc/address.sip
+++ b/sip/kabc/address.sip
@@ -23,7 +23,7 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
 class Address
@@ -34,7 +34,7 @@ class Address
 
 
 public:
-    typedef TQValueList<KABC::Address> List;
+    typedef TQValueList<TDEABC::Address> List;
 
 %If ( KDE_3_1_0 -  )
     typedef TQValueList<int> TypeList;
@@ -56,8 +56,8 @@ public:
                          Address (int);
 
 %If ( KDE_3_1_0 -  )
-    bool                 operator == (const KABC::Address&) const;
-    bool                 operator != (const KABC::Address&) const;
+    bool                 operator == (const TDEABC::Address&) const;
+    bool                 operator != (const TDEABC::Address&) const;
 %End
 
     bool                 isEmpty () const;
@@ -125,7 +125,7 @@ public:
 
 %If ( KDE_3_1_0 -  )
     static TQString       labelLabel ();
-    static KABC::Address::TypeList typeList ();
+    static TDEABC::Address::TypeList typeList ();
     static TQString       typeLabel (int);
 %End
 
@@ -142,9 +142,9 @@ public:
 
 
 %If ( KDE_3_1_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const KABC::Address&);
-//igx TQDataStream&         operator >> (TQDataStream&, KABC::Address&);
+//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::Address&);
+//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::Address&);
 %End
 
-};  // namespace KABC
+};  // namespace TDEABC
 
diff --git a/sip/kabc/addressbook.sip b/sip/kabc/addressbook.sip
index 2e52bc9..8f58bb1 100644
--- a/sip/kabc/addressbook.sip
+++ b/sip/kabc/addressbook.sip
@@ -23,7 +23,7 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
 class AddressBook : TQObject
@@ -47,10 +47,10 @@ public:
                          AddressBook (const TQString&);
 %End
 
-    KABC::Ticket*        requestSaveTicket (KABC::Resource* = 0);
+    TDEABC::Ticket*        requestSaveTicket (TDEABC::Resource* = 0);
 
 %If ( KDE_3_2_0 -  )
-    void                 releaseSaveTicket (KABC::Ticket*);
+    void                 releaseSaveTicket (TDEABC::Ticket*);
 %End
 
     bool                 load ();
@@ -59,43 +59,43 @@ public:
     bool                 asyncLoad ();
 %End
 
-    bool                 save (KABC::Ticket*);
+    bool                 save (TDEABC::Ticket*);
 
 %If ( KDE_3_2_0 -  )
-    bool                 asyncSave (KABC::Ticket*);
+    bool                 asyncSave (TDEABC::Ticket*);
 %End
 
-//igx     KABC::AddressBook::ConstIterator begin () const;
-//igx     KABC::AddressBook::Iterator begin ();
-//igx     KABC::AddressBook::ConstIterator end () const;
-//igx     KABC::AddressBook::Iterator end ();
+//igx     TDEABC::AddressBook::ConstIterator begin () const;
+//igx     TDEABC::AddressBook::Iterator begin ();
+//igx     TDEABC::AddressBook::ConstIterator end () const;
+//igx     TDEABC::AddressBook::Iterator end ();
     void                 clear ();
-    void                 insertAddressee (const KABC::Addressee&);
-    void                 removeAddressee (const KABC::Addressee&);
-//ig     void                 removeAddressee (const KABC::AddressBook::Iterator&);
-//igx     KABC::AddressBook::Iterator find (const Addressee&);
-    KABC::Addressee      findByUid (const TQString&);
+    void                 insertAddressee (const TDEABC::Addressee&);
+    void                 removeAddressee (const TDEABC::Addressee&);
+//ig     void                 removeAddressee (const TDEABC::AddressBook::Iterator&);
+//igx     TDEABC::AddressBook::Iterator find (const Addressee&);
+    TDEABC::Addressee      findByUid (const TQString&);
 
 %If ( KDE_3_2_0 -  )
-    KABC::Addressee::List allAddressees ();
+    TDEABC::Addressee::List allAddressees ();
 %End
 
-    KABC::Addressee::List findByName (const TQString&);
-    KABC::Addressee::List findByEmail (const TQString&);
-    KABC::Addressee::List findByCategory (const TQString&);
+    TDEABC::Addressee::List findByName (const TQString&);
+    TDEABC::Addressee::List findByEmail (const TQString&);
+    TDEABC::Addressee::List findByCategory (const TQString&);
     virtual TQString      identifier ();
 
 %If ( KDE_3_1_0 -  )
-    KABC::Field::List    fields (int = KABC ::Field ::All );
+    TDEABC::Field::List    fields (int = KABC ::Field ::All );
     bool                 addCustomField (const TQString&, int = KABC ::Field ::All , const TQString& = TQString ::null , const TQString& = TQString ::null );
 %End
 
-    bool                 addResource (KABC::Resource*);
+    bool                 addResource (TDEABC::Resource*);
 
 %If ( KDE_3_1_0 -  )
-    bool                 removeResource (KABC::Resource*);
-    TQPtrList<KABC::Resource> resources ();
-    void                 setErrorHandler (KABC::ErrorHandler*);
+    bool                 removeResource (TDEABC::Resource*);
+    TQPtrList<TDEABC::Resource> resources ();
+    void                 setErrorHandler (TDEABC::ErrorHandler*);
     void                 error (const TQString&);
     void                 cleanUp ();
 %End
@@ -111,23 +111,23 @@ public:
 
 
 signals:
-    void                 addressBookChanged (KABC::AddressBook*);
-    void                 addressBookLocked (KABC::AddressBook*);
-    void                 addressBookUnlocked (KABC::AddressBook*);
+    void                 addressBookChanged (TDEABC::AddressBook*);
+    void                 addressBookLocked (TDEABC::AddressBook*);
+    void                 addressBookUnlocked (TDEABC::AddressBook*);
 
 %If ( KDE_3_2_0 -  )
-    void                 loadingFinished (KABC::Resource*);
-    void                 savingFinished (KABC::Resource*);
+    void                 loadingFinished (TDEABC::Resource*);
+    void                 savingFinished (TDEABC::Resource*);
 %End
 
 
 protected slots:
 
 %If ( KDE_3_2_0 -  )
-    void                 resourceLoadingFinished (KABC::Resource*);
-    void                 resourceSavingFinished (KABC::Resource*);
-    void                 resourceLoadingError (KABC::Resource*, const TQString&);
-    void                 resourceSavingError (KABC::Resource*, const TQString&);
+    void                 resourceLoadingFinished (TDEABC::Resource*);
+    void                 resourceSavingFinished (TDEABC::Resource*);
+    void                 resourceLoadingError (TDEABC::Resource*, const TQString&);
+    void                 resourceSavingError (TDEABC::Resource*, const TQString&);
 %End
 
 
@@ -135,11 +135,11 @@ protected:
 
 %If ( KDE_3_1_0 -  )
     void                 deleteRemovedAddressees ();
-    void                 setStandardResource (KABC::Resource*);
-    KABC::Resource*      standardResource ();
+    void                 setStandardResource (TDEABC::Resource*);
+    TDEABC::Resource*      standardResource ();
 
 %If ( KDE_3_2_0 -  )
-//ig     KRES::Manager<KABC::Resource>* resourceManager ();
+//ig     KRES::Manager<TDEABC::Resource>* resourceManager ();
 %End
 
 %End
@@ -149,16 +149,16 @@ protected:
 
 
 %If ( KDE_3_1_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const KABC::AddressBook&);
-//igx TQDataStream&         operator >> (TQDataStream&, KABC::AddressBook&);
+//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::AddressBook&);
+//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::AddressBook&);
 %End
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 
 
-%MappedType TQPtrList<KABC::Resource>
-//converts a Python list of KABC::Resource
+%MappedType TQPtrList<TDEABC::Resource>
+//converts a Python list of TDEABC::Resource
 {
 %TypeHeaderCode
 #include <tqptrlist.h>
@@ -177,8 +177,8 @@ protected:
 
     // Get it.
 
-    TQPtrList<KABC::Resource> *cpplist = (TQPtrList<KABC::Resource> *)sipCpp;
-    KABC::Resource *cpp;
+    TQPtrList<TDEABC::Resource> *cpplist = (TQPtrList<TDEABC::Resource> *)sipCpp;
+    TDEABC::Resource *cpp;
     PyObject *inst;
 
     // the loop depends on the type of iterator the  tmeplate makes available
@@ -199,16 +199,16 @@ protected:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    TQPtrList<KABC::Resource> *cpplist = new TQPtrList<KABC::Resource>;
+    TQPtrList<TDEABC::Resource> *cpplist = new TQPtrList<TDEABC::Resource>;
 
     PyObject *elem;
-    KABC::Resource *cpp;
+    TDEABC::Resource *cpp;
     int iserr = 0;
 
     for (int i = 0; i < PyList_Size (sipPy); i++)
     {
         elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::Resource *)sipForceConvertToType(elem, sipType_KABC_Resource, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
+        cpp = (TDEABC::Resource *)sipForceConvertToType(elem, sipType_KABC_Resource, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
 
         if (iserr)
         {
diff --git a/sip/kabc/addressee.sip b/sip/kabc/addressee.sip
index 536bd2e..24ce9b4 100644
--- a/sip/kabc/addressee.sip
+++ b/sip/kabc/addressee.sip
@@ -23,7 +23,7 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
 class Addressee
@@ -34,18 +34,18 @@ class Addressee
 
 
 public:
-//ig     typedef TQValueList<KABC::Addressee> List;
+//ig     typedef TQValueList<TDEABC::Addressee> List;
 
 %If ( KDE_3_4_2 -  )
-    typedef TQMap<TQString,KABC::Addressee> Map;
+    typedef TQMap<TQString,TDEABC::Addressee> Map;
 %End
 
                          Addressee ();
-                         Addressee (const KABC::Addressee&);
+                         Addressee (const TDEABC::Addressee&);
 
 %If ( KDE_3_1_0 -  )
-    bool                 operator == (const KABC::Addressee&) const;
-    bool                 operator != (const KABC::Addressee&) const;
+    bool                 operator == (const TDEABC::Addressee&) const;
+    bool                 operator != (const TDEABC::Addressee&) const;
 %End
 
     bool                 isEmpty () const;
@@ -147,15 +147,15 @@ public:
     static TQString       mailerLabel ();
 %End
 
-    void                 setTimeZone (const KABC::TimeZone&);
-    KABC::TimeZone       timeZone () const;
+    void                 setTimeZone (const TDEABC::TimeZone&);
+    TDEABC::TimeZone       timeZone () const;
 
 %If ( KDE_3_1_0 -  )
     static TQString       timeZoneLabel ();
 %End
 
-    void                 setGeo (const KABC::Geo&);
-    KABC::Geo            geo () const;
+    void                 setGeo (const TDEABC::Geo&);
+    TDEABC::Geo            geo () const;
 
 %If ( KDE_3_1_0 -  )
     static TQString       geoLabel ();
@@ -215,20 +215,20 @@ public:
 
 %If ( KDE_3_1_0 -  )
     static TQString       urlLabel ();
-    void                 setSecrecy (const KABC::Secrecy&);
-    KABC::Secrecy        secrecy () const;
+    void                 setSecrecy (const TDEABC::Secrecy&);
+    TDEABC::Secrecy        secrecy () const;
     static TQString       secrecyLabel ();
-    void                 setLogo (const KABC::Picture&);
-    KABC::Picture        logo () const;
+    void                 setLogo (const TDEABC::Picture&);
+    TDEABC::Picture        logo () const;
     static TQString       logoLabel ();
-    void                 setPhoto (const KABC::Picture&);
-    KABC::Picture        photo () const;
+    void                 setPhoto (const TDEABC::Picture&);
+    TDEABC::Picture        photo () const;
     static TQString       photoLabel ();
-    void                 setSound (const KABC::Sound&);
-    KABC::Sound          sound () const;
+    void                 setSound (const TDEABC::Sound&);
+    TDEABC::Sound          sound () const;
     static TQString       soundLabel ();
-    void                 setAgent (const KABC::Agent&);
-    KABC::Agent          agent () const;
+    void                 setAgent (const TDEABC::Agent&);
+    TDEABC::Agent          agent () const;
     static TQString       agentLabel ();
 %End
 
@@ -249,41 +249,41 @@ public:
     void                 setEmails (const TQStringList&);
 %End
 
-    void                 insertPhoneNumber (const KABC::PhoneNumber&);
-    void                 removePhoneNumber (const KABC::PhoneNumber&);
-    KABC::PhoneNumber    phoneNumber (int) const;
-    KABC::PhoneNumber::List phoneNumbers () const;
+    void                 insertPhoneNumber (const TDEABC::PhoneNumber&);
+    void                 removePhoneNumber (const TDEABC::PhoneNumber&);
+    TDEABC::PhoneNumber    phoneNumber (int) const;
+    TDEABC::PhoneNumber::List phoneNumbers () const;
 
 %If ( KDE_3_1_0 -  )
-    KABC::PhoneNumber::List phoneNumbers (int) const;
+    TDEABC::PhoneNumber::List phoneNumbers (int) const;
 %End
 
-    KABC::PhoneNumber    findPhoneNumber (const TQString&) const;
+    TDEABC::PhoneNumber    findPhoneNumber (const TQString&) const;
 
 %If ( KDE_3_1_0 -  )
-    void                 insertKey (const KABC::Key&);
-    void                 removeKey (const KABC::Key&);
-    KABC::Key            key (int, TQString = TQString ::null ) const;
-    KABC::Key::List      keys () const;
+    void                 insertKey (const TDEABC::Key&);
+    void                 removeKey (const TDEABC::Key&);
+    TDEABC::Key            key (int, TQString = TQString ::null ) const;
+    TDEABC::Key::List      keys () const;
 
 %If ( KDE_3_4_2 -  )
-    void                 setKeys (const KABC::Key::List&);
+    void                 setKeys (const TDEABC::Key::List&);
 %End
 
-    KABC::Key::List      keys (int, TQString = TQString ::null ) const;
-    KABC::Key            findKey (const TQString&) const;
+    TDEABC::Key::List      keys (int, TQString = TQString ::null ) const;
+    TDEABC::Key            findKey (const TQString&) const;
 %End
 
-    void                 insertAddress (const KABC::Address&);
-    void                 removeAddress (const KABC::Address&);
-    KABC::Address        address (int) const;
-    KABC::Address::List  addresses () const;
+    void                 insertAddress (const TDEABC::Address&);
+    void                 removeAddress (const TDEABC::Address&);
+    TDEABC::Address        address (int) const;
+    TDEABC::Address::List  addresses () const;
 
 %If ( KDE_3_1_0 -  )
-    KABC::Address::List  addresses (int) const;
+    TDEABC::Address::List  addresses (int) const;
 %End
 
-    KABC::Address        findAddress (const TQString&) const;
+    TDEABC::Address        findAddress (const TQString&) const;
     void                 insertCategory (const TQString&);
     void                 removeCategory (const TQString&);
     bool                 hasCategory (const TQString&) const;
@@ -303,14 +303,14 @@ public:
 
 %If ( KDE_3_1_0 -  )
     TQString              asString () const;
-    void                 setResource (KABC::Resource*);
-    KABC::Resource*      resource () const;
+    void                 setResource (TDEABC::Resource*);
+    TDEABC::Resource*      resource () const;
     void                 setChanged (bool);
     bool                 changed () const;
 
 %If ( KDE_3_4_2 -  )
-    static void          setSortMode (KABC::SortMode*);
-    bool                 operator < (const KABC::Addressee&);
+    static void          setSortMode (TDEABC::SortMode*);
+    bool                 operator < (const TDEABC::Addressee&);
 %End
 
 %End
@@ -324,20 +324,20 @@ public:
 
 
 %If ( KDE_3_1_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const KABC::Addressee&);
-//igx TQDataStream&         operator >> (TQDataStream&, KABC::Addressee&);
+//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::Addressee&);
+//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::Addressee&);
 %End
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 
 
-%MappedType KABC::Addressee::List
-//converts a Python list of KABC::Addressee
+%MappedType TDEABC::Addressee::List
+//converts a Python list of TDEABC::Addressee
 {
 %TypeHeaderCode
 #include <tqvaluelist.h>
-//typedef TQValueList<KABC::Addressee> List;
+//typedef TQValueList<TDEABC::Addressee> List;
 %End
 
 %ConvertFromTypeCode
@@ -349,14 +349,14 @@ public:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    TQValueList<KABC::Addressee> *cpplist = (TQValueList<KABC::Addressee> *)sipCpp;
+    TQValueList<TDEABC::Addressee> *cpplist = (TQValueList<TDEABC::Addressee> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    TQValueList<KABC::Addressee>::Iterator it;
+    TQValueList<TDEABC::Addressee>::Iterator it;
     for( it = cpplist->begin(); it != cpplist->end(); ++it )
     {
-        if (((inst = sipConvertFromNewType(new KABC::Addressee (*it), sipType_KABC_Addressee, NULL)) == NULL)
+        if (((inst = sipConvertFromNewType(new TDEABC::Addressee (*it), sipType_KABC_Addressee, NULL)) == NULL)
             || PyList_Append (pylist, inst) < 0)
         {
             Py_DECREF (pylist);
@@ -372,16 +372,16 @@ public:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    TQValueList<KABC::Addressee> *cpplist = new TQValueList<KABC::Addressee>;
+    TQValueList<TDEABC::Addressee> *cpplist = new TQValueList<TDEABC::Addressee>;
 
     PyObject *elem;
-    KABC::Addressee *cpp;
+    TDEABC::Addressee *cpp;
     int iserr = 0;
 
     for (int i = 0; i < PyList_Size (sipPy); i++)
     {
         elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::Addressee *)sipForceConvertToType(elem, sipType_KABC_Addressee, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+        cpp = (TDEABC::Addressee *)sipForceConvertToType(elem, sipType_KABC_Addressee, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
 
         if (iserr)
         {
@@ -399,12 +399,12 @@ public:
 %End
 };
 
-%MappedType KABC::Address::List
-//converts a Python list of KABC::Address
+%MappedType TDEABC::Address::List
+//converts a Python list of TDEABC::Address
 {
 %TypeHeaderCode
 #include <tqvaluelist.h>
-//typedef TQValueList<KABC::Address> List;
+//typedef TQValueList<TDEABC::Address> List;
 %End
 
 %ConvertFromTypeCode
@@ -416,14 +416,14 @@ public:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    TQValueList<KABC::Address> *cpplist = (TQValueList<KABC::Address> *)sipCpp;
+    TQValueList<TDEABC::Address> *cpplist = (TQValueList<TDEABC::Address> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    TQValueList<KABC::Address>::Iterator it;
+    TQValueList<TDEABC::Address>::Iterator it;
     for( it = cpplist->begin(); it != cpplist->end(); ++it )
     {
-        if (((inst = sipConvertFromNewType(new KABC::Address (*it), sipType_KABC_Address, NULL)) == NULL)
+        if (((inst = sipConvertFromNewType(new TDEABC::Address (*it), sipType_KABC_Address, NULL)) == NULL)
             || PyList_Append (pylist, inst) < 0)
         {
             Py_DECREF (pylist);
@@ -439,16 +439,16 @@ public:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    TQValueList<KABC::Address> *cpplist = new TQValueList<KABC::Address>;
+    TQValueList<TDEABC::Address> *cpplist = new TQValueList<TDEABC::Address>;
 
     PyObject *elem;
-    KABC::Address *cpp;
+    TDEABC::Address *cpp;
     int iserr = 0;
 
     for (int i = 0; i < PyList_Size (sipPy); i++)
     {
         elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::Address *)sipForceConvertToType(elem, sipType_KABC_Address, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+        cpp = (TDEABC::Address *)sipForceConvertToType(elem, sipType_KABC_Address, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
 
         if (iserr)
         {
diff --git a/sip/kabc/addresseedialog.sip b/sip/kabc/addresseedialog.sip
index 388d4cc..a162b8d 100644
--- a/sip/kabc/addresseedialog.sip
+++ b/sip/kabc/addresseedialog.sip
@@ -23,7 +23,7 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
 class AddresseeItem : TQListViewItem
@@ -41,8 +41,8 @@ public:
         Email
     };
 
-                         AddresseeItem (TQListView*, const KABC::Addressee&);
-    KABC::Addressee      addressee () const;
+                         AddresseeItem (TQListView*, const TDEABC::Addressee&);
+    TDEABC::Addressee      addressee () const;
     virtual TQString      key (int, bool) const;
 
 };  // class AddresseeItem
@@ -57,10 +57,10 @@ class AddresseeDialog : KDialogBase
 
 public:
                          AddresseeDialog (TQWidget* = 0, bool = 0);
-    KABC::Addressee      addressee ();
-    KABC::Addressee::List addressees ();
-    static KABC::Addressee getAddressee (TQWidget*);
-    static KABC::Addressee::List getAddressees (TQWidget*);
+    TDEABC::Addressee      addressee ();
+    TDEABC::Addressee::List addressees ();
+    static TDEABC::Addressee getAddressee (TQWidget*);
+    static TDEABC::Addressee::List getAddressees (TQWidget*);
 
 protected slots:
 
@@ -71,5 +71,5 @@ protected slots:
 
 };  // class AddresseeDialog
 
-};  // namespace KABC
+};  // namespace TDEABC
 
diff --git a/sip/kabc/addresseelist.sip b/sip/kabc/addresseelist.sip
index a7d24cc..9969a16 100644
--- a/sip/kabc/addresseelist.sip
+++ b/sip/kabc/addresseelist.sip
@@ -30,7 +30,7 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 namespace SortingTraits
 {
@@ -43,8 +43,8 @@ class Uid
 
 
 public:
-    static bool          eq (const KABC::Addressee&, const KABC::Addressee&);
-    static bool          lt (const KABC::Addressee&, const KABC::Addressee&);
+    static bool          eq (const TDEABC::Addressee&, const TDEABC::Addressee&);
+    static bool          lt (const TDEABC::Addressee&, const TDEABC::Addressee&);
 
 };  // class Uid
 
@@ -57,8 +57,8 @@ class Name
 
 
 public:
-    static bool          eq (const KABC::Addressee&, const KABC::Addressee&);
-    static bool          lt (const KABC::Addressee&, const KABC::Addressee&);
+    static bool          eq (const TDEABC::Addressee&, const TDEABC::Addressee&);
+    static bool          lt (const TDEABC::Addressee&, const TDEABC::Addressee&);
 
 };  // class Name
 
@@ -71,8 +71,8 @@ class FormattedName
 
 
 public:
-    static bool          eq (const KABC::Addressee&, const KABC::Addressee&);
-    static bool          lt (const KABC::Addressee&, const KABC::Addressee&);
+    static bool          eq (const TDEABC::Addressee&, const TDEABC::Addressee&);
+    static bool          lt (const TDEABC::Addressee&, const TDEABC::Addressee&);
 
 };  // class FormattedName
 
@@ -85,8 +85,8 @@ class FamilyName
 
 
 public:
-    static bool          eq (const KABC::Addressee&, const KABC::Addressee&);
-    static bool          lt (const KABC::Addressee&, const KABC::Addressee&);
+    static bool          eq (const TDEABC::Addressee&, const TDEABC::Addressee&);
+    static bool          lt (const TDEABC::Addressee&, const TDEABC::Addressee&);
 
 };  // class FamilyName
 
@@ -99,8 +99,8 @@ class GivenName
 
 
 public:
-    static bool          eq (const KABC::Addressee&, const KABC::Addressee&);
-    static bool          lt (const KABC::Addressee&, const KABC::Addressee&);
+    static bool          eq (const TDEABC::Addressee&, const TDEABC::Addressee&);
+    static bool          lt (const TDEABC::Addressee&, const TDEABC::Addressee&);
 
 };  // class GivenName
 
@@ -116,7 +116,7 @@ enum
     GivenName
 };
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/addresslineedit.sip b/sip/kabc/addresslineedit.sip
index 5d68ba5..a3e3f03 100644
--- a/sip/kabc/addresslineedit.sip
+++ b/sip/kabc/addresslineedit.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class AddressLineEdit : KLineEdit
@@ -60,7 +60,7 @@ protected:
 
 };  // class AddressLineEdit
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/agent.sip b/sip/kabc/agent.sip
index 5842970..3d836b3 100644
--- a/sip/kabc/agent.sip
+++ b/sip/kabc/agent.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class Agent
@@ -38,21 +38,21 @@ class Agent
 public:
                          Agent ();
                          Agent (const TQString&);
-                         Agent (KABC::Addressee*);
-    bool                 operator == (const KABC::Agent&) const;
-    bool                 operator != (const KABC::Agent&) const;
+                         Agent (TDEABC::Addressee*);
+    bool                 operator == (const TDEABC::Agent&) const;
+    bool                 operator != (const TDEABC::Agent&) const;
     void                 setUrl (const TQString&);
-    void                 setAddressee (KABC::Addressee*);
+    void                 setAddressee (TDEABC::Addressee*);
     bool                 isIntern () const;
     TQString              url () const;
-    KABC::Addressee*     addressee () const;
+    TDEABC::Addressee*     addressee () const;
     TQString              asString () const;
 
 };  // class Agent
 
-//igx TQDataStream&         operator << (TQDataStream&, const KABC::Agent&);
-//igx TQDataStream&         operator >> (TQDataStream&, KABC::Agent&);
-};  // namespace KABC
+//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::Agent&);
+//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::Agent&);
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/distributionlist.sip b/sip/kabc/distributionlist.sip
index 28f10c5..1526117 100644
--- a/sip/kabc/distributionlist.sip
+++ b/sip/kabc/distributionlist.sip
@@ -23,7 +23,7 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
 class DistributionList
@@ -39,23 +39,23 @@ public:
     {
 
     public:
-        typedef TQValueList<KABC::DistributionList::Entry> List;
+        typedef TQValueList<TDEABC::DistributionList::Entry> List;
                              Entry ();
-                             Entry (const KABC::Addressee&, const TQString&);
-        KABC::Addressee      addressee;
+                             Entry (const TDEABC::Addressee&, const TQString&);
+        TDEABC::Addressee      addressee;
         TQString              email;
 
     };  // class Entry
 
 
 public:
-                         DistributionList (KABC::DistributionListManager*, const TQString&);
+                         DistributionList (TDEABC::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 );
+    void                 insertEntry (const TDEABC::Addressee&, const TQString& = TQString ::null );
+    void                 removeEntry (const TDEABC::Addressee&, const TQString& = TQString ::null );
     TQStringList          emails () const;
-    KABC::DistributionList::Entry::List entries () const;
+    TDEABC::DistributionList::Entry::List entries () const;
 
 };  // class DistributionList
 
@@ -68,10 +68,10 @@ class DistributionListManager
 
 
 public:
-                         DistributionListManager (KABC::AddressBook*);
-    KABC::DistributionList* list (const TQString&);
-    void                 insert (KABC::DistributionList*);
-    void                 remove (KABC::DistributionList*);
+                         DistributionListManager (TDEABC::AddressBook*);
+    TDEABC::DistributionList* list (const TQString&);
+    void                 insert (TDEABC::DistributionList*);
+    void                 remove (TDEABC::DistributionList*);
     TQStringList          listNames ();
     bool                 load ();
     bool                 save ();
@@ -89,7 +89,7 @@ class DistributionListWatcher : TQObject
 
 
 public:
-    static KABC::DistributionListWatcher* self ();
+    static TDEABC::DistributionListWatcher* self ();
 
 signals:
     void                 changed ();
@@ -102,12 +102,12 @@ protected:
 
 %End
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 
 
-%MappedType KABC::DistributionList::Entry::List
-//converts a Python list of KABC::DistributionList::Entry
+%MappedType TDEABC::DistributionList::Entry::List
+//converts a Python list of TDEABC::DistributionList::Entry
 {
 %TypeHeaderCode
 #include <distributionlist.h>
@@ -122,14 +122,14 @@ protected:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    TQValueList<KABC::DistributionList::Entry> *cpplist = (TQValueList<KABC::DistributionList::Entry> *)sipCpp;
+    TQValueList<TDEABC::DistributionList::Entry> *cpplist = (TQValueList<TDEABC::DistributionList::Entry> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    TQValueList<KABC::DistributionList::Entry>::Iterator it;
+    TQValueList<TDEABC::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)
+        if (((inst = sipConvertFromNewType(new TDEABC::DistributionList::Entry (*it), sipType_KABC_DistributionList_Entry, NULL)) == NULL)
             || PyList_Append (pylist, inst) < 0)
         {
             Py_DECREF (pylist);
@@ -145,16 +145,16 @@ protected:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    TQValueList<KABC::DistributionList::Entry> *cpplist = new TQValueList<KABC::DistributionList::Entry>;
+    TQValueList<TDEABC::DistributionList::Entry> *cpplist = new TQValueList<TDEABC::DistributionList::Entry>;
 
     PyObject *elem;
-    KABC::DistributionList::Entry *cpp;
+    TDEABC::DistributionList::Entry *cpp;
     int iserr = 0;
 
     for (int i = 0; i < PyList_Size (sipPy); i++)
     {
         elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::DistributionList::Entry *)sipForceConvertToType(elem, sipType_KABC_DistributionList_Entry, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+        cpp = (TDEABC::DistributionList::Entry *)sipForceConvertToType(elem, sipType_KABC_DistributionList_Entry, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
 
         if (iserr)
         {
diff --git a/sip/kabc/distributionlistdialog.sip b/sip/kabc/distributionlistdialog.sip
index 8aa9f4e..4d3ff1c 100644
--- a/sip/kabc/distributionlistdialog.sip
+++ b/sip/kabc/distributionlistdialog.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class DistributionListDialog : KDialogBase
@@ -36,7 +36,7 @@ class DistributionListDialog : KDialogBase
 
 
 public:
-                         DistributionListDialog (KABC::AddressBook*, TQWidget*);
+                         DistributionListDialog (TDEABC::AddressBook*, TQWidget*);
 
 };  // class DistributionListDialog
 
@@ -64,11 +64,11 @@ class DistributionListEditorWidget : TQWidget
 
 
 public:
-                         DistributionListEditorWidget (KABC::AddressBook*, TQWidget*);
+                         DistributionListEditorWidget (TDEABC::AddressBook*, TQWidget*);
 
 };  // class DistributionListEditorWidget
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/distributionlisteditor.sip b/sip/kabc/distributionlisteditor.sip
index 48ad147..53757b6 100644
--- a/sip/kabc/distributionlisteditor.sip
+++ b/sip/kabc/distributionlisteditor.sip
@@ -23,7 +23,7 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
 class EmailSelectDialog : KDialogBase
@@ -43,5 +43,5 @@ public:
 
 //ig class DistributionListEditor : TQWidget;
 
-};  // namespace KABC
+};  // namespace TDEABC
 
diff --git a/sip/kabc/errorhandler.sip b/sip/kabc/errorhandler.sip
index e232e35..8004383 100644
--- a/sip/kabc/errorhandler.sip
+++ b/sip/kabc/errorhandler.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class ErrorHandler
@@ -42,7 +42,7 @@ public:
 };  // class ErrorHandler
 
 
-class ConsoleErrorHandler : KABC::ErrorHandler
+class ConsoleErrorHandler : TDEABC::ErrorHandler
 {
 %TypeHeaderCode
 #include <tqwidget.h>
@@ -58,7 +58,7 @@ public:
 
 %If ( KDE_3_5_1 -  )
 
-class GUIErrorHandler : KABC::ErrorHandler
+class GUIErrorHandler : TDEABC::ErrorHandler
 {
 %TypeHeaderCode
 #include <errorhandler.h>
@@ -75,7 +75,7 @@ public:
 
 %If ( KDE_3_2_0 -  )
 
-class GuiErrorHandler : KABC::ErrorHandler
+class GuiErrorHandler : TDEABC::ErrorHandler
 {
 %TypeHeaderCode
 #include <tqwidget.h>
@@ -91,7 +91,7 @@ public:
 
 %End
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/field.sip b/sip/kabc/field.sip
index a7c1a85..68d325a 100644
--- a/sip/kabc/field.sip
+++ b/sip/kabc/field.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class Field
@@ -36,7 +36,7 @@ class Field
 
 
 public:
-    typedef TQValueList<KABC::Field*> List;
+    typedef TQValueList<TDEABC::Field*> List;
 
     enum FieldCategory
     {
@@ -52,30 +52,30 @@ public:
     virtual TQString      label ();
     virtual int          category ();
     static TQString       categoryLabel (int);
-    virtual TQString      value (const KABC::Addressee&);
-    virtual bool         setValue (KABC::Addressee&, const TQString&);
+    virtual TQString      value (const TDEABC::Addressee&);
+    virtual bool         setValue (TDEABC::Addressee&, const TQString&);
 
 %If ( KDE_3_2_0 -  )
-    TQString              sortKey (const KABC::Addressee&);
+    TQString              sortKey (const TDEABC::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 TQString&, int, const TQString&, const TQString&);
+    virtual bool         equals (TDEABC::Field*);
+    static TDEABC::Field::List allFields ();
+    static TDEABC::Field::List defaultFields ();
+    static TDEABC::Field*  createCustomField (const TQString&, int, const TQString&, const TQString&);
     static void          deleteFields ();
-    static void          saveFields (TDEConfig*, const TQString&, const KABC::Field::List&);
-    static void          saveFields (const TQString&, const KABC::Field::List&);
-    static KABC::Field::List restoreFields (TDEConfig*, const TQString&);
-    static KABC::Field::List restoreFields (const TQString&);
+    static void          saveFields (TDEConfig*, const TQString&, const TDEABC::Field::List&);
+    static void          saveFields (const TQString&, const TDEABC::Field::List&);
+    static TDEABC::Field::List restoreFields (TDEConfig*, const TQString&);
+    static TDEABC::Field::List restoreFields (const TQString&);
 
 protected:
     static void          createField (int, int = 0);
     static void          createDefaultField (int, int = 0);
 
 private:
-//ig                          Field (KABC::Field::FieldImpl*);
+//ig                          Field (TDEABC::Field::FieldImpl*);
                          ~Field ();
 //force
                          Field ();
@@ -83,15 +83,15 @@ private:
 
 };  // class Field
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
 
 
 %If (KDE_3_1_0 - )
-%MappedType KABC::Field::List
-//converts a Python list of KABC::Field
+%MappedType TDEABC::Field::List
+//converts a Python list of TDEABC::Field
 {
 %TypeHeaderCode
 #include <field.h>
@@ -106,14 +106,14 @@ private:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    TQValueList<KABC::Field *> *cpplist = (TQValueList<KABC::Field *> *)sipCpp;
+    TQValueList<TDEABC::Field *> *cpplist = (TQValueList<TDEABC::Field *> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    TQValueList<KABC::Field *>::Iterator it;
+    TQValueList<TDEABC::Field *>::Iterator it;
     for( it = cpplist->begin(); it != cpplist->end(); ++it )
     {
-        if (((inst = sipConvertFromType((KABC::Field *)(*it), sipType_KABC_Field, NULL)) == NULL)
+        if (((inst = sipConvertFromType((TDEABC::Field *)(*it), sipType_KABC_Field, NULL)) == NULL)
             || PyList_Append (pylist, inst) < 0)
         {
             Py_DECREF (pylist);
@@ -129,16 +129,16 @@ private:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    TQValueList<KABC::Field *> *cpplist = new TQValueList<KABC::Field *>;
+    TQValueList<TDEABC::Field *> *cpplist = new TQValueList<TDEABC::Field *>;
 
     PyObject *elem;
-    KABC::Field *cpp;
+    TDEABC::Field *cpp;
     int iserr = 0;
 
     for (int i = 0; i < PyList_Size (sipPy); i++)
     {
         elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::Field *)sipForceConvertToType(elem, sipType_KABC_Field, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
+        cpp = (TDEABC::Field *)sipForceConvertToType(elem, sipType_KABC_Field, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
 
         if (iserr)
         {
diff --git a/sip/kabc/format.sip b/sip/kabc/format.sip
index 30e1197..edf428a 100644
--- a/sip/kabc/format.sip
+++ b/sip/kabc/format.sip
@@ -23,7 +23,7 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
 class Format
@@ -34,10 +34,10 @@ class Format
 
 
 public:
-    virtual bool         load (KABC::AddressBook*, const TQString&)  = 0;
-    virtual bool         save (KABC::AddressBook*, const TQString&)  = 0;
+    virtual bool         load (TDEABC::AddressBook*, const TQString&)  = 0;
+    virtual bool         save (TDEABC::AddressBook*, const TQString&)  = 0;
 
 };  // class Format
 
-};  // namespace KABC
+};  // namespace TDEABC
 
diff --git a/sip/kabc/formatfactory.sip b/sip/kabc/formatfactory.sip
index 1eac237..0bede53 100644
--- a/sip/kabc/formatfactory.sip
+++ b/sip/kabc/formatfactory.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class FormatInfo
@@ -51,10 +51,10 @@ class FormatFactory
 
 
 public:
-    static KABC::FormatFactory* self ();
-    KABC::FormatPlugin*  format (const TQString&);
+    static TDEABC::FormatFactory* self ();
+    TDEABC::FormatPlugin*  format (const TQString&);
     TQStringList          formats ();
-    KABC::FormatInfo*    info (const TQString&);
+    TDEABC::FormatInfo*    info (const TQString&);
 
 protected:
                          FormatFactory ();
@@ -68,7 +68,7 @@ protected:
 
 };  // class FormatFactory
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/formatplugin.sip b/sip/kabc/formatplugin.sip
index 1008943..7b38f41 100644
--- a/sip/kabc/formatplugin.sip
+++ b/sip/kabc/formatplugin.sip
@@ -25,10 +25,10 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
-class FormatPlugin : KABC::Plugin
+class FormatPlugin : TDEABC::Plugin
 {
 %TypeHeaderCode
 #include <formatplugin.h>
@@ -36,15 +36,15 @@ class FormatPlugin : KABC::Plugin
 
 
 public:
-    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         load (TDEABC::Addressee&, TQFile*)  = 0;
+    virtual bool         loadAll (TDEABC::AddressBook*, TDEABC::Resource*, TQFile*)  = 0;
+    virtual void         save (const TDEABC::Addressee&, TQFile*)  = 0;
+    virtual void         saveAll (TDEABC::AddressBook*, TDEABC::Resource*, TQFile*)  = 0;
     virtual bool         checkFormat (TQFile*) const = 0;
 
 };  // class FormatPlugin
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/geo.sip b/sip/kabc/geo.sip
index 3ffca2f..8454114 100644
--- a/sip/kabc/geo.sip
+++ b/sip/kabc/geo.sip
@@ -23,7 +23,7 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
 class Geo
@@ -41,10 +41,10 @@ public:
     void                 setLongitude (float);
     float                longitude () const;
     bool                 isValid () const;
-    bool                 operator == (const KABC::Geo&) const;
+    bool                 operator == (const TDEABC::Geo&) const;
 
 %If ( KDE_3_1_0 -  )
-    bool                 operator != (const KABC::Geo&) const;
+    bool                 operator != (const TDEABC::Geo&) const;
 %End
 
     TQString              asString () const;
@@ -53,9 +53,9 @@ public:
 
 
 %If ( KDE_3_1_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const KABC::Geo&);
-//igx TQDataStream&         operator >> (TQDataStream&, KABC::Geo&);
+//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::Geo&);
+//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::Geo&);
 %End
 
-};  // namespace KABC
+};  // namespace TDEABC
 
diff --git a/sip/kabc/key.sip b/sip/kabc/key.sip
index 113a1ad..1005498 100644
--- a/sip/kabc/key.sip
+++ b/sip/kabc/key.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class Key
@@ -36,7 +36,7 @@ class Key
 
 
 public:
-    typedef TQValueList<KABC::Key> List;
+    typedef TQValueList<TDEABC::Key> List;
     typedef TQValueList<int> TypeList;
 
     enum Types
@@ -47,8 +47,8 @@ public:
     };
 
                          Key (const TQString& = TQString ::null , int = PGP );
-    bool                 operator == (const KABC::Key&) const;
-    bool                 operator != (const KABC::Key&) const;
+    bool                 operator == (const TDEABC::Key&) const;
+    bool                 operator != (const TDEABC::Key&) const;
     void                 setId (const TQString&);
     TQString              id () const;
     void                 setBinaryData (const TQByteArray&);
@@ -65,20 +65,20 @@ public:
 
 };  // class Key
 
-//igx TQDataStream&         operator << (TQDataStream&, const KABC::Key&);
-//igx TQDataStream&         operator >> (TQDataStream&, KABC::Key&);
-};  // namespace KABC
+//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::Key&);
+//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::Key&);
+};  // namespace TDEABC
 
 %End
 
 
 
-%MappedType KABC::Key::List
-//converts a Python list of KABC::Key
+%MappedType TDEABC::Key::List
+//converts a Python list of TDEABC::Key
 {
 %TypeHeaderCode
 #include <tqvaluelist.h>
-//typedef TQValueList<KABC::Key> List;
+//typedef TQValueList<TDEABC::Key> List;
 %End
 
 %ConvertFromTypeCode
@@ -90,14 +90,14 @@ public:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    TQValueList<KABC::Key> *cpplist = (TQValueList<KABC::Key> *)sipCpp;
+    TQValueList<TDEABC::Key> *cpplist = (TQValueList<TDEABC::Key> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    TQValueList<KABC::Key>::Iterator it;
+    TQValueList<TDEABC::Key>::Iterator it;
     for( it = cpplist->begin(); it != cpplist->end(); ++it )
     {
-        if (((inst = sipConvertFromNewType(new KABC::Key(*it), sipType_KABC_Key, NULL)) == NULL)
+        if (((inst = sipConvertFromNewType(new TDEABC::Key(*it), sipType_KABC_Key, NULL)) == NULL)
             || PyList_Append (pylist, inst) < 0)
         {
             Py_DECREF (pylist);
@@ -113,16 +113,16 @@ public:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    TQValueList<KABC::Key> *cpplist = new TQValueList<KABC::Key>;
+    TQValueList<TDEABC::Key> *cpplist = new TQValueList<TDEABC::Key>;
 
     PyObject *elem;
-    KABC::Key *cpp;
+    TDEABC::Key *cpp;
     int iserr = 0;
 
     for (int i = 0; i < PyList_Size (sipPy); i++)
     {
         elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::Key *)sipForceConvertToType(elem, sipType_KABC_Key, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+        cpp = (TDEABC::Key *)sipForceConvertToType(elem, sipType_KABC_Key, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
 
         if (iserr)
         {
diff --git a/sip/kabc/ldapclient.sip b/sip/kabc/ldapclient.sip
index baf3f6d..9e66a8a 100644
--- a/sip/kabc/ldapclient.sip
+++ b/sip/kabc/ldapclient.sip
@@ -25,10 +25,10 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 //ig typedef TQValueList<TQByteArray> LdapAttrValue;
-//ig typedef TQMap<TQString,KABC::LdapAttrValue> LdapAttrMap;
+//ig typedef TQMap<TQString,TDEABC::LdapAttrValue> LdapAttrMap;
 
 class LdapObject
 {
@@ -41,22 +41,22 @@ public:
                          LdapObject ();
 
 %If ( KDE_3_3_0 -  )
-                         LdapObject (const TQString&, KABC::LdapClient*);
+                         LdapObject (const TQString&, TDEABC::LdapClient*);
 %End
 
-                         LdapObject (const KABC::LdapObject&);
+                         LdapObject (const TDEABC::LdapObject&);
     TQString              toString () const;
     void                 clear ();
     TQString              dn;
 //ig     LdapAttrMap          attrs;
 
 %If ( KDE_3_3_0 -  )
-    KABC::LdapClient*    client;
+    TDEABC::LdapClient*    client;
 %End
 
 
 protected:
-    void                 assign (const KABC::LdapObject&);
+    void                 assign (const TDEABC::LdapObject&);
 
 public:
 
@@ -82,7 +82,7 @@ public:
 signals:
     void                 done ();
     void                 error (const TQString&);
-    void                 result (const KABC::LdapObject&);
+    void                 result (const TDEABC::LdapObject&);
 
 public slots:
     void                 setHost (const TQString&);
@@ -138,7 +138,7 @@ public:
 
 
 %If ( KDE_3_3_0 -  )
-typedef TQValueList<KABC::LdapResult> LdapResultList;
+typedef TQValueList<TDEABC::LdapResult> LdapResultList;
 %End
 
 
@@ -159,22 +159,22 @@ signals:
     void                 searchData (const TQStringList&);
 
 %If ( KDE_3_3_0 -  )
-    void                 searchData (const KABC::LdapResultList&);
+    void                 searchData (const TDEABC::LdapResultList&);
 %End
 
     void                 searchDone ();
 
 };  // class LdapSearch
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
 
 
 %If (KDE_3_3_0 - )
-%MappedType KABC::LdapResultList
-//converts a Python list of KABC::LdapREsult
+%MappedType TDEABC::LdapResultList
+//converts a Python list of TDEABC::LdapREsult
 {
 %TypeHeaderCode
 #include <ldapclient.h>
@@ -189,14 +189,14 @@ signals:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    TQValueList<KABC::LdapResult> *cpplist = (TQValueList<KABC::LdapResult> *)sipCpp;
+    TQValueList<TDEABC::LdapResult> *cpplist = (TQValueList<TDEABC::LdapResult> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    TQValueList<KABC::LdapResult>::Iterator it;
+    TQValueList<TDEABC::LdapResult>::Iterator it;
     for( it = cpplist->begin(); it != cpplist->end(); ++it )
     {
-        if (((inst = sipConvertFromNewType(new KABC::LdapResult(*it), sipType_KABC_LdapResult, NULL)) == NULL)
+        if (((inst = sipConvertFromNewType(new TDEABC::LdapResult(*it), sipType_KABC_LdapResult, NULL)) == NULL)
             || PyList_Append (pylist, inst) < 0)
         {
             Py_DECREF (pylist);
@@ -212,16 +212,16 @@ signals:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    TQValueList<KABC::LdapResult> *cpplist = new TQValueList<KABC::LdapResult>;
+    TQValueList<TDEABC::LdapResult> *cpplist = new TQValueList<TDEABC::LdapResult>;
 
     PyObject *elem;
-    KABC::LdapResult *cpp;
+    TDEABC::LdapResult *cpp;
     int iserr = 0;
 
     for (int i = 0; i < PyList_Size (sipPy); i++)
     {
         elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::LdapResult *)sipForceConvertToType(elem, sipType_KABC_LdapResult, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+        cpp = (TDEABC::LdapResult *)sipForceConvertToType(elem, sipType_KABC_LdapResult, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
 
         if (iserr)
         {
diff --git a/sip/kabc/ldapconfigwidget.sip b/sip/kabc/ldapconfigwidget.sip
index 928c00a..81b4cf6 100644
--- a/sip/kabc/ldapconfigwidget.sip
+++ b/sip/kabc/ldapconfigwidget.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_3_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class LdapConfigWidget : TQWidget
@@ -95,11 +95,11 @@ public:
     int                  timeLimit () const;
     int                  flags () const;
     void                 setFlags (int);
-    KABC::LDAPUrl        url () const;
+    TDEABC::LDAPUrl        url () const;
 
 };  // class LdapConfigWidget
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/ldapurl.sip b/sip/kabc/ldapurl.sip
index 605fe6d..371fb5a 100644
--- a/sip/kabc/ldapurl.sip
+++ b/sip/kabc/ldapurl.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_3_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class LDAPUrl : KURL
@@ -62,14 +62,14 @@ public:
     void                 setDn (const TQString&);
     const TQStringList&   attributes ();
     void                 setAttributes (const TQStringList&);
-    KABC::LDAPUrl::Scope scope () const;
-    void                 setScope (KABC::LDAPUrl::Scope);
+    TDEABC::LDAPUrl::Scope scope () const;
+    void                 setScope (TDEABC::LDAPUrl::Scope);
     const TQString&       filter () const;
     void                 setFilter (TQString);
     bool                 hasExtension (const TQString&) const;
-    KABC::LDAPUrl::Extension extension (const TQString&) const;
+    TDEABC::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 TDEABC::LDAPUrl::Extension&);
     void                 setExtension (const TQString&, const TQString&, bool = 0);
     void                 removeExtension (const TQString&);
     void                 updateQuery ();
@@ -79,7 +79,7 @@ protected:
 
 };  // class LDAPUrl
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/ldif.sip b/sip/kabc/ldif.sip
index 7cc6eab..710b570 100644
--- a/sip/kabc/ldif.sip
+++ b/sip/kabc/ldif.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_3_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class LDIF
@@ -74,11 +74,11 @@ public:
     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 ();
+    TDEABC::LDIF::ParseVal processLine ();
+    TDEABC::LDIF::ParseVal nextItem ();
     void                 setLDIF (const TQByteArray&);
     void                 endLDIF ();
-    KABC::LDIF::EntryType entryType () const;
+    TDEABC::LDIF::EntryType entryType () const;
     int                  modType () const;
     const TQString&       dn () const;
     const TQString&       newRdn () const;
@@ -93,7 +93,7 @@ public:
 
 };  // class LDIF
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/ldifconverter.sip b/sip/kabc/ldifconverter.sip
index 76fa5c1..8e14ad3 100644
--- a/sip/kabc/ldifconverter.sip
+++ b/sip/kabc/ldifconverter.sip
@@ -29,7 +29,7 @@
 
 
 %If ( KDE_3_2_0 -  )
-namespace KABC
+namespace TDEABC
 {
 namespace LDIFConverter
 {
@@ -39,31 +39,31 @@ namespace LDIFConverter
 //ig bool                 addresseeToLDIF (const AddresseeList&, TQString&);
 %End
 
-bool                 addresseeToLDIF (const KABC::Addressee&, TQString&);
+bool                 addresseeToLDIF (const TDEABC::Addressee&, TQString&);
 TQString              makeLDIFfieldString (TQString, TQString, bool = 1);
-bool                 parseSingleLine (KABC::Addressee&, KABC::Address&, KABC::Address&, TQString&);
+bool                 parseSingleLine (TDEABC::Addressee&, TDEABC::Address&, TDEABC::Address&, TQString&);
 bool                 splitLine (TQString&, TQString&, TQString&);
-bool                 evaluatePair (KABC::Addressee&, KABC::Address&, KABC::Address&, TQString&, TQString&);
+bool                 evaluatePair (TDEABC::Addressee&, TDEABC::Address&, TDEABC::Address&, TQString&, TQString&);
 
 %If (  - KDE_3_5_2 )
-bool                 LDIFToAddressee (const TQString&, KABC::Addressee::List&, TQDateTime = TQDateTime ::currentDateTime ());
+bool                 LDIFToAddressee (const TQString&, TDEABC::Addressee::List&, TQDateTime = TQDateTime ::currentDateTime ());
 %MethodCode
 
-    KABC::Addressee::List *xa1 = (KABC::Addressee::List *)a1;
+    TDEABC::Addressee::List *xa1 = (TDEABC::Addressee::List *)a1;
 
     Py_BEGIN_ALLOW_THREADS
-    sipRes = KABC::LDIFConverter::LDIFToAddressee (*a0, *xa1, *a2);    
+    sipRes = TDEABC::LDIFConverter::LDIFToAddressee (*a0, *xa1, *a2);    
     Py_END_ALLOW_THREADS
 
 %End
 
-bool                 addresseeToLDIF (const KABC::Addressee::List&, TQString&);
+bool                 addresseeToLDIF (const TDEABC::Addressee::List&, TQString&);
 %MethodCode
 
-    KABC::Addressee::List *xa0 = (KABC::Addressee::List *)a0;
+    TDEABC::Addressee::List *xa0 = (TDEABC::Addressee::List *)a0;
 
     Py_BEGIN_ALLOW_THREADS
-    sipRes = KABC::LDIFConverter::addresseeToLDIF (*xa0, *a1);
+    sipRes = TDEABC::LDIFConverter::addresseeToLDIF (*xa0, *a1);
     Py_END_ALLOW_THREADS
 
 %End
@@ -72,7 +72,7 @@ bool                 addresseeToLDIF (const KABC::Addressee::List&, TQString&);
 
 };  // namespace LDIFConverter
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/lock.sip b/sip/kabc/lock.sip
index 874d29c..10ad727 100644
--- a/sip/kabc/lock.sip
+++ b/sip/kabc/lock.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_2_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class Lock : TQObject
@@ -51,7 +51,7 @@ signals:
 
 };  // class Lock
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/locknull.sip b/sip/kabc/locknull.sip
index 7e54a1b..d157031 100644
--- a/sip/kabc/locknull.sip
+++ b/sip/kabc/locknull.sip
@@ -25,10 +25,10 @@
 
 
 %If ( KDE_3_2_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
-class LockNull : KABC::Lock
+class LockNull : TDEABC::Lock
 {
 %TypeHeaderCode
 #include <locknull.h>
@@ -43,7 +43,7 @@ public:
 
 };  // class LockNull
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/phonenumber.sip b/sip/kabc/phonenumber.sip
index 6b2ee66..4d8e6e8 100644
--- a/sip/kabc/phonenumber.sip
+++ b/sip/kabc/phonenumber.sip
@@ -23,7 +23,7 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
 class PhoneNumber
@@ -34,7 +34,7 @@ class PhoneNumber
 
 
 public:
-    typedef TQValueList<KABC::PhoneNumber> List;
+    typedef TQValueList<TDEABC::PhoneNumber> List;
 
 %If ( KDE_3_1_0 -  )
     typedef TQValueList<int> TypeList;
@@ -63,8 +63,8 @@ public:
                          PhoneNumber (const TQString&, int = Home );
 
 %If ( KDE_3_1_0 -  )
-    bool                 operator == (const KABC::PhoneNumber&) const;
-    bool                 operator != (const KABC::PhoneNumber&) const;
+    bool                 operator == (const TDEABC::PhoneNumber&) const;
+    bool                 operator != (const TDEABC::PhoneNumber&) const;
 %End
 
     void                 setId (const TQString&);
@@ -112,20 +112,20 @@ public:
 
 
 %If ( KDE_3_1_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const KABC::PhoneNumber&);
-//igx TQDataStream&         operator >> (TQDataStream&, KABC::PhoneNumber&);
+//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::PhoneNumber&);
+//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::PhoneNumber&);
 %End
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 
 
-%MappedType KABC::PhoneNumber::List
-//converts a Python list of KABC::PhoneNumber
+%MappedType TDEABC::PhoneNumber::List
+//converts a Python list of TDEABC::PhoneNumber
 {
 %TypeHeaderCode
 #include <tqvaluelist.h>
-//typedef TQValueList<KABC::PhoneNumber> List;
+//typedef TQValueList<TDEABC::PhoneNumber> List;
 %End
 
 %ConvertFromTypeCode
@@ -137,14 +137,14 @@ public:
     if ((pylist = PyList_New(0)) == NULL)
         return NULL;
 
-    TQValueList<KABC::PhoneNumber> *cpplist = (TQValueList<KABC::PhoneNumber> *)sipCpp;
+    TQValueList<TDEABC::PhoneNumber> *cpplist = (TQValueList<TDEABC::PhoneNumber> *)sipCpp;
     PyObject *inst;
 
     // Get it.
-    TQValueList<KABC::PhoneNumber>::Iterator it;
+    TQValueList<TDEABC::PhoneNumber>::Iterator it;
     for( it = cpplist->begin(); it != cpplist->end(); ++it )
     {
-        if (((inst = sipConvertFromNewType(new KABC::PhoneNumber(*it), sipType_KABC_PhoneNumber, NULL)) == NULL)
+        if (((inst = sipConvertFromNewType(new TDEABC::PhoneNumber(*it), sipType_KABC_PhoneNumber, NULL)) == NULL)
             || PyList_Append (pylist, inst) < 0)
         {
             Py_DECREF (pylist);
@@ -160,16 +160,16 @@ public:
     if (sipIsErr == NULL)
         return PyList_Check(sipPy);
 
-    TQValueList<KABC::PhoneNumber> *cpplist = new TQValueList<KABC::PhoneNumber>;
+    TQValueList<TDEABC::PhoneNumber> *cpplist = new TQValueList<TDEABC::PhoneNumber>;
 
     PyObject *elem;
-    KABC::PhoneNumber *cpp;
+    TDEABC::PhoneNumber *cpp;
     int iserr = 0;
 
     for (int i = 0; i < PyList_Size (sipPy); i++)
     {
         elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::PhoneNumber *)sipForceConvertToType(elem, sipType_KABC_PhoneNumber, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+        cpp = (TDEABC::PhoneNumber *)sipForceConvertToType(elem, sipType_KABC_PhoneNumber, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
 
         if (iserr)
         {
diff --git a/sip/kabc/picture.sip b/sip/kabc/picture.sip
index d715f84..9b78ede 100644
--- a/sip/kabc/picture.sip
+++ b/sip/kabc/picture.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class Picture
@@ -39,8 +39,8 @@ public:
                          Picture ();
                          Picture (const TQString&);
                          Picture (const TQImage&);
-    bool                 operator == (const KABC::Picture&) const;
-    bool                 operator != (const KABC::Picture&) const;
+    bool                 operator == (const TDEABC::Picture&) const;
+    bool                 operator != (const TDEABC::Picture&) const;
     void                 setUrl (const TQString&);
     void                 setData (const TQImage&);
     void                 setType (const TQString&);
@@ -52,9 +52,9 @@ public:
 
 };  // class Picture
 
-//igx TQDataStream&         operator << (TQDataStream&, const KABC::Picture&);
-//igx TQDataStream&         operator >> (TQDataStream&, KABC::Picture&);
-};  // namespace KABC
+//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::Picture&);
+//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::Picture&);
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/plugin.sip b/sip/kabc/plugin.sip
index cfa9e54..17f7553 100644
--- a/sip/kabc/plugin.sip
+++ b/sip/kabc/plugin.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class Plugin
@@ -46,7 +46,7 @@ public:
 
 };  // class Plugin
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/resource.sip b/sip/kabc/resource.sip
index f5ed27b..e289140 100644
--- a/sip/kabc/resource.sip
+++ b/sip/kabc/resource.sip
@@ -23,7 +23,7 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
 class Ticket
@@ -34,10 +34,10 @@ class Ticket
 
 
 public:
-    KABC::Resource*      resource ();
+    TDEABC::Resource*      resource ();
 
 private:
-                         Ticket (KABC::Resource*);
+                         Ticket (TDEABC::Resource*);
 
 };  // class Ticket
 
@@ -59,35 +59,35 @@ public:
 //ig     class ConstIterator;
 
                          Resource (const TDEConfig*);
-//ig     virtual KABC::Resource::ConstIterator begin () const;
-//ig     virtual KABC::Resource::Iterator begin ();
-//ig     virtual KABC::Resource::ConstIterator end () const;
-//ig     virtual KABC::Resource::Iterator end ();
-    KABC::AddressBook*   addressBook ();
+//ig     virtual TDEABC::Resource::ConstIterator begin () const;
+//ig     virtual TDEABC::Resource::Iterator begin ();
+//ig     virtual TDEABC::Resource::ConstIterator end () const;
+//ig     virtual TDEABC::Resource::Iterator end ();
+    TDEABC::AddressBook*   addressBook ();
     virtual void         writeConfig (TDEConfig*);
-    virtual KABC::Ticket* requestSaveTicket ()  = 0;
-    virtual void         releaseSaveTicket (KABC::Ticket*)  = 0;
+    virtual TDEABC::Ticket* requestSaveTicket ()  = 0;
+    virtual void         releaseSaveTicket (TDEABC::Ticket*)  = 0;
     virtual bool         load ()  = 0;
     virtual bool         asyncLoad ();
-    virtual void         insertAddressee (const KABC::Addressee&);
-    virtual void         removeAddressee (const KABC::Addressee&);
-    virtual bool         save (KABC::Ticket*)  = 0;
-    virtual bool         asyncSave (KABC::Ticket*);
-    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         insertAddressee (const TDEABC::Addressee&);
+    virtual void         removeAddressee (const TDEABC::Addressee&);
+    virtual bool         save (TDEABC::Ticket*)  = 0;
+    virtual bool         asyncSave (TDEABC::Ticket*);
+    virtual TDEABC::Addressee findByUid (const TQString&);
+    virtual TDEABC::Addressee::List findByName (const TQString&);
+    virtual TDEABC::Addressee::List findByEmail (const TQString&);
+    virtual TDEABC::Addressee::List findByCategory (const TQString&);
     virtual void         clear ();
-    void                 setAddressBook (KABC::AddressBook*);
+    void                 setAddressBook (TDEABC::AddressBook*);
 
 signals:
-    void                 loadingFinished (KABC::Resource*);
-    void                 loadingError (KABC::Resource*, const TQString&);
-    void                 savingFinished (KABC::Resource*);
-    void                 savingError (KABC::Resource*, const TQString&);
+    void                 loadingFinished (TDEABC::Resource*);
+    void                 loadingError (TDEABC::Resource*, const TQString&);
+    void                 savingFinished (TDEABC::Resource*);
+    void                 savingError (TDEABC::Resource*, const TQString&);
 
 protected:
-    KABC::Ticket*        createTicket (KABC::Resource*);
+    TDEABC::Ticket*        createTicket (TDEABC::Resource*);
 
 };  // class Resource
 
@@ -96,7 +96,7 @@ protected:
 
 %If ( KDE_3_1_0 - KDE_3_2_0 )
 
-class Resource : KABC::Plugin
+class Resource : TDEABC::Plugin
 {
 %TypeHeaderCode
 #include <tdeabc/resource.h>
@@ -104,15 +104,15 @@ class Resource : KABC::Plugin
 
 
 public:
-                         Resource (KABC::AddressBook*);
+                         Resource (TDEABC::AddressBook*);
     virtual bool         open ();
     virtual void         close ();
-    virtual KABC::Ticket* requestSaveTicket ();
+    virtual TDEABC::Ticket* requestSaveTicket ();
     virtual bool         load ();
-    virtual bool         save (KABC::Ticket*);
-    KABC::AddressBook*   addressBook ();
+    virtual bool         save (TDEABC::Ticket*);
+    TDEABC::AddressBook*   addressBook ();
     virtual TQString      identifier () const;
-    virtual void         removeAddressee (const KABC::Addressee&);
+    virtual void         removeAddressee (const TDEABC::Addressee&);
     virtual void         cleanUp ();
     virtual void         setReadOnly (bool);
     virtual bool         readOnly () const;
@@ -123,7 +123,7 @@ public:
     static TQString       cryptStr (const TQString&);
 
 protected:
-    KABC::Ticket*        createTicket (KABC::Resource*);
+    TDEABC::Ticket*        createTicket (TDEABC::Resource*);
 
 };  // class Resource
 
@@ -140,21 +140,21 @@ class Resource
 
 
 public:
-                         Resource (KABC::AddressBook*);
+                         Resource (TDEABC::AddressBook*);
     virtual bool         open ();
     virtual void         close ();
-    virtual KABC::Ticket* requestSaveTicket ();
-    virtual bool         load (KABC::AddressBook*);
-    virtual bool         save (KABC::Ticket*);
-    void                 setAddressBook (KABC::AddressBook*);
-    KABC::AddressBook*   addressBook ();
+    virtual TDEABC::Ticket* requestSaveTicket ();
+    virtual bool         load (TDEABC::AddressBook*);
+    virtual bool         save (TDEABC::Ticket*);
+    void                 setAddressBook (TDEABC::AddressBook*);
+    TDEABC::AddressBook*   addressBook ();
 
 protected:
-    KABC::Ticket*        createTicket (KABC::Resource*);
+    TDEABC::Ticket*        createTicket (TDEABC::Resource*);
 
 };  // class Resource
 
 %End
 
-};  // namespace KABC
+};  // namespace TDEABC
 
diff --git a/sip/kabc/resourcefile.sip b/sip/kabc/resourcefile.sip
index 09943de..3fa78de 100644
--- a/sip/kabc/resourcefile.sip
+++ b/sip/kabc/resourcefile.sip
@@ -23,12 +23,12 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
 %If ( KDE_3_2_0 -  )
 
-class ResourceFile : KABC::Resource
+class ResourceFile : TDEABC::Resource
 {
 %TypeHeaderCode
 #include <resourcefile.h>
@@ -45,14 +45,14 @@ public:
     virtual void         doClose ();
 
 %If ( KDE_3_5_1 -  )
-    virtual KABC::Ticket* requestSaveTicket ();
-    virtual void         releaseSaveTicket (KABC::Ticket*);
+    virtual TDEABC::Ticket* requestSaveTicket ();
+    virtual void         releaseSaveTicket (TDEABC::Ticket*);
 %End
 
     virtual bool         load ();
     virtual bool         asyncLoad ();
-    virtual bool         save (KABC::Ticket*);
-    virtual bool         asyncSave (KABC::Ticket*);
+    virtual bool         save (TDEABC::Ticket*);
+    virtual bool         asyncSave (TDEABC::Ticket*);
 %End
 
     void                 setFileName (const TQString&);
@@ -63,7 +63,7 @@ public:
     TQString              format () const;
 
 %If ( KDE_3_5_2 -  )
-    virtual void         removeAddressee (const KABC::Addressee&);
+    virtual void         removeAddressee (const TDEABC::Addressee&);
 %End
 
 %End
@@ -84,27 +84,27 @@ protected:
 public:
 
 %If (  - KDE_3_5_2 )
-    void                 removeAddressee (const KABC::Addressee&);
+    void                 removeAddressee (const TDEABC::Addressee&);
 %End
 
 
 public:
 
 %If (  - KDE_3_3_0 )
-                         ResourceFile (KABC::AddressBook*, const TDEConfig*);
-                         ResourceFile (KABC::AddressBook*, const TQString&, KABC::FormatPlugin* = 0);
+                         ResourceFile (TDEABC::AddressBook*, const TDEConfig*);
+                         ResourceFile (TDEABC::AddressBook*, const TQString&, TDEABC::FormatPlugin* = 0);
     bool                 open ();
     void                 close ();
 %End
 
 
 %If (  - KDE_3_5_1 )
-    KABC::Ticket*        requestSaveTicket ();
-    void                 releaseSaveTicket (KABC::Ticket*);
+    TDEABC::Ticket*        requestSaveTicket ();
+    void                 releaseSaveTicket (TDEABC::Ticket*);
 
 %If (  - KDE_3_3_0 )
     bool                 load ();
-    bool                 save (KABC::Ticket*);
+    bool                 save (TDEABC::Ticket*);
     virtual void         cleanUp ();
 %End
 
@@ -119,7 +119,7 @@ public:
 
 %If (  - KDE_3_2_0 )
 
-class ResourceFile : KABC::Resource
+class ResourceFile : TDEABC::Resource
 {
 %TypeHeaderCode
 #include <resourcefile.h>
@@ -129,23 +129,23 @@ class ResourceFile : KABC::Resource
 public:
 
 %If ( KDE_3_1_0 -  )
-                         ResourceFile (KABC::AddressBook*, const TDEConfig*);
-                         ResourceFile (KABC::AddressBook*, const TQString&, KABC::FormatPlugin* = 0);
+                         ResourceFile (TDEABC::AddressBook*, const TDEConfig*);
+                         ResourceFile (TDEABC::AddressBook*, const TQString&, TDEABC::FormatPlugin* = 0);
     bool                 open ();
     void                 close ();
 %End
 
-    KABC::Ticket*        requestSaveTicket ();
-    void                 releaseSaveTicket (KABC::Ticket*);
+    TDEABC::Ticket*        requestSaveTicket ();
+    void                 releaseSaveTicket (TDEABC::Ticket*);
     bool                 load ();
-    bool                 save (KABC::Ticket*);
+    bool                 save (TDEABC::Ticket*);
     virtual void         cleanUp ();
     void                 setFileName (const TQString&);
     TQString              fileName () const;
 
 %If ( KDE_3_1_0 -  )
     virtual TQString      identifier () const;
-    void                 removeAddressee (const KABC::Addressee&);
+    void                 removeAddressee (const TDEABC::Addressee&);
 %End
 
 
@@ -156,8 +156,8 @@ protected:
 public:
 
 %If (  - KDE_3_1_0 )
-                         ResourceFile (KABC::AddressBook*, const TQString&, KABC::Format* = 0);
-    bool                 load (KABC::AddressBook*);
+                         ResourceFile (TDEABC::AddressBook*, const TQString&, TDEABC::Format* = 0);
+    bool                 load (TDEABC::AddressBook*);
 %End
 
 
@@ -172,5 +172,5 @@ protected slots:
 
 %End
 
-};  // namespace KABC
+};  // namespace TDEABC
 
diff --git a/sip/kabc/resourceselectdialog.sip b/sip/kabc/resourceselectdialog.sip
index d7c0a64..e3ca153 100644
--- a/sip/kabc/resourceselectdialog.sip
+++ b/sip/kabc/resourceselectdialog.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class ResourceSelectDialog
@@ -38,18 +38,18 @@ class ResourceSelectDialog
 
 
 public:
-                         ResourceSelectDialog (KABC::AddressBook*, TQWidget* = 0, const char* = 0);
-    KABC::Resource*      resource ();
-    static KABC::Resource* getResource (KABC::AddressBook*, TQWidget* = 0);
+                         ResourceSelectDialog (TDEABC::AddressBook*, TQWidget* = 0, const char* = 0);
+    TDEABC::Resource*      resource ();
+    static TDEABC::Resource* getResource (TDEABC::AddressBook*, TQWidget* = 0);
 //force
 
 private:
-                         ResourceSelectDialog (KABC::ResourceSelectDialog&);
+                         ResourceSelectDialog (TDEABC::ResourceSelectDialog&);
 //end
 
 };  // class ResourceSelectDialog
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/secrecy.sip b/sip/kabc/secrecy.sip
index 33c6d30..c0f9b50 100644
--- a/sip/kabc/secrecy.sip
+++ b/sip/kabc/secrecy.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class Secrecy
@@ -51,8 +51,8 @@ public:
 %End
 
                          Secrecy (int = Private );
-    bool                 operator == (const KABC::Secrecy&) const;
-    bool                 operator != (const KABC::Secrecy&) const;
+    bool                 operator == (const TDEABC::Secrecy&) const;
+    bool                 operator != (const TDEABC::Secrecy&) const;
 
 %If ( KDE_3_2_0 -  )
     bool                 isValid () const;
@@ -82,11 +82,11 @@ public:
 
 
 %If ( KDE_3_4_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const KABC::Secrecy&);
-//igx TQDataStream&         operator >> (TQDataStream&, KABC::Secrecy&);
+//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::Secrecy&);
+//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::Secrecy&);
 %End
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/sortmode.sip b/sip/kabc/sortmode.sip
index 537e68f..b562805 100644
--- a/sip/kabc/sortmode.sip
+++ b/sip/kabc/sortmode.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_4_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class SortMode
@@ -36,12 +36,12 @@ class SortMode
 
 
 public:
-    virtual bool         lesser (const KABC::Addressee&, const KABC::Addressee&) const = 0;
+    virtual bool         lesser (const TDEABC::Addressee&, const TDEABC::Addressee&) const = 0;
 
 };  // class SortMode
 
 
-class NameSortMode : KABC::SortMode
+class NameSortMode : TDEABC::SortMode
 {
 %TypeHeaderCode
 #include <sortmode.h>
@@ -58,13 +58,13 @@ public:
     };
 
                          NameSortMode ();
-                         NameSortMode (KABC::NameSortMode::NameType, bool = 1);
-    virtual bool         lesser (const KABC::Addressee&, const KABC::Addressee&) const;
+                         NameSortMode (TDEABC::NameSortMode::NameType, bool = 1);
+    virtual bool         lesser (const TDEABC::Addressee&, const TDEABC::Addressee&) const;
 
 };  // class NameSortMode
 
 
-class FieldSortMode : KABC::SortMode
+class FieldSortMode : TDEABC::SortMode
 {
 %TypeHeaderCode
 #include <sortmode.h>
@@ -72,12 +72,12 @@ class FieldSortMode : KABC::SortMode
 
 
 public:
-                         FieldSortMode (KABC::Field*, bool = 1);
-    virtual bool         lesser (const KABC::Addressee&, const KABC::Addressee&) const;
+                         FieldSortMode (TDEABC::Field*, bool = 1);
+    virtual bool         lesser (const TDEABC::Addressee&, const TDEABC::Addressee&) const;
 
 };  // class FieldSortMode
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/sound.sip b/sip/kabc/sound.sip
index c9c8d4e..e97aec4 100644
--- a/sip/kabc/sound.sip
+++ b/sip/kabc/sound.sip
@@ -25,7 +25,7 @@
 
 
 %If ( KDE_3_1_0 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class Sound
@@ -39,8 +39,8 @@ public:
                          Sound ();
                          Sound (const TQString&);
                          Sound (const TQByteArray&);
-    bool                 operator == (const KABC::Sound&) const;
-    bool                 operator != (const KABC::Sound&) const;
+    bool                 operator == (const TDEABC::Sound&) const;
+    bool                 operator != (const TDEABC::Sound&) const;
     void                 setUrl (const TQString&);
 
 %If ( KDE_3_4_0 -  )
@@ -55,9 +55,9 @@ public:
 
 };  // class Sound
 
-//igx TQDataStream&         operator << (TQDataStream&, const KABC::Sound&);
-//igx TQDataStream&         operator >> (TQDataStream&, KABC::Sound&);
-};  // namespace KABC
+//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::Sound&);
+//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::Sound&);
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/stdaddressbook.sip b/sip/kabc/stdaddressbook.sip
index e2e9109..305e5f2 100644
--- a/sip/kabc/stdaddressbook.sip
+++ b/sip/kabc/stdaddressbook.sip
@@ -23,10 +23,10 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
-class StdAddressBook : KABC::AddressBook
+class StdAddressBook : TDEABC::AddressBook
 {
 %TypeHeaderCode
 #include <tdeabc/resource.h>
@@ -39,8 +39,8 @@ class StdAddressBook : KABC::AddressBook
 public:
 
 %If ( KDE_3_2_0 -  )
-    static KABC::StdAddressBook* self ();
-    static KABC::StdAddressBook* self (bool);
+    static TDEABC::StdAddressBook* self ();
+    static TDEABC::StdAddressBook* self (bool);
 %End
 
     static bool          save ();
@@ -58,8 +58,8 @@ public:
     static bool          automaticSave ();
 
 %If ( KDE_3_2_0 -  )
-    KABC::Addressee      whoAmI ();
-    void                 setWhoAmI (const KABC::Addressee&);
+    TDEABC::Addressee      whoAmI ();
+    void                 setWhoAmI (const TDEABC::Addressee&);
 %End
 
 %End
@@ -82,12 +82,12 @@ protected:
 public:
 
 %If (  - KDE_3_2_0 )
-    static KABC::AddressBook* self ();
+    static TDEABC::AddressBook* self ();
 %End
 
 
 %If ( KDE_3_1_0 - KDE_3_2_2 )
-    static KABC::AddressBook* self (bool);
+    static TDEABC::AddressBook* self (bool);
 %End
 
 
@@ -107,5 +107,5 @@ public:
 
 };  // class StdAddressBook
 
-};  // namespace KABC
+};  // namespace TDEABC
 
diff --git a/sip/kabc/timezone.sip b/sip/kabc/timezone.sip
index c8f28af..0b461bf 100644
--- a/sip/kabc/timezone.sip
+++ b/sip/kabc/timezone.sip
@@ -23,7 +23,7 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
 class TimeZone
@@ -39,10 +39,10 @@ public:
     void                 setOffset (int);
     int                  offset () const;
     bool                 isValid () const;
-    bool                 operator == (const KABC::TimeZone&) const;
+    bool                 operator == (const TDEABC::TimeZone&) const;
 
 %If ( KDE_3_1_0 -  )
-    bool                 operator != (const KABC::TimeZone&) const;
+    bool                 operator != (const TDEABC::TimeZone&) const;
 %End
 
     TQString              asString () const;
@@ -51,9 +51,9 @@ public:
 
 
 %If ( KDE_3_1_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const KABC::TimeZone&);
-//igx TQDataStream&         operator >> (TQDataStream&, KABC::TimeZone&);
+//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::TimeZone&);
+//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::TimeZone&);
 %End
 
-};  // namespace KABC
+};  // namespace TDEABC
 
diff --git a/sip/kabc/vcardconverter.sip b/sip/kabc/vcardconverter.sip
index ff90050..b545fe0 100644
--- a/sip/kabc/vcardconverter.sip
+++ b/sip/kabc/vcardconverter.sip
@@ -29,7 +29,7 @@
 
 
 %If ( KDE_3_1_1 -  )
-namespace KABC
+namespace TDEABC
 {
 
 class VCardConverter
@@ -50,14 +50,14 @@ public:
                          VCardConverter ();
 
 %If ( KDE_3_2_0 -  )
-    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&);
+    TQString              createVCard (const TDEABC::Addressee&, TDEABC::VCardConverter::Version = v3_0 );
+    TQString              createVCards (TDEABC::Addressee::List, TDEABC::VCardConverter::Version = v3_0 );
+    TDEABC::Addressee      parseVCard (const TQString&);
+    TDEABC::Addressee::List parseVCards (const TQString&);
 %End
 
-    bool                 vCardToAddressee (const TQString&, KABC::Addressee&, KABC::VCardConverter::Version = v3_0 );
-    bool                 addresseeToVCard (const KABC::Addressee&, TQString&, KABC::VCardConverter::Version = v3_0 );
+    bool                 vCardToAddressee (const TQString&, TDEABC::Addressee&, TDEABC::VCardConverter::Version = v3_0 );
+    bool                 addresseeToVCard (const TDEABC::Addressee&, TQString&, TDEABC::VCardConverter::Version = v3_0 );
 
 };  // class VCardConverter
 
@@ -68,7 +68,7 @@ TQString              dateToVCardString (const TQDate&);
 TQDateTime            VCardStringToDate (const TQString&);
 %End
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End
 
diff --git a/sip/kabc/vcardformat.sip b/sip/kabc/vcardformat.sip
index fa677fc..7e387e3 100644
--- a/sip/kabc/vcardformat.sip
+++ b/sip/kabc/vcardformat.sip
@@ -23,10 +23,10 @@
 // If not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-namespace KABC
+namespace TDEABC
 {
 
-class VCardFormat : KABC::Format
+class VCardFormat : TDEABC::Format
 {
 %TypeHeaderCode
 #include <vcardformat.h>
@@ -35,10 +35,10 @@ class VCardFormat : KABC::Format
 
 public:
                          VCardFormat ();
-    bool                 load (KABC::AddressBook*, const TQString&);
-    bool                 save (KABC::AddressBook*, const TQString&);
+    bool                 load (TDEABC::AddressBook*, const TQString&);
+    bool                 save (TDEABC::AddressBook*, const TQString&);
 
 };  // class VCardFormat
 
-};  // namespace KABC
+};  // namespace TDEABC
 
diff --git a/sip/kabc/vcardformatplugin.sip b/sip/kabc/vcardformatplugin.sip
index e059f5d..f6641aa 100644
--- a/sip/kabc/vcardformatplugin.sip
+++ b/sip/kabc/vcardformatplugin.sip
@@ -25,10 +25,10 @@
 
 
 %If ( KDE_3_1_1 -  )
-namespace KABC
+namespace TDEABC
 {
 
-class VCardFormatPlugin : KABC::FormatPlugin
+class VCardFormatPlugin : TDEABC::FormatPlugin
 {
 %TypeHeaderCode
 #include <vcardformatplugin.h>
@@ -37,15 +37,15 @@ class VCardFormatPlugin : KABC::FormatPlugin
 
 public:
                          VCardFormatPlugin ();
-    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                 load (TDEABC::Addressee&, TQFile*);
+    bool                 loadAll (TDEABC::AddressBook*, TDEABC::Resource*, TQFile*);
+    void                 save (const TDEABC::Addressee&, TQFile*);
+    void                 saveAll (TDEABC::AddressBook*, TDEABC::Resource*, TQFile*);
     bool                 checkFormat (TQFile*) const;
 
 };  // class VCardFormatPlugin
 
-};  // namespace KABC
+};  // namespace TDEABC
 
 %End