1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
diff -urpN PyQt-x11-gpl-4.10.3.orig/sip/phonon/backendcapabilities.sip PyQt-x11-gpl-4.10.3/sip/phonon/backendcapabilities.sip
--- PyQt-x11-gpl-4.10.3.orig/sip/phonon/backendcapabilities.sip 2013-08-20 22:51:08.000000000 -0700
+++ PyQt-x11-gpl-4.10.3/sip/phonon/backendcapabilities.sip 2014-04-25 11:56:46.658038217 -0700
@@ -39,7 +39,7 @@ namespace Phonon
#include <backendcapabilities.h>
%End
- class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
+ class Notifier : QObject /NoDefaultCtors,PyQtNoQMetaObject/
{
%TypeHeaderCode
#include <backendcapabilities.h>
diff -urpN PyQt-x11-gpl-4.10.3.orig/sip/QtCore/qglobal.sip PyQt-x11-gpl-4.10.3/sip/QtCore/qglobal.sip
--- PyQt-x11-gpl-4.10.3.orig/sip/QtCore/qglobal.sip 2013-08-20 22:51:08.000000000 -0700
+++ PyQt-x11-gpl-4.10.3/sip/QtCore/qglobal.sip 2014-04-25 12:09:51.921693598 -0700
@@ -304,7 +304,7 @@ typedef bool QBool /NoTypeName/;
%End
// Template definition for QFlags.
template<ENUM>
-class QFlags /PyQt4Flags=0x1/
+class QFlags /PyQtFlags=0x1/
{
public:
QFlags(const QFlags &);
diff -urpN PyQt-x11-gpl-4.10.3.orig/sip/QtCore/qurl.sip PyQt-x11-gpl-4.10.3/sip/QtCore/qurl.sip
--- PyQt-x11-gpl-4.10.3.orig/sip/QtCore/qurl.sip 2013-08-20 22:51:08.000000000 -0700
+++ PyQt-x11-gpl-4.10.3/sip/QtCore/qurl.sip 2014-04-25 12:20:20.135974918 -0700
@@ -32,7 +32,7 @@
%If (Qt_5_0_0 -)
// Template definition for QUrlTwoFlags.
template<E1, E2>
-class QUrlTwoFlags /PyQt4Flags=0x1/
+class QUrlTwoFlags /PyQtFlags=0x1/
{
// These are handled by the %ConvertToTypeCode.
//QUrlTwoFlags(E1);
diff -urpN PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_chimera.cpp PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_chimera.cpp
--- PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_chimera.cpp 2013-08-20 22:51:08.000000000 -0700
+++ PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_chimera.cpp 2014-04-25 12:24:55.825034480 -0700
@@ -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;
}
diff -urpN 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
--- PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_qobject_helpers.cpp 2013-08-20 22:51:08.000000000 -0700
+++ PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_qobject_helpers.cpp 2014-04-25 12:28:25.954787869 -0700
@@ -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);
diff -urpN PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_types.cpp PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_types.cpp
--- PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_types.cpp 2013-08-20 22:51:08.000000000 -0700
+++ PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_types.cpp 2014-04-25 12:28:46.191571288 -0700
@@ -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);
}
diff -urpN PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_pyqtsignal.cpp PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_pyqtsignal.cpp
--- PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_pyqtsignal.cpp 2013-08-20 22:51:08.000000000 -0700
+++ PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_pyqtsignal.cpp 2014-04-25 12:31:26.920852082 -0700
@@ -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)
|
GitWeb