changeset 90:ba63040afbf2

wrapping of QBuffer and QProcess, fixed #9
author eldar
date Wed, 27 May 2009 13:02:13 +0000
parents 8a4e85876ea8
children 100d72cf4b81
files build/core.makefile build/core.txt build/xml.makefile generator/build_all.txt generator/typesystem_core-java.java generator/typesystem_core.xml
diffstat 6 files changed, 19 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/build/core.makefile	Tue May 26 14:55:13 2009 +0000
+++ b/build/core.makefile	Wed May 27 13:02:13 2009 +0000
@@ -70,4 +70,6 @@
     QTimeLine \
     QAbstractFactory \
     QAbstractListModel \
-    QCryptographicHash
\ No newline at end of file
+    QCryptographicHash \
+    QProcess \
+    QBuffer
\ No newline at end of file
--- a/build/core.txt	Tue May 26 14:55:13 2009 +0000
+++ b/build/core.txt	Wed May 27 13:02:13 2009 +0000
@@ -52,6 +52,7 @@
     QAbstractListModel
     QCryptographicHash
     QSettings
-   ## QProcess
+    QProcess
+    QBuffer
     )
 	
--- a/build/xml.makefile	Tue May 26 14:55:13 2009 +0000
+++ b/build/xml.makefile	Wed May 27 13:02:13 2009 +0000
@@ -16,6 +16,7 @@
 ## Classes.
 ## TODO: use list that generated by dgen.
 xml_classes = \
+ArrayOps \
 QDomAttr \
 QDomCDATASection \
 QDomCharacterData \
--- a/generator/build_all.txt	Tue May 26 14:55:13 2009 +0000
+++ b/generator/build_all.txt	Wed May 27 13:02:13 2009 +0000
@@ -6,8 +6,5 @@
   <load-typesystem name="typesystem_svg.xml" generate="yes" />
   <load-typesystem name="typesystem_network.xml" generate="yes" />
   <load-typesystem name="typesystem_xml.xml" generate="yes" />
-  <load-typesystem name="typesystem_xmlpatterns.xml" generate="yes" />
   <load-typesystem name="typesystem_webkit.xml" generate="yes" />
-  <load-typesystem name="typesystem_designer.xml" generate="yes" />
-  <load-typesystem name="typesystem_phonon.xml" generate="yes" />
 </typesystem>
--- a/generator/typesystem_core-java.java	Tue May 26 14:55:13 2009 +0000
+++ b/generator/typesystem_core-java.java	Wed May 27 13:02:13 2009 +0000
@@ -113,7 +113,7 @@
 
     protected static QCoreApplication m_instance = null;
 
-	this(char[][] args)
+	this(in string[] args)
 	{
 //        if (m_instance != null)
 //            throw new RuntimeException("QCoreApplication can only be initialized once");
@@ -489,24 +489,13 @@
 
     // retain a reference to avoid gc
     private Object strongDataReference = null;
-
-    public QBuffer(QByteArray byteArray, QObject parent) {
-        this(byteArray.nativePointer(), parent);
-        strongDataReference = byteArray;
-    }
-
-    public QBuffer(QByteArray byteArray) {
-        this(byteArray, null);
-    }
-
     public final void setBuffer(QByteArray byteArray) {
-        setBuffer(byteArray.nativePointer());
+        setBuffer_private(byteArray);
         strongDataReference = byteArray;
     }
 
     public final void setData(byte data[]) {
-        QNativePointer np = qt.internal.QtJambiInternal.byteArrayToNativePointer(data);
-        setData(np, data.length);
+        setData(cast(char*)data.ptr, data.length);
     }
 
 }// class
--- a/generator/typesystem_core.xml	Tue May 26 14:55:13 2009 +0000
+++ b/generator/typesystem_core.xml	Wed May 27 13:02:13 2009 +0000
@@ -2178,10 +2178,11 @@
         <remove/>
     </modify-function>
   
+
         <inject-code>
             <import-file name="typesystem_core-java.java" quote-after-line="class QBuffer___" quote-before-line="}// class"/>
         </inject-code>
-        <extra-includes>
+<!--        <extra-includes>
             <include file-name="qt.QNativePointer" location="java"/>
         </extra-includes>
 
@@ -2193,9 +2194,10 @@
             </modify-argument>
         </modify-function>
 
-
+-->
         <modify-function signature="setBuffer(QByteArray*)">
             <access modifier="private"/>
+            <rename to="setBuffer_private"/>
         </modify-function>
 
 
@@ -2253,7 +2255,10 @@
   <object-type name="QProcess">
     <modify-function signature="readChannelMode()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> <!--### Obsolete in 4.3-->
-  
+
+        <modify-function signature="error()const">
+            <rename to="lastError"/>
+        </modify-function>
         <modify-function signature="finished(int, QProcess::ExitStatus)">
             <rename to="finishedWithStatusCode"/>
         </modify-function>
@@ -2262,7 +2267,7 @@
                 <reference-count action="set" variable-name="__rcStandardOutputProcess"/>
             </modify-argument>
         </modify-function>
-        <modify-function signature="startDetached(QString,QStringList&lt;QString&gt;,QString,long long*)">
+<!--        <modify-function signature="startDetached(QString,QStringList&lt;QString&gt;,QString,long long*)">
             <access modifier="private"/>
             <modify-argument index="4">
                 <remove-default-expression/>
@@ -2270,7 +2275,7 @@
         </modify-function>
         <inject-code>
              <import-file name="typesystem_core-java.java" quote-after-line="class QProcess___" quote-before-line="}// class"/>
-        </inject-code>
+        </inject-code>-->
   </object-type>
 
   <object-type name="QSignalMapper">