Actually move the kde files that were renamed in the last commit

109 files changed, 0 insertions, 13804 deletions

diff --git a/sip/kdecore/bytearray.sip b/sip/kdecore/bytearray.sip
deleted file mode 100644
index aae4780..0000000
--- a/sip/kdecore/bytearray.sip
+++ /dev/null
@@ -1,945 +0,0 @@
-//
-//     Copyright 2004 Jim Bublitz <jbublitz@nwinternet.com>
-//     Earlier copyrights 1998 - 2003 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-//            module tdecore  version KDE_3_2_2
-
-
-// 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 <qvariant.h>
-%End
-
-
-void dcop_add (QDataStream&, QWidget::FocusPolicy /Constrained/);
-void dcop_add (QDataStream&, int /Constrained/, const QCString& = "int");
-//void dcop_add (QDataStream&, longlong);
-//void dcop_add (QDataStream&, ulonglong);
-void dcop_add (QDataStream&, double, const QCString& = "double");
-void dcop_add (QDataStream&, QString);
-void dcop_add (QDataStream&, QStringList);
-void dcop_add (QDataStream&, QCString);
-void dcop_add (QDataStream&, KURL);
-void dcop_add (QDataStream&, KURL::List);
-void dcop_add (QDataStream&, QSize);
-void dcop_add (QDataStream&, QRect);
-void dcop_add (QDataStream&, QRegion);
-void dcop_add (QDataStream&, QPoint);
-void dcop_add (QDataStream&, QFont);
-void dcop_add (QDataStream&, QCursor);
-void dcop_add (QDataStream&, QPixmap);
-void dcop_add (QDataStream&, QColor);
-void dcop_add (QDataStream&, QColorGroup);
-void dcop_add (QDataStream&, QPalette);
-void dcop_add (QDataStream&, QBrush);
-void dcop_add (QDataStream&, DCOPRef);
-void dcop_add (QDataStream&, QVariant);
-void dcop_add (QDataStream&, QDate);
-void dcop_add (QDataStream&, QTime);
-void dcop_add (QDataStream&, QDateTime);
-void dcop_add (QDataStream&, QImage);
-void dcop_add (QDataStream&, QKeySequence);
-void dcop_add (QDataStream&, QPen);
-void dcop_add (QDataStream&, QPicture);
-void dcop_add (QDataStream&, QPointArray);
-void dcop_add (QDataStream&, QByteArray);
-
-void dcop_add (QDataStream&, SIP_PYDICT, QCString);
-%MethodCode
-    const sipTypeDef *map_td = sipFindType(*a2);
-
-    if (map_td)
-    {
-        int iserr = 0;
-        void *map_v;
-
-        map_v = sipForceConvertToType(a1, map_td, NULL,
-                SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            sipIsErr = 1;
-        }
-        else if (*a2 == "QMap<QCString,DCOPRef>")
-        {
-            QMap<QCString,DCOPRef> *map = (QMap<QCString,DCOPRef> *)map_v;
-
-            *a0 << *map;
-        }
-        else if (*a2 == "QMap<QString,DCOPRef>")
-        {
-            QMap<QString,DCOPRef> *map = (QMap<QString,DCOPRef> *)map_v;
-
-            *a0 << *map;
-        }
-        else if (*a2 == "QMap<QString,QString>")
-        {
-            QMap<QString,QString> *map = (QMap<QString,QString> *)map_v;
-
-            *a0 << *map;
-        }
-        else if (*a2 == "QMap<QString,QByteArray>")
-        {
-            QMap<QString,QByteArray> *map = (QMap<QString,QByteArray> *)map_v;
-
-            *a0 << *map;
-        }
-    }
-%End
-
-
-void dcop_add (QDataStream&, SIP_PYLIST, QCString);
-%MethodCode
-    const sipTypeDef *list_td = sipFindType(*a2);
-
-    if (list_td)
-    {
-        int iserr = 0;
-        void *list_v;
-
-        list_v = sipForceConvertToType(a1, list_td, NULL,
-                SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            sipIsErr = 1;
-        }
-        else if (*a2 == "QValueList<QCString>")
-        {
-            QValueList<QCString> *list = (QValueList<QCString> *)list_v;
-
-            *a0 << *list;
-        }
-        else if (*a2 == "QValueList<DCOPRef>")
-        {
-            QValueList<DCOPRef> *list = (QValueList<DCOPRef> *)list_v;
-
-            *a0 << *list;
-        }
-    }
-%End
-
-
-void dcop_next (QDataStream&, QCString&);
-%MethodCode
-    if (*a1 == "char")
-    {
-        Q_INT8 res;
-        *a0 >> res;
-        return PyInt_FromLong ((long)res);
-    }
-    else if (*a1 == "bool")
-    {
-        bool res;
-        *a0 >> res;
-        return PyBool_FromLong ((long)res);
-    }
-    else if (*a1 == "int")
-    {
-        int res;
-        *a0 >> res;
-        return PyInt_FromLong ((long)res);
-    }
-    else if (*a1 == "long")
-    {
-        long res;
-        *a0 >> res;
-        return PyLong_FromLong (res);
-    }
-    else if (*a1 == "short")
-    {
-        short res;
-        *a0 >> res;
-        return PyInt_FromLong ((long)res);
-    }
-    if (*a1 == "uchar" || *a1 == "unsigned char")
-    {
-        Q_UINT8 res;
-        *a0 >> res;
-        return PyInt_FromLong ((long)res);
-    }
-    else if (*a1 == "uint" || *a1 == "unsigned int")
-    {
-        unsigned int res;
-        *a0 >> res;
-        return PyInt_FromLong ((long)res);
-    }
-    else if (*a1 == "ulong" || *a1 == "unsigned long")
-    {
-        unsigned long res;
-        *a0 >> res;
-        return PyLong_FromLong (res);
-    }
-    else if (*a1 == "Q_INT32")
-    {
-        Q_INT32 res;
-        *a0 >> res;
-        return PyLong_FromLong ((long)res);
-    }
-    else if (*a1 == "pid_t")
-    {
-        pid_t res;
-        *a0 >> res;
-        return PyLong_FromLong ((long)res);
-    }
-    else if (*a1 == "ushort" || *a1 == "unsigned short")
-    {
-        unsigned short res;
-        *a0 >> res;
-        return PyInt_FromLong ((long)res);
-    }
-    else if (*a1 == "float")
-    {
-        float res;
-        *a0 >> res;
-        return PyFloat_FromDouble ((double)res);
-    }
-    else if (*a1 == "double")
-    {
-        double res;
-        *a0 >> res;
-        return PyFloat_FromDouble (res);
-    }
-    else if (*a1 == "QString")
-    {
-        QString res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QString(res), sipType_QString, NULL);
-    }
-    else if (*a1 == "QStringList")
-    {
-        QStringList res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QStringList(res), sipType_QStringList, NULL);
-    }
-    else if (*a1 == "QCString")
-    {
-        QCString res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QCString(res), sipType_QCString, NULL);
-    }
-    else if (*a1 == "KURL")
-    {
-        KURL res;
-        *a0 >> res;
-        return sipConvertFromNewType(new KURL(res), sipType_KURL, NULL);
-    }
-    else if (*a1 == "KURL::List")
-    {
-        KURL::List res;
-        *a0 >> res;
-        return sipConvertFromNewType(new KURL::List(res), sipType_KURL_List, NULL);
-    }
-    else if (*a1 == "QSize")
-    {
-        QSize res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QSize(res), sipType_QSize, NULL);
-    }
-    else if (*a1 == "QRect")
-    {
-        QRect res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QRect(res), sipType_QRect, NULL);
-    }
-    else if (*a1 == "QRegion")
-    {
-        QRect res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QRegion(res), sipType_QRegion, NULL);
-    }
-    else if (*a1 == "QPoint")
-    {
-        QPoint res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QPoint(res), sipType_QPoint, NULL);
-    }
-    else if (*a1 == "QFont")
-    {
-        QFont res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QFont(res), sipType_QFont, NULL);
-    }
-    else if (*a1 == "QCursor")
-    {
-        QCursor res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QCursor(res), sipType_QCursor, NULL);
-    }
-    else if (*a1 == "QPixmap")
-    {
-        QPixmap res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QPixmap(res), sipType_QPixmap, NULL);
-    }
-    else if (*a1 == "QColor")
-    {
-        QColor res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QColor(res), sipType_QColor, NULL);
-    }
-    else if (*a1 == "QColorGroup")
-    {
-        QColorGroup res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QColorGroup(res), sipType_QColorGroup, NULL);
-    }
-    else if (*a1 == "QPalette")
-    {
-        QPalette res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QPalette(res), sipType_QPalette, NULL);
-    }
-    else if (*a1 == "QBrush")
-    {
-        QBrush res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QBrush(res), sipType_QBrush, NULL);
-    }
-    else if (*a1 == "FocusPolicy")
-    {
-        unsigned int res;
-        *a0 >> res;
-        return PyInt_FromLong ((long)res);
-    }
-    else if (*a1 == "DCOPRef")
-    {
-        DCOPRef res;
-        *a0 >> res;
-        return sipConvertFromNewType(new DCOPRef(res), sipType_DCOPRef, NULL);
-    }
-    else if (*a1 == "QVariant")
-    {
-        QVariant res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QVariant(res), sipType_QVariant, NULL);
-    }
-    else if (*a1 == "QDate")
-    {
-        QDate res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QDate(res), sipType_QDate, NULL);
-    }
-    else if (*a1 == "QTime")
-    {
-        QTime res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QTime(res), sipType_QTime, NULL);
-    }
-    else if (*a1 == "QDateTime")
-    {
-        QDateTime res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QDateTime(res), sipType_QDateTime, NULL);
-    }
-    else if (*a1 == "QImage")
-    {
-        QImage res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QImage(res), sipType_QImage, NULL);
-    }
-    else if (*a1 == "QKeySequence")
-    {
-        QKeySequence res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QKeySequence(res), sipType_QKeySequence, NULL);
-    }
-    else if (*a1 == "QPen")
-    {
-        QPen res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QPen(res), sipType_QPen, NULL);
-    }
-    else if (*a1 == "QPicture")
-    {
-        QPicture res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QPicture(res), sipType_QPicture, NULL);
-    }
-    else if (*a1 == "QPointArray")
-    {
-        QPointArray res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QPointArray(res), sipType_QPointArray, NULL);
-    }
-    else if (*a1 == "QByteArray")
-    {
-        QByteArray res;
-        *a0 >> res;
-        return sipConvertFromNewType(new QByteArray(res), sipType_QByteArray, NULL);
-    }
-    else if (*a1 == "QMap<QCString,DCOPRef>")
-    {
-        QMap<QCString, DCOPRef> res;
-        *a0 >> res;
-        return sipConvertFromType(&res, sipFindType(*a1), NULL);
-    }
-    else if (*a1 == "QMap<QString,DCOPRef>")
-    {
-        QMap<QString, DCOPRef> res;
-        *a0 >> res;
-        return sipConvertFromType(&res, sipFindType(*a1), NULL);
-    }
-    else if (*a1 == "QMap<QString,QString>")
-    {
-        QMap<QString, QString> res;
-        *a0 >> res;
-        return sipConvertFromType(&res, sipFindType(*a1), NULL);
-    }
-    else if (*a1 == "QMap<QString,QByteArray>")
-    {
-        QMap<QString, QByteArray> res;
-        *a0 >> res;
-        return sipConvertFromType(&res, sipFindType(*a1), NULL);
-    }
-    else if (*a1 == "QValueList<QCString>")
-    {
-        QValueList<QCString> res;
-        *a0 >> res;
-        return sipConvertFromType(&res, sipFindType(*a1), NULL);
-    }
-    else if (*a1 == "QValueList<DCOPRef>" || *a1 == "QCStringList")
-    {
-        QValueList<DCOPRef> res;
-        *a0 >> res;
-        return sipConvertFromType(&res, sipFindType(*a1), NULL);
-    }
-
-%End
-
-%ModuleHeaderCode
-#include <qcstring.h>
-#include <qdatastream.h>
-#include <dcopref.h>
-%End
-
-%ModuleCode
-
-void dcop_add (QDataStream& s, int value, const QCString& type_)
-{
-    if (type_ == "char")
-        s << (Q_INT8)value;
-    else if (type_ == "bool")
-        s << (bool)value;
-    else if (type_ == "short")
-        s << (short)value;
-    else if (type_ == "int")
-        s << (int)value;
-    else if (type_ == "long")
-        s << (long)value;
-    else if (type_== "uchar" || type_ == "unsigned char")
-        s << (Q_UINT8)value;
-    else if (type_ == "ushort" || type_ == "unsigned short")
-        s << (ushort)value;
-    else if (type_ == "uint" || type_ == "unsigned int")
-        s << (uint)value;
-    else if (type_ == "ulong" || type_ == "unsigned long")
-        s << (long)value;
-}
-
-/*void dcop_add (QDataStream& s, longlong value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, ulonglong value)
-{
-    s << value;
-}*/
-
-void dcop_add (QDataStream& s, double value, const QCString& type_)
-{
-    if (type_ == "double")
-        s << value;
-    else if (type_ == "float")
-        s << (float)value;
-}
-
-void dcop_add (QDataStream& s, QString value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QStringList value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QCString value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, KURL value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, KURL::List value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QSize value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QRect value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QRegion value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QPoint value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QFont value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QCursor value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QPixmap value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QColor value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QColorGroup value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QPalette value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QBrush value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QWidget::FocusPolicy value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, DCOPRef value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QVariant value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QDate value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QTime value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QDateTime value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QImage value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QKeySequence value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QPen value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QPicture value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QPointArray value)
-{
-    s << value;
-}
-
-void dcop_add (QDataStream& s, QByteArray value)
-{
-    s << value;
-}
-
-%End
-
-
-%MappedType QMap<QCString,DCOPRef>
-//converts a Python dict of QCString:DCOPRef
-{
-%TypeHeaderCode
-#include <qmap.h>
-//typedef QMap<QCString,DCOPRef> DCOPRefMap;
-%End
-
-%ConvertFromTypeCode
-    // Convert to a Python dict
-
-    if (!sipCpp)
-        return PyDict_New();
-
-    PyObject *dict;
-
-    // Create the dictionary.
-
-    if ((dict = PyDict_New()) == NULL)
-        return NULL;
-
-    // Get it.
-
-    const QMap<QCString,DCOPRef> cppmap = *sipCpp;
-    QMap<QCString,DCOPRef>::ConstIterator it;
-
-    for (it = cppmap.begin (); it != cppmap.end (); ++it)
-    {
-        QCString acpp = it.key ();
-        DCOPRef bcpp = it.data ();
-        PyObject *ainst;
-        PyObject *binst = NULL;
-        if (((ainst = sipConvertFromNewType(new QCString(acpp), sipType_QCString, NULL)) == NULL)
-            || ((binst = sipConvertFromNewType(new DCOPRef(bcpp), sipType_DCOPRef, NULL)) == NULL)
-            || (PyDict_SetItem (dict, ainst, binst) < 0))
-        {
-            Py_XDECREF (ainst);
-            Py_XDECREF (binst);
-            Py_DECREF (dict);
-            return NULL;
-        }
-    }
-
-    return dict;
-%End
-
-
-%ConvertToTypeCode
-    // Convert a Python dictionary to a QMap on the heap.
-
-    if (sipIsErr == NULL)
-        return PyDict_Check(sipPy);
-
-    QMap<QCString,DCOPRef> *cppmap = new QMap<QCString,DCOPRef>;
-
-    PyObject *aelem, *belem;
-    SIP_SSIZE_T pos = 0;
-    QCString *acpp;
-    DCOPRef *bcpp;
-
-    while (PyDict_Next(sipPy, &pos, &aelem, &belem))
-    {
-        int iserr = 0;
-
-        acpp = (QCString *)sipForceConvertToType(aelem, sipType_QCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-        bcpp = (DCOPRef *)sipForceConvertToType(belem, sipType_DCOPRef, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cppmap;
-            return 0;
-        }
-
-        cppmap->insert (*acpp, *bcpp);
-    }
-
-    *sipCppPtr = cppmap;
-
-    return 1;
-%End
-};
-
-%MappedType QMap<QString,DCOPRef>
-//converts a Python dict of QString:DCOPRef
-{
-%TypeHeaderCode
-#include <qmap.h>
-//typedef QMap<QString,DCOPRef> DCOPRefMap;
-%End
-
-%ConvertFromTypeCode
-    // Convert to a Python dict
-
-    if (!sipCpp)
-        return PyDict_New();
-
-    PyObject *dict;
-
-    // Create the dictionary.
-
-    if ((dict = PyDict_New()) == NULL)
-        return NULL;
-
-    // Get it.
-
-    const QMap<QString,DCOPRef> cppmap = *sipCpp;
-    QMap<QString,DCOPRef>::ConstIterator it;
-
-    for (it = cppmap.begin (); it != cppmap.end (); ++it)
-    {
-        QString acpp = it.key ();
-        DCOPRef bcpp = it.data ();
-        PyObject *ainst;
-        PyObject *binst = NULL;
-        if (((ainst = sipConvertFromNewType(new QString(acpp), sipType_QString, sipTransferObj)) == NULL)
-            || ((binst = sipConvertFromNewType(new DCOPRef(bcpp), sipType_DCOPRef, sipTransferObj)) == NULL)
-            || (PyDict_SetItem (dict, ainst, binst) < 0))
-        {
-            Py_XDECREF (ainst);
-            Py_XDECREF (binst);
-            Py_DECREF (dict);
-            return NULL;
-        }
-    }
-
-    return dict;
-%End
-
-
-%ConvertToTypeCode
-    // Convert a Python dictionary to a QMap on the heap.
-
-    if (sipIsErr == NULL)
-        return PyDict_Check(sipPy);
-
-    QMap<QString,DCOPRef> *cppmap = new QMap<QString,DCOPRef>;
-
-    PyObject *aelem, *belem;
-    SIP_SSIZE_T pos = 0;
-    QString *acpp;
-    DCOPRef *bcpp;
-
-    while (PyDict_Next(sipPy, &pos, &aelem, &belem))
-    {
-        int iserr = 0, acpp_state;
-
-        acpp = (QString *)sipForceConvertToType(aelem, sipType_QString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
-        bcpp = (DCOPRef *)sipForceConvertToType(belem, sipType_DCOPRef, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-  
-        if (iserr)
-        {
-            if (acpp)
-                sipReleaseType(acpp, sipType_QString, acpp_state);
-
-            *sipIsErr = 1;
-            delete cppmap;
-            return 0;
-        }
-
-        cppmap->insert (*acpp, *bcpp);
-
-        sipReleaseType(acpp, sipType_QString, acpp_state);
-    }
-
-    *sipCppPtr = cppmap;
-
-    return 1;
-%End
-};
-
-
-//%MappedType QMap<QString,QString> is available in tdecore/kconfig.sip
-
-
-%MappedType QMap<QString,QByteArray>
-//converts a Python dict of QString:QByteArray
-{
-%TypeHeaderCode
-#include <qmap.h>
-%End
-
-%ConvertFromTypeCode
-    // Convert to a Python dict
-
-    if (!sipCpp)
-        return PyDict_New();
-
-    PyObject *dict;
-
-    // Create the dictionary.
-
-    if ((dict = PyDict_New()) == NULL)
-        return NULL;
-
-    // Get it.
-
-    const QMap<QString,QByteArray> cppmap = *sipCpp;
-    QMap<QString,QByteArray>::ConstIterator it;
-
-    for (it = cppmap.begin (); it != cppmap.end (); ++it)
-    {
-        QString acpp = it.key ();
-        QByteArray bcpp = it.data ();
-        PyObject *ainst;
-        PyObject *binst = NULL;
-        if (((ainst = sipConvertFromNewType(new QString(acpp), sipType_QString, sipTransferObj)) == NULL)
-            || ((binst = sipConvertFromNewType(new QByteArray(bcpp), sipType_QByteArray, sipTransferObj)) == NULL)
-            || (PyDict_SetItem (dict, ainst, binst) < 0))
-        {
-            Py_XDECREF (ainst);
-            Py_XDECREF (binst);
-            Py_DECREF (dict);
-            return NULL;
-        }
-    }
-
-    return dict;
-%End
-
-
-%ConvertToTypeCode
-    // Convert a Python dictionary to a QMap<QString,QByteArray> on the heap.
-
-    if (sipIsErr == NULL)
-        return PyDict_Check(sipPy);
-
-    QMap<QString,QByteArray> *cppmap = new QMap<QString,QByteArray>;
-
-    PyObject *aelem, *belem;
-    SIP_SSIZE_T pos = 0;
-    QString *acpp;
-    QByteArray *bcpp;
-
-    while (PyDict_Next(sipPy, &pos, &aelem, &belem))
-    {
-        int iserr = 0, acpp_state, bcpp_state;
-
-        acpp = (QString *)sipForceConvertToType(aelem, sipType_QString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
-        bcpp = (QByteArray *)sipForceConvertToType(belem, sipType_QByteArray, sipTransferObj, SIP_NOT_NONE, &bcpp_state, &iserr);
-  
-        if (iserr)
-        {
-            if (acpp)
-                sipReleaseType(acpp, sipType_QString, acpp_state);
-
-            *sipIsErr = 1;
-            delete cppmap;
-            return 0;
-        }
-
-        cppmap->insert (*acpp, *bcpp);
-
-        sipReleaseType(acpp, sipType_QString, acpp_state);
-        sipReleaseType(bcpp, sipType_QByteArray, bcpp_state);
-    }
-
-    *sipCppPtr = cppmap;
-
-    return 1;
-%End
-};
-
-
-
-%MappedType QValueList<DCOPRef>
-//converts a Python list of DCOPRef
-{
-%TypeHeaderCode
-#include <qvaluelist.h>
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    QValueList<DCOPRef> *cpplist = (QValueList<DCOPRef> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    QValueList<DCOPRef>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipConvertFromNewType(new DCOPRef(*it), sipType_DCOPRef, NULL)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    QValueList<DCOPRef> *cpplist = new QValueList<DCOPRef>;
-
-    PyObject *elem;
-    DCOPRef *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (DCOPRef *)sipForceConvertToType(elem, sipType_DCOPRef, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
diff --git a/sip/kdecore/fixx11h.sip b/sip/kdecore/fixx11h.sip
deleted file mode 100644
index 22fe789..0000000
--- a/sip/kdecore/fixx11h.sip
+++ /dev/null
@@ -1,30 +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 tdecore  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 <X11/X.h>
-#include <fixx11h.h>
-%End
-
diff --git a/sip/kdecore/kaboutdata.sip b/sip/kdecore/kaboutdata.sip
deleted file mode 100644
index 1117cda..0000000
--- a/sip/kdecore/kaboutdata.sip
+++ /dev/null
@@ -1,301 +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 tdecore  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.
-
-
-class KAboutPerson
-{
-%TypeHeaderCode
-#include <kaboutdata.h>
-%End
-
-
-public:
-                         KAboutPerson (const char*, const char*, const char*, const char*);
-                         KAboutPerson ();
-    QString              name () const;
-    QString              task () const;
-    QString              emailAddress () const;
-    QString              webAddress () const;
-
-};  // class KAboutPerson
-
-
-class KAboutTranslator
-{
-%TypeHeaderCode
-#include <kaboutdata.h>
-%End
-
-
-public:
-                         KAboutTranslator (const QString& = QString ::null , const QString& = QString ::null );
-    QString              name () const;
-    QString              emailAddress () const;
-
-};  // class KAboutTranslator
-
-
-class KAboutData
-{
-%TypeHeaderCode
-#include <kaboutdata.h>
-%End
-
-
-public:
-
-    enum LicenseKey
-    {
-        License_Custom, 
-        License_File, 
-        License_Unknown, 
-        License_GPL, 
-        License_GPL_V2, 
-        License_LGPL, 
-        License_LGPL_V2, 
-        License_BSD, 
-        License_Artistic, 
-        License_QPL, 
-        License_QPL_V1_0
-    };
-
-
-public:
-                         KAboutData (const char*, const char*, const char*, const char* = 0, int = License_Unknown , const char* = 0, const char* = 0, const char* = 0, const char* = "submit@bugs.kde.org");
-    void                 addAuthor (const char*, const char* = 0, const char* = 0, const char* = 0);
-    void                 addCredit (const char*, const char* = 0, const char* = 0, const char* = 0);
-    void                 setTranslator (const char*, const char*);
-    void                 setLicenseText (const char*);
-    void                 setLicenseTextFile (const QString&);
-
-%If ( KDE_3_3_0 -  )
-    void                 setAppName (const char*);
-    void                 setProgramName (const char*);
-
-%If ( KDE_3_4_0 -  )
-    void                 setProgramLogo (const QImage&);
-%End
-
-    void                 setVersion (const char*);
-    void                 setShortDescription (const char*);
-    void                 setLicense (KAboutData::LicenseKey);
-    void                 setCopyrightStatement (const char*);
-    void                 setOtherText (const char*);
-    void                 setHomepage (const char*);
-    void                 setBugAddress (const char*);
-%End
-
-
-%If ( KDE_3_2_0 -  )
-    void                 setProductName (const char*);
-%End
-
-    const char*          appName () const;
-
-%If ( KDE_3_2_0 -  )
-    const char*          productName () const;
-%End
-
-    QString              programName () const;
-
-%If ( KDE_3_5_1 -  )
-    const char*          internalProgramName () const;
-    void                 translateInternalProgramName () const;
-%End
-
-
-%If ( KDE_3_4_0 -  )
-    QImage               programLogo () const;
-%End
-
-    QString              version () const;
-
-%If ( KDE_3_5_1 -  )
-    const char*          internalVersion () const;
-%End
-
-    QString              shortDescription () const;
-    QString              homepage () const;
-    QString              bugAddress () const;
-
-%If ( KDE_3_5_1 -  )
-    const char*          internalBugAddress () const;
-%End
-
-    const QValueList<KAboutPerson> authors () const;
-    const QValueList<KAboutPerson> credits () const;
-    const QValueList<KAboutTranslator> translators () const;
-    static QString       aboutTranslationTeam ();
-    QString              otherText () const;
-    QString              license () const;
-    QString              copyrightStatement () const;
-
-%If ( KDE_3_5_0 -  )
-    QString              customAuthorPlainText () const;
-    QString              customAuthorRichText () const;
-    bool                 customAuthorTextEnabled () const;
-    void                 setCustomAuthorText (const QString&, const QString&);
-    void                 unsetCustomAuthorText ();
-%End
-
-
-};  // class KAboutData
-
-
-
-%MappedType QValueList<KAboutPerson>
-//converts a Python list of KAboutPerson
-{
-%TypeHeaderCode
-#include <qvaluelist.h>
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    QValueList<KAboutPerson> *cpplist = (QValueList<KAboutPerson> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    QValueList<KAboutPerson>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipConvertFromNewType(new KAboutPerson(*it), sipType_KAboutPerson, NULL)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    QValueList<KAboutPerson> *cpplist = new QValueList<KAboutPerson>;
-
-    PyObject *elem;
-    KAboutPerson *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KAboutPerson *)sipForceConvertToType(elem, sipType_KAboutPerson, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
-
-%MappedType QValueList<KAboutTranslator>
-//converts a Python list of KAboutTranslator
-{
-%TypeHeaderCode
-#include <qvaluelist.h>
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    QValueList<KAboutTranslator> *cpplist = (QValueList<KAboutTranslator> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    QValueList<KAboutTranslator>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipConvertFromNewType(new KAboutTranslator(*it), sipType_KAboutTranslator, NULL)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    QValueList<KAboutTranslator> *cpplist = new QValueList<KAboutTranslator>;
-
-    PyObject *elem;
-    KAboutTranslator *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KAboutTranslator *)sipForceConvertToType(elem, sipType_KAboutTranslator, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
-
diff --git a/sip/kdecore/kaccel.sip b/sip/kdecore/kaccel.sip
deleted file mode 100644
index 301aba2..0000000
--- a/sip/kdecore/kaccel.sip
+++ /dev/null
@@ -1,240 +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 tdecore  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.
-
-
-class KAccel : QAccel
-{
-%TypeHeaderCode
-#include <kaccel.h>
-%End
-
-
-public:
-                         KAccel (QWidget* /TransferThis/, const char* = 0);
-                         KAccel (QWidget*, QObject* /TransferThis/, const char* = 0);
-    KAccelActions&       actions ();
-    bool                 isEnabled () const;
-    void                 setEnabled (bool);
-    bool                 setAutoUpdate (bool);
-
-%If ( KDE_3_1_4 -  )
-    KAccelAction*        insert (const QString&, const QString&, const QString&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
-    KAccelAction*        insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
-    KAccelAction*        insert (const char*, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
-    KAccelAction*        insert (KStdAccel::StdAccel, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
-%End
-
-    bool                 remove (const QString&);
-    bool                 updateConnections ();
-    const KShortcut&     shortcut (const QString&) const;
-    bool                 setShortcut (const QString&, const KShortcut&);
-
-%If ( KDE_3_1_4 -  )
-    bool                 setSlot (const QString&, SIP_RXOBJ_CON, SIP_SLOT_CON ());
-%End
-
-    bool                 setEnabled (const QString&, bool);
-    const QString&       configGroup () const;
-    void                 setConfigGroup (const QString&);
-    bool                 readSettings (KConfigBase* = 0);
-    bool                 writeSettings (KConfigBase* = 0) const;
-    void                 emitKeycodeChanged ();
-
-signals:
-    void                 keycodeChanged ();
-
-public:
-    bool                 insertItem (const QString&, const QString&, const char*, int = 0, QPopupMenu* = 0, bool = 1);
-    bool                 insertItem (const QString&, const QString&, int, int, QPopupMenu*, bool = 1);
-    bool                 insertStdItem (KStdAccel::StdAccel, const QString& = QString ::null );
-
-%If ( KDE_3_1_4 -  )
-    bool                 connectItem (const QString&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1);
-    bool                 connectItem (KStdAccel::StdAccel, SIP_RXOBJ_CON, SIP_SLOT_CON ());
-%End
-
-    bool                 removeItem (const QString&);
-    bool                 setItemEnabled (const QString&, bool);
-    void                 changeMenuAccel (QPopupMenu*, int, const QString&);
-    void                 changeMenuAccel (QPopupMenu*, int, KStdAccel::StdAccel);
-    static int           stringToKey (const QString&);
-    int                  currentKey (const QString&) const;
-    QString              findKey (int) const;
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-public:
-
-%If (  - KDE_3_2_0 )
-//ig     bool                 getAutoUpdate ();
-//ig     KAccelAction*        insert (const QString&, const QString&);
-%End
-
-
-public:
-
-%If (  - KDE_3_1_4 )
-    KAccelAction*        insert (const QString&, const QString&, const QString&, const KShortcut&, const QObject*, const char*, bool = 1, bool = 1);
-    KAccelAction*        insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, const QObject*, const char*, bool = 1, bool = 1);
-    KAccelAction*        insert (const char*, const KShortcut&, const QObject*, const char*, bool = 1, bool = 1);
-    KAccelAction*        insert (KStdAccel::StdAccel, const QObject*, const char*, bool = 1, bool = 1);
-    bool                 setSlot (const QString&, const QObject*, const char*);
-%End
-
-
-public:
-
-%If (  - KDE_3_1_4 )
-    bool                 connectItem (const QString&, const QObject*, const char*, bool = 1);
-    bool                 connectItem (KStdAccel::StdAccel, const QObject*, const char*);
-
-//force
-%ConvertToSubClassCode
-    // The table of Python class objects indexed by their names.  The table
-    // must be sorted by name.
-
-    static sipStringTypeClassMap map[] = {
-        {sipName_KAccel,                  &sipClass_KAccel},
-        {sipName_KApplication,            &sipClass_KApplication},
-        {sipName_KAsyncIO,                &sipClass_KAsyncIO},
-        {sipName_KAudioPlayer,            &sipClass_KAudioPlayer},
-        {sipName_KBufferedIO,             &sipClass_KBufferedIO},
-#if KDE_VERSION >= 0x030100
-        {sipName_KClipboardSynchronizer,  &sipClass_KClipboardSynchronizer},
-#endif
-        {sipName_KCompletion,             &sipClass_KCompletion},
-        {sipName_KConfig,                 &sipClass_KConfig},
-        {sipName_KConfigBase,             &sipClass_KConfigBase},
-        {sipName_KConfigGroup,            &sipClass_KConfigGroup},
-        {sipName_KDesktopFile,            &sipClass_KDesktopFile},
-        {sipName_KGlobalAccel,            &sipClass_KGlobalAccel},
-        {sipName_KLibFactory,             &sipClass_KLibFactory},
-        {sipName_KLibLoader,              &sipClass_KLibLoader},
-        {sipName_KLibrary,                &sipClass_KLibrary},
-        {sipName_KMultipleDrag,           &sipClass_KMultipleDrag},
-        {sipName_KProcIO,                 &sipClass_KProcIO},
-        {sipName_KProcess,                &sipClass_KProcess},
-        {sipName_KProcessController,      &sipClass_KProcessController},
-        {sipName_KServerSocket,           &sipClass_KServerSocket},
-        {sipName_KShellProcess,           &sipClass_KShellProcess},
-        {sipName_KSimpleConfig,           &sipClass_KSimpleConfig},
-        {sipName_KSocket,                 &sipClass_KSocket},
-        {sipName_KStartupInfo,            &sipClass_KStartupInfo},
-        {sipName_KUniqueApplication,      &sipClass_KUniqueApplication},
-        {sipName_KWinModule,              &sipClass_KWinModule},
-    };
-
-    sipClass = sipMapStringToClass(sipCpp -> className(),map,sizeof (map)/sizeof (map[0]));
-%End
-//end
-%End
-
-
-};  // class KAccel
-
-
-
-%MappedType QMap<int,QString>
-//converts a Python dict of int:QString
-{
-%TypeHeaderCode
-#include <kaccel.h>
-%End
-
-%ConvertFromTypeCode
-
-    if (!sipCpp)
-        return PyDict_New();
-
-        PyObject *dict;
-
-    // Create the dictionary.
-
-    if ((dict = PyDict_New()) == NULL)
-        return NULL;
-
-    // Get it.
-
-        const QMap<int,QString> map = *sipCpp;
-        QMap<int,QString>::ConstIterator it;
-
-    for (it = map.begin (); it != map.end (); ++it)
-        {
-                PyObject *iKey  = PyInt_FromLong (((long) it.key ()));
-                PyObject *sData = PyString_FromString ((char *)((QString *)&it.data ()));
-
-                if ((iKey == NULL) || (sData == NULL) || (PyDict_SetItem (dict, iKey, sData) < 0))
-                {
-                        Py_XDECREF (iKey);
-                        Py_XDECREF (sData);
-                        Py_DECREF (dict);
-                        return NULL;
-                }
-        }
-
-    return dict;
-%End
-
-
-%ConvertToTypeCode
-    // Convert a Python dictionary to a KKeyMapOrder on the heap.
-
-    if (sipIsErr == NULL)
-        return PyDict_Check(sipPy);
-
-    QMap<int,QString> *map = new QMap<int,QString>;
-
-    PyObject *key, *value;
-    SIP_SSIZE_T pos = 0;
-    int iKey;
-    QString *sData;
-
-    while (PyDict_Next(sipPy, &pos, &key, &value))
-    {
-        int iserr = 0, sData_state;
-
-        iKey = PyInt_AS_LONG (key);
-        sData = (QString *)sipForceConvertToType(value, sipType_QString, sipTransferObj, SIP_NOT_NONE, &sData_state, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete map;
-            return 0;
-        }
-
-        map->insert (iKey, *sData);
-
-        sipReleaseType(sData, sipType_QString, sData_state);
-    }
-
-    *sipCppPtr = map;
-
-    return 1;
-%End
-};
-
-
diff --git a/sip/kdecore/kaccelaction.sip b/sip/kdecore/kaccelaction.sip
deleted file mode 100644
index 20947b6..0000000
--- a/sip/kdecore/kaccelaction.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 tdecore  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.
-
-
-class KAccelAction
-{
-%TypeHeaderCode
-#include <kaccelaction.h>
-%End
-
-
-public:
-                         KAccelAction ();
-                         KAccelAction (const KAccelAction&);
-                         KAccelAction (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, const QObject*, const char*, bool, bool);
-    void                 clear ();
-    bool                 init (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, const QObject*, const char*, bool, bool);
-    const QString&       name () const;
-    const QString&       label () const;
-    const QString&       whatsThis () const;
-    const KShortcut&     shortcut () const;
-    const KShortcut&     shortcutDefault () const;
-    const KShortcut&     shortcutDefault3 () const;
-    const KShortcut&     shortcutDefault4 () const;
-    const QObject*       objSlotPtr () const;
-    const char*          methodSlotPtr () const;
-    bool                 isConfigurable () const;
-    bool                 isEnabled () const;
-    void                 setName (const QString&);
-    void                 setLabel (const QString&);
-    void                 setWhatsThis (const QString&);
-    bool                 setShortcut (const KShortcut&);
-    void                 setSlot (const QObject*, const char*);
-    void                 setConfigurable (bool);
-    void                 setEnabled (bool);
-    int                  getID () const;
-    void                 setID (int);
-    bool                 isConnected () const;
-    bool                 setKeySequence (uint, const KKeySequence&);
-    void                 clearShortcut ();
-    bool                 contains (const KKeySequence&);
-    QString              toString () const;
-    QString              toStringInternal () const;
-    static bool          useFourModifierKeys ();
-    static void          useFourModifierKeys (bool);
-
-protected:
-    void                 incConnections ();
-    void                 decConnections ();
-
-};  // class KAccelAction
-
-
-class KAccelActions
-{
-%TypeHeaderCode
-#include <kaccelaction.h>
-%End
-
-
-public:
-                         KAccelActions ();
-                         KAccelActions (const KAccelActions&);
-    void                 clear ();
-    bool                 init (const KAccelActions&);
-    bool                 init (KConfigBase&, const QString&);
-    void                 updateShortcuts (KAccelActions&);
-    int                  actionIndex (const QString&) const;
-    KAccelAction*        actionPtr (uint);
-    KAccelAction*        actionPtr (const QString&);
-    KAccelAction*        actionPtr (KKeySequence);
-
-%If ( KDE_3_1_4 -  )
-    KAccelAction&        operator [] (uint);
-%MethodCode
-//returns (KAccelAction&)
-//takes index | (uint)
-    sipRes = &((*sipCpp) [a0]);
-%End
-
-%End
-
-    KAccelAction*        insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, const QObject* = 0, const char* = 0, bool = 1, bool = 1);
-    KAccelAction*        insert (const QString&, const QString&);
-    bool                 remove (const QString&);
-    bool                 readActions (const QString& = "Shortcuts", KConfigBase* = 0);
-    bool                 writeActions (const QString& = "Shortcuts", KConfigBase* = 0, bool = 0, bool = 0) const;
-    void                 emitKeycodeChanged ();
-    uint                 count () const;
-
-protected:
-    void                 resize (uint);
-    void                 insertPtr (KAccelAction*);
-
-private:
-                         KAccelActions (KAccelBase*);
-    KAccelActions &operator=(const KAccelActions &);
-
-};  // class KAccelActions
-
diff --git a/sip/kdecore/kaccelbase.sip b/sip/kdecore/kaccelbase.sip
deleted file mode 100644
index 334c6d8..0000000
--- a/sip/kdecore/kaccelbase.sip
+++ /dev/null
@@ -1,102 +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 tdecore  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.
-
-
-class KAccelBase
-{
-%TypeHeaderCode
-#include <kaccelbase.h>
-%End
-
-
-public:
-
-    enum Init
-    {
-        QT_KEYS, 
-        NATIVE_KEYS
-    };
-
-
-    enum Signal
-    {
-        KEYCODE_CHANGED
-    };
-
-                         KAccelBase (int);
-    uint                 actionCount () const;
-    KAccelActions&       actions ();
-    bool                 isEnabled () const;
-    KAccelAction*        actionPtr (const QString&);
-    KAccelAction*        actionPtr (const KKey&);
-    KAccelAction*        actionPtr (const KKeyServer::Key&);
-    const QString&       configGroup () const;
-    void                 setConfigGroup (const QString&);
-    void                 setConfigGlobal (bool);
-    virtual void         setEnabled (bool)  = 0;
-    bool                 getAutoUpdate ();
-    bool                 setAutoUpdate (bool);
-    KAccelAction*        insert (const QString&, const QString&);
-    KAccelAction*        insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, const QObject*, const char*, bool = 1, bool = 1);
-    bool                 remove (const QString&);
-    bool                 setActionSlot (const QString&, const QObject*, const char*);
-    bool                 updateConnections ();
-    bool                 setShortcut (const QString&, const KShortcut&);
-    bool                 setActionEnabled (const QString&, bool);
-    void                 readSettings (KConfigBase* = 0);
-    void                 writeSettings (KConfigBase* = 0) const;
-    QPopupMenu*          createPopupMenu (QWidget*, const KKeySequence&);
-
-protected:
-    void                 slotRemoveAction (KAccelAction*);
-//ig     void                 createKeyList (QValueVector<structX>&);
-    bool                 insertConnection (KAccelAction*);
-    bool                 removeConnection (KAccelAction*);
-    virtual bool         emitSignal (KAccelBase::Signal)  = 0;
-    virtual bool         connectKey (KAccelAction&, const KKeyServer::Key&)  = 0;
-    virtual bool         connectKey (const KKeyServer::Key&)  = 0;
-    virtual bool         disconnectKey (KAccelAction&, const KKeyServer::Key&)  = 0;
-    virtual bool         disconnectKey (const KKeyServer::Key&)  = 0;
-
-protected:
-
-%If ( KDE_3_5_0 -  )
-    virtual bool         isEnabledInternal () const;
-%End
-
-    
-//ig     class ActionInfo;
-
-//ig     typedef QMap<KKeyServer::Key,KAccelBase::ActionInfo> KKeyToActionMap;
-
-protected:
-
-%If (  - KDE_3_1_1 )
-//igx     virtual void         virtual_hook (int, void*);
-%End
-
-
-};  // class KAccelBase
-
diff --git a/sip/kdecore/kallocator.sip b/sip/kdecore/kallocator.sip
deleted file mode 100644
index 7272123..0000000
--- a/sip/kdecore/kallocator.sip
+++ /dev/null
@@ -1,48 +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 tdecore  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.
-
-
-class KZoneAllocator
-{
-%TypeHeaderCode
-#include <kallocator.h>
-%End
-
-
-public:
-                         KZoneAllocator (long = 131072);
-    void*                allocate (size_t);
-    void                 deallocate (void*);
-    void                 free_since (void*);
-
-protected:
-//ig     typedef QValueList<KZoneAllocator::MemBlock*> MemList;
-//ig     void                 addBlock (KZoneAllocator::MemBlock*);
-//ig     void                 delBlock (KZoneAllocator::MemBlock*);
-//ig     void                 insertHash (KZoneAllocator::MemBlock*);
-    void                 initHash ();
-
-};  // class KZoneAllocator
-
diff --git a/sip/kdecore/kapplication.sip b/sip/kdecore/kapplication.sip
deleted file mode 100644
index e91de01..0000000
--- a/sip/kdecore/kapplication.sip
+++ /dev/null
@@ -1,449 +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 tdecore  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.
-
-
-class KApplication : QApplication, KInstance
-{
-%TypeHeaderCode
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-extern char **pyArgvToC(PyObject *argvlist,int *argcp);
-extern void updatePyArgv(PyObject *argvlist,int argc,char **argv);
-%End
-
-
-public:
-
-    enum CaptionLayout
-    {
-        CaptionAppLast, 
-        CaptionAppFirst, 
-        CaptionNoApp
-    };
-
-                         KApplication (bool = 1, bool = 1);
-
-%If ( KDE_3_3_0 -  )
-//ig                          KApplication (Display*, Qt::HANDLE = 0, Qt::HANDLE = 0, bool = 1);
-%End
-
-//ig                          KApplication (Display*, int&, char**, const QCString&, bool = 1, bool = 1);
-                         KApplication (SIP_PYLIST, QCString&, bool = 1, bool = 1) [(int&, char**, const QCString&, bool = 1, bool = 1)];
-%MethodCode
-//takes argv | (a Python list of strings) | rAppName | (Python string) | allowStyles | (bool = 1)  | GUIenabled | (bool = 1)
-
-        int argc, nargc;
-        char **argv;
-
-        // Convert the list.
-
-        if ((argv = pyArgvToC(a0, &argc)) == NULL)
-            return NULL;
-
-        // Create it now the arguments are right.
-
-        nargc = argc;
-
-        Py_BEGIN_ALLOW_THREADS
-
-        // The following two lines simulate the actual ctor call
-        // which is commented out below
-        KCmdLineArgs::init (nargc, argv, (char *)"unknown", (char *)"KDE Application", NULL, false);
-        sipCpp = new sipKApplication((bool)a1,(bool)a2);
-
-        // This method calls KCmdLineArgs::initIgnore, which is a private method
-//        sipCpp = new sipKApplication (nargc,argv, qc, a1, a2);
-
-        Py_END_ALLOW_THREADS
-
-        // Now modify the original list.
-
-        updatePyArgv(a0, argc, argv);
-%End
-
-    static void          addCmdLineOptions ();
-    static KApplication* kApplication ();
-    KConfig*             sessionConfig ();
-    bool                 isRestored () const;
-    void                 disableSessionManagement ();
-
-%If ( KDE_3_2_0 -  )
-    void                 enableSessionManagement ();
-%End
-
-
-    enum ShutdownConfirm
-    {
-        ShutdownConfirmDefault, 
-        ShutdownConfirmNo, 
-        ShutdownConfirmYes
-    };
-
-
-    enum ShutdownType
-    {
-        ShutdownTypeDefault, 
-        ShutdownTypeNone, 
-        ShutdownTypeReboot, 
-        ShutdownTypeHalt
-    };
-
-
-    enum ShutdownMode
-    {
-        ShutdownModeDefault, 
-        ShutdownModeSchedule, 
-        ShutdownModeTryNow, 
-        ShutdownModeForceNow, 
-        ShutdownModeInteractive
-    };
-
-    bool                 requestShutDown (KApplication::ShutdownConfirm = ShutdownConfirmDefault , KApplication::ShutdownType = ShutdownTypeDefault , KApplication::ShutdownMode = ShutdownModeDefault );
-    void                 propagateSessionManager ();
-    void                 commitData (QSessionManager&);
-    void                 saveState (QSessionManager&);
-
-%If ( KDE_3_1_1 -  )
-    bool                 sessionSaving () const;
-%End
-
-    static DCOPClient*   dcopClient ();
-    static void          disableAutoDcopRegistration ();
-    QPixmap              icon () const;
-    QString              iconName () const;
-    QPixmap              miniIcon () const;
-    QString              miniIconName () const;
-    void                 setTopWidget (QWidget*);
-
-%If ( KDE_3_2_0 -  )
-    void                 invokeHelp (const QString&, const QString&, const QCString&) const;
-%End
-
-    void                 invokeHelp (const QString& = QString ::null , const QString& = QString ::null ) const;
-    void                 invokeHTMLHelp (const QString&, const QString& = QString ::null ) const;
-
-%If ( KDE_3_2_0 -  )
-    void                 invokeMailer (const QString&, const QString&, const QCString&);
-%End
-
-    void                 invokeMailer (const QString&, const QString&);
-
-%If ( KDE_3_3_0 -  )
-    void                 invokeMailer (const KURL&, const QCString&, bool);
-%End
-
-
-%If ( KDE_3_2_0 -  )
-    void                 invokeMailer (const KURL&, const QCString&);
-%End
-
-    void                 invokeMailer (const KURL&);
-
-%If ( KDE_3_2_0 -  )
-    void                 invokeMailer (const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QStringList&, const QCString&);
-%End
-
-    void                 invokeMailer (const QString&, const QString&, const QString&, const QString&, const QString&, const QString& = QString ::null , const QStringList& = QStringList ());
-
-public slots:
-
-%If ( KDE_3_2_0 -  )
-    void                 invokeBrowser (const QString&, const QCString&);
-%End
-
-    void                 invokeBrowser (const QString&);
-
-%If ( KDE_3_2_0 -  )
-    void                 cut ();
-    void                 copy ();
-    void                 paste ();
-    void                 clear ();
-    void                 selectAll ();
-%End
-
-
-public:
-    static QCString      launcher ();
-    static int           startServiceByName (const QString&, const QString&, QString* /Out/, QCString* /Out/, int*, const QCString& = QCString ("" ), bool = 0);
-    static int           startServiceByName (const QString&, const QStringList&, QString* /Out/, QCString* /Out/, int*, const QCString& = QCString ("" ), bool = 0);
-    static int           startServiceByDesktopPath (const QString&, const QString&, QString* /Out/, QCString* /Out/, int*, const QCString& = QCString ("" ), bool = 0);
-    static int           startServiceByDesktopPath (const QString&, const QStringList&, QString* /Out/, QCString* /Out/, int*, const QCString& = QCString ("" ), bool = 0);
-    static int           startServiceByDesktopName (const QString&, const QString&, QString* /Out/, QCString* /Out/, int*, const QCString& = QCString ("" ), bool = 0);
-    static int           startServiceByDesktopName (const QString&, const QStringList&, QString* /Out/, QCString* /Out/, int*, const QCString& = QCString ("" ), bool = 0);
-
-%If ( KDE_3_2_0 -  )
-    static int           tdeinitExec (const QString&, const QStringList&, QString* /Out/, int*, QCString&);
-%End
-
-    static int           tdeinitExec (const QString&, const QStringList&, QString* /Out/, int*);
-
-%If ( KDE_3_2_0 -  )
-    static int           tdeinitExecWait (const QString&, const QStringList&, QString* /Out/, int*, QCString&);
-%End
-
-    static int           tdeinitExecWait (const QString&, const QStringList&, QString* /Out/, int*);
-    QString              caption () const;
-//ig     KStyle*              kstyle () const;
-    QString              makeStdCaption (const QString&, bool = 1, bool = 0) const;
-    QString              tempSaveName (const QString&) const;
-    QString              checkRecoverFile (const QString&, bool&) const;
-    Display*             getDisplay ();
-    void                 enableStyles ();
-    void                 disableStyles ();
-    void                 installX11EventFilter (QWidget*);
-
-%If ( KDE_3_2_0 -  )
-    void                 removeX11EventFilter (const QWidget*);
-%End
-
-    static int           random ();
-    static QString       randomString (int);
-    void                 addKipcEventMask (int);
-    void                 removeKipcEventMask (int);
-    QCString             startupId () const;
-    void                 setStartupId (const QCString&);
-
-%If ( KDE_3_2_0 -  )
-    void                 updateUserTimestamp (ulong = 0);
-
-%If ( KDE_3_2_3 -  )
-    ulong                userTimestamp () const;
-
-%If ( KDE_3_3_0 -  )
-    void                 updateRemoteUserTimestamp (const QCString&, ulong = 0);
-%End
-
-%End
-
-%End
-
-    QString              geometryArgument () const;
-    void                 installKDEPropertyMap ();
-    bool                 authorize (const QString&);
-    bool                 authorizeKAction (const char*);
-
-%If ( KDE_3_1_0 -  )
-    bool                 authorizeURLAction (const QString&, const KURL&, const KURL&);
-
-%If ( KDE_3_2_0 -  )
-    void                 allowURLAction (const QString&, const KURL&, const KURL&);
-    bool                 authorizeControlModule (const QString&);
-    QStringList          authorizeControlModules (const QStringList&);
-
-%If ( KDE_3_4_0 -  )
-    static ButtonState   keyboardMouseState ();
-%End
-
-%End
-
-
-    enum 
-    {
-        ShiftModifier, 
-        LockModifier, 
-        ControlModifier, 
-        Modifier1, 
-        Modifier2, 
-        Modifier3, 
-        Modifier4, 
-        Modifier5
-    };
-
-    static uint          keyboardModifiers ();
-
-    enum 
-    {
-        Button1Pressed, 
-        Button2Pressed, 
-        Button3Pressed, 
-        Button4Pressed, 
-        Button5Pressed
-    };
-
-    static uint          mouseState ();
-%End
-
-
-public slots:
-    void                 ref ();
-    void                 deref ();
-
-protected:
-                         KApplication (bool, bool, KInstance*);
-
-%If ( KDE_3_3_0 -  )
-//ig                          KApplication (Display*, Qt::HANDLE, Qt::HANDLE, bool, KInstance*);
-%End
-
-//ig     bool                 x11EventFilter (XEvent*);
-
-%If ( KDE_3_2_0 -  )
-    void                 invokeEditSlot (const char*);
-%End
-
-
-public:
-    bool                 notify (QObject*, QEvent*);
-
-%If ( KDE_3_2_0 -  )
-//ig     int                  xErrhandler (Display*, void*);
-//ig     int                  xioErrhandler (Display*);
-%End
-
-
-%If ( KDE_3_0_1 -  )
-//ig     void                 iceIOErrorHandler (_IceConn*);
-%End
-
-    bool                 loadedByKdeinit;
-    static void          startKdeinit ();
-
-    enum SettingsCategory
-    {
-        SETTINGS_MOUSE, 
-        SETTINGS_COMPLETION, 
-        SETTINGS_PATHS, 
-        SETTINGS_POPUPMENU, 
-        SETTINGS_QT, 
-        SETTINGS_SHORTCUTS
-    };
-
-
-%If ( KDE_3_1_0 -  )
-    static QPalette      createApplicationPalette ();
-    static QPalette      createApplicationPalette (KConfig*, int);
-
-%If ( KDE_3_2_0 -  )
-    static void          installSigpipeHandler ();
-    static bool          guiEnabled ();
-%End
-
-%End
-
-
-signals:
-    void                 kdisplayPaletteChanged ();
-    void                 kdisplayStyleChanged ();
-    void                 kdisplayFontChanged ();
-    void                 appearanceChanged ();
-    void                 toolbarAppearanceChanged (int);
-    void                 backgroundChanged (int);
-    void                 settingsChanged (int);
-    void                 iconChanged (int);
-    void                 kipcMessage (int, int);
-    void                 saveYourself ();
-    void                 shutDown ();
-
-private:
-                         KApplication (const KApplication&);
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-public:
-
-%If (  - KDE_3_2_0 )
-    int                  xioErrhandler ();
-%End
-
-
-};  // class KApplication
-
-
-class KSessionManaged
-{
-%TypeHeaderCode
-#include <kapplication.h>
-%End
-
-
-public:
-                         KSessionManaged ();
-    virtual bool         saveState (QSessionManager&);
-    virtual bool         commitData (QSessionManager&);
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KSessionManaged
-
-typedef ulong Atom;
-//ig typedef void Display;
-//ig bool                 checkAccess (const QString&, int);
-
-
-%ModuleCode
-#include <string.h>
-
-// Convert a Python argv list to a conventional C argc count and argv array.
-char **pyArgvToC(PyObject *argvlist,int *argcp)
-{
-    int argc;
-    char **argv;
-
-    argc = PyList_Size(argvlist);
-
-    // Allocate space for two copies of the argument pointers, plus the
-    // terminating NULL.
-    if ((argv = (char **)sipMalloc(2 * (argc + 1) * sizeof (char *))) == NULL)
-        return NULL;
-
-    // Convert the list.
-    for (int a = 0; a < argc; ++a)
-    {
-        char *arg;
-
-        // Get the argument and allocate memory for it.
-        if ((arg = PyString_AsString(PyList_GetItem(argvlist,a))) == NULL ||
-            (argv[a] = (char *)sipMalloc(strlen(arg) + 1)) == NULL)
-            return NULL;
-
-        // Copy the argument and save a pointer to it.
-        strcpy(argv[a],arg);
-        argv[a + argc + 1] = argv[a];
-    }
-
-    argv[argc + argc + 1] = argv[argc] = NULL;
-
-    *argcp = argc;
-
-    return argv;
-}
-
-
-// Remove arguments from the Python argv list that have been removed from the
-// C argv array.
-void updatePyArgv(PyObject *argvlist,int argc,char **argv)
-{
-    for (int a = 0, na = 0; a < argc; ++a)
-    {
-        // See if it was removed.
-        if (argv[na] == argv[a + argc + 1])
-            ++na;
-        else
-            PyList_SetSlice(argvlist,na,na + 1,NULL);
-    }
-}
-%End
diff --git a/sip/kdecore/kasyncio.sip b/sip/kdecore/kasyncio.sip
deleted file mode 100644
index 3c716df..0000000
--- a/sip/kdecore/kasyncio.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 tdecore  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.
-
-
-class KAsyncIO : QObject, QIODevice
-{
-%TypeHeaderCode
-#include <kasyncio.h>
-%End
-
-
-protected:
-                         KAsyncIO ();
-
-private:
-                         KAsyncIO (KAsyncIO&);
-
-public:
-    virtual void         enableRead (bool)  = 0;
-    virtual void         enableWrite (bool)  = 0;
-
-signals:
-    void                 readyRead ();
-    void                 readyWrite ();
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KAsyncIO
-
diff --git a/sip/kdecore/kaudioplayer.sip b/sip/kdecore/kaudioplayer.sip
deleted file mode 100644
index e211058..0000000
--- a/sip/kdecore/kaudioplayer.sip
+++ /dev/null
@@ -1,42 +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 tdecore  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.
-
-
-class KAudioPlayer : QObject
-{
-%TypeHeaderCode
-#include <kaudioplayer.h>
-%End
-
-
-public:
-                         KAudioPlayer (const QString&, QObject* /TransferThis/ = 0, const char* = 0);
-    static void          play (const QString&);
-
-public slots:
-    void                 play ();
-
-};  // class KAudioPlayer
-
diff --git a/sip/kdecore/kbufferedio.sip b/sip/kdecore/kbufferedio.sip
deleted file mode 100644
index bb79121..0000000
--- a/sip/kdecore/kbufferedio.sip
+++ /dev/null
@@ -1,73 +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 tdecore  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.
-
-
-class KBufferedIO : KAsyncIO
-{
-%TypeHeaderCode
-#include <kbufferedio.h>
-%End
-
-
-protected:
-                         KBufferedIO ();
-
-public:
-
-    enum closeModes
-    {
-        availRead, 
-        dirtyWrite, 
-        involuntary, 
-        delayed, 
-        closedNow
-    };
-
-    virtual void         closeNow ()  = 0;
-    virtual bool         setBufferSize (int, int = -2);
-    virtual int          bytesAvailable () const;
-    virtual int          waitForMore (int)  = 0;
-    virtual int          bytesToWrite () const;
-    virtual bool         canReadLine () const;
-    virtual int          peekBlock (char*, uint)  = 0;
-    virtual int          unreadBlock (const char*, uint);
-
-signals:
-    void                 bytesWritten (int);
-    void                 closed (int);
-
-protected:
-    virtual uint         consumeReadBuffer (uint, char*, bool = 1);
-    virtual void         consumeWriteBuffer (uint);
-    virtual uint         feedReadBuffer (uint, const char*, bool = 0);
-    virtual uint         feedWriteBuffer (uint, const char*);
-    virtual uint         readBufferSize () const;
-    virtual uint         writeBufferSize () const;
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KBufferedIO
-
diff --git a/sip/kdecore/kcalendarsystem.sip b/sip/kdecore/kcalendarsystem.sip
deleted file mode 100644
index 0cd4023..0000000
--- a/sip/kdecore/kcalendarsystem.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 tdecore  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 -  )
-
-class KCalendarSystem
-{
-%TypeHeaderCode
-#include <kcalendarsystem.h>
-%End
-
-
-public:
-                         KCalendarSystem (const KLocale* = 0);
-    virtual int          year (const QDate&) const = 0;
-    virtual QString      yearString (const QDate&, bool) const;
-    virtual int          yearStringToInteger (const QString&, int& /Out/) const;
-    virtual int          month (const QDate&) const = 0;
-    virtual QString      monthString (const QDate&, bool) const;
-    virtual int          monthStringToInteger (const QString&, int& /Out/) const;
-    virtual int          day (const QDate&) const = 0;
-    virtual QString      dayString (const QDate&, bool) const;
-    virtual int          dayStringToInteger (const QString&, int& /Out/) const;
-    virtual int          dayOfWeek (const QDate&) const = 0;
-    virtual int          dayOfYear (const QDate&) const = 0;
-    virtual bool         setYMD (QDate&, int, int, int) const = 0;
-    virtual QDate        addYears (const QDate&, int) const = 0;
-    virtual QDate        addMonths (const QDate&, int) const = 0;
-    virtual QDate        addDays (const QDate&, int) const = 0;
-    virtual int          monthsInYear (const QDate&) const = 0;
-    virtual int          daysInYear (const QDate&) const = 0;
-    virtual int          daysInMonth (const QDate&) const = 0;
-    virtual int          weeksInYear (int) const = 0;
-    virtual int          weekNumber (const QDate&, int* = 0) const = 0;
-    virtual QString      monthName (int, int, bool = 0) const = 0;
-    virtual QString      monthName (const QDate&, bool = 0) const = 0;
-    virtual QString      monthNamePossessive (int, int, bool = 0) const = 0;
-    virtual QString      monthNamePossessive (const QDate&, bool = 0) const = 0;
-    virtual QString      weekDayName (int, bool = 0) const = 0;
-    virtual QString      weekDayName (const QDate&, bool = 0) const = 0;
-    virtual int          minValidYear () const = 0;
-    virtual int          maxValidYear () const = 0;
-    virtual int          weekDayOfPray () const = 0;
-    virtual QString      calendarName () const = 0;
-    virtual bool         isLunar () const = 0;
-    virtual bool         isLunisolar () const = 0;
-    virtual bool         isSolar () const = 0;
-
-protected:
-    const KLocale*       locale () const;
-
-};  // class KCalendarSystem
-
-%End
-
diff --git a/sip/kdecore/kcalendarsystemfactory.sip b/sip/kdecore/kcalendarsystemfactory.sip
deleted file mode 100644
index 20c4f35..0000000
--- a/sip/kdecore/kcalendarsystemfactory.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 tdecore  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 -  )
-
-class KCalendarSystemFactory
-{
-%TypeHeaderCode
-#include <kcalendarsystemfactory.h>
-%End
-
-
-public:
-                         KCalendarSystemFactory ();
-    static KCalendarSystem* create (const QString& = QString ::fromLatin1 ("gregorian" ), const KLocale* = 0);
-    static QStringList   calendarSystems ();
-
-};  // class KCalendarSystemFactory
-
-%End
-
diff --git a/sip/kdecore/kcatalogue.sip b/sip/kdecore/kcatalogue.sip
deleted file mode 100644
index 3469af8..0000000
--- a/sip/kdecore/kcatalogue.sip
+++ /dev/null
@@ -1,64 +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 tdecore  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.
-
-
-class KCatalogue
-{
-%TypeHeaderCode
-#include <kcatalogue.h>
-%End
-
-
-public:
-
-%If ( KDE_3_3_0 -  )
-                         KCatalogue (const QString& = QString ::null , const QString& = QString ::null );
-%End
-
-                         KCatalogue (const KCatalogue&);
-    QString              name () const;
-
-%If ( KDE_3_3_0 -  )
-    QString              language () const;
-    int                  pluralType () const;
-    void                 setPluralType (int);
-%End
-
-    const char*          translate (const char*) const;
-
-public:
-
-%If (  - KDE_3_3_0 )
-
-%If ( D_MANDRAKE )
-                         KCatalogue (const QString& = QString ::null );
-    void                 setFileName (const QString&);
-%End
-
-%End
-
-
-};  // class KCatalogue
-
diff --git a/sip/kdecore/kcharsets.sip b/sip/kdecore/kcharsets.sip
deleted file mode 100644
index 9be4386..0000000
--- a/sip/kdecore/kcharsets.sip
+++ /dev/null
@@ -1,62 +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 tdecore  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.
-
-
-class KCharsets
-{
-%TypeHeaderCode
-#include <kcharsets.h>
-%End
-
-
-protected:
-                         KCharsets ();
-
-public:
-    QTextCodec*          codecForName (const QString&) const;
-    QTextCodec*          codecForName (const QString&, bool& /Out/) const /PyName=codecForName2/;
-    QChar                fromEntity (const QString&) const;
-    QChar                fromEntity (const QString&, int& /Out/) const /PyName=fromEntity2/;
-    QString              toEntity (const QChar&) const;
-
-%If ( KDE_3_1_0 -  )
-    static QString       resolveEntities (const QString&);
-%End
-
-    QStringList          availableEncodingNames ();
-    QStringList          descriptiveEncodingNames ();
-    QString              languageForEncoding (const QString&);
-    QString              encodingForName (const QString&);
-
-public:
-
-%If (  - KDE_3_2_0 )
-//ig     QStringList          languages ();
-//ig     QStringList          encodingsForLanguage (const QString&);
-%End
-
-
-};  // class KCharsets
-
diff --git a/sip/kdecore/kclipboard.sip b/sip/kdecore/kclipboard.sip
deleted file mode 100644
index 4abc45a..0000000
--- a/sip/kdecore/kclipboard.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 tdecore  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 -  )
-
-class KClipboardSynchronizer : QObject
-{
-%TypeHeaderCode
-#include <kclipboard.h>
-%End
-
-
-public:
-    static KClipboardSynchronizer* self ();
-    static void          setSynchronizing (bool);
-    static bool          isSynchronizing ();
-    static void          setReverseSynchronizing (bool);
-    static bool          isReverseSynchronizing ();
-
-protected:
-                         ~KClipboardSynchronizer ();
-
-private:
-                         KClipboardSynchronizer (QObject* /TransferThis/ = 0, const char* = 0);
-
-};  // class KClipboardSynchronizer
-
-%End
-
diff --git a/sip/kdecore/kcmdlineargs.sip b/sip/kdecore/kcmdlineargs.sip
deleted file mode 100644
index c9831f6..0000000
--- a/sip/kdecore/kcmdlineargs.sip
+++ /dev/null
@@ -1,264 +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 tdecore  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.
-
-
-class KCmdLineOptions
-{
-%TypeHeaderCode
-#include <kcmdlineargs.h>
-extern char **pyArgvToC(PyObject *argvlist,int *argcp);
-extern void updatePyArgv(PyObject *argvlist,int argc,char **argv);
-%End
-
-
-public:
-    const char*          name;
-    const char*          description;
-
-%If ( KDE_3_5_3 -  )
-// def is a Python keyword - use /PyName=/
-//pykwd     const char*          def;
-%End
-
-
-};  // class KCmdLineOptions
-
-
-class KCmdLineArgs
-{
-%TypeHeaderCode
-#include <kcmdlineargs.h>
-#include <qapplication.h>
-%End
-
-
-public:
-
-%If ( KDE_3_2_0 -  )
-    static void          init (SIP_PYLIST, const char*, const char*, const char*, const char*, bool = 0) [void (int, char**, const char*, const char*, const char*, const char*, bool = 0)];
-%MethodCode
-//takes _argc | (int) | _argv | (char) | _appname | (char) | programName | (char) | _description | (char) | _version | (char) | noKApp | (bool = 0)
-
-    int argc, nargc;
-    char **argv;
-
-    // Convert the list.
-
-    if ((argv = pyArgvToC(a0, &argc)) == NULL)
-        return NULL;
-
-    // Create it now the arguments are right.
-    nargc = argc;
-
-    Py_BEGIN_ALLOW_THREADS
-    KCmdLineArgs::init (nargc,argv, a1, a2, a3, a4, a5);
-    Py_END_ALLOW_THREADS
-
-    // Now modify the original list.
-
-    updatePyArgv (a0, argc, argv);
-%End
-
-%End
-
-    static void          init (SIP_PYLIST, const char*, const char*, const char*, bool = 0) [void (int, char**, const char*, const char*, const char*, bool = 0)];
-%MethodCode
-//takes  _argv | (a Python list of strings which may be modified) | _appname | (char) | _description | (char) | _version | (char) | noKApp | (bool = False)
-
-    int argc, nargc;
-    char **argv;
-
-    // Convert the list.
-
-    if ((argv = pyArgvToC(a0, &argc)) == NULL)
-        return NULL;
-
-    // Create it now the arguments are right.
-    nargc = argc;
-
-    Py_BEGIN_ALLOW_THREADS
-    KCmdLineArgs::init (nargc,argv, a1, a2, a3, a4);
-    Py_END_ALLOW_THREADS
-
-    // Now modify the original list.
-
-    updatePyArgv (a0, argc, argv);
-%End
-
-    static void          init (SIP_PYLIST, const KAboutData*, bool = 0) [void (int, char**, const KAboutData*, bool = 0)];
-%MethodCode
-//takes  _argv | (a Python list of strings which may be modified) | about | (KAboutData) | noKApp | (bool = 0)
-
-    int argc, nargc; //, iserr = 0;
-    char **argv;
-
-    // Convert the list.
-
-    if ((argv = pyArgvToC (a0, &argc)) == NULL)
-        return NULL;
-
-    // Create it now the arguments are right.
-    nargc = argc;
-
-    Py_BEGIN_ALLOW_THREADS
-    KCmdLineArgs::init (nargc, argv, a1, a2);
-    Py_END_ALLOW_THREADS
-
-    // Now modify the original list.
-
-    updatePyArgv (a0, argc, argv);
-%End
-
-    static void          init (const KAboutData*);
-    static void          addCmdLineOptions (SIP_PYLIST, const char* = 0, const char* = 0, const char* = 0) [void (const KCmdLineOptions*, const char* = 0, const char* = 0, const char* = 0)];
-%MethodCode
-//takes options  | (a Python list of tuples) | name | (char = 0) | id | (char = 0) | afterId | (char = 0)
-
-//doc
-// A Pytbon list of tuples (name, description, default) is the first parameter
-// instead of a KCmdLineOptions object (KCmdLineOptions is not used);
-// NULL (or None) parameters to mark the end of the list are not required
-//end
-
-    int n;
-
-    if ((n = PyList_Size (a0)) == 0)
-        return NULL;
-
-    // opts is persistent
-    KCmdLineOptions *opts;
-
-    Py_BEGIN_ALLOW_THREADS
-    opts = new KCmdLineOptions [n + 1];
-    Py_END_ALLOW_THREADS
-
-    int i, tsz;
-    for (i = 0; i < n; i++)
-    {
-        PyObject *tuple;
-
-        if ((tuple = PyList_GetItem (a0, i)) != NULL)
-        {
-            tsz = PyTuple_Size (tuple);
-            PyObject *member;
-
-            if (tsz == 0)
-                goto errorExit;
-
-            member = PyTuple_GET_ITEM (tuple, 0);
-            if (PyString_Check (member))
-                opts [i].name = PyString_AS_STRING (member);
-            else
-                goto errorExit;
-
-            if (tsz > 1)
-            {
-                member = PyTuple_GET_ITEM (tuple, 1);
-                if PyString_Check (member)
-                    opts [i].description = PyString_AS_STRING (member);
-                else
-                    goto errorExit;
-            }
-            else
-                opts [i].description = NULL;
-
-
-            if (tsz > 2)
-            {
-                member = PyTuple_GET_ITEM (tuple, 2);
-                if PyString_Check (member)
-                    opts [i].def = PyString_AS_STRING (member);
-                else
-                    goto errorExit;
-            }
-            else
-                opts [i].def = NULL;
-        }
-        else
-            goto errorExit;
-    }
-
-    // mark the end of the list
-    opts [n].name        = NULL;
-    opts [n].description = NULL;
-    opts [n].def         = NULL;
-
-    Py_BEGIN_ALLOW_THREADS
-    KCmdLineArgs::addCmdLineOptions (opts, a1, a2, a3);
-    Py_END_ALLOW_THREADS
-
-    Py_INCREF (Py_None);
-    return Py_None;
-
-errorExit:
-    delete opts;
-    return NULL;
-%End
-
-    static KCmdLineArgs* parsedArgs (const char* = 0);
-    static QString       cwd ();
-    static const char*   appName ();
-    static void          usage (const char* = 0);
-    static void          usage (const QString&);
-    static void          enable_i18n ();
-    QCString             getOption (const char*);
-
-%If ( KDE_3_1_4 -  )
-    QCStringList         getOptionList (const char*) const;
-%End
-
-    bool                 isSet (const char*);
-    int                  count ();
-    const char*          arg (int);
-    KURL                 url (int);
-    static KURL          makeURL (const char*);
-    static void          setCwd (char*);
-    void                 clear ();
-
-%If ( KDE_3_2_0 -  )
-    static void          reset ();
-    static void          loadAppArgs (QDataStream&);
-
-%If ( KDE_3_4_0 -  )
-    static void          addTempFileOption ();
-    static bool          isTempFileSet ();
-%End
-
-%End
-
-
-protected:
-                         KCmdLineArgs (const KCmdLineOptions*, const char*, const char*);
-                         ~KCmdLineArgs ();
-
-public:
-
-%If (  - KDE_3_1_3 )
-    QValueList<QCString> getOptionList (const char*);
-%End
-
-
-};  // class KCmdLineArgs
-
diff --git a/sip/kdecore/kcompletion.sip b/sip/kdecore/kcompletion.sip
deleted file mode 100644
index 268480d..0000000
--- a/sip/kdecore/kcompletion.sip
+++ /dev/null
@@ -1,227 +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 tdecore  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.
-
-
-class KCompletion : QObject
-{
-%TypeHeaderCode
-#include <kcompletion.h>
-%End
-
-
-public:
-
-    enum CompOrder
-    {
-        Sorted, 
-        Insertion, 
-        Weighted
-    };
-
-                         KCompletion ();
-    virtual QString      makeCompletion (const QString&);
-    QStringList          substringCompletion (const QString&) const;
-    QString              previousMatch ();
-    QString              nextMatch ();
-    virtual const QString& lastMatch () const;
-    QStringList          items () const;
-
-%If ( KDE_3_3_0 -  )
-    bool                 isEmpty () const;
-%End
-
-    virtual void         setCompletionMode (KGlobalSettings::Completion);
-    KGlobalSettings::Completion completionMode () const;
-    virtual void         setOrder (KCompletion::CompOrder);
-    CompOrder            order () const;
-    virtual void         setIgnoreCase (bool);
-    bool                 ignoreCase () const;
-    QStringList          allMatches ();
-    QStringList          allMatches (const QString&);
-//ig     KCompletionMatches   allWeightedMatches ();
-//ig     KCompletionMatches   allWeightedMatches (const QString&);
-    virtual void         setEnableSounds (bool);
-    bool                 isSoundsEnabled () const;
-    bool                 hasMultipleMatches () const;
-    void                 enableSounds ();
-    void                 disableSounds ();
-
-public slots:
-    void                 slotMakeCompletion (const QString&);
-    void                 slotPreviousMatch ();
-    void                 slotNextMatch ();
-    void                 insertItems (const QStringList&);
-    virtual void         setItems (const QStringList&);
-    void                 addItem (const QString&);
-    void                 addItem (const QString&, uint);
-    void                 removeItem (const QString&);
-    virtual void         clear ();
-
-signals:
-    void                 match (const QString&);
-    void                 matches (const QStringList&);
-    void                 multipleMatches ();
-
-protected:
-    virtual void         postProcessMatch (QString*);
-    virtual void         postProcessMatches (QStringList*);
-//ig     virtual void         postProcessMatches (KCompletionMatches*) const;
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KCompletion
-
-
-//ig class KCompletionMatches : KCompletionMatchesList;
-
-
-class KCompletionBase
-{
-%TypeHeaderCode
-#include <kcompletion.h>
-%End
-
-
-public:
-
-    enum KeyBindingType
-    {
-        TextCompletion, 
-        PrevCompletionMatch, 
-        NextCompletionMatch, 
-        SubstringCompletion
-    };
-
-    typedef QMap<KCompletionBase::KeyBindingType,KShortcut> KeyBindingMap;
-                         KCompletionBase ();
-    KCompletion*         completionObject (bool = 1);
-    virtual void         setCompletionObject (KCompletion*, bool = 1);
-    virtual void         setHandleSignals (bool);
-    bool                 isCompletionObjectAutoDeleted () const;
-    void                 setAutoDeleteCompletionObject (bool);
-    void                 setEnableSignals (bool);
-    bool                 handleSignals () const;
-    bool                 emitSignals () const;
-    virtual void         setCompletionMode (KGlobalSettings::Completion);
-    KGlobalSettings::Completion completionMode () const;
-    bool                 setKeyBinding (KCompletionBase::KeyBindingType, const KShortcut&);
-    const KShortcut&     getKeyBinding (KCompletionBase::KeyBindingType) const;
-    void                 useGlobalKeyBindings ();
-    virtual void         setCompletedText (const QString&)  = 0;
-    virtual void         setCompletedItems (const QStringList&)  = 0;
-    KCompletion*         compObj () const;
-
-protected:
-    KCompletionBase::KeyBindingMap getKeyBindings () const;
-    void                 setDelegate (KCompletionBase*);
-    KCompletionBase*     delegate () const;
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KCompletionBase
-
-//ig typedef KSortableValueList<QString> KCompletionMatchesList;
-
-
-%MappedType KCompletionBase::KeyBindingMap
-//converts a Python dict of int:KShortcut
-{
-%TypeHeaderCode
-#include <kcompletion.h>
-%End
-%ConvertFromTypeCode
-
-    if (!sipCpp)
-        return PyDict_New();
-
-    PyObject *dict;
-
-    // Create the dictionary.
-
-    if ((dict = PyDict_New()) == NULL)
-        return NULL;
-
-    // Get it.
-
-    const QMap<KCompletionBase::KeyBindingType,KShortcut> map = *sipCpp;
-    QMap<KCompletionBase::KeyBindingType,KShortcut>::ConstIterator it;
-
-    PyObject *key;
-    PyObject *value;
-
-    for (it = map.begin (); it != map.end (); ++it)
-    {
-        key   = PyInt_FromLong ((int) it.key ());
-        value = sipConvertFromInstance ((void *)&(it.data ()), sipClass_KShortcut, sipTransferObj);
-        if ((value == NULL) || (PyDict_SetItem (dict, key, value) < 0))
-        {
-            Py_XDECREF (key);
-            Py_XDECREF (value);
-            Py_DECREF (dict);
-            return NULL;
-        }
-    }
-
-
-    return dict;
-%End
-
-
-%ConvertToTypeCode
-    // Convert a Python dictionary to a KeyBindingMap on the heap.
-
-    if (sipIsErr == NULL)
-        return PyDict_Check(sipPy);
-
-    QMap<KCompletionBase::KeyBindingType,KShortcut> *kbmap = new QMap<KCompletionBase::KeyBindingType,KShortcut>;
-
-    PyObject *key, *value;
-    SIP_SSIZE_T pos = 0;
-    KShortcut *cValue;
-    int iserr;
-
-    while (PyDict_Next(sipPy, &pos, &key, &value))
-    {
-        cValue = (KShortcut *)sipForceConvertToType(value, sipType_KShortcut, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr || !PyInt_Check (key))
-        {
-            *sipIsErr = 1;
-            delete kbmap;
-            return 0;
-        }
-
-        kbmap->insert ((KCompletionBase::KeyBindingType)PyInt_AS_LONG (key), *cValue);
-    }
-
-    *sipCppPtr = kbmap;
-
-    return 1;
-%End
-};
-
-
diff --git a/sip/kdecore/kconfig.sip b/sip/kdecore/kconfig.sip
deleted file mode 100644
index ed09152..0000000
--- a/sip/kdecore/kconfig.sip
+++ /dev/null
@@ -1,238 +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 tdecore  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.
-
-
-class KConfig : KConfigBase
-{
-%TypeHeaderCode
-#include <kconfig.h>
-%End
-
-
-public:
-                         KConfig (const QString& = QString ::null , bool = 0, bool = 1, const char* = "config");
-
-%If ( KDE_3_2_0 -  )
-                         KConfig (KConfigBackEnd*, bool = 0);
-%End
-
-    virtual void         rollback (bool = 1);
-    virtual QStringList  groupList () const;
-    virtual QMap<QString,QString> entryMap (const QString&) const;
-    virtual void         reparseConfiguration ();
-    void                 setFileWriteMode (int);
-    void                 setForceGlobal (bool);
-    bool                 forceGlobal () const;
-
-%If ( KDE_3_1_0 -  )
-    void                 checkUpdate (const QString&, const QString&);
-
-%If ( KDE_3_2_0 -  )
-    KConfig*             copyTo (const QString&, KConfig* = 0) const;
-
-%If ( KDE_3_3_0 -  )
-    KLockFile::Ptr       lockFile (bool = 0);
-%End
-
-%End
-
-%End
-
-
-protected:
-    virtual bool         internalHasGroup (const QCString&) const;
-    virtual KEntryMap    internalEntryMap (const QString&) const;
-    virtual KEntryMap    internalEntryMap () const;
-    virtual void         putData (const KEntryKey&, const KEntry&, bool = 1);
-    virtual KEntry       lookupData (const KEntryKey&) const;
-
-private:
-                         KConfig (const KConfig&);
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KConfig
-
-
-%If ( KDE_3_2_0 -  )
-
-class KSharedConfig : KConfig, KShared
-{
-%TypeHeaderCode
-#include <kconfig.h>
-%End
-
-
-public:
-//ig     typedef KSharedPtr<KSharedConfig> Ptr;
-
-public:
-    static KSharedConfig::Ptr openConfig (const QString&, bool = 0, bool = 1);
-
-private:
-                         KSharedConfig (const QString&, bool, bool);
-                         ~KSharedConfig ();
-
-};  // class KSharedConfig
-
-%End
-
-
-
-%MappedType QMap<QString,QString>
-//converts a Python dict of QString:QString
-{
-%TypeHeaderCode
-#include <qmap.h>
-%End
-
-%ConvertFromTypeCode
-    // Convert to a Python dict
-
-    if (!sipCpp)
-        return PyDict_New();
-
-    PyObject *dict;
-
-    // Create the dictionary.
-
-    if ((dict = PyDict_New()) == NULL)
-        return NULL;
-
-    // Get it.
-
-    const QMap<QString,QString> cppmap = *sipCpp;
-    QMap<QString,QString>::ConstIterator it;
-
-    for (it = cppmap.begin (); it != cppmap.end (); ++it)
-    {
-        QString acpp = it.key ();
-        QString bcpp = it.data ();
-        PyObject *ainst;
-        PyObject *binst = NULL;
-        if (((ainst = sipConvertFromNewType(new QString(acpp), sipType_QString, sipTransferObj)) == NULL)
-            || ((binst = sipConvertFromNewType(new QString(bcpp), sipType_QString, sipTransferObj)) == NULL)
-            || (PyDict_SetItem (dict, ainst, binst) < 0))
-        {
-            Py_XDECREF (ainst);
-            Py_XDECREF (binst);
-            Py_DECREF (dict);
-            return NULL;
-        }
-    }
-
-    return dict;
-%End
-
-
-%ConvertToTypeCode
-    // Convert a Python dictionary to a QMap on the heap.
-
-    if (sipIsErr == NULL)
-        return PyDict_Check(sipPy);
-
-    QMap<QString,QString> *cppmap = new QMap<QString,QString>;
-
-    PyObject *aelem, *belem;
-    SIP_SSIZE_T pos = 0;
-    QString *acpp;
-    QString *bcpp;
-
-    while (PyDict_Next(sipPy, &pos, &aelem, &belem))
-    {
-        int iserr = 0, acpp_state, bcpp_state;
-
-        acpp = (QString *)sipForceConvertToType(aelem, sipType_QString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
-        bcpp = (QString *)sipForceConvertToType(belem, sipType_QString, sipTransferObj, SIP_NOT_NONE, &bcpp_state, &iserr);
-
-        if (iserr)
-        {
-            if (acpp)
-                sipReleaseType(acpp, sipType_QString, acpp_state);
-
-            *sipIsErr = 1;
-            delete cppmap;
-            return 0;
-        }
-
-        cppmap->insert (*acpp, *bcpp);
-
-        sipReleaseType(acpp, sipType_QString, acpp_state);
-        sipReleaseType(bcpp, sipType_QString, bcpp_state);
-    }
-
-    *sipCppPtr = cppmap;
-
-    return 1;
-%End
-};
-
-
-%If (KDE_3_2_0 - )
-%MappedType KSharedConfig::Ptr
-//converts KSharedConfig
-{
-%TypeHeaderCode
-#include <ksharedptr.h>
-#include <kconfig.h>
-%End
-
-%ConvertFromTypeCode
-    // Convert to a Python instance
-
-    if (!sipCpp)
-        return NULL;
-
-    KSharedPtr<KSharedConfig> *cPtr = new KSharedPtr<KSharedConfig> (*(KSharedPtr<KSharedConfig> *)sipCpp);
-    KSharedConfig *cpp = cPtr->data ();
-    PyObject *obj = sipConvertFromInstance (cpp, sipClass_KSharedConfig, sipTransferObj);
-
-    return obj;
-%End
-
-%ConvertToTypeCode
-    // Convert a Python instance to a Ptr on the heap.
-
-    if (sipIsErr == NULL)
-        return PyInstance_Check(sipPy);
-
-    int iserr = 0;
-    KSharedConfig *cpp = (KSharedConfig *)sipForceConvertToType(sipPy, sipType_KSharedConfig, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
-
-    if (iserr)
-    {
-        *sipIsErr = 1;
-        return 0;
-    }
-
-    *sipCppPtr = new KSharedPtr<KSharedConfig> (cpp);
-
-    return 1;
-%End
-};
-%End
-
-
diff --git a/sip/kdecore/kconfigbackend.sip b/sip/kdecore/kconfigbackend.sip
deleted file mode 100644
index ca10d9e..0000000
--- a/sip/kdecore/kconfigbackend.sip
+++ /dev/null
@@ -1,93 +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 tdecore  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.
-
-
-class KConfigBackEnd
-{
-%TypeHeaderCode
-#include <kconfigbackend.h>
-%End
-
-
-public:
-                         KConfigBackEnd (KConfigBase*, const QString&, const char*, bool);
-    virtual bool         parseConfigFiles ()  = 0;
-    virtual void         sync (bool = 1)  = 0;
-    void                 changeFileName (const QString&, const char*, bool);
-    virtual KConfigBase::ConfigState getConfigState () const;
-    QString              fileName () const;
-    const char*          resource () const;
-    void                 setLocaleString (const QCString&);
-    void                 setFileWriteMode (int);
-
-%If ( KDE_3_2_0 -  )
-    bool                 checkConfigFilesWritable (bool);
-
-%If ( KDE_3_3_0 -  )
-    KLockFile::Ptr       lockFile (bool = 0);
-%End
-
-%End
-
-    QString              filename () const;
-
-protected:
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-protected:
-
-};  // class KConfigBackEnd
-
-
-class KConfigINIBackEnd : KConfigBackEnd
-{
-%TypeHeaderCode
-#include <kconfigdata.h>
-#include <kconfigbackend.h>
-%End
-
-
-public:
-                         KConfigINIBackEnd (KConfigBase*, const QString&, const char*, bool = 1);
-    bool                 parseConfigFiles ();
-    virtual void         sync (bool = 1);
-
-protected:
-    void                 parseSingleConfigFile (QFile&, KEntryMap* = 0, bool = 0, bool = 0);
-    bool                 writeConfigFile (QString, bool = 0, bool = 1);
-
-%If ( KDE_3_2_0 -  )
-    bool                 getEntryMap (KEntryMap&, bool, QFile*);
-//ig     void                 writeEntries (FILE*, const KEntryMap&);
-%End
-
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KConfigINIBackEnd
-
diff --git a/sip/kdecore/kconfigbase.sip b/sip/kdecore/kconfigbase.sip
deleted file mode 100644
index cde14d9..0000000
--- a/sip/kdecore/kconfigbase.sip
+++ /dev/null
@@ -1,333 +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 tdecore  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
-typedef long long longlong;
-typedef unsigned long long ulonglong;
-%End
-
-
-class KConfigBase : QObject
-{
-%TypeHeaderCode
-#include <kconfigbase.h>
-%End
-
-
-public:
-                         KConfigBase ();
-    void                 setGroup (const QString&);
-    void                 setDesktopGroup ();
-    QString              group () const;
-    bool                 hasGroup (const QString&) const;
-    virtual QStringList  groupList () const = 0;
-    QString              locale () const;
-    QString              readEntry (const QString&, const QString& = QString ::null ) const;
-    QString              readEntry (const char*, const QString& = QString ::null ) const;
-    QVariant             readPropertyEntry (const QString&, QVariant::Type) const;
-    QVariant             readPropertyEntry (const char*, QVariant::Type) const;
-    QVariant             readPropertyEntry (const QString&, const QVariant&) const;
-    QVariant             readPropertyEntry (const char*, const QVariant&) const;
-    int                  readListEntry (const QString&, QStrList&, char = ',') const;
-    int                  readListEntry (const char*, QStrList&, char = ',') const;
-    QStringList          readListEntry (const QString&, char = ',') const;
-    QStringList          readListEntry (const char*, char = ',') const;
-
-%If ( KDE_3_3_0 -  )
-    QStringList          readListEntry (const char*, const QStringList&, char = ',') const;
-%End
-
-    QValueList<int>      readIntListEntry (const QString&) const;
-    QValueList<int>      readIntListEntry (const char*) const;
-    QString              readPathEntry (const QString&, const QString& = QString ::null ) const;
-    QString              readPathEntry (const char*, const QString& = QString ::null ) const;
-
-%If ( KDE_3_1_3 -  )
-    QStringList          readPathListEntry (const QString&, char = ',') const;
-    QStringList          readPathListEntry (const char*, char = ',') const;
-%End
-
-    int                  readNumEntry (const QString&, int = 0) const;
-    int                  readNumEntry (const char*, int = 0) const;
-    uint                 readUnsignedNumEntry (const QString&, uint = 0) const;
-    uint                 readUnsignedNumEntry (const char*, uint = 0) const;
-    long                 readLongNumEntry (const QString&, long = 0) const;
-    long                 readLongNumEntry (const char*, long = 0) const;
-    ulong                readUnsignedLongNumEntry (const QString&, ulong = 0) const;
-    ulong                readUnsignedLongNumEntry (const char*, ulong = 0) const;
-
-%If ( KDE_3_2_0 -  )
-    longlong             readNum64Entry (const QString&, longlong = 0) const;
-    longlong             readNum64Entry (const char*, longlong = 0) const;
-    ulonglong            readUnsignedNum64Entry (const QString&, ulonglong = 0) const;
-    ulonglong            readUnsignedNum64Entry (const char*, ulonglong = 0) const;
-%End
-
-    double               readDoubleNumEntry (const QString&, double = 0.0) const;
-    double               readDoubleNumEntry (const char*, double = 0.0) const;
-    QFont                readFontEntry (const QString&, const QFont* = 0) const;
-    QFont                readFontEntry (const char*, const QFont* = 0) const;
-    bool                 readBoolEntry (const QString&, const bool = 0) const;
-    bool                 readBoolEntry (const char*, const bool = 0) const;
-    QRect                readRectEntry (const QString&, const QRect* = 0) const;
-    QRect                readRectEntry (const char*, const QRect* = 0) const;
-    QPoint               readPointEntry (const QString&, const QPoint* = 0) const;
-    QPoint               readPointEntry (const char*, const QPoint* = 0) const;
-    QSize                readSizeEntry (const QString&, const QSize* = 0) const;
-    QSize                readSizeEntry (const char*, const QSize* = 0) const;
-    QColor               readColorEntry (const QString&, const QColor* = 0) const;
-    QColor               readColorEntry (const char*, const QColor* = 0) const;
-    QDateTime            readDateTimeEntry (const QString&, const QDateTime* = 0) const;
-    QDateTime            readDateTimeEntry (const char*, const QDateTime* = 0) const;
-    QString              readEntryUntranslated (const QString&, const QString& = QString ::null ) const;
-    QString              readEntryUntranslated (const char*, const QString& = QString ::null ) const;
-    void                 writeEntry (const QString&, const QString&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, const QString&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const QString&, const QVariant&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, const QVariant&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const QString&, const QStrList&, char = ',', bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, const QStrList&, char = ',', bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const QString&, const QStringList&, char = ',', bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, const QStringList&, char = ',', bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const QString&, const QValueList<int>&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, const QValueList<int>&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const QString&, const char*, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, const char*, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const QString&, int, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, int, bool = 1, bool = 0, bool = 0);
-
-%If ( KDE_3_2_0 -  )
-    void                 writeEntry (const QString&, longlong, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, longlong, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const QString&, ulonglong, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, ulonglong, bool = 1, bool = 0, bool = 0);
-%End
-
-//ig     void                 writeEntry (const QString&, double, bool = 1, bool = 0, char = 'g', int = 6, bool = 0);
-//ig     void                 writeEntry (const char*, double, bool = 1, bool = 0, char = 'g', int = 6, bool = 0);
-    void                 writeEntry (const QString&, const QFont&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, const QFont&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const QString&, const QColor&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, const QColor&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const QString&, const QDateTime&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, const QDateTime&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const QString&, const QRect&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, const QRect&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const QString&, const QPoint&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, const QPoint&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const QString&, const QSize&, bool = 1, bool = 0, bool = 0);
-    void                 writeEntry (const char*, const QSize&, bool = 1, bool = 0, bool = 0);
-    void                 writePathEntry (const QString&, const QString&, bool = 1, bool = 0, bool = 0);
-    void                 writePathEntry (const char*, const QString&, bool = 1, bool = 0, bool = 0);
-
-%If ( KDE_3_1_3 -  )
-    void                 writePathEntry (const QString&, const QStringList&, char = ',', bool = 1, bool = 0, bool = 0);
-    void                 writePathEntry (const char*, const QStringList&, char = ',', bool = 1, bool = 0, bool = 0);
-%End
-
-    void                 deleteEntry (const QString&, bool = 0, bool = 0);
-    void                 deleteEntry (const char*, bool = 0, bool = 0);
-    bool                 deleteGroup (const QString&, bool = 1, bool = 0);
-    void                 setDollarExpansion (bool = 1);
-    bool                 isDollarExpansion () const;
-    virtual void         rollback (bool = 1);
-    virtual void         sync ();
-    bool                 isDirty () const;
-    virtual void         setReadOnly (bool);
-    bool                 isReadOnly () const;
-    bool                 hasKey (const QString&) const;
-    virtual QMap<QString,QString> entryMap (const QString&) const = 0;
-    virtual void         reparseConfiguration ()  = 0;
-    bool                 isImmutable () const;
-    bool                 groupIsImmutable (const QString&) const;
-    bool                 entryIsImmutable (const QString&) const;
-
-    enum ConfigState
-    {
-        NoAccess, 
-        ReadOnly, 
-        ReadWrite
-    };
-
-    ConfigState          getConfigState () const;
-
-%If ( KDE_3_2_0 -  )
-    bool                 checkConfigFilesWritable (bool);
-    void                 setReadDefaults (bool);
-    bool                 readDefaults () const;
-    void                 revertToDefault (const QString&);
-    bool                 hasDefault (const QString&) const;
-%End
-
-
-protected:
-    void                 setLocale ();
-    virtual void         setDirty (bool = 1);
-    virtual void         parseConfigFiles ();
-    virtual KEntryMap    internalEntryMap (const QString&) const = 0;
-    virtual KEntryMap    internalEntryMap () const = 0;
-    virtual void         putData (const KEntryKey&, const KEntry&, bool = 1)  = 0;
-    virtual KEntry       lookupData (const KEntryKey&) const = 0;
-    virtual bool         internalHasGroup (const QCString&) const = 0;
-
-public:
-    void                 setGroup (const QCString&);
-    void                 setGroup (const char*);
-    bool                 hasGroup (const QCString&) const;
-    bool                 hasGroup (const char*) const;
-    bool                 hasKey (const char*) const;
-
-protected:
-    QCString             readEntryUtf8 (const char*) const;
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KConfigBase
-
-
-class KConfigGroupSaver
-{
-%TypeHeaderCode
-#include <kconfigbase.h>
-%End
-
-
-public:
-                         KConfigGroupSaver (KConfigBase*, QString);
-                         KConfigGroupSaver (KConfigBase*, const char*);
-                         KConfigGroupSaver (KConfigBase*, const QCString&);
-    KConfigBase*         config ();
-
-private:
-                         KConfigGroupSaver (const KConfigGroupSaver&);
-
-};  // class KConfigGroupSaver
-
-
-class KConfigGroup : KConfigBase
-{
-%TypeHeaderCode
-#include <kconfigbase.h>
-%End
-
-
-public:
-                         KConfigGroup (KConfigBase*, const QCString&);
-                         KConfigGroup (KConfigBase*, const QString&);
-                         KConfigGroup (KConfigBase*, const char*);
-    void                 deleteGroup (bool = 0);
-
-%If ( KDE_3_4_0 -  )
-    bool                 groupIsImmutable () const;
-%End
-
-    virtual void         setDirty (bool);
-    virtual void         putData (const KEntryKey&, const KEntry&, bool = 1);
-    virtual KEntry       lookupData (const KEntryKey&) const;
-    virtual void         sync ();
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KConfigGroup
-
-
-
-%MappedType longlong
-//converts a Python long
-{
-%TypeHeaderCode
-#if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 3
-#define LONG_LONG  PY_LONG_LONG
-#endif
-%End
-%ConvertFromTypeCode
-    if (!sipCpp)
-        Py_INCREF (Py_None);
-        return Py_None;
-
-//    PyObject *LongLong;
-
-    return PyLong_FromLongLong (*(LONG_LONG *)sipCpp);
-%End
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyLong_Check (sipPy) || PyInt_Check (sipPy);
-
-    long long *ll = new long long;
-    *ll = 0;
-
-    if (PyLong_Check (sipPy))
-        *ll = PyLong_AsLongLong (sipPy);
-    else if (PyInt_Check (sipPy))
-        *ll = (long long)PyInt_AS_LONG (sipPy);
-
-    *sipCppPtr = ll;
-
-    return 1;
-%End
-
-};
-
-
-%MappedType ulonglong
-//converts a Python long
-{
-%TypeHeaderCode
-#if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 3
-#define LONG_LONG  PY_LONG_LONG
-#endif
-%End
-%ConvertFromTypeCode
-    if (!sipCpp)
-        Py_INCREF (Py_None);
-        return Py_None;
-
-    return PyLong_FromUnsignedLongLong (*(LONG_LONG *)sipCpp);
-%End
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyLong_Check (sipPy) || PyInt_Check (sipPy);
-
-    unsigned long long *ul = new unsigned long long;
-    *ul = 0;
-
-    if (PyLong_Check (sipPy))
-        *ul = PyLong_AsUnsignedLongLong (sipPy);
-    else if (PyInt_Check (sipPy))
-        *ul = (unsigned long long)PyInt_AS_LONG (sipPy);
-
-    *sipCppPtr = ul;
-
-    return 1;
-%End
-
-};
-
-
diff --git a/sip/kdecore/kconfigdata.sip b/sip/kdecore/kconfigdata.sip
deleted file mode 100644
index b22ef03..0000000
--- a/sip/kdecore/kconfigdata.sip
+++ /dev/null
@@ -1,172 +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 tdecore  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.
-
-
-class KEntry
-{
-%TypeHeaderCode
-#include <kconfigdata.h>
-%End
-
-
-public:
-                         KEntry ();
-    QCString             mValue;
-    bool                 bDirty;
-    bool                 bNLS;
-    bool                 bGlobal;
-    bool                 bImmutable;
-    bool                 bDeleted;
-
-%If ( KDE_3_1_0 -  )
-    bool                 bExpand;
-%End
-
-
-};  // class KEntry
-
-
-class KEntryKey
-{
-%TypeHeaderCode
-#include <kconfigdata.h>
-%End
-
-
-public:
-                         KEntryKey (const QCString& = QCString ("" ), const QCString& = QCString ("" ));
-    QCString             mGroup;
-    QCString             mKey;
-    bool                 bLocal;
-    bool                 bDefault;
-    const char*          c_key;
-
-};  // class KEntryKey
-
-//ig typedef QMap<KEntryKey,KEntry>::Iterator KEntryMapIterator;
-//ig typedef QMap<KEntryKey,KEntry>::ConstIterator KEntryMapConstIterator;
-//force
-KEntryMap            testKEntryMap (SIP_PYOBJECT) [KEntryMap (KEntryMap)];
-%MethodCode
-//takes dict | (KEntryMap)
-//returns (QMap<KEntryKey,KEntry)
-
-    int isErr = 0;
-    KEntryMap *map = (KEntryMap *)sipForceConvertToType(a0, sipType_KEntryMap, NULL, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &isErr);
-
-    if (isErr)
-        sipRes = NULL;
-    else
-        sipRes = map;
-%End
-
-//end
-
-
-%MappedType KEntryMap
-//converts a Python dict of KEntryKey:KEntry
-{
-%TypeHeaderCode
-#include <qmap.h>
-#include <kconfigdata.h>
-%End
-
-%ConvertFromTypeCode
-    // Convert to a Python dict
-
-    if (!sipCpp)
-        return PyDict_New();
-
-    PyObject *dict;
-
-    // Create the dictionary.
-
-    if ((dict = PyDict_New()) == NULL)
-        return NULL;
-
-    // Get it.
-
-    const KEntryMap cppmap = *sipCpp;
-    KEntryMap::ConstIterator it;
-
-    for (it = cppmap.begin (); it != cppmap.end (); ++it)
-    {
-        KEntryKey acpp = it.key ();
-        KEntry bcpp = it.data ();
-        PyObject *ainst;
-        PyObject *binst = NULL;
-        if (((ainst = sipConvertFromNewType(new KEntryKey(acpp), sipType_KEntryKey, NULL)) == NULL)
-            || ((binst = sipConvertFromNewType(new KEntry(bcpp), sipType_KEntry, NULL)) == NULL)
-            || (PyDict_SetItem (dict, ainst, binst) < 0))
-        {
-            Py_XDECREF (ainst);
-            Py_XDECREF (binst);
-            Py_DECREF (dict);
-            return NULL;
-        }
-    }
-
-    return dict;
-%End
-
-
-%ConvertToTypeCode
-    // Convert a Python dictionary to a QMap on the heap.
-
-    if (sipIsErr == NULL)
-        return PyDict_Check(sipPy);
-
-
-    KEntryMap *cppmap = new KEntryMap;
-
-    PyObject *aelem, *belem;
-    SIP_SSIZE_T pos = 0;
-    KEntryKey *acpp;
-    KEntry *bcpp;
-
-    while (PyDict_Next(sipPy, &pos, &aelem, &belem))
-    {
-        int iserr = 0;
-
-        acpp = (KEntryKey *)sipForceConvertToType(aelem, sipType_KEntryKey, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-        bcpp = (KEntry *)sipForceConvertToType(belem, sipType_KEntry, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cppmap;
-            return 0;
-        }
-
-        cppmap->insert (*acpp, *bcpp);
-    }
-
-    *sipCppPtr = cppmap;
-
-    return 1;
-%End
-};
-
-
diff --git a/sip/kdecore/kconfigdialogmanager.sip b/sip/kdecore/kconfigdialogmanager.sip
deleted file mode 100644
index 5c97582..0000000
--- a/sip/kdecore/kconfigdialogmanager.sip
+++ /dev/null
@@ -1,64 +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 tdecore  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 -  )
-
-class KConfigDialogManager : QObject
-{
-%TypeHeaderCode
-#include <kconfigdialogmanager.h>
-%End
-
-
-signals:
-    void                 settingsChanged ();
-    void                 settingsChanged (QWidget*);
-    void                 widgetModified ();
-
-public:
-                         KConfigDialogManager (QWidget* /TransferThis/, KConfigSkeleton*, const char* = 0);
-    void                 addWidget (QWidget*);
-    bool                 hasChanged ();
-    bool                 isDefault ();
-
-public slots:
-    void                 updateSettings ();
-    void                 updateWidgets ();
-    void                 updateWidgetsDefault ();
-
-protected:
-    void                 init (bool);
-    bool                 parseChildren (const QWidget*, bool);
-    void                 setProperty (QWidget*, const QVariant&);
-    QVariant             property (QWidget*);
-    void                 setupWidget (QWidget*, KConfigSkeletonItem*);
-
-protected:
-
-};  // class KConfigDialogManager
-
-%End
-
diff --git a/sip/kdecore/kconfigskeleton.sip b/sip/kdecore/kconfigskeleton.sip
deleted file mode 100644
index 638f5f5..0000000
--- a/sip/kdecore/kconfigskeleton.sip
+++ /dev/null
@@ -1,1146 +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 tdecore  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 -  )
-
-class KConfigSkeletonItem
-{
-%TypeHeaderCode
-#include <typeinfo>
-#include <kconfigskeleton.h>
-%End
-
-
-public:
-    typedef QValueList<KConfigSkeletonItem*> List;
-//ig     typedef QDict<KConfigSkeletonItem> Dict;
-//ig     typedef QDictIterator<KConfigSkeletonItem> DictIterator;
-                         KConfigSkeletonItem (const QString&, const QString&);
-    void                 setGroup (const QString&);
-    QString              group () const;
-    void                 setKey (const QString&);
-    QString              key () const;
-    void                 setName (const QString&);
-    QString              name () const;
-    void                 setLabel (const QString&);
-    QString              label () const;
-    void                 setWhatsThis (const QString&);
-    QString              whatsThis () const;
-    virtual void         readConfig (KConfig*)  = 0;
-    virtual void         writeConfig (KConfig*)  = 0;
-    virtual void         readDefault (KConfig*)  = 0;
-    virtual void         setProperty (const QVariant&)  = 0;
-    virtual QVariant     property () const = 0;
-    virtual QVariant     minValue () const;
-    virtual QVariant     maxValue () const;
-    virtual void         setDefault ()  = 0;
-    virtual void         swapDefault ()  = 0;
-    bool                 isImmutable () const;
-
-protected:
-    void                 readImmutability (KConfig*);
-
-//force
-%ConvertToSubClassCode
-    if (dynamic_cast<KConfigSkeleton::ItemBool*>(sipCpp))
-        sipClass =  sipClass_KConfigSkeleton_ItemBool;
-    else if (dynamic_cast<KConfigSkeleton::ItemColor*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemColor;
-    else if (dynamic_cast<KConfigSkeleton::ItemDateTime*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemDateTime;
-    else if (dynamic_cast<KConfigSkeleton::ItemDouble*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemDouble;
-    else if (dynamic_cast<KConfigSkeleton::ItemEnum*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemEnum;
-    else if (dynamic_cast<KConfigSkeleton::ItemFont*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemFont;
-    else if (dynamic_cast<KConfigSkeleton::ItemInt*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemInt;
-    else if (dynamic_cast<KConfigSkeleton::ItemInt64*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemInt64;
-    else if (dynamic_cast<KConfigSkeleton::ItemIntList*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemIntList;
-    else if (dynamic_cast<KConfigSkeleton::ItemLong*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemLong;
-    else if (dynamic_cast<KConfigSkeleton::ItemPassword*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemPassword;
-    else if (dynamic_cast<KConfigSkeleton::ItemPath*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemPath;
-    else if (dynamic_cast<KConfigSkeleton::ItemPoint*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemPoint;
-    else if (dynamic_cast<KConfigSkeleton::ItemProperty*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemProperty;
-    else if (dynamic_cast<KConfigSkeleton::ItemRect*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemRect;
-    else if (dynamic_cast<KConfigSkeleton::ItemSize*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemSize;
-    else if (dynamic_cast<KConfigSkeleton::ItemString*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemString;
-    else if (dynamic_cast<KConfigSkeleton::ItemStringList*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemStringList;
-    else if (dynamic_cast<KConfigSkeleton::ItemUInt*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemUInt;
-    else if (dynamic_cast<KConfigSkeleton::ItemUInt64*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemUInt64;
-    else if (dynamic_cast<KConfigSkeleton::ItemULong*>(sipCpp))
-        sipClass = sipClass_KConfigSkeleton_ItemULong;
-    else
-        sipClass = NULL;
-%End
-//end
-
-};  // class KConfigSkeletonItem
-
-%End
-
-
-%If ( KDE_3_2_0 -  )
-
-class KConfigSkeleton
-{
-%TypeHeaderCode
-#include <kconfigskeleton.h>
-typedef QValueList<int> IntList;
-%End
-
-
-public:
-
-    class ItemPassword : KConfigSkeleton::ItemString
-    {
-
-    public:
-                             ItemPassword (const QString&, const QString&, QString&, const QString& = QString ::fromLatin1 ("" ));
-
-    };  // class ItemPassword
-
-
-public:
-
-    class ItemPath : KConfigSkeleton::ItemString
-    {
-
-    public:
-                             ItemPath (const QString&, const QString&, QString&, const QString& = QString ::null );
-
-    };  // class ItemPath
-
-
-public:
-
-    class ItemEnum : KConfigSkeleton::ItemInt
-    {
-
-    public:
-
-        class Choice
-        {
-
-        public:
-            QString              name;
-            QString              label;
-            QString              whatsThis;
-
-        };  // class Choice
-
-
-    public:
-                             ItemEnum (const QString&, const QString&, int, const QValueList<KConfigSkeleton::ItemEnum::Choice>&, int = 0) [(const QString&, const QString&, int&, const QValueList<KConfigSkeleton::ItemEnum::Choice>&, int = 0)];
-%MethodCode
-//takes group | (QString) | key | (QString) | reference | (int) | choices | (QValueList<KConfigSkeleton::ItemEnum::Choice>) |defaultValue | (int = 1)
-
-    class PyItemEnum : public KConfigSkeleton::ItemEnum
-    {
-    public:
-        PyItemEnum (const QString& group, const QString& key, int& val, const QValueList<KConfigSkeleton::ItemEnum::Choice>& choices, int defaultValue = 0) :
-            KConfigSkeleton::ItemEnum(group, key, this->value, choices, defaultValue)
-        {
-            value = val;
-        };
-
-    private:
-        int value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp = (sipKConfigSkeleton_ItemEnum *) new PyItemEnum (*a0, *a1, a2, *a3, a4);
-    Py_END_ALLOW_THREADS
-%End
-
-        QValueList<KConfigSkeleton::ItemEnum::Choice> choices () const;
-        void                 readConfig (KConfig*);
-        void                 writeConfig (KConfig*);
-
-    public:
-//force
-        void                 setValue (const int&);
-        int                  value ();
-        virtual void         setDefaultValue (const int&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-//end
-
-    };  // class ItemEnum
-
-
-public:
-
-%If ( KDE_3_4_0 -  )
-
-    class ItemPathList : KConfigSkeleton::ItemStringList
-    {
-
-    public:
-                             ItemPathList (const QString&, const QString&, QStringList&, const QStringList& = QStringList ());
-        void                 readConfig (KConfig*);
-        void                 writeConfig (KConfig*);
-
-    };  // class ItemPathList
-
-
-public:
-%End
-
-
-public:
-                         KConfigSkeleton (const QString& = QString ::null );
-                         KConfigSkeleton (KSharedConfig::Ptr);
-    void                 setDefaults ();
-    void                 readConfig ();
-    void                 writeConfig ();
-    void                 setCurrentGroup (const QString&);
-    QString              currentGroup ();
-    void                 addItem (KConfigSkeletonItem*, const QString& = QString ::null );
-    ItemString*          addItemString (const QString&, QString&, const QString& = QString ::fromLatin1 ("" ), const QString& = QString ::null );
-    KConfigSkeleton::ItemPassword* addItemPassword (const QString&, QString&, const QString& = QString ::fromLatin1 ("" ), const QString& = QString ::null );
-    KConfigSkeleton::ItemPath* addItemPath (const QString&, QString&, const QString& = QString ::fromLatin1 ("" ), const QString& = QString ::null );
-    ItemProperty*        addItemProperty (const QString&, QVariant&, const QVariant& = QVariant (), const QString& = QString ::null );
-    ItemBool*            addItemBool (const QString&, bool&, bool = 0, const QString& = QString ::null );
-%MethodCode
-//takes name | (QString) | value | (bool) | defaultValue | (bool) | key | (QString = QString::null)
-
-    class PyItemBool : public KConfigSkeleton::ItemBool
-    {
-    public:
-        PyItemBool (const QString &group, const QString &key, bool val, bool defaultValue = 0) :
-            KConfigSkeleton::ItemBool (group, key, this->value, defaultValue)
-        {
-            value = val;
-        }
-
-    private:
-        bool value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipRes = new PyItemBool (sipCpp->currentGroup(), a3->isNull() ? *a0 : *a3, a1, a2);
-    sipCpp->addItem(sipRes, *a0);
-    Py_END_ALLOW_THREADS
-%End
-
-    ItemInt*             addItemInt (const QString&, int&, int = 0, const QString& = QString ::null );
-%MethodCode
-//takes name | (QString) | value | (int) | defaultValue | (int) | key | (QString = QString::null)
-
-    class PyItemInt : public KConfigSkeleton::ItemInt
-    {
-    public:
-        PyItemInt(const QString &group, const QString &key, int val, int defaultValue=0) :
-            KConfigSkeleton::ItemInt (group, key, this->value, defaultValue)
-        {
-            value = val;
-        }
-
-    private:
-        int value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipRes = new PyItemInt(sipCpp->currentGroup(), a3->isNull() ? *a0 : *a3, a1, a2);
-    sipCpp->addItem(sipRes, *a0);
-    Py_END_ALLOW_THREADS
-%End
-
-    ItemUInt*            addItemUInt (const QString&, uint&, uint = 0, const QString& = QString ::null );
-%MethodCode
-//takes name | (QString) | value | (uint) | defaultValue | (uint) | key | (QString = QString::null)
-
-    class PyItemUInt : public KConfigSkeleton::ItemUInt
-    {
-    public:
-        PyItemUInt(const QString &group, const QString &key, uint val, uint defaultValue = 0) :
-            KConfigSkeleton::ItemUInt (group, key, this->value, defaultValue)
-        {
-            value = val;
-        }
-
-    private:
-        uint value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipRes = new PyItemUInt(sipCpp->currentGroup(), a3->isNull() ? *a0 : *a3, a1, a2);
-    sipCpp->addItem(sipRes, *a0);
-    Py_END_ALLOW_THREADS
-%End
-
-    ItemLong*            addItemLong (const QString&, long&, long = 0, const QString& = QString ::null );
-%MethodCode
-//takes name | (QString) | value | (long) | defaultValue | (long) | key | (QString = QString::null)
-
-    class PyItemLong : public KConfigSkeleton::ItemLong
-    {
-    public:
-        PyItemLong(const QString &group, const QString &key, long val, long defaultValue=0) :
-            KConfigSkeleton::ItemLong (group, key, this->value, defaultValue)
-        {
-            value = val;
-        }
-
-    private:
-        long value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipRes = new PyItemLong(sipCpp->currentGroup(), a3->isNull() ? *a0 : *a3, a1, a2);
-    sipCpp->addItem(sipRes, *a0);
-    Py_END_ALLOW_THREADS
-%End
-
-    ItemULong*           addItemULong (const QString&, ulong&, ulong = 0, const QString& = QString ::null );
-%MethodCode
-//takes name | (QString) | value | (ulong) | defaultValue | (ulong) | key | (QString = QString::null)
-
-    class PyItemULong : public KConfigSkeleton::ItemULong
-    {
-    public:
-        PyItemULong(const QString &group, const QString &key, ulong val, ulong defaultValue = 0) :
-            KConfigSkeleton::ItemULong (group, key, this->value, defaultValue)
-        {
-            value = val;
-        }
-
-    private:
-        ulong value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipRes = new PyItemULong(sipCpp->currentGroup(), a3->isNull() ? *a0 : *a3, a1, a2);
-    sipCpp->addItem(sipRes, *a0);
-    Py_END_ALLOW_THREADS
-%End
-
-    KConfigSkeleton::ItemInt64* addItemInt64 (const QString&, longlong&, longlong = 0, const QString& = QString ::null );
-    KConfigSkeleton::ItemUInt64* addItemUInt64 (const QString&, ulonglong&, ulonglong = 0, const QString& = QString ::null );
-    ItemDouble*          addItemDouble (const QString&, double&, double = 0.0, const QString& = QString ::null );
-%MethodCode
-//takes name | (QString) | value | (double) | defaultValue | (double) | key | (QString = QString::null)
-
-    class PyItemDouble : public KConfigSkeleton::ItemDouble
-    {
-    public:
-        PyItemDouble(const QString &group, const QString &key, double val, double defaultValue=0.0) :
-            KConfigSkeleton::ItemDouble(group, key, this->value, defaultValue)
-        {
-            value = val;
-        };
-
-    private:
-        double value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipRes = new PyItemDouble(sipCpp->currentGroup(), a3->isNull() ? *a0 : *a3, a1, a2);
-    sipCpp->addItem(sipRes, *a0);
-    Py_END_ALLOW_THREADS
-%End
-
-    ItemColor*           addItemColor (const QString&, QColor&, const QColor& = QColor (128 ,128 ,128 ), const QString& = QString ::null );
-    ItemFont*            addItemFont (const QString&, QFont&, const QFont& = KGlobalSettings ::generalFont (), const QString& = QString ::null );
-    ItemRect*            addItemRect (const QString&, QRect&, const QRect& = QRect (), const QString& = QString ::null );
-    ItemPoint*           addItemPoint (const QString&, QPoint&, const QPoint& = QPoint (), const QString& = QString ::null );
-    ItemSize*            addItemSize (const QString&, QSize&, const QSize& = QSize (), const QString& = QString ::null );
-    ItemDateTime*        addItemDateTime (const QString&, QDateTime&, const QDateTime& = QDateTime (), const QString& = QString ::null );
-    KConfigSkeleton::ItemStringList* addItemStringList (const QString&, QStringList&, const QStringList& = QStringList (), const QString& = QString ::null );
-    KConfigSkeleton::ItemIntList* addItemIntList (const QString&, QValueList<int>&, const QValueList<int>& = IntList (), const QString& = QString ::null );
-%MethodCode
-//returns a Python list of int
-//takes name | (QString) | reference | (a Python list of int) | defaultValue | (a Python list of int = []) | key | (QString = QString::null)
-    if (a2 == NULL) *(QValueList<int> *)a2 = QValueList<int>();
-    Py_BEGIN_ALLOW_THREADS
-    sipRes = sipCpp->addItemIntList (*a0, *a1, *a2, *a3);
-    Py_END_ALLOW_THREADS
-%End
-
-    KConfig*             config () const;
-    SIP_PYLIST           items () const [KConfigSkeletonItem::List ()];
-%MethodCode
-//returns (a Python list of Items)
-
-    KConfigSkeletonItem::List list;
-
-    Py_BEGIN_ALLOW_THREADS
-    list = sipCpp->items ();
-    Py_END_ALLOW_THREADS
-
-    int n = list.count ();
-    if (n > 0)
-        for (int i = 0; i < n; i++)
-            PyList_Append (sipRes, sipConvertFromInstance (&(list [i]), sipClass_KConfigSkeletonItem, NULL));
-%End
-
-    bool                 isImmutable (const QString&);
-    KConfigSkeletonItem* findItem (const QString&);
-    bool                 useDefaults (bool);
-
-protected:
-    virtual void         usrUseDefaults (bool);
-    virtual void         usrSetDefaults ();
-    virtual void         usrReadConfig ();
-    virtual void         usrWriteConfig ();
-
-public:
-//force
-
-    class ItemString : KConfigSkeletonItem
-    {
-
-    public:
-
-        enum Type
-        {
-            Normal, 
-            Password, 
-            Path
-        };
-
-                             ItemString (const QString&, const QString&, QString&, const QString& = QString ::fromLatin1 ("" ), KConfigSkeleton::ItemString::Type = KConfigSkeleton ::ItemString ::Normal );
-        void                 setValue (const QString&);
-        QString&             value ();
-        virtual void         setDefaultValue (const QString&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-
-    };  // class ItemString
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemProperty : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemProperty (const QString&, const QString&, QVariant, QVariant = 0) [(const QString&, const QString&, QVariant&, QVariant = 0)];
-%MethodCode
-//takes group | (QString) | key | (QString) | reference | (QVariant) | defaultValue | (QVariant = 0)
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp = (sipKConfigSkeleton_ItemProperty *) new KConfigSkeleton::ItemProperty (*a0, *a1, *a2, *a3);
-    Py_END_ALLOW_THREADS
-%End
-
-        void                 setValue (const QVariant&);
-        QVariant&            value ();
-        virtual void         setDefaultValue (const QVariant&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-
-    };  // class ItemProperty
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemBool : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemBool (const QString&, const QString&, bool, bool = 1) [(const QString&, const QString&, bool&, bool = 1)];
-%MethodCode
-//takes group | (QString) | key | (QString) | reference | (bool) | defaultValue | (bool = 1)
-
-    class PyItemBool : public KConfigSkeleton::ItemBool
-    {
-    public:
-        PyItemBool(const QString &group, const QString &key, bool val, bool defaultValue = false) :
-            KConfigSkeleton::ItemBool(group, key, this->value, defaultValue)
-        {
-            value = val;
-        };
-
-    private:
-        bool value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp = (sipKConfigSkeleton_ItemBool *) new PyItemBool (*a0, *a1, a2);
-    Py_END_ALLOW_THREADS
-%End
-
-        void                 setValue (const bool&);
-        bool                 value ();
-        virtual void         setDefaultValue (const bool&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-
-    };  // class ItemBool
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemInt : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemInt (const QString&, const QString&, int, int = 1) [(const QString&, const QString&, int&, int = 1)];
-%MethodCode
-//takes group | (QString) | key | (QString) | reference | (int) | defaultValue | (int = 1)
-
-    class PyItemInt : public KConfigSkeleton::ItemInt
-    {
-    public:
-        PyItemInt(const QString &group, const QString &key, int val, int defaultValue = 0) :
-            KConfigSkeleton::ItemInt(group, key, this->value, defaultValue)
-        {
-            value = val;
-        };
-
-    private:
-        int value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp = (sipKConfigSkeleton_ItemInt *) new PyItemInt (*a0, *a1, a2);
-    Py_END_ALLOW_THREADS
-%End
-
-        void                 setValue (const int&);
-        int                  value ();
-        virtual void         setDefaultValue (const int&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-        QVariant             minValue () const;
-        QVariant             maxValue () const;
-        void                 setMinValue (int);
-        void                 setMaxValue (int);
-
-    };  // class ItemInt
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemInt64 : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemInt64 (const QString&, const QString&, longlong&, longlong = 0);
-%MethodCode
-//takes group | (QString) | key | (QString) | reference | (longlong) | defaultValue | (longlong = 0)
-
-    class PyItemInt64 : public KConfigSkeleton::ItemInt64
-    {
-    public:
-        PyItemInt64(const QString &group, const QString &key, Q_INT64 val, Q_INT64 defaultValue=0) :
-            KConfigSkeleton::ItemInt64(group, key, this->value, defaultValue)
-        {
-            value = val;
-        };
-
-    private:
-        Q_INT64 value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp = (sipKConfigSkeleton_ItemInt64 *) new PyItemInt64 (*a0, *a1, *a2, *a3);
-    Py_END_ALLOW_THREADS
-%End
-
-        void                 setValue (const longlong&);
-        longlong&            value ();
-        virtual void         setDefaultValue (const longlong&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-        QVariant             minValue () const;
-        QVariant             maxValue () const;
-        void                 setMinValue (longlong);
-        void                 setMaxValue (longlong);
-
-    };  // class ItemInt64
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemUInt : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemUInt (const QString&, const QString&, uint, uint = 0) [(const QString&, const QString&, uint&, uint = 0)];
-%MethodCode
-//takes group | (QString) | key | (QString) | reference | (uint) | defaultValue | (uint = 1)
-
-    class PyItemUInt : public KConfigSkeleton::ItemUInt
-    {
-    public:
-        PyItemUInt(const QString &group, const QString &key, uint val, uint defaultValue = 0) :
-            KConfigSkeleton::ItemUInt(group, key, this->value, defaultValue)
-        {
-            value = val;
-        };
-
-    private:
-        uint value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp = (sipKConfigSkeleton_ItemUInt *) new PyItemUInt (*a0, *a1, a2);
-    Py_END_ALLOW_THREADS
-%End
-
-        void                 setValue (const uint&);
-        uint                 value ();
-        virtual void         setDefaultValue (const uint&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-        QVariant             minValue () const;
-        QVariant             maxValue () const;
-        void                 setMinValue (uint);
-        void                 setMaxValue (uint);
-
-    };  // class ItemUInt
-
-
-public:
-
-public:
-
-    class ItemLong : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemLong (const QString&, const QString&, long&, long = 0) [(const QString&, const QString&, long&, long = 0)];
-%MethodCode
-//takes group | (QString) | key | (QString) | reference | (long) | defaultValue | (long = 1)
-
-    class PyItemLong : public KConfigSkeleton::ItemLong
-    {
-    public:
-        PyItemLong(const QString &group, const QString &key, long val, long defaultValue = 0) :
-            KConfigSkeleton::ItemLong(group, key, this->value, defaultValue)
-        {
-            value = val;
-        };
-
-    private:
-        long value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp = (sipKConfigSkeleton_ItemLong *) new PyItemLong (*a0, *a1, a2);
-    Py_END_ALLOW_THREADS
-%End
-
-        void                 setValue (const long&);
-        long                 value ();
-        virtual void         setDefaultValue (const long&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-        QVariant             minValue () const;
-        QVariant             maxValue () const;
-        void                 setMinValue (long);
-        void                 setMaxValue (long);
-
-    };  // class ItemLong
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemULong : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemULong (const QString&, const QString&, ulong, ulong = 0) [(const QString&, const QString&, ulong&, ulong = 0)];
-%MethodCode
-//takes group | (QString) | key | (QString) | reference | (ulong) | defaultValue | (ulong = 1)
-
-    class PyItemULong : public KConfigSkeleton::ItemULong
-    {
-    public:
-        PyItemULong(const QString &group, const QString &key, ulong val, ulong defaultValue = 0) :
-            KConfigSkeleton::ItemULong(group, key, this->value, defaultValue)
-        {
-            value = val;
-        };
-
-    private:
-        ulong value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp = (sipKConfigSkeleton_ItemULong *) new PyItemULong (*a0, *a1, a2);
-    Py_END_ALLOW_THREADS
-%End
-
-        void                 setValue (const ulong&);
-        ulong                value ();
-        virtual void         setDefaultValue (const ulong&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-        QVariant             minValue () const;
-        QVariant             maxValue () const;
-        void                 setMinValue (ulong);
-        void                 setMaxValue (ulong);
-
-    };  // class ItemULong
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemUInt64 : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemUInt64 (const QString&, const QString&, ulonglong&, ulonglong = 0);
-%MethodCode
-//takes group | (QString) | key | (QString) | reference | (ulonglong) | defaultValue | (ulonglong = 0)
-
-    class PyItemUInt64 : public KConfigSkeleton::ItemUInt64
-    {
-    public:
-        PyItemUInt64(const QString &group, const QString &key, Q_UINT64 val, Q_UINT64 defaultValue = 0) :
-            KConfigSkeleton::ItemUInt64(group, key, this->value, defaultValue)
-        {
-            value = val;
-        };
-
-    private:
-        Q_UINT64 value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp = (sipKConfigSkeleton_ItemUInt64 *) new PyItemUInt64 (*a0, *a1, *a2, *a3);
-    Py_END_ALLOW_THREADS
-%End
-
-        void                 setValue (const ulonglong&);
-        ulonglong            value ();
-        virtual void         setDefaultValue (const ulonglong&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-        QVariant             minValue () const;
-        QVariant             maxValue () const;
-        void                 setMinValue (ulonglong);
-        void                 setMaxValue (ulonglong);
-
-    };  // class ItemUInt64
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemDouble : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemDouble (const QString&, const QString&, double, double = 0) [(const QString&, const QString&, double&, double = 0)];
-%MethodCode
-//takes group | (QString) | key | (QString) | reference | (double) | defaultValue | (double = 0)
-    class PyItemDouble : public KConfigSkeleton::ItemDouble
-    {
-    public:
-        PyItemDouble(const QString &group, const QString &key, double val, double defaultValue=0.0) :
-            KConfigSkeleton::ItemDouble(group, key, this->value, defaultValue)
-        {
-            value = val;
-        };
-
-    private:
-        double value;
-    };
-
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp = (sipKConfigSkeleton_ItemDouble *) new PyItemDouble (*a0, *a1, a2, a3);
-    Py_END_ALLOW_THREADS
-%End
-
-        void                 setValue (const double&);
-        double               value ();
-        virtual void         setDefaultValue (const double&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-        QVariant             minValue () const;
-        QVariant             maxValue () const;
-        void                 setMinValue (double);
-        void                 setMaxValue (double);
-
-    };  // class ItemDouble
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemColor : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemColor (const QString&, const QString&, QColor&, const QColor& = QColor (128 ,128 ,128 ));
-        void                 setValue (const QColor&);
-        QColor&              value ();
-        virtual void         setDefaultValue (const QColor&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-
-    };  // class ItemColor
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemFont : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemFont (const QString&, const QString&, QFont&, const QFont& = KGlobalSettings ::generalFont ());
-        void                 setValue (const QFont&);
-        QFont&               value ();
-        virtual void         setDefaultValue (const QFont&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-
-    };  // class ItemFont
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemRect : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemRect (const QString&, const QString&, QRect&, const QRect& = QRect ());
-        void                 setValue (const QRect&);
-        QRect&               value ();
-        virtual void         setDefaultValue (const QRect&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-
-    };  // class ItemRect
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemPoint : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemPoint (const QString&, const QString&, QPoint&, const QPoint& = QPoint ());
-        void                 setValue (const QPoint&);
-        QPoint&              value ();
-        virtual void         setDefaultValue (const QPoint&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-
-    };  // class ItemPoint
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemSize : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemSize (const QString&, const QString&, QSize&, const QSize& = QSize ());
-        void                 setValue (const QSize&);
-        QSize&               value ();
-        virtual void         setDefaultValue (const QSize&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-
-    };  // class ItemSize
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemDateTime : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemDateTime (const QString&, const QString&, QDateTime&, const QDateTime& = QDateTime ());
-        void                 setValue (const QDateTime&);
-        QDateTime&           value ();
-        virtual void         setDefaultValue (const QDateTime&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-
-    };  // class ItemDateTime
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemStringList : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemStringList (const QString&, const QString&, QStringList&, const QStringList& = QStringList ());
-        void                 setValue (const QStringList&);
-        QStringList&         value ();
-        virtual void         setDefaultValue (const QStringList&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-
-    };  // class ItemStringList
-
-
-public:
-//end
-
-public:
-//force
-
-    class ItemIntList : KConfigSkeletonItem
-    {
-
-    public:
-                             ItemIntList (const QString&, const QString&, QValueList<int>&, const QValueList<int>& = IntList ());
-%MethodCode
-//takes group | (QString) | key | (QString) | reference | (a Python list of int) | defaultValue | (a Python list of int = 0)
-    if (a3 == NULL) *(QValueList<int> *)a3 = QValueList<int>();
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp = (sipKConfigSkeleton_ItemIntList *) new KConfigSkeleton::ItemIntList (*a0, *a1, *a2, *a3);
-    Py_END_ALLOW_THREADS
-%End
-
-        void                 setValue (const QValueList<int>&);
-        QValueList<int>&     value ();
-        virtual void         setDefaultValue (const QValueList<int>&);
-        virtual void         setDefault ();
-        void                 swapDefault ();
-        void                 writeConfig (KConfig*);
-        void                 readConfig (KConfig*);
-        void                 setProperty (const QVariant&);
-        QVariant             property () const;
-
-    };  // class ItemIntList
-
-
-public:
-//end
-
-};  // class KConfigSkeleton
-
-%End
-
-
-
-%If (KDE_3_2_0 - )
-%MappedType QValueList<KConfigSkeleton::ItemEnum::Choice>
-{
-%TypeHeaderCode
-#include <kconfigskeleton.h>
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    QValueList<KConfigSkeleton::ItemEnum::Choice> *cpplist = (QValueList<KConfigSkeleton::ItemEnum::Choice> *)sipCpp;
-    PyObject *inst;
-
-    // Get it.
-    QValueList<KConfigSkeleton::ItemEnum::Choice>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        if (((inst = sipConvertFromNewType(new KConfigSkeleton::ItemEnum::Choice(*it), sipType_KConfigSkeleton_ItemEnum_Choice, NULL)) == NULL)
-            || PyList_Append (pylist, inst) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    QValueList<KConfigSkeleton::ItemEnum::Choice> *cpplist = new QValueList<KConfigSkeleton::ItemEnum::Choice>;
-
-    PyObject *elem;
-    KConfigSkeleton::ItemEnum::Choice *cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (KConfigSkeleton::ItemEnum::Choice *)sipForceConvertToType(elem, sipType_KConfigSkeleton_ItemEnum_Choice, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (*cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-%End
-
-
diff --git a/sip/kdecore/kcrash.sip b/sip/kdecore/kcrash.sip
deleted file mode 100644
index ebf2252..0000000
--- a/sip/kdecore/kcrash.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 tdecore  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.
-
-
-class KCrash
-{
-%TypeHeaderCode
-#include <kcrash.h>
-%End
-
-
-public:
-    static void          defaultCrashHandler (int);
-//ig     static void          setCrashHandler (HandlerType = defaultCrashHandler );
-//ig     static HandlerType   crashHandler ();
-//ig     static void          setEmergencySaveFunction (HandlerType = 0 );
-//ig     static HandlerType   emergencySaveFunction ();
-
-%If ( KDE_3_2_0 -  )
-    static void          setSafer (bool);
-%End
-
-    static void          setApplicationPath (QString);
-    static void          setApplicationName (QString);
-
-protected:
-
-};  // class KCrash
-
diff --git a/sip/kdecore/kdcoppropertyproxy.sip b/sip/kdecore/kdcoppropertyproxy.sip
deleted file mode 100644
index b6da6be..0000000
--- a/sip/kdecore/kdcoppropertyproxy.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 tdecore  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.
-
-
-class KDCOPPropertyProxy
-{
-%TypeHeaderCode
-#include <kdcoppropertyproxy.h>
-%End
-
-
-public:
-                         KDCOPPropertyProxy (QObject*);
-    bool                 isPropertyRequest (const QCString&);
-    bool                 processPropertyRequest (const QCString&, const QByteArray&, QCString&, QByteArray&);
-    QValueList<QCString> functions ();
-    static QValueList<QCString> functions (QObject*);
-    static bool          isPropertyRequest (const QCString&, QObject*);
-    static bool          processPropertyRequest (const QCString&, const QByteArray&, QCString&, QByteArray&, QObject*);
-
-};  // class KDCOPPropertyProxy
-
diff --git a/sip/kdecore/kdebug.sip b/sip/kdecore/kdebug.sip
deleted file mode 100644
index 19d8ddd..0000000
--- a/sip/kdecore/kdebug.sip
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-//     Copyright 2003 Jim Bublitz <jbublitz@nwinternet.com>
-//     Earlier copyrights 1998 - 2002 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module tdecore  version KDE_3_1_1
-
-
-// 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.
-
-
-class kdbgstream
-{
-%TypeHeaderCode
-#include <kdebug.h>
-%End
-
-
-public:
-                         kdbgstream (uint, uint, bool = 1);
-                         kdbgstream (const char*, uint, uint, bool = 1);
-    void                 flush ();
-//ig     kdbgstream&          form (const char*, ...);
-
-};  // class kdbgstream
-
-
-class kndbgstream
-{
-%TypeHeaderCode
-#include <kdebug.h>
-%End
-
-
-public:
-                         kndbgstream ();
-    void                 flush ();
-//ig     kndbgstream&         form (const char*, ...);
-
-};  // class kndbgstream
-
-//ig void                 kDebugFatal (const char*, ...);
-//ig void                 kDebugFatal (ushort, const char*, ...);
-kdbgstream&          perror (kdbgstream&);
-kdbgstream           kdDebug (int = 0);
-kdbgstream           kdDebug (bool, int = 0);
-kdbgstream           kdWarning (int = 0);
-kdbgstream           kdWarning (bool, int = 0);
-kdbgstream           kdError (int = 0);
-kdbgstream           kdError (bool, int = 0);
-kdbgstream           kdFatal (int = 0);
-kdbgstream           kdFatal (bool, int = 0);
diff --git a/sip/kdecore/kdecore-kde310.diff b/sip/kdecore/kdecore-kde310.diff
deleted file mode 100644
index d87c911..0000000
--- a/sip/kdecore/kdecore-kde310.diff
+++ /dev/null
@@ -1 +0,0 @@
-+ %Include kclipboard.sip
diff --git a/sip/kdecore/kdecore-kde311.diff b/sip/kdecore/kdecore-kde311.diff
deleted file mode 100644
index d87c911..0000000
--- a/sip/kdecore/kdecore-kde311.diff
+++ /dev/null
@@ -1 +0,0 @@
-+ %Include kclipboard.sip
diff --git a/sip/kdecore/kdecore-kde312.diff b/sip/kdecore/kdecore-kde312.diff
deleted file mode 100644
index d87c911..0000000
--- a/sip/kdecore/kdecore-kde312.diff
+++ /dev/null
@@ -1 +0,0 @@
-+ %Include kclipboard.sip
diff --git a/sip/kdecore/kdecore-kde313.diff b/sip/kdecore/kdecore-kde313.diff
deleted file mode 100644
index d87c911..0000000
--- a/sip/kdecore/kdecore-kde313.diff
+++ /dev/null
@@ -1 +0,0 @@
-+ %Include kclipboard.sip
diff --git a/sip/kdecore/kdecore-kde314.diff b/sip/kdecore/kdecore-kde314.diff
deleted file mode 100644
index 13e7719..0000000
--- a/sip/kdecore/kdecore-kde314.diff
+++ /dev/null
@@ -1,3 +0,0 @@
-+ %Include kclipboard.sip
-+ %Include kdeversion.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde315.diff b/sip/kdecore/kdecore-kde315.diff
deleted file mode 100644
index 13e7719..0000000
--- a/sip/kdecore/kdecore-kde315.diff
+++ /dev/null
@@ -1,3 +0,0 @@
-+ %Include kclipboard.sip
-+ %Include kdeversion.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde320.diff b/sip/kdecore/kdecore-kde320.diff
deleted file mode 100644
index 8476e6c..0000000
--- a/sip/kdecore/kdecore-kde320.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include kmacroexpander.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include kurldrag.sip
-+ %Include kuser.sip
-
-
-
diff --git a/sip/kdecore/kdecore-kde321.diff b/sip/kdecore/kdecore-kde321.diff
deleted file mode 100644
index 5dc526d..0000000
--- a/sip/kdecore/kdecore-kde321.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include kmacroexpander.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde322.diff b/sip/kdecore/kdecore-kde322.diff
deleted file mode 100644
index e0d64ad..0000000
--- a/sip/kdecore/kdecore-kde322.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-+ %Include fixx11h.sip
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include kmacroexpander.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde323.diff b/sip/kdecore/kdecore-kde323.diff
deleted file mode 100644
index e0d64ad..0000000
--- a/sip/kdecore/kdecore-kde323.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-+ %Include fixx11h.sip
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include kmacroexpander.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde330.diff b/sip/kdecore/kdecore-kde330.diff
deleted file mode 100644
index d202574..0000000
--- a/sip/kdecore/kdecore-kde330.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-+ %Include fixx11h.sip
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include klockfile.sip
-+ %Include kmacroexpander.sip
-+ %Include kmanagerselection.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde331.diff b/sip/kdecore/kdecore-kde331.diff
deleted file mode 100644
index d202574..0000000
--- a/sip/kdecore/kdecore-kde331.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-+ %Include fixx11h.sip
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include klockfile.sip
-+ %Include kmacroexpander.sip
-+ %Include kmanagerselection.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde332.diff b/sip/kdecore/kdecore-kde332.diff
deleted file mode 100644
index d202574..0000000
--- a/sip/kdecore/kdecore-kde332.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-+ %Include fixx11h.sip
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include klockfile.sip
-+ %Include kmacroexpander.sip
-+ %Include kmanagerselection.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde340.diff b/sip/kdecore/kdecore-kde340.diff
deleted file mode 100644
index d202574..0000000
--- a/sip/kdecore/kdecore-kde340.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-+ %Include fixx11h.sip
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include klockfile.sip
-+ %Include kmacroexpander.sip
-+ %Include kmanagerselection.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde341.diff b/sip/kdecore/kdecore-kde341.diff
deleted file mode 100644
index d202574..0000000
--- a/sip/kdecore/kdecore-kde341.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-+ %Include fixx11h.sip
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include klockfile.sip
-+ %Include kmacroexpander.sip
-+ %Include kmanagerselection.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde342.diff b/sip/kdecore/kdecore-kde342.diff
deleted file mode 100644
index d202574..0000000
--- a/sip/kdecore/kdecore-kde342.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-+ %Include fixx11h.sip
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include klockfile.sip
-+ %Include kmacroexpander.sip
-+ %Include kmanagerselection.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde343.diff b/sip/kdecore/kdecore-kde343.diff
deleted file mode 100644
index d202574..0000000
--- a/sip/kdecore/kdecore-kde343.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-+ %Include fixx11h.sip
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include klockfile.sip
-+ %Include kmacroexpander.sip
-+ %Include kmanagerselection.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde350.diff b/sip/kdecore/kdecore-kde350.diff
deleted file mode 100644
index b8dba4c..0000000
--- a/sip/kdecore/kdecore-kde350.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-+ %Include fixx11h.sip
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include klockfile.sip
-+ %Include kmacroexpander.sip
-+ %Include kmanagerselection.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include ktimezones.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde351.diff b/sip/kdecore/kdecore-kde351.diff
deleted file mode 100644
index b8dba4c..0000000
--- a/sip/kdecore/kdecore-kde351.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-+ %Include fixx11h.sip
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include klockfile.sip
-+ %Include kmacroexpander.sip
-+ %Include kmanagerselection.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include ktimezones.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde352.diff b/sip/kdecore/kdecore-kde352.diff
deleted file mode 100644
index b8dba4c..0000000
--- a/sip/kdecore/kdecore-kde352.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-+ %Include fixx11h.sip
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include klockfile.sip
-+ %Include kmacroexpander.sip
-+ %Include kmanagerselection.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include ktimezones.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecore-kde353.diff b/sip/kdecore/kdecore-kde353.diff
deleted file mode 100644
index b8dba4c..0000000
--- a/sip/kdecore/kdecore-kde353.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-+ %Include fixx11h.sip
-+ %Include kcalendarsystem.sip
-+ %Include kcalendarsystemfactory.sip
-+ %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
-+ %Include kidna.sip
-+ %Include klockfile.sip
-+ %Include kmacroexpander.sip
-+ %Include kmanagerselection.sip
-+ %Include kmountpoint.sip
-+ %Include kpty.sip
-+ %Include kshell.sip
-+ %Include ktimezones.sip
-+ %Include kurldrag.sip
diff --git a/sip/kdecore/kdecoremod.sip.in b/sip/kdecore/kdecoremod.sip.in
deleted file mode 100644
index 60e93e0..0000000
--- a/sip/kdecore/kdecoremod.sip.in
+++ /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 tdecore  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 tdecore
-
-%Import qt/qtmod.sip
-%Import dcopmod.sip
-
-%Include bytearray.sip
-%Include kaboutdata.sip
-%Include kaccel.sip
-%Include kaccelaction.sip
-%Include kaccelbase.sip
-%Include kallocator.sip
-%Include kapplication.sip
-%Include kasyncio.sip
-%Include kaudioplayer.sip
-%Include kbufferedio.sip
-%Include kcatalogue.sip
-%Include kcharsets.sip
-%Include kcmdlineargs.sip
-%Include kcompletion.sip
-%Include kconfig.sip
-%Include kconfigbackend.sip
-%Include kconfigbase.sip
-%Include kconfigdata.sip
-%Include kcrash.sip
-%Include kdcoppropertyproxy.sip
-%Include kdesktopfile.sip
-%Include kglobal.sip
-%Include kglobalaccel.sip
-%Include kglobalsettings.sip
-%Include kiconeffect.sip
-%Include kiconloader.sip
-%Include kicontheme.sip
-%Include kinstance.sip
-%Include kipc.sip
-%Include kkeynative.sip
-%Include kkeyserver_x11.sip
-%Include klibloader.sip
-%Include klocale.sip
-%Include kmdcodec.sip
-%Include kmimesourcefactory.sip
-%Include kmultipledrag.sip
-%Include knotifyclient.sip
-%Include kpalette.sip
-%Include kpixmapprovider.sip
-%Include kprocctrl.sip
-%Include kprocess.sip
-%Include kprocio.sip
-%Include krandomsequence.sip
-%Include kregexp.sip
-%Include krfcdate.sip
-%Include krootprop.sip
-%Include ksavefile.sip
-%Include ksharedptr.sip
-%Include kshortcut.sip
-%Include kshortcutlist.sip
-%Include ksimpleconfig.sip
-%Include ksock.sip
-%Include kstartupinfo.sip
-%Include kstaticdeleter.sip
-%Include kstdaccel.sip
-%Include kstddirs.sip
-%Include kstringhandler.sip
-%Include ktempdir.sip
-%Include ktempfile.sip
-%Include kuniqueapplication.sip
-%Include kurl.sip
-%Include kwin.sip
-%Include kwinmodule.sip
-%Include netwm.sip
-%Include netwm_def.sip
-@mark@
diff --git a/sip/kdecore/kdesktopfile.sip b/sip/kdecore/kdesktopfile.sip
deleted file mode 100644
index 47e83fd..0000000
--- a/sip/kdecore/kdesktopfile.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 tdecore  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.
-
-
-class KDesktopFile : KConfig
-{
-%TypeHeaderCode
-#include <kdesktopfile.h>
-%End
-
-
-public:
-                         KDesktopFile (const QString&, bool = 0, const char* = "apps");
-    static bool          isDesktopFile (const QString&);
-
-%If ( KDE_3_1_0 -  )
-    static bool          isAuthorizedDesktopFile (const QString&);
-
-%If ( KDE_3_2_0 -  )
-    static QString       locateLocal (const QString&);
-%End
-
-%End
-
-    QString              readType () const;
-    QString              readIcon () const;
-    QString              readName () const;
-    QString              readComment () const;
-    QString              readGenericName () const;
-    QString              readPath () const;
-    QString              readDevice () const;
-    QString              readURL () const;
-    QStringList          readActions () const;
-    void                 setActionGroup (const QString&);
-    bool                 hasActionGroup (const QString&) const;
-    bool                 hasLinkType () const;
-    bool                 hasApplicationType () const;
-    bool                 hasMimeTypeType () const;
-    bool                 hasDeviceType () const;
-    bool                 tryExec () const;
-    QString              fileName () const;
-    QString              resource () const;
-
-%If ( KDE_3_1_0 -  )
-    QString              readDocPath () const;
-%End
-
-    QStringList          sortOrder () const;
-
-%If ( KDE_3_2_0 -  )
-    KDesktopFile*        copyTo (const QString&) const;
-%End
-
-    QString              filename () const;
-
-private:
-                         KDesktopFile (const KDesktopFile&);
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KDesktopFile
-
diff --git a/sip/kdecore/kdesktopwidget.sip b/sip/kdecore/kdesktopwidget.sip
deleted file mode 100644
index cf97c1e..0000000
--- a/sip/kdecore/kdesktopwidget.sip
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//     Copyright 2003 Jim Bublitz <jbublitz@nwinternet.com>
-//     Earlier copyrights 1998 - 2002 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module tdecore  version KDE_3_1_1
-
-
-// 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.
-
-
-class KDesktopWidget : QWidget
-{
-%TypeHeaderCode
-#include <kdesktopwidget.h>
-%End
-
-
-public:
-                         KDesktopWidget ();
-    bool                 isVirtualDesktop () const;
-    int                  numScreens () const;
-    int                  primaryScreen () const;
-    int                  screenNumber (QWidget* = 0) const;
-    int                  screenNumber (const QPoint&) const;
-    QWidget*             screen (int = -1);
-    const QRect&         screenGeometry (int = -1) const;
-
-};  // class KDesktopWidget
-
diff --git a/sip/kdecore/kdestyle.sip b/sip/kdecore/kdestyle.sip
deleted file mode 100644
index 2456913..0000000
--- a/sip/kdecore/kdestyle.sip
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-//     Copyright 2003 Jim Bublitz <jbublitz@nwinternet.com>
-//     Earlier copyrights 1998 - 2002 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module tdecore  version KDE_3_1_1
-
-
-// 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.
-
-
-class KDEAniMenu : QObject
-{
-%TypeHeaderCode
-#include <kdestyle.h>
-%End
-
-
-public:
-                         KDEAniMenu (QPopupMenu*);
-
-protected:
-    void                 scrollIn ();
-
-protected slots:
-    void                 slotDestroyFake ();
-    void                 slotFinished ();
-
-};  // class KDEAniMenu
-
-
-class KDEStyle : KStyle
-{
-%TypeHeaderCode
-#include <kdestyle.h>
-%End
-
-
-public:
-                         KDEStyle ();
-    virtual void         polish (QWidget*);
-    virtual void         unPolish (QWidget*);
-    virtual void         polish (QPalette&);
-    void                 drawButton (QPainter*, int, int, int, int, const QColorGroup&, bool = 0, const QBrush* = 0);
-    void                 drawButtonMask (QPainter*, int, int, int, int);
-    void                 drawComboButtonMask (QPainter*, int, int, int, int);
-    QRect                buttonRect (int, int, int, int);
-    void                 drawBevelButton (QPainter*, int, int, int, int, const QColorGroup&, bool = 0, const QBrush* = 0);
-    void                 drawPushButton (QPushButton*, QPainter*);
-    virtual void         drawPushButtonLabel (QPushButton*, QPainter*);
-    void                 drawScrollBarControls (QPainter*, const QScrollBar*, int, uint, uint);
-    QStyle::ScrollControl scrollBarPointOver (const QScrollBar*, int, const QPoint&);
-    void                 scrollBarMetrics (const QScrollBar*, int&/Out/, int&/Out/, int&/Out/, int&/Out/);
-    QSize                indicatorSize () const;
-    void                 drawIndicator (QPainter*, int, int, int, int, const QColorGroup&, int, bool = 0, bool = 1);
-    void                 drawIndicatorMask (QPainter*, int, int, int, int, int);
-    QSize                exclusiveIndicatorSize () const;
-    void                 drawExclusiveIndicator (QPainter*, int, int, int, int, const QColorGroup&, bool, bool = 0, bool = 1);
-    void                 drawExclusiveIndicatorMask (QPainter*, int, int, int, int, bool);
-    void                 drawComboButton (QPainter*, int, int, int, int, const QColorGroup&, bool = 0, bool = 0, bool = 1, const QBrush* = 0);
-    QRect                comboButtonRect (int, int, int, int);
-    QRect                comboButtonFocusRect (int, int, int, int);
-    int                  sliderLength () const;
-    void                 drawArrow (QPainter*, Qt::ArrowType, bool, int, int, int, int, const QColorGroup&, bool = 1, const QBrush* = 0);
-    void                 drawSlider (QPainter*, int, int, int, int, const QColorGroup&, Orientation, bool, bool);
-    void                 drawSliderMask (QPainter*, int, int, int, int, Orientation, bool, bool);
-    void                 drawKToolBar (QPainter*, int, int, int, int, const QColorGroup&, KToolBarPos, QBrush* = 0);
-    void                 drawKBarHandle (QPainter*, int, int, int, int, const QColorGroup&, KToolBarPos, QBrush* = 0);
-    void                 drawKMenuBar (QPainter*, int, int, int, int, const QColorGroup&, bool, QBrush* = 0);
-    void                 drawKToolBarButton (QPainter*, int, int, int, int, const QColorGroup&, bool = 0, bool = 1, bool = 1, bool = 0, KToolButtonType = Icon, const QString& = QString::null, const QPixmap* = 0, QFont* = 0, QWidget* = 0);
-//ig     void                 drawKMenuItem (QPainter*, int, int, int, int, const QColorGroup&, bool, QMenuItem*, QBrush* = 0);
-//ig     void                 drawPopupMenuItem (QPainter*, bool, int, int, QMenuItem*, const QPalette&, bool, bool, int, int, int, int);
-//ig     int                  popupMenuItemHeight (bool, QMenuItem*, const QFontMetrics&);
-    void                 drawKProgressBlock (QPainter*, int, int, int, int, const QColorGroup&, QBrush*);
-    void                 drawFocusRect (QPainter*, const QRect&, const QColorGroup&, const QColor*, bool);
-    int                  defaultFrameWidth () const;
-    void                 polishPopupMenu (QPopupMenu*);
-    void                 drawTab (QPainter*, const QTabBar*, QTab*, bool);
-    void                 drawTabMask (QPainter*, const QTabBar*, QTab*, bool);
-    void                 tabbarMetrics (const QTabBar*, int&/Out/, int&/Out/, int&/Out/);
-    void                 drawSplitter (QPainter*, int, int, int, int, const QColorGroup&, Orientation);
-    int                  splitterWidth () const;
-    void                 drawPanel (QPainter*, int, int, int, int, const QColorGroup&, bool, int, const QBrush*);
-    void                 drawKickerAppletHandle (QPainter*, int, int, int, int, const QColorGroup&, QBrush*);
-    bool                 eventFilter (QObject*, QEvent*);
-
-protected:
-    void                 drawSBDeco (QPainter*, const QRect&, const QColorGroup&, bool);
-    void                 drawSBButton (QPainter*, const QRect&, const QColorGroup&, bool = 0);
-    void                 kColorBitmaps (QPainter*, const QColorGroup&, int, int, QBitmap* = 0, QBitmap* = 0, QBitmap* = 0, QBitmap* = 0, QBitmap* = 0, QBitmap* = 0);
-
-};  // class KDEStyle
-
diff --git a/sip/kdecore/kdeversion.sip b/sip/kdecore/kdeversion.sip
deleted file mode 100644
index 0f71d17..0000000
--- a/sip/kdecore/kdeversion.sip
+++ /dev/null
@@ -1,45 +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 tdecore  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 <kdeversion.h>
-%End
-
-
-%If ( KDE_3_1_4 -  )
-namespace KDE
-{
-
-%If ( KDE_3_2_0 -  )
-uint                 version ();
-%End
-
-uint                 versionMajor ();
-uint                 versionMinor ();
-uint                 versionRelease ();
-const char*          versionString ();
-};  // namespace KDE
-
-%End
diff --git a/sip/kdecore/kglobal.sip b/sip/kdecore/kglobal.sip
deleted file mode 100644
index b8947e0..0000000
--- a/sip/kdecore/kglobal.sip
+++ /dev/null
@@ -1,65 +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 tdecore  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.
-
-
-class KGlobal
-{
-%TypeHeaderCode
-#include <kglobal.h>
-%End
-
-
-public:
-    static KInstance*    instance ();
-    static KStandardDirs* dirs ();
-    static KConfig*      config ();
-
-%If ( KDE_3_2_0 -  )
-    static KSharedConfig* sharedConfig ();
-%End
-
-    static KIconLoader*  iconLoader ();
-    static KLocale*      locale ();
-    static KCharsets*    charsets ();
-    static const QString& staticQString (const char*);
-    static const QString& staticQString (const QString&);
-    static void          registerStaticDeleter (KStaticDeleterBase*);
-    static void          unregisterStaticDeleter (KStaticDeleterBase*);
-    static void          deleteStaticDeleters ();
-//ig     KStringDict*         _stringDict;
-//ig     KInstance*           _instance;
-//ig     KLocale*             _locale;
-//ig     KCharsets*           _charsets;
-//ig     KStaticDeleterList*  _staticDeleters;
-    static void          setActiveInstance (KInstance*);
-    static KInstance*    activeInstance ();
-//ig     KInstance*           _activeInstance;
-
-};  // class KGlobal
-
-
-%If ( KDE_3_4_0 -  )
-int                  kasciistricmp (const char*, const char*);
-%End
diff --git a/sip/kdecore/kglobalaccel.sip b/sip/kdecore/kglobalaccel.sip
deleted file mode 100644
index 1e757f5..0000000
--- a/sip/kdecore/kglobalaccel.sip
+++ /dev/null
@@ -1,87 +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 tdecore  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.
-
-
-class KGlobalAccel : QObject
-{
-%TypeHeaderCode
-#include <kglobalaccel.h>
-%End
-
-
-public:
-                         KGlobalAccel (QObject*, const char* = 0);
-    bool                 isEnabled () const;
-    void                 setEnabled (bool);
-    KAccelAction*        insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
-
-%If ( KDE_3_1_0 -  )
-    bool                 remove (const QString&);
-%End
-
-    KAccelAction*        insert (const QString&, const QString&);
-    bool                 updateConnections ();
-    const KShortcut&     shortcut (const QString&) const;
-    bool                 setShortcut (const QString&, const KShortcut&);
-    bool                 setSlot (const QString&, SIP_RXOBJ_CON, SIP_SLOT_CON ());
-
-%If ( KDE_3_4_0 -  )
-    bool                 setActionEnabled (const QString&, bool);
-%End
-
-
-%If ( KDE_3_3_0 -  )
-    QString              label (const QString&) const;
-%End
-
-    const QString&       configGroup () const;
-    void                 setConfigGroup (const QString&);
-    bool                 readSettings (KConfigBase* = 0);
-    bool                 writeSettings (KConfigBase* = 0) const;
-
-%If ( KDE_3_1_0 -  )
-    bool                 writeSettings (KConfigBase*, bool) const;
-%End
-
-    static bool          useFourModifierKeys ();
-
-%If ( KDE_3_5_0 -  )
-    static void          blockShortcuts (bool);
-    void                 disableBlocking (bool);
-%End
-
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-public:
-
-%If (  - KDE_3_2_0 )
-//ig     bool                 setEnabled (const QString&, bool);
-%End
-
-
-};  // class KGlobalAccel
-
diff --git a/sip/kdecore/kglobalsettings.sip b/sip/kdecore/kglobalsettings.sip
deleted file mode 100644
index 08386c6..0000000
--- a/sip/kdecore/kglobalsettings.sip
+++ /dev/null
@@ -1,157 +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 tdecore  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.
-
-
-class KGlobalSettings
-{
-%TypeHeaderCode
-#include <kglobalsettings.h>
-%End
-
-
-public:
-    static int           dndEventDelay ();
-    static bool          singleClick ();
-
-%If ( KDE_3_1_0 -  )
-
-    enum TearOffHandle
-    {
-        Disable, 
-        ApplicationLevel, 
-        Enable
-    };
-
-    static KGlobalSettings::TearOffHandle insertTearOffHandle ();
-%End
-
-    static bool          changeCursorOverIcon ();
-    static bool          visualActivate ();
-    static uint          visualActivateSpeed ();
-    static int           autoSelectDelay ();
-    static int           contextMenuKey ();
-    static bool          showContextMenusOnPress ();
-
-    enum Completion
-    {
-        CompletionNone, 
-        CompletionAuto, 
-        CompletionMan, 
-        CompletionShell, 
-        CompletionPopup, 
-        CompletionPopupAuto
-    };
-
-    static Completion    completionMode ();
-
-    class KMouseSettings
-    {
-
-    public:
-
-        enum 
-        {
-            RightHanded, 
-            LeftHanded
-        };
-
-        int                  handed;
-
-    };  // class KMouseSettings
-
-
-public:
-    static KGlobalSettings::KMouseSettings& mouseSettings ();
-    static QString       desktopPath ();
-    static QString       autostartPath ();
-    static QString       trashPath ();
-    static QString       documentPath ();
-    static QColor        toolBarHighlightColor ();
-    static QColor        inactiveTitleColor ();
-    static QColor        inactiveTextColor ();
-    static QColor        activeTitleColor ();
-    static QColor        activeTextColor ();
-    static int           contrast ();
-
-%If ( KDE_3_4_0 -  )
-    static QColor        buttonBackground ();
-    static QColor        buttonTextColor ();
-%End
-
-    static QColor        baseColor ();
-    static QColor        textColor ();
-    static QColor        linkColor ();
-    static QColor        visitedLinkColor ();
-    static QColor        highlightedTextColor ();
-    static QColor        highlightColor ();
-    static QColor        alternateBackgroundColor ();
-    static QColor        calculateAlternateBackgroundColor (const QColor&);
-
-%If ( KDE_3_4_0 -  )
-    static bool          shadeSortColumn ();
-%End
-
-    static QFont         generalFont ();
-    static QFont         fixedFont ();
-    static QFont         toolBarFont ();
-    static QFont         menuFont ();
-    static QFont         windowTitleFont ();
-    static QFont         taskbarFont ();
-
-%If ( KDE_3_1_0 -  )
-    static QFont         largeFont (const QString& = QString ::null );
-%End
-
-    static bool          isMultiHead ();
-
-%If ( KDE_3_1_0 -  )
-    static bool          wheelMouseZooms ();
-
-%If ( KDE_3_2_0 -  )
-    static QRect         splashScreenDesktopGeometry ();
-    static QRect         desktopGeometry (const QPoint&);
-    static QRect         desktopGeometry (QWidget*);
-    static bool          showIconsOnPushButtons ();
-    static bool          showFilePreview (const KURL&);
-    static bool          opaqueResize ();
-
-%If ( KDE_3_3_0 -  )
-    static int           buttonLayout ();
-%End
-
-%End
-
-%End
-
-
-public:
-
-%If (  - KDE_3_1_0 )
-    static bool          insertTearOffHandle ();
-%End
-
-
-};  // class KGlobalSettings
-
diff --git a/sip/kdecore/kiconeffect.sip b/sip/kdecore/kiconeffect.sip
deleted file mode 100644
index a157ee4..0000000
--- a/sip/kdecore/kiconeffect.sip
+++ /dev/null
@@ -1,102 +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 tdecore  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.
-
-
-class KIconEffect
-{
-%TypeHeaderCode
-#include <kiconeffect.h>
-%End
-
-
-public:
-                         KIconEffect ();
-
-%If ( KDE_3_4_0 -  )
-
-    enum Effects
-    {
-        NoEffect, 
-        ToGray, 
-        Colorize, 
-        ToGamma, 
-        DeSaturate, 
-        ToMonochrome, 
-        LastEffect
-    };
-
-%End
-
-    void                 init ();
-    bool                 hasEffect (int, int) const;
-    QString              fingerprint (int, int);
-    QImage               apply (QImage, int, int);
-    QImage               apply (QImage, int, float, const QColor, bool);
-
-%If ( KDE_3_4_0 -  )
-    QImage               apply (QImage, int, float, const QColor, const QColor, bool) const;
-%End
-
-    QPixmap              apply (QPixmap, int, int);
-    QPixmap              apply (QPixmap, int, float, const QColor, bool);
-
-%If ( KDE_3_4_0 -  )
-    QPixmap              apply (QPixmap, int, float, const QColor, const QColor, bool) const;
-%End
-
-    QImage               doublePixels (QImage);
-    static void          visualActivate (QWidget*, QRect);
-    static void          toGray (QImage&, float);
-    static void          colorize (QImage&, const QColor&, float);
-
-%If ( KDE_3_4_0 -  )
-    static void          toMonochrome (QImage&, const QColor&, const QColor&, float);
-%End
-
-    static void          deSaturate (QImage&, float);
-    static void          toGamma (QImage&, float);
-    static void          semiTransparent (QImage&);
-    static void          semiTransparent (QPixmap&);
-    static void          overlay (QImage&, QImage&);
-
-public:
-
-%If (  - KDE_3_4_0 )
-
-    enum Effects
-    {
-        NoEffect, 
-        ToGray, 
-        Colorize, 
-        ToGamma, 
-        DeSaturate, 
-        LastEffect
-    };
-
-%End
-
-
-};  // class KIconEffect
-
diff --git a/sip/kdecore/kiconloader.sip b/sip/kdecore/kiconloader.sip
deleted file mode 100644
index a4fd24d..0000000
--- a/sip/kdecore/kiconloader.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 tdecore  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.
-
-
-class KIconLoader
-{
-%TypeHeaderCode
-#include <kiconloader.h>
-%End
-
-
-public:
-                         KIconLoader (const QString& = QString ::null , KStandardDirs* = 0);
-    void                 addAppDir (const QString&);
-    QPixmap              loadIcon (const QString&, KIcon::Group, int = 0, int = KIcon ::DefaultState , QString* = 0, bool = 0) const;
-
-%If ( KDE_3_5_0 -  )
-    QIconSet             loadIconSet (const QString&, KIcon::Group, int, bool, bool);
-%End
-
-
-%If ( KDE_3_1_0 -  )
-    QIconSet             loadIconSet (const QString&, KIcon::Group, int, bool);
-%End
-
-    QIconSet             loadIconSet (const QString&, KIcon::Group, int = 0);
-    QString              iconPath (const QString&, int, bool = 0) const;
-    QMovie               loadMovie (const QString&, KIcon::Group, int = 0) const;
-    QString              moviePath (const QString&, KIcon::Group, int = 0) const;
-    QStringList          loadAnimated (const QString&, KIcon::Group, int = 0) const;
-    QStringList          queryIcons (int, KIcon::Context = KIcon ::Any ) const;
-    QStringList          queryIconsByContext (int, KIcon::Context = KIcon ::Any ) const;
-
-%If ( KDE_3_1_0 -  )
-    QStringList          queryIconsByDir (const QString&) const;
-%End
-
-    int                  currentSize (KIcon::Group) const;
-    KIconTheme*          theme ();
-    KIconEffect*         iconEffect ();
-    void                 reconfigure (const QString&, KStandardDirs*);
-    static QPixmap       unknown ();
-    bool                 alphaBlending (KIcon::Group) const;
-
-%If ( KDE_3_1_0 -  )
-    void                 addExtraDesktopThemes ();
-    bool                 extraDesktopThemesAdded () const;
-    void                 enableDelayedIconSetLoading (bool);
-    bool                 isDelayedIconSetLoadingEnabled () const;
-%End
-
-
-};  // class KIconLoader
-
-
-%ModuleCode
-#include <kiconloader.h>
-%End
-
-QPixmap              DesktopIcon (const QString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-QPixmap              DesktopIcon (const QString&, KInstance*);
-QIconSet             DesktopIconSet (const QString&, int = 0, KInstance* = KGlobal ::instance ());
-QPixmap              BarIcon (const QString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-QPixmap              BarIcon (const QString&, KInstance*);
-QIconSet             BarIconSet (const QString&, int = 0, KInstance* = KGlobal ::instance ());
-QPixmap              SmallIcon (const QString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-QPixmap              SmallIcon (const QString&, KInstance*);
-QIconSet             SmallIconSet (const QString&, int = 0, KInstance* = KGlobal ::instance ());
-QPixmap              MainBarIcon (const QString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-QPixmap              MainBarIcon (const QString&, KInstance*);
-QIconSet             MainBarIconSet (const QString&, int = 0, KInstance* = KGlobal ::instance ());
-QPixmap              UserIcon (const QString&, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-QPixmap              UserIcon (const QString&, KInstance*);
-QIconSet             UserIconSet (const QString&, KInstance* = KGlobal ::instance ());
-int                  IconSize (KIcon::Group, KInstance* = KGlobal ::instance ());
diff --git a/sip/kdecore/kicontheme.sip b/sip/kdecore/kicontheme.sip
deleted file mode 100644
index 269a8b0..0000000
--- a/sip/kdecore/kicontheme.sip
+++ /dev/null
@@ -1,249 +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 tdecore  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.
-
-
-class KIcon
-{
-%TypeHeaderCode
-#include <kicontheme.h>
-%End
-
-
-public:
-                         KIcon ();
-    bool                 isValid () const;
-
-    enum Context
-    {
-        Any, 
-        Action, 
-        Application, 
-        Device, 
-        FileSystem, 
-        MimeType
-    };
-
-
-    enum Type
-    {
-        Fixed, 
-        Scalable, 
-        Threshold
-    };
-
-
-    enum MatchType
-    {
-        MatchExact, 
-        MatchBest
-    };
-
-
-%If ( KDE_3_2_0 -  )
-
-    enum Group
-    {
-        NoGroup, 
-        Desktop, 
-        FirstGroup, 
-        Toolbar, 
-        MainToolbar, 
-        Small, 
-        Panel, 
-        LastGroup, 
-        User
-    };
-
-
-%If ( KDE_3_3_1 -  )
-
-    enum StdSizes
-    {
-        SizeSmall, 
-        SizeSmallMedium, 
-        SizeMedium, 
-        SizeLarge, 
-        SizeHuge, 
-        SizeEnormous
-    };
-
-%End
-
-%End
-
-
-    enum States
-    {
-        DefaultState, 
-        ActiveState, 
-        DisabledState, 
-        LastState
-    };
-
-
-%If ( KDE_3_1_0 -  )
-
-    enum Overlays
-    {
-        LockOverlay, 
-        ZipOverlay, 
-        LinkOverlay, 
-        HiddenOverlay, 
-        ShareOverlay, 
-        OverlayMask
-    };
-
-%End
-
-    int                  size;
-    Context              context;
-    Type                 type;
-    int                  threshold;
-    QString              path;
-
-public:
-
-%If ( KDE_3_3_0 - KDE_3_3_1 )
-
-    enum StdSizes
-    {
-        SizeSmall, 
-        SizeSmallMedium, 
-        SizeMedium, 
-        SizeLarge, 
-        SizeHuge
-    };
-
-%End
-
-
-public:
-
-%If ( KDE_3_2_0 - KDE_3_3_0 )
-
-    enum StdSizes
-    {
-        SizeSmall, 
-        SizeMedium, 
-        SizeLarge, 
-        SizeHuge
-    };
-
-%End
-
-
-public:
-
-%If (  - KDE_3_2_0 )
-
-    enum Group
-    {
-        NoGroup, 
-        Desktop, 
-        FirstGroup, 
-        Toolbar, 
-        MainToolbar, 
-        Small, 
-        Panel, 
-        LastGroup, 
-        User
-    };
-
-
-    enum StdSizes
-    {
-        SizeSmall, 
-        SizeMedium, 
-        SizeLarge
-    };
-
-%End
-
-
-public:
-
-%If (  - KDE_3_1_0 )
-
-    enum Overlays
-    {
-        LockOverlay, 
-        ZipOverlay, 
-        LinkOverlay, 
-        HiddenOverlay, 
-        OverlayMask
-    };
-
-%End
-
-
-};  // class KIcon
-
-
-class KIconTheme
-{
-%TypeHeaderCode
-#include <kicontheme.h>
-%End
-
-
-public:
-                         KIconTheme (const QString&, const QString& = QString ::null );
-    QString              name () const;
-    QString              description () const;
-    QString              example () const;
-    QString              screenshot () const;
-    QString              linkOverlay () const;
-    QString              zipOverlay () const;
-    QString              lockOverlay () const;
-
-%If ( KDE_3_1_0 -  )
-    QString              shareOverlay () const;
-%End
-
-    QString              dir () const;
-    QStringList          inherits () const;
-    bool                 isValid () const;
-
-%If ( KDE_3_1_0 -  )
-    bool                 isHidden () const;
-%End
-
-    int                  depth () const;
-    int                  defaultSize (KIcon::Group) const;
-    QValueList<int>      querySizes (KIcon::Group) const;
-    QStringList          queryIcons (int, KIcon::Context = KIcon ::Any ) const;
-    QStringList          queryIconsByContext (int, KIcon::Context = KIcon ::Any ) const;
-    KIcon                iconPath (const QString&, int, KIcon::MatchType) const;
-    static QStringList   list ();
-    static QString       current ();
-    static void          reconfigure ();
-
-%If ( KDE_3_1_0 -  )
-    static QString       defaultThemeName ();
-%End
-
-
-};  // class KIconTheme
-
diff --git a/sip/kdecore/kidna.sip b/sip/kdecore/kidna.sip
deleted file mode 100644
index e3e0cd5..0000000
--- a/sip/kdecore/kidna.sip
+++ /dev/null
@@ -1,40 +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 tdecore  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 <kidna.h>
-%End
-
-
-%If ( KDE_3_2_0 -  )
-namespace KIDNA
-{
-QCString             toAsciiCString (const QString&);
-QString              toAscii (const QString&);
-QString              toUnicode (const QString&);
-};  // namespace KIDNA
-
-%End
-
diff --git a/sip/kdecore/kinstance.sip b/sip/kdecore/kinstance.sip
deleted file mode 100644
index 82df1be..0000000
--- a/sip/kdecore/kinstance.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 tdecore  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.
-
-
-class KInstance
-{
-%TypeHeaderCode
-#include <kinstance.h>
-%End
-
-
-public:
-                         KInstance (const QCString&);
-                         KInstance (const KAboutData*);
-                         KInstance (KInstance*);
-    KStandardDirs*       dirs () const;
-    KConfig*             config () const;
-
-%If ( KDE_3_2_0 -  )
-    KSharedConfig*       sharedConfig () const;
-%End
-
-    KIconLoader*         iconLoader () const;
-    void                 newIconLoader () const;
-    const KAboutData*    aboutData () const;
-    QCString             instanceName () const;
-    KMimeSourceFactory*  mimeSourceFactory () const;
-
-protected:
-//ig                          KInstance (const KInstance&);
-
-%If ( KDE_3_1_0 -  )
-    void                 setConfigName (const QString&);
-%End
-
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-public:
-
-%If (  - KDE_3_2_0 )
-//ig     KCharsets*           charsets () const;
-%End
-
-//force
-
-private:
-                         KInstance (const KInstance&);
-//end
-
-};  // class KInstance
-
diff --git a/sip/kdecore/kipc.sip b/sip/kdecore/kipc.sip
deleted file mode 100644
index 4e86b1a..0000000
--- a/sip/kdecore/kipc.sip
+++ /dev/null
@@ -1,98 +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 tdecore  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.
-
-
-class KIPC
-{
-%TypeHeaderCode
-#include <qwindowdefs.h>
-#include <kipc.h>
-%End
-
-
-public:
-
-%If ( KDE_3_5_0 -  )
-
-    enum Message
-    {
-        PaletteChanged, 
-        FontChanged, 
-        StyleChanged, 
-        BackgroundChanged, 
-        SettingsChanged, 
-        IconChanged, 
-        ToolbarStyleChanged, 
-        ClipboardConfigChanged, 
-        BlockShortcuts, 
-        UserMessage
-    };
-
-%End
-
-    static void          sendMessage (KIPC::Message, WId, int = 0);
-    static void          sendMessageAll (KIPC::Message, int = 0);
-
-public:
-
-%If ( KDE_3_1_0 - KDE_3_5_0 )
-
-    enum Message
-    {
-        PaletteChanged, 
-        FontChanged, 
-        StyleChanged, 
-        BackgroundChanged, 
-        SettingsChanged, 
-        IconChanged, 
-        ToolbarStyleChanged, 
-        ClipboardConfigChanged, 
-        UserMessage
-    };
-
-%End
-
-
-public:
-
-%If (  - KDE_3_1_0 )
-
-    enum Message
-    {
-        PaletteChanged, 
-        FontChanged, 
-        StyleChanged, 
-        BackgroundChanged, 
-        SettingsChanged, 
-        IconChanged, 
-        ToolbarStyleChanged, 
-        UserMessage
-    };
-
-%End
-
-
-};  // class KIPC
-
diff --git a/sip/kdecore/kkeynative.sip b/sip/kdecore/kkeynative.sip
deleted file mode 100644
index 55af059..0000000
--- a/sip/kdecore/kkeynative.sip
+++ /dev/null
@@ -1,90 +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 tdecore  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.
-
-
-class KKeyNative
-{
-%TypeHeaderCode
-#include <kkeynative.h>
-%End
-
-
-public:
-                         KKeyNative ();
-//ig                          KKeyNative (const XEvent*);
-                         KKeyNative (const KKey&);
-                         KKeyNative (const KKeyNative&);
-                         KKeyNative (uint, uint, uint);
-    void                 clear ();
-//ig     bool                 init (const XEvent*);
-    bool                 init (const KKey&);
-    bool                 init (const KKeyNative&);
-    int                  keyCodeQt () const;
-    KKey                 key () const;
-
-%If ( KDE_3_1_4 -  )
-//ig                          operator KKey () const;
-%End
-
-    uint                 code () const;
-    uint                 mod () const;
-    uint                 sym () const;
-    bool                 isNull () const;
-    int                  compare (const KKeyNative&) const;
-
-%If ( KDE_3_1_4 -  )
-    bool                 operator == (const KKeyNative&) const;
-    bool                 operator != (const KKeyNative&) const;
-    bool                 operator < (const KKeyNative&) const;
-%End
-
-    static KKeyNative&   null ();
-    static bool          keyboardHasWinKey ();
-    static uint          modX (KKey::ModFlag);
-    static uint          accelModMaskX ();
-
-%If ( KDE_3_1_3 -  )
-    static uint          modXNumLock ();
-    static uint          modXLock ();
-    static uint          modXScrollLock ();
-
-%If ( KDE_3_4_3 -  )
-    static uint          modXModeSwitch ();
-%End
-
-%End
-
-
-};  // class KKeyNative
-
-
-%If ( KDE_3_1_4 -  )
-//ig typedef union _XEvent XEvent;
-%End
-
-
-%If (  - KDE_3_1_4 )
-//ig typedef _XEvent XEvent;
-%End
diff --git a/sip/kdecore/kkeyserver_x11.sip b/sip/kdecore/kkeyserver_x11.sip
deleted file mode 100644
index a50ff80..0000000
--- a/sip/kdecore/kkeyserver_x11.sip
+++ /dev/null
@@ -1,187 +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 tdecore  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 <kkeyserver_x11.h>
-%End
-
-namespace KKeyServer
-{
-
-%If ( KDE_3_1_0 -  )
-
-enum ExtraModFlag
-{
-    MODE_SWITCH
-};
-
-%End
-
-
-class Sym
-{
-%TypeHeaderCode
-#include <kkeyserver_x11.h>
-%End
-
-
-public:
-    uint                 m_sym;
-                         Sym ();
-                         Sym (uint);
-                         Sym (const QString&);
-    bool                 initQt (int);
-    bool                 init (const QString&);
-    int                  qt () const;
-    QString              toStringInternal () const;
-    QString              toString () const;
-    uint                 getModsRequired () const;
-    uint                 getSymVariation () const;
-
-%If ( KDE_3_1_4 -  )
-//ig                          operator uint () const;
-%End
-
-
-};  // class Sym
-
-
-class Key
-{
-%TypeHeaderCode
-#include <kkeyserver_x11.h>
-%End
-
-
-public:
-
-    enum 
-    {
-        CODE_FOR_QT
-    };
-
-    uint                 m_code;
-    uint                 m_mod;
-    uint                 m_sym;
-    bool                 init (const KKey&, bool);
-    bool                 isNative () const;
-    uint                 code () const;
-    uint                 mod () const;
-    uint                 sym () const;
-    int                  keyCodeQt () const;
-    void                 setKeycodeQt (int);
-    int                  compare (const KKeyServer::Key&) const;
-
-%If ( KDE_3_1_4 -  )
-    bool                 operator == (const KKeyServer::Key&) const;
-    bool                 operator < (const KKeyServer::Key&) const;
-%End
-
-    KKey                 key () const;
-
-};  // class Key
-
-
-class Variations
-{
-%TypeHeaderCode
-#include <kkeyserver_x11.h>
-%End
-
-
-public:
-
-    enum 
-    {
-        MAX_VARIATIONS
-    };
-
-//ig     KKeyServer::Key      m_rgkey[MAX_VARIATIONS];
-    uint                 m_nVariations;
-                         Variations ();
-    void                 init (const KKey&, bool);
-    uint                 count () const;
-    const KKeyServer::Key& key (uint) const;
-
-};  // class Variations
-
-bool                 initializeMods ();
-uint                 modX (KKey::ModFlag);
-bool                 keyboardHasWinKey ();
-uint                 modXShift ();
-uint                 modXLock ();
-uint                 modXCtrl ();
-uint                 modXAlt ();
-uint                 modXNumLock ();
-uint                 modXWin ();
-uint                 modXScrollLock ();
-
-%If ( KDE_3_4_2 -  )
-uint                 modXModeSwitch ();
-%End
-
-uint                 accelModMaskX ();
-//ig bool                 keyQtToSym (int, uint&);
-//ig bool                 keyQtToMod (int, uint&);
-//ig bool                 symToKeyQt (uint, int&);
-//ig bool                 modToModQt (uint, int&);
-//ig bool                 modToModX (uint, uint&);
-//ig bool                 modXToModQt (uint, int&);
-
-%If ( KDE_3_4_2 -  )
-//ig int                  qtButtonStateToMod (Qt::ButtonState);
-%End
-
-//ig bool                 modXToMod (uint, uint&);
-//ig bool                 codeXToSym (uchar, uint, uint&);
-//ig QString              modToStringInternal (uint);
-//ig QString              modToStringUser (uint);
-
-%If ( KDE_3_5_0 -  )
-uint                 stringUserToMod (const QString&);
-%End
-
-//ig bool                 stringToSymMod (const QString&, uint&, uint&);
-//ig void                 keyQtToKeyX (uint, uchar*, uint*, uint*);
-
-%If (  - KDE_3_2_0 )
-
-class CodeMod
-{
-%TypeHeaderCode
-#include <kkeyserver_x11.h>
-%End
-
-
-public:
-    int                  code;
-    int                  mod;
-
-};  // class CodeMod
-
-%End
-
-};  // namespace KKeyServer
-
diff --git a/sip/kdecore/klibloader.sip b/sip/kdecore/klibloader.sip
deleted file mode 100644
index 80fa29f..0000000
--- a/sip/kdecore/klibloader.sip
+++ /dev/null
@@ -1,103 +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 tdecore  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.
-
-
-class KLibrary : QObject
-{
-%TypeHeaderCode
-#include <klibloader.h>
-%End
-
-
-public:
-//ig                          KLibrary (const QString&, const QString&, void*);
-    QString              name () const;
-    QString              fileName () const;
-    KLibFactory*         factory ();
-    void*                symbol (const char*);
-
-%If ( KDE_3_1_0 -  )
-    bool                 hasSymbol (const char*) const;
-%End
-
-    void                 unload () const;
-
-private:
-                         ~KLibrary ();
-//force
-                         KLibrary (const QString&, const QString&, void*);
-//end
-
-};  // class KLibrary
-
-
-class KLibLoader : QObject
-{
-%TypeHeaderCode
-#include <klibloader.h>
-%End
-
-
-public:
-    KLibFactory*         factory (const char*);
-    virtual KLibrary*    library (const char*);
-    KLibrary*            globalLibrary (const char*);
-    QString              lastErrorMessage () const;
-    virtual void         unloadLibrary (const char*);
-    static KLibLoader*   self ();
-    static void          cleanUp ();
-    static QString       findLibrary (const char*, const KInstance* = KGlobal ::instance ());
-
-protected:
-                         KLibLoader (QObject* /TransferThis/ = 0, const char* = 0);
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KLibLoader
-
-
-class KLibFactory : QObject
-{
-%TypeHeaderCode
-#include <klibloader.h>
-%End
-
-
-public:
-                         KLibFactory (QObject* /TransferThis/ = 0, const char* = 0);
-    QObject*             create (QObject* /Transfer/ = 0, const char* = 0, const char* = "QObject", const QStringList& = QStringList ());
-
-signals:
-    void                 objectCreated (QObject*);
-
-protected:
-    virtual QObject*     createObject (QObject* /Transfer/ = 0, const char* = 0, const char* = "QObject", const QStringList& = QStringList ()) /Factory/;
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KLibFactory
-
diff --git a/sip/kdecore/klocale.sip b/sip/kdecore/klocale.sip
deleted file mode 100644
index ffe12a0..0000000
--- a/sip/kdecore/klocale.sip
+++ /dev/null
@@ -1,243 +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 tdecore  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.
-
-
-class KLocale
-{
-%TypeHeaderCode
-#include <klocale.h>
-%End
-
-
-public:
-                         KLocale (const QString&, KConfig* = 0);
-//ig                          KLocale (const KLocale&);
-    QString              translate (const char*) const;
-    QString              translate (const char*, const char*) const;
-    QString              translate (const char*, const char*, ulong) const;
-    bool                 setEncoding (int);
-    bool                 setLanguage (const QString&);
-    bool                 setLanguage (const QStringList&);
-    bool                 setCountry (const QString&);
-
-    enum SignPosition
-    {
-        ParensAround, 
-        BeforeQuantityMoney, 
-        AfterQuantityMoney, 
-        BeforeMoney, 
-        AfterMoney
-    };
-
-    QString              decimalSymbol () const;
-    QString              thousandsSeparator () const;
-    QString              currencySymbol () const;
-    QString              monetaryDecimalSymbol () const;
-    QString              monetaryThousandsSeparator () const;
-    QString              positiveSign () const;
-    QString              negativeSign () const;
-    int                  fracDigits () const;
-    bool                 positivePrefixCurrencySymbol () const;
-    bool                 negativePrefixCurrencySymbol () const;
-    SignPosition         positiveMonetarySignPosition () const;
-    SignPosition         negativeMonetarySignPosition () const;
-    QString              formatMoney (double, const QString& = QString ::null , int = -1) const;
-    QString              formatNumber (double, int = -1) const;
-    QString              formatNumber (const QString&) const;
-
-%If ( KDE_3_5_0 -  )
-    QString              formatNumber (const QString&, bool, int) const;
-%End
-
-
-%If ( KDE_3_2_0 -  )
-    QString              formatLong (long) const;
-%End
-
-
-%If ( KDE_3_1_0 -  )
-    bool                 nounDeclension () const;
-%End
-
-    QString              formatDate (const QDate&, bool = 0) const;
-
-%If ( KDE_3_1_0 -  )
-    bool                 dateMonthNamePossessive () const;
-
-%If ( KDE_3_3_0 -  )
-    QString              formatTime (const QTime&, bool, bool) const;
-%End
-
-%End
-
-    QString              formatTime (const QTime&, bool = 0) const;
-    bool                 use12Clock () const;
-    bool                 weekStartsMonday () const;
-
-%If ( KDE_3_1_0 -  )
-    int                  weekStartDay () const;
-%End
-
-    QString              monthName (int, bool = 0) const;
-
-%If ( KDE_3_1_0 -  )
-    QString              monthNamePossessive (int, bool = 0) const;
-%End
-
-    QString              weekDayName (int, bool = 0) const;
-
-%If ( KDE_3_2_0 -  )
-    const KCalendarSystem* calendar () const;
-    QString              calendarType () const;
-    void                 setCalendar (const QString&);
-%End
-
-    QString              formatDateTime (const QDateTime&, bool, bool = 0) const;
-    double               readMoney (const QString&, bool* = 0) const;
-    double               readNumber (const QString&, bool* = 0) const;
-    QDate                readDate (const QString&, bool* = 0) const;
-    QDate                readDate (const QString&, const QString&, bool* = 0) const;
-
-%If ( KDE_3_2_0 -  )
-
-    enum ReadDateFlags
-    {
-        NormalFormat, 
-        ShortFormat
-    };
-
-    QDate                readDate (const QString&, KLocale::ReadDateFlags, bool* = 0) const;
-%End
-
-    QTime                readTime (const QString&, bool* = 0) const;
-
-%If ( KDE_3_2_0 -  )
-
-    enum ReadTimeFlags
-    {
-        WithSeconds, 
-        WithoutSeconds
-    };
-
-    QTime                readTime (const QString&, KLocale::ReadTimeFlags, bool* = 0) const;
-%End
-
-    QString              language () const;
-    QString              country () const;
-    QStringList          languagesTwoAlpha () const;
-    QStringList          languageList () const;
-    const char*          encoding () const;
-    int                  encodingMib () const;
-    QTextCodec*          codecForEncoding () const;
-
-%If ( KDE_3_2_0 -  )
-    int                  fileEncodingMib () const;
-%End
-
-    void                 setDateFormat (const QString&);
-    void                 setDateFormatShort (const QString&);
-
-%If ( KDE_3_1_0 -  )
-    void                 setDateMonthNamePossessive (bool);
-%End
-
-    void                 setTimeFormat (const QString&);
-    void                 setWeekStartsMonday (bool);
-
-%If ( KDE_3_1_0 -  )
-    void                 setWeekStartDay (int);
-%End
-
-    QString              dateFormat () const;
-    QString              dateFormatShort () const;
-    QString              timeFormat () const;
-    void                 setDecimalSymbol (const QString&);
-    void                 setThousandsSeparator (const QString&);
-    void                 setPositiveSign (const QString&);
-    void                 setNegativeSign (const QString&);
-    void                 setPositiveMonetarySignPosition (KLocale::SignPosition);
-    void                 setNegativeMonetarySignPosition (KLocale::SignPosition);
-    void                 setPositivePrefixCurrencySymbol (bool);
-    void                 setNegativePrefixCurrencySymbol (bool);
-    void                 setFracDigits (int);
-    void                 setMonetaryThousandsSeparator (const QString&);
-    void                 setMonetaryDecimalSymbol (const QString&);
-    void                 setCurrencySymbol (const QString&);
-    int                  pageSize () const;
-    void                 setPageSize (int);
-
-    enum MeasureSystem
-    {
-        Metric, 
-        Imperial
-    };
-
-    KLocale::MeasureSystem measureSystem () const;
-    void                 setMeasureSystem (KLocale::MeasureSystem);
-    void                 insertCatalogue (const QString&);
-    void                 removeCatalogue (const QString&);
-    void                 setActiveCatalogue (const QString&);
-    QString              translateQt (const char*, const char*, const char*) const;
-
-%If ( KDE_3_1_0 -  )
-    QStringList          allLanguagesTwoAlpha () const;
-    QString              twoAlphaToLanguageName (const QString&) const;
-    QStringList          allCountriesTwoAlpha () const;
-    QString              twoAlphaToCountryName (const QString&) const;
-%End
-
-    static void          splitLocale (const QString&, QString&, QString&, QString&);
-    static void          setMainCatalogue (const char*);
-    static QString       langLookup (const QString&, const char* = "html");
-    static QString       defaultLanguage ();
-    static QString       defaultCountry ();
-
-%If ( KDE_3_0_1 -  )
-    static QString       _initLanguage (KConfigBase*);
-%End
-
-    QString              formatMoney (const QString&) const;
-    QString              languages () const;
-//ig     bool                 setCharset (const QString&);
-//ig     QString              charset () const;
-
-protected:
-//ig     static void          initInstance ();
-//force
-
-private:
-                         KLocale (const KLocale&);
-//end
-
-};  // class KLocale
-
-
-%ModuleCode
-#include <klocale.h>
-%End
-
-QString              i18n (const char*);
-QString              i18n (const char*, const char*);
-QString              i18n (const char*, const char*, ulong);
diff --git a/sip/kdecore/klockfile.sip b/sip/kdecore/klockfile.sip
deleted file mode 100644
index 0e1aeb5..0000000
--- a/sip/kdecore/klockfile.sip
+++ /dev/null
@@ -1,112 +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 tdecore  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 -  )
-
-class KLockFile : KShared
-{
-%TypeHeaderCode
-#include <klockfile.h>
-%End
-
-
-public:
-    typedef KSharedPtr<KLockFile> Ptr;
-                         KLockFile (const QString&);
-
-    enum LockResult
-    {
-        LockOK, 
-        LockFail, 
-        LockError, 
-        LockStale
-    };
-
-
-    enum LockOptions
-    {
-        LockNoBlock, 
-        LockForce
-    };
-
-    KLockFile::LockResult lock (int = 0);
-    bool                 isLocked () const;
-    void                 unlock ();
-    int                  staleTime () const;
-    void                 setStaleTime (int);
-    bool                 getLockInfo (int& /Out/, QString& /Out/, QString& /Out/);
-
-};  // class KLockFile
-
-%End
-
-
-
-%If (KDE_3_3_0 - )
-%MappedType KLockFile::Ptr
-//converts KLockFile
-{
-%TypeHeaderCode
-#include <ksharedptr.h>
-#include <klockfile.h>
-%End
-
-%ConvertFromTypeCode
-    // Convert to a Python instance
-
-    if (!sipCpp)
-        return NULL;
-
-    KSharedPtr<KLockFile> *cPtr = new KSharedPtr<KLockFile> (*(KSharedPtr<KLockFile> *)sipCpp);
-    KLockFile *cpp = cPtr->data ();
-    PyObject *obj = sipConvertFromInstance (cpp, sipClass_KLockFile, sipTransferObj);
-
-    return obj;
-%End
-
-%ConvertToTypeCode
-    // Convert a Python instance to a Ptr on the heap.
-
-    if (sipIsErr == NULL)
-        return PyInstance_Check(sipPy);
-
-    int iserr = 0;
-    KLockFile *cpp = (KLockFile *)sipForceConvertToType(sipPy, sipType_KLockFile, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
-
-    if (iserr)
-    {
-        *sipIsErr = 1;
-        return 0;
-    }
-
-    *sipCppPtr = new KSharedPtr<KLockFile> (cpp);
-
-    return 1;
-%End
-};
-%End
-
-
diff --git a/sip/kdecore/kmacroexpander.sip b/sip/kdecore/kmacroexpander.sip
deleted file mode 100644
index 6316a9d..0000000
--- a/sip/kdecore/kmacroexpander.sip
+++ /dev/null
@@ -1,384 +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 tdecore  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 <kmacroexpander.h>
-%End
-
-
-%If ( KDE_3_2_0 -  )
-
-class KMacroExpanderBase
-{
-%TypeHeaderCode
-#include <kmacroexpander.h>
-%End
-
-
-public:
-                         KMacroExpanderBase (QChar = '%');
-    void                 expandMacros (QString&);
-    bool                 expandMacrosShellQuote (QString&, uint& /In, Out/);
-    bool                 expandMacrosShellQuote (QString&);
-    void                 setEscapeChar (QChar);
-    QChar                escapeChar () const;
-
-protected:
-    virtual int          expandPlainMacro (const QString&, uint, QStringList&);
-    virtual int          expandEscapedMacro (const QString&, uint, QStringList&);
-
-};  // class KMacroExpanderBase
-
-%End
-
-
-%If ( KDE_3_3_0 -  )
-
-class KWordMacroExpander : KMacroExpanderBase
-{
-%TypeHeaderCode
-#include <kmacroexpander.h>
-%End
-
-
-public:
-                         KWordMacroExpander (QChar = '%');
-
-protected:
-    virtual int          expandPlainMacro (const QString&, uint, QStringList&);
-    virtual int          expandEscapedMacro (const QString&, uint, QStringList&);
-    virtual bool         expandMacro (const QString&, QStringList&)  = 0;
-
-};  // class KWordMacroExpander
-
-%End
-
-
-%If ( KDE_3_3_0 -  )
-
-class KCharMacroExpander : KMacroExpanderBase
-{
-%TypeHeaderCode
-#include <kmacroexpander.h>
-%End
-
-
-public:
-                         KCharMacroExpander (QChar = '%');
-
-protected:
-    virtual int          expandPlainMacro (const QString&, uint, QStringList&);
-    virtual int          expandEscapedMacro (const QString&, uint, QStringList&);
-    virtual bool         expandMacro (QChar, QStringList&)  = 0;
-
-};  // class KCharMacroExpander
-
-%End
-
-
-%If ( KDE_3_2_0 -  )
-namespace KMacroExpander
-{
-QString              expandMacros (const QString&, const QMap<QChar,QString>&, QChar = '%');
-QString              expandMacrosShellQuote (const QString&, const QMap<QChar,QString>&, QChar = '%');
-QString              expandMacros (const QString&, const QMap<QString,QString>&, QChar = '%');
-QString              expandMacrosShellQuote (const QString&, const QMap<QString,QString>&, QChar = '%');
-QString              expandMacros (const QString&, const QMap<QChar,QStringList>&, QChar = '%');
-QString              expandMacros (const QString&, const QMap<QString,QStringList>&, QChar = '%');
-QString              expandMacrosShellQuote (const QString&, const QMap<QChar,QStringList>&, QChar = '%');
-QString              expandMacrosShellQuote (const QString&, const QMap<QString,QStringList>&, QChar = '%');
-};  // namespace KMacroExpander
-
-%End
-
-
-
-%MappedType QMap<QChar,QString>
-//converts a Python dict of QChar:QString
-{
-%TypeHeaderCode
-#include <qmap.h>
-#include <qstring.h>
-%End
-
-%ConvertFromTypeCode
-
-    if (!sipCpp)
-        return PyDict_New();
-
-    PyObject *dict;
-
-    // Create the dictionary.
-
-    if ((dict = PyDict_New()) == NULL)
-        return NULL;
-
-    // Get it.
-
-    const QMap<QChar,QString> map = *sipCpp;
-    QMap<QChar,QString>::ConstIterator it;
-
-    for (it = map.begin (); it != map.end (); ++it)
-    {
-        QChar acpp = it.key ();
-        PyObject *binst = PyString_FromString ((char *)((QString *)&it.data ()));
-        PyObject *ainst;
-        if (((ainst = sipConvertFromNewType(new QChar(acpp), sipType_QChar, sipTransferObj)) == NULL)
-            || (binst == NULL)
-            || (PyDict_SetItem (dict, ainst, binst) < 0))
-        {
-            Py_XDECREF (ainst);
-            Py_XDECREF (binst);
-            Py_DECREF (dict);
-            return NULL;
-        }
-    }
-
-    return dict;
-%End
-
-
-%ConvertToTypeCode
-// Convert a Python dictionary to a QMap<QChar, QString>
-
-    if (sipIsErr == NULL)
-        return PyDict_Check(sipPy);
-
-    QMap<QChar,QString> *map = new QMap<QChar,QString>;
-
-    PyObject *key, *value;
-    SIP_SSIZE_T pos = 0;
-    QChar *cKey;
-    QString *sData;
-
-    while (PyDict_Next(sipPy, &pos, &key, &value))
-    {
-        int iserr = 0, cKey_state, sData_state;
-
-        cKey  = (QChar *)sipForceConvertToType(key, sipType_QChar, sipTransferObj, SIP_NOT_NONE, &cKey_state, &iserr);
-        sData = (QString *)sipForceConvertToType(value, sipType_QString, sipTransferObj, SIP_NOT_NONE, &sData_state, &iserr);
-
-        if (iserr)
-        {
-            if (cKey)
-                sipReleaseType(cKey, sipType_QChar, cKey_state);
-
-            *sipIsErr = 1;
-            delete map;
-            return 0;
-        }
-
-        map->insert (*cKey, *sData);
-
-        sipReleaseType(cKey, sipType_QChar, cKey_state);
-        sipReleaseType(sData, sipType_QString, sData_state);
-    }
-
-    *sipCppPtr = map;
-
-    return 1;
-%End
-};
-
-
-%MappedType QMap<QString,QStringList>
-//converts a Python dict of QString:QStringList
-{
-%TypeHeaderCode
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
-%End
-
-%ConvertFromTypeCode
-
-    if (!sipCpp)
-        return PyDict_New();
-
-    PyObject *dict;
-
-    // Create the dictionary.
-
-    if ((dict = PyDict_New()) == NULL)
-        return NULL;
-
-    // Get it.
-
-    const QMap<QString, QStringList> map = *sipCpp;
-    QMap<QString, QStringList>::ConstIterator it;
-
-    for (it = map.begin (); it != map.end (); ++it)
-    {
-        QStringList bcpp = it.data ();
-        PyObject *ainst = PyString_FromString ((char *)((QString *)&it.key ()));
-        PyObject *binst;
-        if (((binst = sipConvertFromNewType(new QStringList(bcpp), sipType_QStringList, sipTransferObj)) == NULL)
-            || (ainst == NULL)
-            || (PyDict_SetItem (dict, ainst, binst) < 0))
-        {
-            Py_XDECREF (ainst);
-            Py_XDECREF (binst);
-            Py_DECREF (dict);
-            return NULL;
-        }
-    }
-
-    return dict;
-%End
-
-
-%ConvertToTypeCode
-// Convert a Python dictionary to a QMap<QString, QStringList> on the heap.
-
-    if (sipIsErr == NULL)
-        return PyDict_Check(sipPy);
-
-    QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
-
-    PyObject *key, *value;
-    SIP_SSIZE_T pos = 0;
-    QString *sKey;
-    QStringList *slData;
-
-    while (PyDict_Next(sipPy, &pos, &key, &value))
-    {
-        int iserr = 0, sKey_state, slData_state;
-
-        sKey = (QString *)sipForceConvertToType(key, sipType_QString, sipTransferObj, SIP_NOT_NONE, &sKey_state, &iserr);
-        slData = (QStringList *)sipForceConvertToType(value, sipType_QStringList, sipTransferObj, SIP_NOT_NONE, &slData_state, &iserr);
-
-        if (iserr)
-        {
-            if (sKey)
-                sipReleaseType(sKey, sipType_QString, sKey_state);
-
-            *sipIsErr = 1;
-            delete map;
-            return 0;
-        }
-
-        map->insert (*sKey, *slData);
-
-        sipReleaseType(sKey, sipType_QString, sKey_state);
-        sipReleaseType(slData, sipType_QStringList, slData_state);
-    }
-
-    *sipCppPtr = map;
-
-    return 1;
-%End
-};
-
-
-%MappedType QMap<QChar,QStringList>
-//converts a Python dict of QChar:QStringList
-{
-%TypeHeaderCode
-#include <qmap.h>
-#include <qstringlist.h>
-#include <qstring.h>
-%End
-
-%ConvertFromTypeCode
-
-    if (!sipCpp)
-        return PyDict_New();
-
-    PyObject *dict;
-
-    // Create the dictionary.
-
-    if ((dict = PyDict_New()) == NULL)
-        return NULL;
-
-    // Get it.
-
-    const QMap<QChar,QStringList> map = *sipCpp;
-    QMap<QChar,QStringList>::ConstIterator it;
-
-    for (it = map.begin (); it != map.end (); ++it)
-    {
-        QChar acpp = it.key ();
-        QStringList bcpp = it.data ();
-        PyObject *binst;
-        PyObject *ainst;
-        if (((ainst = sipConvertFromNewType(new QChar(acpp), sipType_QChar, sipTransferObj)) == NULL)
-            || (binst = sipConvertFromNewType(new QStringList(bcpp), sipType_QStringList, sipTransferObj))
-            || (PyDict_SetItem (dict, ainst, binst) < 0))
-        {
-            Py_XDECREF (ainst);
-            Py_XDECREF (binst);
-            Py_DECREF (dict);
-            return NULL;
-        }
-    }
-
-    return dict;
-%End
-
-
-%ConvertToTypeCode
-// Convert a Python dictionary to a QMap<QChar, QStringList> on the heap.
-
-    if (sipIsErr == NULL)
-        return PyDict_Check(sipPy);
-
-    QMap<QChar,QStringList> *map = new QMap<QChar,QStringList>;
-
-    PyObject *key, *value;
-    SIP_SSIZE_T pos = 0;
-    QChar *cKey;
-    QStringList *slData;
-
-    while (PyDict_Next(sipPy, &pos, &key, &value))
-    {
-        int iserr = 0, cKey_state, slData_state;
-
-        cKey = (QChar *)sipForceConvertToType(key, sipType_QChar, sipTransferObj, SIP_NOT_NONE, &cKey_state, &iserr);
-        slData = (QStringList *)sipForceConvertToType(value, sipType_QStringList, sipTransferObj, SIP_NOT_NONE, &slData_state, &iserr);
-
-        if (iserr)
-        {
-            if (cKey)
-                sipReleaseType(cKey, sipType_QChar, cKey_state);
-
-            *sipIsErr = 1;
-            delete map;
-            return 0;
-        }
-
-        map->insert (*cKey, *slData);
-
-        sipReleaseType(cKey, sipType_QChar, cKey_state);
-        sipReleaseType(slData, sipType_QStringList, slData_state);
-    }
-
-    *sipCppPtr = map;
-
-    return 1;
-%End
-};
-
-
diff --git a/sip/kdecore/kmanagerselection.sip b/sip/kdecore/kmanagerselection.sip
deleted file mode 100644
index a43fd2e..0000000
--- a/sip/kdecore/kmanagerselection.sip
+++ /dev/null
@@ -1,91 +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 tdecore  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 -  )
-
-class KSelectionOwner : QObject
-{
-%TypeHeaderCode
-#include <qdockwindow.h>
-#include <qvariant.h>
-#include <kmanagerselection.h>
-%End
-
-
-public:
-                         KSelectionOwner (Atom, int = -1, QObject* /TransferThis/ = 0);
-                         KSelectionOwner (const char*, int = -1, QObject* /TransferThis/ = 0);
-    bool                 claim (bool, bool = 1);
-    void                 release ();
-    Window               ownerWindow () const;
-//ig     bool                 filterEvent (XEvent*);
-
-signals:
-    void                 lostOwnership ();
-
-protected:
-//ig     virtual bool         handleMessage (XEvent*);
-    virtual bool         genericReply (Atom, Atom, Window);
-    virtual void         replyTargets (Atom, Window);
-    virtual void         getAtoms ();
-    void                 setData (long, long);
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KSelectionOwner
-
-%End
-
-
-%If ( KDE_3_2_0 -  )
-
-class KSelectionWatcher : QObject
-{
-%TypeHeaderCode
-#include <qdockwindow.h>
-#include <qvariant.h>
-#include <kmanagerselection.h>
-%End
-
-
-public:
-                         KSelectionWatcher (Atom, int = -1, QObject* /TransferThis/ = 0);
-                         KSelectionWatcher (const char*, int = -1, QObject* /TransferThis/ = 0);
-    Window               owner ();
-//ig     void                 filterEvent (XEvent*);
-
-signals:
-    void                 newOwner (Window);
-    void                 lostOwner ();
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KSelectionWatcher
-
-%End
-
diff --git a/sip/kdecore/kmdcodec.sip b/sip/kdecore/kmdcodec.sip
deleted file mode 100644
index e554fc5..0000000
--- a/sip/kdecore/kmdcodec.sip
+++ /dev/null
@@ -1,156 +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 tdecore  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.
-
-
-class KCodecs
-{
-%TypeHeaderCode
-#include <kmdcodec.h>
-%End
-
-
-public:
-    static QCString      quotedPrintableEncode (const QByteArray&, bool);
-    static QCString      quotedPrintableEncode (const QCString&, bool = 1);
-    static void          quotedPrintableEncode (const QByteArray&, QByteArray&, bool);
-    static QCString      quotedPrintableDecode (const QByteArray&);
-    static QCString      quotedPrintableDecode (const QCString&);
-    static void          quotedPrintableDecode (const QByteArray&, QByteArray&);
-    static QCString      uuencode (const QByteArray&);
-    static QCString      uuencode (const QCString&);
-    static void          uuencode (const QByteArray&, QByteArray&);
-    static QCString      uudecode (const QByteArray&);
-    static QCString      uudecode (const QCString&);
-    static void          uudecode (const QByteArray&, QByteArray&);
-    static QCString      base64Encode (const QByteArray&, bool);
-    static QCString      base64Encode (const QCString&, bool);
-    static void          base64Encode (const QByteArray&, QByteArray&, bool);
-    static QCString      base64Decode (const QByteArray&);
-    static QCString      base64Decode (const QCString&);
-    static void          base64Decode (const QByteArray&, QByteArray&);
-
-private:
-                         KCodecs ();
-
-};  // class KCodecs
-
-
-class KMD5
-{
-%TypeHeaderCode
-#include <kmdcodec.h>
-%End
-
-
-public:
-//ig     typedef uchar Digest[16];
-                         KMD5 ();
-                         KMD5 (const char*, int = -1);
-                         KMD5 (const QByteArray&);
-                         KMD5 (const QCString&);
-    void                 update (const char*, int = -1);
-//igx     void                 update (const uchar*, int = -1);
-    void                 update (const QByteArray&);
-    void                 update (const QCString&);
-    bool                 update (QIODevice&);
-    void                 reset ();
-//ig     const Digest&        rawDigest ();
-//ig     void                 rawDigest (KMD5::Digest&);
-    QCString             hexDigest ();
-    void                 hexDigest (QCString&);
-    QCString             base64Digest ();
-//ig     bool                 verify (const KMD5::Digest&);
-    bool                 verify (const QCString&);
-
-protected:
-
-%If ( KDE_3_1_0 -  )
-//ig     void                 transform (const uchar);
-%End
-
-    void                 finalize ();
-
-private:
-                         KMD5 (const KMD5&);
-
-protected:
-
-%If ( KDE_3_1_0 -  )
-//force
-    void                 transform (const uchar*);
-%End
-
-//end
-
-protected:
-
-%If (  - KDE_3_1_0 )
-    void                 transform (const uchar*);
-%End
-
-
-};  // class KMD5
-
-
-%If ( KDE_3_4_0 -  )
-
-class KMD4
-{
-%TypeHeaderCode
-#include <kmdcodec.h>
-%End
-
-
-public:
-//ig     typedef uchar Digest[16];
-                         KMD4 ();
-                         KMD4 (const char*, int = -1);
-                         KMD4 (const QByteArray&);
-                         KMD4 (const QCString&);
-    void                 update (const char*, int = -1);
-//igx     void                 update (const uchar*, int = -1);
-    void                 update (const QByteArray&);
-    void                 update (const QCString&);
-    bool                 update (QIODevice&);
-    void                 reset ();
-//ig     const Digest&        rawDigest ();
-//ig     void                 rawDigest (KMD4::Digest&);
-    QCString             hexDigest ();
-    void                 hexDigest (QCString&);
-    QCString             base64Digest ();
-//ig     bool                 verify (const KMD4::Digest&);
-    bool                 verify (const QCString&);
-
-protected:
-//ig     void                 transform (ulong, const ulong);
-    void                 finalize ();
-
-private:
-                         KMD4 (const KMD4&);
-
-};  // class KMD4
-
-%End
-
diff --git a/sip/kdecore/kmimesourcefactory.sip b/sip/kdecore/kmimesourcefactory.sip
deleted file mode 100644
index b15e8d3..0000000
--- a/sip/kdecore/kmimesourcefactory.sip
+++ /dev/null
@@ -1,42 +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 tdecore  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.
-
-
-class KMimeSourceFactory : QMimeSourceFactory
-{
-%TypeHeaderCode
-#include <kmimesourcefactory.h>
-%End
-
-
-public:
-                         KMimeSourceFactory (KIconLoader* = KGlobal ::iconLoader ());
-    virtual QString      makeAbsolute (const QString&, const QString&) const;
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KMimeSourceFactory
-
diff --git a/sip/kdecore/kmountpoint.sip b/sip/kdecore/kmountpoint.sip
deleted file mode 100644
index 13f22da..0000000
--- a/sip/kdecore/kmountpoint.sip
+++ /dev/null
@@ -1,186 +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 tdecore  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 -  )
-
-class KMountPoint : KShared
-{
-%TypeHeaderCode
-#include <kmountpoint.h>
-%End
-
-
-public:
-//ig     typedef KSharedPtr<KMountPoint> Ptr;
-//ig     typedef QValueList<KMountPoint::Ptr> List;
-
-public:
-
-    enum 
-    {
-        NeedMountOptions, 
-        NeedRealDeviceName
-    };
-
-    static KMountPoint::List possibleMountPoints (int = 0);
-    static KMountPoint::List currentMountPoints (int = 0);
-    QString              mountedFrom () const;
-    QString              realDeviceName () const;
-    QString              mountPoint () const;
-    QString              mountType () const;
-    QStringList          mountOptions () const;
-
-%If ( KDE_3_4_0 -  )
-    static QString       devNameFromOptions (const QStringList&);
-%End
-
-
-private:
-                         KMountPoint ();
-
-};  // class KMountPoint
-
-%End
-
-
-
-%MappedType KMountPoint::Ptr
-//converts KMountPoint
-{
-%TypeHeaderCode
-#include <ksharedptr.h>
-#include <kmountpoint.h>
-%End
-
-%ConvertFromTypeCode
-    // Convert to a Python instance
-
-    if (!sipCpp)
-        return NULL;
-
-    KSharedPtr<KMountPoint> *cPtr = new KSharedPtr<KMountPoint> (*(KSharedPtr<KMountPoint> *)sipCpp);
-    KMountPoint *cpp = cPtr->data ();
-    PyObject *obj = sipConvertFromInstance (cpp, sipClass_KMountPoint, sipTransferObj);
-
-    return obj;
-%End
-
-%ConvertToTypeCode
-    // Convert a Python instance to a Ptr on the heap.
-
-    if (sipIsErr == NULL)
-        return PyInstance_Check(sipPy);
-
-    int iserr = 0;
-    KMountPoint *cpp = (KMountPoint *)sipForceConvertToType(sipPy, sipType_KMountPoint, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
-
-    if (iserr)
-    {
-        *sipIsErr = 1;
-        return 0;
-    }
-
-    *sipCppPtr = new KSharedPtr<KMountPoint> (cpp);
-
-    return 1;
-%End
-};
-
-
-%MappedType KMountPoint::List
-//converts a Python list of KMountPoint
-{
-%TypeHeaderCode
-#include <qvaluelist.h>
-#include <kmountpoint.h>
-%End
-
-%ConvertFromTypeCode
-    // Convert to a Python list of Ptr (KMountPoint).
-    if (!sipCpp)
-        return PyList_New (0);
-
-    PyObject *plist;
-
-    // Create the list
-    if ((plist = PyList_New(0)) == NULL)
-        return NULL;
-
-    // Get it.
-    KMountPoint::List *cList = (KMountPoint::List *)sipCpp;
-    PyObject *inst;
-
-    KMountPoint::List::Iterator it;
-    for( it = cList->begin(); it != cList->end(); ++it )
-    {
-        inst = sipConvertFromType(static_cast<KMountPoint::Ptr>(*it), sipType_KMountPoint_Ptr, sipTransferObj);
-
-        if ((inst == NULL) || (PyList_Append (plist, inst) < 0))
-        {
-            Py_XDECREF (inst);
-            Py_DECREF (plist);
-            return NULL;
-        }
-    }
-
-    return plist;
-%End
-
-%ConvertToTypeCode
-    // Convert a Python list to List on the heap.
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    KMountPoint::List *cList = new KMountPoint::List;
-
-    PyObject *elem;
-    KMountPoint *mtpt;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        mtpt = (KMountPoint *)sipForceConvertToType(elem, sipType_KMountPoint, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
-
-        KMountPoint::Ptr *ptr = new KMountPoint::Ptr (mtpt);
-
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cList;
-            return 0;
-        }
-
-        cList->append (*ptr);
-    }
-
-    *sipCppPtr = cList;
-
-    return 1;
-%End
-};
-
-
diff --git a/sip/kdecore/kmultipledrag.sip b/sip/kdecore/kmultipledrag.sip
deleted file mode 100644
index b064d01..0000000
--- a/sip/kdecore/kmultipledrag.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 tdecore  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.
-
-
-class KMultipleDrag : QDragObject
-{
-%TypeHeaderCode
-#include <kmultipledrag.h>
-%End
-
-
-public:
-                         KMultipleDrag (QWidget* = 0, const char* = 0);
-    void                 addDragObject (QDragObject*);
-
-%If ( KDE_3_5_0 -  )
-    virtual QByteArray   encodedData (const char*) const;
-    virtual const char*  format (int) const;
-%End
-
-
-protected:
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-protected:
-
-%If (  - KDE_3_5_0 )
-    virtual QByteArray   encodedData (const char*) const;
-    virtual const char*  format (int) const;
-%End
-
-
-};  // class KMultipleDrag
-
diff --git a/sip/kdecore/knotifyclient.sip b/sip/kdecore/knotifyclient.sip
deleted file mode 100644
index a5a5adf..0000000
--- a/sip/kdecore/knotifyclient.sip
+++ /dev/null
@@ -1,139 +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 tdecore  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 <knotifyclient.h>
-%End
-
-namespace KNotifyClient
-{
-
-class Instance
-{
-%TypeHeaderCode
-#include <knotifyclient.h>
-%End
-
-
-public:
-                         Instance (KInstance*);
-    bool                 useSystemBell () const;
-    static KInstance*    current ();
-    static KNotifyClient::Instance* currentInstance ();
-
-};  // class Instance
-
-
-%If ( KDE_3_2_0 -  )
-
-enum 
-{
-    Default, 
-//ig     None, 
-    Sound, 
-    Messagebox, 
-    Logfile, 
-    Stderr, 
-    PassivePopup, 
-    Execute, 
-    Taskbar
-};
-
-%End
-
-
-enum 
-{
-    Notification, 
-    Warning, 
-    Error, 
-    Catastrophe
-};
-
-
-enum StandardEvent
-{
-    cannotOpenFile, 
-    notification, 
-    warning, 
-    fatalError, 
-    catastrophe
-};
-
-bool                 startDaemon ();
-
-%If ( KDE_3_2_0 -  )
-int                  event (const QString&, const QString& = QString ::null );
-int                  event (KNotifyClient::StandardEvent, const QString& = QString ::null );
-
-%If ( KDE_3_2_1 -  )
-int                  userEvent (const QString& = QString ::null , int = KNotifyClient ::Default , int = KNotifyClient ::Default , const QString& = QString ::null , const QString& = QString ::null );
-%End
-
-int                  event (int, const QString&, const QString& = QString ::null );
-int                  event (int, KNotifyClient::StandardEvent, const QString& = QString ::null );
-int                  userEvent (int, const QString& = QString ::null , int = KNotifyClient ::Default , int = KNotifyClient ::Default , const QString& = QString ::null , const QString& = QString ::null );
-%End
-
-void                 beep (const QString& = QString ::null );
-int                  getPresentation (const QString&);
-QString              getFile (const QString&, int);
-int                  getDefaultPresentation (const QString&);
-QString              getDefaultFile (const QString&, int);
-KInstance*           instance ();
-
-%If ( KDE_3_1_0 - KDE_3_2_0 )
-
-enum 
-{
-    Default, 
-//ig     None, 
-    Sound, 
-    Messagebox, 
-    Logfile, 
-    Stderr, 
-    PassivePopup, 
-    Execute
-};
-
-%End
-
-
-%If (  - KDE_3_1_0 )
-
-enum 
-{
-    Default, 
-//ig     None, 
-    Sound, 
-    Messagebox, 
-    Logfile, 
-    Stderr
-};
-
-%End
-
-};  // namespace KNotifyClient
-
diff --git a/sip/kdecore/kpalette.sip b/sip/kdecore/kpalette.sip
deleted file mode 100644
index 8989844..0000000
--- a/sip/kdecore/kpalette.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 tdecore  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.
-
-
-class KPalette
-{
-%TypeHeaderCode
-#include <kpalette.h>
-%End
-
-
-public:
-    static QStringList   getPaletteList ();
-                         KPalette (const QString& = QString ::null );
-                         KPalette (const KPalette&);
-    bool                 save ();
-    QString              description ();
-    void                 setDescription (const QString&);
-    QString              name ();
-    void                 setName (const QString&);
-
-    enum Editable
-    {
-        Yes, 
-        No, 
-        Ask
-    };
-
-    Editable             editable ();
-    void                 setEditable (KPalette::Editable);
-    int                  nrColors ();
-    QColor               color (int);
-    int                  findColor (const QColor&);
-    QString              colorName (int);
-    QString              colorName (const QColor&);
-    int                  addColor (const QColor&, const QString& = QString ::null );
-    int                  changeColor (int, const QColor&, const QString& = QString ::null );
-    int                  changeColor (const QColor&, const QColor&, const QString& = QString ::null );
-
-};  // class KPalette
-
diff --git a/sip/kdecore/kpixmapprovider.sip b/sip/kdecore/kpixmapprovider.sip
deleted file mode 100644
index 5909306..0000000
--- a/sip/kdecore/kpixmapprovider.sip
+++ /dev/null
@@ -1,41 +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 tdecore  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.
-
-
-class KPixmapProvider
-{
-%TypeHeaderCode
-#include <kpixmapprovider.h>
-%End
-
-
-public:
-    virtual QPixmap      pixmapFor (const QString&, int = 0)  = 0;
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KPixmapProvider
-
diff --git a/sip/kdecore/kprocctrl.sip b/sip/kdecore/kprocctrl.sip
deleted file mode 100644
index c437dd8..0000000
--- a/sip/kdecore/kprocctrl.sip
+++ /dev/null
@@ -1,95 +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 tdecore  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.
-
-
-class KProcessController : QObject
-{
-%TypeHeaderCode
-#include <kprocctrl.h>
-%End
-
-
-public:
-
-%If ( KDE_3_2_0 -  )
-    static void          ref ();
-    static void          deref ();
-%End
-
-    KProcessController*  theKProcessController;
-    static void          theSigCHLDHandler (int);
-
-%If ( KDE_3_0_3 -  )
-    bool                 waitForProcessExit (int);
-
-%If ( KDE_3_2_0 -  )
-    void                 unscheduleCheck ();
-    void                 rescheduleCheck ();
-    int                  notifierFd () const;
-%End
-
-%End
-
-    void                 addKProcess (KProcess*);
-    void                 removeKProcess (KProcess*);
-
-%If ( KDE_3_2_0 -  )
-    void                 addProcess (int);
-%End
-
-
-%If ( KDE_3_1_0 -  )
-
-private:
-                         KProcessController ();
-%End
-
-                         ~KProcessController ();
-                         KProcessController (KProcessController&);
-
-public:
-
-%If (  - KDE_3_1_0 )
-                         KProcessController ();
-%End
-
-
-public:
-
-%If (  - KDE_3_2_0 )
-    static void          setupHandlers ();
-    static void          resetHandlers ();
-%End
-
-
-public slots:
-
-%If (  - KDE_3_2_0 )
-    void                 slotDoHousekeeping (int);
-%End
-
-
-};  // class KProcessController
-
diff --git a/sip/kdecore/kprocess.sip b/sip/kdecore/kprocess.sip
deleted file mode 100644
index 53ab178..0000000
--- a/sip/kdecore/kprocess.sip
+++ /dev/null
@@ -1,272 +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 tdecore  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.
-
-
-class KProcess : QObject
-{
-%TypeHeaderCode
-#include <kprocess.h>
-%End
-
-
-public:
-
-%If ( KDE_3_5_2 -  )
-
-    enum Communication
-    {
-        NoCommunication, 
-        Stdin, 
-        Stdout, 
-        Stderr, 
-        AllOutput, 
-        All, 
-        NoRead, 
-        CTtyOnly, 
-        MergedStderr
-    };
-
-%End
-
-
-%If ( KDE_3_2_0 -  )
-
-    enum RunMode
-    {
-        DontCare, 
-        NotifyOnExit, 
-        Block, 
-        OwnGroup
-    };
-
-                         KProcess (QObject* /TransferThis/, const char* = 0);
-%End
-
-                         KProcess ();
-    bool                 setExecutable (const QString&);
-
-%If ( KDE_3_1_4 -  )
-    KProcess&            operator << (const QString&);
-    KProcess&            operator << (const char*);
-    KProcess&            operator << (const QCString&);
-    KProcess&            operator << (const QStringList&);
-%End
-
-    void                 clearArguments ();
-    virtual bool         start (KProcess::RunMode = NotifyOnExit , KProcess::Communication = NoCommunication );
-    virtual bool         kill (int = SIGTERM );
-    bool                 isRunning () const;
-    pid_t                pid () const;
-    pid_t                getPid () const;
-    void                 suspend ();
-    void                 resume ();
-
-%If ( KDE_3_2_0 -  )
-    bool                 wait (int = -1);
-%End
-
-    bool                 normalExit () const;
-
-%If ( KDE_3_2_0 -  )
-    bool                 signalled () const;
-    bool                 coreDumped () const;
-%End
-
-    int                  exitStatus () const;
-
-%If ( KDE_3_2_0 -  )
-    int                  exitSignal () const;
-%End
-
-    bool                 writeStdin (const char*, int);
-    bool                 closeStdin ();
-    bool                 closeStdout ();
-    bool                 closeStderr ();
-
-%If ( KDE_3_2_0 -  )
-    bool                 closePty ();
-    void                 closeAll ();
-%End
-
-    const QValueList<QCString>& args ();
-    void                 setRunPrivileged (bool);
-    bool                 runPrivileged () const;
-    void                 setEnvironment (const QString&, const QString&);
-    void                 setWorkingDirectory (const QString&);
-
-%If ( KDE_3_1_0 -  )
-    void                 setUseShell (bool, const char* = 0);
-    static QString       quote (const QString&);
-%End
-
-    void                 detach ();
-
-%If ( KDE_3_2_0 -  )
-
-    enum 
-    {
-        PrioLowest, 
-        PrioLow, 
-        PrioLower, 
-        PrioNormal, 
-        PrioHigher, 
-        PrioHigh, 
-        PrioHighest
-    };
-
-    bool                 setPriority (int);
-%End
-
-
-signals:
-    void                 processExited (KProcess*);
-    void                 receivedStdout (KProcess*, char*, int);
-//ig     void                 receivedStdout (int, int&);
-    void                 receivedStderr (KProcess*, char*, int);
-    void                 wroteStdin (KProcess*);
-
-protected slots:
-    void                 slotChildOutput (int);
-    void                 slotChildError (int);
-    void                 slotSendData (int);
-
-protected:
-    void                 setupEnvironment ();
-    virtual int          setupCommunication (KProcess::Communication);
-    virtual int          commSetupDoneP ();
-    virtual int          commSetupDoneC ();
-    virtual void         processHasExited (int);
-    virtual void         commClose ();
-
-%If ( KDE_3_2_0 -  )
-    void                 setBinaryExecutable (const char*);
-%End
-
-    int                  childOutput (int);
-    int                  childError (int);
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-public:
-
-%If (  - KDE_3_5_2 )
-
-    enum Communication
-    {
-        NoCommunication, 
-        Stdin, 
-        Stdout, 
-        Stderr, 
-        AllOutput, 
-        All, 
-        NoRead
-    };
-
-%End
-
-
-public:
-
-%If ( KDE_3_2_0 - KDE_3_4_0 )
-    void                 setUsePty (KProcess::Communication, bool);
-    KPty*                pty () const;
-%End
-
-
-public:
-
-%If (  - KDE_3_2_0 )
-
-    enum RunMode
-    {
-        DontCare, 
-        NotifyOnExit, 
-        Block
-    };
-
-%End
-
-
-%If (  - KDE_3_2_0 )
-
-private:
-                         KProcess (const KProcess&);
-%End
-
-
-public:
-//force
-    void                 setArguments (SIP_PYLIST) [void (char**)];
-%MethodCode
-//takes arglist | (a Python list of strings)
-//doc
-// setArguments is the PyKDE equivalent of the stream operator methods (<<)
-// in KDE's KProcess class - provide with a list of strings representing
-// the arguments to the executable program set with setExecutable (PyKDE
-// will continue to provide setExecutable even though it's deprecated in
-// KDE (to also be replaced with stream operators)
-//end
-
-    PyObject *elem;
-
-    for (int i = 0; i < PyList_Size (a0); i++)
-    {
-        elem = PyList_GET_ITEM (a0, i);
-        *sipCpp << PyString_AsString (elem);
-    }
-
-
-%End
-
-//end
-
-};  // class KProcess
-
-
-class KShellProcess : KProcess
-{
-%TypeHeaderCode
-#include <kprocess.h>
-%End
-
-
-public:
-                         KShellProcess (const char* = 0);
-    virtual bool         start (RunMode = NotifyOnExit , Communication = NoCommunication );
-    static QString       quote (const QString&);
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-%If (  - KDE_3_2_0 )
-
-private:
-                         KShellProcess (const KShellProcess&);
-%End
-
-
-};  // class KShellProcess
-
diff --git a/sip/kdecore/kprocio.sip b/sip/kdecore/kprocio.sip
deleted file mode 100644
index bb99e9a..0000000
--- a/sip/kdecore/kprocio.sip
+++ /dev/null
@@ -1,67 +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 tdecore  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.
-
-
-class KProcIO : KProcess
-{
-%TypeHeaderCode
-#include <kprocio.h>
-%End
-
-
-public:
-                         KProcIO (QTextCodec* = 0);
-
-%If ( KDE_3_2_0 -  )
-    void                 setComm (Communication);
-%End
-
-    bool                 start (RunMode = NotifyOnExit , bool = 0);
-    bool                 writeStdin (const QString&, bool = 1);
-    bool                 writeStdin (const QCString&, bool);
-    bool                 writeStdin (const QByteArray&);
-    bool                 fputs (const QString&, bool = 1);
-    void                 closeWhenDone ();
-    int                  readln (QString& /Out/, bool = 1, bool* = 0);
-    int                  fgets (QString&, bool = 0);
-    void                 resetAll ();
-    void                 ackRead ();
-    void                 enableReadSignals (bool);
-
-signals:
-    void                 readReady (KProcIO*);
-
-protected:
-    void                 controlledEmission ();
-
-protected slots:
-    void                 received (KProcess*, char*, int);
-    void                 sent (KProcess*);
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KProcIO
-
diff --git a/sip/kdecore/kpty.sip b/sip/kdecore/kpty.sip
deleted file mode 100644
index 7a27ee4..0000000
--- a/sip/kdecore/kpty.sip
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-//     Copyright 2005 Jim Bublitz <jbublitz@nwinternet.com>
-//     Earlier copyrights 1998 - 2004 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module tdecore  version KDE_3_3_2
-
-
-// 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 -  )
-
-class KPty
-{
-%TypeHeaderCode
-#include <kpty.h>
-%End
-
-
-public:
-                         KPty ();
-    bool                 open ();
-    void                 close ();
-    void                 setCTty ();
-    void                 login (const char* = 0, const char* = 0);
-    void                 logout ();
-    void                 setWinSize (int, int);
-    void                 setXonXoff (bool);
-    const char*          ttyName () const;
-    int                  masterFd () const;
-    int                  slaveFd () const;
-
-};  // class KPty
-
-%End
-
diff --git a/sip/kdecore/krandomsequence.sip b/sip/kdecore/krandomsequence.sip
deleted file mode 100644
index 34474f4..0000000
--- a/sip/kdecore/krandomsequence.sip
+++ /dev/null
@@ -1,45 +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 tdecore  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.
-
-
-class KRandomSequence
-{
-%TypeHeaderCode
-#include <krandomsequence.h>
-%End
-
-
-public:
-                         KRandomSequence (long = 0);
-                         KRandomSequence (const KRandomSequence&);
-    void                 setSeed (long = 1);
-    double               getDouble ();
-    ulong                getLong (ulong);
-    bool                 getBool ();
-//ig     void                 randomize (QGList*);
-    void                 modulate (int);
-
-};  // class KRandomSequence
-
diff --git a/sip/kdecore/kregexp.sip b/sip/kdecore/kregexp.sip
deleted file mode 100644
index 03b9f5c..0000000
--- a/sip/kdecore/kregexp.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 tdecore  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.
-
-
-class KRegExp
-{
-%TypeHeaderCode
-#include <kregexp.h>
-%End
-
-
-public:
-                         KRegExp ();
-                         KRegExp (const char*, const char* = "");
-    bool                 compile (const char*, const char* = "");
-    bool                 match (const char*);
-    const char*          group (int);
-    int                  groupStart (int);
-    int                  groupEnd (int);
-
-};  // class KRegExp
-
diff --git a/sip/kdecore/krfcdate.sip b/sip/kdecore/krfcdate.sip
deleted file mode 100644
index 7628e37..0000000
--- a/sip/kdecore/krfcdate.sip
+++ /dev/null
@@ -1,42 +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 tdecore  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.
-
-
-class KRFCDate
-{
-%TypeHeaderCode
-#include <krfcdate.h>
-%End
-
-
-public:
-    static time_t        parseDate (const QString&);
-    static time_t        parseDateISO8601 (const QString&);
-    static int           localUTCOffset ();
-    static QCString      rfc2822DateString (time_t, int);
-    static QCString      rfc2822DateString (time_t);
-
-};  // class KRFCDate
-
diff --git a/sip/kdecore/krootprop.sip b/sip/kdecore/krootprop.sip
deleted file mode 100644
index 66d3d72..0000000
--- a/sip/kdecore/krootprop.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 tdecore  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.
-
-
-class KRootProp
-{
-%TypeHeaderCode
-#include <krootprop.h>
-%End
-
-
-public:
-                         KRootProp (const QString& = QString ::null );
-    void                 setProp (const QString& = "");
-    QString              prop () const;
-    void                 destroy ();
-    QString              readEntry (const QString&, const QString& = QString ::null ) const;
-    int                  readNumEntry (const QString&, int = 0) const;
-    QFont                readFontEntry (const QString&, const QFont* = 0) const;
-    QColor               readColorEntry (const QString&, const QColor* = 0) const;
-    QString              writeEntry (const QString&, const QString&);
-    QString              writeEntry (const QString&, int);
-    QString              writeEntry (const QString&, const QFont&);
-    QString              writeEntry (const QString&, const QColor&);
-    QString              removeEntry (const QString&);
-    QStringList          listEntries () const;
-    void                 sync ();
-
-};  // class KRootProp
-
diff --git a/sip/kdecore/ksavefile.sip b/sip/kdecore/ksavefile.sip
deleted file mode 100644
index 84975c9..0000000
--- a/sip/kdecore/ksavefile.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 tdecore  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.
-
-
-class KSaveFile
-{
-%TypeHeaderCode
-#include <ksavefile.h>
-%End
-
-
-public:
-                         KSaveFile (const QString&, int = 438);
-    int                  status ();
-    QString              name ();
-    int                  handle ();
-//ig     FILE*                fstream ();
-    QFile*               file ();
-    QTextStream*         textStream ();
-    QDataStream*         dataStream ();
-    void                 abort ();
-    bool                 close ();
-
-%If ( KDE_3_2_0 -  )
-    static bool          backupFile (const QString&, const QString& = QString ::null , const QString& = QString ::fromLatin1 ("~" ));
-%End
-
-
-};  // class KSaveFile
-
diff --git a/sip/kdecore/ksharedptr.sip b/sip/kdecore/ksharedptr.sip
deleted file mode 100644
index f6ca092..0000000
--- a/sip/kdecore/ksharedptr.sip
+++ /dev/null
@@ -1,45 +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 tdecore  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.
-
-
-class KShared
-{
-%TypeHeaderCode
-#include <ksharedptr.h>
-%End
-
-
-public:
-                         KShared ();
-                         KShared (const KShared&);
-    void                 _KShared_ref ();
-    void                 _KShared_unref ();
-    int                  _KShared_count ();
-
-protected:
-                         ~KShared ();
-
-};  // class KShared
-
diff --git a/sip/kdecore/kshell.sip b/sip/kdecore/kshell.sip
deleted file mode 100644
index 3285446..0000000
--- a/sip/kdecore/kshell.sip
+++ /dev/null
@@ -1,77 +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 tdecore  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 <kshell.h>
-extern char **pyArgvToC(PyObject *argvlist,int *argcp);
-%End
-
-
-%If ( KDE_3_2_0 -  )
-namespace KShell
-{
-
-enum Options
-{
-    NoOptions, 
-    TildeExpand, 
-    AbortOnMeta
-};
-
-
-enum Errors
-{
-    NoError, 
-    BadQuoting, 
-    FoundMeta
-};
-
-QStringList          splitArgs (const QString&, int = 0, int* = 0);
-QString              joinArgs (const QStringList&);
-QString              joinArgsDQ (const QStringList&);
-QString              joinArgs (SIP_PYLIST) [QString (const char**, int = -1)];
-%MethodCode
-//returns (QString)
-//takes a0 | a Python list of strings
-        int argc;
-        char **argv;
-
-        // Convert the list.
-
-        if ((argv = pyArgvToC(a0, &argc)) == NULL)
-            return NULL;
-
-        Py_BEGIN_ALLOW_THREADS
-        sipRes = new QString (KShell::joinArgs (argv, argc));
-        Py_END_ALLOW_THREADS
-
-%End
-
-QString              tildeExpand (const QString&);
-QString              homeDir (const QString&);
-};  // namespace KShell
-
-%End
-
diff --git a/sip/kdecore/kshortcut.sip b/sip/kdecore/kshortcut.sip
deleted file mode 100644
index bfc03c9..0000000
--- a/sip/kdecore/kshortcut.sip
+++ /dev/null
@@ -1,261 +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 tdecore  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.
-
-
-class KKey
-{
-%TypeHeaderCode
-#include <kshortcut.h>
-%End
-
-
-public:
-
-    enum 
-    {
-        MOD_FLAG_COUNT
-    };
-
-
-%If ( KDE_3_1_3 -  )
-
-    enum 
-    {
-        QtWIN
-    };
-
-%End
-
-
-    enum ModFlag
-    {
-        SHIFT, 
-        CTRL, 
-        ALT, 
-        WIN
-    };
-
-                         KKey ();
-                         KKey (int);
-                         KKey (const QKeySequence&);
-                         KKey (const QKeyEvent*);
-                         KKey (const KKey&);
-                         KKey (const QString&);
-                         KKey (uint, uint);
-    void                 clear ();
-    bool                 init (int);
-    bool                 init (const QKeySequence&);
-    bool                 init (const QKeyEvent*);
-    bool                 init (const KKey&);
-    bool                 init (const QString&);
-    bool                 init (uint, uint);
-    bool                 isNull () const;
-    uint                 sym () const;
-    uint                 modFlags () const;
-    int                  compare (const KKey&) const;
-
-%If ( KDE_3_1_4 -  )
-    bool                 operator == (const KKey&) const;
-    bool                 operator != (const KKey&) const;
-    bool                 operator < (const KKey&) const;
-%End
-
-    int                  keyCodeQt () const;
-    QString              toString () const;
-    QString              toStringInternal () const;
-    void                 simplify ();
-    static KKey&         null ();
-    static QString       modFlagLabel (KKey::ModFlag);
-
-public:
-
-%If (  - KDE_3_2_0 )
-//ig     bool                 isValidQt () const;
-//ig     bool                 isValidNative () const;
-%End
-
-
-public:
-
-%If ( KDE_3_1_2 - KDE_3_1_3 )
-
-    enum 
-    {
-        QtWIN
-    };
-
-%End
-
-
-public:
-
-%If (  - KDE_3_1_2 )
-
-    enum 
-    {
-        QtWIN
-    };
-
-%End
-
-
-};  // class KKey
-
-
-class KKeySequence
-{
-%TypeHeaderCode
-#include <kshortcut.h>
-%End
-
-
-public:
-
-    enum 
-    {
-        MAX_KEYS
-    };
-
-                         KKeySequence ();
-                         KKeySequence (const QKeySequence&);
-                         KKeySequence (const KKey&);
-//ig                          KKeySequence (const KKeyNative&);
-                         KKeySequence (const KKeySequence&);
-                         KKeySequence (const QString&);
-    void                 clear ();
-    bool                 init (const QKeySequence&);
-    bool                 init (const KKey&);
-//ig     bool                 init (const KKeyNative&);
-    bool                 init (const KKeySequence&);
-    bool                 init (const QString&);
-    uint                 count () const;
-    const KKey&          key (uint) const;
-    bool                 isTriggerOnRelease () const;
-    bool                 setKey (uint, const KKey&);
-    bool                 isNull () const;
-    bool                 startsWith (const KKeySequence&) const;
-    int                  compare (const KKeySequence&) const;
-
-%If ( KDE_3_1_4 -  )
-    bool                 operator == (const KKeySequence&) const;
-    bool                 operator != (const KKeySequence&) const;
-    bool                 operator < (const KKeySequence&) const;
-%End
-
-    QKeySequence         qt () const;
-    int                  keyCodeQt () const;
-    QString              toString () const;
-    QString              toStringInternal () const;
-    static KKeySequence& null ();
-
-protected:
-
-public:
-
-%If (  - KDE_3_2_0 )
-//ig     void                 setTriggerOnRelease (bool);
-%End
-
-
-};  // class KKeySequence
-
-
-class KShortcut
-{
-%TypeHeaderCode
-#include <kshortcut.h>
-%End
-
-
-public:
-
-    enum 
-    {
-        MAX_SEQUENCES
-    };
-
-                         KShortcut ();
-                         KShortcut (int);
-                         KShortcut (const QKeySequence&);
-                         KShortcut (const KKey&);
-                         KShortcut (const KKeySequence&);
-                         KShortcut (const KShortcut&);
-                         KShortcut (const char*);
-                         KShortcut (const QString&);
-    void                 clear ();
-    bool                 init (int);
-    bool                 init (const QKeySequence&);
-    bool                 init (const KKey&);
-    bool                 init (const KKeySequence&);
-    bool                 init (const KShortcut&);
-    bool                 init (const QString&);
-    uint                 count () const;
-    const KKeySequence&  seq (uint) const;
-    int                  keyCodeQt () const;
-    bool                 isNull () const;
-    int                  compare (const KShortcut&) const;
-
-%If ( KDE_3_1_4 -  )
-    bool                 operator == (const KShortcut&) const;
-    bool                 operator != (const KShortcut&) const;
-    bool                 operator < (const KShortcut&) const;
-%End
-
-    bool                 contains (const KKey&) const;
-    bool                 contains (const KKeyNative&) const;
-    bool                 contains (const KKeySequence&) const;
-    bool                 setSeq (uint, const KKeySequence&);
-    bool                 append (const KKeySequence&);
-
-%If ( KDE_3_3_0 -  )
-    void                 remove (const KKeySequence&);
-%End
-
-
-%If ( KDE_3_2_0 -  )
-    bool                 append (const KKey&);
-    bool                 append (const KShortcut&);
-%End
-
-
-%If ( KDE_3_1_4 -  )
-//ig                          operator QKeySequence () const;
-%End
-
-    QString              toString () const;
-    QString              toStringInternal (const KShortcut* = 0) const;
-    static KShortcut&    null ();
-
-protected:
-
-public:
-
-%If ( KDE_3_1_4 -  )
-//ig                          operator int () const;
-%End
-
-
-};  // class KShortcut
-
diff --git a/sip/kdecore/kshortcutlist.sip b/sip/kdecore/kshortcutlist.sip
deleted file mode 100644
index cdf22c9..0000000
--- a/sip/kdecore/kshortcutlist.sip
+++ /dev/null
@@ -1,133 +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 tdecore  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.
-
-
-class KShortcutList
-{
-%TypeHeaderCode
-#include <kconfigbase.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
-%End
-
-
-public:
-                         KShortcutList ();
-    virtual uint         count () const = 0;
-    virtual QString      name (uint) const = 0;
-    virtual QString      label (uint) const = 0;
-    virtual QString      whatsThis (uint) const = 0;
-    virtual const KShortcut& shortcut (uint) const = 0;
-    virtual const KShortcut& shortcutDefault (uint) const = 0;
-    virtual bool         isConfigurable (uint) const = 0;
-    virtual bool         setShortcut (uint, const KShortcut&)  = 0;
-    virtual bool         isGlobal (uint) const;
-    virtual int          index (const QString&) const;
-    virtual int          index (const KKeySequence&) const;
-    virtual const KInstance* instance () const;
-
-    enum Other
-    {
-
-    };
-
-    virtual QVariant     getOther (KShortcutList::Other, uint) const = 0;
-    virtual bool         setOther (KShortcutList::Other, uint, QVariant)  = 0;
-    virtual bool         save () const = 0;
-    virtual bool         readSettings (const QString& = QString ::null , KConfigBase* = 0);
-    virtual bool         writeSettings (const QString& = QString ::null , KConfigBase* = 0, bool = 0, bool = 0) const;
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KShortcutList
-
-
-class KAccelShortcutList : KShortcutList
-{
-%TypeHeaderCode
-#include <kconfigbase.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
-%End
-
-
-public:
-                         KAccelShortcutList (KAccel*);
-                         KAccelShortcutList (KGlobalAccel*);
-                         KAccelShortcutList (KAccelActions&, bool);
-    virtual uint         count () const;
-    virtual QString      name (uint) const;
-    virtual QString      label (uint) const;
-    virtual QString      whatsThis (uint) const;
-    virtual const KShortcut& shortcut (uint) const;
-    virtual const KShortcut& shortcutDefault (uint) const;
-    virtual bool         isConfigurable (uint) const;
-    virtual bool         setShortcut (uint, const KShortcut&);
-    virtual bool         isGlobal (uint) const;
-    virtual QVariant     getOther (KShortcutList::Other, uint) const;
-    virtual bool         setOther (KShortcutList::Other, uint, QVariant);
-    virtual bool         save () const;
-
-protected:
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KAccelShortcutList
-
-namespace KStdAccel
-{
-
-class ShortcutList : KShortcutList
-{
-%TypeHeaderCode
-#include <kconfigbase.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
-%End
-
-
-public:
-                         ShortcutList ();
-    virtual uint         count () const;
-    virtual QString      name (uint) const;
-    virtual QString      label (uint) const;
-    virtual QString      whatsThis (uint) const;
-    virtual const KShortcut& shortcut (uint) const;
-    virtual const KShortcut& shortcutDefault (uint) const;
-    virtual bool         isConfigurable (uint) const;
-    virtual bool         setShortcut (uint, const KShortcut&);
-    virtual QVariant     getOther (KShortcutList::Other, uint) const;
-    virtual bool         setOther (KShortcutList::Other, uint, QVariant);
-    virtual bool         save () const;
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class ShortcutList
-
-};  // namespace KStdAccel
-
diff --git a/sip/kdecore/ksimpleconfig.sip b/sip/kdecore/ksimpleconfig.sip
deleted file mode 100644
index 17b70a3..0000000
--- a/sip/kdecore/ksimpleconfig.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 tdecore  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.
-
-
-class KSimpleConfig : KConfig
-{
-%TypeHeaderCode
-#include <ksimpleconfig.h>
-%End
-
-
-public:
-                         KSimpleConfig (const QString&, bool = 0);
-
-%If ( KDE_3_2_0 -  )
-                         KSimpleConfig (KConfigBackEnd*, bool = 0);
-%End
-
-    virtual void         sync ();
-
-private:
-                         KSimpleConfig (const KSimpleConfig&);
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class KSimpleConfig
-
diff --git a/sip/kdecore/ksock.sip b/sip/kdecore/ksock.sip
deleted file mode 100644
index 5cb653e..0000000
--- a/sip/kdecore/ksock.sip
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-//     Copyright 2005 Jim Bublitz <jbublitz@nwinternet.com>
-//     Earlier copyrights 1998 - 2004 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module tdecore  version KDE_3_3_2
-
-
-// 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.
-
-
-class KSocket : QObject
-{
-%TypeHeaderCode
-#include <ksock.h>
-%End
-
-
-public:
-                         KSocket (int);
-                         KSocket (const char*, ushort, int = 30);
-                         KSocket (const char*);
-    int                  socket () const;
-    void                 enableRead (bool);
-    void                 enableWrite (bool);
-
-signals:
-    void                 readEvent (KSocket*);
-    void                 writeEvent (KSocket*);
-    void                 closeEvent (KSocket*);
-
-public slots:
-    void                 slotWrite (int);
-    void                 slotRead (int);
-
-protected:
-    bool                 connect (const QString&, ushort, int = 0);
-    bool                 connect (const char*);
-
-private:
-                         KSocket (const KSocket&);
-
-};  // class KSocket
-
-
-class KServerSocket : QObject
-{
-%TypeHeaderCode
-#include <ksock.h>
-%End
-
-
-public:
-                         KServerSocket (ushort, bool);
-                         KServerSocket (const char*, bool);
-    bool                 bindAndListen ();
-    int                  socket () const;
-    ushort               port ();
-
-public slots:
-    virtual void         slotAccept (int);
-
-signals:
-    void                 accepted (KSocket*);
-
-protected:
-    bool                 init (ushort);
-    bool                 init (const char*);
-
-private:
-                         KServerSocket (const KServerSocket&);
-
-public:
-
-%If (  - KDE_3_1_2 )
-                         KServerSocket (ushort);
-                         KServerSocket (const char*);
-%End
-
-
-};  // class KServerSocket
-
diff --git a/sip/kdecore/kstartupinfo.sip b/sip/kdecore/kstartupinfo.sip
deleted file mode 100644
index 319ee2d..0000000
--- a/sip/kdecore/kstartupinfo.sip
+++ /dev/null
@@ -1,280 +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 tdecore  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.
-
-
-class KStartupInfo : QObject
-{
-%TypeHeaderCode
-#include <kstartupinfo.h>
-%End
-
-
-public:
-
-%If ( KDE_3_2_0 -  )
-    static void          disableAutoAppStartedSending (bool = 1);
-%End
-
-    static void          appStarted ();
-
-%If ( KDE_3_2_0 -  )
-    static void          appStarted (const QCString&);
-    static void          setNewStartupId (QWidget*, const QCString&);
-    static void          silenceStartup (bool);
-
-%If ( KDE_3_3_0 -  )
-    static QCString      createNewStartupId ();
-%End
-
-%End
-
-
-%If ( KDE_3_1_1 -  )
-
-    enum 
-    {
-        CleanOnCantDetect, 
-        DisableKWinModule, 
-        AnnounceSilenceChanges
-    };
-
-%End
-
-                         KStartupInfo (bool, QObject* /TransferThis/ = 0, const char* = 0);
-    static bool          sendStartup (const KStartupInfoId&, const KStartupInfoData&);
-//ig     static bool          sendStartupX (Display*, const KStartupInfoId&, const KStartupInfoData&);
-    static bool          sendChange (const KStartupInfoId&, const KStartupInfoData&);
-//ig     static bool          sendChangeX (Display*, const KStartupInfoId&, const KStartupInfoData&);
-    static bool          sendFinish (const KStartupInfoId&);
-//ig     static bool          sendFinishX (Display*, const KStartupInfoId&);
-    static bool          sendFinish (const KStartupInfoId&, const KStartupInfoData&);
-//ig     static bool          sendFinishX (Display*, const KStartupInfoId&, const KStartupInfoData&);
-    static KStartupInfoId currentStartupIdEnv ();
-    static void          resetStartupEnv ();
-
-    enum startup_t
-    {
-        NoMatch, 
-        Match, 
-        CantDetect
-    };
-
-    KStartupInfo::startup_t checkStartup (WId);
-    KStartupInfo::startup_t checkStartup (WId, KStartupInfoId&);
-    KStartupInfo::startup_t checkStartup (WId, KStartupInfoData&);
-    KStartupInfo::startup_t checkStartup (WId, KStartupInfoId&, KStartupInfoData&);
-    void                 setTimeout (uint);
-    static void          setWindowStartupId (WId, const QCString&);
-    static QCString      windowStartupId (WId);
-
-%If ( KDE_3_2_0 -  )
-    static void          handleAutoAppStartedSending ();
-%End
-
-
-signals:
-    void                 gotNewStartup (const KStartupInfoId&, const KStartupInfoData&);
-    void                 gotStartupChange (const KStartupInfoId&, const KStartupInfoData&);
-    void                 gotRemoveStartup (const KStartupInfoId&, const KStartupInfoData&);
-
-protected:
-    virtual void         customEvent (QCustomEvent*);
-
-};  // class KStartupInfo
-
-
-class KStartupInfoId
-{
-%TypeHeaderCode
-#include <kstartupinfo.h>
-%End
-
-
-public:
-
-%If ( KDE_3_1_4 -  )
-    bool                 operator == (const KStartupInfoId&) const;
-    bool                 operator != (const KStartupInfoId&) const;
-%End
-
-    bool                 none () const;
-    void                 initId (const QCString& = "");
-    const QCString&      id () const;
-
-%If ( KDE_3_3_0 -  )
-    ulong                timestamp () const;
-%End
-
-    bool                 setupStartupEnv () const;
-                         KStartupInfoId ();
-                         KStartupInfoId (const KStartupInfoId&);
-
-%If ( KDE_3_1_4 -  )
-    bool                 operator < (const KStartupInfoId&) const;
-%End
-
-
-private:
-                         KStartupInfoId (const QString&);
-
-};  // class KStartupInfoId
-
-
-class KStartupInfoData
-{
-%TypeHeaderCode
-#include <kstartupinfo.h>
-%End
-
-
-public:
-    void                 setBin (const QString&);
-    const QString&       bin () const;
-    void                 setName (const QString&);
-    const QString&       findName () const;
-    const QString&       name () const;
-
-%If ( KDE_3_2_0 -  )
-    void                 setDescription (const QString&);
-    const QString&       findDescription () const;
-    const QString&       description () const;
-%End
-
-    void                 setIcon (const QString&);
-    const QString&       findIcon () const;
-    const QString&       icon () const;
-    void                 setDesktop (int);
-    int                  desktop () const;
-    void                 setWMClass (const QCString&);
-    const QCString       findWMClass () const;
-    const QCString&      WMClass () const;
-    void                 addPid (pid_t);
-    const QValueList<int>& pids () const;
-    bool                 is_pid (pid_t) const;
-    void                 setHostname (const QCString& = QCString ());
-    const QCString&      hostname () const;
-
-%If ( KDE_3_1_1 -  )
-
-    enum TriState
-    {
-        Yes, 
-        No, 
-        Unknown
-    };
-
-    void                 setSilent (KStartupInfoData::TriState);
-    KStartupInfoData::TriState silent () const;
-
-%If ( KDE_3_2_0 -  )
-    void                 setTimestamp (ulong);
-    ulong                timestamp () const;
-    int                  screen () const;
-    void                 setScreen (int);
-%End
-
-%End
-
-    void                 update (const KStartupInfoData&);
-                         KStartupInfoData ();
-                         KStartupInfoData (const KStartupInfoData&);
-
-private:
-                         KStartupInfoData (const QString&);
-
-};  // class KStartupInfoData
-
-/*%MappedType QValueList<pid_t>
-//converts a Python list of long
-{
-%TypeHeaderCode
-#include <qvaluelist.h>
-%End
-
-%ConvertFromTypeCode
-    // Handle no list.
-
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Convert to a Python list of long.
-
-    PyObject *l;
-
-    // Create the list.
-
-    if ((l = PyList_New(sipCpp -> count())) == NULL)
-        return NULL;
-
-    // Get it.
-
-    for (uint i = 0; i < sipCpp -> count(); ++i)
-        if (PyList_SetItem(l,i,PyLong_FromLong((long)(*sipCpp)[i])) < 0)
-        {
-            Py_DECREF(l);
-
-            return NULL;
-        }
-
-    return l;
-%End
-
-%ConvertToTypeCode
-    // Convert a Python list of long to a QValueList<long> on the heap.
-
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    if (sipPy == Py_None)
-    {
-        *sipCppPtr = NULL;
-
-        return 0;
-    }
-
-    QValueList<pid_t> *qvl = new QValueList<pid_t>;
-
-    PyErr_Clear();
-
-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-    {
-        qvl -> append((pid_t)PyLong_AsLong(PyList_GET_ITEM(sipPy,i)));
-
-        if (PyErr_Occurred() != NULL)
-        {
-            delete qvl;
-            *sipIsErr = 1;
-
-            return 0;
-        }
-    }
-
-    *sipCppPtr = qvl;
-
-    return 1;
-%End
-};*/
-
-
diff --git a/sip/kdecore/kstaticdeleter.sip b/sip/kdecore/kstaticdeleter.sip
deleted file mode 100644
index fb3778d..0000000
--- a/sip/kdecore/kstaticdeleter.sip
+++ /dev/null
@@ -1,38 +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 tdecore  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.
-
-
-class KStaticDeleterBase
-{
-%TypeHeaderCode
-#include <kstaticdeleter.h>
-%End
-
-
-public:
-    virtual void         destructObject ()  = 0;
-
-};  // class KStaticDeleterBase
-
diff --git a/sip/kdecore/kstdaccel.sip b/sip/kdecore/kstdaccel.sip
deleted file mode 100644
index f0ecb36..0000000
--- a/sip/kdecore/kstdaccel.sip
+++ /dev/null
@@ -1,441 +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 tdecore  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 <kstdaccel.h>
-%End
-
-namespace KStdAccel
-{
-
-%If ( KDE_3_4_0 -  )
-
-enum StdAccel
-{
-    AccelNone, 
-    Open, 
-    New, 
-    Close, 
-    Save, 
-    Print, 
-    Quit, 
-    Undo, 
-    Redo, 
-    Cut, 
-    Copy, 
-    Paste, 
-    SelectAll, 
-    Deselect, 
-    DeleteWordBack, 
-    DeleteWordForward, 
-    Find, 
-    FindNext, 
-    FindPrev, 
-    Replace, 
-    Home, 
-    End, 
-    Prior, 
-    Next, 
-    GotoLine, 
-    AddBookmark, 
-    ZoomIn, 
-    ZoomOut, 
-    Up, 
-    Back, 
-    Forward, 
-    Reload, 
-    PopupMenuContext, 
-    ShowMenubar, 
-    Help, 
-    WhatsThis, 
-    TextCompletion, 
-    PrevCompletion, 
-    NextCompletion, 
-    SubstringCompletion, 
-    RotateUp, 
-    RotateDown, 
-    TabNext, 
-    TabPrev, 
-    FullScreen, 
-    BackwardWord, 
-    ForwardWord, 
-    BeginningOfLine, 
-    EndOfLine, 
-    PasteSelection, 
-    WhatThis
-};
-
-%End
-
-const KShortcut&     shortcut (KStdAccel::StdAccel);
-QString              name (KStdAccel::StdAccel);
-QString              label (KStdAccel::StdAccel);
-QString              whatsThis (KStdAccel::StdAccel);
-KStdAccel::StdAccel  findStdAccel (const KKeySequence&);
-KShortcut            shortcutDefault (KStdAccel::StdAccel);
-KShortcut            shortcutDefault3 (KStdAccel::StdAccel);
-KShortcut            shortcutDefault4 (KStdAccel::StdAccel);
-const KShortcut&     open ();
-const KShortcut&     openNew ();
-const KShortcut&     close ();
-const KShortcut&     save ();
-const KShortcut&     print ()  /PyName=print_/;
-const KShortcut&     quit ();
-const KShortcut&     undo ();
-const KShortcut&     redo ();
-const KShortcut&     cut ();
-const KShortcut&     copy ();
-const KShortcut&     paste ();
-
-%If ( KDE_3_4_0 -  )
-const KShortcut&     pasteSelection ();
-%End
-
-const KShortcut&     selectAll ();
-const KShortcut&     deleteWordBack ();
-const KShortcut&     deleteWordForward ();
-const KShortcut&     find ();
-const KShortcut&     findNext ();
-const KShortcut&     findPrev ();
-const KShortcut&     replace ();
-const KShortcut&     zoomIn ();
-const KShortcut&     zoomOut ();
-//ig const KShortcut&     insert ();
-const KShortcut&     home ();
-const KShortcut&     end ();
-
-%If ( KDE_3_3_0 -  )
-const KShortcut&     beginningOfLine ();
-const KShortcut&     endOfLine ();
-%End
-
-const KShortcut&     prior ();
-const KShortcut&     next ();
-const KShortcut&     gotoLine ();
-const KShortcut&     addBookmark ();
-
-%If ( KDE_3_2_0 -  )
-const KShortcut&     tabNext ();
-const KShortcut&     tabPrev ();
-const KShortcut&     fullScreen ();
-%End
-
-const KShortcut&     help ();
-const KShortcut&     completion ();
-const KShortcut&     prevCompletion ();
-const KShortcut&     nextCompletion ();
-const KShortcut&     substringCompletion ();
-const KShortcut&     rotateUp ();
-const KShortcut&     rotateDown ();
-const KShortcut&     popupMenuContext ();
-const KShortcut&     whatsThis ();
-const KShortcut&     reload ();
-const KShortcut&     up ();
-const KShortcut&     back ();
-const KShortcut&     forward ();
-
-%If ( KDE_3_3_0 -  )
-const KShortcut&     backwardWord ();
-const KShortcut&     forwardWord ();
-%End
-
-const KShortcut&     showMenubar ();
-QString              action (KStdAccel::StdAccel);
-QString              description (KStdAccel::StdAccel);
-int                  key (KStdAccel::StdAccel);
-int                  defaultKey (KStdAccel::StdAccel);
-bool                 isEqual (const QKeyEvent*, int);
-
-%If ( KDE_3_3_0 - KDE_3_4_0 )
-
-enum StdAccel
-{
-    AccelNone, 
-    Open, 
-    New, 
-    Close, 
-    Save, 
-    Print, 
-    Quit, 
-    Undo, 
-    Redo, 
-    Cut, 
-    Copy, 
-    Paste, 
-    SelectAll, 
-    Deselect, 
-    DeleteWordBack, 
-    DeleteWordForward, 
-    Find, 
-    FindNext, 
-    FindPrev, 
-    Replace, 
-    Home, 
-    End, 
-    Prior, 
-    Next, 
-    GotoLine, 
-    AddBookmark, 
-    ZoomIn, 
-    ZoomOut, 
-    Up, 
-    Back, 
-    Forward, 
-    Reload, 
-    PopupMenuContext, 
-    ShowMenubar, 
-    Help, 
-    WhatsThis, 
-    TextCompletion, 
-    PrevCompletion, 
-    NextCompletion, 
-    SubstringCompletion, 
-    RotateUp, 
-    RotateDown, 
-    TabNext, 
-    TabPrev, 
-    FullScreen, 
-    BackwardWord, 
-    ForwardWord, 
-    BeginningOfLine, 
-    EndOfLine, 
-    WhatThis
-};
-
-%End
-
-
-%If ( KDE_3_2_0 - KDE_3_3_0 )
-
-enum StdAccel
-{
-    AccelNone, 
-    Open, 
-    New, 
-    Close, 
-    Save, 
-    Print, 
-    Quit, 
-    Undo, 
-    Redo, 
-    Cut, 
-    Copy, 
-    Paste, 
-    SelectAll, 
-    Deselect, 
-    DeleteWordBack, 
-    DeleteWordForward, 
-    Find, 
-    FindNext, 
-    FindPrev, 
-    Replace, 
-    Home, 
-    End, 
-    Prior, 
-    Next, 
-    GotoLine, 
-    AddBookmark, 
-    ZoomIn, 
-    ZoomOut, 
-    Up, 
-    Back, 
-    Forward, 
-    Reload, 
-    PopupMenuContext, 
-    ShowMenubar, 
-    Help, 
-    WhatsThis, 
-    TextCompletion, 
-    PrevCompletion, 
-    NextCompletion, 
-    SubstringCompletion, 
-    RotateUp, 
-    RotateDown, 
-    TabNext, 
-    TabPrev, 
-    FullScreen, 
-    WhatThis
-};
-
-%End
-
-
-%If ( KDE_3_1_3 - KDE_3_2_0 )
-
-enum StdAccel
-{
-    AccelNone, 
-    Open, 
-    New, 
-    Close, 
-    Save, 
-    Print, 
-    Quit, 
-    Undo, 
-    Redo, 
-    Cut, 
-    Copy, 
-    Paste, 
-    SelectAll, 
-    Deselect, 
-    DeleteWordBack, 
-    DeleteWordForward, 
-    Find, 
-    FindNext, 
-    FindPrev, 
-    Replace, 
-    Home, 
-    End, 
-    Prior, 
-    Next, 
-    GotoLine, 
-    AddBookmark, 
-    ZoomIn, 
-    ZoomOut, 
-    Up, 
-    Back, 
-    Forward, 
-    Reload, 
-    PopupMenuContext, 
-    ShowMenubar, 
-    Help, 
-    WhatsThis, 
-    TextCompletion, 
-    PrevCompletion, 
-    NextCompletion, 
-    SubstringCompletion, 
-    RotateUp, 
-    RotateDown, 
-    WhatThis
-};
-
-%End
-
-
-%If ( KDE_3_1_2 - KDE_3_1_3 )
-
-enum StdAccel
-{
-    AccelNone, 
-    Open, 
-    New, 
-    Close, 
-    Save, 
-    Print, 
-    Quit, 
-    Undo, 
-    Redo, 
-    Cut, 
-    Copy, 
-    Paste, 
-    SelectAll, 
-    Deselect, 
-    DeleteWordBack, 
-    DeleteWordForward, 
-    Find, 
-    FindNext, 
-    FindPrev, 
-    Replace, 
-    Home, 
-    End, 
-    Prior, 
-    Next, 
-    GotoLine, 
-    AddBookmark, 
-    ZoomIn, 
-    ZoomOut, 
-    Up, 
-    Back, 
-    Forward, 
-    Reload, 
-    PopupMenuContext, 
-    ShowMenubar, 
-    Help, 
-    WhatsThis, 
-    TextCompletion, 
-    PrevCompletion, 
-    NextCompletion, 
-    SubstringCompletion, 
-    RotateUp, 
-    RotateDown, 
-    WhatThis
-};
-
-%End
-
-
-%If (  - KDE_3_1_2 )
-
-enum StdAccel
-{
-    AccelNone, 
-    Open, 
-    New, 
-    Close, 
-    Save, 
-    Print, 
-    Quit, 
-    Undo, 
-    Redo, 
-    Cut, 
-    Copy, 
-    Paste, 
-    SelectAll, 
-    Deselect, 
-    DeleteWordBack, 
-    DeleteWordForward, 
-    Find, 
-    FindNext, 
-    FindPrev, 
-    Replace, 
-    Home, 
-    End, 
-    Prior, 
-    Next, 
-    GotoLine, 
-    AddBookmark, 
-    ZoomIn, 
-    ZoomOut, 
-    Up, 
-    Back, 
-    Forward, 
-    Reload, 
-    PopupMenuContext, 
-    ShowMenubar, 
-    Help, 
-    WhatsThis, 
-    TextCompletion, 
-    PrevCompletion, 
-    NextCompletion, 
-    SubstringCompletion, 
-    RotateUp, 
-    RotateDown, 
-    WhatThis
-};
-
-%End
-
-};  // namespace KStdAccel
-
diff --git a/sip/kdecore/kstddirs.sip b/sip/kdecore/kstddirs.sip
deleted file mode 100644
index c83819c..0000000
--- a/sip/kdecore/kstddirs.sip
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-//     Copyright 2003 Jim Bublitz <jbublitz@nwinternet.com>
-//     Earlier copyrights 1998 - 2002 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module tdecore  version KDE_3_1_1
-
-
-// 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.
-
-
-class KStandardDirs
-{
-%TypeHeaderCode
-#include <kstddirs.h>
-%End
-
-
-public:
-                         KStandardDirs ();
-    void                 addPrefix (const QString&);
-    bool                 addResourceType (const char*, const QString&);
-    bool                 addResourceDir (const char*, const QString&);
-    QString              findResource (const char*, const QString&) const;
-    Q_UINT32             calcResourceHash (const char*, const QString&, bool) const;
-    QStringList          findDirs (const char*, const QString&) const;
-    QString              findResourceDir (const char*, const QString&) const;
-    QStringList          findAllResources (const char*, const QString& = QString::null, bool = 0, bool = 0) const;
-    QStringList          findAllResources (const char*, const QString&, bool, bool, QStringList&) const;
-    static QString       findExe (const QString&, const QString& = QString::null, bool = 0);
-    static int           findAllExe (QStringList&, const QString&, const QString& = QString::null, bool = 0);
-    void                 addKDEDefaults ();
-    bool                 addCustomized (KConfig*);
-    QStringList          resourceDirs (const char*) const;
-    QStringList          allTypes () const;
-    QString              saveLocation (const char*, const QString& = QString::null, bool = 1) const;
-    static bool          makeDir (const QString&, int = 493);
-    static QString       kde_default (const char*);
-    QString              kfsstnd_prefixes ();
-    QString              localkdedir () const;
-    static bool          exists (const QString&);
-
-private:
-                         KStandardDirs (const KStandardDirs&);
-
-};  // class KStandardDirs
-
-
-%ModuleCode
-#include <kstddirs.h>
-%End
-
-QString              locate (const char*, const QString&, const KInstance* = KGlobal::instance());
-QString              locateLocal (const char*, const QString&, const KInstance* = KGlobal::instance());
diff --git a/sip/kdecore/kstringhandler.sip b/sip/kdecore/kstringhandler.sip
deleted file mode 100644
index 3084b52..0000000
--- a/sip/kdecore/kstringhandler.sip
+++ /dev/null
@@ -1,89 +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 tdecore  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.
-
-
-class KStringHandler
-{
-%TypeHeaderCode
-#include <kstringhandler.h>
-%End
-
-
-public:
-    static QString       word (const QString&, uint);
-    static QString       word (const QString&, const char*);
-    static QString       insword (const QString&, const QString&, uint);
-    static QString       setword (const QString&, const QString&, uint);
-    static QString       remrange (const QString&, const char*);
-    static QString       remword (const QString&, uint);
-    static QString       remword (const QString&, const QString&);
-    static QString       capwords (const QString&);
-    static QStringList   capwords (const QStringList&);
-    static QString       reverse (const QString&);
-    static QStringList   reverse (const QStringList&);
-    static QString       ljust (const QString&, uint);
-    static QString       rjust (const QString&, uint);
-    static QString       center (const QString&, uint);
-    static QString       lsqueeze (const QString&, uint = 40);
-
-%If ( KDE_3_2_0 -  )
-    static QString       lEmSqueeze (const QString&, const QFontMetrics&, uint = 30);
-    static QString       lPixelSqueeze (const QString&, const QFontMetrics&, uint);
-%End
-
-    static QString       csqueeze (const QString&, uint = 40);
-
-%If ( KDE_3_2_0 -  )
-    static QString       cEmSqueeze (const QString&, const QFontMetrics&, uint = 30);
-    static QString       cPixelSqueeze (const QString&, const QFontMetrics&, uint);
-%End
-
-    static QString       rsqueeze (const QString&, uint = 40);
-
-%If ( KDE_3_2_0 -  )
-    static QString       rEmSqueeze (const QString&, const QFontMetrics&, uint = 30);
-    static QString       rPixelSqueeze (const QString&, const QFontMetrics&, uint);
-%End
-
-    static bool          matchFileName (const QString&, const QString&);
-//ig     static QStringList   perlSplit (const QString&, const QString&, uint = 0);
-//ig     static QStringList   perlSplit (const QChar&, const QString&, uint = 0);
-//ig     static QStringList   perlSplit (const QRegExp&, const QString&, uint = 0);
-
-%If ( KDE_3_1_0 -  )
-    static QString       tagURLs (const QString&);
-
-%If ( KDE_3_2_0 -  )
-    static QString       obscure (const QString&);
-    static bool          isUtf8 (const char*);
-    static QString       from8Bit (const char*);
-%End
-
-%End
-
-    static bool          matchFilename (const QString&, const QString&);
-
-};  // class KStringHandler
-
diff --git a/sip/kdecore/ktempdir.sip b/sip/kdecore/ktempdir.sip
deleted file mode 100644
index 26da116..0000000
--- a/sip/kdecore/ktempdir.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 tdecore  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 -  )
-
-class KTempDir
-{
-%TypeHeaderCode
-#include <fixx11h.h>
-#include <ktempdir.h>
-%End
-
-
-public:
-                         KTempDir (QString = QString ::null , int = 448);
-    void                 setAutoDelete (bool);
-    int                  status () const;
-    QString              name () const;
-    QDir*                qDir ();
-    void                 unlink ();
-    bool                 existing () const;
-
-%If ( KDE_3_5_2 -  )
-    static bool          removeDir (const QString&);
-%End
-
-
-protected:
-    bool                 create (const QString&, int);
-    void                 setError (int);
-
-};  // class KTempDir
-
-%End
-
diff --git a/sip/kdecore/ktempfile.sip b/sip/kdecore/ktempfile.sip
deleted file mode 100644
index 108b292..0000000
--- a/sip/kdecore/ktempfile.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 tdecore  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.
-
-
-class KTempFile
-{
-%TypeHeaderCode
-#include <ktempfile.h>
-%End
-
-
-public:
-                         KTempFile (QString = QString ::null , QString = QString ::null , int = 384);
-    void                 setAutoDelete (bool);
-    int                  status ();
-    QString              name ();
-    int                  handle ();
-//ig     FILE*                fstream ();
-    QTextStream*         textStream ();
-    QDataStream*         dataStream ();
-    QFile*               file ();
-    void                 unlink ();
-
-%If ( KDE_3_3_0 -  )
-    bool                 sync ();
-%End
-
-    bool                 close ();
-
-protected:
-                         KTempFile (bool);
-    bool                 create (const QString&, const QString&, int);
-    void                 setError (int);
-
-};  // class KTempFile
-
diff --git a/sip/kdecore/ktimezones.sip b/sip/kdecore/ktimezones.sip
deleted file mode 100644
index dc31c4f..0000000
--- a/sip/kdecore/ktimezones.sip
+++ /dev/null
@@ -1,272 +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 tdecore  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_5_0 -  )
-
-class KTimezoneSource : KShared
-{
-%TypeHeaderCode
-#include <ktimezones.h>
-%End
-
-
-public:
-                         KTimezoneSource (const QString&);
-    virtual QString      db ();
-    virtual bool         parse (const QString&, KTimezoneDetails&) const;
-
-};  // class KTimezoneSource
-
-%End
-
-
-%If ( KDE_3_5_0 -  )
-
-class KTimezone
-{
-%TypeHeaderCode
-#include <ktimezones.h>
-%End
-
-
-public:
-    static const float   UNKNOWN;
-    static bool          isValidLatitude (float);
-    static bool          isValidLongitude (float);
-                         KTimezone (KSharedPtr<KTimezoneSource>, const QString&, const QString& = QString (), float = KTimezone ::UNKNOWN , float = KTimezone ::UNKNOWN , const QString& = QString ());
-    QString              name () const;
-    QString              countryCode () const;
-    float                latitude () const;
-    float                longitude () const;
-    int                  offset (Qt::TimeSpec = Qt ::UTC ) const;
-    int                  offset (const QDateTime&) const;
-    QDateTime            convert (const KTimezone*, const QDateTime&) const;
-    QString              comment () const;
-    bool                 parse (KTimezoneDetails&) const;
-
-private:
-                         KTimezone (const KTimezone&);
-
-public:
-//force
-    typedef KSharedPtr<KTimezoneSource> TZSourcePtr;
-//end
-
-};  // class KTimezone
-
-%End
-
-
-%If ( KDE_3_5_0 -  )
-
-class KTimezoneDetails
-{
-%TypeHeaderCode
-#include <ktimezones.h>
-%End
-
-
-public:
-                         KTimezoneDetails ();
-    virtual void         parseEnded ();
-    virtual void         parseStarted ();
-    virtual void         gotHeader (uint, uint, uint, uint, uint, uint);
-    virtual void         gotTransitionTime (int, uint);
-    virtual void         gotLocalTimeIndex (int, uint);
-    virtual void         gotLocalTime (int, int, bool, uint);
-    virtual void         gotAbbreviation (int, const QString&);
-    virtual void         gotLeapAdjustment (int, uint, uint);
-    virtual void         gotIsStandard (int, bool);
-    virtual void         gotIsUTC (int, bool);
-
-};  // class KTimezoneDetails
-
-%End
-
-
-%If ( KDE_3_5_0 -  )
-
-class KTimezones
-{
-%TypeHeaderCode
-#include <ktimezones.h>
-%End
-
-
-public:
-                         KTimezones ();
-    const KTimezone*     local ();
-    const KTimezone*     zone (const QString&);
-    typedef QMap<QString,KTimezone*> ZoneMap;
-    const KTimezones::ZoneMap allZones ();
-    void                 add (KTimezone*);
-
-private:
-                         KTimezones (const KTimezones&);
-
-};  // class KTimezones
-
-%End
-
-
-
-%If (KDE_3_5_0 - )
-%MappedType KSharedPtr<KTimezoneSource>
-//converts KSharedPtr<KTimezoneSource>
-{
-%TypeHeaderCode
-#include <ksharedptr.h>
-#include <ktimezones.h>
-%End
-
-%ConvertFromTypeCode
-    // Convert to a Python instance
-
-    if (!sipCpp)
-        return NULL;
-
-    KSharedPtr<KTimezoneSource> *cPtr = new KSharedPtr<KTimezoneSource> (*(KSharedPtr<KTimezoneSource> *)sipCpp);
-    KTimezoneSource *cpp = cPtr->data ();
-    PyObject *obj = sipConvertFromInstance (cpp, sipClass_KTimezoneSource, sipTransferObj);
-
-    return obj;
-%End
-
-%ConvertToTypeCode
-    // Convert a Python instance to a Ptr on the heap.
-
-    if (sipIsErr == NULL)
-        return PyInstance_Check(sipPy);
-
-    int iserr = 0;
-    KTimezoneSource *cpp = (KTimezoneSource *)sipForceConvertToType(sipPy, sipType_KTimezoneSource, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
-
-    if (iserr)
-    {
-        *sipIsErr = 1;
-        return 0;
-    }
-
-    *sipCppPtr = new KSharedPtr<KTimezoneSource> (cpp);
-
-    return 1;
-%End
-};
-%End
-
-
-%If (KDE_3_5_0 - )
-%MappedType KTimezones::ZoneMap
-//converts a Python dict of QString:KTimezone
-{
-%TypeHeaderCode
-#include <qmap.h>
-#include <qstring.h>
-#include <ktimezones.h>
-%End
-
-%ConvertFromTypeCode
-    // Convert to a Python dict
-
-    if (!sipCpp)
-        return PyDict_New();
-
-    PyObject *dict;
-
-    // Create the dictionary.
-
-    if ((dict = PyDict_New()) == NULL)
-        return NULL;
-
-    // Get it.
-
-    const QMap<QString, KTimezone*> cppmap = *sipCpp;
-    QMap<QString, KTimezone*>::ConstIterator it;
-
-    for (it = cppmap.begin (); it != cppmap.end (); ++it)
-    {
-        QString acpp = it.key ();
-        KTimezone *bcpp = it.data ();
-        PyObject *ainst;
-        PyObject *binst = NULL;
-        if (((ainst = sipConvertFromNewType(new QString(acpp), sipType_QString, sipTransferObj)) == NULL)
-            || ((binst = sipConvertFromType(bcpp, sipType_KTimezone, sipTransferObj)) == NULL)
-            || (PyDict_SetItem (dict, ainst, binst) < 0))
-        {
-            Py_XDECREF (ainst);
-            Py_XDECREF (binst);
-            Py_DECREF (dict);
-            return NULL;
-        }
-    }
-
-    return dict;
-%End
-
-
-%ConvertToTypeCode
-    // Convert a Python dictionary to a QMap on the heap.
-
-    if (sipIsErr == NULL)
-        return PyDict_Check(sipPy);
-
-    QMap<QString, KTimezone*> *cppmap = new QMap<QString, KTimezone*>;
-
-    PyObject *aelem, *belem;
-    SIP_SSIZE_T pos = 0;
-    QString *acpp;
-    KTimezone *bcpp;
-
-    while (PyDict_Next(sipPy, &pos, &aelem, &belem))
-    {
-        int iserr = 0, acpp_state;
-
-        acpp = (QString *)sipForceConvertToType(aelem, sipType_QString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
-        bcpp = (KTimezone *)sipForceConvertToType(belem, sipType_KTimezone, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
-
-        if (iserr)
-        {
-            if (acpp)
-                sipReleaseType(acpp, sipType_QString, acpp_state);
-
-            *sipIsErr = 1;
-            delete cppmap;
-            return 0;
-        }
-
-        cppmap->insert (*acpp, bcpp);
-
-        sipReleaseType(acpp, sipType_QString, acpp_state);
-    }
-
-    *sipCppPtr = cppmap;
-
-    return 1;
-%End
-};
-%End
-
-
diff --git a/sip/kdecore/kuniqueapplication.sip b/sip/kdecore/kuniqueapplication.sip
deleted file mode 100644
index a15e8ad..0000000
--- a/sip/kdecore/kuniqueapplication.sip
+++ /dev/null
@@ -1,68 +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 tdecore  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.
-
-
-class KUniqueApplication : KApplication, DCOPObject
-{
-%TypeHeaderCode
-#include <kuniqueapp.h>
-%End
-
-
-public:
-                         KUniqueApplication (bool, bool, bool);
-
-%If ( KDE_3_3_0 -  )
-//ig                          KUniqueApplication (Display*, Qt::HANDLE = 0, Qt::HANDLE = 0, bool = 1, bool = 0);
-%End
-
-    static void          addCmdLineOptions ();
-    static bool          start ();
-    bool                 process (const QCString&, const QByteArray&, QCString&, QByteArray&);
-    virtual int          newInstance ();
-
-%If ( KDE_3_3_0 -  )
-    bool                 restoringSession ();
-    static void          setHandleAutoStarted ();
-%End
-
-
-protected:
-
-%If ( KDE_3_3_0 -  )
-    virtual void         virtual_hook (int, void*);
-%End
-
-
-public:
-
-%If (  - KDE_3_3_0 )
-                         KUniqueApplication (bool = 1, bool = 1);
-    virtual DCOPClient*  dcopClient ();
-%End
-
-
-};  // class KUniqueApplication
-
diff --git a/sip/kdecore/kurl.sip b/sip/kdecore/kurl.sip
deleted file mode 100644
index 7acf594..0000000
--- a/sip/kdecore/kurl.sip
+++ /dev/null
@@ -1,408 +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 tdecore  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.
-
-
-class KURL
-{
-%TypeHeaderCode
-#include <kurl.h>
-%End
-
-
-public:
-
-    enum AdjustementFlags
-    {
-        NoAdjustements, 
-        StripFileProtocol
-    };
-
-
-%If ( KDE_3_2_0 -  )
-
-    enum URIMode
-    {
-        Auto, 
-        Invalid, 
-        RawURI, 
-        URL, 
-        Mailto
-    };
-
-%End
-
-                         KURL ();
-                         KURL (const QString&, int = 0);
-                         KURL (const char*, int = 0);
-                         KURL (const QCString&, int = 0);
-                         KURL (const KURL&);
-                         KURL (const QUrl&);
-                         KURL (const KURL&, const QString&, int = 0);
-    QString              protocol () const;
-    void                 setProtocol (const QString&);
-
-%If ( KDE_3_2_0 -  )
-    int                  uriMode () const;
-%End
-
-    QString              user () const;
-    void                 setUser (const QString&);
-    bool                 hasUser () const;
-    QString              pass ()  /PyName=pass_/;
-    void                 setPass (const QString&);
-    bool                 hasPass () const;
-    QString              host () const;
-    void                 setHost (const QString&);
-    bool                 hasHost () const;
-    ushort               port () const;
-    void                 setPort (ushort);
-    QString              path () const;
-    QString              path (int) const;
-    void                 setPath (const QString&);
-    bool                 hasPath () const;
-    void                 cleanPath (bool = 0);
-    void                 adjustPath (int);
-    void                 setEncodedPathAndQuery (const QString&, int = 0);
-    void                 setEncodedPath (const QString&, int = 0);
-    QString              encodedPathAndQuery (int = 0, bool = 0, int = 0) const;
-    void                 setQuery (const QString&, int = 0);
-    QString              query () const;
-    QString              ref () const;
-    void                 setRef (const QString&);
-    bool                 hasRef () const;
-    QString              htmlRef () const;
-    QString              encodedHtmlRef () const;
-    void                 setHTMLRef (const QString&);
-    bool                 hasHTMLRef () const;
-    bool                 isValid () const;
-    bool                 isMalformed () const;
-    bool                 isLocalFile () const;
-    void                 setFileEncoding (const QString&);
-    QString              fileEncoding () const;
-    bool                 hasSubURL () const;
-    void                 addPath (const QString&);
-    QString              queryItem (const QString&) const;
-
-%If ( KDE_3_2_0 -  )
-    QString              queryItem (const QString&, int) const;
-%End
-
-
-%If ( KDE_3_1_0 -  )
-
-    enum QueryItemsOptions
-    {
-        CaseInsensitiveKeys
-    };
-
-    QMap<QString,QString> queryItems (int = 0) const;
-
-%If ( KDE_3_2_0 -  )
-    QMap<QString,QString> queryItems (int, int) const;
-%End
-
-    void                 addQueryItem (const QString&, const QString&, int = 0);
-    void                 removeQueryItem (const QString&);
-%End
-
-    void                 setFileName (const QString&);
-    QString              fileName (bool = 1) const;
-    QString              directory (bool = 1, bool = 1) const;
-
-%If ( KDE_3_2_0 -  )
-    void                 setDirectory (const QString&);
-%End
-
-    bool                 cd (const QString&);
-    QString              url (int = 0, int = 0) const;
-    QString              prettyURL (int = 0) const;
-    QString              prettyURL (int, KURL::AdjustementFlags) const;
-
-%If ( KDE_3_4_0 -  )
-    QString              pathOrURL () const;
-%End
-
-
-%If ( KDE_3_0_1 -  )
-    QString              htmlURL () const;
-%End
-
-    bool                 isEmpty () const;
-    KURL                 upURL () const;
-
-%If ( KDE_3_2_0 -  )
-    bool                 operator < (const KURL&) const;
-%End
-
-
-%If ( KDE_3_1_4 -  )
-    bool                 operator == (const KURL&) const;
-    bool                 operator == (const QString&) const;
-    bool                 operator != (const KURL&) const;
-    bool                 operator != (const QString&) const;
-%End
-
-    bool                 cmp (const KURL&, bool = 0) const;
-
-%If ( KDE_3_1_0 -  )
-    bool                 equals (const KURL&, bool = 0) const;
-%End
-
-    bool                 isParentOf (const KURL&) const;
-    static KURL::List    split (const QString&);
-    static KURL::List    split (const KURL&);
-    static KURL          join (const KURL::List&);
-
-%If ( KDE_3_1_0 -  )
-    static KURL          fromPathOrURL (const QString&);
-%End
-
-    static QString       encode_string (const QString&, int = 0);
-    static QString       encode_string_no_slash (const QString&, int = 0);
-    static QString       decode_string (const QString&, int = 0);
-    static bool          isRelativeURL (const QString&);
-
-%If ( KDE_3_2_0 -  )
-    static QString       relativeURL (const KURL&, const KURL&, int = 0);
-    static QString       relativePath (const QString&, const QString&, bool* = 0);
-    static KURL::URIMode uriModeForProtocol (const QString&);
-%End
-
-    QString              filename (bool = 1) const;
-
-protected:
-    void                 reset ();
-
-%If ( KDE_3_2_0 -  )
-    void                 parseURL (const QString&, int = 0);
-    void                 parseRawURI (const QString&, int = 0);
-    void                 parseMailto (const QString&, int = 0);
-%End
-
-    void                 parse (const QString&, int = 0);
-
-public:
-//force
-
-    class List
-    {
-
-    public:
-                             List ();
-                             List (const QStringList&);
-        QStringList          toStringList () const;
-        bool                 isEmpty () const;
-        void                 append (const KURL&);
-        void                 prepend (const KURL&);
-        void                 remove (const KURL&);
-        const KURL&          first () const;
-        const KURL&          last () const;
-        int                  findIndex (const KURL&) const;
-        uint                 contains (const KURL&) const;
-        uint                 count () const;
-        void                 clear ();
-        int                  __len__ ()  /NonLazy/;
-%MethodCode
-//returns (int)
-    Py_BEGIN_ALLOW_THREADS
-    sipRes = sipCpp -> count();
-    Py_END_ALLOW_THREADS
-%End
-
-        void                 __setitem__ (int, const KURL&);
-%MethodCode
-//takes index | (int) | value | (KURL)
-    int len;
-
-    len = sipCpp -> count();
-
-    if ((a0 = sipConvertFromSequenceIndex(a0,len)) < 0)
-        sipIsErr = 1;
-    else
-        (*sipCpp)[a0] = *a1;
-%End
-
-        void                 __setitem__ (SIP_PYSLICE, const KURL::List&);
-%MethodCode
-//takes range | (a Python slice) | urlList | (KURL.List)
-
-    int len;
-    SIP_SSIZE_T start, stop, step, slicelength;
-
-    len = sipCpp -> count();
-
-    if (sipConvertFromSliceObject(a0,len,&start,&stop,&step,&slicelength) < 0)
-        sipIsErr = 1;
-    else
-    {
-        int vlen = a1 -> count();
-        if (vlen != slicelength)
-        {
-            sipBadLengthForSlice(vlen,slicelength);
-            sipIsErr = 1;
-        }
-        else
-        {
-            KURL::List::ConstIterator it = a1 -> begin();
-            for (int i = 0; i < slicelength; ++i)
-            {
-                (*sipCpp)[start] = *it;
-                start += step;
-                ++it;
-            }
-        }
-    }
-%End
-
-        void                 __delitem__ (int);
-%MethodCode
-//takes index | (int)
-    int len;
-
-    len = sipCpp -> count();
-
-    if ((a0 = sipConvertFromSequenceIndex(a0,len)) < 0)
-        sipIsErr = 1;
-    else
-        sipCpp -> remove(sipCpp -> at(a0));
-%End
-
-        void                 __delitem__ (SIP_PYSLICE);
-%MethodCode
-//takes range | (a Python slice)
-    int len;
-    SIP_SSIZE_T start, stop, step, slicelength;
-
-    len = sipCpp -> count();
-    if (sipConvertFromSliceObject(a0,len,&start,&stop,&step,&slicelength) < 0)
-        sipIsErr = 1;
-    else
-        for (int i = 0; i < slicelength; ++i)
-        {
-            sipCpp -> remove(sipCpp -> at(start));
-            start += step - 1;
-        }
-%End
-
-        KURL                 operator [] (int);
-%MethodCode
-//returns (KURL)
-//takes index | (int)
-    int len;
-
-    len = sipCpp -> count();
-
-    if ((a0 = sipConvertFromSequenceIndex(a0,len)) < 0)
-        sipIsErr = 1;
-    else
-        sipRes = new KURL((*sipCpp)[a0]);
-%End
-
-        KURL::List           operator [] (SIP_PYSLICE);
-%MethodCode
-//returns (KURL.List)
-//takes range | (a Python slice)
-    int len;
-    SIP_SSIZE_T start, stop, step, slicelength;
-
-    len = sipCpp -> count();
-
-    if (sipConvertFromSliceObject(a0,len,&start,&stop,&step,&slicelength) < 0)
-        sipIsErr = 1;
-    else
-    {
-        sipRes = new KURL::List();
-
-        for (int i = 0; i < slicelength; ++i)
-        {
-            (*sipRes) += (*sipCpp)[start];
-            start += step;
-        }
-    }
-%End
-
-        KURL::List           operator + (const KURL::List&);
-%MethodCode
-//returns (KURL.List)
-//takes listToAdd | (KURL.List)
-    Py_BEGIN_ALLOW_THREADS
-//    sipRes = new KURL::List((const KURL::List&)((*sipCpp) + *a0));
-    sipRes = new KURL::List (*sipCpp);
-    (*sipRes) += (*a0);
-    Py_END_ALLOW_THREADS
-%End
-
-        KURL::List&          operator += (const KURL::List&);
-        KURL::List           operator * (int);
-%MethodCode
-    sipRes = new KURL::List();
-
-    for (int i = 0; i < a0; ++i)
-        (*sipRes) += (*sipCpp);
-%End
-
-        KURL::List&          operator *= (int);
-%MethodCode
-//returns (KURL.List)
-//takes val | (int)
-    KURL::List orig(*sipCpp);
-
-    sipCpp -> clear();
-
-    for (int i = 0; i < a0; ++i)
-        (*sipCpp) += orig;
-%End
-
-        bool                 operator == (const KURL::List&);
-        bool                 operator != (const KURL::List&);
-        int                  __contains__ (KURL)  /NonLazy/;
-%MethodCode
-//returns (bool)
-//takes a0 | (KURL)
-
-    QString s = a0->url ();
-    sipRes = 0;
-    KURL::List::Iterator it;
-    for (it = sipCpp->begin (); (it != sipCpp->end ()) && (sipRes == 0); it++)
-        if (s == (*it).url ())
-            sipRes = 1;
-%End
-
-
-    };  // class List
-
-
-public:
-//end
-
-};  // class KURL
-
-bool                 urlcmp (const QString&, const QString&);
-bool                 urlcmp (const QString&, const QString&, bool, bool);
-
-%If ( KDE_3_1_4 -  )
-//igx QDataStream&         operator << (QDataStream&, const KURL&);
-//igx QDataStream&         operator >> (QDataStream&, KURL&);
-%End
diff --git a/sip/kdecore/kurldrag.sip b/sip/kdecore/kurldrag.sip
deleted file mode 100644
index 11b971e..0000000
--- a/sip/kdecore/kurldrag.sip
+++ /dev/null
@@ -1,76 +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 tdecore  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_4 -  )
-
-class KURLDrag : QUriDrag
-{
-%TypeHeaderCode
-#include <kurldrag.h>
-%End
-
-
-public:
-                         KURLDrag (const KURL::List&, QWidget*, const char*);
-                         KURLDrag (const KURL::List&, const QMap<QString,QString>&, QWidget*, const char*);
-
-%If ( KDE_3_4_0 -  )
-    void                 setExportAsText (bool);
-%End
-
-    static KURLDrag*     newDrag (const KURL::List&, QWidget* = 0, const char* = 0);
-    static KURLDrag*     newDrag (const KURL::List&, const QMap<QString,QString>&, QWidget* = 0, const char* = 0);
-    QMap<QString,QString>& metaData ();
-    static bool          decode (const QMimeSource*, KURL::List&);
-    static bool          decode (const QMimeSource*, KURL::List&, QMap<QString,QString>&);
-
-%If ( KDE_3_2_0 -  )
-    static QString       urlToString (const KURL&);
-    static KURL          stringToUrl (const QCString&);
-
-%If ( KDE_3_5_0 -  )
-    virtual const char*  format (int) const;
-    virtual QByteArray   encodedData (const char*) const;
-%End
-
-%End
-
-
-protected:
-                         KURLDrag (const QStrList&, const QMap<QString,QString>&, QWidget*, const char*);
-
-protected:
-
-%If (  - KDE_3_5_0 )
-    virtual const char*  format (int) const;
-    virtual QByteArray   encodedData (const char*) const;
-%End
-
-
-};  // class KURLDrag
-
-%End
-
diff --git a/sip/kdecore/kuser.sip b/sip/kdecore/kuser.sip
deleted file mode 100644
index 1ff5db9..0000000
--- a/sip/kdecore/kuser.sip
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-//     Copyright 2004 Jim Bublitz <jbublitz@nwinternet.com>
-//     Earlier copyrights 1998 - 2003 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module tdecore  version KDE_3_2_2
-
-
-// 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 -  )
-
-class KUser
-{
-%TypeHeaderCode
-#include <../extra/kde320/ksharedptr.h>
-#include <kuser.h>
-%End
-
-
-public:
-
-    enum UIDMode
-    {
-        UseEffectiveUID, 
-        UseRealUserID
-    };
-
-                         KUser (KUser::UIDMode = UseEffectiveUID );
-                         KUser (long);
-                         KUser (const QString&);
-                         KUser (const char*);
-//ig                          KUser (passwd*);
-    bool                 operator == (const KUser&) const;
-    bool                 operator != (const KUser&) const;
-    bool                 isValid () const;
-    long                 uid () const;
-    long                 gid () const;
-    bool                 isSuperUser () const;
-    QString              loginName () const;
-    QString              fullName () const;
-    QString              roomNumber () const;
-    QString              workPhone () const;
-    QString              homePhone () const;
-    QString              homeDir () const;
-    QString              shell () const;
-
-%If (  - KDE_3_2_1 )
-
-private:
-                         KUser (const KUser&);
-%End
-
-
-};  // class KUser
-
-%End
-
diff --git a/sip/kdecore/kvmallocator.sip b/sip/kdecore/kvmallocator.sip
deleted file mode 100644
index d75fa6d..0000000
--- a/sip/kdecore/kvmallocator.sip
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-//     Copyright 2003 Jim Bublitz <jbublitz@nwinternet.com>
-//     Earlier copyrights 1998 - 2002 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module tdecore  version KDE_3_1_1
-
-
-// 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.
-
-
-class KVMAllocator
-{
-%TypeHeaderCode
-#include <kvmallocator.h>
-%End
-
-public:
-                         KVMAllocator ();
-//ig     Block*               allocate (size_t);
-//ig     void                 free (Block*);
-//ig     void                 copy (void*, Block*, int = 0, size_t = 0);
-//ig     void                 copy (Block*, void*, int = 0, size_t = 0);
-//ig     void*                map (Block*);
-//ig     void                 unmap (Block*);
-
-};  // class KVMAllocator
diff --git a/sip/kdecore/kwin.sip b/sip/kdecore/kwin.sip
deleted file mode 100644
index 4340b39..0000000
--- a/sip/kdecore/kwin.sip
+++ /dev/null
@@ -1,188 +0,0 @@
-//
-//     Copyright 2005 Jim Bublitz <jbublitz@nwinternet.com>
-//     Earlier copyrights 1998 - 2004 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module tdecore  version KDE_3_3_2
-
-
-// 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.
-
-
-class KWin
-{
-%TypeHeaderCode
-#include <kwin.h>
-%End
-
-
-public:
-
-%If ( KDE_3_2_0 -  )
-    static void          activateWindow (WId, long = 0);
-    static void          forceActiveWindow (WId, long = 0);
-%End
-
-    static void          setActiveWindow (WId);
-
-%If ( KDE_3_2_0 -  )
-    static void          demandAttention (WId, bool = 1);
-    static void          setUserTime (WId, long);
-%End
-
-    static void          invokeContextHelp ();
-    static void          setSystemTrayWindowFor (WId, WId);
-
-%If ( KDE_3_2_0 -  )
-
-    class WindowInfo
-    {
-
-    public:
-                             WindowInfo (WId, ulong, ulong);
-                             WindowInfo ();
-        bool                 valid (bool = 0) const;
-        WId                  win () const;
-        ulong                state () const;
-
-%If ( KDE_3_2_1 -  )
-        bool                 hasState (ulong) const;
-%End
-
-        bool                 isMinimized () const;
-        NET::MappingState    mappingState () const;
-
-%If ( KDE_3_3_0 -  )
-        NETExtendedStrut     extendedStrut () const;
-%End
-
-        NETStrut             strut () const;
-        NET::WindowType      windowType (int) const;
-        QString              visibleName () const;
-        QString              visibleNameWithState () const;
-        QString              name () const;
-        QString              visibleIconName () const;
-        QString              visibleIconNameWithState () const;
-        QString              iconName () const;
-        bool                 isOnCurrentDesktop () const;
-        bool                 isOnDesktop (int) const;
-        bool                 onAllDesktops () const;
-        int                  desktop () const;
-        QRect                geometry () const;
-        QRect                frameGeometry () const;
-        WId                  transientFor () const;
-        WId                  groupLeader () const;
-
-%If ( KDE_3_3_0 -  )
-        QCString             windowClassClass () const;
-        QCString             windowClassName () const;
-        QCString             windowRole () const;
-        QCString             clientMachine () const;
-%End
-
-        bool                 actionSupported (NET::Action) const;
-                             WindowInfo (const KWin::WindowInfo&);
-
-    };  // class WindowInfo
-
-
-public:
-%End
-
-
-%If ( KDE_3_2_0 -  )
-    static KWin::WindowInfo windowInfo (WId, ulong = 0, ulong = 0);
-    static WId           transientFor (WId);
-    static WId           groupLeader (WId);
-%End
-
-    static QPixmap       icon (WId, int = -1, int = -1, bool = 0);
-
-%If ( KDE_3_2_0 -  )
-
-    enum IconSource
-    {
-        NETWM, 
-        WMHints, 
-        ClassHint, 
-        XApp
-    };
-
-    static QPixmap       icon (WId, int, int, bool, int);
-%End
-
-    static void          setIcons (WId, const QPixmap&, const QPixmap&);
-    static void          setType (WId, NET::WindowType);
-    static void          setState (WId, ulong);
-    static void          clearState (WId, ulong);
-    static void          setOnAllDesktops (WId, bool);
-    static void          setOnDesktop (WId, int);
-
-%If ( KDE_3_3_0 -  )
-    static void          setExtendedStrut (WId, int, int, int, int, int, int, int, int, int, int, int, int);
-%End
-
-    static void          setStrut (WId, int, int, int, int);
-    static int           currentDesktop ();
-    static int           numberOfDesktops ();
-    static void          setCurrentDesktop (int);
-    static void          iconifyWindow (WId, bool = 1);
-    static void          deIconifyWindow (WId, bool = 1);
-
-%If ( KDE_3_2_0 -  )
-    static void          raiseWindow (WId);
-    static void          lowerWindow (WId);
-    static bool          icccmCompliantMappingState ();
-    static bool          allowedActionsSupported ();
-    static QString       readNameProperty (WId, ulong);
-%End
-
-
-    class Info
-    {
-
-    public:
-        WId                  win;
-        ulong                state;
-
-%If ( KDE_3_2_0 -  )
-        bool                 isMinimized () const;
-%End
-
-        bool                 isIconified () const;
-        NET::MappingState    mappingState;
-        NETStrut             strut;
-        NET::WindowType      windowType;
-        QString              visibleName;
-        QString              name;
-        int                  desktop;
-        bool                 onAllDesktops;
-        pid_t                pid;
-        QRect                geometry;
-        QRect                frameGeometry;
-        QString              visibleNameWithState () const;
-
-    };  // class Info
-
-
-public:
-    static KWin::Info    info (WId);
-    static void          appStarted ();
-
-};  // class KWin
-
diff --git a/sip/kdecore/kwinmodule.sip b/sip/kdecore/kwinmodule.sip
deleted file mode 100644
index 8d31af4..0000000
--- a/sip/kdecore/kwinmodule.sip
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-//     Copyright 2005 Jim Bublitz <jbublitz@nwinternet.com>
-//     Earlier copyrights 1998 - 2004 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module tdecore  version KDE_3_3_2
-
-
-// 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.
-
-
-class KWinModule : QObject
-{
-%TypeHeaderCode
-#include <kwinmodule.h>
-%End
-
-
-public:
-
-%If ( KDE_3_2_0 -  )
-
-    enum 
-    {
-        INFO_DESKTOP, 
-        INFO_WINDOWS, 
-        INFO_ALL
-    };
-
-                         KWinModule (QObject* /TransferThis/, int);
-%End
-
-                         KWinModule (QObject* /TransferThis/ = 0);
-    const QValueList<WId>& windows () const;
-    const QValueList<WId>& stackingOrder () const;
-    bool                 hasWId (WId) const;
-    const QValueList<WId>& systemTrayWindows () const;
-    int                  currentDesktop () const;
-    int                  numberOfDesktops () const;
-    WId                  activeWindow () const;
-    QRect                workArea (int = -1) const;
-    QRect                workArea (const QValueList<WId>&, int = -1) const;
-    QString              desktopName (int) const;
-    void                 setDesktopName (int, const QString&);
-    void                 doNotManage (const QString&);
-
-signals:
-    void                 currentDesktopChanged (int);
-    void                 windowAdded (WId);
-    void                 windowRemoved (WId);
-    void                 activeWindowChanged (WId);
-    void                 desktopNamesChanged ();
-    void                 numberOfDesktopsChanged (int);
-    void                 systemTrayWindowAdded (WId);
-    void                 systemTrayWindowRemoved (WId);
-    void                 workAreaChanged ();
-    void                 strutChanged ();
-    void                 stackingOrderChanged ();
-
-%If ( KDE_3_2_0 -  )
-//ig     void                 windowChanged (WId, const ulong*);
-%End
-
-    void                 windowChanged (WId, uint);
-    void                 windowChanged (WId);
-
-protected:
-
-%If ( KDE_3_2_0 -  )
-    virtual void         connectNotify (const char*);
-%End
-
-
-};  // class KWinModule
-
-
-
-%MappedType QValueList<WId>
-//converts a Python list of WId
-{
-%TypeHeaderCode
-#include <qvaluelist.h>
-#include <kwinmodule.h>
-%End
-
-%ConvertFromTypeCode
-    if (!sipCpp)
-        return PyList_New(0);
-
-    // Create the list
-    PyObject *pylist;
-    if ((pylist = PyList_New(0)) == NULL)
-        return NULL;
-
-    QValueList<WId> *cpplist = (QValueList<WId> *)sipCpp;
-
-    // Get it.
-    QValueList<WId>::Iterator it;
-    for( it = cpplist->begin(); it != cpplist->end(); ++it )
-    {
-        WId cpp = *it;
-        if (PyList_Append (pylist, PyInt_FromLong ((int) cpp)) < 0)
-        {
-            Py_DECREF (pylist);
-            return NULL;
-        }
-    }
-
-    return pylist;
-%End
-
-
-%ConvertToTypeCode
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    QValueList<WId> *cpplist = new QValueList<WId>;
-
-    PyObject *elem;
-    WId cpp;
-    int iserr = 0;
-
-    for (int i = 0; i < PyList_Size (sipPy); i++)
-    {
-        elem = PyList_GET_ITEM (sipPy, i);
-        cpp = (WId) PyInt_AS_LONG (elem);
-        if (iserr)
-        {
-            *sipIsErr = 1;
-            delete cpplist;
-            return 0;
-        }
-
-        cpplist->append (cpp);
-    }
-
-    *sipCppPtr = cpplist;
-
-    return 1;
-%End
-};
-
-
diff --git a/sip/kdecore/kxmessages.sip b/sip/kdecore/kxmessages.sip
deleted file mode 100644
index 68fa9bf..0000000
--- a/sip/kdecore/kxmessages.sip
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-//     Copyright 2003 Jim Bublitz <jbublitz@nwinternet.com>
-//     Earlier copyrights 1998 - 2002 Jim Bublitz and/or Phil Thompson
-//     may also apply
-
-
-//                 Generated by preSip
-//            module tdecore  version KDE_3_1_0
-
-
-// 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.
-
-
-class KXMessages : QWidget
-{
-%TypeHeaderCode
-#include <qwidget.h>
-#include <kxmessages.h>
-%End
-
-public:
-                         KXMessages (const char* = 0, QWidget*/TransferThis/ = 0);
-    void                 sendMessage (WId, const char*, const QString&);
-    void                 broadcastMessage (const char*, const QString&);
-//ig         static bool          sendMessageX (Display*, WId, const char*, const QString&);
-//ig         static bool          broadcastMessageX (Display*, const char*, const QString&);
-
-signals:
-    void                 gotMessage (const QString&);
-
-protected:
-//ig         virtual bool         x11Event (XEvent*);
-
-protected:
-
-%If (  - KDE_3_0_1 )
-//ig         static void          send_message_internal (WId, const QString&, long, Display*, Atom, Window);
-%End
-
-
-};  // class KXMessages
-
diff --git a/sip/kdecore/netwm.sip b/sip/kdecore/netwm.sip
deleted file mode 100644
index a4f02df..0000000
--- a/sip/kdecore/netwm.sip
+++ /dev/null
@@ -1,628 +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 tdecore  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.
-
-
-class NETRootInfo : NET
-{
-%TypeHeaderCode
-#include <netwm.h>
-%End
-
-
-public:
-
-%If ( KDE_3_2_0 -  )
-
-    enum 
-    {
-        PROTOCOLS, 
-        WINDOW_TYPES, 
-        STATES, 
-        PROTOCOLS2, 
-        ACTIONS, 
-        PROPERTIES_SIZE
-    };
-
-                         NETRootInfo (Window, const char*, SIP_PYLIST, int = -1, bool = 1) [(Display*, Window, const char*, const ulong*, int, int = -1, bool = 1)];
-%MethodCode
-//takes supportWindow | (Window) | wmName | (a Python string) | properties | (a Python list) |  screen | (int = -1) | doActivate | (bool = True)
-    int count   = PyList_Size (a2);
-    unsigned long *list = new unsigned long [count];
-
-    for (int i = 0; i < count; i++)
-        list [i] = (unsigned long)PyInt_AS_LONG (PyList_GET_ITEM (a2, i));
-
-    Py_BEGIN_ALLOW_THREADS
-    Display *d = qt_xdisplay ();
-    sipCpp = new sipNETRootInfo (d, a0, a1, list, count, a3, a4);
-    Py_END_ALLOW_THREADS
-
-    delete list;
-%End
-
-%End
-
-                         NETRootInfo (Window, const char*, ulong, int = -1, bool = 1) [(Display*, Window, const char*, ulong, int = -1, bool = 1)];
-%MethodCode
-//takes  supportWindow | (Window) | wmName | (a Python string) | properties | (ulong) | screen | (int = -1) | doActivate | (bool = 1)
-
-    Py_BEGIN_ALLOW_THREADS
-    Display *d = qt_xdisplay ();
-    sipCpp = new sipNETRootInfo (d, a0, a1, a2, a3, a4);
-    Py_END_ALLOW_THREADS
-%End
-
-
-%If ( KDE_3_2_0 -  )
-                         NETRootInfo (SIP_PYLIST, int = -1, bool = 1) [(Display*, const ulong*, int, int = -1, bool = 1)];
-%MethodCode
-//takes properties | (ulong) | screen | (int = -1) | doActivate | (bool = 1)
-    int count   = PyList_Size (a0);
-    unsigned long *list = new unsigned long [count];
-
-    for (int i = 0; i < count; i++)
-        list [i] = (unsigned long)PyInt_AS_LONG (PyList_GET_ITEM (a2, i));
-
-    Py_BEGIN_ALLOW_THREADS
-    Display *d = qt_xdisplay ();
-    sipCpp = new sipNETRootInfo (d, list, count, a1, a2);
-    Py_END_ALLOW_THREADS
-
-    delete list;
-%End
-
-%End
-
-                         NETRootInfo (ulong, int = -1, bool = 1) [(Display*, ulong, int = -1, bool = 1)];
-%MethodCode
-//takes  properties | (ulong) | screen | (int = -1) | doActivate | (bool = 1)
-
-    Py_BEGIN_ALLOW_THREADS
-    Display *d = qt_xdisplay ();
-    sipCpp = new sipNETRootInfo (d, a0, a1, a2);
-    Py_END_ALLOW_THREADS
-%End
-
-                         NETRootInfo (const NETRootInfo&);
-    Display*             x11Display () const;
-    Window               rootWindow () const;
-    Window               supportWindow () const;
-    const char*          wmName () const;
-    int                  screenNumber () const;
-
-%If ( KDE_3_2_0 -  )
-    bool                 isSupported (NET::Property) const;
-    bool                 isSupported (NET::Property2) const;
-    bool                 isSupported (NET::WindowType) const;
-    bool                 isSupported (NET::State) const;
-    bool                 isSupported (NET::Action) const;
-    SIP_PYLIST           supportedProperties () const [ulong* ()];
-%MethodCode
-//returns a Python list of ulong
-    int count = 5;
-    const ulong *props;
-    Py_BEGIN_ALLOW_THREADS
-    props = sipCpp->supportedProperties ();
-    Py_END_ALLOW_THREADS
-
-    for (int i = 0; i < count; i++)
-        PyList_Append (sipRes, PyLong_FromUnsignedLong (props [i]));
-%End
-
-    SIP_PYLIST           passedProperties () const [ulong* ()];
-%MethodCode
-//returns a Python list of ulong
-    int count = 5;
-    const ulong *props;
-    Py_BEGIN_ALLOW_THREADS
-    props = sipCpp->passedProperties ();
-    Py_END_ALLOW_THREADS
-
-    for (int i = 0; i < count; i++)
-        PyList_Append (sipRes, PyLong_FromUnsignedLong (props [i]));
-%End
-
-%End
-
-    ulong                supported () const;
-    SIP_PYLIST           clientList () const [Window* ()];
-%MethodCode
-//returns a Python list of Window
-    int count = sipCpp->clientListCount ();
-    const Window *props;
-    Py_BEGIN_ALLOW_THREADS
-    props = sipCpp->clientList ();
-    Py_END_ALLOW_THREADS
-
-    for (int i = 0; i < count; i++)
-        PyList_Append (sipRes, PyLong_FromUnsignedLong ((unsigned long)props [i]));
-%End
-
-    int                  clientListCount () const;
-    SIP_PYLIST           clientListStacking () const [Window* ()];
-%MethodCode
-//returns a Python list of Window
-    int count = sipCpp->clientListStackingCount ();
-    const Window *props;
-    Py_BEGIN_ALLOW_THREADS
-    props = sipCpp->clientListStacking ();
-    Py_END_ALLOW_THREADS
-
-    for (int i = 0; i < count; i++)
-        PyList_Append (sipRes, PyLong_FromUnsignedLong ((unsigned long)props [i]));
-%End
-
-    int                  clientListStackingCount () const;
-    SIP_PYLIST           kdeSystemTrayWindows () const [Window* ()];
-%MethodCode
-//returns a Python list of Window
-    int count = sipCpp->kdeSystemTrayWindowsCount ();
-    const Window *props;
-    Py_BEGIN_ALLOW_THREADS
-    props = sipCpp->kdeSystemTrayWindows ();
-    Py_END_ALLOW_THREADS
-
-    for (int i = 0; i < count; i++)
-        PyList_Append (sipRes, PyLong_FromUnsignedLong ((unsigned long)props [i]));
-%End
-
-    int                  kdeSystemTrayWindowsCount () const;
-    NETSize              desktopGeometry (int) const;
-    NETPoint             desktopViewport (int) const;
-    NETRect              workArea (int) const;
-    const char*          desktopName (int) const;
-    SIP_PYLIST           virtualRoots () const [Window* ()];
-%MethodCode
-//returns a Python list of Window
-    int count = sipCpp->virtualRootsCount ();
-    const Window *props;
-    Py_BEGIN_ALLOW_THREADS
-    props = sipCpp->virtualRoots ();
-    Py_END_ALLOW_THREADS
-
-    for (int i = 0; i < count; i++)
-        PyList_Append (sipRes, PyLong_FromUnsignedLong ((unsigned long)props [i]));
-%End
-
-    int                  virtualRootsCount () const;
-    int                  numberOfDesktops () const;
-    int                  currentDesktop () const;
-    Window               activeWindow () const;
-    void                 activate ();
-    void                 setClientList (SIP_PYLIST) [void (Window*, uint)];
-%MethodCode
-//takes windows | (a Python list of Window)
-
-    int n = PyList_Size (a0);
-    Window array [n];
-    PyObject *elem;
-
-    for (int i = 0; i < n; i++)
-    {
-        elem = PyList_GetItem (a0, i);
-        if (!PyLong_Check (elem))
-            return NULL;
-
-        array [i] = (Window) PyLong_AsUnsignedLong (elem);
-    }
-
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp->setClientList (array, n);
-    Py_END_ALLOW_THREADS
-%End
-
-    void                 setClientListStacking (SIP_PYLIST) [void (Window*, uint)];
-%MethodCode
-//takes windows | (a Python list of Window)
-
-    int n = PyList_Size (a0);
-    Window array [n];
-    PyObject *elem;
-
-    for (int i = 0; i < n; i++)
-    {
-        elem = PyList_GetItem (a0, i);
-        if (!PyLong_Check (elem))
-            return NULL;
-
-        array [i] = (Window) PyLong_AsUnsignedLong (elem);
-    }
-
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp->setClientListStacking (array, n);
-    Py_END_ALLOW_THREADS
-%End
-
-    void                 setKDESystemTrayWindows (SIP_PYLIST) [void (Window*, uint)];
-%MethodCode
-//takes windows | (a Python list of Window)
-
-    int n = PyList_Size (a0);
-    Window array [n];
-    PyObject *elem;
-
-    for (int i = 0; i < n; i++)
-    {
-        elem = PyList_GetItem (a0, i);
-        if (!PyLong_Check (elem))
-            return NULL;
-
-        array [i] = (Window) PyLong_AsUnsignedLong (elem);
-    }
-
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp->setKDESystemTrayWindows (array, n);
-    Py_END_ALLOW_THREADS
-%End
-
-    void                 setCurrentDesktop (int);
-    void                 setDesktopGeometry (int, const NETSize&);
-    void                 setDesktopViewport (int, const NETPoint&);
-    void                 setNumberOfDesktops (int);
-    void                 setDesktopName (int, const char*);
-
-%If ( KDE_3_2_0 -  )
-    void                 setActiveWindow (Window, NET::RequestSource, Time, Window);
-%End
-
-    void                 setActiveWindow (Window);
-    void                 setWorkArea (int, const NETRect&);
-    void                 setVirtualRoots (SIP_PYLIST) [void (Window*, uint)];
-%MethodCode
-//takes windows | (a Python list of Window)
-    int n = PyList_Size (a0);
-
-    Window array [n];
-    PyObject *elem;
-
-    for (int i = 0; i < n; i++)
-    {
-        elem = PyList_GetItem (a0, i);
-        if (!PyLong_Check (elem))
-            return NULL;
-
-        array [i] = (Window) PyLong_AsUnsignedLong (elem);
-    }
-
-    Py_BEGIN_ALLOW_THREADS
-    sipCpp->setVirtualRoots (array, n);
-    Py_END_ALLOW_THREADS
-%End
-
-
-%If ( KDE_3_5_0 -  )
-    void                 setShowingDesktop (bool);
-    bool                 showingDesktop () const;
-%End
-
-    void                 closeWindowRequest (Window);
-    void                 moveResizeRequest (Window, int, int, Direction);
-
-%If ( KDE_3_2_0 -  )
-    void                 moveResizeWindowRequest (Window, int, int, int, int, int);
-
-%If ( KDE_3_3_0 -  )
-    void                 restackRequest (Window, RequestSource, Window, int, Time);
-%End
-
-    void                 restackRequest (Window, Window, int);
-//ig     void                 event (XEvent*, ulong*, int);
-%End
-
-//ig     ulong                event (XEvent*);
-
-protected:
-    virtual void         addClient (Window);
-    virtual void         removeClient (Window);
-    virtual void         addSystemTrayWin (Window);
-    virtual void         removeSystemTrayWin (Window);
-    virtual void         changeNumberOfDesktops (int);
-    virtual void         changeDesktopGeometry (int, const NETSize&);
-    virtual void         changeDesktopViewport (int, const NETPoint&);
-    virtual void         changeCurrentDesktop (int);
-    virtual void         changeActiveWindow (Window);
-    virtual void         closeWindow (Window);
-    virtual void         moveResize (Window, int, int, ulong);
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class NETRootInfo
-
-
-%If ( KDE_3_2_0 -  )
-
-class NETRootInfo2 : NETRootInfo
-{
-%TypeHeaderCode
-#include <netwm.h>
-%End
-
-
-public:
-                         NETRootInfo2 (Window, const char*, SIP_PYLIST, int = -1, bool = 1) [(Display*, Window, const char*, ulong*, int, int = -1, bool = 1)];
-%MethodCode
-//takes window | (Window) | rootWindow | (Window) | properties | (ulong) | role | (int) | a3 | (Role = Client)
-    int count   = PyList_Size (a2);
-    unsigned long *list = new unsigned long [count];
-
-    for (int i = 0; i < count; i++)
-        list [i] = (unsigned long)PyInt_AS_LONG (PyList_GET_ITEM (a2, i));
-
-    Py_BEGIN_ALLOW_THREADS
-    Display *d = qt_xdisplay ();
-    sipCpp = new sipNETRootInfo2 (d, a0, a1, list, count, a3, a4);
-    Py_END_ALLOW_THREADS
-
-    delete list;
-%End
-
-//ig                          NETRootInfo2 (Display*, const ulong*, int, int = -1, bool = 1);
-    void                 sendPing (Window, Time);
-
-protected:
-    virtual void         gotPing (Window, Time);
-    virtual void         changeActiveWindow (Window, NET::RequestSource, Time, Window);
-    virtual void         restackWindow (Window, Window, int);
-    virtual void         moveResizeWindow (Window, int, int, int, int, int);
-
-};  // class NETRootInfo2
-
-%End
-
-
-%If ( KDE_3_3_0 -  )
-
-class NETRootInfo3 : NETRootInfo2
-{
-%TypeHeaderCode
-#include <netwm.h>
-%End
-
-
-public:
-                         NETRootInfo3 (Window, const char*, SIP_PYLIST, int = -1, bool = 1) [(Display*, Window, const char*, ulong*, int, int = -1, bool = 1)];
-%MethodCode
-//takes window | (Window) | rootWindow | (Window) | properties | (ulong) | role | (int) | a3 | (Role = Client)
-    int count   = PyList_Size (a2);
-    unsigned long *list = new unsigned long [count];
-
-    for (int i = 0; i < count; i++)
-        list [i] = (unsigned long)PyInt_AS_LONG (PyList_GET_ITEM (a2, i));
-
-    Py_BEGIN_ALLOW_THREADS
-    Display *d = qt_xdisplay ();
-    sipCpp = new sipNETRootInfo3 (d, a0, a1, list, count, a3, a4);
-    Py_END_ALLOW_THREADS
-
-    delete list;
-%End
-
-//ig                          NETRootInfo3 (Display*, const ulong*, int, int = -1, bool = 1);
-    void                 takeActivity (Window, Time, long);
-
-protected:
-    virtual void         restackWindow (Window, RequestSource, Window, int, Time);
-    virtual void         gotTakeActivity (Window, Time, long);
-
-};  // class NETRootInfo3
-
-%End
-
-
-%If ( KDE_3_5_0 -  )
-
-class NETRootInfo4 : NETRootInfo3
-{
-%TypeHeaderCode
-#include <netwm.h>
-%End
-
-
-public:
-                         NETRootInfo4 (Window, const char*, SIP_PYLIST, int = -1, bool = 1) [(Display*, Window, const char*, ulong*, int, int = -1, bool = 1)];
-%MethodCode
-//takes window | (Window) | rootWindow | (Window) | properties | (ulong) | role | (int) | a3 | (Role = Client)
-    int count   = PyList_Size (a2);
-    unsigned long *list = new unsigned long [count];
-
-    for (int i = 0; i < count; i++)
-        list [i] = (unsigned long)PyInt_AS_LONG (PyList_GET_ITEM (a2, i));
-
-    Py_BEGIN_ALLOW_THREADS
-    Display *d = qt_xdisplay ();
-    sipCpp = new sipNETRootInfo4 (d, a0, a1, list, count, a3, a4);
-    Py_END_ALLOW_THREADS
-
-    delete list;
-%End
-
-//ig                          NETRootInfo4 (Display*, const ulong*, int, int = -1, bool = 1);
-
-protected:
-    virtual void         changeShowingDesktop (bool);
-
-};  // class NETRootInfo4
-
-%End
-
-
-class NETWinInfo : NET
-{
-%TypeHeaderCode
-#include <netwm.h>
-%End
-
-
-public:
-
-%If ( KDE_3_2_0 -  )
-
-    enum 
-    {
-        PROTOCOLS, 
-        PROTOCOLS2, 
-        PROPERTIES_SIZE
-    };
-
-                         NETWinInfo (Window, Window, SIP_PYLIST, Role = Client ) [(Display*, Window, Window, const ulong*, int, Role = Client )];
-%MethodCode
-//takes window | (Window) | rootWindow | (Window) | properties | (ulong) | role | (int) | a3 | (Role = Client)
-    int count   = PyList_Size (a2);
-    unsigned long *list = new unsigned long [count];
-
-    for (int i = 0; i < count; i++)
-        list [i] = (unsigned long)PyInt_AS_LONG (PyList_GET_ITEM (a2, i));
-
-    Py_BEGIN_ALLOW_THREADS
-    Display *d = qt_xdisplay ();
-    sipCpp = new sipNETWinInfo (d, a0, a1, list, count, a3);
-    Py_END_ALLOW_THREADS
-
-    delete list;
-%End
-
-%End
-
-                         NETWinInfo (Window, Window, ulong, Role = Client ) [(Display*, Window, Window, ulong, Role = Client )];
-%MethodCode
-//returns ()
-//takes window (Window) | rootWindow (Window) | properties (ulong) | role (Role = Client)
-
-    Py_BEGIN_ALLOW_THREADS
-    Display *d = qt_xdisplay ();
-    sipCpp = new sipNETWinInfo (d, a0, a1, a2, a3);
-    Py_END_ALLOW_THREADS
-%End
-
-                         NETWinInfo (const NETWinInfo&);
-
-%If ( KDE_3_2_0 -  )
-    bool                 hasNETSupport () const;
-    SIP_PYLIST           passedProperties () const [ulong* ()];
-%MethodCode
-//returns a Python list of ulong
-    int count = 2;
-    const ulong *props;
-    Py_BEGIN_ALLOW_THREADS
-    props = sipCpp->passedProperties ();
-    Py_END_ALLOW_THREADS
-
-    for (int i = 0; i < count; i++)
-        PyList_Append (sipRes, PyLong_FromUnsignedLong (props [i]));
-%End
-
-%End
-
-    ulong                properties () const;
-    NETRect              iconGeometry () const;
-    ulong                state () const;
-
-%If ( KDE_3_3_0 -  )
-    NETExtendedStrut     extendedStrut () const;
-%End
-
-    NETStrut             strut () const;
-
-%If ( KDE_3_2_0 -  )
-    WindowType           windowType (ulong) const;
-%End
-
-    WindowType           windowType () const;
-    const char*          name () const;
-    const char*          visibleName () const;
-    const char*          iconName () const;
-    const char*          visibleIconName () const;
-    int                  desktop () const;
-    int                  pid () const;
-    Bool                 handledIcons () const;
-    Window               kdeSystemTrayWinFor () const;
-    MappingState         mappingState () const;
-//ig     void                 setIcon (NETIcon, Bool = True);
-    void                 setIconGeometry (NETRect);
-
-%If ( KDE_3_3_0 -  )
-    void                 setExtendedStrut (const NETExtendedStrut&);
-%End
-
-    void                 setStrut (NETStrut);
-    void                 setState (ulong, ulong);
-    void                 setWindowType (WindowType);
-    void                 setName (const char*);
-    void                 setVisibleName (const char*);
-    void                 setIconName (const char*);
-    void                 setVisibleIconName (const char*);
-    void                 setDesktop (int);
-    void                 setPid (int);
-    void                 setHandledIcons (Bool);
-    void                 setKDESystemTrayWinFor (Window);
-
-%If ( KDE_3_5_0 -  )
-    void                 setFrameExtents (NETStrut);
-%End
-
-    void                 setKDEFrameStrut (NETStrut);
-//ig     NETIcon              icon (int = -1, int = -1) const;
-
-%If ( KDE_3_2_0 -  )
-    void                 setUserTime (Time);
-    Time                 userTime () const;
-    void                 setStartupId (const char*);
-    const char*          startupId () const;
-    void                 setAllowedActions (ulong);
-    ulong                allowedActions () const;
-    Window               transientFor () const;
-    Window               groupLeader () const;
-
-%If ( KDE_3_3_0 -  )
-    const char*          windowClassClass () const;
-    const char*          windowClassName () const;
-    const char*          windowRole () const;
-    const char*          clientMachine () const;
-%End
-
-%End
-
-    void                 kdeGeometry (NETRect&, NETRect&);
-
-%If ( KDE_3_2_0 -  )
-//ig     void                 event (XEvent*, ulong*, int);
-%End
-
-//ig     ulong                event (XEvent*);
-//ig     const int            OnAllDesktops;
-
-protected:
-    virtual void         changeDesktop (int);
-    virtual void         changeState (ulong, ulong);
-
-protected:
-//igx     virtual void         virtual_hook (int, void*);
-
-};  // class NETWinInfo
-
-//force
-typedef ulong Time;
-//end
diff --git a/sip/kdecore/netwm_def.sip b/sip/kdecore/netwm_def.sip
deleted file mode 100644
index f203ea1..0000000
--- a/sip/kdecore/netwm_def.sip
+++ /dev/null
@@ -1,535 +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 tdecore  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.
-
-
-class NETPoint
-{
-%TypeHeaderCode
-#include <netwm_def.h>
-%End
-
-
-public:
-                         NETPoint ();
-    int                  x;
-    int                  y;
-
-};  // class NETPoint
-
-
-class NETSize
-{
-%TypeHeaderCode
-#include <netwm_def.h>
-%End
-
-
-public:
-                         NETSize ();
-    int                  width;
-    int                  height;
-
-};  // class NETSize
-
-
-class NETRect
-{
-%TypeHeaderCode
-#include <netwm_def.h>
-%End
-
-
-public:
-    NETPoint             pos;
-    NETSize              size;
-
-};  // class NETRect
-
-
-class NETIcon
-{
-%TypeHeaderCode
-#include <netwm_def.h>
-%End
-
-
-public:
-                         NETIcon ();
-    NETSize              size;
-//ig     uchar*               data;
-
-};  // class NETIcon
-
-
-%If ( KDE_3_3_0 -  )
-
-class NETExtendedStrut
-{
-%TypeHeaderCode
-#include <netwm_def.h>
-%End
-
-
-public:
-                         NETExtendedStrut ();
-    int                  left_width;
-    int                  left_start;
-    int                  left_end;
-    int                  right_width;
-    int                  right_start;
-    int                  right_end;
-    int                  top_width;
-    int                  top_start;
-    int                  top_end;
-    int                  bottom_width;
-    int                  bottom_start;
-    int                  bottom_end;
-
-};  // class NETExtendedStrut
-
-%End
-
-
-class NETStrut
-{
-%TypeHeaderCode
-#include <netwm_def.h>
-%End
-
-
-public:
-                         NETStrut ();
-    int                  left;
-    int                  right;
-    int                  top;
-    int                  bottom;
-
-};  // class NETStrut
-
-
-class NET
-{
-%TypeHeaderCode
-#include <netwm_def.h>
-%End
-
-
-public:
-
-    enum Role
-    {
-        Client, 
-        WindowManager
-    };
-
-
-%If ( KDE_3_2_0 -  )
-
-    enum WindowType
-    {
-        Unknown, 
-        Normal, 
-        Desktop, 
-        Dock, 
-        Toolbar, 
-        Menu, 
-        Dialog, 
-        Override, 
-        TopMenu, 
-        Tool, 
-        Utility, 
-        Splash
-    };
-
-
-    enum WindowTypeMask
-    {
-        NormalMask, 
-        DesktopMask, 
-        DockMask, 
-        ToolbarMask, 
-        MenuMask, 
-        DialogMask, 
-        OverrideMask, 
-        TopMenuMask, 
-        UtilityMask, 
-        SplashMask
-    };
-
-
-%If ( KDE_3_3_1 -  )
-
-    enum 
-    {
-        AllTypesMask
-    };
-
-%End
-
-
-%If ( KDE_3_3_0 -  )
-    static bool          typeMatchesMask (NET::WindowType, ulong);
-%End
-
-
-    enum State
-    {
-        Modal, 
-        Sticky, 
-        MaxVert, 
-        MaxHoriz, 
-        Max, 
-        Shaded, 
-        SkipTaskbar, 
-        KeepAbove, 
-        StaysOnTop, 
-        SkipPager, 
-        Hidden, 
-        FullScreen, 
-        KeepBelow, 
-        DemandsAttention
-    };
-
-
-%If ( KDE_3_5_1 -  )
-
-    enum Direction
-    {
-        TopLeft, 
-        Top, 
-        TopRight, 
-        Right, 
-        BottomRight, 
-        Bottom, 
-        BottomLeft, 
-        Left, 
-        Move, 
-        KeyboardSize, 
-        KeyboardMove, 
-        MoveResizeCancel
-    };
-
-%End
-
-%End
-
-
-    enum MappingState
-    {
-        Visible, 
-        Withdrawn, 
-        Iconic
-    };
-
-
-%If ( KDE_3_2_0 -  )
-
-    enum Action
-    {
-        ActionMove, 
-        ActionResize, 
-        ActionMinimize, 
-        ActionShade, 
-        ActionStick, 
-        ActionMaxVert, 
-        ActionMaxHoriz, 
-        ActionMax, 
-        ActionFullScreen, 
-        ActionChangeDesktop, 
-        ActionClose
-    };
-
-
-%If ( KDE_3_5_0 -  )
-
-    enum Property
-    {
-        Supported, 
-        ClientList, 
-        ClientListStacking, 
-        NumberOfDesktops, 
-        DesktopGeometry, 
-        DesktopViewport, 
-        CurrentDesktop, 
-        DesktopNames, 
-        ActiveWindow, 
-        WorkArea, 
-        SupportingWMCheck, 
-        VirtualRoots, 
-        KDESystemTrayWindows, 
-        CloseWindow, 
-        WMMoveResize, 
-        WMName, 
-        WMVisibleName, 
-        WMDesktop, 
-        WMWindowType, 
-        WMState, 
-        WMStrut, 
-        WMIconGeometry, 
-        WMIcon, 
-        WMPid, 
-        WMHandledIcons, 
-        WMPing, 
-        WMKDESystemTrayWinFor, 
-        XAWMState, 
-        WMFrameExtents, 
-        WMKDEFrameStrut, 
-        WMIconName, 
-        WMVisibleIconName, 
-        WMGeometry
-    };
-
-%End
-
-
-    enum 
-    {
-        OnAllDesktops
-    };
-
-
-    enum RequestSource
-    {
-        FromUnknown, 
-        FromApplication, 
-        FromTool
-    };
-
-
-%If ( KDE_3_5_3 -  )
-    static int           timestampCompare (ulong, ulong);
-    static int           timestampDiff (ulong, ulong);
-%End
-
-%End
-
-
-public:
-
-%If ( KDE_3_2_0 - KDE_3_5_1 )
-
-    enum Direction
-    {
-        TopLeft, 
-        Top, 
-        TopRight, 
-        Right, 
-        BottomRight, 
-        Bottom, 
-        BottomLeft, 
-        Left, 
-        Move, 
-        KeyboardSize, 
-        KeyboardMove
-    };
-
-%End
-
-
-public:
-
-%If (  - KDE_3_5_0 )
-
-    enum Property
-    {
-        Supported, 
-        ClientList, 
-        ClientListStacking, 
-        NumberOfDesktops, 
-        DesktopGeometry, 
-        DesktopViewport, 
-        CurrentDesktop, 
-        DesktopNames, 
-        ActiveWindow, 
-        WorkArea, 
-        SupportingWMCheck, 
-        VirtualRoots, 
-        KDESystemTrayWindows, 
-        CloseWindow, 
-        WMMoveResize, 
-        WMName, 
-        WMVisibleName, 
-        WMDesktop, 
-        WMWindowType, 
-        WMState, 
-        WMStrut, 
-        WMIconGeometry, 
-        WMIcon, 
-        WMPid, 
-        WMHandledIcons, 
-        WMPing, 
-        WMKDESystemTrayWinFor, 
-        XAWMState, 
-        WMKDEFrameStrut, 
-        WMIconName, 
-        WMVisibleIconName, 
-        WMGeometry
-    };
-
-%End
-
-
-%If ( KDE_3_3_1 -  )
-
-    enum Property2
-    {
-        WM2UserTime, 
-        WM2StartupId, 
-        WM2TransientFor, 
-        WM2GroupLeader, 
-        WM2AllowedActions, 
-        WM2RestackWindow, 
-        WM2MoveResizeWindow, 
-        WM2ExtendedStrut, 
-        WM2TakeActivity, 
-        WM2KDETemporaryRules, 
-        WM2WindowClass, 
-        WM2WindowRole, 
-        WM2ClientMachine
-    };
-
-%End
-
-
-public:
-
-%If ( KDE_3_3_0 - KDE_3_3_1 )
-
-    enum 
-    {
-        AllTypesMask
-    };
-
-
-    enum Property2
-    {
-        WM2UserTime, 
-        WM2StartupId, 
-        WM2TransientFor, 
-        WM2GroupLeader, 
-        WM2AllowedActions, 
-        WM2RestackWindow, 
-        WM2MoveResizeWindow, 
-        WM2ExtendedStrut, 
-        WM2TakeActivity, 
-        WM2KDETemporaryRules
-    };
-
-%End
-
-
-public:
-
-%If ( KDE_3_2_0 - KDE_3_3_0 )
-
-    enum Property2
-    {
-        WM2UserTime, 
-        WM2StartupId, 
-        WM2TransientFor, 
-        WM2GroupLeader, 
-        WM2AllowedActions, 
-        WM2RestackWindow, 
-        WM2MoveResizeWindow
-    };
-
-%End
-
-
-public:
-
-%If ( KDE_3_1_0 - KDE_3_2_0 )
-
-    enum WindowType
-    {
-        Unknown, 
-        Normal, 
-        Desktop, 
-        Dock, 
-        Toolbar, 
-        Menu, 
-        Dialog, 
-        Override, 
-        TopMenu, 
-        Tool
-    };
-
-%End
-
-
-%If (  - KDE_3_2_0 )
-
-    enum State
-    {
-        Modal, 
-        Sticky, 
-        MaxVert, 
-        MaxHoriz, 
-        Max, 
-        Shaded, 
-        SkipTaskbar, 
-        StaysOnTop, 
-        SkipPager
-    };
-
-
-    enum Direction
-    {
-        TopLeft, 
-        Top, 
-        TopRight, 
-        Right, 
-        BottomRight, 
-        Bottom, 
-        BottomLeft, 
-        Left, 
-        Move
-    };
-
-%End
-
-
-public:
-
-%If (  - KDE_3_1_0 )
-
-    enum WindowType
-    {
-        Unknown, 
-        Normal, 
-        Desktop, 
-        Dock, 
-        Tool, 
-        Menu, 
-        Dialog, 
-        Override, 
-        Toolbar
-    };
-
-%End
-
-
-};  // class NET
-