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

Remove typesystem verbosity after fix of bug 417.

Browse source 
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Renato Araújo <renato.filho@openbossa.org>
This commit is contained in:
Hugo Parente Lima 2011-05-10 18:41:49 -03:00
commit 4d90463624
8 changed files with 89 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

56
PySide/QtCore/typesystem_core.xml
View file

@ -244,7 +244,7 @@
<rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/> <rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/>
<rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/> <rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/>
<namespace-type name="Qt"> <namespace-type name="Qt">
<enum-type name="AlignmentFlag" flags="Qt::Alignment" /> <enum-type name="AlignmentFlag" flags="Alignment" />
<enum-type name="AnchorAttribute"/> <enum-type name="AnchorAttribute"/>
<enum-type name="AnchorPoint"/> <enum-type name="AnchorPoint"/>
<enum-type name="ApplicationAttribute"/> <enum-type name="ApplicationAttribute"/>
@ -263,33 +263,33 @@
<enum-type name="CursorShape" /> <enum-type name="CursorShape" />
<enum-type name="DateFormat" /> <enum-type name="DateFormat" />
<enum-type name="DayOfWeek"/> <enum-type name="DayOfWeek"/>
<enum-type name="DockWidgetArea" flags="Qt::DockWidgetAreas" /> <enum-type name="DockWidgetArea" flags="DockWidgetAreas" />
<enum-type name="DockWidgetAreaSizes"/> <enum-type name="DockWidgetAreaSizes"/>
<enum-type name="DropAction" flags="Qt::DropActions"/> <enum-type name="DropAction" flags="DropActions"/>
<enum-type name="EventPriority"/> <enum-type name="EventPriority"/>
<enum-type name="FillRule"/> <enum-type name="FillRule"/>
<enum-type name="FocusPolicy"/> <enum-type name="FocusPolicy"/>
<enum-type name="FocusReason"/> <enum-type name="FocusReason"/>
<enum-type name="GestureFlag" flags="Qt::GestureFlags"/> <enum-type name="GestureFlag" flags="GestureFlags"/>
<enum-type name="GestureState"/> <enum-type name="GestureState"/>
<enum-type name="GestureType"/> <enum-type name="GestureType"/>
<enum-type name="GlobalColor"/> <enum-type name="GlobalColor"/>
<enum-type name="HitTestAccuracy"/> <enum-type name="HitTestAccuracy"/>
<enum-type name="ImageConversionFlag" flags="Qt::ImageConversionFlags" /> <enum-type name="ImageConversionFlag" flags="ImageConversionFlags" />
<enum-type name="InputMethodHint" flags="Qt::InputMethodHints"/> <enum-type name="InputMethodHint" flags="InputMethodHints"/>
<enum-type name="InputMethodQuery"/> <enum-type name="InputMethodQuery"/>
<enum-type name="ItemDataRole" force-integer="yes" /> <enum-type name="ItemDataRole" force-integer="yes" />
<enum-type name="ItemFlag" flags="Qt::ItemFlags"/> <enum-type name="ItemFlag" flags="ItemFlags"/>
<enum-type name="ItemSelectionMode"/> <enum-type name="ItemSelectionMode"/>
<enum-type name="Key" /> <enum-type name="Key" />
<enum-type name="KeyboardModifier" flags="Qt::KeyboardModifiers"/> <enum-type name="KeyboardModifier" flags="KeyboardModifiers"/>
<enum-type name="LayoutDirection"/> <enum-type name="LayoutDirection"/>
<enum-type name="MaskMode"/> <enum-type name="MaskMode"/>
<enum-type name="MatchFlag" flags="Qt::MatchFlags"/> <enum-type name="MatchFlag" flags="MatchFlags"/>
<enum-type name="Modifier"/> <enum-type name="Modifier"/>
<enum-type name="MouseButton" flags="Qt::MouseButtons"/> <enum-type name="MouseButton" flags="MouseButtons"/>
<enum-type name="NavigationMode"/> <enum-type name="NavigationMode"/>
<enum-type name="Orientation" flags="Qt::Orientations"/> <enum-type name="Orientation" flags="Orientations"/>
<enum-type name="PenCapStyle"/> <enum-type name="PenCapStyle"/>
<enum-type name="PenJoinStyle"/> <enum-type name="PenJoinStyle"/>
<enum-type name="PenStyle"/> <enum-type name="PenStyle"/>
@ -301,10 +301,10 @@
<enum-type name="TextElideMode"/> <enum-type name="TextElideMode"/>
<enum-type name="TextFlag"/> <enum-type name="TextFlag"/>
<enum-type name="TextFormat"/> <enum-type name="TextFormat"/>
<enum-type name="TextInteractionFlag" flags="Qt::TextInteractionFlags"/> <enum-type name="TextInteractionFlag" flags="TextInteractionFlags"/>
<enum-type name="TileRule"/> <enum-type name="TileRule"/>
<enum-type name="TimeSpec"/> <enum-type name="TimeSpec"/>
<enum-type name="ToolBarArea" flags="Qt::ToolBarAreas" /> <enum-type name="ToolBarArea" flags="ToolBarAreas" />
<enum-type name="ToolBarAreaSizes"/> <enum-type name="ToolBarAreaSizes"/>
<enum-type name="ToolButtonStyle"/> <enum-type name="ToolButtonStyle"/>
<enum-type name="TouchPointState"/> <enum-type name="TouchPointState"/>
@ -314,8 +314,8 @@
<enum-type name="WidgetAttribute" /> <enum-type name="WidgetAttribute" />
<enum-type name="WindowFrameSection"/> <enum-type name="WindowFrameSection"/>
<enum-type name="WindowModality"/> <enum-type name="WindowModality"/>
<enum-type name="WindowState" flags="Qt::WindowStates"/> <enum-type name="WindowState" flags="WindowStates"/>
<enum-type name="WindowType" flags="Qt::WindowFlags"/> <enum-type name="WindowType" flags="WindowFlags"/>
<!--### These functions are part of QtGui, not QtCore --> <!--### These functions are part of QtGui, not QtCore -->
<modify-function signature="codecForHtml(const QByteArray &amp;)" remove="all"/> <modify-function signature="codecForHtml(const QByteArray &amp;)" remove="all"/>
@ -640,8 +640,8 @@
</add-function> </add-function>
</value-type> </value-type>
<value-type name="QDir"> <value-type name="QDir">
<enum-type name="Filter" flags="QDir::Filters"/> <enum-type name="Filter" flags="Filters"/>
<enum-type name="SortFlag" flags="QDir::SortFlags" /> <enum-type name="SortFlag" flags="SortFlags" />
<add-function signature="__reduce__" return-type="PyObject*"> <add-function signature="__reduce__" return-type="PyObject*">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="reduce_code"> <insert-template name="reduce_code">
@ -955,7 +955,7 @@
<enum-type name="FormatType"/> <enum-type name="FormatType"/>
<enum-type name="Language" /> <enum-type name="Language" />
<enum-type name="MeasurementSystem"/> <enum-type name="MeasurementSystem"/>
<enum-type name="NumberOption" flags="QLocale::NumberOptions"/> <enum-type name="NumberOption" flags="NumberOptions"/>
<!--### All those C++ number types have the same representation in Python --> <!--### All those C++ number types have the same representation in Python -->
<modify-function signature="toString(qulonglong) const" remove="all"/> <modify-function signature="toString(qulonglong) const" remove="all"/>
<modify-function signature="toString(ushort) const" remove="all"/> <modify-function signature="toString(ushort) const" remove="all"/>
@ -1107,7 +1107,7 @@
<modify-function signature="relock()" allow-thread="yes" /> <modify-function signature="relock()" allow-thread="yes" />
</object-type> </object-type>
<object-type name="QDirIterator"> <object-type name="QDirIterator">
<enum-type name="IteratorFlag" flags="QDirIterator::IteratorFlags"/> <enum-type name="IteratorFlag" flags="IteratorFlags"/>
</object-type> </object-type>
<object-type name="QThread"> <object-type name="QThread">
<enum-type name="Priority"/> <enum-type name="Priority"/>
@ -1435,7 +1435,7 @@
</extra-includes> </extra-includes>
</object-type> </object-type>
<value-type name="QUrl" hash-function="PySide::hash"> <value-type name="QUrl" hash-function="PySide::hash">
<enum-type name="FormattingOption" flags="QUrl::FormattingOptions"/> <enum-type name="FormattingOption" flags="FormattingOptions"/>
<enum-type name="ParsingMode"/> <enum-type name="ParsingMode"/>
<modify-documentation xpath='description/para[3]'> <modify-documentation xpath='description/para[3]'>
&lt;para>URLs can be represented in two forms: encoded or unencoded. The unencoded representation is suitable for showing to users, but the encoded representation is typically what you would send to a web server. For example, the unencoded URL &quot;http://bühler.example.com&quot; would be sent to the server as &quot;http://xn--bhler-kva.example.com/List%20of%20applicants.xml&quot;.&lt;/para> &lt;para>URLs can be represented in two forms: encoded or unencoded. The unencoded representation is suitable for showing to users, but the encoded representation is typically what you would send to a web server. For example, the unencoded URL &quot;http://bühler.example.com&quot; would be sent to the server as &quot;http://xn--bhler-kva.example.com/List%20of%20applicants.xml&quot;.&lt;/para>
@ -1830,7 +1830,7 @@
</add-function> </add-function>
</value-type> </value-type>
<value-type name="QTextBoundaryFinder"> <value-type name="QTextBoundaryFinder">
<enum-type name="BoundaryReason" flags="QTextBoundaryFinder::BoundaryReasons"/> <enum-type name="BoundaryReason" flags="BoundaryReasons"/>
<enum-type name="BoundaryType"/> <enum-type name="BoundaryType"/>
<!-- There's no QChar in PySide --> <!-- There's no QChar in PySide -->
<modify-function signature="QTextBoundaryFinder(QTextBoundaryFinder::BoundaryType,const QChar*,int,unsigned char*,int)" remove="all"/> <modify-function signature="QTextBoundaryFinder(QTextBoundaryFinder::BoundaryType,const QChar*,int,unsigned char*,int)" remove="all"/>
@ -1843,7 +1843,7 @@
<modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/> <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/>
</object-type> </object-type>
<object-type name="QEventLoop"> <object-type name="QEventLoop">
<enum-type name="ProcessEventsFlag" flags="QEventLoop::ProcessEventsFlags"/> <enum-type name="ProcessEventsFlag" flags="ProcessEventsFlags"/>
<modify-function signature="exec(QFlags&lt;QEventLoop::ProcessEventsFlag>)" rename="exec_" allow-thread="yes" /> <modify-function signature="exec(QFlags&lt;QEventLoop::ProcessEventsFlag>)" rename="exec_" allow-thread="yes" />
<modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>)" allow-thread="yes" /> <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>)" allow-thread="yes" />
<modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>, int)" allow-thread="yes" /> <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>, int)" allow-thread="yes" />
@ -1851,7 +1851,7 @@
<object-type name="QFile"> <object-type name="QFile">
<enum-type name="FileError"/> <enum-type name="FileError"/>
<enum-type name="MemoryMapFlags"/> <enum-type name="MemoryMapFlags"/>
<enum-type name="Permission" flags="QFile::Permissions"/> <enum-type name="Permission" flags="Permissions"/>
<extra-includes> <extra-includes>
<include file-name="QAbstractFileEngine" location="global"/> <include file-name="QAbstractFileEngine" location="global"/>
</extra-includes> </extra-includes>
@ -1882,7 +1882,7 @@
<modify-function signature="flush()" allow-thread="yes"/> <modify-function signature="flush()" allow-thread="yes"/>
</object-type> </object-type>
<object-type name="QIODevice"> <object-type name="QIODevice">
<enum-type name="OpenModeFlag" flags="QIODevice::OpenMode"/> <enum-type name="OpenModeFlag" flags="OpenMode"/>
<modify-function signature="open(QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes"/> <modify-function signature="open(QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes"/>
<modify-function signature="close()" allow-thread="yes"/> <modify-function signature="close()" allow-thread="yes"/>
<modify-function signature="seek(qint64)" allow-thread="yes"/> <modify-function signature="seek(qint64)" allow-thread="yes"/>
@ -2012,7 +2012,7 @@
</extra-includes> </extra-includes>
</object-type> </object-type>
<object-type name="QTextCodec"> <object-type name="QTextCodec">
<enum-type name="ConversionFlag" flags="QTextCodec::ConversionFlags"/> <enum-type name="ConversionFlag" flags="ConversionFlags"/>
<object-type name="ConverterState"> <object-type name="ConverterState">
<include file-name="QTextCodec" location="global"/> <include file-name="QTextCodec" location="global"/>
@ -2166,7 +2166,7 @@
<!-- <object-type name="QAbstractFileEngine::UnMapExtensionOption" /> --> <!-- <object-type name="QAbstractFileEngine::UnMapExtensionOption" /> -->
<object-type name="QAbstractFileEngine"> <object-type name="QAbstractFileEngine">
<enum-type name="Extension" extensible="yes"/> <enum-type name="Extension" extensible="yes"/>
<enum-type name="FileFlag" flags="QAbstractFileEngine::FileFlags"/> <enum-type name="FileFlag" flags="FileFlags"/>
<enum-type name="FileName"/> <enum-type name="FileName"/>
<enum-type name="FileOwner"/> <enum-type name="FileOwner"/>
<enum-type name="FileTime"/> <enum-type name="FileTime"/>
@ -2646,7 +2646,7 @@
</value-type> </value-type>
<object-type name="QTextStream" stream="yes"> <object-type name="QTextStream" stream="yes">
<enum-type name="FieldAlignment"/> <enum-type name="FieldAlignment"/>
<enum-type name="NumberFlag" flags="QTextStream::NumberFlags"/> <enum-type name="NumberFlag" flags="NumberFlags"/>
<enum-type name="RealNumberNotation"/> <enum-type name="RealNumberNotation"/>
<enum-type name="Status"/> <enum-type name="Status"/>
<!-- Removed because it expect QString to be mutable --> <!-- Removed because it expect QString to be mutable -->
@ -2689,7 +2689,7 @@
<enum-type name="SystemSemaphoreError"/> <enum-type name="SystemSemaphoreError"/>
</object-type> </object-type>
<namespace-type name="QtConcurrent" target-type="class"> <namespace-type name="QtConcurrent" target-type="class">
<enum-type name="ReduceOption" flags="QtConcurrent::ReduceOptions"/> <enum-type name="ReduceOption" flags="ReduceOptions"/>
<extra-includes> <extra-includes>
<include file-name="qtconcurrentreducekernel.h" location="global"/> <include file-name="qtconcurrentreducekernel.h" location="global"/>
<include file-name="qtconcurrentthreadengine.h" location="global"/> <include file-name="qtconcurrentthreadengine.h" location="global"/>

90
PySide/QtGui/typesystem_gui_common.xml
View file

@ -276,7 +276,7 @@
<enum-type name="StyleOptionVersion"/> <enum-type name="StyleOptionVersion"/>
</value-type> </value-type>
<value-type name="QStyleOptionButton" polymorphic-id-expression="%1-&gt;type == QStyleOptionButton::Type &amp;&amp; %1-&gt;version == QStyleOptionButton::Version"> <value-type name="QStyleOptionButton" polymorphic-id-expression="%1-&gt;type == QStyleOptionButton::Type &amp;&amp; %1-&gt;version == QStyleOptionButton::Version">
<enum-type name="ButtonFeature" flags="QStyleOptionButton::ButtonFeatures"/> <enum-type name="ButtonFeature" flags="ButtonFeatures"/>
<enum-type name="StyleOptionType"/> <enum-type name="StyleOptionType"/>
<enum-type name="StyleOptionVersion"/> <enum-type name="StyleOptionVersion"/>
</value-type> </value-type>
@ -304,7 +304,7 @@
<enum-type name="StyleOptionVersion"/> <enum-type name="StyleOptionVersion"/>
</value-type> </value-type>
<value-type name="QStyleOptionFrameV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV2::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV2::Version"> <value-type name="QStyleOptionFrameV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV2::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV2::Version">
<enum-type name="FrameFeature" flags="QStyleOptionFrameV2::FrameFeatures"/> <enum-type name="FrameFeature" flags="FrameFeatures"/>
<enum-type name="StyleOptionVersion"/> <enum-type name="StyleOptionVersion"/>
</value-type> </value-type>
<value-type name="QStyleOptionFrameV3" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV3::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV3::Version"> <value-type name="QStyleOptionFrameV3" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV3::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV3::Version">
@ -348,7 +348,7 @@
<enum-type name="StyleOptionVersion"/> <enum-type name="StyleOptionVersion"/>
</value-type> </value-type>
<value-type name="QStyleOptionTab" polymorphic-id-expression="%1-&gt;type == QStyleOptionTab::Type &amp;&amp; %1-&gt;version == QStyleOptionTab::Version"> <value-type name="QStyleOptionTab" polymorphic-id-expression="%1-&gt;type == QStyleOptionTab::Type &amp;&amp; %1-&gt;version == QStyleOptionTab::Version">
<enum-type name="CornerWidget" flags="QStyleOptionTab::CornerWidgets"/> <enum-type name="CornerWidget" flags="CornerWidgets"/>
<enum-type name="SelectedPosition"/> <enum-type name="SelectedPosition"/>
<enum-type name="StyleOptionType"/> <enum-type name="StyleOptionType"/>
<enum-type name="StyleOptionVersion"/> <enum-type name="StyleOptionVersion"/>
@ -378,7 +378,7 @@
<value-type name="QStyleOptionToolBar" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBar::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBar::Version"> <value-type name="QStyleOptionToolBar" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBar::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBar::Version">
<enum-type name="StyleOptionType"/> <enum-type name="StyleOptionType"/>
<enum-type name="StyleOptionVersion"/> <enum-type name="StyleOptionVersion"/>
<enum-type name="ToolBarFeature" flags="QStyleOptionToolBar::ToolBarFeatures"/> <enum-type name="ToolBarFeature" flags="ToolBarFeatures"/>
<enum-type name="ToolBarPosition"/> <enum-type name="ToolBarPosition"/>
</value-type> </value-type>
<value-type name="QStyleOptionToolBox" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBox::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBox::Version"> <value-type name="QStyleOptionToolBox" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBox::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBox::Version">
@ -393,7 +393,7 @@
<value-type name="QStyleOptionToolButton" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolButton::Type &amp;&amp; %1-&gt;version == QStyleOptionToolButton::Version"> <value-type name="QStyleOptionToolButton" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolButton::Type &amp;&amp; %1-&gt;version == QStyleOptionToolButton::Version">
<enum-type name="StyleOptionType"/> <enum-type name="StyleOptionType"/>
<enum-type name="StyleOptionVersion"/> <enum-type name="StyleOptionVersion"/>
<enum-type name="ToolButtonFeature" flags="QStyleOptionToolButton::ToolButtonFeatures" /> <enum-type name="ToolButtonFeature" flags="ToolButtonFeatures" />
</value-type> </value-type>
<value-type name="QStyleOptionViewItem" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItem::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItem::Version"> <value-type name="QStyleOptionViewItem" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItem::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItem::Version">
<enum-type name="Position"/> <enum-type name="Position"/>
@ -402,7 +402,7 @@
</value-type> </value-type>
<value-type name="QStyleOptionViewItemV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV2::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV2::Version"> <value-type name="QStyleOptionViewItemV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV2::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV2::Version">
<enum-type name="StyleOptionVersion"/> <enum-type name="StyleOptionVersion"/>
<enum-type name="ViewItemFeature" flags="QStyleOptionViewItemV2::ViewItemFeatures"/> <enum-type name="ViewItemFeature" flags="ViewItemFeatures"/>
</value-type> </value-type>
<value-type name="QStyleOptionViewItemV3" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV3::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV3::Version"> <value-type name="QStyleOptionViewItemV3" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV3::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV3::Version">
<enum-type name="StyleOptionVersion"/> <enum-type name="StyleOptionVersion"/>
@ -427,14 +427,14 @@
</value-type> </value-type>
<value-type name="QTextInlineObject" /> <value-type name="QTextInlineObject" />
<value-type name="QSizePolicy"> <value-type name="QSizePolicy">
<enum-type name="ControlType" flags="QSizePolicy::ControlTypes"/> <enum-type name="ControlType" flags="ControlTypes"/>
<enum-type name="Policy"/> <enum-type name="Policy"/>
<enum-type name="PolicyFlag"/> <enum-type name="PolicyFlag"/>
</value-type> </value-type>
<value-type name="QTableWidgetSelectionRange"/> <value-type name="QTableWidgetSelectionRange"/>
<value-type name="QTextDocumentFragment" /> <value-type name="QTextDocumentFragment" />
<value-type name="QTextOption"> <value-type name="QTextOption">
<enum-type name="Flag" flags="QTextOption::Flags"/> <enum-type name="Flag" flags="Flags"/>
<enum-type name="TabType"/> <enum-type name="TabType"/>
<enum-type name="WrapMode"/> <enum-type name="WrapMode"/>
<value-type name="Tab"/> <value-type name="Tab"/>
@ -655,7 +655,7 @@
<value-type name="QTextFormat" > <value-type name="QTextFormat" >
<enum-type name="FormatType"/> <enum-type name="FormatType"/>
<enum-type name="ObjectTypes"/> <enum-type name="ObjectTypes"/>
<enum-type name="PageBreakFlag" flags="QTextFormat::PageBreakFlags"/> <enum-type name="PageBreakFlag" flags="PageBreakFlags"/>
<enum-type name="Property" /> <enum-type name="Property" />
<modify-function signature="isValid()const" access="non-final"/> <modify-function signature="isValid()const" access="non-final"/>
</value-type> </value-type>
@ -756,7 +756,7 @@
Shiboken::Object::releaseOwnership(%PYARG_0); Shiboken::Object::releaseOwnership(%PYARG_0);
</inject-code> </inject-code>
</add-function> </add-function>
<enum-type name="IteratorFlag" flags="QTreeWidgetItemIterator::IteratorFlags"/> <enum-type name="IteratorFlag" flags="IteratorFlags"/>
<!-- ### See bug 778 --> <!-- ### See bug 778 -->
<modify-function signature="operator++(int)" remove="all"/> <modify-function signature="operator++(int)" remove="all"/>
<modify-function signature="operator--(int)" remove="all"/> <modify-function signature="operator--(int)" remove="all"/>
@ -1579,7 +1579,7 @@
<enum-type name="CacheMode"/> <enum-type name="CacheMode"/>
<enum-type name="Extension"/> <enum-type name="Extension"/>
<enum-type name="GraphicsItemChange"/> <enum-type name="GraphicsItemChange"/>
<enum-type name="GraphicsItemFlag" flags="QGraphicsItem::GraphicsItemFlags"/> <enum-type name="GraphicsItemFlag" flags="GraphicsItemFlags"/>
<enum-type name="PanelModality"/> <enum-type name="PanelModality"/>
<inject-code class="target" position="end"> <inject-code class="target" position="end">
PyObject* userTypeConstant = PyInt_FromLong(QGraphicsItem::UserType); PyObject* userTypeConstant = PyInt_FromLong(QGraphicsItem::UserType);
@ -1717,7 +1717,7 @@
<enum-type name="CursorAction"/> <enum-type name="CursorAction"/>
<enum-type name="DragDropMode"/> <enum-type name="DragDropMode"/>
<enum-type name="DropIndicatorPosition"/> <enum-type name="DropIndicatorPosition"/>
<enum-type name="EditTrigger" flags="QAbstractItemView::EditTriggers"/> <enum-type name="EditTrigger" flags="EditTriggers"/>
<enum-type name="ScrollHint"/> <enum-type name="ScrollHint"/>
<enum-type name="ScrollMode"/> <enum-type name="ScrollMode"/>
<enum-type name="SelectionBehavior"/> <enum-type name="SelectionBehavior"/>
@ -1859,7 +1859,7 @@
<object-type name="QDialogButtonBox"> <object-type name="QDialogButtonBox">
<enum-type name="ButtonLayout"/> <enum-type name="ButtonLayout"/>
<enum-type name="ButtonRole"/> <enum-type name="ButtonRole"/>
<enum-type name="StandardButton" flags="QDialogButtonBox::StandardButtons" /> <enum-type name="StandardButton" flags="StandardButtons" />
<modify-function signature="addButton(QAbstractButton*,QDialogButtonBox::ButtonRole)"> <modify-function signature="addButton(QAbstractButton*,QDialogButtonBox::ButtonRole)">
<modify-argument index="1"> <modify-argument index="1">
<parent index="this" action="add"/> <parent index="this" action="add"/>
@ -1890,7 +1890,7 @@
</object-type> </object-type>
<object-type name="QWizard"> <object-type name="QWizard">
<enum-type name="WizardButton" /> <enum-type name="WizardButton" />
<enum-type name="WizardOption" flags="QWizard::WizardOptions"/> <enum-type name="WizardOption" flags="WizardOptions"/>
<enum-type name="WizardPixmap"/> <enum-type name="WizardPixmap"/>
<enum-type name="WizardStyle"/> <enum-type name="WizardStyle"/>
<modify-function signature="addPage(QWizardPage*)"> <modify-function signature="addPage(QWizardPage*)">
@ -1920,10 +1920,10 @@
</modify-function> </modify-function>
</object-type> </object-type>
<object-type name="QFontComboBox"> <object-type name="QFontComboBox">
<enum-type name="FontFilter" flags="QFontComboBox::FontFilters"/> <enum-type name="FontFilter" flags="FontFilters"/>
</object-type> </object-type>
<object-type name="QFontDialog"> <object-type name="QFontDialog">
<enum-type name="FontDialogOption" flags="QFontDialog::FontDialogOptions"/> <enum-type name="FontDialogOption" flags="FontDialogOptions"/>
<modify-function signature="getFont(bool*,QWidget*)" allow-thread="yes"> <modify-function signature="getFont(bool*,QWidget*)" allow-thread="yes">
<modify-argument index="1"> <modify-argument index="1">
<remove-argument /> <remove-argument />
@ -2077,7 +2077,7 @@
</modify-function> </modify-function>
</object-type> </object-type>
<object-type name="QItemSelectionModel"> <object-type name="QItemSelectionModel">
<enum-type name="SelectionFlag" flags="QItemSelectionModel::SelectionFlags"/> <enum-type name="SelectionFlag" flags="SelectionFlags"/>
</object-type> </object-type>
<object-type name="QListView"> <object-type name="QListView">
<enum-type name="Flow"/> <enum-type name="Flow"/>
@ -2094,7 +2094,7 @@
</modify-function> </modify-function>
</object-type> </object-type>
<object-type name="QMainWindow"> <object-type name="QMainWindow">
<enum-type name="DockOption" flags="QMainWindow::DockOptions"/> <enum-type name="DockOption" flags="DockOptions"/>
<modify-function signature="setCentralWidget(QWidget*)"> <modify-function signature="setCentralWidget(QWidget*)">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="replace_child"> <insert-template name="replace_child">
@ -2180,7 +2180,7 @@
</object-type> </object-type>
<object-type name="QMdiArea"> <object-type name="QMdiArea">
<enum-type name="AreaOption" flags="QMdiArea::AreaOptions"/> <enum-type name="AreaOption" flags="AreaOptions"/>
<enum-type name="ViewMode"/> <enum-type name="ViewMode"/>
<enum-type name="WindowOrder"/> <enum-type name="WindowOrder"/>
<modify-function signature="addSubWindow(QWidget*, QFlags&lt;Qt::WindowType&gt;)" > <modify-function signature="addSubWindow(QWidget*, QFlags&lt;Qt::WindowType&gt;)" >
@ -2193,7 +2193,7 @@
</modify-function> </modify-function>
</object-type> </object-type>
<object-type name="QMdiSubWindow"> <object-type name="QMdiSubWindow">
<enum-type name="SubWindowOption" flags="QMdiSubWindow::SubWindowOptions"/> <enum-type name="SubWindowOption" flags="SubWindowOptions"/>
<modify-function signature="setWidget(QWidget*)" > <modify-function signature="setWidget(QWidget*)" >
<modify-argument index="1"> <modify-argument index="1">
<parent index="this" action="add"/> <parent index="this" action="add"/>
@ -2547,7 +2547,7 @@
<object-type name="QTextBlockGroup" /> <object-type name="QTextBlockGroup" />
<object-type name="QTextBlockUserData" /> <object-type name="QTextBlockUserData" />
<object-type name="QTextItem"> <object-type name="QTextItem">
<enum-type name="RenderFlag" flags="QTextItem::RenderFlags"/> <enum-type name="RenderFlag" flags="RenderFlags"/>
</object-type> </object-type>
<object-type name="QTextList" > <object-type name="QTextList" >
<!--### Obsolete in 4.3--> <!--### Obsolete in 4.3-->
@ -2880,9 +2880,9 @@
<enum-type name="PrimitiveElement" extensible="yes" /> <enum-type name="PrimitiveElement" extensible="yes" />
<enum-type name="RequestSoftwareInputPanel"/> <enum-type name="RequestSoftwareInputPanel"/>
<enum-type name="StandardPixmap" extensible="yes"/> <enum-type name="StandardPixmap" extensible="yes"/>
<enum-type name="StateFlag" flags="QStyle::State"/> <enum-type name="StateFlag" flags="State"/>
<enum-type name="StyleHint" extensible="yes" /> <enum-type name="StyleHint" extensible="yes" />
<enum-type name="SubControl" flags="QStyle::SubControls" extensible="yes" force-integer="yes"/> <enum-type name="SubControl" flags="SubControls" extensible="yes" force-integer="yes"/>
<enum-type name="SubElement" extensible="yes" /> <enum-type name="SubElement" extensible="yes" />
<modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
<modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes"/> <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes"/>
@ -2906,7 +2906,7 @@
</modify-function> </modify-function>
</object-type> </object-type>
<object-type name="QColorDialog"> <object-type name="QColorDialog">
<enum-type name="ColorDialogOption" flags="QColorDialog::ColorDialogOptions"/> <enum-type name="ColorDialogOption" flags="ColorDialogOptions"/>
<!-- Obsolete method --> <!-- Obsolete method -->
<modify-function signature="getRgba(uint,bool*,QWidget*)" remove="all" /> <modify-function signature="getRgba(uint,bool*,QWidget*)" remove="all" />
<modify-function signature="getColor(const QColor&amp;, QWidget*)" allow-thread="yes" /> <modify-function signature="getColor(const QColor&amp;, QWidget*)" allow-thread="yes" />
@ -3139,9 +3139,9 @@
<include file-name="QPainterPath" location="global"/> <include file-name="QPainterPath" location="global"/>
<include file-name="QVarLengthArray" location="global"/> <include file-name="QVarLengthArray" location="global"/>
</extra-includes> </extra-includes>
<enum-type name="CacheModeFlag" flags="QGraphicsView::CacheMode"/> <enum-type name="CacheModeFlag" flags="CacheMode"/>
<enum-type name="DragMode"/> <enum-type name="DragMode"/>
<enum-type name="OptimizationFlag" flags="QGraphicsView::OptimizationFlags"/> <enum-type name="OptimizationFlag" flags="OptimizationFlags"/>
<enum-type name="ViewportAnchor"/> <enum-type name="ViewportAnchor"/>
<enum-type name="ViewportUpdateMode"/> <enum-type name="ViewportUpdateMode"/>
<modify-function signature="setupViewport(QWidget *)" access="non-final"/> <modify-function signature="setupViewport(QWidget *)" access="non-final"/>
@ -3278,7 +3278,7 @@
<include file-name="QVarLengthArray" location="global"/> <include file-name="QVarLengthArray" location="global"/>
</extra-includes> </extra-includes>
<enum-type name="ItemIndexMethod"/> <enum-type name="ItemIndexMethod"/>
<enum-type name="SceneLayer" flags="QGraphicsScene::SceneLayers"/> <enum-type name="SceneLayer" flags="SceneLayers"/>
<!-- ### Obsolete --> <!-- ### Obsolete -->
<modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*,QWidget*)" remove="all" /> <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*,QWidget*)" remove="all" />
@ -3779,7 +3779,7 @@
<include file-name="glue/qwidget_glue.h" location="local"/> <include file-name="glue/qwidget_glue.h" location="local"/>
</extra-includes> </extra-includes>
<enum-type name="RenderFlag" flags="QWidget::RenderFlags"/> <enum-type name="RenderFlag" flags="RenderFlags"/>
<modify-function signature="setParent(QWidget*)"> <modify-function signature="setParent(QWidget*)">
<modify-argument index="this"> <modify-argument index="this">
@ -4043,7 +4043,7 @@
<object-type name="QMessageBox"> <object-type name="QMessageBox">
<enum-type name="ButtonRole"/> <enum-type name="ButtonRole"/>
<enum-type name="Icon"/> <enum-type name="Icon"/>
<enum-type name="StandardButton" flags="QMessageBox::StandardButtons" /> <enum-type name="StandardButton" flags="StandardButtons" />
<modify-function signature="removeButton(QAbstractButton*)"> <modify-function signature="removeButton(QAbstractButton*)">
<modify-argument index="1"> <modify-argument index="1">
<parent index="this" action="add"/> <parent index="this" action="add"/>
@ -4076,7 +4076,7 @@
<object-type name="QAbstractSpinBox"> <object-type name="QAbstractSpinBox">
<enum-type name="ButtonSymbols"/> <enum-type name="ButtonSymbols"/>
<enum-type name="CorrectionMode"/> <enum-type name="CorrectionMode"/>
<enum-type name="StepEnabledFlag" flags="QAbstractSpinBox::StepEnabled"/> <enum-type name="StepEnabledFlag" flags="StepEnabled"/>
<modify-function signature="setLineEdit(QLineEdit *)"> <modify-function signature="setLineEdit(QLineEdit *)">
<modify-argument index="1"> <modify-argument index="1">
<parent index="this" action="add"/> <parent index="this" action="add"/>
@ -4280,7 +4280,7 @@
<modify-function signature="exec(QFlags&lt;Qt::DropAction&gt;, Qt::DropAction)" rename="exec_" allow-thread="yes"/> <modify-function signature="exec(QFlags&lt;Qt::DropAction&gt;, Qt::DropAction)" rename="exec_" allow-thread="yes"/>
</object-type> </object-type>
<object-type name="QDateTimeEdit"> <object-type name="QDateTimeEdit">
<enum-type name="Section" flags="QDateTimeEdit::Sections"/> <enum-type name="Section" flags="Sections"/>
<modify-function signature="setCalendarWidget(QCalendarWidget *)"> <modify-function signature="setCalendarWidget(QCalendarWidget *)">
<modify-argument index="1"> <modify-argument index="1">
<parent index="this" action="add"/> <parent index="this" action="add"/>
@ -4357,7 +4357,7 @@
<enum-type name="AcceptMode"/> <enum-type name="AcceptMode"/>
<enum-type name="DialogLabel"/> <enum-type name="DialogLabel"/>
<enum-type name="FileMode"/> <enum-type name="FileMode"/>
<enum-type name="Option" flags="QFileDialog::Options"/> <enum-type name="Option" flags="Options"/>
<enum-type name="ViewMode"/> <enum-type name="ViewMode"/>
<extra-includes> <extra-includes>
<include file-name="QUrl" location="global"/> <include file-name="QUrl" location="global"/>
@ -4742,7 +4742,7 @@
<include file-name="QTextFormat" location="global"/> <include file-name="QTextFormat" location="global"/>
<include file-name="QTextCursor" location="global"/> <include file-name="QTextCursor" location="global"/>
</extra-includes> </extra-includes>
<enum-type name="FindFlag" flags="QTextDocument::FindFlags"/> <enum-type name="FindFlag" flags="FindFlags"/>
<enum-type name="MetaInformation"/> <enum-type name="MetaInformation"/>
<enum-type name="ResourceType"/> <enum-type name="ResourceType"/>
<enum-type name="Stacks" since="4.7"/> <enum-type name="Stacks" since="4.7"/>
@ -4869,7 +4869,7 @@
</modify-function> </modify-function>
</object-type> </object-type>
<object-type name="QDockWidget"> <object-type name="QDockWidget">
<enum-type name="DockWidgetFeature" flags="QDockWidget::DockWidgetFeatures"/> <enum-type name="DockWidgetFeature" flags="DockWidgetFeatures"/>
<modify-function signature="setTitleBarWidget(QWidget*)"> <modify-function signature="setTitleBarWidget(QWidget*)">
<modify-argument index="1"> <modify-argument index="1">
<parent index="this" action="add"/> <parent index="this" action="add"/>
@ -5015,8 +5015,8 @@
</modify-function> </modify-function>
</object-type> </object-type>
<object-type name="QPaintEngine"> <object-type name="QPaintEngine">
<enum-type name="DirtyFlag" flags="QPaintEngine::DirtyFlags"/> <enum-type name="DirtyFlag" flags="DirtyFlags"/>
<enum-type name="PaintEngineFeature" flags="QPaintEngine::PaintEngineFeatures"/> <enum-type name="PaintEngineFeature" flags="PaintEngineFeatures"/>
<enum-type name="PolygonDrawMode"/> <enum-type name="PolygonDrawMode"/>
<enum-type name="Type"/> <enum-type name="Type"/>
<modify-function signature="begin(QPaintDevice*)"> <modify-function signature="begin(QPaintDevice*)">
@ -5078,7 +5078,7 @@
<!--### End of obsolete section --> <!--### End of obsolete section -->
</object-type> </object-type>
<object-type name="QTextEdit"> <object-type name="QTextEdit">
<enum-type name="AutoFormattingFlag" flags="QTextEdit::AutoFormatting"/> <enum-type name="AutoFormattingFlag" flags="AutoFormatting"/>
<enum-type name="LineWrapMode"/> <enum-type name="LineWrapMode"/>
<value-type name="ExtraSelection" > <value-type name="ExtraSelection" >
<include file-name="QTextEdit" location="global"/> <include file-name="QTextEdit" location="global"/>
@ -5116,8 +5116,8 @@
<include file-name="QPixmap" location="global"/> <include file-name="QPixmap" location="global"/>
</extra-includes> </extra-includes>
<enum-type name="CompositionMode"/> <enum-type name="CompositionMode"/>
<enum-type name="PixmapFragmentHint" flags="QPainter::PixmapFragmentHints" since="4.7"/> <enum-type name="PixmapFragmentHint" flags="PixmapFragmentHints" since="4.7"/>
<enum-type name="RenderHint" flags="QPainter::RenderHints"/> <enum-type name="RenderHint" flags="RenderHints"/>
<!-- ### "drawText(...)" is an internal method. --> <!-- ### "drawText(...)" is an internal method. -->
<modify-function signature="drawText(const QPointF &amp;, const QString &amp;, int, int)" remove="all"/> <modify-function signature="drawText(const QPointF &amp;, const QString &amp;, int, int)" remove="all"/>
@ -6439,20 +6439,20 @@
<enum-type name="GestureCancelPolicy"/> <enum-type name="GestureCancelPolicy"/>
</object-type> </object-type>
<object-type name="QGestureRecognizer"> <object-type name="QGestureRecognizer">
<enum-type name="ResultFlag" flags="QGestureRecognizer::Result"/> <enum-type name="ResultFlag" flags="Result"/>
</object-type> </object-type>
<object-type name="QTapAndHoldGesture"/> <object-type name="QTapAndHoldGesture"/>
<object-type name="QTapGesture"/> <object-type name="QTapGesture"/>
<object-type name="QGraphicsAnchor"/> <object-type name="QGraphicsAnchor"/>
<object-type name="QGraphicsAnchorLayout"/> <object-type name="QGraphicsAnchorLayout"/>
<object-type name="QGraphicsBlurEffect"> <object-type name="QGraphicsBlurEffect">
<enum-type name="BlurHint" flags="QGraphicsBlurEffect::BlurHints"/> <enum-type name="BlurHint" flags="BlurHints"/>
</object-type> </object-type>
<object-type name="QGraphicsColorizeEffect"/> <object-type name="QGraphicsColorizeEffect"/>
<object-type name="QGraphicsDropShadowEffect"/> <object-type name="QGraphicsDropShadowEffect"/>
<object-type name="QGraphicsEffect"> <object-type name="QGraphicsEffect">
<enum-type name="ChangeFlag" flags="QGraphicsEffect::ChangeFlags"/> <enum-type name="ChangeFlag" flags="ChangeFlags"/>
<enum-type name="PixmapPadMode"/> <enum-type name="PixmapPadMode"/>
</object-type> </object-type>
@ -6469,7 +6469,7 @@
<object-type name="QMouseEventTransition"/> <object-type name="QMouseEventTransition"/>
<object-type name="QPanGesture"/> <object-type name="QPanGesture"/>
<object-type name="QPinchGesture"> <object-type name="QPinchGesture">
<enum-type name="ChangeFlag" flags="QPinchGesture::ChangeFlags"/> <enum-type name="ChangeFlag" flags="ChangeFlags"/>
</object-type> </object-type>
<value-type name="QQuaternion"> <value-type name="QQuaternion">
<add-function signature="__repr__" return-type="PyObject*"> <add-function signature="__repr__" return-type="PyObject*">
@ -6595,7 +6595,7 @@
<!-- The following entries may be present in the system or not. Keep this section organized. --> <!-- The following entries may be present in the system or not. Keep this section organized. -->
<object-type name="QAbstractPageSetupDialog"/> <object-type name="QAbstractPageSetupDialog"/>
<object-type name="QAbstractPrintDialog"> <object-type name="QAbstractPrintDialog">
<enum-type name="PrintDialogOption" flags="QAbstractPrintDialog::PrintDialogOptions"/> <enum-type name="PrintDialogOption" flags="PrintDialogOptions"/>
<enum-type name="PrintRange"/> <enum-type name="PrintRange"/>
<modify-function signature="exec()" rename="exec_" allow-thread="yes" /> <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
</object-type> </object-type>
@ -6612,7 +6612,7 @@
</object-type> </object-type>
<object-type name="QPageSetupDialog"> <object-type name="QPageSetupDialog">
<enum-type name="PageSetupDialogOption" flags="QPageSetupDialog::PageSetupDialogOptions"/> <enum-type name="PageSetupDialogOption" flags="PageSetupDialogOptions"/>
<modify-function signature="exec()" rename="exec_" allow-thread="yes"/> <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
</object-type> </object-type>

10
PySide/QtNetwork/typesystem_network.xml
View file

@ -128,7 +128,7 @@
</object-type> </object-type>
<object-type name="QTcpSocket"/> <object-type name="QTcpSocket"/>
<object-type name="QUdpSocket"> <object-type name="QUdpSocket">
<enum-type name="BindFlag" flags="QUdpSocket::BindMode"/> <enum-type name="BindFlag" flags="BindMode"/>
<extra-includes> <extra-includes>
<include file-name="autoarraypointer.h" location="global"/> <include file-name="autoarraypointer.h" location="global"/>
</extra-includes> </extra-includes>
@ -222,11 +222,11 @@
<value-type name="QNetworkAddressEntry" /> <value-type name="QNetworkAddressEntry" />
<value-type name="QNetworkInterface"> <value-type name="QNetworkInterface">
<enum-type name="InterfaceFlag" flags="QNetworkInterface::InterfaceFlags"/> <enum-type name="InterfaceFlag" flags="InterfaceFlags"/>
</value-type> </value-type>
<value-type name="QNetworkProxy"> <value-type name="QNetworkProxy">
<enum-type name="Capability" flags="QNetworkProxy::Capabilities" /> <enum-type name="Capability" flags="Capabilities" />
<enum-type name="ProxyType"/> <enum-type name="ProxyType"/>
</value-type> </value-type>
@ -304,11 +304,11 @@
<value-type name="QNetworkConfiguration" since="4.7"> <value-type name="QNetworkConfiguration" since="4.7">
<enum-type name="BearerType" /> <enum-type name="BearerType" />
<enum-type name="Purpose" since="4.7"/> <enum-type name="Purpose" since="4.7"/>
<enum-type name="StateFlag" flags="QNetworkConfiguration::StateFlags" since="4.7"/> <enum-type name="StateFlag" flags="StateFlags" since="4.7"/>
<enum-type name="Type" since="4.7"/> <enum-type name="Type" since="4.7"/>
</value-type> </value-type>
<object-type name="QNetworkConfigurationManager" since="4.7"> <object-type name="QNetworkConfigurationManager" since="4.7">
<enum-type name="Capability" flags="QNetworkConfigurationManager::Capabilities" since="4.7"/> <enum-type name="Capability" flags="Capabilities" since="4.7"/>
</object-type> </object-type>
<object-type name="QNetworkSession" since="4.7"> <object-type name="QNetworkSession" since="4.7">
<enum-type name="SessionError" since="4.7"/> <enum-type name="SessionError" since="4.7"/>

8
PySide/QtOpenGL/typesystem_opengl.xml
View file

@ -25,7 +25,7 @@
<rejection class="QGLContext" field-name="currentCtx"/> <rejection class="QGLContext" field-name="currentCtx"/>
<namespace-type name="QGL"> <namespace-type name="QGL">
<enum-type name="FormatOption" flags="QGL::FormatOptions" force-integer="yes"/> <enum-type name="FormatOption" flags="FormatOptions" force-integer="yes"/>
<extra-includes> <extra-includes>
<include file-name="qgl.h" location="global"/> <include file-name="qgl.h" location="global"/>
</extra-includes> </extra-includes>
@ -39,12 +39,12 @@
<value-type name="QGLFormat"> <value-type name="QGLFormat">
<enum-type name="OpenGLContextProfile" since="4.7"/> <enum-type name="OpenGLContextProfile" since="4.7"/>
<enum-type name="OpenGLVersionFlag" flags="QGLFormat::OpenGLVersionFlags"/> <enum-type name="OpenGLVersionFlag" flags="OpenGLVersionFlags"/>
</value-type> </value-type>
<rejection class="QGLContext" field-name="currentCtx" /> <rejection class="QGLContext" field-name="currentCtx" />
<object-type name="QGLContext"> <object-type name="QGLContext">
<enum-type name="BindOption" flags="QGLContext::BindOptions"/> <enum-type name="BindOption" flags="BindOptions"/>
<modify-function signature="chooseContext(const QGLContext*)"> <modify-function signature="chooseContext(const QGLContext*)">
<modify-argument index="1" invalidate-after-use="yes"/> <modify-argument index="1" invalidate-after-use="yes"/>
</modify-function> </modify-function>
@ -89,7 +89,7 @@
<value-type name="QGLFramebufferObjectFormat"/> <value-type name="QGLFramebufferObjectFormat"/>
<object-type name="QGLShader"> <object-type name="QGLShader">
<enum-type name="ShaderTypeBit" flags="QGLShader::ShaderType"/> <enum-type name="ShaderTypeBit" flags="ShaderType"/>
</object-type> </object-type>
<object-type name="QGLShaderProgram"> <object-type name="QGLShaderProgram">
<!-- ### Use QMatrixZxY overloads --> <!-- ### Use QMatrixZxY overloads -->

6
PySide/QtScript/typesystem_script.xml
View file

@ -38,7 +38,7 @@
<enum-type name="Extension"/> <enum-type name="Extension"/>
</object-type> </object-type>
<object-type name="QScriptEngine"> <object-type name="QScriptEngine">
<enum-type name="QObjectWrapOption" flags="QScriptEngine::QObjectWrapOptions"/> <enum-type name="QObjectWrapOption" flags="QObjectWrapOptions"/>
<enum-type name="ValueOwnership"/> <enum-type name="ValueOwnership"/>
</object-type> </object-type>
<object-type name="QScriptExtensionInterface"/> <object-type name="QScriptExtensionInterface"/>
@ -46,8 +46,8 @@
<value-type name="QScriptProgram"/> <value-type name="QScriptProgram"/>
<value-type name="QScriptString"/> <value-type name="QScriptString"/>
<value-type name="QScriptValue"> <value-type name="QScriptValue">
<enum-type name="PropertyFlag" flags="QScriptValue::PropertyFlags"/> <enum-type name="PropertyFlag" flags="PropertyFlags"/>
<enum-type name="ResolveFlag" flags="QScriptValue::ResolveFlags"/> <enum-type name="ResolveFlag" flags="ResolveFlags"/>
<enum-type name="SpecialValue"/> <enum-type name="SpecialValue"/>
</value-type> </value-type>
<object-type name="QScriptValueIterator"/> <object-type name="QScriptValueIterator"/>

2
PySide/QtSql/typesystem_sql.xml
View file

@ -27,7 +27,7 @@
<namespace-type name="QSql"> <namespace-type name="QSql">
<enum-type name="Location"/> <enum-type name="Location"/>
<enum-type name="ParamTypeFlag" flags="QSql::ParamType"/> <enum-type name="ParamTypeFlag" flags="ParamType"/>
<enum-type name="TableType"/> <enum-type name="TableType"/>
<enum-type name="NumericalPrecisionPolicy"/> <enum-type name="NumericalPrecisionPolicy"/>
<extra-includes> <extra-includes>

2
PySide/QtWebKit/typesystem_webkit.xml
View file

@ -76,7 +76,7 @@
<enum-type name="WebGraphic"/> <enum-type name="WebGraphic"/>
</object-type> </object-type>
<object-type name="QWebPage"> <object-type name="QWebPage">
<enum-type name="FindFlag" flags="QWebPage::FindFlags"/> <enum-type name="FindFlag" flags="FindFlags"/>
<enum-type name="LinkDelegationPolicy"/> <enum-type name="LinkDelegationPolicy"/>
<enum-type name="NavigationType"/> <enum-type name="NavigationType"/>
<enum-type name="WebAction"/> <enum-type name="WebAction"/>

4
PySide/phonon/typesystem_phonon.xml
View file

@ -129,7 +129,7 @@
<object-type name="VolumeFaderInterface"/> <object-type name="VolumeFaderInterface"/>
<value-type name="EffectParameter"> <value-type name="EffectParameter">
<enum-type name="Hint" flags="Phonon::EffectParameter::Hints"/> <enum-type name="Hint" flags="Hints"/>
<!-- ### Internal methods and ctors --> <!-- ### Internal methods and ctors -->
<modify-function signature="EffectParameter()" remove="all"/> <modify-function signature="EffectParameter()" remove="all"/>
<modify-function signature="operator&lt;(const Phonon::EffectParameter &amp;)const" remove="all"/> <modify-function signature="operator&lt;(const Phonon::EffectParameter &amp;)const" remove="all"/>
@ -265,7 +265,7 @@
<object-type name="Effect"/> <object-type name="Effect"/>
<object-type name="EffectWidget"/> <object-type name="EffectWidget"/>
<object-type name="MediaController"> <object-type name="MediaController">
<enum-type name="Feature" flags="Phonon::MediaController::Features"/> <enum-type name="Feature" flags="Features"/>
<enum-type name="NavigationMenu"/> <enum-type name="NavigationMenu"/>
</object-type> </object-type>
<object-type name="MediaObject" /> <object-type name="MediaObject" />