comparison generator/typesystem_gui.xml @ 373:1f189d0ceab4

merge
author Max Samukha <maxter@spambox.com>
date Thu, 08 Jul 2010 17:20:02 +0300
parents a032df77b6ab 12f60887ed15
children d2f48c4cb3e3
comparison
equal deleted inserted replaced
372:a032df77b6ab 373:1f189d0ceab4
1917 <import-file name="typesystem_gui-java.java" quote-after-line="class QPen___" quote-before-line="}// class"/> 1917 <import-file name="typesystem_gui-java.java" quote-after-line="class QPen___" quote-before-line="}// class"/>
1918 </inject-code> 1918 </inject-code>
1919 </value-type> 1919 </value-type>
1920 1920
1921 <value-type name="QBrush"> 1921 <value-type name="QBrush">
1922 <modify-function signature="QBrush(Qt::GlobalColor, Qt::BrushStyle)" remove="all"/> 1922 <!-- <modify-function signature="QBrush(Qt::GlobalColor, Qt::BrushStyle)" remove="all"/> -->
1923 <modify-function signature="operator=(const QBrush &amp;)" remove="all"/> 1923 <modify-function signature="operator=(const QBrush &amp;)" remove="all"/>
1924 <!-- restore later - abstract class not handled--> 1924 <!-- restore later - abstract class not handled-->
1925 <modify-function signature="gradient() const" remove="all"/> 1925 <modify-function signature="gradient() const" remove="all"/>
1926 1926
1927 <extra-includes> 1927 <extra-includes>
6143 </modify-function> 6143 </modify-function>
6144 <modify-function signature="setCancelButton(QPushButton*)"> 6144 <modify-function signature="setCancelButton(QPushButton*)">
6145 <modify-argument index="1"> 6145 <modify-argument index="1">
6146 <!-- Safe to ignore because button is reparented --> 6146 <!-- Safe to ignore because button is reparented -->
6147 <reference-count action="ignore"/> 6147 <reference-count action="ignore"/>
6148
6148 </modify-argument> 6149 </modify-argument>
6149 </modify-function> 6150 </modify-function>
6150 <modify-function signature="setLabel(QLabel*)"> 6151 <modify-function signature="setLabel(QLabel*)">
6151 <modify-argument index="1"> 6152 <modify-argument index="1">
6152 <!-- Safe to ignore because label is reparented --> 6153 <!-- Safe to ignore because label is reparented -->