aboutsummaryrefslogtreecommitdiffstats
path: root/PySide/QtCore/typesystem_core_common.xml
diff options
context:
space:
mode:
authorPaulo Alcantara <pcacjr@gmail.com>2011-12-16 18:10:45 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:56:23 -0300
commit481ba5aa3ef94b417211fd25f07f30575b5afa68 (patch)
tree7d66376adea91c57c0530aabf5cc2bea0a786bce /PySide/QtCore/typesystem_core_common.xml
parent8ddbd3167bba33820b19de36c2dbac83e9e8f55d (diff)
Fix BUG #1084 - "Crash (segfault) when writing unicode string on socket"
See http://bugs.pyside.org/show_bug.cgi?id=1084. Signed-off-by: Paulo Alcantara <pcacjr@gmail.com> Reviewed-by: Trust me
Diffstat (limited to 'PySide/QtCore/typesystem_core_common.xml')
-rw-r--r--PySide/QtCore/typesystem_core_common.xml21
1 files changed, 8 insertions, 13 deletions
diff --git a/PySide/QtCore/typesystem_core_common.xml b/PySide/QtCore/typesystem_core_common.xml
index aa39e9536..a2e1deb6b 100644
--- a/PySide/QtCore/typesystem_core_common.xml
+++ b/PySide/QtCore/typesystem_core_common.xml
@@ -2666,20 +2666,15 @@
<modify-function signature="waitForReadyRead(int)" allow-thread="yes"/>
<modify-function signature="waitForBytesWritten(int)" allow-thread="yes"/>
<!-- ### peek(qint64) do the job -->
- <modify-function signature="peek(char *,qint64)" remove="all"/>
+ <modify-function signature="peek(char*, qint64)" remove="all"/>
<!-- ### read(qint64) do the job -->
- <modify-function signature="read(char *,qint64)" remove="all"/>
+ <modify-function signature="read(char*, qint64)" remove="all"/>
<!-- ### readLine(qint64) do the job -->
- <modify-function signature="readLine(char *,qint64)" remove="all"/>
+ <modify-function signature="readLine(char*, qint64)" remove="all"/>
<!-- ### write(str) do the job -->
- <modify-function signature="write(const char *,qint64)" remove="all"/>
- <modify-function signature="write(const char *)">
- <inject-code>
- %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, Shiboken::String::len(%PYARG_1));
- %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
- </inject-code>
- </modify-function>
- <modify-function signature="getChar(char *)">
+ <modify-function signature="write(const char*, qint64)" remove="all"/>
+ <modify-function signature="write(const char*)" remove="all"/>
+ <modify-function signature="getChar(char*)">
<modify-argument index="1">
<remove-argument />
<remove-default-expression />
@@ -2688,7 +2683,7 @@
<insert-template name="fix_char*" />
</inject-code>
</modify-function>
- <modify-function signature="readData(char *,qint64)">
+ <modify-function signature="readData(char*, qint64)">
<inject-code class="target">
QByteArray ba;
ba.resize(%2);
@@ -2712,7 +2707,7 @@
</conversion-rule>
</modify-argument>
</modify-function>
- <modify-function signature="readLineData(char *,qint64)">
+ <modify-function signature="readLineData(char*, qint64)">
<inject-code class="target">
QByteArray ba;
ba.resize(%2);