jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated QtWebKit's type system.

Browse source 
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Reviewed by Renato Araújo <renato.filho@openbossa.org>
This commit is contained in:
Marcelo Lira 2011-08-11 13:06:41 -03:00 • committed by Hugo Parente Lima
commit 2a26f35607
1 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

34
PySide/QtWebKit/typesystem_webkit.xml
View file

@ -90,28 +90,31 @@
<value-type name="ExtensionReturn" /> <value-type name="ExtensionReturn" />
<modify-function signature="extension(QWebPage::Extension, const QWebPage::ExtensionOption*, QWebPage::ExtensionReturn*)"> <modify-function signature="extension(QWebPage::Extension, const QWebPage::ExtensionOption*, QWebPage::ExtensionReturn*)">
<modify-argument index="2" invalidate-after-use="yes"> <template name="qwebpage_extension_argument_conversion">
<conversion-rule class="target">
PyObject* %out = 0; PyObject* %out = 0;
// Cast the parameters according to the extension type // Cast the parameters according to the extension type
if (extension == QWebPage::ChooseMultipleFilesExtension) if (extension == QWebPage::ChooseMultipleFilesExtension) {
%out = %CONVERTTOPYTHON[ChooseMultipleFilesExtensionOption*](reinterpret_cast&lt;const ChooseMultipleFilesExtensionOption*>(option)); const ChooseMultipleFilesExtension$TYPE_SUFFIX* _in = reinterpret_cast&lt;const ChooseMultipleFilesExtension$TYPE_SUFFIX*>(%in);
%out = %CONVERTTOPYTHON[const ChooseMultipleFilesExtension$TYPE_SUFFIX*](_in);
#if QT_VERSION >= 0x040600 #if QT_VERSION >= 0x040600
else if (extension == QWebPage::ErrorPageExtension) } else if (extension == QWebPage::ErrorPageExtension) {
%out = %CONVERTTOPYTHON[ErrorPageExtensionOption*](reinterpret_cast&lt;const ErrorPageExtensionOption*>(option)); const ErrorPageExtension$TYPE_SUFFIX* _in = reinterpret_cast&lt;const ErrorPageExtension$TYPE_SUFFIX*>(%in);
%out = %CONVERTTOPYTHON[const ErrorPageExtension$TYPE_SUFFIX*](_in);
#endif #endif
}
</template>
<modify-argument index="2" invalidate-after-use="yes">
<conversion-rule class="target">
<insert-template name="qwebpage_extension_argument_conversion">
<replace from="$TYPE_SUFFIX" to="Option"/>
</insert-template>
</conversion-rule> </conversion-rule>
</modify-argument> </modify-argument>
<modify-argument index="3" invalidate-after-use="yes"> <modify-argument index="3" invalidate-after-use="yes">
<conversion-rule class="target"> <conversion-rule class="target">
PyObject* %out = 0; <insert-template name="qwebpage_extension_argument_conversion">
// Cast the parameters according to the extension type <replace from="$TYPE_SUFFIX" to="Return"/>
if (extension == QWebPage::ChooseMultipleFilesExtension) </insert-template>
%out = %CONVERTTOPYTHON[ChooseMultipleFilesExtensionReturn*](reinterpret_cast&lt;const ChooseMultipleFilesExtensionReturn*>(output));
#if QT_VERSION >= 0x040600
else if (extension == QWebPage::ErrorPageExtension)
%out = %CONVERTTOPYTHON[ErrorPageExtensionReturn*](reinterpret_cast&lt;const ErrorPageExtensionReturn*>(output));
#endif
</conversion-rule> </conversion-rule>
</modify-argument> </modify-argument>
</modify-function> </modify-function>
@ -190,7 +193,8 @@
PyErr_SetString(PyExc_IndexError, "index out of bounds"); PyErr_SetString(PyExc_IndexError, "index out of bounds");
return 0; return 0;
} }
return %CONVERTTOPYTHON[QWebElement](%CPPSELF.at(_i)); QWebElement element = %CPPSELF.at(_i);
return %CONVERTTOPYTHON[QWebElement](element);
</inject-code> </inject-code>
</add-function> </add-function>
</value-type> </value-type>