Updated python directory

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1175349 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

59 files changed, 0 insertions, 4642 deletions

diff --git a/python/pykde/sip/kabc/address.sip b/python/pykde/sip/kabc/address.sip
deleted file mode 100644
index d15d1694..00000000
--- a/python/pykde/sip/kabc/address.sip
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class Address
-{
-%TypeHeaderCode
-#include <address.h>
-%End
-
-
-public:
-    typedef QValueList<KABC::Address> List;
-
-%If ( KDE_3_1_0 -  )
-    typedef QValueList<int> TypeList;
-%End
-
-
-    enum Type
-    {
-        Dom, 
-        Intl, 
-        Postal, 
-        Parcel, 
-        Home, 
-        Work, 
-        Pref
-    };
-
-                         Address ();
-                         Address (int);
-
-%If ( KDE_3_1_0 -  )
-    bool                 operator == (const KABC::Address&) const;
-    bool                 operator != (const KABC::Address&) const;
-%End
-
-    bool                 isEmpty () const;
-    void                 clear ();
-    void                 setId (const QString&);
-    QString              id () const;
-    void                 setType (int);
-    int                  type () const;
-
-%If ( KDE_3_1_0 -  )
-    QString              typeLabel () const;
-%End
-
-    void                 setPostOfficeBox (const QString&);
-    QString              postOfficeBox () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       postOfficeBoxLabel ();
-%End
-
-    void                 setExtended (const QString&);
-    QString              extended () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       extendedLabel ();
-%End
-
-    void                 setStreet (const QString&);
-    QString              street () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       streetLabel ();
-%End
-
-    void                 setLocality (const QString&);
-    QString              locality () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       localityLabel ();
-%End
-
-    void                 setRegion (const QString&);
-    QString              region () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       regionLabel ();
-%End
-
-    void                 setPostalCode (const QString&);
-    QString              postalCode () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       postalCodeLabel ();
-%End
-
-    void                 setCountry (const QString&);
-    QString              country () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       countryLabel ();
-%End
-
-    void                 setLabel (const QString&);
-    QString              label () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       labelLabel ();
-    static KABC::Address::TypeList typeList ();
-    static QString       typeLabel (int);
-%End
-
-    void                 dump () const;
-
-%If ( KDE_3_2_0 -  )
-    QString              formattedAddress (const QString& = QString ::null , const QString& = QString ::null ) const;
-    static QString       countryToISO (const QString&);
-    static QString       ISOtoCountry (const QString&);
-%End
-
-
-};  // class Address
-
-
-%If ( KDE_3_1_0 -  )
-//igx QDataStream&         operator << (QDataStream&, const KABC::Address&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Address&);
-%End
-
-};  // namespace KABC
-
diff --git a/python/pykde/sip/kabc/addressbook.sip b/python/pykde/sip/kabc/addressbook.sip
deleted file mode 100644
index 0075bf67..00000000
--- a/python/pykde/sip/kabc/addressbook.sip
+++ /dev/null
@@ -1,230 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class AddressBook : QObject
-{
-%TypeHeaderCode
-#include <resource.h>
-#include <addressbook.h>
-%End
-
-
-public:
-    
-//ig     class Iterator;
-
-    
-//ig     class ConstIterator;
-
-                         AddressBook ();
-
-%If ( KDE_3_2_0 -  )
-                         AddressBook (const QString&);
-%End
-
-    KABC::Ticket*        requestSaveTicket (KABC::Resource* = 0);
-
-%If ( KDE_3_2_0 -  )
-    void                 releaseSaveTicket (KABC::Ticket*);
-%End
-
-    bool                 load ();
-
-%If ( KDE_3_2_0 -  )
-    bool                 asyncLoad ();
-%End
-
-    bool                 save (KABC::Ticket*);
-
-%If ( KDE_3_2_0 -  )
-    bool                 asyncSave (KABC::Ticket*);
-%End
-
-//igx     KABC::AddressBook::ConstIterator begin () const;
-//igx     KABC::AddressBook::Iterator begin ();
-//igx     KABC::AddressBook::ConstIterator end () const;
-//igx     KABC::AddressBook::Iterator end ();
-    void                 clear ();
-    void                 insertAddressee (const KABC::Addressee&);
-    void                 removeAddressee (const KABC::Addressee&);
-//ig     void                 removeAddressee (const KABC::AddressBook::Iterator&);
-//igx     KABC::AddressBook::Iterator find (const Addressee&);
-    KABC::Addressee      findByUid (const QString&);
-
-%If ( KDE_3_2_0 -  )
-    KABC::Addressee::List allAddressees ();
-%End
-
-    KABC::Addressee::List findByName (const QString&);
-    KABC::Addressee::List findByEmail (const QString&);
-    KABC::Addressee::List findByCategory (const QString&);
-    virtual QString      identifier ();
-
-%If ( KDE_3_1_0 -  )
-    KABC::Field::List    fields (int = KABC ::Field ::All );
-    bool                 addCustomField (const QString&, int = KABC ::Field ::All , const QString& = QString ::null , const QString& = QString ::null );
-%End
-
-    bool                 addResource (KABC::Resource*);
-
-%If ( KDE_3_1_0 -  )
-    bool                 removeResource (KABC::Resource*);
-    QPtrList<KABC::Resource> resources ();
-    void                 setErrorHandler (KABC::ErrorHandler*);
-    void                 error (const QString&);
-    void                 cleanUp ();
-%End
-
-    void                 dump () const;
-    void                 emitAddressBookLocked ();
-    void                 emitAddressBookUnlocked ();
-    void                 emitAddressBookChanged ();
-
-%If ( KDE_3_5_0 -  )
-    bool                 loadingHasFinished () const;
-%End
-
-
-signals:
-    void                 addressBookChanged (KABC::AddressBook*);
-    void                 addressBookLocked (KABC::AddressBook*);
-    void                 addressBookUnlocked (KABC::AddressBook*);
-
-%If ( KDE_3_2_0 -  )
-    void                 loadingFinished (KABC::Resource*);
-    void                 savingFinished (KABC::Resource*);
-%End
-
-
-protected slots:
-
-%If ( KDE_3_2_0 -  )
-    void                 resourceLoadingFinished (KABC::Resource*);
-    void                 resourceSavingFinished (KABC::Resource*);
-    void                 resourceLoadingError (KABC::Resource*, const QString&);
-    void                 resourceSavingError (KABC::Resource*, const QString&);
-%End
-
-
-protected:
-
-%If ( KDE_3_1_0 -  )
-    void                 deleteRemovedAddressees ();
-    void                 setStandardResource (KABC::Resource*);
-    KABC::Resource*      standardResource ();
-
-%If ( KDE_3_2_0 -  )
-//ig     KRES::Manager<KABC::Resource>* resourceManager ();
-%End
-
-%End
-
-
-};  // class AddressBook
-
-
-%If ( KDE_3_1_0 -  )
-//igx QDataStream&         operator << (QDataStream&, const KABC::AddressBook&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::AddressBook&);
-%End
-
-};  // namespace KABC
-
-
-
-%MappedType QPtrList<KABC::Resource>
-//converts a Python list of KABC::Resource
-{
-%TypeHeaderCode
-#include <qptrlist.h>
-#include <sipkabcKABCResource.h>
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New (0);
-
-    PyObject *pylist;
-
-    // Create the list
-
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    // Get it.
-
-    QPtrList<KABC::Resource> *cpplist = (QPtrList<KABC::Resource> *)sipCpp;
-    KABC::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);
-
-    QPtrList<KABC::Resource> *cpplist = new QPtrList<KABC::Resource>;
-
-    PyObject *elem;
-    KABC::Resource *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::Resource *)sipForceConvertTo_KABC_Resource (elem, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
-
diff --git a/python/pykde/sip/kabc/addressee.sip b/python/pykde/sip/kabc/addressee.sip
deleted file mode 100644
index 05f6bac1..00000000
--- a/python/pykde/sip/kabc/addressee.sip
+++ /dev/null
@@ -1,470 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class Addressee
-{
-%TypeHeaderCode
-#include <addressee.h>
-%End
-
-
-public:
-//ig     typedef QValueList<KABC::Addressee> List;
-
-%If ( KDE_3_4_2 -  )
-    typedef QMap<QString,KABC::Addressee> Map;
-%End
-
-                         Addressee ();
-                         Addressee (const KABC::Addressee&);
-
-%If ( KDE_3_1_0 -  )
-    bool                 operator == (const KABC::Addressee&) const;
-    bool                 operator != (const KABC::Addressee&) const;
-%End
-
-    bool                 isEmpty () const;
-    void                 setUid (const QString&);
-    QString              uid () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       uidLabel ();
-%End
-
-    void                 setName (const QString&);
-    QString              name () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       nameLabel ();
-%End
-
-    void                 setFormattedName (const QString&);
-    QString              formattedName () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       formattedNameLabel ();
-%End
-
-    void                 setFamilyName (const QString&);
-    QString              familyName () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       familyNameLabel ();
-%End
-
-    void                 setGivenName (const QString&);
-    QString              givenName () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       givenNameLabel ();
-%End
-
-    void                 setAdditionalName (const QString&);
-    QString              additionalName () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       additionalNameLabel ();
-%End
-
-    void                 setPrefix (const QString&);
-    QString              prefix () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       prefixLabel ();
-%End
-
-    void                 setSuffix (const QString&);
-    QString              suffix () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       suffixLabel ();
-%End
-
-    void                 setNickName (const QString&);
-    QString              nickName () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       nickNameLabel ();
-%End
-
-    void                 setBirthday (const QDateTime&);
-    QDateTime            birthday () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       birthdayLabel ();
-    static QString       homeAddressStreetLabel ();
-    static QString       homeAddressLocalityLabel ();
-    static QString       homeAddressRegionLabel ();
-    static QString       homeAddressPostalCodeLabel ();
-    static QString       homeAddressCountryLabel ();
-    static QString       homeAddressLabelLabel ();
-    static QString       businessAddressStreetLabel ();
-    static QString       businessAddressLocalityLabel ();
-    static QString       businessAddressRegionLabel ();
-    static QString       businessAddressPostalCodeLabel ();
-    static QString       businessAddressCountryLabel ();
-    static QString       businessAddressLabelLabel ();
-    static QString       homePhoneLabel ();
-    static QString       businessPhoneLabel ();
-    static QString       mobilePhoneLabel ();
-    static QString       homeFaxLabel ();
-    static QString       businessFaxLabel ();
-    static QString       carPhoneLabel ();
-    static QString       isdnLabel ();
-    static QString       pagerLabel ();
-    static QString       emailLabel ();
-%End
-
-    void                 setMailer (const QString&);
-    QString              mailer () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       mailerLabel ();
-%End
-
-    void                 setTimeZone (const KABC::TimeZone&);
-    KABC::TimeZone       timeZone () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       timeZoneLabel ();
-%End
-
-    void                 setGeo (const KABC::Geo&);
-    KABC::Geo            geo () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       geoLabel ();
-%End
-
-    void                 setTitle (const QString&);
-    QString              title () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       titleLabel ();
-%End
-
-    void                 setRole (const QString&);
-    QString              role () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       roleLabel ();
-%End
-
-    void                 setOrganization (const QString&);
-    QString              organization () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       organizationLabel ();
-%End
-
-    void                 setNote (const QString&);
-    QString              note () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       noteLabel ();
-%End
-
-    void                 setProductId (const QString&);
-    QString              productId () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       productIdLabel ();
-%End
-
-    void                 setRevision (const QDateTime&);
-    QDateTime            revision () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       revisionLabel ();
-%End
-
-    void                 setSortString (const QString&);
-    QString              sortString () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       sortStringLabel ();
-%End
-
-    void                 setUrl (const KURL&);
-    KURL                 url () const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       urlLabel ();
-    void                 setSecrecy (const KABC::Secrecy&);
-    KABC::Secrecy        secrecy () const;
-    static QString       secrecyLabel ();
-    void                 setLogo (const KABC::Picture&);
-    KABC::Picture        logo () const;
-    static QString       logoLabel ();
-    void                 setPhoto (const KABC::Picture&);
-    KABC::Picture        photo () const;
-    static QString       photoLabel ();
-    void                 setSound (const KABC::Sound&);
-    KABC::Sound          sound () const;
-    static QString       soundLabel ();
-    void                 setAgent (const KABC::Agent&);
-    KABC::Agent          agent () const;
-    static QString       agentLabel ();
-%End
-
-    void                 setNameFromString (const QString&);
-    QString              realName () const;
-
-%If ( KDE_3_1_0 -  )
-    QString              assembledName () const;
-%End
-
-    QString              fullEmail (const QString& = QString ::null ) const;
-    void                 insertEmail (const QString&, bool = 0);
-    void                 removeEmail (const QString&);
-    QString              preferredEmail () const;
-    QStringList          emails () const;
-
-%If ( KDE_3_4_2 -  )
-    void                 setEmails (const QStringList&);
-%End
-
-    void                 insertPhoneNumber (const KABC::PhoneNumber&);
-    void                 removePhoneNumber (const KABC::PhoneNumber&);
-    KABC::PhoneNumber    phoneNumber (int) const;
-    KABC::PhoneNumber::List phoneNumbers () const;
-
-%If ( KDE_3_1_0 -  )
-    KABC::PhoneNumber::List phoneNumbers (int) const;
-%End
-
-    KABC::PhoneNumber    findPhoneNumber (const QString&) const;
-
-%If ( KDE_3_1_0 -  )
-    void                 insertKey (const KABC::Key&);
-    void                 removeKey (const KABC::Key&);
-    KABC::Key            key (int, QString = QString ::null ) const;
-    KABC::Key::List      keys () const;
-
-%If ( KDE_3_4_2 -  )
-    void                 setKeys (const KABC::Key::List&);
-%End
-
-    KABC::Key::List      keys (int, QString = QString ::null ) const;
-    KABC::Key            findKey (const QString&) const;
-%End
-
-    void                 insertAddress (const KABC::Address&);
-    void                 removeAddress (const KABC::Address&);
-    KABC::Address        address (int) const;
-    KABC::Address::List  addresses () const;
-
-%If ( KDE_3_1_0 -  )
-    KABC::Address::List  addresses (int) const;
-%End
-
-    KABC::Address        findAddress (const QString&) const;
-    void                 insertCategory (const QString&);
-    void                 removeCategory (const QString&);
-    bool                 hasCategory (const QString&) const;
-    void                 setCategories (const QStringList&);
-    QStringList          categories () const;
-    void                 insertCustom (const QString&, const QString&, const QString&);
-    void                 removeCustom (const QString&, const QString&);
-    QString              custom (const QString&, const QString&) const;
-    void                 setCustoms (const QStringList&);
-    QStringList          customs () const;
-
-%If ( KDE_3_1_0 -  )
-    static void          parseEmailAddress (const QString&, QString&, QString&);
-%End
-
-    void                 dump () const;
-
-%If ( KDE_3_1_0 -  )
-    QString              asString () const;
-    void                 setResource (KABC::Resource*);
-    KABC::Resource*      resource () const;
-    void                 setChanged (bool);
-    bool                 changed () const;
-
-%If ( KDE_3_4_2 -  )
-    static void          setSortMode (KABC::SortMode*);
-    bool                 operator < (const KABC::Addressee&);
-%End
-
-%End
-
-
-
-
-
-
-};  // class Addressee
-
-
-%If ( KDE_3_1_0 -  )
-//igx QDataStream&         operator << (QDataStream&, const KABC::Addressee&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Addressee&);
-%End
-
-};  // namespace KABC
-
-
-
-%MappedType KABC::Addressee::List
-//converts a Python list of KABC::Addressee
-{
-%TypeHeaderCode
-#include <qvaluelist.h>
-#include <sipkabcKABCAddressee.h>
-//typedef QValueList<KABC::Addressee> List;
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    QValueList<KABC::Addressee> *cpplist = (QValueList<KABC::Addressee> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    QValueList<KABC::Addressee>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipBuildResult (NULL, "N", new KABC::Addressee (*it), sipClass_KABC_Addressee)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    QValueList<KABC::Addressee> *cpplist = new QValueList<KABC::Addressee>;
-
-    PyObject *elem;
-    KABC::Addressee *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::Addressee *)sipForceConvertTo_KABC_Addressee (elem, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
-%MappedType KABC::Address::List
-//converts a Python list of KABC::Address
-{
-%TypeHeaderCode
-#include <qvaluelist.h>
-#include <sipkabcKABCAddress.h>
-//typedef QValueList<KABC::Address> List;
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    QValueList<KABC::Address> *cpplist = (QValueList<KABC::Address> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    QValueList<KABC::Address>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipBuildResult (NULL, "N", new KABC::Address (*it), sipClass_KABC_Address)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    QValueList<KABC::Address> *cpplist = new QValueList<KABC::Address>;
-
-    PyObject *elem;
-    KABC::Address *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::Address *)sipForceConvertTo_KABC_Address (elem, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
diff --git a/python/pykde/sip/kabc/addresseedialog.sip b/python/pykde/sip/kabc/addresseedialog.sip
deleted file mode 100644
index abfd6d27..00000000
--- a/python/pykde/sip/kabc/addresseedialog.sip
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class AddresseeItem : QListViewItem
-{
-%TypeHeaderCode
-#include <addresseedialog.h>
-%End
-
-
-public:
-
-    enum columns
-    {
-        Name, 
-        Email
-    };
-
-                         AddresseeItem (QListView*, const KABC::Addressee&);
-    KABC::Addressee      addressee () const;
-    virtual QString      key (int, bool) const;
-
-};  // class AddresseeItem
-
-
-class AddresseeDialog : KDialogBase
-{
-%TypeHeaderCode
-#include <addresseedialog.h>
-%End
-
-
-public:
-                         AddresseeDialog (QWidget* = 0, bool = 0);
-    KABC::Addressee      addressee ();
-    KABC::Addressee::List addressees ();
-    static KABC::Addressee getAddressee (QWidget*);
-    static KABC::Addressee::List getAddressees (QWidget*);
-
-protected slots:
-
-%If ( KDE_3_1_0 -  )
-    void                 addressBookChanged ();
-%End
-
-
-};  // class AddresseeDialog
-
-};  // namespace KABC
-
diff --git a/python/pykde/sip/kabc/addresseelist.sip b/python/pykde/sip/kabc/addresseelist.sip
deleted file mode 100644
index f5264649..00000000
--- a/python/pykde/sip/kabc/addresseelist.sip
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 <qwidget.h>
-#include <addresseelist.h>
-%End
-
-
-%If ( KDE_3_1_0 -  )
-namespace KABC
-{
-namespace SortingTraits
-{
-
-class Uid
-{
-%TypeHeaderCode
-#include <addresseelist.h>
-%End
-
-
-public:
-    static bool          eq (const KABC::Addressee&, const KABC::Addressee&);
-    static bool          lt (const KABC::Addressee&, const KABC::Addressee&);
-
-};  // class Uid
-
-
-class Name
-{
-%TypeHeaderCode
-#include <addresseelist.h>
-%End
-
-
-public:
-    static bool          eq (const KABC::Addressee&, const KABC::Addressee&);
-    static bool          lt (const KABC::Addressee&, const KABC::Addressee&);
-
-};  // class Name
-
-
-class FormattedName
-{
-%TypeHeaderCode
-#include <addresseelist.h>
-%End
-
-
-public:
-    static bool          eq (const KABC::Addressee&, const KABC::Addressee&);
-    static bool          lt (const KABC::Addressee&, const KABC::Addressee&);
-
-};  // class FormattedName
-
-
-class FamilyName
-{
-%TypeHeaderCode
-#include <addresseelist.h>
-%End
-
-
-public:
-    static bool          eq (const KABC::Addressee&, const KABC::Addressee&);
-    static bool          lt (const KABC::Addressee&, const KABC::Addressee&);
-
-};  // class FamilyName
-
-
-class GivenName
-{
-%TypeHeaderCode
-#include <addresseelist.h>
-%End
-
-
-public:
-    static bool          eq (const KABC::Addressee&, const KABC::Addressee&);
-    static bool          lt (const KABC::Addressee&, const KABC::Addressee&);
-
-};  // class GivenName
-
-};  // namespace SortingTraits
-
-
-enum 
-{
-    Uid, 
-    Name, 
-    FormattedName, 
-    FamilyName, 
-    GivenName
-};
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/addresslineedit.sip b/python/pykde/sip/kabc/addresslineedit.sip
deleted file mode 100644
index 54606e91..00000000
--- a/python/pykde/sip/kabc/addresslineedit.sip
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class AddressLineEdit : KLineEdit
-{
-%TypeHeaderCode
-#include <addresslineedit.h>
-%End
-
-
-public:
-                         AddressLineEdit (QWidget*, bool = 1, const char* = 0);
-    virtual void         setFont (const QFont&);
-
-%If ( KDE_3_2_0 -  )
-    static KConfig*      config ();
-%End
-
-
-public slots:
-    void                 cursorAtEnd ();
-    void                 enableCompletion (bool);
-
-protected:
-    virtual void         loadAddresses ();
-    void                 addAddress (const QString&);
-    virtual void         keyPressEvent (QKeyEvent*);
-    virtual void         dropEvent (QDropEvent*);
-    virtual void         paste ();
-    virtual void         insert (const QString&);
-    virtual void         mouseReleaseEvent (QMouseEvent*);
-    void                 doCompletion (bool);
-
-};  // class AddressLineEdit
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/agent.sip b/python/pykde/sip/kabc/agent.sip
deleted file mode 100644
index 4aff028a..00000000
--- a/python/pykde/sip/kabc/agent.sip
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class Agent
-{
-%TypeHeaderCode
-#include <agent.h>
-%End
-
-
-public:
-                         Agent ();
-                         Agent (const QString&);
-                         Agent (KABC::Addressee*);
-    bool                 operator == (const KABC::Agent&) const;
-    bool                 operator != (const KABC::Agent&) const;
-    void                 setUrl (const QString&);
-    void                 setAddressee (KABC::Addressee*);
-    bool                 isIntern () const;
-    QString              url () const;
-    KABC::Addressee*     addressee () const;
-    QString              asString () const;
-
-};  // class Agent
-
-//igx QDataStream&         operator << (QDataStream&, const KABC::Agent&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Agent&);
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/distributionlist.sip b/python/pykde/sip/kabc/distributionlist.sip
deleted file mode 100644
index a21d8847..00000000
--- a/python/pykde/sip/kabc/distributionlist.sip
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class DistributionList
-{
-%TypeHeaderCode
-#include <distributionlist.h>
-%End
-
-
-public:
-
-    class Entry
-    {
-
-    public:
-        typedef QValueList<KABC::DistributionList::Entry> List;
-                             Entry ();
-                             Entry (const KABC::Addressee&, const QString&);
-        KABC::Addressee      addressee;
-        QString              email;
-
-    };  // class Entry
-
-
-public:
-                         DistributionList (KABC::DistributionListManager*, const QString&);
-    void                 setName (const QString&);
-    QString              name () const;
-    void                 insertEntry (const KABC::Addressee&, const QString& = QString ::null );
-    void                 removeEntry (const KABC::Addressee&, const QString& = QString ::null );
-    QStringList          emails () const;
-    KABC::DistributionList::Entry::List entries () const;
-
-};  // class DistributionList
-
-
-class DistributionListManager
-{
-%TypeHeaderCode
-#include <distributionlist.h>
-%End
-
-
-public:
-                         DistributionListManager (KABC::AddressBook*);
-    KABC::DistributionList* list (const QString&);
-    void                 insert (KABC::DistributionList*);
-    void                 remove (KABC::DistributionList*);
-    QStringList          listNames ();
-    bool                 load ();
-    bool                 save ();
-
-};  // class DistributionListManager
-
-
-%If ( KDE_3_1_0 -  )
-
-class DistributionListWatcher : QObject
-{
-%TypeHeaderCode
-#include <distributionlist.h>
-%End
-
-
-public:
-    static KABC::DistributionListWatcher* self ();
-
-signals:
-    void                 changed ();
-
-protected:
-                         DistributionListWatcher ();
-                         ~DistributionListWatcher ();
-
-};  // class DistributionListWatcher
-
-%End
-
-};  // namespace KABC
-
-
-
-%MappedType KABC::DistributionList::Entry::List
-//converts a Python list of KABC::DistributionList::Entry
-{
-%TypeHeaderCode
-#include <qvaluelist.h>
-#include <sipkabcKABCDistributionListEntry.h>
-//typedef QValueList<KABC::DistributionList::Entry> List;
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    QValueList<KABC::DistributionList::Entry> *cpplist = (QValueList<KABC::DistributionList::Entry> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    QValueList<KABC::DistributionList::Entry>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipBuildResult (NULL, "N", new KABC::DistributionList::Entry (*it), sipClass_KABC_DistributionList_Entry)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    QValueList<KABC::DistributionList::Entry> *cpplist = new QValueList<KABC::DistributionList::Entry>;
-
-    PyObject *elem;
-    KABC::DistributionList::Entry *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::DistributionList::Entry *)sipForceConvertTo_KABC_DistributionList_Entry (elem, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
-
diff --git a/python/pykde/sip/kabc/distributionlistdialog.sip b/python/pykde/sip/kabc/distributionlistdialog.sip
deleted file mode 100644
index 720afd09..00000000
--- a/python/pykde/sip/kabc/distributionlistdialog.sip
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class DistributionListDialog : KDialogBase
-{
-%TypeHeaderCode
-#include <distributionlistdialog.h>
-%End
-
-
-public:
-                         DistributionListDialog (KABC::AddressBook*, QWidget*);
-
-};  // class DistributionListDialog
-
-
-class EmailSelector : KDialogBase
-{
-%TypeHeaderCode
-#include <distributionlistdialog.h>
-%End
-
-
-public:
-                         EmailSelector (const QStringList&, const QString&, QWidget*);
-    QString              selected ();
-    static QString       getEmail (const QStringList&, const QString&, QWidget*);
-
-};  // class EmailSelector
-
-
-class DistributionListEditorWidget : QWidget
-{
-%TypeHeaderCode
-#include <distributionlistdialog.h>
-%End
-
-
-public:
-                         DistributionListEditorWidget (KABC::AddressBook*, QWidget*);
-
-};  // class DistributionListEditorWidget
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/distributionlisteditor.sip b/python/pykde/sip/kabc/distributionlisteditor.sip
deleted file mode 100644
index e97df7f8..00000000
--- a/python/pykde/sip/kabc/distributionlisteditor.sip
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class EmailSelectDialog : KDialogBase
-{
-%TypeHeaderCode
-#include <distributionlisteditor.h>
-%End
-
-
-public:
-                         EmailSelectDialog (const QStringList&, const QString&, QWidget*);
-    QString              selected ();
-    static QString       getEmail (const QStringList&, const QString&, QWidget*);
-
-};  // class EmailSelectDialog
-
-
-//ig class DistributionListEditor : QWidget;
-
-};  // namespace KABC
-
diff --git a/python/pykde/sip/kabc/errorhandler.sip b/python/pykde/sip/kabc/errorhandler.sip
deleted file mode 100644
index 9a24483f..00000000
--- a/python/pykde/sip/kabc/errorhandler.sip
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class ErrorHandler
-{
-%TypeHeaderCode
-#include <qwidget.h>
-#include <errorhandler.h>
-%End
-
-
-public:
-    virtual void         error (const QString&)  = 0;
-
-};  // class ErrorHandler
-
-
-class ConsoleErrorHandler : KABC::ErrorHandler
-{
-%TypeHeaderCode
-#include <qwidget.h>
-#include <errorhandler.h>
-%End
-
-
-public:
-    virtual void         error (const QString&);
-
-};  // class ConsoleErrorHandler
-
-
-%If ( KDE_3_5_1 -  )
-
-class GUIErrorHandler : KABC::ErrorHandler
-{
-%TypeHeaderCode
-#include <errorhandler.h>
-%End
-
-
-public:
-    virtual void         error (const QString&);
-
-};  // class GUIErrorHandler
-
-%End
-
-
-%If ( KDE_3_2_0 -  )
-
-class GuiErrorHandler : KABC::ErrorHandler
-{
-%TypeHeaderCode
-#include <qwidget.h>
-#include <errorhandler.h>
-%End
-
-
-public:
-                         GuiErrorHandler (QWidget*);
-    virtual void         error (const QString&);
-
-};  // class GuiErrorHandler
-
-%End
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/field.sip b/python/pykde/sip/kabc/field.sip
deleted file mode 100644
index 6056f7d7..00000000
--- a/python/pykde/sip/kabc/field.sip
+++ /dev/null
@@ -1,162 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class Field
-{
-%TypeHeaderCode
-#include <field.h>
-%End
-
-
-public:
-    typedef QValueList<KABC::Field*> List;
-
-    enum FieldCategory
-    {
-        All, 
-        Frequent, 
-        Address, 
-        Email, 
-        Personal, 
-        Organization, 
-        CustomCategory
-    };
-
-    virtual QString      label ();
-    virtual int          category ();
-    static QString       categoryLabel (int);
-    virtual QString      value (const KABC::Addressee&);
-    virtual bool         setValue (KABC::Addressee&, const QString&);
-
-%If ( KDE_3_2_0 -  )
-    QString              sortKey (const KABC::Addressee&);
-%End
-
-    virtual bool         isCustom ();
-    virtual bool         equals (KABC::Field*);
-    static KABC::Field::List allFields ();
-    static KABC::Field::List defaultFields ();
-    static KABC::Field*  createCustomField (const QString&, int, const QString&, const QString&);
-    static void          deleteFields ();
-    static void          saveFields (KConfig*, const QString&, const KABC::Field::List&);
-    static void          saveFields (const QString&, const KABC::Field::List&);
-    static KABC::Field::List restoreFields (KConfig*, const QString&);
-    static KABC::Field::List restoreFields (const QString&);
-
-protected:
-    static void          createField (int, int = 0);
-    static void          createDefaultField (int, int = 0);
-
-private:
-//ig                          Field (KABC::Field::FieldImpl*);
-                         ~Field ();
-//force
-                         Field ();
-//end
-
-};  // class Field
-
-};  // namespace KABC
-
-%End
-
-
-
-%If (KDE_3_1_0 - )
-%MappedType KABC::Field::List
-//converts a Python list of KABC::Field
-{
-%TypeHeaderCode
-#include <qvaluelist.h>
-#include <sipkabcKABCField.h>
-//typedef QValueList<KABC::Field *> List;
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    QValueList<KABC::Field *> *cpplist = (QValueList<KABC::Field *> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    QValueList<KABC::Field *>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipBuildResult (NULL, "N", (KABC::Field *) (*it), sipClass_KABC_Field)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    QValueList<KABC::Field *> *cpplist = new QValueList<KABC::Field *>;
-
-    PyObject *elem;
-    KABC::Field *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::Field *)sipForceConvertTo_KABC_Field (elem, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-%End
-
-
diff --git a/python/pykde/sip/kabc/format.sip b/python/pykde/sip/kabc/format.sip
deleted file mode 100644
index 30b863ba..00000000
--- a/python/pykde/sip/kabc/format.sip
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class Format
-{
-%TypeHeaderCode
-#include <format.h>
-%End
-
-
-public:
-    virtual bool         load (KABC::AddressBook*, const QString&)  = 0;
-    virtual bool         save (KABC::AddressBook*, const QString&)  = 0;
-
-};  // class Format
-
-};  // namespace KABC
-
diff --git a/python/pykde/sip/kabc/formatfactory.sip b/python/pykde/sip/kabc/formatfactory.sip
deleted file mode 100644
index 14ec70c4..00000000
--- a/python/pykde/sip/kabc/formatfactory.sip
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class FormatInfo
-{
-%TypeHeaderCode
-#include <formatfactory.h>
-%End
-
-
-public:
-    QString              library;
-    QString              nameLabel;
-    QString              descriptionLabel;
-
-};  // class FormatInfo
-
-
-class FormatFactory
-{
-%TypeHeaderCode
-#include <formatfactory.h>
-%End
-
-
-public:
-    static KABC::FormatFactory* self ();
-    KABC::FormatPlugin*  format (const QString&);
-    QStringList          formats ();
-    KABC::FormatInfo*    info (const QString&);
-
-protected:
-                         FormatFactory ();
-
-protected:
-
-%If (  - KDE_3_2_0 )
-                         ~FormatFactory ();
-%End
-
-
-};  // class FormatFactory
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/formatplugin.sip b/python/pykde/sip/kabc/formatplugin.sip
deleted file mode 100644
index bb63e8d0..00000000
--- a/python/pykde/sip/kabc/formatplugin.sip
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class FormatPlugin : KABC::Plugin
-{
-%TypeHeaderCode
-#include <formatplugin.h>
-%End
-
-
-public:
-    virtual bool         load (KABC::Addressee&, QFile*)  = 0;
-    virtual bool         loadAll (KABC::AddressBook*, KABC::Resource*, QFile*)  = 0;
-    virtual void         save (const KABC::Addressee&, QFile*)  = 0;
-    virtual void         saveAll (KABC::AddressBook*, KABC::Resource*, QFile*)  = 0;
-    virtual bool         checkFormat (QFile*) const = 0;
-
-};  // class FormatPlugin
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/geo.sip b/python/pykde/sip/kabc/geo.sip
deleted file mode 100644
index 48124a71..00000000
--- a/python/pykde/sip/kabc/geo.sip
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-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 KABC::Geo&) const;
-
-%If ( KDE_3_1_0 -  )
-    bool                 operator != (const KABC::Geo&) const;
-%End
-
-    QString              asString () const;
-
-};  // class Geo
-
-
-%If ( KDE_3_1_0 -  )
-//igx QDataStream&         operator << (QDataStream&, const KABC::Geo&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Geo&);
-%End
-
-};  // namespace KABC
-
diff --git a/python/pykde/sip/kabc/kabc-kde310.diff b/python/pykde/sip/kabc/kabc-kde310.diff
deleted file mode 100644
index 294c0cbc..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde311.diff b/python/pykde/sip/kabc/kabc-kde311.diff
deleted file mode 100644
index 294c0cbc..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde312.diff b/python/pykde/sip/kabc/kabc-kde312.diff
deleted file mode 100644
index 294c0cbc..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde313.diff b/python/pykde/sip/kabc/kabc-kde313.diff
deleted file mode 100644
index 294c0cbc..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde314.diff b/python/pykde/sip/kabc/kabc-kde314.diff
deleted file mode 100644
index 294c0cbc..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde320.diff b/python/pykde/sip/kabc/kabc-kde320.diff
deleted file mode 100644
index a7c2d681..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde322.diff b/python/pykde/sip/kabc/kabc-kde322.diff
deleted file mode 100644
index a7c2d681..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde323.diff b/python/pykde/sip/kabc/kabc-kde323.diff
deleted file mode 100644
index a7c2d681..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde330.diff b/python/pykde/sip/kabc/kabc-kde330.diff
deleted file mode 100644
index d89a0acc..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde331.diff b/python/pykde/sip/kabc/kabc-kde331.diff
deleted file mode 100644
index d89a0acc..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde332.diff b/python/pykde/sip/kabc/kabc-kde332.diff
deleted file mode 100644
index d89a0acc..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde340.diff b/python/pykde/sip/kabc/kabc-kde340.diff
deleted file mode 100644
index 24ca6590..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde341.diff b/python/pykde/sip/kabc/kabc-kde341.diff
deleted file mode 100644
index 24ca6590..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde342.diff b/python/pykde/sip/kabc/kabc-kde342.diff
deleted file mode 100644
index 24ca6590..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde343.diff b/python/pykde/sip/kabc/kabc-kde343.diff
deleted file mode 100644
index 24ca6590..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde350.diff b/python/pykde/sip/kabc/kabc-kde350.diff
deleted file mode 100644
index 24ca6590..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde351.diff b/python/pykde/sip/kabc/kabc-kde351.diff
deleted file mode 100644
index 24ca6590..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde352.diff b/python/pykde/sip/kabc/kabc-kde352.diff
deleted file mode 100644
index 24ca6590..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabc-kde353.diff b/python/pykde/sip/kabc/kabc-kde353.diff
deleted file mode 100644
index 3ea9e5f6..00000000
--- a/python/pykde/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/python/pykde/sip/kabc/kabcmod.sip b/python/pykde/sip/kabc/kabcmod.sip
deleted file mode 100644
index 109cefcc..00000000
--- a/python/pykde/sip/kabc/kabcmod.sip
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 kdecoremod.sip
-%Import kdefxmod.sip
-%Import kdeuimod.sip
-%Import kiomod.sip
-%Import kresourcesmod.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
-%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 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/python/pykde/sip/kabc/kabcmod.sip.in b/python/pykde/sip/kabc/kabcmod.sip.in
deleted file mode 100644
index 0b5234a3..00000000
--- a/python/pykde/sip/kabc/kabcmod.sip.in
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 kdecoremod.sip
-%Import kdefxmod.sip
-%Import kdeuimod.sip
-%Import kiomod.sip
-%Import kresourcesmod.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/python/pykde/sip/kabc/key.sip b/python/pykde/sip/kabc/key.sip
deleted file mode 100644
index 9036d113..00000000
--- a/python/pykde/sip/kabc/key.sip
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class Key
-{
-%TypeHeaderCode
-#include <key.h>
-%End
-
-
-public:
-    typedef QValueList<KABC::Key> List;
-    typedef QValueList<int> TypeList;
-
-    enum Types
-    {
-        X509, 
-        PGP, 
-        Custom
-    };
-
-                         Key (const QString& = QString ::null , int = PGP );
-    bool                 operator == (const KABC::Key&) const;
-    bool                 operator != (const KABC::Key&) const;
-    void                 setId (const QString&);
-    QString              id () const;
-    void                 setBinaryData (const QByteArray&);
-    QByteArray           binaryData () const;
-    void                 setTextData (const QString&);
-    QString              textData () const;
-    bool                 isBinary () const;
-    void                 setType (int);
-    void                 setCustomTypeString (const QString&);
-    int                  type () const;
-    QString              customTypeString () const;
-    static TypeList      typeList ();
-    static QString       typeLabel (int);
-
-};  // class Key
-
-//igx QDataStream&         operator << (QDataStream&, const KABC::Key&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Key&);
-};  // namespace KABC
-
-%End
-
-
-
-%MappedType KABC::Key::List
-//converts a Python list of KABC::Key
-{
-%TypeHeaderCode
-#include <qvaluelist.h>
-#include <sipkabcKABCKey.h>
-//typedef QValueList<KABC::Key> List;
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    QValueList<KABC::Key> *cpplist = (QValueList<KABC::Key> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    QValueList<KABC::Key>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipBuildResult (NULL, "N", new KABC::Key (*it), sipClass_KABC_Key)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    QValueList<KABC::Key> *cpplist = new QValueList<KABC::Key>;
-
-    PyObject *elem;
-    KABC::Key *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::Key *)sipForceConvertTo_KABC_Key (elem, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
-
diff --git a/python/pykde/sip/kabc/ldapclient.sip b/python/pykde/sip/kabc/ldapclient.sip
deleted file mode 100644
index 794cdb0a..00000000
--- a/python/pykde/sip/kabc/ldapclient.sip
+++ /dev/null
@@ -1,245 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-//ig typedef QValueList<QByteArray> LdapAttrValue;
-//ig typedef QMap<QString,KABC::LdapAttrValue> LdapAttrMap;
-
-class LdapObject
-{
-%TypeHeaderCode
-#include <ldapclient.h>
-%End
-
-
-public:
-                         LdapObject ();
-
-%If ( KDE_3_3_0 -  )
-                         LdapObject (const QString&, KABC::LdapClient*);
-%End
-
-                         LdapObject (const KABC::LdapObject&);
-    QString              toString () const;
-    void                 clear ();
-    QString              dn;
-//ig     LdapAttrMap          attrs;
-
-%If ( KDE_3_3_0 -  )
-    KABC::LdapClient*    client;
-%End
-
-
-protected:
-    void                 assign (const KABC::LdapObject&);
-
-public:
-
-%If (  - KDE_3_3_0 )
-                         LdapObject (QString);
-%End
-
-
-};  // class LdapObject
-
-
-class LdapClient : QObject
-{
-%TypeHeaderCode
-#include <ldapclient.h>
-%End
-
-
-public:
-                         LdapClient (QObject* = 0, const char* = 0);
-    bool                 isActive () const;
-
-signals:
-    void                 done ();
-    void                 error (const QString&);
-    void                 result (const KABC::LdapObject&);
-
-public slots:
-    void                 setHost (const QString&);
-    QString              host () const;
-    void                 setPort (const QString&);
-    QString              port () const;
-    void                 setBase (const QString&);
-    QString              base () const;
-
-%If ( KDE_3_2_0 -  )
-    void                 setBindDN (const QString&);
-    QString              bindDN () const;
-    void                 setPwdBindDN (const QString&);
-    QString              pwdBindDN () const;
-%End
-
-    void                 setAttrs (const QStringList&);
-    QStringList          attrs () const;
-    void                 setScope (const QString);
-    void                 startQuery (const QString&);
-    void                 cancelQuery ();
-
-protected slots:
-    void                 slotData (KIO::Job*, const QByteArray&);
-    void                 slotInfoMessage (KIO::Job*, const QString&);
-    void                 slotDone ();
-
-protected:
-    void                 startParseLDIF ();
-    void                 parseLDIF (const QByteArray&);
-    void                 endParseLDIF ();
-
-};  // class LdapClient
-
-
-%If ( KDE_3_3_0 -  )
-
-class LdapResult
-{
-%TypeHeaderCode
-#include <ldapclient.h>
-%End
-
-
-public:
-    QString              name;
-    QString              email;
-    int                  clientNumber;
-
-};  // class LdapResult
-
-%End
-
-
-%If ( KDE_3_3_0 -  )
-typedef QValueList<KABC::LdapResult> LdapResultList;
-%End
-
-
-class LdapSearch : QObject
-{
-%TypeHeaderCode
-#include <ldapclient.h>
-%End
-
-
-public:
-                         LdapSearch ();
-    void                 startSearch (const QString&);
-    void                 cancelSearch ();
-    bool                 isAvailable () const;
-
-signals:
-    void                 searchData (const QStringList&);
-
-%If ( KDE_3_3_0 -  )
-    void                 searchData (const KABC::LdapResultList&);
-%End
-
-    void                 searchDone ();
-
-};  // class LdapSearch
-
-};  // namespace KABC
-
-%End
-
-
-
-%If (KDE_3_3_0 - )
-%MappedType KABC::LdapResultList
-//converts a Python list of KABC::LdapREsult
-{
-%TypeHeaderCode
-#include <qvaluelist.h>
-#include <sipkabcKABCLdapResult.h>
-//typedef QValueList<KABC::LdapResult> List;
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    QValueList<KABC::LdapResult> *cpplist = (QValueList<KABC::LdapResult> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    QValueList<KABC::LdapResult>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipBuildResult (NULL, "N", new KABC::LdapResult (*it), sipClass_KABC_LdapResult)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    QValueList<KABC::LdapResult> *cpplist = new QValueList<KABC::LdapResult>;
-
-    PyObject *elem;
-    KABC::LdapResult *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::LdapResult *)sipForceConvertTo_KABC_LdapResult (elem, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-%End
-
-
diff --git a/python/pykde/sip/kabc/ldapconfigwidget.sip b/python/pykde/sip/kabc/ldapconfigwidget.sip
deleted file mode 100644
index ce1ddb1a..00000000
--- a/python/pykde/sip/kabc/ldapconfigwidget.sip
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class LdapConfigWidget : QWidget
-{
-%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 (QWidget* = 0, const char* = 0, WFlags = 0);
-                         LdapConfigWidget (int, QWidget* = 0, const char* = 0, WFlags = 0);
-    void                 setUser (const QString&);
-    QString              user () const;
-    void                 setPassword (const QString&);
-    QString              password () const;
-    void                 setBindDN (const QString&);
-    QString              bindDN () const;
-    void                 setRealm (const QString&);
-    QString              realm () const;
-    void                 setHost (const QString&);
-    QString              host () const;
-    void                 setPort (int);
-    int                  port () const;
-    void                 setVer (int);
-    int                  ver () const;
-    void                 setDn (const QString&);
-    QString              dn () const;
-    void                 setFilter (const QString&);
-    QString              filter () const;
-    void                 setMech (const QString&);
-    QString              mech () const;
-    void                 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);
-    KABC::LDAPUrl        url () const;
-
-};  // class LdapConfigWidget
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/ldapurl.sip b/python/pykde/sip/kabc/ldapurl.sip
deleted file mode 100644
index d0e6406e..00000000
--- a/python/pykde/sip/kabc/ldapurl.sip
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class LDAPUrl : KURL
-{
-%TypeHeaderCode
-#include <ldapurl.h>
-%End
-
-
-public:
-
-    class Extension
-    {
-
-    public:
-        QString              value;
-        bool                 critical;
-
-    };  // class Extension
-
-
-public:
-
-    enum Scope
-    {
-        Base, 
-        One, 
-        Sub
-    };
-
-                         LDAPUrl ();
-                         LDAPUrl (const KURL&);
-    const QString&       dn () const;
-    void                 setDn (const QString&);
-    const QStringList&   attributes ();
-    void                 setAttributes (const QStringList&);
-    KABC::LDAPUrl::Scope scope () const;
-    void                 setScope (KABC::LDAPUrl::Scope);
-    const QString&       filter () const;
-    void                 setFilter (QString);
-    bool                 hasExtension (const QString&) const;
-    KABC::LDAPUrl::Extension extension (const QString&) const;
-    QString              extension (const QString&, bool& /Out/) const /PyName=extensionAndCritical/;
-    void                 setExtension (const QString&, const KABC::LDAPUrl::Extension&);
-    void                 setExtension (const QString&, const QString&, bool = 0);
-    void                 removeExtension (const QString&);
-    void                 updateQuery ();
-
-protected:
-    void                 parseQuery ();
-
-};  // class LDAPUrl
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/ldif.sip b/python/pykde/sip/kabc/ldif.sip
deleted file mode 100644
index b7deb950..00000000
--- a/python/pykde/sip/kabc/ldif.sip
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-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 QCString      assembleLine (const QString&, const QByteArray&, uint = 0, bool = 0);
-    static QCString      assembleLine (const QString&, const QCString&, uint = 0, bool = 0);
-    static QCString      assembleLine (const QString&, const QString&, uint = 0, bool = 0);
-    static bool          splitLine (const QCString&, QString&, QByteArray&);
-    static bool          splitControl (const QCString&, QString&, bool&, QByteArray&);
-    void                 startParsing ();
-    KABC::LDIF::ParseVal processLine ();
-    KABC::LDIF::ParseVal nextItem ();
-    void                 setLDIF (const QByteArray&);
-    void                 endLDIF ();
-    KABC::LDIF::EntryType entryType () const;
-    int                  modType () const;
-    const QString&       dn () const;
-    const QString&       newRdn () const;
-    const QString&       newSuperior () const;
-    bool                 delOldRdn () const;
-    const QString&       attr () const;
-    const QByteArray&    val () const;
-    bool                 isUrl () const;
-    bool                 critical () const;
-    const QString&       oid () const;
-    uint                 lineNo () const;
-
-};  // class LDIF
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/ldifconverter.sip b/python/pykde/sip/kabc/ldifconverter.sip
deleted file mode 100644
index 8bc4b528..00000000
--- a/python/pykde/sip/kabc/ldifconverter.sip
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-namespace LDIFConverter
-{
-
-%If ( KDE_3_5_2 -  )
-//ig bool                 LDIFToAddressee (const QString&, AddresseeList&, QDateTime = QDateTime ::currentDateTime ());
-//ig bool                 addresseeToLDIF (const AddresseeList&, QString&);
-%End
-
-bool                 addresseeToLDIF (const KABC::Addressee&, QString&);
-QString              makeLDIFfieldString (QString, QString, bool = 1);
-bool                 parseSingleLine (KABC::Addressee&, KABC::Address&, KABC::Address&, QString&);
-bool                 splitLine (QString&, QString&, QString&);
-bool                 evaluatePair (KABC::Addressee&, KABC::Address&, KABC::Address&, QString&, QString&);
-
-%If (  - KDE_3_5_2 )
-bool                 LDIFToAddressee (const QString&, KABC::Addressee::List&, QDateTime = QDateTime ::currentDateTime ());
-%MethodCode
-
-    KABC::Addressee::List *xa1 = (KABC::Addressee::List *)a1;
-
-    Py_BEGIN_ALLOW_THREADS
-    sipRes = KABC::LDIFConverter::LDIFToAddressee (*a0, *xa1, *a2);    
-    Py_END_ALLOW_THREADS
-
-%End
-
-bool                 addresseeToLDIF (const KABC::Addressee::List&, QString&);
-%MethodCode
-
-    KABC::Addressee::List *xa0 = (KABC::Addressee::List *)a0;
-
-    Py_BEGIN_ALLOW_THREADS
-    sipRes = KABC::LDIFConverter::addresseeToLDIF (*xa0, *a1);
-    Py_END_ALLOW_THREADS
-
-%End
-
-%End
-
-};  // namespace LDIFConverter
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/lock.sip b/python/pykde/sip/kabc/lock.sip
deleted file mode 100644
index 82dbebbc..00000000
--- a/python/pykde/sip/kabc/lock.sip
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class Lock : QObject
-{
-%TypeHeaderCode
-#include <lock.h>
-%End
-
-
-public:
-                         Lock (const QString&);
-    virtual bool         lock ();
-    virtual bool         unlock ();
-    virtual QString      error () const;
-    QString              lockFileName () const;
-    static bool          readLockFile (const QString&, int&, QString&);
-    static bool          writeLockFile (const QString&);
-    static QString       locksDir ();
-
-signals:
-    void                 locked ();
-    void                 unlocked ();
-
-};  // class Lock
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/locknull.sip b/python/pykde/sip/kabc/locknull.sip
deleted file mode 100644
index 6c24a381..00000000
--- a/python/pykde/sip/kabc/locknull.sip
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class LockNull : KABC::Lock
-{
-%TypeHeaderCode
-#include <locknull.h>
-%End
-
-
-public:
-                         LockNull (bool);
-    bool                 lock ();
-    bool                 unlock ();
-    QString              error () const;
-
-};  // class LockNull
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/phonenumber.sip b/python/pykde/sip/kabc/phonenumber.sip
deleted file mode 100644
index faa8b9bd..00000000
--- a/python/pykde/sip/kabc/phonenumber.sip
+++ /dev/null
@@ -1,191 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class PhoneNumber
-{
-%TypeHeaderCode
-#include <phonenumber.h>
-%End
-
-
-public:
-    typedef QValueList<KABC::PhoneNumber> List;
-
-%If ( KDE_3_1_0 -  )
-    typedef QValueList<int> TypeList;
-
-    enum Types
-    {
-        Home, 
-        Work, 
-        Msg, 
-        Pref, 
-        Voice, 
-        Fax, 
-        Cell, 
-        Video, 
-        Bbs, 
-        Modem, 
-        Car, 
-        Isdn, 
-        Pcs, 
-        Pager
-    };
-
-%End
-
-                         PhoneNumber ();
-                         PhoneNumber (const QString&, int = Home );
-
-%If ( KDE_3_1_0 -  )
-    bool                 operator == (const KABC::PhoneNumber&) const;
-    bool                 operator != (const KABC::PhoneNumber&) const;
-%End
-
-    void                 setId (const QString&);
-    QString              id () const;
-    void                 setNumber (const QString&);
-    QString              number () const;
-    void                 setType (int);
-    int                  type () const;
-
-%If ( KDE_3_1_0 -  )
-    QString              typeLabel () const;
-    QString              label () const;
-    static TypeList      typeList ();
-    static QString       typeLabel (int);
-    static QString       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 QDataStream&         operator << (QDataStream&, const KABC::PhoneNumber&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::PhoneNumber&);
-%End
-
-};  // namespace KABC
-
-
-
-%MappedType KABC::PhoneNumber::List
-//converts a Python list of KABC::PhoneNumber
-{
-%TypeHeaderCode
-#include <qvaluelist.h>
-#include <sipkabcKABCPhoneNumber.h>
-//typedef QValueList<KABC::PhoneNumber> List;
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    QValueList<KABC::PhoneNumber> *cpplist = (QValueList<KABC::PhoneNumber> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    QValueList<KABC::PhoneNumber>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipBuildResult (NULL, "N", new KABC::PhoneNumber (*it), sipClass_KABC_PhoneNumber)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    QValueList<KABC::PhoneNumber> *cpplist = new QValueList<KABC::PhoneNumber>;
-
-    PyObject *elem;
-    KABC::PhoneNumber *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KABC::PhoneNumber *)sipForceConvertTo_KABC_PhoneNumber (elem, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
-
diff --git a/python/pykde/sip/kabc/picture.sip b/python/pykde/sip/kabc/picture.sip
deleted file mode 100644
index 453566ef..00000000
--- a/python/pykde/sip/kabc/picture.sip
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class Picture
-{
-%TypeHeaderCode
-#include <picture.h>
-%End
-
-
-public:
-                         Picture ();
-                         Picture (const QString&);
-                         Picture (const QImage&);
-    bool                 operator == (const KABC::Picture&) const;
-    bool                 operator != (const KABC::Picture&) const;
-    void                 setUrl (const QString&);
-    void                 setData (const QImage&);
-    void                 setType (const QString&);
-    bool                 isIntern () const;
-    QString              url () const;
-    QImage               data () const;
-    QString              type () const;
-    QString              asString () const;
-
-};  // class Picture
-
-//igx QDataStream&         operator << (QDataStream&, const KABC::Picture&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Picture&);
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/plugin.sip b/python/pykde/sip/kabc/plugin.sip
deleted file mode 100644
index 4df2c429..00000000
--- a/python/pykde/sip/kabc/plugin.sip
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class Plugin
-{
-%TypeHeaderCode
-#include <plugin.h>
-%End
-
-
-public:
-                         Plugin ();
-    virtual void         setType (const QString&);
-    virtual QString      type () const;
-    virtual void         setNameLabel (const QString&);
-    virtual QString      nameLabel () const;
-    virtual void         setDescriptionLabel (const QString&);
-    virtual QString      descriptionLabel () const;
-
-};  // class Plugin
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/resource.sip b/python/pykde/sip/kabc/resource.sip
deleted file mode 100644
index 14149cbe..00000000
--- a/python/pykde/sip/kabc/resource.sip
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class Ticket
-{
-%TypeHeaderCode
-#include <kabc/resource.h>
-%End
-
-
-public:
-    KABC::Resource*      resource ();
-
-private:
-                         Ticket (KABC::Resource*);
-
-};  // class Ticket
-
-
-%If ( KDE_3_2_0 -  )
-
-class Resource : KRES::Resource
-{
-%TypeHeaderCode
-#include <kabc/resource.h>
-%End
-
-
-public:
-    
-//ig     class Iterator;
-
-    
-//ig     class ConstIterator;
-
-                         Resource (const KConfig*);
-//ig     virtual KABC::Resource::ConstIterator begin () const;
-//ig     virtual KABC::Resource::Iterator begin ();
-//ig     virtual KABC::Resource::ConstIterator end () const;
-//ig     virtual KABC::Resource::Iterator end ();
-    KABC::AddressBook*   addressBook ();
-    virtual void         writeConfig (KConfig*);
-    virtual KABC::Ticket* requestSaveTicket ()  = 0;
-    virtual void         releaseSaveTicket (KABC::Ticket*)  = 0;
-    virtual bool         load ()  = 0;
-    virtual bool         asyncLoad ();
-    virtual void         insertAddressee (const KABC::Addressee&);
-    virtual void         removeAddressee (const KABC::Addressee&);
-    virtual bool         save (KABC::Ticket*)  = 0;
-    virtual bool         asyncSave (KABC::Ticket*);
-    virtual KABC::Addressee findByUid (const QString&);
-    virtual KABC::Addressee::List findByName (const QString&);
-    virtual KABC::Addressee::List findByEmail (const QString&);
-    virtual KABC::Addressee::List findByCategory (const QString&);
-    virtual void         clear ();
-    void                 setAddressBook (KABC::AddressBook*);
-
-signals:
-    void                 loadingFinished (KABC::Resource*);
-    void                 loadingError (KABC::Resource*, const QString&);
-    void                 savingFinished (KABC::Resource*);
-    void                 savingError (KABC::Resource*, const QString&);
-
-protected:
-    KABC::Ticket*        createTicket (KABC::Resource*);
-
-};  // class Resource
-
-%End
-
-
-%If ( KDE_3_1_0 - KDE_3_2_0 )
-
-class Resource : KABC::Plugin
-{
-%TypeHeaderCode
-#include <kabc/resource.h>
-%End
-
-
-public:
-                         Resource (KABC::AddressBook*);
-    virtual bool         open ();
-    virtual void         close ();
-    virtual KABC::Ticket* requestSaveTicket ();
-    virtual bool         load ();
-    virtual bool         save (KABC::Ticket*);
-    KABC::AddressBook*   addressBook ();
-    virtual QString      identifier () const;
-    virtual void         removeAddressee (const KABC::Addressee&);
-    virtual void         cleanUp ();
-    virtual void         setReadOnly (bool);
-    virtual bool         readOnly () const;
-    virtual void         setFastResource (bool);
-    virtual bool         fastResource () const;
-    virtual void         setName (const QString);
-    virtual QString      name () const;
-    static QString       cryptStr (const QString&);
-
-protected:
-    KABC::Ticket*        createTicket (KABC::Resource*);
-
-};  // class Resource
-
-%End
-
-
-%If (  - KDE_3_1_0 )
-
-class Resource
-{
-%TypeHeaderCode
-#include <kabc/resource.h>
-%End
-
-
-public:
-                         Resource (KABC::AddressBook*);
-    virtual bool         open ();
-    virtual void         close ();
-    virtual KABC::Ticket* requestSaveTicket ();
-    virtual bool         load (KABC::AddressBook*);
-    virtual bool         save (KABC::Ticket*);
-    void                 setAddressBook (KABC::AddressBook*);
-    KABC::AddressBook*   addressBook ();
-
-protected:
-    KABC::Ticket*        createTicket (KABC::Resource*);
-
-};  // class Resource
-
-%End
-
-};  // namespace KABC
-
diff --git a/python/pykde/sip/kabc/resourcefile.sip b/python/pykde/sip/kabc/resourcefile.sip
deleted file mode 100644
index 75786b8d..00000000
--- a/python/pykde/sip/kabc/resourcefile.sip
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-%If ( KDE_3_2_0 -  )
-
-class ResourceFile : KABC::Resource
-{
-%TypeHeaderCode
-#include <resourcefile.h>
-%End
-
-
-public:
-
-%If ( KDE_3_3_0 -  )
-                         ResourceFile (const KConfig*);
-                         ResourceFile (const QString&, const QString& = "vcard");
-    virtual void         writeConfig (KConfig*);
-    virtual bool         doOpen ();
-    virtual void         doClose ();
-
-%If ( KDE_3_5_1 -  )
-    virtual KABC::Ticket* requestSaveTicket ();
-    virtual void         releaseSaveTicket (KABC::Ticket*);
-%End
-
-    virtual bool         load ();
-    virtual bool         asyncLoad ();
-    virtual bool         save (KABC::Ticket*);
-    virtual bool         asyncSave (KABC::Ticket*);
-%End
-
-    void                 setFileName (const QString&);
-    QString              fileName () const;
-
-%If ( KDE_3_5_1 -  )
-    void                 setFormat (const QString&);
-    QString              format () const;
-
-%If ( KDE_3_5_2 -  )
-    virtual void         removeAddressee (const KABC::Addressee&);
-%End
-
-%End
-
-
-protected slots:
-    void                 fileChanged ();
-
-protected:
-
-%If ( KDE_3_3_0 -  )
-    void                 init (const QString&, const QString&);
-%End
-
-//ig     bool                 lock (const QString&);
-//ig     void                 unlock (const QString&);
-
-public:
-
-%If (  - KDE_3_5_2 )
-    void                 removeAddressee (const KABC::Addressee&);
-%End
-
-
-public:
-
-%If (  - KDE_3_3_0 )
-                         ResourceFile (KABC::AddressBook*, const KConfig*);
-                         ResourceFile (KABC::AddressBook*, const QString&, KABC::FormatPlugin* = 0);
-    bool                 open ();
-    void                 close ();
-%End
-
-
-%If (  - KDE_3_5_1 )
-    KABC::Ticket*        requestSaveTicket ();
-    void                 releaseSaveTicket (KABC::Ticket*);
-
-%If (  - KDE_3_3_0 )
-    bool                 load ();
-    bool                 save (KABC::Ticket*);
-    virtual void         cleanUp ();
-%End
-
-    virtual QString      identifier () const;
-%End
-
-
-};  // class ResourceFile
-
-%End
-
-
-%If (  - KDE_3_2_0 )
-
-class ResourceFile : KABC::Resource
-{
-%TypeHeaderCode
-#include <resourcefile.h>
-%End
-
-
-public:
-
-%If ( KDE_3_1_0 -  )
-                         ResourceFile (KABC::AddressBook*, const KConfig*);
-                         ResourceFile (KABC::AddressBook*, const QString&, KABC::FormatPlugin* = 0);
-    bool                 open ();
-    void                 close ();
-%End
-
-    KABC::Ticket*        requestSaveTicket ();
-    void                 releaseSaveTicket (KABC::Ticket*);
-    bool                 load ();
-    bool                 save (KABC::Ticket*);
-    virtual void         cleanUp ();
-    void                 setFileName (const QString&);
-    QString              fileName () const;
-
-%If ( KDE_3_1_0 -  )
-    virtual QString      identifier () const;
-    void                 removeAddressee (const KABC::Addressee&);
-%End
-
-
-protected:
-//ig     bool                 lock (const QString&);
-//ig     void                 unlock (const QString&);
-
-public:
-
-%If (  - KDE_3_1_0 )
-                         ResourceFile (KABC::AddressBook*, const QString&, KABC::Format* = 0);
-    bool                 load (KABC::AddressBook*);
-%End
-
-
-protected slots:
-
-%If (  - KDE_3_1_0 )
-    void                 checkFile ();
-%End
-
-
-};  // class ResourceFile
-
-%End
-
-};  // namespace KABC
-
diff --git a/python/pykde/sip/kabc/resourceselectdialog.sip b/python/pykde/sip/kabc/resourceselectdialog.sip
deleted file mode 100644
index 9210316f..00000000
--- a/python/pykde/sip/kabc/resourceselectdialog.sip
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class ResourceSelectDialog
-{
-%TypeHeaderCode
-#include <qwidget.h>
-#include <resourceselectdialog.h>
-#include <kabc/resource.h>
-%End
-
-
-public:
-                         ResourceSelectDialog (KABC::AddressBook*, QWidget* = 0, const char* = 0);
-    KABC::Resource*      resource ();
-    static KABC::Resource* getResource (KABC::AddressBook*, QWidget* = 0);
-//force
-
-private:
-                         ResourceSelectDialog (KABC::ResourceSelectDialog&);
-//end
-
-};  // class ResourceSelectDialog
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/secrecy.sip b/python/pykde/sip/kabc/secrecy.sip
deleted file mode 100644
index 605db1e3..00000000
--- a/python/pykde/sip/kabc/secrecy.sip
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class Secrecy
-{
-%TypeHeaderCode
-#include <secrecy.h>
-%End
-
-
-public:
-    typedef QValueList<int> TypeList;
-
-%If ( KDE_3_2_0 -  )
-
-    enum Types
-    {
-        Public, 
-        Private, 
-        Confidential, 
-        Invalid
-    };
-
-%End
-
-                         Secrecy (int = Private );
-    bool                 operator == (const KABC::Secrecy&) const;
-    bool                 operator != (const KABC::Secrecy&) const;
-
-%If ( KDE_3_2_0 -  )
-    bool                 isValid () const;
-%End
-
-    void                 setType (int);
-    int                  type () const;
-    static TypeList      typeList ();
-    static QString       typeLabel (int);
-    QString              asString () const;
-
-public:
-
-%If (  - KDE_3_2_0 )
-
-    enum Types
-    {
-        Public, 
-        Private, 
-        Confidential
-    };
-
-%End
-
-
-};  // class Secrecy
-
-
-%If ( KDE_3_4_0 -  )
-//igx QDataStream&         operator << (QDataStream&, const KABC::Secrecy&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Secrecy&);
-%End
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/sortmode.sip b/python/pykde/sip/kabc/sortmode.sip
deleted file mode 100644
index 537e68fa..00000000
--- a/python/pykde/sip/kabc/sortmode.sip
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class SortMode
-{
-%TypeHeaderCode
-#include <sortmode.h>
-%End
-
-
-public:
-    virtual bool         lesser (const KABC::Addressee&, const KABC::Addressee&) const = 0;
-
-};  // class SortMode
-
-
-class NameSortMode : KABC::SortMode
-{
-%TypeHeaderCode
-#include <sortmode.h>
-%End
-
-
-public:
-
-    enum NameType
-    {
-        FormattedName, 
-        FamilyName, 
-        GivenName
-    };
-
-                         NameSortMode ();
-                         NameSortMode (KABC::NameSortMode::NameType, bool = 1);
-    virtual bool         lesser (const KABC::Addressee&, const KABC::Addressee&) const;
-
-};  // class NameSortMode
-
-
-class FieldSortMode : KABC::SortMode
-{
-%TypeHeaderCode
-#include <sortmode.h>
-%End
-
-
-public:
-                         FieldSortMode (KABC::Field*, bool = 1);
-    virtual bool         lesser (const KABC::Addressee&, const KABC::Addressee&) const;
-
-};  // class FieldSortMode
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/sound.sip b/python/pykde/sip/kabc/sound.sip
deleted file mode 100644
index b4558839..00000000
--- a/python/pykde/sip/kabc/sound.sip
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class Sound
-{
-%TypeHeaderCode
-#include <sound.h>
-%End
-
-
-public:
-                         Sound ();
-                         Sound (const QString&);
-                         Sound (const QByteArray&);
-    bool                 operator == (const KABC::Sound&) const;
-    bool                 operator != (const KABC::Sound&) const;
-    void                 setUrl (const QString&);
-
-%If ( KDE_3_4_0 -  )
-    bool                 isEmpty () const;
-%End
-
-    void                 setData (const QByteArray&);
-    bool                 isIntern () const;
-    QString              url () const;
-    QByteArray           data () const;
-    QString              asString () const;
-
-};  // class Sound
-
-//igx QDataStream&         operator << (QDataStream&, const KABC::Sound&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::Sound&);
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/stdaddressbook.sip b/python/pykde/sip/kabc/stdaddressbook.sip
deleted file mode 100644
index e571f47a..00000000
--- a/python/pykde/sip/kabc/stdaddressbook.sip
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class StdAddressBook : KABC::AddressBook
-{
-%TypeHeaderCode
-#include <kabc/resource.h>
-#include <addressee.h>
-#include <addressbook.h>
-#include <stdaddressbook.h>
-%End
-
-
-public:
-
-%If ( KDE_3_2_0 -  )
-    static KABC::StdAddressBook* self ();
-    static KABC::StdAddressBook* self (bool);
-%End
-
-    static bool          save ();
-
-%If ( KDE_3_1_1 -  )
-    static void          handleCrash ();
-%End
-
-    static QString       fileName ();
-
-%If ( KDE_3_1_0 -  )
-    static QString       directoryName ();
-    static void          setAutomaticSave (bool);
-    static void          close ();
-    static bool          automaticSave ();
-
-%If ( KDE_3_2_0 -  )
-    KABC::Addressee      whoAmI ();
-    void                 setWhoAmI (const KABC::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 KABC::AddressBook* self ();
-%End
-
-
-%If ( KDE_3_1_0 - KDE_3_2_2 )
-    static KABC::AddressBook* self (bool);
-%End
-
-
-protected:
-
-%If (  - KDE_3_2_0 )
-                         ~StdAddressBook ();
-%End
-
-
-public:
-
-%If (  - KDE_3_1_0 )
-    QString              identifier ();
-%End
-
-
-};  // class StdAddressBook
-
-};  // namespace KABC
-
diff --git a/python/pykde/sip/kabc/timezone.sip b/python/pykde/sip/kabc/timezone.sip
deleted file mode 100644
index e095d451..00000000
--- a/python/pykde/sip/kabc/timezone.sip
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class TimeZone
-{
-%TypeHeaderCode
-#include <timezone.h>
-%End
-
-
-public:
-                         TimeZone ();
-                         TimeZone (int);
-    void                 setOffset (int);
-    int                  offset () const;
-    bool                 isValid () const;
-    bool                 operator == (const KABC::TimeZone&) const;
-
-%If ( KDE_3_1_0 -  )
-    bool                 operator != (const KABC::TimeZone&) const;
-%End
-
-    QString              asString () const;
-
-};  // class TimeZone
-
-
-%If ( KDE_3_1_0 -  )
-//igx QDataStream&         operator << (QDataStream&, const KABC::TimeZone&);
-//igx QDataStream&         operator >> (QDataStream&, KABC::TimeZone&);
-%End
-
-};  // namespace KABC
-
diff --git a/python/pykde/sip/kabc/vcardconverter.sip b/python/pykde/sip/kabc/vcardconverter.sip
deleted file mode 100644
index 5276fd0e..00000000
--- a/python/pykde/sip/kabc/vcardconverter.sip
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class VCardConverter
-{
-%TypeHeaderCode
-#include <vcardconverter.h>
-%End
-
-
-public:
-
-    enum Version
-    {
-        v2_1, 
-        v3_0
-    };
-
-                         VCardConverter ();
-
-%If ( KDE_3_2_0 -  )
-    QString              createVCard (const KABC::Addressee&, KABC::VCardConverter::Version = v3_0 );
-    QString              createVCards (KABC::Addressee::List, KABC::VCardConverter::Version = v3_0 );
-    KABC::Addressee      parseVCard (const QString&);
-    KABC::Addressee::List parseVCards (const QString&);
-%End
-
-    bool                 vCardToAddressee (const QString&, KABC::Addressee&, KABC::VCardConverter::Version = v3_0 );
-    bool                 addresseeToVCard (const KABC::Addressee&, QString&, KABC::VCardConverter::Version = v3_0 );
-
-};  // class VCardConverter
-
-
-%If ( KDE_3_2_0 -  )
-QString              dateToVCardString (const QDateTime&);
-QString              dateToVCardString (const QDate&);
-QDateTime            VCardStringToDate (const QString&);
-%End
-
-};  // namespace KABC
-
-%End
-
diff --git a/python/pykde/sip/kabc/vcardformat.sip b/python/pykde/sip/kabc/vcardformat.sip
deleted file mode 100644
index 91fe0902..00000000
--- a/python/pykde/sip/kabc/vcardformat.sip
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class VCardFormat : KABC::Format
-{
-%TypeHeaderCode
-#include <vcardformat.h>
-%End
-
-
-public:
-                         VCardFormat ();
-    bool                 load (KABC::AddressBook*, const QString&);
-    bool                 save (KABC::AddressBook*, const QString&);
-
-};  // class VCardFormat
-
-};  // namespace KABC
-
diff --git a/python/pykde/sip/kabc/vcardformatplugin.sip b/python/pykde/sip/kabc/vcardformatplugin.sip
deleted file mode 100644
index f6aeef26..00000000
--- a/python/pykde/sip/kabc/vcardformatplugin.sip
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-//     Copyright 2006 Jim Bublitz <jbublitz@nwinternet.com>
-//     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 KABC
-{
-
-class VCardFormatPlugin : KABC::FormatPlugin
-{
-%TypeHeaderCode
-#include <vcardformatplugin.h>
-%End
-
-
-public:
-                         VCardFormatPlugin ();
-    bool                 load (KABC::Addressee&, QFile*);
-    bool                 loadAll (KABC::AddressBook*, KABC::Resource*, QFile*);
-    void                 save (const KABC::Addressee&, QFile*);
-    void                 saveAll (KABC::AddressBook*, KABC::Resource*, QFile*);
-    bool                 checkFormat (QFile*) const;
-
-};  // class VCardFormatPlugin
-
-};  // namespace KABC
-
-%End
-