File fix-for-patched-sip.diff of Package python-qt4.1536

Overview Repositories Revisions Requests Users Attributes Meta

File fix-for-patched-sip.diff of Package python-qt4.1536

Index: PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_chimera.cpp
===================================================================
--- PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_chimera.cpp
+++ PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_chimera.cpp
@@ -554,7 +554,7 @@ bool Chimera::parse_py_type(PyTypeObject
 void Chimera::set_flag()
 {
     if (qpycore_is_pyqt4_class(_type))
-        _is_flag = ((pyqt4ClassTypeDef *)_type)->qt4_flags & 0x01;
+        _is_flag = ((pyqt4ClassTypeDef *)_type)->flags & 0x01;
 }
 
 
Index: PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_pyqtsignal.cpp
===================================================================
--- PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_pyqtsignal.cpp
+++ PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_pyqtsignal.cpp
@@ -574,7 +574,7 @@ void qpycore_set_signal_name(qpycore_pyq
 int qpycore_get_lazy_attr(const sipTypeDef *td, PyObject *dict)
 {
     pyqt4ClassTypeDef *ctd = (pyqt4ClassTypeDef *)td;
-    const pyqt4QtSignal *sigs = ctd->qt4_signals;
+    const pyqt4QtSignal *sigs = ctd->qt_signals;
 
     // Handle the trvial case.
     if (!sigs)
Index: PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_qobject_helpers.cpp
===================================================================
--- PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_qobject_helpers.cpp
+++ PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_qobject_helpers.cpp
@@ -57,7 +57,7 @@ const QMetaObject *qpycore_qobject_metao
         return QPYCORE_QMETAOBJECT(((pyqtWrapperType *)Py_TYPE(pySelf))->metaobject);
 
     // Fall back to the static Qt meta-object.
-    return reinterpret_cast<const QMetaObject *>(((pyqt4ClassTypeDef *)base)->qt4_static_metaobject);
+    return reinterpret_cast<const QMetaObject *>(((pyqt4ClassTypeDef *)base)->static_metaobject);
 }
 
 
@@ -324,7 +324,7 @@ PyObject *qpycore_qobject_staticmetaobje
             return 0;
         }
 
-        mo = reinterpret_cast<const QMetaObject *>(p4ctd->qt4_static_metaobject);
+        mo = reinterpret_cast<const QMetaObject *>(p4ctd->static_metaobject);
     }
 
     return sipConvertFromType(const_cast<QMetaObject *>(mo), sipType_QMetaObject, 0);
Index: PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_types.cpp
===================================================================
--- PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_types.cpp
+++ PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_types.cpp
@@ -161,7 +161,7 @@ static int pyqtWrapperType_init(pyqtWrap
     {
         // Create a dynamic meta-object as its base wrapped type has a static
         // Qt meta-object.
-        if (pyqt_td->qt4_static_metaobject && create_dynamic_metaobject(self) < 0)
+        if (pyqt_td->static_metaobject && create_dynamic_metaobject(self) < 0)
             return -1;
     }
 
@@ -815,7 +815,7 @@ static const QMetaObject *get_qmetaobjec
         return QPYCORE_QMETAOBJECT(pyqt_wt->metaobject);
 
     // It's a wrapped type.
-    return reinterpret_cast<const QMetaObject *>(((pyqt4ClassTypeDef *)((sipWrapperType *)pyqt_wt)->type)->qt4_static_metaobject);
+    return reinterpret_cast<const QMetaObject *>(((pyqt4ClassTypeDef *)((sipWrapperType *)pyqt_wt)->type)->static_metaobject);
 }

Places

File fix-for-patched-sip.diff of Package python-qt4.1536

Places