Uncomment QTextStream and QDataStream plus fixes

2 files changed, 173 insertions, 31 deletions

diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index 1010c9ff5..03bef4792 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -17,7 +17,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qchar_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qchildevent_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qcoreapplication_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qcryptographichash_wrapper.cpp
-# ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qdatastream_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qdatastream_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qdate_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qdatetime_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qdir_wrapper.cpp
@@ -75,7 +75,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextcodec_converterstate_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextcodec_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextdecoder_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextencoder_wrapper.cpp
-# ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextstream_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextstream_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextstreammanipulator_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qthread_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtime_wrapper.cpp
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index fa9d8cba3..4726339e8 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -252,6 +252,13 @@
   <enum-type name="QChar::CombiningClass" />
   <enum-type name="QLineF::IntersectType" />
   <enum-type name="QVariant::Type" />
+  <primitive-type name="qint8"/>
+  <primitive-type name="qint16"/>
+  <primitive-type name="qint32"/>
+  <primitive-type name="quint8"/>
+  <primitive-type name="quint16"/>
+  <primitive-type name="quint32"/>
+  <primitive-type name="quint64"/>
   <primitive-type name="bool"/>
   <primitive-type name="double"/>
   <primitive-type name="qreal"/>
@@ -1775,44 +1782,52 @@
   </object-type>
   <object-type name="QTimerEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Timer"/>
   <object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DynamicPropertyChange"/>
-  <!-- FIXME Removed due to a shiboken bug-->
-  <!--
-  <object-type name="QDataStream">
+
+  <template name="stream_read_method">
+      %RETURN_TYPE _result;
+      PyObject *_pyresult;
+      *( %CPPSELF ) &gt;&gt; _result;
+      _pyresult = Shiboken::Converter&lt; %RETURN_TYPE &gt;::toPython(_result);
+      return _pyresult;
+  </template>
+
+  <template name="stream_write_method">
+      *( %CPPSELF ) &lt;&lt; cpp_arg0;
+  </template>
+
+  <object-type name="QDataStream" stream="yes">
     <extra-includes>
       <include file-name="QtCore/QtCore" location="global"/>
     </extra-includes>
 
-    <modify-function signature="QDataStream(QByteArray*,QFlags&amp;QIODevice::OpenModeFlag>)" remove="all" />
-
     <modify-function signature="setDevice(QIODevice*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
 
-    <!- - remove primitive operators - ->
+    <modify-function signature="operator&gt;&gt;(qint8&amp;)" remove="all"/>
     <modify-function signature="operator&gt;&gt;(bool&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(char&amp;*)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(double&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(float&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(int&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(quint8&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(qint16&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(quint16&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(qint32&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(quint32&amp;)" remove="all"/>
     <modify-function signature="operator&gt;&gt;(qint64&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(short&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(signed char&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(unsigned char&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(unsigned int&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(unsigned long long&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(unsigned short&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(quint64&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(float&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(double&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(char&amp;*)" remove="all"/>
 
+    <modify-function signature="operator&lt;&lt;(qint8)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(bool)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(signed char)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(unsigned char)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(unsigned short)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(short)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(unsigned int)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(int)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(unsigned long long)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(quint8)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(qint16)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(quint16)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(qint32)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(quint32)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(qint64)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(quint64)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(float)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(double)" remove="all"/>
 
@@ -1821,8 +1836,133 @@
     <modify-function signature="readBytes(char&amp;*,uint&amp;)" remove="all"/>
     <modify-function signature="writeRawData(const char*,int)" remove="all"/>
     <modify-function signature="writeBytes(const char*,uint)" remove="all"/>
+
+    <!-- Extra functions for primitive type handling -->
+
+    <add-function signature="readBool()" return-type="bool">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readInt8()" return-type="qint8">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readUInt8()" return-type="quint8">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readUInt16()" return-type="quint16">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readInt16()" return-type="qint16">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readInt32()" return-type="qint32">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readUInt32()" return-type="quint32">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readInt64()" return-type="qint64">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readUInt64()" return-type="quint64">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readFloat()" return-type="float">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readDouble()" return-type="qreal">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readString()" return-type="QString">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="writeBool(bool)">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeInt8(qint8)">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeUInt8(const char*)">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeUInt16(quint16)">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeInt16(qint16)">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeInt32(qint32)">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeUInt32(quint32)">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeInt64(qint64)">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeUInt64(quint64)">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeFloat(float)">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeDouble(qreal)">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeString(QString)">
+        <inject-code class="native" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+
+
   </object-type>
-  -->
   <object-type name="QFSFileEngine">
     <extra-includes>
       <include file-name="QDateTime" location="global"/>
@@ -1831,21 +1971,24 @@
   <value-type name="QTextStreamManipulator">
     <modify-function signature="exec(QTextStream &amp;)" rename="exec_"/>
   </value-type>
-  <!-- FIXME Removed due to a shiboken bug-->
-<!--  <object-type name="QTextStream">
+  <object-type name="QTextStream" stream="yes">
     <modify-function signature="QTextStream(QByteArray *, QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
     <modify-function signature="QTextStream(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
     <modify-function signature="setString(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
     <modify-function signature="string()const" remove="all"/>
     <modify-function signature="codec()const" remove="all"/>
 
-    <!- - remove operators - ->
     <modify-function signature="operator&lt;&lt;(char)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(const void*)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(double)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(float)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(qlonglong)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(qulonglong)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(signed short)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(signed int)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(signed long)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(unsigned long)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(QBool)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(unsigned int)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(unsigned short)" remove="all"/>
 
@@ -1865,13 +2008,12 @@
     <modify-function signature="operator&gt;&gt;(QChar&amp;)" remove="all"/>
     <modify-function signature="operator&gt;&gt;(QString&amp;)" remove="all"/>
 
-    <!- -TODO- ->
     <modify-function signature="operator&lt;&lt;(const char*)" remove="all"/>
     <modify-function signature="flush()" allow-thread="yes"/>
     <modify-function signature="read(qint64)" allow-thread="yes"/>
     <modify-function signature="readLine(qint64)" allow-thread="yes"/>
     <modify-function signature="readAll()" allow-thread="yes"/>
-  </object-type>-->
+  </object-type>
   <object-type name="QSystemSemaphore"/>
   <namespace-type name="QtConcurrent" target-type="class">
     <extra-includes>