diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-09-21 09:32:02 -0300 |
|---|---|---|
| committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-09-23 09:03:06 -0300 |
| commit | 8048bd0c3bcdb1de33aa69d961402b355d6b07af (patch) | |
| tree | 15c736c2180185e1940daf58c9c611abda42a306 /PySide/QtWebKit | |
| parent | bf4b2c7660adc99b6a8b83748787f0ea078ad13b (diff) | |
Modified the type system files to make use of nested type declarations.
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Reviewed by Renato Araújo <renato.filho@openbossa.org>
Diffstat (limited to 'PySide/QtWebKit')
| -rw-r--r-- | PySide/QtWebKit/typesystem_webkit.xml | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/PySide/QtWebKit/typesystem_webkit.xml b/PySide/QtWebKit/typesystem_webkit.xml index 2ba3d8cd2..1c3911125 100644 --- a/PySide/QtWebKit/typesystem_webkit.xml +++ b/PySide/QtWebKit/typesystem_webkit.xml @@ -25,24 +25,6 @@ <namespace-type name="WebCore"/> - <enum-type name="QWebSettings::FontFamily"/> - <enum-type name="QWebSettings::FontSize"/> - <enum-type name="QWebSettings::WebGraphic"/> - <enum-type name="QWebSettings::WebAttribute"/> - <enum-type name="QWebPage::ErrorDomain"/> - <enum-type name="QWebPage::NavigationType"/> - <enum-type name="QWebPage::WebAction"/> - <enum-type name="QWebPage::WebWindowType"/> - <enum-type name="QWebPage::FindFlag" flags="QWebPage::FindFlags"/> - <enum-type name="QWebPage::LinkDelegationPolicy"/> - <enum-type name="QWebPluginFactory::Extension"/> - - <!-- Qt 4.6 --> - <enum-type name="QWebElement::StyleResolveStrategy"/> - <enum-type name="QWebFrame::RenderLayer"/> - <enum-type name="QWebPage:ErrorDomain"/> - <enum-type name="QWebPage::Extension"/> - <!-- unsuported property with type QList<MimeType> --> <rejection class="QWebPluginFactory::Plugin" field-name="mimeTypes"/> @@ -60,6 +42,7 @@ <modify-function signature="print(QPrinter*)const" rename="print_" /> </object-type> <object-type name="QWebFrame"> + <enum-type name="RenderLayer"/> <modify-function signature="addToJavaScriptWindowObject(QString,QObject*)"> <modify-argument index="2"> <parent index="this" action="add"/> @@ -69,8 +52,23 @@ <modify-function signature="metaData()const" remove="all" /> </object-type> - <object-type name="QWebSettings"/> + <object-type name="QWebSettings"> + <enum-type name="FontFamily"/> + <enum-type name="FontSize"/> + <enum-type name="WebAttribute"/> + <enum-type name="WebGraphic"/> + </object-type> <object-type name="QWebPage"> + <enum-type name="ErrorDomain"/> + <enum-type name="FindFlag" flags="QWebPage::FindFlags"/> + <enum-type name="LinkDelegationPolicy"/> + <enum-type name="NavigationType"/> + <enum-type name="WebAction"/> + <enum-type name="WebWindowType"/> + <!-- Qt 4.6 --> + <enum-type name="ErrorDomain"/> + <enum-type name="Extension"/> + <modify-function signature="javaScriptPrompt(QWebFrame*,const QString &,const QString &,QString*)"> <modify-argument index="return"> <replace-type modified-type="PyObject"/> @@ -87,9 +85,11 @@ </object-type> <object-type name="QWebHistory"/> <object-type name="QWebHistoryInterface"/> - <object-type name="QWebPluginFactory"/> - <value-type name="QWebPluginFactory::Plugin"/> - <value-type name="QWebPluginFactory::MimeType"/> + <object-type name="QWebPluginFactory"> + <enum-type name="Extension"/> + <value-type name="Plugin"/> + <value-type name="MimeType"/> + </object-type> <value-type name="QWebDatabase"/> <value-type name="QWebHistoryItem"/> <value-type name="QWebHitTestResult"/> @@ -98,6 +98,8 @@ <!-- Qt 4.6 --> <object-type name="QGraphicsWebView"/> <object-type name="QWebInspector"/> - <value-type name="QWebElement"/> + <value-type name="QWebElement"> + <enum-type name="StyleResolveStrategy"/> + </value-type> <value-type name="QWebElementCollection"/> </typesystem> |