--- python/pykde4/sip/kio/kacl.sip.orig	2009-07-23 15:41:49.000000000 -0400
+++ python/pykde4/sip/kio/kacl.sip	2009-07-23 15:42:25.000000000 -0400
@@ -144,7 +144,7 @@
     {
         PyObject *elem = PyList_GET_ITEM (sipPy, i);
         PyObject *pyp1 = PyTuple_GET_ITEM (elem, 0);
-        p1 = *(QString *)sipForceConvertTo_QString (pyp1, &iserr);
+        p1 = *(QString *)sipForceConvertToInstance(pyp1, sipClass_QString, NULL, 0, NULL, &iserr);
 
         if (iserr)
         {
--- python/pykde4/sip/kio/global.sip.orig	2009-07-23 15:44:30.000000000 -0400
+++ python/pykde4/sip/kio/global.sip	2009-07-23 15:45:18.000000000 -0400
@@ -243,8 +243,8 @@
     {
         int iserr = 0;
 
-        acpp = (QString *)sipForceConvertTo_QString (aelem, &iserr);
-        bcpp = (QString *)sipForceConvertTo_QString (belem, &iserr);
+        acpp = (QString *)sipForceConvertToInstance(aelem, sipClass_QString, NULL, 0, NULL, &iserr);
+        bcpp = (QString *)sipForceConvertToInstance(belem, sipClass_QString, NULL, 0, NULL, &iserr);
 
         if (iserr)
         {
--- python/pykde4/sip/kparts/factory.sip.orig	2009-07-23 15:48:03.000000000 -0400
+++ python/pykde4/sip/kparts/factory.sip	2009-07-23 15:48:13.000000000 -0400
@@ -37,7 +37,7 @@
 
 protected:
     virtual KParts::Part*   createPartObject (QWidget* parentWidget = 0, QObject* parent /Transfer/ = 0, const char* classname = "KParts::Part", const QStringList& args = QStringList()) = 0;
-    virtual QObject*        createObject (QObject* parent /Transfer/ = 0, const char* classname = "QObject", const QStringList& args = QStringList());
+    //virtual QObject*        createObject (QObject* parent /Transfer/ = 0, const char* classname = "QObject", const QStringList& args = QStringList());
 };   // Factory
 
 };   // KParts
--- python/pykde4/sip/phonon/backendcapabilities.sip.orig	2009-07-23 16:03:38.000000000 -0400
+++ python/pykde4/sip/phonon/backendcapabilities.sip	2009-07-23 16:03:55.000000000 -0400
@@ -26,7 +26,7 @@
 {
 namespace BackendCapabilities
 {
-class Notifier : QObject /NoDefaultCtors,NoQMetaObject/
+class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
 {
 
 signals:
--- python/pykde4/sip/kdecore/kptydevice.sip.orig	2009-07-23 15:37:28.000000000 -0400
+++ python/pykde4/sip/kdecore/kptydevice.sip	2009-07-23 15:38:08.000000000 -0400
@@ -46,9 +46,9 @@
     void                 readEof ();
 
 protected:
-    virtual qint64       readData (char*, qint64);
-    virtual qint64       readLineData (char*, qint64);
-    virtual qint64       writeData (const char*, qint64);
+    //virtual qint64       readData (char*, qint64);
+    //virtual qint64       readLineData (char*, qint64);
+    //virtual qint64       writeData (const char*, qint64);
 
 };  // class KPtyDevice
 
--- python/pykde4/sip/kdecore/typedefs.sip.orig	2009-07-23 16:05:52.000000000 -0400
+++ python/pykde4/sip/kdecore/typedefs.sip	2009-07-23 15:26:13.000000000 -0400
@@ -244,7 +244,7 @@
         return PyInstance_Check(sipPy);
 
     int iserr = 0;
-    TYPE *cpp = (TYPE *)sipForceConvertTo_TYPE (sipPy, &iserr);
+    TYPE *cpp = (TYPE *)sipForceConvertToInstance(sipPy, sipClass_TYPE, NULL, 0, NULL, &iserr);
 
     if (iserr)
     {
--- python/pykde4/sip/akonadi/messagethreadingattribute.sip.orig	2009-07-23 17:21:50.000000000 -0400
+++ python/pykde4/sip/akonadi/messagethreadingattribute.sip	2009-07-23 17:23:12.000000000 -0400
@@ -30,20 +30,23 @@
 
 public:
                             MessageThreadingAttribute ();
-                            MessageThreadingAttribute (const Akonadi::MessageThreadingAttribute& other);
-    QList<Akonadi::Entity::Id>         perfectParents () const;
-    void                    setPerfectParents (const QList<Akonadi::Entity::Id>& parents);
-    QList<Akonadi::Entity::Id>         unperfectParents () const;
-    void                    setUnperfectParents (const QList<Akonadi::Entity::Id>& parents);
-    QList<Akonadi::Entity::Id>         subjectParents () const;
-    void                    setSubjectParents (const QList<Akonadi::Entity::Id>& parents);
+//ig                        MessageThreadingAttribute (const Akonadi::MessageThreadingAttribute& other);
+//ig    QList<Akonadi::Item::Id>         perfectParents () const;
+//ig    void                    setPerfectParents (const QList<Akonadi::Item::Id>& parents);
+//ig    QList<Akonadi::Item::Id>         unperfectParents () const;
+//ig    void                    setUnperfectParents (const QList<Akonadi::Item::Id>& parents);
+//ig    QList<Akonadi::Item::Id>         subjectParents () const;
+//ig    void                    setSubjectParents (const QList<Akonadi::Item::Id>& parents);
     QByteArray              type () const;
     Akonadi::MessageThreadingAttribute*  clone () const;
     QByteArray              serialized () const;
     void                    deserialize (const QByteArray& data);
-//private:
-//    Akonadi::MessageThreadingAttribute& operator = (const Akonadi::MessageThreadingAttribute& other);
-
+    QList<Akonadi::Entity::Id>  perfectParents () const;
+    void                    setPerfectParents (const QList<Akonadi::Entity::Id>& parents);
+    QList<Akonadi::Entity::Id>  unperfectParents () const;
+    void                    setUnperfectParents (const QList<Akonadi::Entity::Id>& parents);
+    QList<Akonadi::Entity::Id>  subjectParents () const;
+    void                    setSubjectParents (const QList<Akonadi::Entity::Id>& parents);
 };   // MessageThreadingAttribute
 
 };   // Akonadi