[patch] Patch solving the compilation errors for qtjambi-4.4.3

gcc4.4-4.4.3.patch (text/plain), 3.62 KB, created by Dominik Kapusta (RETIRED) on 2009-07-20 17:36:38 UTC

diff --git a/generator/parser/rpp/pp-internal.h b/generator/parser/rpp/pp-internal.h
index e7d7886..9d44602 100755
--- a/generator/parser/rpp/pp-internal.h
+++ b/generator/parser/rpp/pp-internal.h
@@ -45,6 +45,8 @@
 
 #include <algorithm>
 
+#include <cstdio>
+
 namespace rpp {
 
 namespace _PP_internal
diff --git a/generator/typesystem_core-common.xml b/generator/typesystem_core-common.xml
index e7cfca5..f97ef54 100644
--- a/generator/typesystem_core-common.xml
+++ b/generator/typesystem_core-common.xml
@@ -709,6 +709,10 @@
         <include file-name="QStringList" location="global"/>
     </extra-includes>
     <modify-function signature="operator=(QRegExp)" remove="all"/>
+    <modify-function signature="pos(int)const"> <remove/> </modify-function>
+    <modify-function signature="cap(int)const"> <remove/> </modify-function>
+    <modify-function signature="capturedTexts()const"> <remove/> </modify-function>
+    <modify-function signature="errorString()const"> <remove/> </modify-function>
   </value-type>
 
   <value-type name="QFileInfo">
diff --git a/generator/typesystem_gui-common.xml b/generator/typesystem_gui-common.xml
index dc235e0..ffb0ca1 100644
--- a/generator/typesystem_gui-common.xml
+++ b/generator/typesystem_gui-common.xml
@@ -1425,6 +1425,8 @@
     <modify-function signature="exec()" access="non-final"/>
     <modify-function signature="extension()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="orientation()const" remove="all"/> <!--### Obsolete in 4.3-->
+    <modify-function signature="open()" access="non-final"/>
+    <modify-function signature="accepted()" access="non-final"/>
     <modify-function signature="setOrientation(Qt::Orientation)" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="showExtension(bool)" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
diff --git a/generator/typesystem_xml-common.xml b/generator/typesystem_xml-common.xml
index e298f4a..5233a06 100644
--- a/generator/typesystem_xml-common.xml
+++ b/generator/typesystem_xml-common.xml
@@ -132,6 +132,9 @@
         <modify-function signature="value(const QLatin1String &amp;)const">
             <remove />
         </modify-function>
+        <modify-function signature="hasAttribute(const QLatin1String &amp;)const">
+            <remove />
+        </modify-function>
     </value-type>
 
     <value-type name="QXmlStreamNamespaceDeclaration">
diff --git a/juic/javautils.cpp b/juic/javautils.cpp
index ca524d8..d1e999b 100755
--- a/juic/javautils.cpp
+++ b/juic/javautils.cpp
@@ -42,6 +42,8 @@
 #include "javautils.h"
 #include <QtCore/QHash>
 
+#include <cstdio>
+
 QString javaFixString(const QString &str)
 {
     const ushort *chars = str.utf16();
diff --git a/qtjambi/qtdynamicmetaobject.cpp b/qtjambi/qtdynamicmetaobject.cpp
index 2f4052b..c0968f6 100755
--- a/qtjambi/qtdynamicmetaobject.cpp
+++ b/qtjambi/qtdynamicmetaobject.cpp
@@ -180,11 +180,12 @@ void QtDynamicMetaObjectPrivate::initialize(JNIEnv *env, jclass java_class, cons
 
     int extra_data_count = extra_data != 0 ? env->GetArrayLength(extra_data) : 0;
     if (extra_data_count > 0) {
-        q->d.extradata = new const QMetaObject *[extra_data_count];
+        const QMetaObject **ptr = new const QMetaObject *[extra_data_count];
+        q->d.extradata = ptr;
         Q_ASSERT(q->d.extradata != 0);
 
         for (int i=0; i<extra_data_count; ++i)
-            q->d.extradata[i] = qtjambi_metaobject_for_class(env, reinterpret_cast<jclass>(env->GetObjectArrayElement(extra_data, i)), 0);
+            ptr[i] = qtjambi_metaobject_for_class(env, reinterpret_cast<jclass>(env->GetObjectArrayElement(extra_data, i)), 0);
     }