diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-05-10 18:41:49 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:54:21 -0300 |
commit | c8f5fa07fea810e448982f7ebac50533e457aa9c (patch) | |
tree | 9052639fd332a1eb6bdb79539eca1c10c8625d00 /PySide | |
parent | c85ce954582eba5761e895641e4e5dbf6dd8f4cc (diff) |
Remove typesystem verbosity after fix of bug 417.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Renato Araújo <renato.filho@openbossa.org>
Diffstat (limited to 'PySide')
-rw-r--r-- | PySide/QtCore/typesystem_core.xml | 56 | ||||
-rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 90 | ||||
-rw-r--r-- | PySide/QtNetwork/typesystem_network.xml | 10 | ||||
-rw-r--r-- | PySide/QtOpenGL/typesystem_opengl.xml | 8 | ||||
-rw-r--r-- | PySide/QtScript/typesystem_script.xml | 6 | ||||
-rw-r--r-- | PySide/QtSql/typesystem_sql.xml | 2 | ||||
-rw-r--r-- | PySide/QtWebKit/typesystem_webkit.xml | 2 | ||||
-rw-r--r-- | PySide/phonon/typesystem_phonon.xml | 4 |
8 files changed, 89 insertions, 89 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index d778d4e38..9d39fea86 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -244,7 +244,7 @@ <rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/> <rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/> <namespace-type name="Qt"> - <enum-type name="AlignmentFlag" flags="Qt::Alignment" /> + <enum-type name="AlignmentFlag" flags="Alignment" /> <enum-type name="AnchorAttribute"/> <enum-type name="AnchorPoint"/> <enum-type name="ApplicationAttribute"/> @@ -263,33 +263,33 @@ <enum-type name="CursorShape" /> <enum-type name="DateFormat" /> <enum-type name="DayOfWeek"/> - <enum-type name="DockWidgetArea" flags="Qt::DockWidgetAreas" /> + <enum-type name="DockWidgetArea" flags="DockWidgetAreas" /> <enum-type name="DockWidgetAreaSizes"/> - <enum-type name="DropAction" flags="Qt::DropActions"/> + <enum-type name="DropAction" flags="DropActions"/> <enum-type name="EventPriority"/> <enum-type name="FillRule"/> <enum-type name="FocusPolicy"/> <enum-type name="FocusReason"/> - <enum-type name="GestureFlag" flags="Qt::GestureFlags"/> + <enum-type name="GestureFlag" flags="GestureFlags"/> <enum-type name="GestureState"/> <enum-type name="GestureType"/> <enum-type name="GlobalColor"/> <enum-type name="HitTestAccuracy"/> - <enum-type name="ImageConversionFlag" flags="Qt::ImageConversionFlags" /> - <enum-type name="InputMethodHint" flags="Qt::InputMethodHints"/> + <enum-type name="ImageConversionFlag" flags="ImageConversionFlags" /> + <enum-type name="InputMethodHint" flags="InputMethodHints"/> <enum-type name="InputMethodQuery"/> <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="Key" /> - <enum-type name="KeyboardModifier" flags="Qt::KeyboardModifiers"/> + <enum-type name="KeyboardModifier" flags="KeyboardModifiers"/> <enum-type name="LayoutDirection"/> <enum-type name="MaskMode"/> - <enum-type name="MatchFlag" flags="Qt::MatchFlags"/> + <enum-type name="MatchFlag" flags="MatchFlags"/> <enum-type name="Modifier"/> - <enum-type name="MouseButton" flags="Qt::MouseButtons"/> + <enum-type name="MouseButton" flags="MouseButtons"/> <enum-type name="NavigationMode"/> - <enum-type name="Orientation" flags="Qt::Orientations"/> + <enum-type name="Orientation" flags="Orientations"/> <enum-type name="PenCapStyle"/> <enum-type name="PenJoinStyle"/> <enum-type name="PenStyle"/> @@ -301,10 +301,10 @@ <enum-type name="TextElideMode"/> <enum-type name="TextFlag"/> <enum-type name="TextFormat"/> - <enum-type name="TextInteractionFlag" flags="Qt::TextInteractionFlags"/> + <enum-type name="TextInteractionFlag" flags="TextInteractionFlags"/> <enum-type name="TileRule"/> <enum-type name="TimeSpec"/> - <enum-type name="ToolBarArea" flags="Qt::ToolBarAreas" /> + <enum-type name="ToolBarArea" flags="ToolBarAreas" /> <enum-type name="ToolBarAreaSizes"/> <enum-type name="ToolButtonStyle"/> <enum-type name="TouchPointState"/> @@ -314,8 +314,8 @@ <enum-type name="WidgetAttribute" /> <enum-type name="WindowFrameSection"/> <enum-type name="WindowModality"/> - <enum-type name="WindowState" flags="Qt::WindowStates"/> - <enum-type name="WindowType" flags="Qt::WindowFlags"/> + <enum-type name="WindowState" flags="WindowStates"/> + <enum-type name="WindowType" flags="WindowFlags"/> <!--### These functions are part of QtGui, not QtCore --> <modify-function signature="codecForHtml(const QByteArray &)" remove="all"/> @@ -632,8 +632,8 @@ </add-function> </value-type> <value-type name="QDir"> - <enum-type name="Filter" flags="QDir::Filters"/> - <enum-type name="SortFlag" flags="QDir::SortFlags" /> + <enum-type name="Filter" flags="Filters"/> + <enum-type name="SortFlag" flags="SortFlags" /> <add-function signature="__reduce__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> @@ -947,7 +947,7 @@ <enum-type name="FormatType"/> <enum-type name="Language" /> <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 --> <modify-function signature="toString(qulonglong) const" remove="all"/> <modify-function signature="toString(ushort) const" remove="all"/> @@ -1099,7 +1099,7 @@ <modify-function signature="relock()" allow-thread="yes" /> </object-type> <object-type name="QDirIterator"> - <enum-type name="IteratorFlag" flags="QDirIterator::IteratorFlags"/> + <enum-type name="IteratorFlag" flags="IteratorFlags"/> </object-type> <object-type name="QThread"> <enum-type name="Priority"/> @@ -1427,7 +1427,7 @@ </extra-includes> </object-type> <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"/> <modify-documentation xpath='description/para[3]'> <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 "http://bühler.example.com" would be sent to the server as "http://xn--bhler-kva.example.com/List%20of%20applicants.xml".</para> @@ -1822,7 +1822,7 @@ </add-function> </value-type> <value-type name="QTextBoundaryFinder"> - <enum-type name="BoundaryReason" flags="QTextBoundaryFinder::BoundaryReasons"/> + <enum-type name="BoundaryReason" flags="BoundaryReasons"/> <enum-type name="BoundaryType"/> <!-- There's no QChar in PySide --> <modify-function signature="QTextBoundaryFinder(QTextBoundaryFinder::BoundaryType,const QChar*,int,unsigned char*,int)" remove="all"/> @@ -1835,7 +1835,7 @@ <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/> </object-type> <object-type name="QEventLoop"> - <enum-type name="ProcessEventsFlag" flags="QEventLoop::ProcessEventsFlags"/> + <enum-type name="ProcessEventsFlag" flags="ProcessEventsFlags"/> <modify-function signature="exec(QFlags<QEventLoop::ProcessEventsFlag>)" rename="exec_" allow-thread="yes" /> <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>)" allow-thread="yes" /> <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>, int)" allow-thread="yes" /> @@ -1843,7 +1843,7 @@ <object-type name="QFile"> <enum-type name="FileError"/> <enum-type name="MemoryMapFlags"/> - <enum-type name="Permission" flags="QFile::Permissions"/> + <enum-type name="Permission" flags="Permissions"/> <extra-includes> <include file-name="QAbstractFileEngine" location="global"/> </extra-includes> @@ -1874,7 +1874,7 @@ <modify-function signature="flush()" allow-thread="yes"/> </object-type> <object-type name="QIODevice"> - <enum-type name="OpenModeFlag" flags="QIODevice::OpenMode"/> + <enum-type name="OpenModeFlag" flags="OpenMode"/> <modify-function signature="open(QFlags<QIODevice::OpenModeFlag>)" allow-thread="yes"/> <modify-function signature="close()" allow-thread="yes"/> <modify-function signature="seek(qint64)" allow-thread="yes"/> @@ -2004,7 +2004,7 @@ </extra-includes> </object-type> <object-type name="QTextCodec"> - <enum-type name="ConversionFlag" flags="QTextCodec::ConversionFlags"/> + <enum-type name="ConversionFlag" flags="ConversionFlags"/> <object-type name="ConverterState"> <include file-name="QTextCodec" location="global"/> @@ -2158,7 +2158,7 @@ <!-- <object-type name="QAbstractFileEngine::UnMapExtensionOption" /> --> <object-type name="QAbstractFileEngine"> <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="FileOwner"/> <enum-type name="FileTime"/> @@ -2638,7 +2638,7 @@ </value-type> <object-type name="QTextStream" stream="yes"> <enum-type name="FieldAlignment"/> - <enum-type name="NumberFlag" flags="QTextStream::NumberFlags"/> + <enum-type name="NumberFlag" flags="NumberFlags"/> <enum-type name="RealNumberNotation"/> <enum-type name="Status"/> <!-- Removed because it expect QString to be mutable --> @@ -2681,7 +2681,7 @@ <enum-type name="SystemSemaphoreError"/> </object-type> <namespace-type name="QtConcurrent" target-type="class"> - <enum-type name="ReduceOption" flags="QtConcurrent::ReduceOptions"/> + <enum-type name="ReduceOption" flags="ReduceOptions"/> <extra-includes> <include file-name="qtconcurrentreducekernel.h" location="global"/> <include file-name="qtconcurrentthreadengine.h" location="global"/> diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index a0089a080..77d1dbb0d 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -276,7 +276,7 @@ <enum-type name="StyleOptionVersion"/> </value-type> <value-type name="QStyleOptionButton" polymorphic-id-expression="%1->type == QStyleOptionButton::Type && %1->version == QStyleOptionButton::Version"> - <enum-type name="ButtonFeature" flags="QStyleOptionButton::ButtonFeatures"/> + <enum-type name="ButtonFeature" flags="ButtonFeatures"/> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </value-type> @@ -304,7 +304,7 @@ <enum-type name="StyleOptionVersion"/> </value-type> <value-type name="QStyleOptionFrameV2" polymorphic-id-expression="%1->type == QStyleOptionFrameV2::Type && %1->version == QStyleOptionFrameV2::Version"> - <enum-type name="FrameFeature" flags="QStyleOptionFrameV2::FrameFeatures"/> + <enum-type name="FrameFeature" flags="FrameFeatures"/> <enum-type name="StyleOptionVersion"/> </value-type> <value-type name="QStyleOptionFrameV3" polymorphic-id-expression="%1->type == QStyleOptionFrameV3::Type && %1->version == QStyleOptionFrameV3::Version"> @@ -348,7 +348,7 @@ <enum-type name="StyleOptionVersion"/> </value-type> <value-type name="QStyleOptionTab" polymorphic-id-expression="%1->type == QStyleOptionTab::Type && %1->version == QStyleOptionTab::Version"> - <enum-type name="CornerWidget" flags="QStyleOptionTab::CornerWidgets"/> + <enum-type name="CornerWidget" flags="CornerWidgets"/> <enum-type name="SelectedPosition"/> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> @@ -378,7 +378,7 @@ <value-type name="QStyleOptionToolBar" polymorphic-id-expression="%1->type == QStyleOptionToolBar::Type && %1->version == QStyleOptionToolBar::Version"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> - <enum-type name="ToolBarFeature" flags="QStyleOptionToolBar::ToolBarFeatures"/> + <enum-type name="ToolBarFeature" flags="ToolBarFeatures"/> <enum-type name="ToolBarPosition"/> </value-type> <value-type name="QStyleOptionToolBox" polymorphic-id-expression="%1->type == QStyleOptionToolBox::Type && %1->version == QStyleOptionToolBox::Version"> @@ -393,7 +393,7 @@ <value-type name="QStyleOptionToolButton" polymorphic-id-expression="%1->type == QStyleOptionToolButton::Type && %1->version == QStyleOptionToolButton::Version"> <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> - <enum-type name="ToolButtonFeature" flags="QStyleOptionToolButton::ToolButtonFeatures" /> + <enum-type name="ToolButtonFeature" flags="ToolButtonFeatures" /> </value-type> <value-type name="QStyleOptionViewItem" polymorphic-id-expression="%1->type == QStyleOptionViewItem::Type && %1->version == QStyleOptionViewItem::Version"> <enum-type name="Position"/> @@ -402,7 +402,7 @@ </value-type> <value-type name="QStyleOptionViewItemV2" polymorphic-id-expression="%1->type == QStyleOptionViewItemV2::Type && %1->version == QStyleOptionViewItemV2::Version"> <enum-type name="StyleOptionVersion"/> - <enum-type name="ViewItemFeature" flags="QStyleOptionViewItemV2::ViewItemFeatures"/> + <enum-type name="ViewItemFeature" flags="ViewItemFeatures"/> </value-type> <value-type name="QStyleOptionViewItemV3" polymorphic-id-expression="%1->type == QStyleOptionViewItemV3::Type && %1->version == QStyleOptionViewItemV3::Version"> <enum-type name="StyleOptionVersion"/> @@ -427,14 +427,14 @@ </value-type> <value-type name="QTextInlineObject" /> <value-type name="QSizePolicy"> - <enum-type name="ControlType" flags="QSizePolicy::ControlTypes"/> + <enum-type name="ControlType" flags="ControlTypes"/> <enum-type name="Policy"/> <enum-type name="PolicyFlag"/> </value-type> <value-type name="QTableWidgetSelectionRange"/> <value-type name="QTextDocumentFragment" /> <value-type name="QTextOption"> - <enum-type name="Flag" flags="QTextOption::Flags"/> + <enum-type name="Flag" flags="Flags"/> <enum-type name="TabType"/> <enum-type name="WrapMode"/> <value-type name="Tab"/> @@ -655,7 +655,7 @@ <value-type name="QTextFormat" > <enum-type name="FormatType"/> <enum-type name="ObjectTypes"/> - <enum-type name="PageBreakFlag" flags="QTextFormat::PageBreakFlags"/> + <enum-type name="PageBreakFlag" flags="PageBreakFlags"/> <enum-type name="Property" /> <modify-function signature="isValid()const" access="non-final"/> </value-type> @@ -756,7 +756,7 @@ Shiboken::Object::releaseOwnership(%PYARG_0); </inject-code> </add-function> - <enum-type name="IteratorFlag" flags="QTreeWidgetItemIterator::IteratorFlags"/> + <enum-type name="IteratorFlag" flags="IteratorFlags"/> <!-- ### See bug 778 --> <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="Extension"/> <enum-type name="GraphicsItemChange"/> - <enum-type name="GraphicsItemFlag" flags="QGraphicsItem::GraphicsItemFlags"/> + <enum-type name="GraphicsItemFlag" flags="GraphicsItemFlags"/> <enum-type name="PanelModality"/> <inject-code class="target" position="end"> PyObject* userTypeConstant = PyInt_FromLong(QGraphicsItem::UserType); @@ -1717,7 +1717,7 @@ <enum-type name="CursorAction"/> <enum-type name="DragDropMode"/> <enum-type name="DropIndicatorPosition"/> - <enum-type name="EditTrigger" flags="QAbstractItemView::EditTriggers"/> + <enum-type name="EditTrigger" flags="EditTriggers"/> <enum-type name="ScrollHint"/> <enum-type name="ScrollMode"/> <enum-type name="SelectionBehavior"/> @@ -1859,7 +1859,7 @@ <object-type name="QDialogButtonBox"> <enum-type name="ButtonLayout"/> <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-argument index="1"> <parent index="this" action="add"/> @@ -1890,7 +1890,7 @@ </object-type> <object-type name="QWizard"> <enum-type name="WizardButton" /> - <enum-type name="WizardOption" flags="QWizard::WizardOptions"/> + <enum-type name="WizardOption" flags="WizardOptions"/> <enum-type name="WizardPixmap"/> <enum-type name="WizardStyle"/> <modify-function signature="addPage(QWizardPage*)"> @@ -1920,10 +1920,10 @@ </modify-function> </object-type> <object-type name="QFontComboBox"> - <enum-type name="FontFilter" flags="QFontComboBox::FontFilters"/> + <enum-type name="FontFilter" flags="FontFilters"/> </object-type> <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-argument index="1"> <remove-argument /> @@ -2077,7 +2077,7 @@ </modify-function> </object-type> <object-type name="QItemSelectionModel"> - <enum-type name="SelectionFlag" flags="QItemSelectionModel::SelectionFlags"/> + <enum-type name="SelectionFlag" flags="SelectionFlags"/> </object-type> <object-type name="QListView"> <enum-type name="Flow"/> @@ -2094,7 +2094,7 @@ </modify-function> </object-type> <object-type name="QMainWindow"> - <enum-type name="DockOption" flags="QMainWindow::DockOptions"/> + <enum-type name="DockOption" flags="DockOptions"/> <modify-function signature="setCentralWidget(QWidget*)"> <inject-code class="target" position="beginning"> <insert-template name="replace_child"> @@ -2180,7 +2180,7 @@ </object-type> <object-type name="QMdiArea"> - <enum-type name="AreaOption" flags="QMdiArea::AreaOptions"/> + <enum-type name="AreaOption" flags="AreaOptions"/> <enum-type name="ViewMode"/> <enum-type name="WindowOrder"/> <modify-function signature="addSubWindow(QWidget*, QFlags<Qt::WindowType>)" > @@ -2193,7 +2193,7 @@ </modify-function> </object-type> <object-type name="QMdiSubWindow"> - <enum-type name="SubWindowOption" flags="QMdiSubWindow::SubWindowOptions"/> + <enum-type name="SubWindowOption" flags="SubWindowOptions"/> <modify-function signature="setWidget(QWidget*)" > <modify-argument index="1"> <parent index="this" action="add"/> @@ -2547,7 +2547,7 @@ <object-type name="QTextBlockGroup" /> <object-type name="QTextBlockUserData" /> <object-type name="QTextItem"> - <enum-type name="RenderFlag" flags="QTextItem::RenderFlags"/> + <enum-type name="RenderFlag" flags="RenderFlags"/> </object-type> <object-type name="QTextList" > <!--### Obsolete in 4.3--> @@ -2880,9 +2880,9 @@ <enum-type name="PrimitiveElement" extensible="yes" /> <enum-type name="RequestSoftwareInputPanel"/> <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="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" /> <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"/> @@ -2906,7 +2906,7 @@ </modify-function> </object-type> <object-type name="QColorDialog"> - <enum-type name="ColorDialogOption" flags="QColorDialog::ColorDialogOptions"/> + <enum-type name="ColorDialogOption" flags="ColorDialogOptions"/> <!-- Obsolete method --> <modify-function signature="getRgba(uint,bool*,QWidget*)" remove="all" /> <modify-function signature="getColor(const QColor&, QWidget*)" allow-thread="yes" /> @@ -3139,9 +3139,9 @@ <include file-name="QPainterPath" location="global"/> <include file-name="QVarLengthArray" location="global"/> </extra-includes> - <enum-type name="CacheModeFlag" flags="QGraphicsView::CacheMode"/> + <enum-type name="CacheModeFlag" flags="CacheMode"/> <enum-type name="DragMode"/> - <enum-type name="OptimizationFlag" flags="QGraphicsView::OptimizationFlags"/> + <enum-type name="OptimizationFlag" flags="OptimizationFlags"/> <enum-type name="ViewportAnchor"/> <enum-type name="ViewportUpdateMode"/> <modify-function signature="setupViewport(QWidget *)" access="non-final"/> @@ -3278,7 +3278,7 @@ <include file-name="QVarLengthArray" location="global"/> </extra-includes> <enum-type name="ItemIndexMethod"/> - <enum-type name="SceneLayer" flags="QGraphicsScene::SceneLayers"/> + <enum-type name="SceneLayer" flags="SceneLayers"/> <!-- ### Obsolete --> <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"/> </extra-includes> - <enum-type name="RenderFlag" flags="QWidget::RenderFlags"/> + <enum-type name="RenderFlag" flags="RenderFlags"/> <modify-function signature="setParent(QWidget*)"> <modify-argument index="this"> @@ -4043,7 +4043,7 @@ <object-type name="QMessageBox"> <enum-type name="ButtonRole"/> <enum-type name="Icon"/> - <enum-type name="StandardButton" flags="QMessageBox::StandardButtons" /> + <enum-type name="StandardButton" flags="StandardButtons" /> <modify-function signature="removeButton(QAbstractButton*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -4076,7 +4076,7 @@ <object-type name="QAbstractSpinBox"> <enum-type name="ButtonSymbols"/> <enum-type name="CorrectionMode"/> - <enum-type name="StepEnabledFlag" flags="QAbstractSpinBox::StepEnabled"/> + <enum-type name="StepEnabledFlag" flags="StepEnabled"/> <modify-function signature="setLineEdit(QLineEdit *)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -4280,7 +4280,7 @@ <modify-function signature="exec(QFlags<Qt::DropAction>, Qt::DropAction)" rename="exec_" allow-thread="yes"/> </object-type> <object-type name="QDateTimeEdit"> - <enum-type name="Section" flags="QDateTimeEdit::Sections"/> + <enum-type name="Section" flags="Sections"/> <modify-function signature="setCalendarWidget(QCalendarWidget *)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -4357,7 +4357,7 @@ <enum-type name="AcceptMode"/> <enum-type name="DialogLabel"/> <enum-type name="FileMode"/> - <enum-type name="Option" flags="QFileDialog::Options"/> + <enum-type name="Option" flags="Options"/> <enum-type name="ViewMode"/> <extra-includes> <include file-name="QUrl" location="global"/> @@ -4742,7 +4742,7 @@ <include file-name="QTextFormat" location="global"/> <include file-name="QTextCursor" location="global"/> </extra-includes> - <enum-type name="FindFlag" flags="QTextDocument::FindFlags"/> + <enum-type name="FindFlag" flags="FindFlags"/> <enum-type name="MetaInformation"/> <enum-type name="ResourceType"/> <enum-type name="Stacks" since="4.7"/> @@ -4869,7 +4869,7 @@ </modify-function> </object-type> <object-type name="QDockWidget"> - <enum-type name="DockWidgetFeature" flags="QDockWidget::DockWidgetFeatures"/> + <enum-type name="DockWidgetFeature" flags="DockWidgetFeatures"/> <modify-function signature="setTitleBarWidget(QWidget*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -5015,8 +5015,8 @@ </modify-function> </object-type> <object-type name="QPaintEngine"> - <enum-type name="DirtyFlag" flags="QPaintEngine::DirtyFlags"/> - <enum-type name="PaintEngineFeature" flags="QPaintEngine::PaintEngineFeatures"/> + <enum-type name="DirtyFlag" flags="DirtyFlags"/> + <enum-type name="PaintEngineFeature" flags="PaintEngineFeatures"/> <enum-type name="PolygonDrawMode"/> <enum-type name="Type"/> <modify-function signature="begin(QPaintDevice*)"> @@ -5078,7 +5078,7 @@ <!--### End of obsolete section --> </object-type> <object-type name="QTextEdit"> - <enum-type name="AutoFormattingFlag" flags="QTextEdit::AutoFormatting"/> + <enum-type name="AutoFormattingFlag" flags="AutoFormatting"/> <enum-type name="LineWrapMode"/> <value-type name="ExtraSelection" > <include file-name="QTextEdit" location="global"/> @@ -5116,8 +5116,8 @@ <include file-name="QPixmap" location="global"/> </extra-includes> <enum-type name="CompositionMode"/> - <enum-type name="PixmapFragmentHint" flags="QPainter::PixmapFragmentHints" since="4.7"/> - <enum-type name="RenderHint" flags="QPainter::RenderHints"/> + <enum-type name="PixmapFragmentHint" flags="PixmapFragmentHints" since="4.7"/> + <enum-type name="RenderHint" flags="RenderHints"/> <!-- ### "drawText(...)" is an internal method. --> <modify-function signature="drawText(const QPointF &, const QString &, int, int)" remove="all"/> @@ -6439,20 +6439,20 @@ <enum-type name="GestureCancelPolicy"/> </object-type> <object-type name="QGestureRecognizer"> - <enum-type name="ResultFlag" flags="QGestureRecognizer::Result"/> + <enum-type name="ResultFlag" flags="Result"/> </object-type> <object-type name="QTapAndHoldGesture"/> <object-type name="QTapGesture"/> <object-type name="QGraphicsAnchor"/> <object-type name="QGraphicsAnchorLayout"/> <object-type name="QGraphicsBlurEffect"> - <enum-type name="BlurHint" flags="QGraphicsBlurEffect::BlurHints"/> + <enum-type name="BlurHint" flags="BlurHints"/> </object-type> <object-type name="QGraphicsColorizeEffect"/> <object-type name="QGraphicsDropShadowEffect"/> <object-type name="QGraphicsEffect"> - <enum-type name="ChangeFlag" flags="QGraphicsEffect::ChangeFlags"/> + <enum-type name="ChangeFlag" flags="ChangeFlags"/> <enum-type name="PixmapPadMode"/> </object-type> @@ -6469,7 +6469,7 @@ <object-type name="QMouseEventTransition"/> <object-type name="QPanGesture"/> <object-type name="QPinchGesture"> - <enum-type name="ChangeFlag" flags="QPinchGesture::ChangeFlags"/> + <enum-type name="ChangeFlag" flags="ChangeFlags"/> </object-type> <value-type name="QQuaternion"> <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. --> <object-type name="QAbstractPageSetupDialog"/> <object-type name="QAbstractPrintDialog"> - <enum-type name="PrintDialogOption" flags="QAbstractPrintDialog::PrintDialogOptions"/> + <enum-type name="PrintDialogOption" flags="PrintDialogOptions"/> <enum-type name="PrintRange"/> <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> </object-type> @@ -6612,7 +6612,7 @@ </object-type> <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"/> </object-type> diff --git a/PySide/QtNetwork/typesystem_network.xml b/PySide/QtNetwork/typesystem_network.xml index fd47356fa..5ed175553 100644 --- a/PySide/QtNetwork/typesystem_network.xml +++ b/PySide/QtNetwork/typesystem_network.xml @@ -128,7 +128,7 @@ </object-type> <object-type name="QTcpSocket"/> <object-type name="QUdpSocket"> - <enum-type name="BindFlag" flags="QUdpSocket::BindMode"/> + <enum-type name="BindFlag" flags="BindMode"/> <extra-includes> <include file-name="autoarraypointer.h" location="global"/> </extra-includes> @@ -222,11 +222,11 @@ <value-type name="QNetworkAddressEntry" /> <value-type name="QNetworkInterface"> - <enum-type name="InterfaceFlag" flags="QNetworkInterface::InterfaceFlags"/> + <enum-type name="InterfaceFlag" flags="InterfaceFlags"/> </value-type> <value-type name="QNetworkProxy"> - <enum-type name="Capability" flags="QNetworkProxy::Capabilities" /> + <enum-type name="Capability" flags="Capabilities" /> <enum-type name="ProxyType"/> </value-type> @@ -304,11 +304,11 @@ <value-type name="QNetworkConfiguration" since="4.7"> <enum-type name="BearerType" /> <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"/> </value-type> <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 name="QNetworkSession" since="4.7"> <enum-type name="SessionError" since="4.7"/> diff --git a/PySide/QtOpenGL/typesystem_opengl.xml b/PySide/QtOpenGL/typesystem_opengl.xml index 0ccacd8e0..6855bf38d 100644 --- a/PySide/QtOpenGL/typesystem_opengl.xml +++ b/PySide/QtOpenGL/typesystem_opengl.xml @@ -25,7 +25,7 @@ <rejection class="QGLContext" field-name="currentCtx"/> <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> <include file-name="qgl.h" location="global"/> </extra-includes> @@ -39,12 +39,12 @@ <value-type name="QGLFormat"> <enum-type name="OpenGLContextProfile" since="4.7"/> - <enum-type name="OpenGLVersionFlag" flags="QGLFormat::OpenGLVersionFlags"/> + <enum-type name="OpenGLVersionFlag" flags="OpenGLVersionFlags"/> </value-type> <rejection class="QGLContext" field-name="currentCtx" /> <object-type name="QGLContext"> - <enum-type name="BindOption" flags="QGLContext::BindOptions"/> + <enum-type name="BindOption" flags="BindOptions"/> <modify-function signature="chooseContext(const QGLContext*)"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> @@ -89,7 +89,7 @@ <value-type name="QGLFramebufferObjectFormat"/> <object-type name="QGLShader"> - <enum-type name="ShaderTypeBit" flags="QGLShader::ShaderType"/> + <enum-type name="ShaderTypeBit" flags="ShaderType"/> </object-type> <object-type name="QGLShaderProgram"> <!-- ### Use QMatrixZxY overloads --> diff --git a/PySide/QtScript/typesystem_script.xml b/PySide/QtScript/typesystem_script.xml index e23542e61..7c28a4018 100644 --- a/PySide/QtScript/typesystem_script.xml +++ b/PySide/QtScript/typesystem_script.xml @@ -38,7 +38,7 @@ <enum-type name="Extension"/> </object-type> <object-type name="QScriptEngine"> - <enum-type name="QObjectWrapOption" flags="QScriptEngine::QObjectWrapOptions"/> + <enum-type name="QObjectWrapOption" flags="QObjectWrapOptions"/> <enum-type name="ValueOwnership"/> </object-type> <object-type name="QScriptExtensionInterface"/> @@ -46,8 +46,8 @@ <value-type name="QScriptProgram"/> <value-type name="QScriptString"/> <value-type name="QScriptValue"> - <enum-type name="PropertyFlag" flags="QScriptValue::PropertyFlags"/> - <enum-type name="ResolveFlag" flags="QScriptValue::ResolveFlags"/> + <enum-type name="PropertyFlag" flags="PropertyFlags"/> + <enum-type name="ResolveFlag" flags="ResolveFlags"/> <enum-type name="SpecialValue"/> </value-type> <object-type name="QScriptValueIterator"/> diff --git a/PySide/QtSql/typesystem_sql.xml b/PySide/QtSql/typesystem_sql.xml index 40a08a13d..2efe4290f 100644 --- a/PySide/QtSql/typesystem_sql.xml +++ b/PySide/QtSql/typesystem_sql.xml @@ -27,7 +27,7 @@ <namespace-type name="QSql"> <enum-type name="Location"/> - <enum-type name="ParamTypeFlag" flags="QSql::ParamType"/> + <enum-type name="ParamTypeFlag" flags="ParamType"/> <enum-type name="TableType"/> <enum-type name="NumericalPrecisionPolicy"/> <extra-includes> diff --git a/PySide/QtWebKit/typesystem_webkit.xml b/PySide/QtWebKit/typesystem_webkit.xml index 5187cea9d..177a29c16 100644 --- a/PySide/QtWebKit/typesystem_webkit.xml +++ b/PySide/QtWebKit/typesystem_webkit.xml @@ -76,7 +76,7 @@ <enum-type name="WebGraphic"/> </object-type> <object-type name="QWebPage"> - <enum-type name="FindFlag" flags="QWebPage::FindFlags"/> + <enum-type name="FindFlag" flags="FindFlags"/> <enum-type name="LinkDelegationPolicy"/> <enum-type name="NavigationType"/> <enum-type name="WebAction"/> diff --git a/PySide/phonon/typesystem_phonon.xml b/PySide/phonon/typesystem_phonon.xml index 5a2fcc1a5..509e0535f 100644 --- a/PySide/phonon/typesystem_phonon.xml +++ b/PySide/phonon/typesystem_phonon.xml @@ -129,7 +129,7 @@ <object-type name="VolumeFaderInterface"/> <value-type name="EffectParameter"> - <enum-type name="Hint" flags="Phonon::EffectParameter::Hints"/> + <enum-type name="Hint" flags="Hints"/> <!-- ### Internal methods and ctors --> <modify-function signature="EffectParameter()" remove="all"/> <modify-function signature="operator<(const Phonon::EffectParameter &)const" remove="all"/> @@ -265,7 +265,7 @@ <object-type name="Effect"/> <object-type name="EffectWidget"/> <object-type name="MediaController"> - <enum-type name="Feature" flags="Phonon::MediaController::Features"/> + <enum-type name="Feature" flags="Features"/> <enum-type name="NavigationMenu"/> </object-type> <object-type name="MediaObject" /> |