diff options
author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-08-03 16:19:51 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:54:42 -0300 |
commit | fae2dfd9b1bc948b72b4a34469a6e0e08e12a30f (patch) | |
tree | 22f7324462f64719b8208747209e4059057ae863 /PySide | |
parent | d129ca02f607068ded1ed6d073c20b56a3e9a276 (diff) |
Moved AutoArrayPointer from libpyside to libshiboken.
Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'PySide')
-rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 8 | ||||
-rw-r--r-- | PySide/QtNetwork/glue/qudpsocket_read_datagram_glue.cpp | 2 | ||||
-rw-r--r-- | PySide/QtNetwork/typesystem_network.xml | 12 | ||||
-rw-r--r-- | PySide/typesystem_templates.xml | 2 |
4 files changed, 4 insertions, 20 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 279670898..724d50630 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -3257,10 +3257,6 @@ <!-- TODO: Support conversions on virtual function --> <modify-function signature="drawItems(QPainter*, int, QGraphicsItem**, const QStyleOptionGraphicsItem*)"> - <extra-includes> - <include file-name="autoarraypointer.h" location="global"/> - </extra-includes> - <modify-argument index="2"> <remove-argument/> <conversion-rule class="native"> @@ -3272,7 +3268,7 @@ <replace-type modified-type="PySequence"/> <conversion-rule class="native"> int numItems = PySequence_Size(%PYARG_1); - PySide::AutoArrayPointer<QGraphicsItem*> %out(numItems); + Shiboken::AutoArrayPointer<QGraphicsItem*> %out(numItems); for (int i=0; i < numItems; i++) { %out[i] = %CONVERTTOCPP[QGraphicsItem*](PySequence_Fast_GET_ITEM(%PYARG_1, i)); } @@ -3299,7 +3295,7 @@ <conversion-rule class="native"> int numOptions = PySequence_Size(%PYARG_2); - PySide::AutoArrayPointer<QStyleOptionGraphicsItem> %out(numOptions); + Shiboken::AutoArrayPointer<QStyleOptionGraphicsItem> %out(numOptions); for (int i=0; i < numOptions; i++) { %out[i] = %CONVERTTOCPP[QStyleOptionGraphicsItem](PySequence_Fast_GET_ITEM(%PYARG_1, i)); } diff --git a/PySide/QtNetwork/glue/qudpsocket_read_datagram_glue.cpp b/PySide/QtNetwork/glue/qudpsocket_read_datagram_glue.cpp index db38f4526..bffc042d5 100644 --- a/PySide/QtNetwork/glue/qudpsocket_read_datagram_glue.cpp +++ b/PySide/QtNetwork/glue/qudpsocket_read_datagram_glue.cpp @@ -1,4 +1,4 @@ - PySide::AutoArrayPointer<char> data(%ARGUMENT_NAMES); + Shiboken::AutoArrayPointer<char> data(%ARGUMENT_NAMES); QHostAddress ha; quint16 port; diff --git a/PySide/QtNetwork/typesystem_network.xml b/PySide/QtNetwork/typesystem_network.xml index ab3f1efd1..6acbdef27 100644 --- a/PySide/QtNetwork/typesystem_network.xml +++ b/PySide/QtNetwork/typesystem_network.xml @@ -53,10 +53,6 @@ <enum-type name="State"/> <enum-type name="TransferMode"/> <enum-type name="TransferType"/> - <extra-includes> - <include file-name="autoarraypointer.h" location="global"/> - </extra-includes> - <modify-function signature="connectToHost(const QString&, quint16)" allow-thread="yes" /> <modify-function signature="login(const QString&, const QString&)" allow-thread="yes" /> <modify-function signature="close()" allow-thread="yes" /> @@ -88,10 +84,6 @@ <enum-type name="ConnectionMode"/> <enum-type name="Error"/> <enum-type name="State"/> - <extra-includes> - <include file-name="autoarraypointer.h" location="global"/> - </extra-includes> - <modify-function signature="readAll()" allow-thread="yes"/> <modify-function signature="read(char*, qint64)" allow-thread="yes"> <modify-argument index="return"> @@ -129,10 +121,6 @@ <object-type name="QTcpSocket"/> <object-type name="QUdpSocket"> <enum-type name="BindFlag" flags="BindMode"/> - <extra-includes> - <include file-name="autoarraypointer.h" location="global"/> - </extra-includes> - <modify-function signature="readDatagram(char*, qint64, QHostAddress*, quint16*)" allow-thread="yes"> <modify-argument index="1"> <remove-argument/> diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml index 9c2be1e7f..4abe6ac38 100644 --- a/PySide/typesystem_templates.xml +++ b/PySide/typesystem_templates.xml @@ -189,7 +189,7 @@ %PYARG_0 = Shiboken::makeTuple(a, b, c, d, e); </template> <template name="read_wrapper"> - PySide::AutoArrayPointer<char> _data(%2); + Shiboken::AutoArrayPointer<char> _data(%2); qint64 _size = %CPPSELF.%FUNCTION_NAME(_data, %2); if (_size > 0) %PYARG_0 = %CONVERTTOPYTHON[QByteArray](QByteArray(_data, _size)); |