diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-11-30 17:47:35 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:56:20 -0300 |
| commit | 7b04273736e46ace2d22b568fa7ed4d23944b067 (patch) | |
| tree | 946abd035182ecabf8c1258e18081c90987d82d5 | |
| parent | 30118e265dbcc536d8ed783ec3f10d56d9cb47c1 (diff) | |
Fixed code for QUdpSocket.readDatagram method to remove usage of Shiboken::makeTuple.
| -rw-r--r-- | PySide/QtNetwork/glue/qudpsocket_read_datagram_glue.cpp | 6 | ||||
| -rw-r--r-- | PySide/QtNetwork/typesystem_network.xml | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/PySide/QtNetwork/glue/qudpsocket_read_datagram_glue.cpp b/PySide/QtNetwork/glue/qudpsocket_read_datagram_glue.cpp deleted file mode 100644 index bffc042d5..000000000 --- a/PySide/QtNetwork/glue/qudpsocket_read_datagram_glue.cpp +++ /dev/null @@ -1,6 +0,0 @@ - Shiboken::AutoArrayPointer<char> data(%ARGUMENT_NAMES); - QHostAddress ha; - quint16 port; - - %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(data, %ARGUMENT_NAMES, &ha, &port); - %PYARG_0 = Shiboken::makeTuple(QByteArray(data, retval), ha, port); diff --git a/PySide/QtNetwork/typesystem_network.xml b/PySide/QtNetwork/typesystem_network.xml index 250129b59..87cb7d979 100644 --- a/PySide/QtNetwork/typesystem_network.xml +++ b/PySide/QtNetwork/typesystem_network.xml @@ -136,7 +136,19 @@ <modify-argument index="return"> <replace-type modified-type="(data, address, port)"/> </modify-argument> - <inject-code class="target" position="beginning" file="glue/qudpsocket_read_datagram_glue.cpp"/> + <inject-code class="target" position="beginning"> + Shiboken::AutoArrayPointer<char> data(%ARGUMENT_NAMES); + QHostAddress ha; + quint16 port; + %BEGIN_ALLOW_THREADS + %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(data, %ARGUMENT_NAMES, &ha, &port); + %END_ALLOW_THREADS + QByteArray ba(data, retval); + PyObject* %PYARG_0 = PyTuple_New(3); + PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[QByteArray](ba)); + PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QHostAddress](ha)); + PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[quint16](port)); + </inject-code> </modify-function> <modify-function signature="writeDatagram(const QByteArray&, const QHostAddress&, quint16)" allow-thread="yes"/> <!-- ### writeDatagram(QByteArray, ...) does the trick --> |