Mercurial > projects > qtd

comparison generator/typesystem_gui.xml @ 410:bb0c0bbca312

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added wrappers for the QFontMetrics methods taking tabstop arrays. Also removed some stray code template instantiations.
author David Nadlinger <code@klickverbot.at>
date Sun, 20 Mar 2011 20:43:06 +0100
parents d2f48c4cb3e3
children b2a803c73b89
comparison
equal deleted inserted replaced
409:4a943393a167 410:bb0c0bbca312
1406 </modify-argument> 1406 </modify-argument>
1407 <modify-argument index="3"> 1407 <modify-argument index="3">
1408 <remove-default-expression/> 1408 <remove-default-expression/>
1409 </modify-argument> 1409 </modify-argument>
1410 </modify-function> 1410 </modify-function>
1411 <inject-code>
1412 <insert-template name="gui.pixmap_save">
1413 <replace from="%INPUT_TYPE" to="qt.core.QIODevice"/>
1414 <replace from="%INPUT_NAME" to="dev"/>
1415 </insert-template>
1416 </inject-code>
1417 1411
1418 <modify-function signature="save(const QString &amp;, const char *, int) const"> 1412 <modify-function signature="save(const QString &amp;, const char *, int) const">
1419 <access modifier="private"/> 1413 <access modifier="private"/>
1420 <rename to="private_save"/> 1414 <rename to="private_save"/>
1421 <modify-argument index="2"> 1415 <modify-argument index="2">
1423 </modify-argument> 1417 </modify-argument>
1424 <modify-argument index="3"> 1418 <modify-argument index="3">
1425 <remove-default-expression/> 1419 <remove-default-expression/>
1426 </modify-argument> 1420 </modify-argument>
1427 </modify-function> 1421 </modify-function>
1428 <inject-code>
1429 <insert-template name="gui.pixmap_save">
1430 <replace from="%INPUT_TYPE" to="String"/>
1431 <replace from="%INPUT_NAME" to="fileName"/>
1432 </insert-template>
1433 </inject-code>
1434 1422
1435 <modify-function signature="QPixmap(QString,const char*,QFlags&lt;Qt::ImageConversionFlag&gt;)"> 1423 <modify-function signature="QPixmap(QString,const char*,QFlags&lt;Qt::ImageConversionFlag&gt;)">
1436 <access modifier="private"/> 1424 <access modifier="private"/>
1437 <modify-argument index="2"> 1425 <modify-argument index="2">
1438 <remove-default-expression/> 1426 <remove-default-expression/>
1768 <modify-function signature="textLanguages()const" remove="all"/> <!--### Obsolete in 4.3--> 1756 <modify-function signature="textLanguages()const" remove="all"/> <!--### Obsolete in 4.3-->
1769 1757
1770 <inject-code> 1758 <inject-code>
1771 <import-file name="typesystem_gui-java.java" quote-after-line="class QImage___" quote-before-line="}// class"/> 1759 <import-file name="typesystem_gui-java.java" quote-after-line="class QImage___" quote-before-line="}// class"/>
1772 </inject-code> 1760 </inject-code>
1773 <inject-code>
1774 <insert-template name="gui.pixmap_save">
1775 <replace from="%INPUT_TYPE" to="String"/>
1776 <replace from="%INPUT_NAME" to="fileName"/>
1777 </insert-template>
1778 </inject-code>
1779 1761
1780 <modify-function signature="save(QIODevice *, const char *, int) const"> 1762 <modify-function signature="save(QIODevice *, const char *, int) const">
1781 <access modifier="private"/> 1763 <access modifier="private"/>
1782 <rename to="private_save"/> 1764 <rename to="private_save"/>
1783 <modify-argument index="2"> 1765 <modify-argument index="2">
1785 </modify-argument> 1767 </modify-argument>
1786 <modify-argument index="3"> 1768 <modify-argument index="3">
1787 <remove-default-expression/> 1769 <remove-default-expression/>
1788 </modify-argument> 1770 </modify-argument>
1789 </modify-function> 1771 </modify-function>
1790 <inject-code>
1791 <insert-template name="gui.pixmap_save">
1792 <replace from="%INPUT_TYPE" to="qt.core.QIODevice"/>
1793 <replace from="%INPUT_NAME" to="dev"/>
1794 </insert-template>
1795 </inject-code>
1796 1772
1797 <template name="gui.image_load"> 1773 <template name="gui.image_load">
1798 public final boolean %FUNCTION_NAME(%ARGUMENT_TYPE %ARGUMENT_NAME, String format) { 1774 public final boolean %FUNCTION_NAME(%ARGUMENT_TYPE %ARGUMENT_NAME, String format) {
1799 return %FUNCTION_NAME(%OUT_ARGUMENT_NAME, format != null ? QNativePointer.createCharPointer(format) : null); 1775 return %FUNCTION_NAME(%OUT_ARGUMENT_NAME, format != null ? QNativePointer.createCharPointer(format) : null);
1800 } 1776 }
2023 </modify-argument> 1999 </modify-argument>
2024 </modify-function> 2000 </modify-function>
2025 2001
2026 <template name="gui.fontmetricsf_boundingrect"> 2002 <template name="gui.fontmetricsf_boundingrect">
2027 <insert-template name="gui.fontmetrics_tabarray_function"> 2003 <insert-template name="gui.fontmetrics_tabarray_function">
2028 <replace from="%RETURN_TYPE" to="qt.core.QRectF"/> 2004 <replace from="%RETURN_TYPE" to="QRectF"/>
2029 <replace from="%FUNCTION_NAME" to="boundingRect"/> 2005 <replace from="%FUNCTION_NAME" to="boundingRect"/>
2030 <replace from="%RECT_ARGUMENTS" to="%RECT_ARGUMENTS, "/> 2006 <replace from="%RECT_ARGUMENTS" to="%RECT_ARGUMENTS, "/>
2031 <replace from="%RECT_CALL_ARGUMENTS" to="%RECT_CALL_ARGUMENTS, "/> 2007 <replace from="%RECT_CALL_ARGUMENTS" to="%RECT_CALL_ARGUMENTS, "/>
2032 </insert-template> 2008 </insert-template>
2033 </template> 2009 </template>
2034 2010
2035 <inject-code> 2011 <inject-code>
2036 <insert-template name="gui.fontmetricsf_boundingrect"> 2012 <insert-template name="gui.fontmetricsf_boundingrect">
2037 <replace from="%RECT_ARGUMENTS" to="qt.core.QRectF rect"/> 2013 <replace from="%RECT_ARGUMENTS" to="QRectF rect"/>
2038 <replace from="%RECT_CALL_ARGUMENTS" to="rect"/> 2014 <replace from="%RECT_CALL_ARGUMENTS" to="rect"/>
2039 </insert-template> 2015 </insert-template>
2040 </inject-code> 2016 </inject-code>
2041 2017
2042 <inject-code> 2018 <inject-code>
2043 <insert-template name="gui.fontmetrics_tabarray_function"> 2019 <insert-template name="gui.fontmetrics_tabarray_function">
2044 <replace from="%RETURN_TYPE" to="qt.core.QSizeF"/> 2020 <replace from="%RETURN_TYPE" to="QSizeF"/>
2045 <replace from="%FUNCTION_NAME" to="size"/> 2021 <replace from="%FUNCTION_NAME" to="size"/>
2046 <replace from="%RECT_ARGUMENTS" to=""/> 2022 <replace from="%RECT_ARGUMENTS" to=""/>
2047 <replace from="%RECT_CALL_ARGUMENTS" to=""/> 2023 <replace from="%RECT_CALL_ARGUMENTS" to=""/>
2048 </insert-template> 2024 </insert-template>
2049 </inject-code> 2025 </inject-code>
2094 <modify-argument index="4"> 2070 <modify-argument index="4">
2095 <remove-default-expression/> 2071 <remove-default-expression/>
2096 </modify-argument> 2072 </modify-argument>
2097 </modify-function> 2073 </modify-function>
2098 2074
2099 <!-- 2075 <template name="gui.fontmetrics_tabarray_function">
2100 <template name="gui.fontmetrics_tabarray_function"> 2076 public final %RETURN_TYPE %FUNCTION_NAME(%RECT_ARGUMENTSint flags, string text, int tabStops = 0, int[] tabArray = null) {
2101 public final %RETURN_TYPE %FUNCTION_NAME(%RECT_ARGUMENTSint flags, String text, int tabStops, int tabArray[]) { 2077 int* ptr;
2102 QNativePointer np = tabArray == null ? null : new QNativePointer(QNativePointer.Type.Int, tabArray.length + 1); 2078 if (tabArray != null) {
2103 if (np != null) { 2079 auto copy = new int[tabArray.length + 1];
2104 for (int i=0; i&lt;tabArray.length; ++i) np.setIntAt(i, tabArray[i]); 2080 copy[0..tabArray.length] = tabArray;
2105 np.setIntAt(tabArray.length, 0); 2081 copy[tabArray.length] = 0;
2082 ptr = copy.ptr;
2106 } 2083 }
2107 return %FUNCTION_NAME(%RECT_CALL_ARGUMENTSflags, text, tabStops, np); 2084 return %FUNCTION_NAME(%RECT_CALL_ARGUMENTSflags, text, tabStops, ptr);
2108 }
2109
2110 public final %RETURN_TYPE %FUNCTION_NAME(%RECT_ARGUMENTSint flags, String text, int tabStops) {
2111 return %FUNCTION_NAME(%RECT_CALL_ARGUMENTSflags, text, tabStops, (int []) null);
2112 }
2113
2114 public final %RETURN_TYPE %FUNCTION_NAME(%RECT_ARGUMENTSint flags, String text) {
2115 return %FUNCTION_NAME(%RECT_CALL_ARGUMENTSflags, text, 0);
2116 } 2085 }
2117 </template> 2086 </template>
2118 2087
2119 <template name="gui.fontmetrics_boundingrect"> 2088 <template name="gui.fontmetrics_boundingrect">
2120 <insert-template name="gui.fontmetrics_tabarray_function"> 2089 <insert-template name="gui.fontmetrics_tabarray_function">
2121 <replace from="%RETURN_TYPE" to="qt.core.QRect"/> 2090 <replace from="%RETURN_TYPE" to="QRect"/>
2122 <replace from="%FUNCTION_NAME" to="boundingRect"/> 2091 <replace from="%FUNCTION_NAME" to="boundingRect"/>
2123 <replace from="%RECT_ARGUMENTS" to="%RECT_ARGUMENTS, "/> 2092 <replace from="%RECT_ARGUMENTS" to="%RECT_ARGUMENTS, "/>
2124 <replace from="%RECT_CALL_ARGUMENTS" to="%RECT_CALL_ARGUMENTS, "/> 2093 <replace from="%RECT_CALL_ARGUMENTS" to="%RECT_CALL_ARGUMENTS, "/>
2125 </insert-template> 2094 </insert-template>
2126 </template> 2095 </template>
2132 </insert-template> 2101 </insert-template>
2133 </inject-code> 2102 </inject-code>
2134 2103
2135 <inject-code> 2104 <inject-code>
2136 <insert-template name="gui.fontmetrics_boundingrect"> 2105 <insert-template name="gui.fontmetrics_boundingrect">
2137 <replace from="%RECT_ARGUMENTS" to="qt.core.QRect rect"/> 2106 <replace from="%RECT_ARGUMENTS" to="QRect rect"/>
2138 <replace from="%RECT_CALL_ARGUMENTS" to="rect"/> 2107 <replace from="%RECT_CALL_ARGUMENTS" to="rect"/>
2139 </insert-template> 2108 </insert-template>
2140 </inject-code> 2109 </inject-code>
2141 2110
2142 <inject-code> 2111 <inject-code>
2143 <insert-template name="gui.fontmetrics_tabarray_function"> 2112 <insert-template name="gui.fontmetrics_tabarray_function">
2144 <replace from="%RETURN_TYPE" to="qt.core.QSize"/> 2113 <replace from="%RETURN_TYPE" to="QSize"/>
2145 <replace from="%FUNCTION_NAME" to="size"/> 2114 <replace from="%FUNCTION_NAME" to="size"/>
2146 <replace from="%RECT_ARGUMENTS" to=""/> 2115 <replace from="%RECT_ARGUMENTS" to=""/>
2147 <replace from="%RECT_CALL_ARGUMENTS" to=""/> 2116 <replace from="%RECT_CALL_ARGUMENTS" to=""/>
2148 </insert-template> 2117 </insert-template>
2149 </inject-code>--> 2118 </inject-code>
2150 </value-type> 2119 </value-type>
2151 2120
2152 <value-type name="QGradient" force-abstract="yes" polymorphic-base="yes" polymorphic-id-expression="%1-&gt;type() == QGradient::NoGradient"> 2121 <value-type name="QGradient" force-abstract="yes" polymorphic-base="yes" polymorphic-id-expression="%1-&gt;type() == QGradient::NoGradient">
2153 <custom-constructor> 2122 <custom-constructor>
2154 Q_UNUSED(copy) 2123 Q_UNUSED(copy)