jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed the remaining occurrences of Shiboken::makeTuple.

Browse source
This commit is contained in:
Marcelo Lira 2011-12-01 17:32:48 -03:00 • committed by Hugo Parente Lima
commit 792504f978
8 changed files with 208 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

60
PySide/QtCore/typesystem_core.xml
View file

@ -937,7 +937,9 @@
static void msgHandlerCallback(QtMsgType type, const char* msg) static void msgHandlerCallback(QtMsgType type, const char* msg)
{ {
Shiboken::GilState state; Shiboken::GilState state;
Shiboken::AutoDecRef arglist(Shiboken::makeTuple(type, msg)); Shiboken::AutoDecRef arglist(PyTuple_New(2));
PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QtMsgType](type));
PyTuple_SET_ITEM(arglist, 1, %CONVERTTOPYTHON[const char*](msg));
Shiboken::AutoDecRef ret(PyObject_CallObject(qtmsghandler, arglist)); Shiboken::AutoDecRef ret(PyObject_CallObject(qtmsghandler, arglist));
} }
static void QtCoreModuleExit() static void QtCoreModuleExit()
@ -1047,9 +1049,11 @@
<replace-type modified-type="(intersectType, intersectionPoint)" /> <replace-type modified-type="(intersectType, intersectionPoint)" />
</modify-argument> </modify-argument>
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
QPointF p; QPointF p;
%RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;p); %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;p);
%PYARG_0 = Shiboken::makeTuple(retval, p); %PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QPointF](p));
</inject-code> </inject-code>
</modify-function> </modify-function>
</value-type> </value-type>
@ -1165,8 +1169,13 @@
</modify-argument> </modify-argument>
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
int year, month, day; int year, month, day;
%BEGIN_ALLOW_THREADS
%CPPSELF.%FUNCTION_NAME(&amp;year, &amp;month, &amp;day); %CPPSELF.%FUNCTION_NAME(&amp;year, &amp;month, &amp;day);
%PYARG_0 = Shiboken::makeTuple(year, month, day); %END_ALLOW_THREADS
%PYARG_0 = PyTuple_New(3);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[int](year));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[int](month));
PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[int](day));
</inject-code> </inject-code>
</modify-function> </modify-function>
<modify-function signature="weekNumber(int*)const" > <modify-function signature="weekNumber(int*)const" >
@ -1178,8 +1187,12 @@
</modify-argument> </modify-argument>
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
int yearNumber; int yearNumber;
%BEGIN_ALLOW_THREADS
int week = %CPPSELF.%FUNCTION_NAME(&amp;yearNumber); int week = %CPPSELF.%FUNCTION_NAME(&amp;yearNumber);
%PYARG_0 = Shiboken::makeTuple(week, yearNumber); %END_ALLOW_THREADS
%PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[int](week));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[int](yearNumber));
</inject-code> </inject-code>
</modify-function> </modify-function>
<!-- This function isn't part of Qt public API --> <!-- This function isn't part of Qt public API -->
@ -1357,6 +1370,7 @@
} }
}; };
</inject-code> </inject-code>
<modify-function signature="getCoords(int*,int*,int*,int*)const"> <modify-function signature="getCoords(int*,int*,int*,int*)const">
<modify-argument index="return"> <modify-argument index="return">
<replace-type modified-type="PyObject" /> <replace-type modified-type="PyObject" />
@ -1374,9 +1388,9 @@
<remove-argument /> <remove-argument />
</modify-argument> </modify-argument>
<inject-code class="target"> <inject-code class="target">
int a, b, c, d; <insert-template name="fix_number*,number*,number*,number*">
%CPPSELF.%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d); <replace from="$TYPE" to="int" />
%PYARG_0 = Shiboken::makeTuple(a, b, c, d); </insert-template>
</inject-code> </inject-code>
</modify-function> </modify-function>
<modify-function signature="getRect(int*,int*,int*,int*)const"> <modify-function signature="getRect(int*,int*,int*,int*)const">
@ -1396,9 +1410,9 @@
<remove-argument /> <remove-argument />
</modify-argument> </modify-argument>
<inject-code class="target"> <inject-code class="target">
int a, b, c, d; <insert-template name="fix_number*,number*,number*,number*">
%CPPSELF.%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d); <replace from="$TYPE" to="int" />
%PYARG_0 = Shiboken::makeTuple(a, b, c, d); </insert-template>
</inject-code> </inject-code>
</modify-function> </modify-function>
</value-type> </value-type>
@ -1441,9 +1455,9 @@
<remove-argument /> <remove-argument />
</modify-argument> </modify-argument>
<inject-code class="target"> <inject-code class="target">
qreal a, b, c, d; <insert-template name="fix_number*,number*,number*,number*">
%CPPSELF.%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d); <replace from="$TYPE" to="qreal" />
%PYARG_0 = Shiboken::makeTuple(a, b, c, d); </insert-template>
</inject-code> </inject-code>
</modify-function> </modify-function>
<modify-function signature="getRect(qreal*,qreal*,qreal*,qreal*)const"> <modify-function signature="getRect(qreal*,qreal*,qreal*,qreal*)const">
@ -1463,9 +1477,9 @@
<remove-argument /> <remove-argument />
</modify-argument> </modify-argument>
<inject-code class="target"> <inject-code class="target">
qreal a, b, c, d; <insert-template name="fix_number*,number*,number*,number*">
%CPPSELF.%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d); <replace from="$TYPE" to="qreal" />
%PYARG_0 = Shiboken::makeTuple(a, b, c, d); </insert-template>
</inject-code> </inject-code>
</modify-function> </modify-function>
</value-type> </value-type>
@ -3055,7 +3069,9 @@
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
qint64 pid; qint64 pid;
%RETURN_TYPE retval = %TYPE::%FUNCTION_NAME(%1, %2, %3, &amp;pid); %RETURN_TYPE retval = %TYPE::%FUNCTION_NAME(%1, %2, %3, &amp;pid);
%PYARG_0 = Shiboken::makeTuple(retval, pid); %PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[qint64](pid));
</inject-code> </inject-code>
</modify-function> </modify-function>
<!-- Function removed because on windows it returns a win32 specific structure --> <!-- Function removed because on windows it returns a win32 specific structure -->
@ -3163,8 +3179,10 @@
</conversion-rule> </conversion-rule>
</modify-argument> </modify-argument>
<inject-code position="end"> <inject-code position="end">
%PYARG_0 = Shiboken::makeTuple(%0, *result_out); %PYARG_0 = PyTuple_New(2);
delete result_out; PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[long](*result_out));
delete result_out;
</inject-code> </inject-code>
</modify-function> </modify-function>
</object-type> </object-type>

18
PySide/QtDeclarative/pysideqmlregistertype.cpp
View file

@ -258,7 +258,10 @@ PyTypeObject PropertyListType = {
void propListAppender(QDeclarativeListProperty<QDeclarativeItem>* propList, QDeclarativeItem* item) void propListAppender(QDeclarativeListProperty<QDeclarativeItem>* propList, QDeclarativeItem* item)
{ {
Shiboken::GilState state; Shiboken::GilState state;
Shiboken::AutoDecRef args(Shiboken::makeTuple(propList->object, item));
Shiboken::AutoDecRef args(PyTuple_New(2));
PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
PyTuple_SET_ITEM(args, 1, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtDeclarativeTypes[SBK_QDECLARATIVEITEM_IDX], item));
DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data); DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data);
Shiboken::AutoDecRef retVal(PyObject_CallObject(data->append, args)); Shiboken::AutoDecRef retVal(PyObject_CallObject(data->append, args));
@ -271,7 +274,9 @@ void propListAppender(QDeclarativeListProperty<QDeclarativeItem>* propList, QDec
int propListCount(QDeclarativeListProperty<QDeclarativeItem>* propList) int propListCount(QDeclarativeListProperty<QDeclarativeItem>* propList)
{ {
Shiboken::GilState state; Shiboken::GilState state;
Shiboken::AutoDecRef args(Shiboken::makeTuple(propList->object));
Shiboken::AutoDecRef args(PyTuple_New(1));
PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data); DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data);
Shiboken::AutoDecRef retVal(PyObject_CallObject(data->count, args)); Shiboken::AutoDecRef retVal(PyObject_CallObject(data->count, args));
@ -289,7 +294,10 @@ int propListCount(QDeclarativeListProperty<QDeclarativeItem>* propList)
QDeclarativeItem* propListAt(QDeclarativeListProperty<QDeclarativeItem>* propList, int index) QDeclarativeItem* propListAt(QDeclarativeListProperty<QDeclarativeItem>* propList, int index)
{ {
Shiboken::GilState state; Shiboken::GilState state;
Shiboken::AutoDecRef args(Shiboken::makeTuple(propList->object, index));
Shiboken::AutoDecRef args(PyTuple_New(2));
PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
PyTuple_SET_ITEM(args, 1, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter<int>(), &index));
DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data); DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data);
Shiboken::AutoDecRef retVal(PyObject_CallObject(data->at, args)); Shiboken::AutoDecRef retVal(PyObject_CallObject(data->at, args));
@ -306,7 +314,9 @@ QDeclarativeItem* propListAt(QDeclarativeListProperty<QDeclarativeItem>* propLis
void propListClear(QDeclarativeListProperty<QDeclarativeItem>* propList) void propListClear(QDeclarativeListProperty<QDeclarativeItem>* propList)
{ {
Shiboken::GilState state; Shiboken::GilState state;
Shiboken::AutoDecRef args(Shiboken::makeTuple(propList->object));
Shiboken::AutoDecRef args(PyTuple_New(1));
PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data); DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data);
Shiboken::AutoDecRef retVal(PyObject_CallObject(data->clear, args)); Shiboken::AutoDecRef retVal(PyObject_CallObject(data->clear, args));

4
PySide/QtDeclarative/typesystem_declarative.xml
View file

@ -104,7 +104,9 @@
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE ok_ = %CPPSELF.%FUNCTION_NAME(%1, %2, &amp;errorString); %RETURN_TYPE ok_ = %CPPSELF.%FUNCTION_NAME(%1, %2, &amp;errorString);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(ok_, errorString); %PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](ok_));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](errorString));
</inject-code> </inject-code>
</modify-function> </modify-function>
</object-type> </object-type>

66
PySide/QtGui/typesystem_gui_common.xml
View file

@ -448,10 +448,12 @@
<replace-type modified-type="PyObject" /> <replace-type modified-type="PyObject" />
</modify-argument> </modify-argument>
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE %0 = %CPPSELF->::%TYPE::%FUNCTION_NAME(&amp;%1, %2); %RETURN_TYPE %0 = %CPPSELF->::%TYPE::%FUNCTION_NAME(&amp;%1, %2);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(%0, %1); %PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](%1));
</inject-code> </inject-code>
</modify-function> </modify-function>
<modify-function signature="xToCursor(qreal,QTextLine::CursorPosition)const"> <modify-function signature="xToCursor(qreal,QTextLine::CursorPosition)const">
@ -911,9 +913,11 @@
</inject-code> </inject-code>
</add-function> </add-function>
<template name="qmatrix_map"> <template name="qmatrix_map">
%ARG1_TYPE a, b; %ARG1_TYPE a, b;
%CPPSELF.%FUNCTION_NAME(%1, %2, &amp;a, &amp;b); %CPPSELF.%FUNCTION_NAME(%1, %2, &amp;a, &amp;b);
%PYARG_0 = Shiboken::makeTuple(a, b); %PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%ARG1_TYPE](a));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](b));
</template> </template>
<modify-function signature="map(int,int,int*,int*)const"> <modify-function signature="map(int,int,int*,int*)const">
<modify-argument index="3"> <modify-argument index="3">
@ -1296,7 +1300,9 @@
</modify-argument> </modify-argument>
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="fix_int*,int*,int*,int*,int*"/> <insert-template name="fix_number*,number*,number*,number*,number*">
<replace from="$TYPE" to="int" />
</insert-template>
</inject-code> </inject-code>
</modify-function> </modify-function>
<modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)"> <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)">
@ -1321,7 +1327,9 @@
</modify-argument> </modify-argument>
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="fix_qreal*,qreal*,qreal*,qreal*,qreal*"/> <insert-template name="fix_number*,number*,number*,number*,number*">
<replace from="$TYPE" to="qreal" />
</insert-template>
</inject-code> </inject-code>
</modify-function> </modify-function>
<modify-function signature="getHsl(int*,int*,int*,int*)const" since="4.6"> <modify-function signature="getHsl(int*,int*,int*,int*)const" since="4.6">
@ -1775,9 +1783,11 @@
<replace-type modified-type="(retval, blockingPanel)"/> <replace-type modified-type="(retval, blockingPanel)"/>
</modify-argument> </modify-argument>
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
QGraphicsItem *item_ = NULL; QGraphicsItem *item_ = NULL;
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;item_); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;item_);
%PYARG_0 = Shiboken::makeTuple(retval_, item_); %PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QGraphicsItem*](item_));
</inject-code> </inject-code>
</modify-function> </modify-function>
<modify-function signature="itemTransform(const QGraphicsItem*,bool*)const"> <modify-function signature="itemTransform(const QGraphicsItem*,bool*)const">
@ -3362,9 +3372,13 @@
<remove-default-expression/> <remove-default-expression/>
</modify-argument> </modify-argument>
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
int a, b, c, d; int a, b, c, d;
%CPPSELF.%FUNCTION_NAME(%1, &amp;a, &amp;b, &amp;c, &amp;d); %CPPSELF.%FUNCTION_NAME(%1, &amp;a, &amp;b, &amp;c, &amp;d);
%PYARG_0 = Shiboken::makeTuple(a, b, c, d); %PYARG_0 = PyTuple_New(4);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[int](a));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[int](b));
PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[int](c));
PyTuple_SET_ITEM(%PYARG_0, 3, %CONVERTTOPYTHON[int](d));
</inject-code> </inject-code>
</modify-function> </modify-function>
</object-type> </object-type>
@ -4860,8 +4874,12 @@
<replace-type modified-type="(retval, subtype)"/> <replace-type modified-type="(retval, subtype)"/>
</modify-argument> </modify-argument>
<inject-code class="target" position="end"> <inject-code class="target" position="end">
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2); %BEGIN_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, %1); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2);
%END_ALLOW_THREADS
%PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](%1));
</inject-code> </inject-code>
</modify-function> </modify-function>
</object-type> </object-type>
@ -5678,12 +5696,14 @@
<enum-type name="RowWrapPolicy"/> <enum-type name="RowWrapPolicy"/>
<template name="fix_args,int*,ItemRole*"> <template name="fix_args,int*,ItemRole*">
int _row; int _row;
QFormLayout::ItemRole _role; QFormLayout::ItemRole _role;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%CPPSELF->%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_row, &amp;_role); %CPPSELF->%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_row, &amp;_role);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(_row, _role); %PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[int](_row));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QFormLayout::ItemRole](_role));
</template> </template>
<modify-function signature="getLayoutPosition(QLayout*,int*,QFormLayout::ItemRole*)const"> <modify-function signature="getLayoutPosition(QLayout*,int*,QFormLayout::ItemRole*)const">

2
PySide/QtNetwork/typesystem_network.xml
View file

@ -144,7 +144,7 @@
%RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(data, %ARGUMENT_NAMES, &amp;ha, &amp;port); %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(data, %ARGUMENT_NAMES, &amp;ha, &amp;port);
%END_ALLOW_THREADS %END_ALLOW_THREADS
QByteArray ba(data, retval); QByteArray ba(data, retval);
PyObject* %PYARG_0 = PyTuple_New(3); %PYARG_0 = PyTuple_New(3);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[QByteArray](ba)); PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[QByteArray](ba));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QHostAddress](ha)); PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QHostAddress](ha));
PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[quint16](port)); PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[quint16](port));

4
PySide/QtOpenGL/typesystem_opengl.xml
View file

@ -701,7 +701,9 @@
QByteArray ret; QByteArray ret;
if (result) if (result)
ret.append((const char*)data, %3); ret.append((const char*)data, %3);
%PYARG_0 = Shiboken::makeTuple(result, ret); %PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[bool](result));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QByteArray](ret));
delete[] data; delete[] data;
</inject-code> </inject-code>
</modify-function> </modify-function>

45
PySide/QtXml/typesystem_xml.xml
View file

@ -33,14 +33,17 @@
<value-type name="QDomComment" /> <value-type name="QDomComment" />
<template name="qdomdocument_setcontent"> <template name="qdomdocument_setcontent">
QString _errorMsg_; QString _errorMsg_;
int _errorLine_ = 0; int _errorLine_ = 0;
int _errorColumn_ = 0; int _errorColumn_ = 0;
%BEGIN_ALLOW_THREADS
%BEGIN_ALLOW_THREADS bool _ret_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_errorMsg_, &amp;_errorLine_, &amp;_errorColumn_);
bool _ret_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_errorMsg_, &amp;_errorLine_, &amp;_errorColumn_); %END_ALLOW_THREADS
%END_ALLOW_THREADS %PYARG_0 = PyTuple_New(4);
%PYARG_0 = Shiboken::makeTuple(_ret_, _errorMsg_, _errorLine_, _errorColumn_); PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[bool](_ret_));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](_errorMsg_));
PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[int](_errorLine_));
PyTuple_SET_ITEM(%PYARG_0, 3, %CONVERTTOPYTHON[int](_errorColumn_));
</template> </template>
<value-type name="QDomDocument"> <value-type name="QDomDocument">
@ -269,13 +272,13 @@
</conversion-rule> </conversion-rule>
</modify-argument> </modify-argument>
<inject-code class="target" position="end"> <inject-code class="target" position="end">
QXmlInputSource* _qxmlinputsource_arg_ = 0; QXmlInputSource* _qxmlinputsource_arg_ = 0;
%BEGIN_ALLOW_THREADS
%BEGIN_ALLOW_THREADS %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
%RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_); %END_ALLOW_THREADS
%END_ALLOW_THREADS %PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
%PYARG_0 = Shiboken::makeTuple(%0, _qxmlinputsource_arg_); PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QXmlInputSource*](_qxmlinputsource_arg_));
</inject-code> </inject-code>
</modify-function> </modify-function>
</object-type> </object-type>
@ -296,11 +299,13 @@
</conversion-rule> </conversion-rule>
</modify-argument> </modify-argument>
<inject-code class="target" position="end"> <inject-code class="target" position="end">
QXmlInputSource* _qxmlinputsource_arg_ = 0; QXmlInputSource* _qxmlinputsource_arg_ = 0;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE %0 = %CPPSELF.%TYPE::%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_); %RETURN_TYPE %0 = %CPPSELF.%TYPE::%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(%0, _qxmlinputsource_arg_); %PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QXmlInputSource*](_qxmlinputsource_arg_));
</inject-code> </inject-code>
</modify-function> </modify-function>
</object-type> </object-type>

144
PySide/typesystem_templates.xml
View file

@ -30,75 +30,80 @@
</template> </template>
<!-- Templates to fix bool* parameters --> <!-- Templates to fix bool* parameters -->
<template name="tuple_retval_ok">
%PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[bool](ok_));
</template>
<template name="fix_bool*"> <template name="fix_bool*">
bool ok_; bool ok_;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, ok_); <insert-template name="tuple_retval_ok"/>
</template> </template>
<template name="fix_args,bool*"> <template name="fix_args,bool*">
bool ok_; bool ok_;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;ok_); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;ok_);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, ok_); <insert-template name="tuple_retval_ok"/>
</template> </template>
<template name="fix_arg,bool*,arg"> <template name="fix_arg,bool*,arg">
bool ok_; bool ok_;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, &amp;ok_, %3); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, &amp;ok_, %3);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, ok_); <insert-template name="tuple_retval_ok"/>
</template> </template>
<template name="fix_bool*,arg"> <template name="fix_bool*,arg">
bool ok_; bool ok_;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, ok_); <insert-template name="tuple_retval_ok"/>
</template> </template>
<template name="fix_bool*,arg,arg"> <template name="fix_bool*,arg,arg">
bool ok_; bool ok_;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, ok_); <insert-template name="tuple_retval_ok"/>
</template> </template>
<template name="fix_bool*,arg,arg,arg"> <template name="fix_bool*,arg,arg,arg">
bool ok_; bool ok_;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3, %4); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3, %4);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, ok_); <insert-template name="tuple_retval_ok"/>
</template> </template>
<template name="fix_bool*,arg,arg,arg,arg"> <template name="fix_bool*,arg,arg,arg,arg">
bool ok_; bool ok_;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3, %4, %5); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3, %4, %5);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, ok_); <insert-template name="tuple_retval_ok"/>
</template> </template>
<template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg"> <template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg">
bool ok_; bool ok_;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, %7, &amp;ok_, %9); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, %7, &amp;ok_, %9);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, ok_); <insert-template name="tuple_retval_ok"/>
</template> </template>
<template name="fix_arg,arg,arg,arg,arg,arg,bool*,arg"> <template name="fix_arg,arg,arg,arg,arg,arg,bool*,arg">
bool ok_; bool ok_;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, &amp;ok_, %8); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, &amp;ok_, %8);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, ok_); <insert-template name="tuple_retval_ok"/>
</template> </template>
<template name="fix_arg,arg,arg,arg,arg,bool*,arg"> <template name="fix_arg,arg,arg,arg,arg,bool*,arg">
bool ok_; bool ok_;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, &amp;ok_, %7); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, &amp;ok_, %7);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, ok_); <insert-template name="tuple_retval_ok"/>
</template> </template>
<template name="get_slice"> <template name="get_slice">
%TYPE* sequence; %TYPE* sequence;
@ -143,27 +148,35 @@
</template> </template>
<template name="fix_char*"> <template name="fix_char*">
char val_; char val_;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;val_); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;val_);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, val_); %PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[char](val_));
</template> </template>
<template name="tuple_abcd_same_type">
%PYARG_0 = PyTuple_New(4);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[$TYPE](a));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[$TYPE](b));
PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[$TYPE](c));
PyTuple_SET_ITEM(%PYARG_0, 3, %CONVERTTOPYTHON[$TYPE](d));
</template>
<template name="fix_number*,number*,number*,number*"> <template name="fix_number*,number*,number*,number*">
$TYPE a, b, c, d; $TYPE a, b, c, d;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%CPPSELF->::%TYPE::%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d); %CPPSELF->::%TYPE::%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(a, b, c, d); <insert-template name="tuple_abcd_same_type"/>
</template> </template>
<template name="fix_number*,number*,number*,number*,args"> <template name="fix_number*,number*,number*,number*,args">
$TYPE a, b, c, d; $TYPE a, b, c, d;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%CPPSELF->::%TYPE::%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d, %ARGUMENT_NAMES); %CPPSELF->::%TYPE::%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d, %ARGUMENT_NAMES);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(a, b, c, d); <insert-template name="tuple_abcd_same_type"/>
</template> </template>
<template name="fix_native_return_number*,number*,number*,number*"> <template name="fix_native_return_number*,number*,number*,number*">
@ -183,18 +196,19 @@
} }
</template> </template>
<template name="fix_int*,int*,int*,int*,int*"> <template name="fix_number*,number*,number*,number*,number*">
int a, b, c, d, e; $TYPE a, b, c, d, e;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%CPPSELF.%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d, &amp;e); %CPPSELF.%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d, &amp;e);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(a, b, c, d, e); %PYARG_0 = PyTuple_New(5);
</template> PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[$TYPE](a));
<template name="fix_qreal*,qreal*,qreal*,qreal*,qreal*"> PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[$TYPE](b));
qreal a, b, c, d, e; PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[$TYPE](c));
%CPPSELF.%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d, &amp;e); PyTuple_SET_ITEM(%PYARG_0, 3, %CONVERTTOPYTHON[$TYPE](d));
%PYARG_0 = Shiboken::makeTuple(a, b, c, d, e); PyTuple_SET_ITEM(%PYARG_0, 4, %CONVERTTOPYTHON[$TYPE](e));
</template> </template>
<template name="read_wrapper"> <template name="read_wrapper">
Shiboken::AutoArrayPointer&lt;char&gt; _data(%2); Shiboken::AutoArrayPointer&lt;char&gt; _data(%2);
qint64 _size = %CPPSELF.%FUNCTION_NAME(_data, %2); qint64 _size = %CPPSELF.%FUNCTION_NAME(_data, %2);
@ -203,21 +217,15 @@
ba = QByteArray(_data, _size); ba = QByteArray(_data, _size);
%PYARG_0 = %CONVERTTOPYTHON[QByteArray](ba); %PYARG_0 = %CONVERTTOPYTHON[QByteArray](ba);
</template> </template>
<template name="fix_return_args,int*">
RETURNTYPE _ret;
int _arg;
%BEGIN_ALLOW_THREADS
_ret = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_arg);
%END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(_ret, _arg);
</template>
<template name="fix_args,number*,number*"> <template name="fix_args,number*,number*">
$TYPE a, b; $TYPE a, b;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;a, &amp;b); %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;a, &amp;b);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(a, b); %PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[$TYPE](a));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[$TYPE](b));
</template> </template>
<template name="fix_virtual_method_return_value_and_bool*"> <template name="fix_virtual_method_return_value_and_bool*">
@ -228,12 +236,15 @@
</template> </template>
<template name="fix_arg,int*,int*"> <template name="fix_arg,int*,int*">
%RETURN_TYPE _ret; %RETURN_TYPE _ret;
int a, b; int a, b;
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
_ret = %CPPSELF.%FUNCTION_NAME(%1, &amp;a, &amp;b); _ret = %CPPSELF.%FUNCTION_NAME(%1, &amp;a, &amp;b);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(_ret, a, b); %PYARG_0 = PyTuple_New(3);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](_ret));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[int](a));
PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[int](b));
</template> </template>
<template name="return_QString"> <template name="return_QString">
@ -241,17 +252,22 @@
</template> </template>
<template name="return_tuple_QValidator_QString_int"> <template name="return_tuple_QValidator_QString_int">
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %RETURN_TYPE(%CPPSELF.%FUNCTION_NAME(%1, %2)); %RETURN_TYPE retval_ = %RETURN_TYPE(%CPPSELF.%FUNCTION_NAME(%1, %2));
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, %1, %2); %PYARG_0 = PyTuple_New(3);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](%1));
PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[%ARG2_TYPE](%2));
</template> </template>
<template name="return_for_QFileDialog"> <template name="return_for_QFileDialog">
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, &amp;%5, %6); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, &amp;%5, %6);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, %5); %PYARG_0 = PyTuple_New(2);
PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG5_TYPE](%5));
</template> </template>
<template name="set_qapp_parent_for_orphan"> <template name="set_qapp_parent_for_orphan">
if (%PYARG_0 &amp;&amp; (%PYARG_0 != Py_None)) { if (%PYARG_0 &amp;&amp; (%PYARG_0 != Py_None)) {