Annotation of /trunk/kdebindings4/patches/kdebindings-4.2.4-pykde4-sip-4.8.patch
Parent Directory | Revision Log
Revision 850 -
(hide annotations)
(download)
Sat Jun 13 07:50:54 2009 UTC (15 years, 3 months ago) by niro
File size: 5254 byte(s)
Sat Jun 13 07:50:54 2009 UTC (15 years, 3 months ago) by niro
File size: 5254 byte(s)
-patches for kdebindings4
1 | niro | 850 | --- python/pykde4/sip/plasma/abstractrunner.sip 2009/01/06 06:52:12 906396 |
2 | +++ python/pykde4/sip/plasma/abstractrunner.sip 2009/04/25 13:15:30 959021 | ||
3 | @@ -129,7 +129,7 @@ | ||
4 | void setHasRunOptions (bool hasRunOptions); | ||
5 | void setSpeed (Plasma::AbstractRunner::Speed newSpeed); | ||
6 | void setPriority (Plasma::AbstractRunner::Priority newPriority); | ||
7 | - KService::List serviceQuery (const QString& serviceType, const QString& constraint = QString()) const; | ||
8 | +//FIXME KService::List serviceQuery (const QString& serviceType, const QString& constraint = QString()) const; | ||
9 | virtual QList<QAction*> actionsForMatch (const Plasma::QueryMatch& match); | ||
10 | QAction* addAction (const QString& id, const QIcon& icon, const QString& text); | ||
11 | void addAction (const QString& id, QAction* action); | ||
12 | --- python/pykde4/sip/phonon/backendcapabilities.sip 2008/07/04 19:03:58 828140 | ||
13 | +++ python/pykde4/sip/phonon/backendcapabilities.sip 2009/04/25 13:15:30 959021 | ||
14 | @@ -26,7 +26,7 @@ | ||
15 | { | ||
16 | namespace BackendCapabilities | ||
17 | { | ||
18 | -class Notifier : QObject /NoDefaultCtors,NoQMetaObject/ | ||
19 | +class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/ | ||
20 | { | ||
21 | |||
22 | signals: | ||
23 | --- python/pykde4/sip/kio/global.sip 2008/12/16 07:51:39 897475 | ||
24 | +++ python/pykde4/sip/kio/global.sip 2009/04/25 13:15:30 959021 | ||
25 | @@ -243,8 +243,8 @@ | ||
26 | { | ||
27 | int iserr = 0; | ||
28 | |||
29 | - acpp = (QString *)sipForceConvertTo_QString (aelem, &iserr); | ||
30 | - bcpp = (QString *)sipForceConvertTo_QString (belem, &iserr); | ||
31 | + acpp = (QString *)sipForceConvertToInstance(aelem, sipClass_QString, NULL, 0, NULL, &iserr); | ||
32 | + bcpp = (QString *)sipForceConvertToInstance(belem, sipClass_QString, NULL, 0, NULL, &iserr); | ||
33 | |||
34 | if (iserr) | ||
35 | { | ||
36 | --- python/pykde4/sip/kio/kacl.sip 2008/07/04 19:03:58 828140 | ||
37 | +++ python/pykde4/sip/kio/kacl.sip 2009/04/25 13:15:30 959021 | ||
38 | @@ -144,8 +144,7 @@ | ||
39 | { | ||
40 | PyObject *elem = PyList_GET_ITEM (sipPy, i); | ||
41 | PyObject *pyp1 = PyTuple_GET_ITEM (elem, 0); | ||
42 | - p1 = *(QString *)sipForceConvertTo_QString (pyp1, &iserr); | ||
43 | - | ||
44 | + p1 = *(QString *)sipForceConvertToInstance(pyp1, sipClass_QString, NULL, 0, NULL, &iserr); | ||
45 | if (iserr) | ||
46 | { | ||
47 | *sipIsErr = 1; | ||
48 | --- python/pykde4/sip/kdecore/kptydevice.sip 2008/07/04 19:03:58 828140 | ||
49 | +++ python/pykde4/sip/kdecore/kptydevice.sip 2009/04/25 13:15:30 959021 | ||
50 | @@ -46,9 +46,9 @@ signals: | ||
51 | void readEof (); | ||
52 | |||
53 | protected: | ||
54 | - virtual qint64 readData (char*, qint64); | ||
55 | - virtual qint64 readLineData (char*, qint64); | ||
56 | - virtual qint64 writeData (const char*, qint64); | ||
57 | +//ig virtual qint64 readData (char*, qint64); | ||
58 | +//ig virtual qint64 readLineData (char*, qint64); | ||
59 | +//ig virtual qint64 writeData (const char*, qint64); | ||
60 | |||
61 | }; // class KPtyDevice | ||
62 | |||
63 | --- python/pykde4/sip/akonadi/messagethreadingattribute.sip 2008/12/30 19:21:36 903526 | ||
64 | +++ python/pykde4/sip/akonadi/messagethreadingattribute.sip 2009/04/25 13:15:30 959021 | ||
65 | @@ -30,7 +30,7 @@ | ||
66 | |||
67 | public: | ||
68 | MessageThreadingAttribute (); | ||
69 | - MessageThreadingAttribute (const Akonadi::MessageThreadingAttribute& other); | ||
70 | +//ig MessageThreadingAttribute (const Akonadi::MessageThreadingAttribute& other); | ||
71 | QList<Akonadi::Entity::Id> perfectParents () const; | ||
72 | void setPerfectParents (const QList<Akonadi::Entity::Id>& parents); | ||
73 | QList<Akonadi::Entity::Id> unperfectParents () const; | ||
74 | --- python/pykde4/sip/dnssd/servicebase.sip 2008/12/30 19:21:36 903526 | ||
75 | +++ python/pykde4/sip/dnssd/servicebase.sip 2009/04/25 13:15:30 959021 | ||
76 | @@ -27,7 +27,7 @@ | ||
77 | %End | ||
78 | |||
79 | public: | ||
80 | - typedef KSharedPtr<DNSSD::ServiceBase> Ptr; | ||
81 | +// typedef KSharedPtr<DNSSD::ServiceBase> Ptr; | ||
82 | |||
83 | explicit ServiceBase (const QString& name = QString(), const QString& type = QString(), const QString& domain = QString(), const QString& host = QString(), unsigned short port = 0); | ||
84 | QString serviceName () const; | ||
85 | --- python/pykde4/sip/kdecore/typedefs.sip 2008/07/06 15:57:41 828781 | ||
86 | +++ python/pykde4/sip/kdecore/typedefs.sip 2009/04/25 13:15:30 959021 | ||
87 | @@ -244,7 +244,7 @@ | ||
88 | return PyInstance_Check(sipPy); | ||
89 | |||
90 | int iserr = 0; | ||
91 | - TYPE *cpp = (TYPE *)sipForceConvertTo_TYPE (sipPy, &iserr); | ||
92 | + TYPE *cpp = (TYPE *)sipForceConvertToInstance(sipPy, sipClass_TYPE, NULL, 0, NULL, &iserr); | ||
93 | |||
94 | if (iserr) | ||
95 | { | ||
96 | |||
97 | |||
98 | --- python/pykde4/sip/kparts/factory.sip 2008/07/04 19:03:58 828140 | ||
99 | +++ python/pykde4/sip/kparts/factory.sip 2009/06/01 19:03:03 976474 | ||
100 | @@ -37,7 +37,7 @@ | ||
101 | |||
102 | protected: | ||
103 | virtual KParts::Part* createPartObject (QWidget* parentWidget = 0, QObject* parent /Transfer/ = 0, const char* classname = "KParts::Part", const QStringList& args = QStringList()) = 0; | ||
104 | - virtual QObject* createObject (QObject* parent /Transfer/ = 0, const char* classname = "QObject", const QStringList& args = QStringList()); | ||
105 | +//ig virtual QObject* createObject (QObject* parent /Transfer/ = 0, const char* classname = "QObject", const QStringList& args = QStringList()); | ||
106 | }; // Factory | ||
107 | |||
108 | }; // KParts | ||
109 |