changeset 324:0cc996b7a601 signals

Qt 4.6
author Eldar Insafutdinov <e.insafutdinov@gmail.com>
date Tue, 29 Dec 2009 02:48:09 +0500
parents 7a3c43424dca
children b460cd08041f
files build/gui.txt generator/abstractmetalang.cpp generator/cppimplgenerator.cpp generator/typesystem_gui.xml
diffstat 4 files changed, 18 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/build/gui.txt	Mon Dec 28 16:28:55 2009 +0500
+++ b/build/gui.txt	Tue Dec 29 02:48:09 2009 +0500
@@ -352,4 +352,6 @@
     QSizeGrip
     QSortFilterProxyModel
     QSound
+	
+	QGraphicsObject
 )
--- a/generator/abstractmetalang.cpp	Mon Dec 28 16:28:55 2009 +0500
+++ b/generator/abstractmetalang.cpp	Tue Dec 29 02:48:09 2009 +0500
@@ -226,6 +226,10 @@
             returned += arg->type()->name().replace("[]", "_3").replace(".", "_");
         }
     }
+
+    if(this->isConstant())
+        returned += "_const";
+
     return returned;
 }
 
--- a/generator/cppimplgenerator.cpp	Mon Dec 28 16:28:55 2009 +0500
+++ b/generator/cppimplgenerator.cpp	Tue Dec 29 02:48:09 2009 +0500
@@ -3816,3 +3816,4 @@
         s << endl << endl;
     }
 }
+
--- a/generator/typesystem_gui.xml	Mon Dec 28 16:28:55 2009 +0500
+++ b/generator/typesystem_gui.xml	Tue Dec 29 02:48:09 2009 +0500
@@ -2202,7 +2202,8 @@
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
 
     <modify-function signature="children()const" remove="all"/>
-  <!--
+    <modify-function signature="isBlockedByModalPanel(QGraphicsItem**)const" remove="all"/>
+	<!--
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
 
     <modify-function signature="paint(QPainter*,const QStyleOptionGraphicsItem*,QWidget*)">
@@ -3687,11 +3688,11 @@
     <modify-function signature="find(QString)">
         <remove/>
     </modify-function>
+    <modify-function signature="find(QString,QPixmap&amp;)">
+        <remove/>
+    </modify-function>
+	
 <!--
-    <modify-function signature="find(QString,QPixmap&amp;)">
-        <access modifier="private"/>
-    </modify-function>
-  
         <inject-code>
             <import-file name="typesystem_gui-java.java" quote-after-line="class QPixmapCache___" quote-before-line="}// class"/>
         </inject-code>
@@ -5297,7 +5298,11 @@
       <modify-function signature="setTextColor(QColor)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="textColor()const" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
-
+  
+  <object-type name="QGraphicsObject">
+    <modify-function signature="children()const" remove="all"/>
+  </object-type>
+  
   <object-type name="QGraphicsTextItem"> <!-- a QObject so main-thread delete redundant -->
     <extra-includes>
       <include file-name="QTextCursor" location="global"/>