Fix FTBFS

58 files changed, 0 insertions, 4553 deletions

diff --git a/sip/kabc/address.sip b/sip/kabc/address.sip
deleted file mode 100644
index aa0918a..0000000
--- a/sip/kabc/address.sip
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-class Address
-{
-%TypeHeaderCode
-#include <address.h>
-%End
-
-
-public:
-    typedef TQValueList<TDEABC::Address> List;
-
-%If ( KDE_3_1_0 -  )
-    typedef TQValueList<int> TypeList;
-%End
-
-
-    enum Type
-    {
-        Dom, 
-        Intl, 
-        Postal, 
-        Parcel, 
-        Home, 
-        Work, 
-        Pref
-    };
-
-                         Address ();
-                         Address (int);
-
-%If ( KDE_3_1_0 -  )
-    bool                 operator == (const TDEABC::Address&) const;
-    bool                 operator != (const TDEABC::Address&) const;
-%End
-
-    bool                 isEmpty () const;
-    void                 clear ();
-    void                 setId (const TQString&);
-    TQString              id () const;
-    void                 setType (int);
-    int                  type () const;
-
-%If ( KDE_3_1_0 -  )
-    TQString              typeLabel () const;
-%End
-
-    void                 setPostOfficeBox (const TQString&);
-    TQString              postOfficeBox () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       postOfficeBoxLabel ();
-%End
-
-    void                 setExtended (const TQString&);
-    TQString              extended () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       extendedLabel ();
-%End
-
-    void                 setStreet (const TQString&);
-    TQString              street () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       streetLabel ();
-%End
-
-    void                 setLocality (const TQString&);
-    TQString              locality () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       localityLabel ();
-%End
-
-    void                 setRegion (const TQString&);
-    TQString              region () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       regionLabel ();
-%End
-
-    void                 setPostalCode (const TQString&);
-    TQString              postalCode () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       postalCodeLabel ();
-%End
-
-    void                 setCountry (const TQString&);
-    TQString              country () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       countryLabel ();
-%End
-
-    void                 setLabel (const TQString&);
-    TQString              label () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       labelLabel ();
-    static TDEABC::Address::TypeList typeList ();
-    static TQString       typeLabel (int);
-%End
-
-    void                 dump () const;
-
-%If ( KDE_3_2_0 -  )
-    TQString              formattedAddress (const TQString& = TQString ::null , const TQString& = TQString ::null ) const;
-    static TQString       countryToISO (const TQString&);
-    static TQString       ISOtoCountry (const TQString&);
-%End
-
-
-};  // class Address
-
-
-%If ( KDE_3_1_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::Address&);
-//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::Address&);
-%End
-
-};  // namespace TDEABC
-
diff --git a/sip/kabc/addressbook.sip b/sip/kabc/addressbook.sip
deleted file mode 100644
index 8f58bb1..0000000
--- a/sip/kabc/addressbook.sip
+++ /dev/null
@@ -1,229 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-class AddressBook : TQObject
-{
-%TypeHeaderCode
-#include <resource.h>
-#include <addressbook.h>
-%End
-
-
-public:
-    
-//ig     class Iterator;
-
-    
-//ig     class ConstIterator;
-
-                         AddressBook ();
-
-%If ( KDE_3_2_0 -  )
-                         AddressBook (const TQString&);
-%End
-
-    TDEABC::Ticket*        requestSaveTicket (TDEABC::Resource* = 0);
-
-%If ( KDE_3_2_0 -  )
-    void                 releaseSaveTicket (TDEABC::Ticket*);
-%End
-
-    bool                 load ();
-
-%If ( KDE_3_2_0 -  )
-    bool                 asyncLoad ();
-%End
-
-    bool                 save (TDEABC::Ticket*);
-
-%If ( KDE_3_2_0 -  )
-    bool                 asyncSave (TDEABC::Ticket*);
-%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 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 -  )
-    TDEABC::Addressee::List allAddressees ();
-%End
-
-    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 -  )
-    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 (TDEABC::Resource*);
-
-%If ( KDE_3_1_0 -  )
-    bool                 removeResource (TDEABC::Resource*);
-    TQPtrList<TDEABC::Resource> resources ();
-    void                 setErrorHandler (TDEABC::ErrorHandler*);
-    void                 error (const TQString&);
-    void                 cleanUp ();
-%End
-
-    void                 dump () const;
-    void                 emitAddressBookLocked ();
-    void                 emitAddressBookUnlocked ();
-    void                 emitAddressBookChanged ();
-
-%If ( KDE_3_5_0 -  )
-    bool                 loadingHasFinished () const;
-%End
-
-
-signals:
-    void                 addressBookChanged (TDEABC::AddressBook*);
-    void                 addressBookLocked (TDEABC::AddressBook*);
-    void                 addressBookUnlocked (TDEABC::AddressBook*);
-
-%If ( KDE_3_2_0 -  )
-    void                 loadingFinished (TDEABC::Resource*);
-    void                 savingFinished (TDEABC::Resource*);
-%End
-
-
-protected slots:
-
-%If ( KDE_3_2_0 -  )
-    void                 resourceLoadingFinished (TDEABC::Resource*);
-    void                 resourceSavingFinished (TDEABC::Resource*);
-    void                 resourceLoadingError (TDEABC::Resource*, const TQString&);
-    void                 resourceSavingError (TDEABC::Resource*, const TQString&);
-%End
-
-
-protected:
-
-%If ( KDE_3_1_0 -  )
-    void                 deleteRemovedAddressees ();
-    void                 setStandardResource (TDEABC::Resource*);
-    TDEABC::Resource*      standardResource ();
-
-%If ( KDE_3_2_0 -  )
-//ig     KRES::Manager<TDEABC::Resource>* resourceManager ();
-%End
-
-%End
-
-
-};  // class AddressBook
-
-
-%If ( KDE_3_1_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::AddressBook&);
-//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::AddressBook&);
-%End
-
-};  // namespace TDEABC
-
-
-
-%MappedType TQPtrList<TDEABC::Resource>
-//converts a Python list of TDEABC::Resource
-{
-%TypeHeaderCode
-#include <tqptrlist.h>
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New (0);
-
-    PyObject *pylist;
-
-    // Create the list
-
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    // Get it.
-
-    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
-    for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () )
-    {
-        if (((inst = sipConvertFromInstance (cpp, sipClass_KABC_Resource, sipTransferObj)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    TQPtrList<TDEABC::Resource> *cpplist = new TQPtrList<TDEABC::Resource>;
-
-    PyObject *elem;
-    TDEABC::Resource *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (TDEABC::Resource *)sipForceConvertToType(elem, sipType_KABC_Resource, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
-
diff --git a/sip/kabc/addressee.sip b/sip/kabc/addressee.sip
deleted file mode 100644
index 24ce9b4..0000000
--- a/sip/kabc/addressee.sip
+++ /dev/null
@@ -1,468 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE_3_4_3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-class Addressee
-{
-%TypeHeaderCode
-#include <addressee.h>
-%End
-
-
-public:
-//ig     typedef TQValueList<TDEABC::Addressee> List;
-
-%If ( KDE_3_4_2 -  )
-    typedef TQMap<TQString,TDEABC::Addressee> Map;
-%End
-
-                         Addressee ();
-                         Addressee (const TDEABC::Addressee&);
-
-%If ( KDE_3_1_0 -  )
-    bool                 operator == (const TDEABC::Addressee&) const;
-    bool                 operator != (const TDEABC::Addressee&) const;
-%End
-
-    bool                 isEmpty () const;
-    void                 setUid (const TQString&);
-    TQString              uid () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       uidLabel ();
-%End
-
-    void                 setName (const TQString&);
-    TQString              name () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       nameLabel ();
-%End
-
-    void                 setFormattedName (const TQString&);
-    TQString              formattedName () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       formattedNameLabel ();
-%End
-
-    void                 setFamilyName (const TQString&);
-    TQString              familyName () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       familyNameLabel ();
-%End
-
-    void                 setGivenName (const TQString&);
-    TQString              givenName () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       givenNameLabel ();
-%End
-
-    void                 setAdditionalName (const TQString&);
-    TQString              additionalName () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       additionalNameLabel ();
-%End
-
-    void                 setPrefix (const TQString&);
-    TQString              prefix () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       prefixLabel ();
-%End
-
-    void                 setSuffix (const TQString&);
-    TQString              suffix () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       suffixLabel ();
-%End
-
-    void                 setNickName (const TQString&);
-    TQString              nickName () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       nickNameLabel ();
-%End
-
-    void                 setBirthday (const TQDateTime&);
-    TQDateTime            birthday () const;
-
-%If ( KDE_3_1_0 -  )
-    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 TQString       mailerLabel ();
-%End
-
-    void                 setTimeZone (const TDEABC::TimeZone&);
-    TDEABC::TimeZone       timeZone () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       timeZoneLabel ();
-%End
-
-    void                 setGeo (const TDEABC::Geo&);
-    TDEABC::Geo            geo () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       geoLabel ();
-%End
-
-    void                 setTitle (const TQString&);
-    TQString              title () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       titleLabel ();
-%End
-
-    void                 setRole (const TQString&);
-    TQString              role () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       roleLabel ();
-%End
-
-    void                 setOrganization (const TQString&);
-    TQString              organization () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       organizationLabel ();
-%End
-
-    void                 setNote (const TQString&);
-    TQString              note () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       noteLabel ();
-%End
-
-    void                 setProductId (const TQString&);
-    TQString              productId () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       productIdLabel ();
-%End
-
-    void                 setRevision (const TQDateTime&);
-    TQDateTime            revision () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       revisionLabel ();
-%End
-
-    void                 setSortString (const TQString&);
-    TQString              sortString () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       sortStringLabel ();
-%End
-
-    void                 setUrl (const KURL&);
-    KURL                 url () const;
-
-%If ( KDE_3_1_0 -  )
-    static TQString       urlLabel ();
-    void                 setSecrecy (const TDEABC::Secrecy&);
-    TDEABC::Secrecy        secrecy () const;
-    static TQString       secrecyLabel ();
-    void                 setLogo (const TDEABC::Picture&);
-    TDEABC::Picture        logo () const;
-    static TQString       logoLabel ();
-    void                 setPhoto (const TDEABC::Picture&);
-    TDEABC::Picture        photo () const;
-    static TQString       photoLabel ();
-    void                 setSound (const TDEABC::Sound&);
-    TDEABC::Sound          sound () const;
-    static TQString       soundLabel ();
-    void                 setAgent (const TDEABC::Agent&);
-    TDEABC::Agent          agent () const;
-    static TQString       agentLabel ();
-%End
-
-    void                 setNameFromString (const TQString&);
-    TQString              realName () const;
-
-%If ( KDE_3_1_0 -  )
-    TQString              assembledName () const;
-%End
-
-    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 TQStringList&);
-%End
-
-    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 -  )
-    TDEABC::PhoneNumber::List phoneNumbers (int) const;
-%End
-
-    TDEABC::PhoneNumber    findPhoneNumber (const TQString&) const;
-
-%If ( KDE_3_1_0 -  )
-    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 TDEABC::Key::List&);
-%End
-
-    TDEABC::Key::List      keys (int, TQString = TQString ::null ) const;
-    TDEABC::Key            findKey (const TQString&) const;
-%End
-
-    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 -  )
-    TDEABC::Address::List  addresses (int) const;
-%End
-
-    TDEABC::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 TQString&, TQString&, TQString&);
-%End
-
-    void                 dump () const;
-
-%If ( KDE_3_1_0 -  )
-    TQString              asString () const;
-    void                 setResource (TDEABC::Resource*);
-    TDEABC::Resource*      resource () const;
-    void                 setChanged (bool);
-    bool                 changed () const;
-
-%If ( KDE_3_4_2 -  )
-    static void          setSortMode (TDEABC::SortMode*);
-    bool                 operator < (const TDEABC::Addressee&);
-%End
-
-%End
-
-
-
-
-
-
-};  // class Addressee
-
-
-%If ( KDE_3_1_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::Addressee&);
-//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::Addressee&);
-%End
-
-};  // namespace TDEABC
-
-
-
-%MappedType TDEABC::Addressee::List
-//converts a Python list of TDEABC::Addressee
-{
-%TypeHeaderCode
-#include <tqvaluelist.h>
-//typedef TQValueList<TDEABC::Addressee> List;
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    TQValueList<TDEABC::Addressee> *cpplist = (TQValueList<TDEABC::Addressee> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    TQValueList<TDEABC::Addressee>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipConvertFromNewType(new TDEABC::Addressee (*it), sipType_KABC_Addressee, NULL)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    TQValueList<TDEABC::Addressee> *cpplist = new TQValueList<TDEABC::Addressee>;
-
-    PyObject *elem;
-    TDEABC::Addressee *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (TDEABC::Addressee *)sipForceConvertToType(elem, sipType_KABC_Addressee, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
-%MappedType TDEABC::Address::List
-//converts a Python list of TDEABC::Address
-{
-%TypeHeaderCode
-#include <tqvaluelist.h>
-//typedef TQValueList<TDEABC::Address> List;
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    TQValueList<TDEABC::Address> *cpplist = (TQValueList<TDEABC::Address> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    TQValueList<TDEABC::Address>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipConvertFromNewType(new TDEABC::Address (*it), sipType_KABC_Address, NULL)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    TQValueList<TDEABC::Address> *cpplist = new TQValueList<TDEABC::Address>;
-
-    PyObject *elem;
-    TDEABC::Address *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (TDEABC::Address *)sipForceConvertToType(elem, sipType_KABC_Address, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
diff --git a/sip/kabc/addresseedialog.sip b/sip/kabc/addresseedialog.sip
deleted file mode 100644
index a162b8d..0000000
--- a/sip/kabc/addresseedialog.sip
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-class AddresseeItem : TQListViewItem
-{
-%TypeHeaderCode
-#include <addresseedialog.h>
-%End
-
-
-public:
-
-    enum columns
-    {
-        Name, 
-        Email
-    };
-
-                         AddresseeItem (TQListView*, const TDEABC::Addressee&);
-    TDEABC::Addressee      addressee () const;
-    virtual TQString      key (int, bool) const;
-
-};  // class AddresseeItem
-
-
-class AddresseeDialog : KDialogBase
-{
-%TypeHeaderCode
-#include <addresseedialog.h>
-%End
-
-
-public:
-                         AddresseeDialog (TQWidget* = 0, bool = 0);
-    TDEABC::Addressee      addressee ();
-    TDEABC::Addressee::List addressees ();
-    static TDEABC::Addressee getAddressee (TQWidget*);
-    static TDEABC::Addressee::List getAddressees (TQWidget*);
-
-protected slots:
-
-%If ( KDE_3_1_0 -  )
-    void                 addressBookChanged ();
-%End
-
-
-};  // class AddresseeDialog
-
-};  // namespace TDEABC
-
diff --git a/sip/kabc/addresseelist.sip b/sip/kabc/addresseelist.sip
deleted file mode 100644
index 9969a16..0000000
--- a/sip/kabc/addresseelist.sip
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-%ModuleHeaderCode
-#include <tqwidget.h>
-#include <addresseelist.h>
-%End
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-namespace SortingTraits
-{
-
-class Uid
-{
-%TypeHeaderCode
-#include <addresseelist.h>
-%End
-
-
-public:
-    static bool          eq (const TDEABC::Addressee&, const TDEABC::Addressee&);
-    static bool          lt (const TDEABC::Addressee&, const TDEABC::Addressee&);
-
-};  // class Uid
-
-
-class Name
-{
-%TypeHeaderCode
-#include <addresseelist.h>
-%End
-
-
-public:
-    static bool          eq (const TDEABC::Addressee&, const TDEABC::Addressee&);
-    static bool          lt (const TDEABC::Addressee&, const TDEABC::Addressee&);
-
-};  // class Name
-
-
-class FormattedName
-{
-%TypeHeaderCode
-#include <addresseelist.h>
-%End
-
-
-public:
-    static bool          eq (const TDEABC::Addressee&, const TDEABC::Addressee&);
-    static bool          lt (const TDEABC::Addressee&, const TDEABC::Addressee&);
-
-};  // class FormattedName
-
-
-class FamilyName
-{
-%TypeHeaderCode
-#include <addresseelist.h>
-%End
-
-
-public:
-    static bool          eq (const TDEABC::Addressee&, const TDEABC::Addressee&);
-    static bool          lt (const TDEABC::Addressee&, const TDEABC::Addressee&);
-
-};  // class FamilyName
-
-
-class GivenName
-{
-%TypeHeaderCode
-#include <addresseelist.h>
-%End
-
-
-public:
-    static bool          eq (const TDEABC::Addressee&, const TDEABC::Addressee&);
-    static bool          lt (const TDEABC::Addressee&, const TDEABC::Addressee&);
-
-};  // class GivenName
-
-};  // namespace SortingTraits
-
-
-enum 
-{
-    Uid, 
-    Name, 
-    FormattedName, 
-    FamilyName, 
-    GivenName
-};
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/addresslineedit.sip b/sip/kabc/addresslineedit.sip
deleted file mode 100644
index a3e3f03..0000000
--- a/sip/kabc/addresslineedit.sip
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-
-class AddressLineEdit : KLineEdit
-{
-%TypeHeaderCode
-#include <addresslineedit.h>
-%End
-
-
-public:
-                         AddressLineEdit (TQWidget*, bool = 1, const char* = 0);
-    virtual void         setFont (const TQFont&);
-
-%If ( KDE_3_2_0 -  )
-    static TDEConfig*      config ();
-%End
-
-
-public slots:
-    void                 cursorAtEnd ();
-    void                 enableCompletion (bool);
-
-protected:
-    virtual void         loadAddresses ();
-    void                 addAddress (const TQString&);
-    virtual void         keyPressEvent (TQKeyEvent*);
-    virtual void         dropEvent (TQDropEvent*);
-    virtual void         paste ();
-    virtual void         insert (const TQString&);
-    virtual void         mouseReleaseEvent (TQMouseEvent*);
-    void                 doCompletion (bool);
-
-};  // class AddressLineEdit
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/agent.sip b/sip/kabc/agent.sip
deleted file mode 100644
index 3d836b3..0000000
--- a/sip/kabc/agent.sip
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-
-class Agent
-{
-%TypeHeaderCode
-#include <agent.h>
-%End
-
-
-public:
-                         Agent ();
-                         Agent (const TQString&);
-                         Agent (TDEABC::Addressee*);
-    bool                 operator == (const TDEABC::Agent&) const;
-    bool                 operator != (const TDEABC::Agent&) const;
-    void                 setUrl (const TQString&);
-    void                 setAddressee (TDEABC::Addressee*);
-    bool                 isIntern () const;
-    TQString              url () const;
-    TDEABC::Addressee*     addressee () const;
-    TQString              asString () const;
-
-};  // class Agent
-
-//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
deleted file mode 100644
index 1526117..0000000
--- a/sip/kabc/distributionlist.sip
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-class DistributionList
-{
-%TypeHeaderCode
-#include <distributionlist.h>
-%End
-
-
-public:
-
-    class Entry
-    {
-
-    public:
-        typedef TQValueList<TDEABC::DistributionList::Entry> List;
-                             Entry ();
-                             Entry (const TDEABC::Addressee&, const TQString&);
-        TDEABC::Addressee      addressee;
-        TQString              email;
-
-    };  // class Entry
-
-
-public:
-                         DistributionList (TDEABC::DistributionListManager*, const TQString&);
-    void                 setName (const TQString&);
-    TQString              name () const;
-    void                 insertEntry (const TDEABC::Addressee&, const TQString& = TQString ::null );
-    void                 removeEntry (const TDEABC::Addressee&, const TQString& = TQString ::null );
-    TQStringList          emails () const;
-    TDEABC::DistributionList::Entry::List entries () const;
-
-};  // class DistributionList
-
-
-class DistributionListManager
-{
-%TypeHeaderCode
-#include <distributionlist.h>
-%End
-
-
-public:
-                         DistributionListManager (TDEABC::AddressBook*);
-    TDEABC::DistributionList* list (const TQString&);
-    void                 insert (TDEABC::DistributionList*);
-    void                 remove (TDEABC::DistributionList*);
-    TQStringList          listNames ();
-    bool                 load ();
-    bool                 save ();
-
-};  // class DistributionListManager
-
-
-%If ( KDE_3_1_0 -  )
-
-class DistributionListWatcher : TQObject
-{
-%TypeHeaderCode
-#include <distributionlist.h>
-%End
-
-
-public:
-    static TDEABC::DistributionListWatcher* self ();
-
-signals:
-    void                 changed ();
-
-protected:
-                         DistributionListWatcher ();
-                         ~DistributionListWatcher ();
-
-};  // class DistributionListWatcher
-
-%End
-
-};  // namespace TDEABC
-
-
-
-%MappedType TDEABC::DistributionList::Entry::List
-//converts a Python list of TDEABC::DistributionList::Entry
-{
-%TypeHeaderCode
-#include <distributionlist.h>
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    TQValueList<TDEABC::DistributionList::Entry> *cpplist = (TQValueList<TDEABC::DistributionList::Entry> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    TQValueList<TDEABC::DistributionList::Entry>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipConvertFromNewType(new TDEABC::DistributionList::Entry (*it), sipType_KABC_DistributionList_Entry, NULL)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    TQValueList<TDEABC::DistributionList::Entry> *cpplist = new TQValueList<TDEABC::DistributionList::Entry>;
-
-    PyObject *elem;
-    TDEABC::DistributionList::Entry *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (TDEABC::DistributionList::Entry *)sipForceConvertToType(elem, sipType_KABC_DistributionList_Entry, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
-
diff --git a/sip/kabc/distributionlistdialog.sip b/sip/kabc/distributionlistdialog.sip
deleted file mode 100644
index 4d3ff1c..0000000
--- a/sip/kabc/distributionlistdialog.sip
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-
-class DistributionListDialog : KDialogBase
-{
-%TypeHeaderCode
-#include <distributionlistdialog.h>
-%End
-
-
-public:
-                         DistributionListDialog (TDEABC::AddressBook*, TQWidget*);
-
-};  // class DistributionListDialog
-
-
-class EmailSelector : KDialogBase
-{
-%TypeHeaderCode
-#include <distributionlistdialog.h>
-%End
-
-
-public:
-                         EmailSelector (const TQStringList&, const TQString&, TQWidget*);
-    TQString              selected ();
-    static TQString       getEmail (const TQStringList&, const TQString&, TQWidget*);
-
-};  // class EmailSelector
-
-
-class DistributionListEditorWidget : TQWidget
-{
-%TypeHeaderCode
-#include <distributionlistdialog.h>
-%End
-
-
-public:
-                         DistributionListEditorWidget (TDEABC::AddressBook*, TQWidget*);
-
-};  // class DistributionListEditorWidget
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/distributionlisteditor.sip b/sip/kabc/distributionlisteditor.sip
deleted file mode 100644
index 53757b6..0000000
--- a/sip/kabc/distributionlisteditor.sip
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-class EmailSelectDialog : KDialogBase
-{
-%TypeHeaderCode
-#include <distributionlisteditor.h>
-%End
-
-
-public:
-                         EmailSelectDialog (const TQStringList&, const TQString&, TQWidget*);
-    TQString              selected ();
-    static TQString       getEmail (const TQStringList&, const TQString&, TQWidget*);
-
-};  // class EmailSelectDialog
-
-
-//ig class DistributionListEditor : TQWidget;
-
-};  // namespace TDEABC
-
diff --git a/sip/kabc/errorhandler.sip b/sip/kabc/errorhandler.sip
deleted file mode 100644
index 8004383..0000000
--- a/sip/kabc/errorhandler.sip
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-
-class ErrorHandler
-{
-%TypeHeaderCode
-#include <tqwidget.h>
-#include <errorhandler.h>
-%End
-
-
-public:
-    virtual void         error (const TQString&)  = 0;
-
-};  // class ErrorHandler
-
-
-class ConsoleErrorHandler : TDEABC::ErrorHandler
-{
-%TypeHeaderCode
-#include <tqwidget.h>
-#include <errorhandler.h>
-%End
-
-
-public:
-    virtual void         error (const TQString&);
-
-};  // class ConsoleErrorHandler
-
-
-%If ( KDE_3_5_1 -  )
-
-class GUIErrorHandler : TDEABC::ErrorHandler
-{
-%TypeHeaderCode
-#include <errorhandler.h>
-%End
-
-
-public:
-    virtual void         error (const TQString&);
-
-};  // class GUIErrorHandler
-
-%End
-
-
-%If ( KDE_3_2_0 -  )
-
-class GuiErrorHandler : TDEABC::ErrorHandler
-{
-%TypeHeaderCode
-#include <tqwidget.h>
-#include <errorhandler.h>
-%End
-
-
-public:
-                         GuiErrorHandler (TQWidget*);
-    virtual void         error (const TQString&);
-
-};  // class GuiErrorHandler
-
-%End
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/field.sip b/sip/kabc/field.sip
deleted file mode 100644
index 68d325a..0000000
--- a/sip/kabc/field.sip
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-
-class Field
-{
-%TypeHeaderCode
-#include <field.h>
-%End
-
-
-public:
-    typedef TQValueList<TDEABC::Field*> List;
-
-    enum FieldCategory
-    {
-        All, 
-        Frequent, 
-        Address, 
-        Email, 
-        Personal, 
-        Organization, 
-        CustomCategory
-    };
-
-    virtual TQString      label ();
-    virtual int          category ();
-    static TQString       categoryLabel (int);
-    virtual TQString      value (const TDEABC::Addressee&);
-    virtual bool         setValue (TDEABC::Addressee&, const TQString&);
-
-%If ( KDE_3_2_0 -  )
-    TQString              sortKey (const TDEABC::Addressee&);
-%End
-
-    virtual bool         isCustom ();
-    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 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 (TDEABC::Field::FieldImpl*);
-                         ~Field ();
-//force
-                         Field ();
-//end
-
-};  // class Field
-
-};  // namespace TDEABC
-
-%End
-
-
-
-%If (KDE_3_1_0 - )
-%MappedType TDEABC::Field::List
-//converts a Python list of TDEABC::Field
-{
-%TypeHeaderCode
-#include <field.h>
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    TQValueList<TDEABC::Field *> *cpplist = (TQValueList<TDEABC::Field *> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    TQValueList<TDEABC::Field *>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipConvertFromType((TDEABC::Field *)(*it), sipType_KABC_Field, NULL)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    TQValueList<TDEABC::Field *> *cpplist = new TQValueList<TDEABC::Field *>;
-
-    PyObject *elem;
-    TDEABC::Field *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (TDEABC::Field *)sipForceConvertToType(elem, sipType_KABC_Field, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-%End
-
-
diff --git a/sip/kabc/format.sip b/sip/kabc/format.sip
deleted file mode 100644
index edf428a..0000000
--- a/sip/kabc/format.sip
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-class Format
-{
-%TypeHeaderCode
-#include <format.h>
-%End
-
-
-public:
-    virtual bool         load (TDEABC::AddressBook*, const TQString&)  = 0;
-    virtual bool         save (TDEABC::AddressBook*, const TQString&)  = 0;
-
-};  // class Format
-
-};  // namespace TDEABC
-
diff --git a/sip/kabc/formatfactory.sip b/sip/kabc/formatfactory.sip
deleted file mode 100644
index 0bede53..0000000
--- a/sip/kabc/formatfactory.sip
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-
-class FormatInfo
-{
-%TypeHeaderCode
-#include <formatfactory.h>
-%End
-
-
-public:
-    TQString              library;
-    TQString              nameLabel;
-    TQString              descriptionLabel;
-
-};  // class FormatInfo
-
-
-class FormatFactory
-{
-%TypeHeaderCode
-#include <formatfactory.h>
-%End
-
-
-public:
-    static TDEABC::FormatFactory* self ();
-    TDEABC::FormatPlugin*  format (const TQString&);
-    TQStringList          formats ();
-    TDEABC::FormatInfo*    info (const TQString&);
-
-protected:
-                         FormatFactory ();
-
-protected:
-
-%If (  - KDE_3_2_0 )
-                         ~FormatFactory ();
-%End
-
-
-};  // class FormatFactory
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/formatplugin.sip b/sip/kabc/formatplugin.sip
deleted file mode 100644
index 7b38f41..0000000
--- a/sip/kabc/formatplugin.sip
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-
-class FormatPlugin : TDEABC::Plugin
-{
-%TypeHeaderCode
-#include <formatplugin.h>
-%End
-
-
-public:
-    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 TDEABC
-
-%End
-
diff --git a/sip/kabc/geo.sip b/sip/kabc/geo.sip
deleted file mode 100644
index 8454114..0000000
--- a/sip/kabc/geo.sip
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-class Geo
-{
-%TypeHeaderCode
-#include <geo.h>
-%End
-
-
-public:
-                         Geo ();
-                         Geo (float, float);
-    void                 setLatitude (float);
-    float                latitude () const;
-    void                 setLongitude (float);
-    float                longitude () const;
-    bool                 isValid () const;
-    bool                 operator == (const TDEABC::Geo&) const;
-
-%If ( KDE_3_1_0 -  )
-    bool                 operator != (const TDEABC::Geo&) const;
-%End
-
-    TQString              asString () const;
-
-};  // class Geo
-
-
-%If ( KDE_3_1_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::Geo&);
-//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::Geo&);
-%End
-
-};  // namespace TDEABC
-
diff --git a/sip/kabc/kabc-kde310.diff b/sip/kabc/kabc-kde310.diff
deleted file mode 100644
index 294c0cb..0000000
--- a/sip/kabc/kabc-kde310.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde311.diff b/sip/kabc/kabc-kde311.diff
deleted file mode 100644
index 294c0cb..0000000
--- a/sip/kabc/kabc-kde311.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde312.diff b/sip/kabc/kabc-kde312.diff
deleted file mode 100644
index 294c0cb..0000000
--- a/sip/kabc/kabc-kde312.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde313.diff b/sip/kabc/kabc-kde313.diff
deleted file mode 100644
index 294c0cb..0000000
--- a/sip/kabc/kabc-kde313.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde314.diff b/sip/kabc/kabc-kde314.diff
deleted file mode 100644
index 294c0cb..0000000
--- a/sip/kabc/kabc-kde314.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde320.diff b/sip/kabc/kabc-kde320.diff
deleted file mode 100644
index a7c2d68..0000000
--- a/sip/kabc/kabc-kde320.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-//+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde322.diff b/sip/kabc/kabc-kde322.diff
deleted file mode 100644
index a7c2d68..0000000
--- a/sip/kabc/kabc-kde322.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-//+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde323.diff b/sip/kabc/kabc-kde323.diff
deleted file mode 100644
index a7c2d68..0000000
--- a/sip/kabc/kabc-kde323.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-//+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde330.diff b/sip/kabc/kabc-kde330.diff
deleted file mode 100644
index d89a0ac..0000000
--- a/sip/kabc/kabc-kde330.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include ldapconfigwidget.sip
-+ %Include ldapurl.sip
-+ %Include ldif.sip
-//+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde331.diff b/sip/kabc/kabc-kde331.diff
deleted file mode 100644
index d89a0ac..0000000
--- a/sip/kabc/kabc-kde331.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include ldapconfigwidget.sip
-+ %Include ldapurl.sip
-+ %Include ldif.sip
-//+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde332.diff b/sip/kabc/kabc-kde332.diff
deleted file mode 100644
index d89a0ac..0000000
--- a/sip/kabc/kabc-kde332.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include ldapconfigwidget.sip
-+ %Include ldapurl.sip
-+ %Include ldif.sip
-//+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde340.diff b/sip/kabc/kabc-kde340.diff
deleted file mode 100644
index 24ca659..0000000
--- a/sip/kabc/kabc-kde340.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include ldapconfigwidget.sip
-+ %Include ldapurl.sip
-+ %Include ldif.sip
-//+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sortmode.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde341.diff b/sip/kabc/kabc-kde341.diff
deleted file mode 100644
index 24ca659..0000000
--- a/sip/kabc/kabc-kde341.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include ldapconfigwidget.sip
-+ %Include ldapurl.sip
-+ %Include ldif.sip
-//+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sortmode.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde342.diff b/sip/kabc/kabc-kde342.diff
deleted file mode 100644
index 24ca659..0000000
--- a/sip/kabc/kabc-kde342.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include ldapconfigwidget.sip
-+ %Include ldapurl.sip
-+ %Include ldif.sip
-//+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sortmode.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde343.diff b/sip/kabc/kabc-kde343.diff
deleted file mode 100644
index 24ca659..0000000
--- a/sip/kabc/kabc-kde343.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include ldapconfigwidget.sip
-+ %Include ldapurl.sip
-+ %Include ldif.sip
-//+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sortmode.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde350.diff b/sip/kabc/kabc-kde350.diff
deleted file mode 100644
index 24ca659..0000000
--- a/sip/kabc/kabc-kde350.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include ldapconfigwidget.sip
-+ %Include ldapurl.sip
-+ %Include ldif.sip
-//+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sortmode.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde351.diff b/sip/kabc/kabc-kde351.diff
deleted file mode 100644
index 24ca659..0000000
--- a/sip/kabc/kabc-kde351.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include ldapconfigwidget.sip
-+ %Include ldapurl.sip
-+ %Include ldif.sip
-//+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sortmode.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde352.diff b/sip/kabc/kabc-kde352.diff
deleted file mode 100644
index 24ca659..0000000
--- a/sip/kabc/kabc-kde352.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include ldapconfigwidget.sip
-+ %Include ldapurl.sip
-+ %Include ldif.sip
-//+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sortmode.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabc-kde353.diff b/sip/kabc/kabc-kde353.diff
deleted file mode 100644
index 3ea9e5f..0000000
--- a/sip/kabc/kabc-kde353.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-+ %Include addresseelist.sip
-+ %Include addresslineedit.sip
-+ %Include agent.sip
-+ %Include distributionlistdialog.sip
-+ %Include errorhandler.sip
-+ %Include field.sip
-+ %Include formatfactory.sip
-+ %Include formatplugin.sip
-+ %Include key.sip
-+ %Include ldapclient.sip
-+ %Include ldapconfigwidget.sip
-+ %Include ldapurl.sip
-+ %Include ldif.sip
-+ %Include ldifconverter.sip
-+ %Include lock.sip
-+ %Include locknull.sip
-+ %Include picture.sip
-+ %Include plugin.sip
-+ %Include resourcefile.sip
-+ %Include resourceselectdialog.sip
-+ %Include secrecy.sip
-+ %Include sortmode.sip
-+ %Include sound.sip
-+ %Include vcardconverter.sip
-+ %Include vcardformatplugin.sip
diff --git a/sip/kabc/kabcmod.sip.in b/sip/kabc/kabcmod.sip.in
deleted file mode 100644
index c1a7ca3..0000000
--- a/sip/kabc/kabcmod.sip.in
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE_3_5_2
-
-%Copying
-
- This software is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public
- License along with this library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-%End
-
-%Module kabc
-
-%Import qt/qtmod.sip
-%Import qtxml/qtxmlmod.sip
-%Import dcopmod.sip
-%Import tdecoremod.sip
-%Import tdefxmod.sip
-%Import tdeuimod.sip
-%Import tdeiomod.sip
-%Import tderesourcesmod.sip
-
-%Include address.sip
-%Include addressbook.sip
-%Include addressee.sip
-%Include addresseedialog.sip
-%Include distributionlist.sip
-%Include distributionlisteditor.sip
-%Include format.sip
-%Include geo.sip
-//%Include ldifconverter.sip
-%Include phonenumber.sip
-%Include resource.sip
-%Include stdaddressbook.sip
-%Include timezone.sip
-%Include vcardformat.sip
-@mark@
-
diff --git a/sip/kabc/key.sip b/sip/kabc/key.sip
deleted file mode 100644
index 1005498..0000000
--- a/sip/kabc/key.sip
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-
-class Key
-{
-%TypeHeaderCode
-#include <key.h>
-%End
-
-
-public:
-    typedef TQValueList<TDEABC::Key> List;
-    typedef TQValueList<int> TypeList;
-
-    enum Types
-    {
-        X509, 
-        PGP, 
-        Custom
-    };
-
-                         Key (const TQString& = TQString ::null , int = PGP );
-    bool                 operator == (const TDEABC::Key&) const;
-    bool                 operator != (const TDEABC::Key&) 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 TQString&);
-    int                  type () const;
-    TQString              customTypeString () const;
-    static TypeList      typeList ();
-    static TQString       typeLabel (int);
-
-};  // class Key
-
-//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::Key&);
-//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::Key&);
-};  // namespace TDEABC
-
-%End
-
-
-
-%MappedType TDEABC::Key::List
-//converts a Python list of TDEABC::Key
-{
-%TypeHeaderCode
-#include <tqvaluelist.h>
-//typedef TQValueList<TDEABC::Key> List;
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    TQValueList<TDEABC::Key> *cpplist = (TQValueList<TDEABC::Key> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    TQValueList<TDEABC::Key>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipConvertFromNewType(new TDEABC::Key(*it), sipType_KABC_Key, NULL)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    TQValueList<TDEABC::Key> *cpplist = new TQValueList<TDEABC::Key>;
-
-    PyObject *elem;
-    TDEABC::Key *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (TDEABC::Key *)sipForceConvertToType(elem, sipType_KABC_Key, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
-
diff --git a/sip/kabc/ldapclient.sip b/sip/kabc/ldapclient.sip
deleted file mode 100644
index 9e66a8a..0000000
--- a/sip/kabc/ldapclient.sip
+++ /dev/null
@@ -1,243 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-//ig typedef TQValueList<TQByteArray> LdapAttrValue;
-//ig typedef TQMap<TQString,TDEABC::LdapAttrValue> LdapAttrMap;
-
-class LdapObject
-{
-%TypeHeaderCode
-#include <ldapclient.h>
-%End
-
-
-public:
-                         LdapObject ();
-
-%If ( KDE_3_3_0 -  )
-                         LdapObject (const TQString&, TDEABC::LdapClient*);
-%End
-
-                         LdapObject (const TDEABC::LdapObject&);
-    TQString              toString () const;
-    void                 clear ();
-    TQString              dn;
-//ig     LdapAttrMap          attrs;
-
-%If ( KDE_3_3_0 -  )
-    TDEABC::LdapClient*    client;
-%End
-
-
-protected:
-    void                 assign (const TDEABC::LdapObject&);
-
-public:
-
-%If (  - KDE_3_3_0 )
-                         LdapObject (TQString);
-%End
-
-
-};  // class LdapObject
-
-
-class LdapClient : TQObject
-{
-%TypeHeaderCode
-#include <ldapclient.h>
-%End
-
-
-public:
-                         LdapClient (TQObject* = 0, const char* = 0);
-    bool                 isActive () const;
-
-signals:
-    void                 done ();
-    void                 error (const TQString&);
-    void                 result (const TDEABC::LdapObject&);
-
-public slots:
-    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 TQString&);
-    TQString              bindDN () const;
-    void                 setPwdBindDN (const TQString&);
-    TQString              pwdBindDN () const;
-%End
-
-    void                 setAttrs (const TQStringList&);
-    TQStringList          attrs () const;
-    void                 setScope (const TQString);
-    void                 startQuery (const TQString&);
-    void                 cancelQuery ();
-
-protected slots:
-    void                 slotData (TDEIO::Job*, const TQByteArray&);
-    void                 slotInfoMessage (TDEIO::Job*, const TQString&);
-    void                 slotDone ();
-
-protected:
-    void                 startParseLDIF ();
-    void                 parseLDIF (const TQByteArray&);
-    void                 endParseLDIF ();
-
-};  // class LdapClient
-
-
-%If ( KDE_3_3_0 -  )
-
-class LdapResult
-{
-%TypeHeaderCode
-#include <ldapclient.h>
-%End
-
-
-public:
-    TQString              name;
-    TQString              email;
-    int                  clientNumber;
-
-};  // class LdapResult
-
-%End
-
-
-%If ( KDE_3_3_0 -  )
-typedef TQValueList<TDEABC::LdapResult> LdapResultList;
-%End
-
-
-class LdapSearch : TQObject
-{
-%TypeHeaderCode
-#include <ldapclient.h>
-%End
-
-
-public:
-                         LdapSearch ();
-    void                 startSearch (const TQString&);
-    void                 cancelSearch ();
-    bool                 isAvailable () const;
-
-signals:
-    void                 searchData (const TQStringList&);
-
-%If ( KDE_3_3_0 -  )
-    void                 searchData (const TDEABC::LdapResultList&);
-%End
-
-    void                 searchDone ();
-
-};  // class LdapSearch
-
-};  // namespace TDEABC
-
-%End
-
-
-
-%If (KDE_3_3_0 - )
-%MappedType TDEABC::LdapResultList
-//converts a Python list of TDEABC::LdapREsult
-{
-%TypeHeaderCode
-#include <ldapclient.h>
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    TQValueList<TDEABC::LdapResult> *cpplist = (TQValueList<TDEABC::LdapResult> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    TQValueList<TDEABC::LdapResult>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipConvertFromNewType(new TDEABC::LdapResult(*it), sipType_KABC_LdapResult, NULL)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    TQValueList<TDEABC::LdapResult> *cpplist = new TQValueList<TDEABC::LdapResult>;
-
-    PyObject *elem;
-    TDEABC::LdapResult *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (TDEABC::LdapResult *)sipForceConvertToType(elem, sipType_KABC_LdapResult, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-%End
-
-
diff --git a/sip/kabc/ldapconfigwidget.sip b/sip/kabc/ldapconfigwidget.sip
deleted file mode 100644
index 81b4cf6..0000000
--- a/sip/kabc/ldapconfigwidget.sip
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_3_0 -  )
-namespace TDEABC
-{
-
-class LdapConfigWidget : TQWidget
-{
-%TypeHeaderCode
-#include <ldapconfigwidget.h>
-%End
-
-
-public:
-
-    enum LCW_Flags
-    {
-        W_USER, 
-        W_PASS, 
-        W_BINDDN, 
-        W_REALM, 
-        W_HOST, 
-        W_PORT, 
-        W_VER, 
-        W_DN, 
-        W_FILTER, 
-        W_SECBOX, 
-        W_AUTHBOX, 
-        W_TIMELIMIT, 
-        W_SIZELIMIT, 
-        W_ALL
-    };
-
-                         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 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);
-    bool                 isSecTLS () const;
-    void                 setSecSSL (bool = 1);
-    bool                 isSecSSL () const;
-    void                 setAuthAnon (bool = 1);
-    bool                 isAuthAnon () const;
-    void                 setAuthSimple (bool = 1);
-    bool                 isAuthSimple () const;
-    void                 setAuthSASL (bool = 1);
-    bool                 isAuthSASL () const;
-    void                 setSizeLimit (int);
-    int                  sizeLimit () const;
-    void                 setTimeLimit (int);
-    int                  timeLimit () const;
-    int                  flags () const;
-    void                 setFlags (int);
-    TDEABC::LDAPUrl        url () const;
-
-};  // class LdapConfigWidget
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/ldapurl.sip b/sip/kabc/ldapurl.sip
deleted file mode 100644
index 371fb5a..0000000
--- a/sip/kabc/ldapurl.sip
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_3_0 -  )
-namespace TDEABC
-{
-
-class LDAPUrl : KURL
-{
-%TypeHeaderCode
-#include <ldapurl.h>
-%End
-
-
-public:
-
-    class Extension
-    {
-
-    public:
-        TQString              value;
-        bool                 critical;
-
-    };  // class Extension
-
-
-public:
-
-    enum Scope
-    {
-        Base, 
-        One, 
-        Sub
-    };
-
-                         LDAPUrl ();
-                         LDAPUrl (const KURL&);
-    const TQString&       dn () const;
-    void                 setDn (const TQString&);
-    const TQStringList&   attributes ();
-    void                 setAttributes (const TQStringList&);
-    TDEABC::LDAPUrl::Scope scope () const;
-    void                 setScope (TDEABC::LDAPUrl::Scope);
-    const TQString&       filter () const;
-    void                 setFilter (TQString);
-    bool                 hasExtension (const TQString&) const;
-    TDEABC::LDAPUrl::Extension extension (const TQString&) const;
-    TQString              extension (const TQString&, bool& /Out/) const /PyName=extensionAndCritical/;
-    void                 setExtension (const TQString&, const TDEABC::LDAPUrl::Extension&);
-    void                 setExtension (const TQString&, const TQString&, bool = 0);
-    void                 removeExtension (const TQString&);
-    void                 updateQuery ();
-
-protected:
-    void                 parseQuery ();
-
-};  // class LDAPUrl
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/ldif.sip b/sip/kabc/ldif.sip
deleted file mode 100644
index 710b570..0000000
--- a/sip/kabc/ldif.sip
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_3_0 -  )
-namespace TDEABC
-{
-
-class LDIF
-{
-%TypeHeaderCode
-#include <ldif.h>
-%End
-
-
-public:
-
-    enum ParseVal
-    {
-        None, 
-        NewEntry, 
-        EndEntry, 
-        Item, 
-        Control, 
-        Err, 
-        MoreData
-    };
-
-
-    enum EntryType
-    {
-        Entry_None, 
-        Entry_Add, 
-        Entry_Del, 
-        Entry_Mod, 
-        Entry_Modrdn
-    };
-
-
-    enum ModType
-    {
-        Mod_None, 
-        Mod_Add, 
-        Mod_Replace, 
-        Mod_Del
-    };
-
-                         LDIF ();
-    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 ();
-    TDEABC::LDIF::ParseVal processLine ();
-    TDEABC::LDIF::ParseVal nextItem ();
-    void                 setLDIF (const TQByteArray&);
-    void                 endLDIF ();
-    TDEABC::LDIF::EntryType entryType () const;
-    int                  modType () const;
-    const TQString&       dn () const;
-    const TQString&       newRdn () const;
-    const TQString&       newSuperior () const;
-    bool                 delOldRdn () const;
-    const TQString&       attr () const;
-    const TQByteArray&    val () const;
-    bool                 isUrl () const;
-    bool                 critical () const;
-    const TQString&       oid () const;
-    uint                 lineNo () const;
-
-};  // class LDIF
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/ldifconverter.sip b/sip/kabc/ldifconverter.sip
deleted file mode 100644
index 8e14ad3..0000000
--- a/sip/kabc/ldifconverter.sip
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-%ModuleHeaderCode
-#include <ldifconverter.h>
-%End
-
-
-%If ( KDE_3_2_0 -  )
-namespace TDEABC
-{
-namespace LDIFConverter
-{
-
-%If ( KDE_3_5_2 -  )
-//ig bool                 LDIFToAddressee (const TQString&, AddresseeList&, TQDateTime = TQDateTime ::currentDateTime ());
-//ig bool                 addresseeToLDIF (const AddresseeList&, TQString&);
-%End
-
-bool                 addresseeToLDIF (const TDEABC::Addressee&, TQString&);
-TQString              makeLDIFfieldString (TQString, TQString, bool = 1);
-bool                 parseSingleLine (TDEABC::Addressee&, TDEABC::Address&, TDEABC::Address&, TQString&);
-bool                 splitLine (TQString&, TQString&, TQString&);
-bool                 evaluatePair (TDEABC::Addressee&, TDEABC::Address&, TDEABC::Address&, TQString&, TQString&);
-
-%If (  - KDE_3_5_2 )
-bool                 LDIFToAddressee (const TQString&, TDEABC::Addressee::List&, TQDateTime = TQDateTime ::currentDateTime ());
-%MethodCode
-
-    TDEABC::Addressee::List *xa1 = (TDEABC::Addressee::List *)a1;
-
-    Py_BEGIN_ALLOW_THREADS
-    sipRes = TDEABC::LDIFConverter::LDIFToAddressee (*a0, *xa1, *a2);    
-    Py_END_ALLOW_THREADS
-
-%End
-
-bool                 addresseeToLDIF (const TDEABC::Addressee::List&, TQString&);
-%MethodCode
-
-    TDEABC::Addressee::List *xa0 = (TDEABC::Addressee::List *)a0;
-
-    Py_BEGIN_ALLOW_THREADS
-    sipRes = TDEABC::LDIFConverter::addresseeToLDIF (*xa0, *a1);
-    Py_END_ALLOW_THREADS
-
-%End
-
-%End
-
-};  // namespace LDIFConverter
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/lock.sip b/sip/kabc/lock.sip
deleted file mode 100644
index 10ad727..0000000
--- a/sip/kabc/lock.sip
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_2_0 -  )
-namespace TDEABC
-{
-
-class Lock : TQObject
-{
-%TypeHeaderCode
-#include <lock.h>
-%End
-
-
-public:
-                         Lock (const TQString&);
-    virtual bool         lock ();
-    virtual bool         unlock ();
-    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 ();
-    void                 unlocked ();
-
-};  // class Lock
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/locknull.sip b/sip/kabc/locknull.sip
deleted file mode 100644
index d157031..0000000
--- a/sip/kabc/locknull.sip
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_2_0 -  )
-namespace TDEABC
-{
-
-class LockNull : TDEABC::Lock
-{
-%TypeHeaderCode
-#include <locknull.h>
-%End
-
-
-public:
-                         LockNull (bool);
-    bool                 lock ();
-    bool                 unlock ();
-    TQString              error () const;
-
-};  // class LockNull
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/phonenumber.sip b/sip/kabc/phonenumber.sip
deleted file mode 100644
index 4d8e6e8..0000000
--- a/sip/kabc/phonenumber.sip
+++ /dev/null
@@ -1,190 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-class PhoneNumber
-{
-%TypeHeaderCode
-#include <phonenumber.h>
-%End
-
-
-public:
-    typedef TQValueList<TDEABC::PhoneNumber> List;
-
-%If ( KDE_3_1_0 -  )
-    typedef TQValueList<int> TypeList;
-
-    enum Types
-    {
-        Home, 
-        Work, 
-        Msg, 
-        Pref, 
-        Voice, 
-        Fax, 
-        Cell, 
-        Video, 
-        Bbs, 
-        Modem, 
-        Car, 
-        Isdn, 
-        Pcs, 
-        Pager
-    };
-
-%End
-
-                         PhoneNumber ();
-                         PhoneNumber (const TQString&, int = Home );
-
-%If ( KDE_3_1_0 -  )
-    bool                 operator == (const TDEABC::PhoneNumber&) const;
-    bool                 operator != (const TDEABC::PhoneNumber&) const;
-%End
-
-    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 -  )
-    TQString              typeLabel () const;
-    TQString              label () const;
-    static TypeList      typeList ();
-    static TQString       typeLabel (int);
-    static TQString       label (int);
-%End
-
-
-public:
-
-%If (  - KDE_3_1_0 )
-
-    enum 
-    {
-        Home, 
-        Work, 
-        Msg, 
-        Pref, 
-        Voice, 
-        Fax, 
-        Cell, 
-        Video, 
-        Bbs, 
-        Modem, 
-        Car, 
-        Isdn, 
-        Pcs, 
-        Pager
-    };
-
-%End
-
-
-};  // class PhoneNumber
-
-
-%If ( KDE_3_1_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::PhoneNumber&);
-//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::PhoneNumber&);
-%End
-
-};  // namespace TDEABC
-
-
-
-%MappedType TDEABC::PhoneNumber::List
-//converts a Python list of TDEABC::PhoneNumber
-{
-%TypeHeaderCode
-#include <tqvaluelist.h>
-//typedef TQValueList<TDEABC::PhoneNumber> List;
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    TQValueList<TDEABC::PhoneNumber> *cpplist = (TQValueList<TDEABC::PhoneNumber> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    TQValueList<TDEABC::PhoneNumber>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipConvertFromNewType(new TDEABC::PhoneNumber(*it), sipType_KABC_PhoneNumber, NULL)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    TQValueList<TDEABC::PhoneNumber> *cpplist = new TQValueList<TDEABC::PhoneNumber>;
-
-    PyObject *elem;
-    TDEABC::PhoneNumber *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (TDEABC::PhoneNumber *)sipForceConvertToType(elem, sipType_KABC_PhoneNumber, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
-
diff --git a/sip/kabc/picture.sip b/sip/kabc/picture.sip
deleted file mode 100644
index 9b78ede..0000000
--- a/sip/kabc/picture.sip
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-
-class Picture
-{
-%TypeHeaderCode
-#include <picture.h>
-%End
-
-
-public:
-                         Picture ();
-                         Picture (const TQString&);
-                         Picture (const TQImage&);
-    bool                 operator == (const TDEABC::Picture&) const;
-    bool                 operator != (const TDEABC::Picture&) const;
-    void                 setUrl (const TQString&);
-    void                 setData (const TQImage&);
-    void                 setType (const TQString&);
-    bool                 isIntern () const;
-    TQString              url () const;
-    TQImage               data () const;
-    TQString              type () const;
-    TQString              asString () const;
-
-};  // class Picture
-
-//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
deleted file mode 100644
index 17f7553..0000000
--- a/sip/kabc/plugin.sip
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-
-class Plugin
-{
-%TypeHeaderCode
-#include <plugin.h>
-%End
-
-
-public:
-                         Plugin ();
-    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
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/resource.sip b/sip/kabc/resource.sip
deleted file mode 100644
index e289140..0000000
--- a/sip/kabc/resource.sip
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-class Ticket
-{
-%TypeHeaderCode
-#include <tdeabc/resource.h>
-%End
-
-
-public:
-    TDEABC::Resource*      resource ();
-
-private:
-                         Ticket (TDEABC::Resource*);
-
-};  // class Ticket
-
-
-%If ( KDE_3_2_0 -  )
-
-class Resource : KRES::Resource
-{
-%TypeHeaderCode
-#include <tdeabc/resource.h>
-%End
-
-
-public:
-    
-//ig     class Iterator;
-
-    
-//ig     class ConstIterator;
-
-                         Resource (const TDEConfig*);
-//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 TDEABC::Ticket* requestSaveTicket ()  = 0;
-    virtual void         releaseSaveTicket (TDEABC::Ticket*)  = 0;
-    virtual bool         load ()  = 0;
-    virtual bool         asyncLoad ();
-    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 (TDEABC::AddressBook*);
-
-signals:
-    void                 loadingFinished (TDEABC::Resource*);
-    void                 loadingError (TDEABC::Resource*, const TQString&);
-    void                 savingFinished (TDEABC::Resource*);
-    void                 savingError (TDEABC::Resource*, const TQString&);
-
-protected:
-    TDEABC::Ticket*        createTicket (TDEABC::Resource*);
-
-};  // class Resource
-
-%End
-
-
-%If ( KDE_3_1_0 - KDE_3_2_0 )
-
-class Resource : TDEABC::Plugin
-{
-%TypeHeaderCode
-#include <tdeabc/resource.h>
-%End
-
-
-public:
-                         Resource (TDEABC::AddressBook*);
-    virtual bool         open ();
-    virtual void         close ();
-    virtual TDEABC::Ticket* requestSaveTicket ();
-    virtual bool         load ();
-    virtual bool         save (TDEABC::Ticket*);
-    TDEABC::AddressBook*   addressBook ();
-    virtual TQString      identifier () const;
-    virtual void         removeAddressee (const TDEABC::Addressee&);
-    virtual void         cleanUp ();
-    virtual void         setReadOnly (bool);
-    virtual bool         readOnly () const;
-    virtual void         setFastResource (bool);
-    virtual bool         fastResource () const;
-    virtual void         setName (const TQString);
-    virtual TQString      name () const;
-    static TQString       cryptStr (const TQString&);
-
-protected:
-    TDEABC::Ticket*        createTicket (TDEABC::Resource*);
-
-};  // class Resource
-
-%End
-
-
-%If (  - KDE_3_1_0 )
-
-class Resource
-{
-%TypeHeaderCode
-#include <tdeabc/resource.h>
-%End
-
-
-public:
-                         Resource (TDEABC::AddressBook*);
-    virtual bool         open ();
-    virtual void         close ();
-    virtual TDEABC::Ticket* requestSaveTicket ();
-    virtual bool         load (TDEABC::AddressBook*);
-    virtual bool         save (TDEABC::Ticket*);
-    void                 setAddressBook (TDEABC::AddressBook*);
-    TDEABC::AddressBook*   addressBook ();
-
-protected:
-    TDEABC::Ticket*        createTicket (TDEABC::Resource*);
-
-};  // class Resource
-
-%End
-
-};  // namespace TDEABC
-
diff --git a/sip/kabc/resourcefile.sip b/sip/kabc/resourcefile.sip
deleted file mode 100644
index 3fa78de..0000000
--- a/sip/kabc/resourcefile.sip
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-%If ( KDE_3_2_0 -  )
-
-class ResourceFile : TDEABC::Resource
-{
-%TypeHeaderCode
-#include <resourcefile.h>
-%End
-
-
-public:
-
-%If ( KDE_3_3_0 -  )
-                         ResourceFile (const TDEConfig*);
-                         ResourceFile (const TQString&, const TQString& = "vcard");
-    virtual void         writeConfig (TDEConfig*);
-    virtual bool         doOpen ();
-    virtual void         doClose ();
-
-%If ( KDE_3_5_1 -  )
-    virtual TDEABC::Ticket* requestSaveTicket ();
-    virtual void         releaseSaveTicket (TDEABC::Ticket*);
-%End
-
-    virtual bool         load ();
-    virtual bool         asyncLoad ();
-    virtual bool         save (TDEABC::Ticket*);
-    virtual bool         asyncSave (TDEABC::Ticket*);
-%End
-
-    void                 setFileName (const TQString&);
-    TQString              fileName () const;
-
-%If ( KDE_3_5_1 -  )
-    void                 setFormat (const TQString&);
-    TQString              format () const;
-
-%If ( KDE_3_5_2 -  )
-    virtual void         removeAddressee (const TDEABC::Addressee&);
-%End
-
-%End
-
-
-protected slots:
-    void                 fileChanged ();
-
-protected:
-
-%If ( KDE_3_3_0 -  )
-    void                 init (const TQString&, const TQString&);
-%End
-
-//ig     bool                 lock (const TQString&);
-//ig     void                 unlock (const TQString&);
-
-public:
-
-%If (  - KDE_3_5_2 )
-    void                 removeAddressee (const TDEABC::Addressee&);
-%End
-
-
-public:
-
-%If (  - KDE_3_3_0 )
-                         ResourceFile (TDEABC::AddressBook*, const TDEConfig*);
-                         ResourceFile (TDEABC::AddressBook*, const TQString&, TDEABC::FormatPlugin* = 0);
-    bool                 open ();
-    void                 close ();
-%End
-
-
-%If (  - KDE_3_5_1 )
-    TDEABC::Ticket*        requestSaveTicket ();
-    void                 releaseSaveTicket (TDEABC::Ticket*);
-
-%If (  - KDE_3_3_0 )
-    bool                 load ();
-    bool                 save (TDEABC::Ticket*);
-    virtual void         cleanUp ();
-%End
-
-    virtual TQString      identifier () const;
-%End
-
-
-};  // class ResourceFile
-
-%End
-
-
-%If (  - KDE_3_2_0 )
-
-class ResourceFile : TDEABC::Resource
-{
-%TypeHeaderCode
-#include <resourcefile.h>
-%End
-
-
-public:
-
-%If ( KDE_3_1_0 -  )
-                         ResourceFile (TDEABC::AddressBook*, const TDEConfig*);
-                         ResourceFile (TDEABC::AddressBook*, const TQString&, TDEABC::FormatPlugin* = 0);
-    bool                 open ();
-    void                 close ();
-%End
-
-    TDEABC::Ticket*        requestSaveTicket ();
-    void                 releaseSaveTicket (TDEABC::Ticket*);
-    bool                 load ();
-    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 TDEABC::Addressee&);
-%End
-
-
-protected:
-//ig     bool                 lock (const TQString&);
-//ig     void                 unlock (const TQString&);
-
-public:
-
-%If (  - KDE_3_1_0 )
-                         ResourceFile (TDEABC::AddressBook*, const TQString&, TDEABC::Format* = 0);
-    bool                 load (TDEABC::AddressBook*);
-%End
-
-
-protected slots:
-
-%If (  - KDE_3_1_0 )
-    void                 checkFile ();
-%End
-
-
-};  // class ResourceFile
-
-%End
-
-};  // namespace TDEABC
-
diff --git a/sip/kabc/resourceselectdialog.sip b/sip/kabc/resourceselectdialog.sip
deleted file mode 100644
index e3ca153..0000000
--- a/sip/kabc/resourceselectdialog.sip
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-
-class ResourceSelectDialog
-{
-%TypeHeaderCode
-#include <tqwidget.h>
-#include <resourceselectdialog.h>
-#include <tdeabc/resource.h>
-%End
-
-
-public:
-                         ResourceSelectDialog (TDEABC::AddressBook*, TQWidget* = 0, const char* = 0);
-    TDEABC::Resource*      resource ();
-    static TDEABC::Resource* getResource (TDEABC::AddressBook*, TQWidget* = 0);
-//force
-
-private:
-                         ResourceSelectDialog (TDEABC::ResourceSelectDialog&);
-//end
-
-};  // class ResourceSelectDialog
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/secrecy.sip b/sip/kabc/secrecy.sip
deleted file mode 100644
index c0f9b50..0000000
--- a/sip/kabc/secrecy.sip
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-
-class Secrecy
-{
-%TypeHeaderCode
-#include <secrecy.h>
-%End
-
-
-public:
-    typedef TQValueList<int> TypeList;
-
-%If ( KDE_3_2_0 -  )
-
-    enum Types
-    {
-        Public, 
-        Private, 
-        Confidential, 
-        Invalid
-    };
-
-%End
-
-                         Secrecy (int = Private );
-    bool                 operator == (const TDEABC::Secrecy&) const;
-    bool                 operator != (const TDEABC::Secrecy&) const;
-
-%If ( KDE_3_2_0 -  )
-    bool                 isValid () const;
-%End
-
-    void                 setType (int);
-    int                  type () const;
-    static TypeList      typeList ();
-    static TQString       typeLabel (int);
-    TQString              asString () const;
-
-public:
-
-%If (  - KDE_3_2_0 )
-
-    enum Types
-    {
-        Public, 
-        Private, 
-        Confidential
-    };
-
-%End
-
-
-};  // class Secrecy
-
-
-%If ( KDE_3_4_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::Secrecy&);
-//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::Secrecy&);
-%End
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/sortmode.sip b/sip/kabc/sortmode.sip
deleted file mode 100644
index b562805..0000000
--- a/sip/kabc/sortmode.sip
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_4_0 -  )
-namespace TDEABC
-{
-
-class SortMode
-{
-%TypeHeaderCode
-#include <sortmode.h>
-%End
-
-
-public:
-    virtual bool         lesser (const TDEABC::Addressee&, const TDEABC::Addressee&) const = 0;
-
-};  // class SortMode
-
-
-class NameSortMode : TDEABC::SortMode
-{
-%TypeHeaderCode
-#include <sortmode.h>
-%End
-
-
-public:
-
-    enum NameType
-    {
-        FormattedName, 
-        FamilyName, 
-        GivenName
-    };
-
-                         NameSortMode ();
-                         NameSortMode (TDEABC::NameSortMode::NameType, bool = 1);
-    virtual bool         lesser (const TDEABC::Addressee&, const TDEABC::Addressee&) const;
-
-};  // class NameSortMode
-
-
-class FieldSortMode : TDEABC::SortMode
-{
-%TypeHeaderCode
-#include <sortmode.h>
-%End
-
-
-public:
-                         FieldSortMode (TDEABC::Field*, bool = 1);
-    virtual bool         lesser (const TDEABC::Addressee&, const TDEABC::Addressee&) const;
-
-};  // class FieldSortMode
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/sound.sip b/sip/kabc/sound.sip
deleted file mode 100644
index e97aec4..0000000
--- a/sip/kabc/sound.sip
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_0 -  )
-namespace TDEABC
-{
-
-class Sound
-{
-%TypeHeaderCode
-#include <sound.h>
-%End
-
-
-public:
-                         Sound ();
-                         Sound (const TQString&);
-                         Sound (const TQByteArray&);
-    bool                 operator == (const TDEABC::Sound&) const;
-    bool                 operator != (const TDEABC::Sound&) const;
-    void                 setUrl (const TQString&);
-
-%If ( KDE_3_4_0 -  )
-    bool                 isEmpty () const;
-%End
-
-    void                 setData (const TQByteArray&);
-    bool                 isIntern () const;
-    TQString              url () const;
-    TQByteArray           data () const;
-    TQString              asString () const;
-
-};  // class Sound
-
-//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
deleted file mode 100644
index 305e5f2..0000000
--- a/sip/kabc/stdaddressbook.sip
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-class StdAddressBook : TDEABC::AddressBook
-{
-%TypeHeaderCode
-#include <tdeabc/resource.h>
-#include <addressee.h>
-#include <addressbook.h>
-#include <stdaddressbook.h>
-%End
-
-
-public:
-
-%If ( KDE_3_2_0 -  )
-    static TDEABC::StdAddressBook* self ();
-    static TDEABC::StdAddressBook* self (bool);
-%End
-
-    static bool          save ();
-
-%If ( KDE_3_1_1 -  )
-    static void          handleCrash ();
-%End
-
-    static TQString       fileName ();
-
-%If ( KDE_3_1_0 -  )
-    static TQString       directoryName ();
-    static void          setAutomaticSave (bool);
-    static void          close ();
-    static bool          automaticSave ();
-
-%If ( KDE_3_2_0 -  )
-    TDEABC::Addressee      whoAmI ();
-    void                 setWhoAmI (const TDEABC::Addressee&);
-%End
-
-%End
-
-
-protected:
-                         StdAddressBook ();
-
-%If ( KDE_3_1_0 -  )
-                         StdAddressBook (bool);
-    void                 init (bool);
-
-%If ( KDE_3_2_2 -  )
-    bool                 saveAll ();
-%End
-
-%End
-
-
-public:
-
-%If (  - KDE_3_2_0 )
-    static TDEABC::AddressBook* self ();
-%End
-
-
-%If ( KDE_3_1_0 - KDE_3_2_2 )
-    static TDEABC::AddressBook* self (bool);
-%End
-
-
-protected:
-
-%If (  - KDE_3_2_0 )
-                         ~StdAddressBook ();
-%End
-
-
-public:
-
-%If (  - KDE_3_1_0 )
-    TQString              identifier ();
-%End
-
-
-};  // class StdAddressBook
-
-};  // namespace TDEABC
-
diff --git a/sip/kabc/timezone.sip b/sip/kabc/timezone.sip
deleted file mode 100644
index 0b461bf..0000000
--- a/sip/kabc/timezone.sip
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-class TimeZone
-{
-%TypeHeaderCode
-#include <timezone.h>
-%End
-
-
-public:
-                         TimeZone ();
-                         TimeZone (int);
-    void                 setOffset (int);
-    int                  offset () const;
-    bool                 isValid () const;
-    bool                 operator == (const TDEABC::TimeZone&) const;
-
-%If ( KDE_3_1_0 -  )
-    bool                 operator != (const TDEABC::TimeZone&) const;
-%End
-
-    TQString              asString () const;
-
-};  // class TimeZone
-
-
-%If ( KDE_3_1_0 -  )
-//igx TQDataStream&         operator << (TQDataStream&, const TDEABC::TimeZone&);
-//igx TQDataStream&         operator >> (TQDataStream&, TDEABC::TimeZone&);
-%End
-
-};  // namespace TDEABC
-
diff --git a/sip/kabc/vcardconverter.sip b/sip/kabc/vcardconverter.sip
deleted file mode 100644
index b545fe0..0000000
--- a/sip/kabc/vcardconverter.sip
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-%ModuleHeaderCode
-#include <vcardconverter.h>
-%End
-
-
-%If ( KDE_3_1_1 -  )
-namespace TDEABC
-{
-
-class VCardConverter
-{
-%TypeHeaderCode
-#include <vcardconverter.h>
-%End
-
-
-public:
-
-    enum Version
-    {
-        v2_1, 
-        v3_0
-    };
-
-                         VCardConverter ();
-
-%If ( KDE_3_2_0 -  )
-    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&, TDEABC::Addressee&, TDEABC::VCardConverter::Version = v3_0 );
-    bool                 addresseeToVCard (const TDEABC::Addressee&, TQString&, TDEABC::VCardConverter::Version = v3_0 );
-
-};  // class VCardConverter
-
-
-%If ( KDE_3_2_0 -  )
-TQString              dateToVCardString (const TQDateTime&);
-TQString              dateToVCardString (const TQDate&);
-TQDateTime            VCardStringToDate (const TQString&);
-%End
-
-};  // namespace TDEABC
-
-%End
-
diff --git a/sip/kabc/vcardformat.sip b/sip/kabc/vcardformat.sip
deleted file mode 100644
index 7e387e3..0000000
--- a/sip/kabc/vcardformat.sip
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace TDEABC
-{
-
-class VCardFormat : TDEABC::Format
-{
-%TypeHeaderCode
-#include <vcardformat.h>
-%End
-
-
-public:
-                         VCardFormat ();
-    bool                 load (TDEABC::AddressBook*, const TQString&);
-    bool                 save (TDEABC::AddressBook*, const TQString&);
-
-};  // class VCardFormat
-
-};  // namespace TDEABC
-
diff --git a/sip/kabc/vcardformatplugin.sip b/sip/kabc/vcardformatplugin.sip
deleted file mode 100644
index f6641aa..0000000
--- a/sip/kabc/vcardformatplugin.sip
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <[email protected]>
-//     Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module kabc  version KDE 3.5.3
-
-
-// This software is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This software is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this library; see the file COPYING.
-// If not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-%If ( KDE_3_1_1 -  )
-namespace TDEABC
-{
-
-class VCardFormatPlugin : TDEABC::FormatPlugin
-{
-%TypeHeaderCode
-#include <vcardformatplugin.h>
-%End
-
-
-public:
-                         VCardFormatPlugin ();
-    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 TDEABC
-
-%End
-