diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-07-06 10:49:53 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-07-06 17:46:24 -0300 |
commit | 56560943dfc2de0d1df5d2058bcf55ea3c9400ee (patch) | |
tree | 1a8d4d19d808a3736330c3f4df870e144b1deadf | |
parent | 01df78dfd8a2f0b6eac8ed4fae2faf1a6592e0c9 (diff) |
Typesystem cleanup.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Luciano Wolf <luciano.wolf@openbossa.org>
-rw-r--r-- | PySide/QtCore/typesystem_core.xml | 62 | ||||
-rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 116 | ||||
-rw-r--r-- | PySide/QtNetwork/typesystem_network.xml | 47 | ||||
-rw-r--r-- | PySide/QtOpenGL/typesystem_opengl.xml | 6 | ||||
-rw-r--r-- | PySide/QtSql/typesystem_sql.xml | 15 | ||||
-rw-r--r-- | PySide/QtXml/typesystem_xml.xml | 29 |
6 files changed, 37 insertions, 238 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index 5b9ea3096..5fe62ed2a 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -173,32 +173,6 @@ <conversion-rule file="qlist_conversions.h"/> <include file-name="QList" location="global"/> </container-type> - <rejection class="QList" function-name="back"/> - <rejection class="QList" function-name="begin"/> - <rejection class="QList" function-name="constBegin"/> - <rejection class="QList" function-name="constData"/> - <rejection class="QList" function-name="constEnd"/> - <rejection class="QList" function-name="data"/> - <rejection class="QList" function-name="end"/> - <rejection class="QList" function-name="erase"/> - <rejection class="QList" function-name="erase"/> - <rejection class="QList" function-name="free"/> - <rejection class="QList" function-name="fromList"/> - <rejection class="QList" function-name="fromSet"/> - <rejection class="QList" function-name="fromSet"/> - <rejection class="QList" function-name="fromStdList" /> - <rejection class="QList" function-name="front" /> - <rejection class="QList" function-name="first" /> - <rejection class="QList" function-name="insert"/> - <rejection class="QList" function-name="last"/> - <rejection class="QList" function-name="malloc"/> - <rejection class="QList" function-name="node_construct"/> - <rejection class="QList" function-name="node_copy"/> - <rejection class="QList" function-name="node_destruct"/> - <rejection class="QList" function-name="operator[]"/> - <rejection class="QList" function-name="operator="/> - <rejection class="QList" function-name="toSet"/> - <rejection class="QList" function-name="toStdList" /> <container-type name="QVector" type="vector"> <conversion-rule file="qvector_conversions.h"/> @@ -221,12 +195,10 @@ <rejection class="QVector" function-name="alloc"/> <rejection class="QVector" function-name="operator+="/> <rejection class="QVector" function-name="operator[]"/> - <rejection class="QVector" function-name="operator="/> <rejection class="QVector" function-name="toStdVector"/> <rejection class="QVector" function-name="fromStdVector"/> <container-type name="QQueue" type="queue"/> - <rejection class="QQueue" function-name="head"/> <container-type name="QHash" type="hash"> <conversion-rule file="qhash_conversions.h"/> @@ -446,40 +418,10 @@ <rejection class="QForeachContainer"/> <rejection class="QForeachContainerBase"/> <rejection class="QGlobalStatic"/> - <rejection class="QHash"/> - <rejection class="QHashData"/> - <rejection class="QHashDummyNode"/> - <rejection class="QHashDummyNode"/> - <rejection class="QHashDummyNode"/> - <rejection class="QHashDummyNode"/> - <rejection class="QHashDummyNode"/> - <rejection class="QHashDummyValue"/> - <rejection class="QHashIterator"/> - <rejection class="QHashNode"/> - <rejection class="QHashNode"/> - <rejection class="QHashNode"/> - <rejection class="QHashNode"/> - <rejection class="QHashNode"/> <rejection class="QInternal"/> <rejection class="QLibrary"/> - <rejection class="QLinkedList"/> - <rejection class="QLinkedListData"/> - <rejection class="QLinkedListIterator"/> - <rejection class="QLinkedListNode"/> - <rejection class="QListData"/> - <rejection class="QListIterator"/> - <rejection class="QMap"/> - <rejection class="QMapData"/> - <rejection class="QMapIterator"/> <rejection class="QMetaType"/> <rejection class="QMetaTypeId"/> - <rejection class="QMultiHash"/> - <rejection class="QMultiMap"/> - <rejection class="QMutableHashIterator"/> - <rejection class="QMutableLinkedListIterator"/> - <rejection class="QMutableListIterator"/> - <rejection class="QMutableMapIterator"/> - <rejection class="QMutableVectorIterator"/> <rejection class="QNoImplicitBoolCast"/> <rejection class="QObjectCleanupHandler"/> <rejection class="QObjectData"/> @@ -507,9 +449,6 @@ <rejection class="QAbstractFileEngine::ExtensionReturn"/> <rejection class="QByteArray::Data"/> <rejection class="QIntForType"/> - <rejection class="QList::Node"/> - <rejection class="QList::const_iterator"/> - <rejection class="QList::iterator"/> <rejection class="QMetaTypeId2"/> <rejection class="QMutableSetIterator"/> <rejection class="QSubString"/> @@ -1328,7 +1267,6 @@ <modify-function signature="operator const char *()const" remove="all"/> <modify-function signature="operator const void *()const" remove="all"/> <modify-function signature="operator+=(const char*)" remove="all"/> - <modify-function signature="operator=(const char*)" remove="all"/> <modify-function signature="operator[](int)const" remove="all"/> <modify-function signature="operator[](uint)const" remove="all"/> <modify-function signature="push_back(char)" remove="all"/> diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 349e07882..36493e301 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -102,7 +102,6 @@ <rejection class="QAccessibleInterfaceEx"/> <rejection class="QAccessibleWidget"/> <rejection class="QAccessibleWidgetEx"/> - <rejection class="QAbstractItemDelegate" function-name="operator="/> <rejection class="QAbstractTextDocumentLayout::PaintContext" field-name="selections"/> <rejection class="QApplication" function-name="compressEvent"/> <rejection class="QBrush" function-name="cleanUp"/> @@ -428,7 +427,6 @@ <enum-type name="QTextFormat::FormatType"/> <enum-type name="QTextFormat::Property" /> <value-type name="QTransform"> - <modify-function signature="operator=(QTransform)" remove="all"/> <modify-function signature="map(int,int,int*,int*)const" remove="all"/> <modify-function signature="map(qreal,qreal,qreal*,qreal*)const" remove="all"/> <modify-function signature="inverted(bool*)const"> @@ -447,7 +445,6 @@ <enum-type name="QTextOption::WrapMode"/> <enum-type name="QTextOption::Flag" flags="QTextOption::Flags"/> <value-type name="QStyleOption" polymorphic-id-expression="%1->type == QStyleOption::SO_Default"> - <modify-function signature="operator=(QStyleOption)" remove="all"/> <modify-function signature="init(const QWidget*)" remove="all"/> <!--### Obsolete in 4.3--> </value-type> @@ -457,61 +454,36 @@ <value-type name="QStyleOptionComboBox" polymorphic-id-expression="%1->type == QStyleOptionComboBox::Type && %1->version == QStyleOptionComboBox::Version" /> <value-type name="QStyleOptionComplex" polymorphic-id-expression="%1->type == QStyleOptionComplex::Type && %1->version == QStyleOptionComplex::Version" /> <value-type name="QStyleOptionDockWidget" polymorphic-id-expression="%1->type == QStyleOptionDockWidget::Type && %1->version == QStyleOptionDockWidget::Version" /> - <value-type name="QStyleOptionDockWidgetV2" polymorphic-id-expression="%1->type == QStyleOptionDockWidgetV2::Type && %1->version == QStyleOptionDockWidgetV2::Version" > - <modify-function signature="operator=(QStyleOptionDockWidget)" remove="all"/> - </value-type> + <value-type name="QStyleOptionDockWidgetV2" polymorphic-id-expression="%1->type == QStyleOptionDockWidgetV2::Type && %1->version == QStyleOptionDockWidgetV2::Version" /> <value-type name="QStyleOptionFocusRect" polymorphic-id-expression="%1->type == QStyleOptionFocusRect::Type && %1->version == QStyleOptionFocusRect::Version" /> <value-type name="QStyleOptionFrame" polymorphic-id-expression="%1->type == QStyleOptionFrame::Type && %1->version == QStyleOptionFrame::Version" /> - <value-type name="QStyleOptionFrameV2" polymorphic-id-expression="%1->type == QStyleOptionFrameV2::Type && %1->version == QStyleOptionFrameV2::Version" > - <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/> - </value-type> - <value-type name="QStyleOptionFrameV3" polymorphic-id-expression="%1->type == QStyleOptionFrameV3::Type && %1->version == QStyleOptionFrameV3::Version"> - <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/> - </value-type> + <value-type name="QStyleOptionFrameV2" polymorphic-id-expression="%1->type == QStyleOptionFrameV2::Type && %1->version == QStyleOptionFrameV2::Version" /> + <value-type name="QStyleOptionFrameV3" polymorphic-id-expression="%1->type == QStyleOptionFrameV3::Type && %1->version == QStyleOptionFrameV3::Version" /> <value-type name="QStyleOptionGroupBox" polymorphic-id-expression="%1->type == QStyleOptionGroupBox::Type && %1->version == QStyleOptionGroupBox::Version" /> <value-type name="QStyleOptionHeader" polymorphic-id-expression="%1->type == QStyleOptionHeader::Type && %1->version == QStyleOptionHeader::Version" /> <value-type name="QStyleOptionMenuItem" polymorphic-id-expression="%1->type == QStyleOptionMenuItem::Type && %1->version == QStyleOptionMenuItem::Version" /> <value-type name="QStyleOptionProgressBar" polymorphic-id-expression="%1->type == QStyleOptionProgressBar::Type && %1->version == QStyleOptionProgressBar::Version" /> - <value-type name="QStyleOptionProgressBarV2" polymorphic-id-expression="%1->type == QStyleOptionProgressBarV2::Type && %1->version == QStyleOptionProgressBarV2::Version" > - <modify-function signature="operator=(QStyleOptionProgressBar)" remove="all"/> - </value-type> + <value-type name="QStyleOptionProgressBarV2" polymorphic-id-expression="%1->type == QStyleOptionProgressBarV2::Type && %1->version == QStyleOptionProgressBarV2::Version" /> <value-type name="QStyleOptionRubberBand" polymorphic-id-expression="%1->type == QStyleOptionRubberBand::Type && %1->version == QStyleOptionRubberBand::Version" /> <value-type name="QStyleOptionSlider" polymorphic-id-expression="%1->type == QStyleOptionSlider::Type && %1->version == QStyleOptionSlider::Version" /> <value-type name="QStyleOptionSpinBox" polymorphic-id-expression="%1->type == QStyleOptionSpinBox::Type && %1->version == QStyleOptionSpinBox::Version" /> <value-type name="QStyleOptionTab" polymorphic-id-expression="%1->type == QStyleOptionTab::Type && %1->version == QStyleOptionTab::Version" /> - <value-type name="QStyleOptionTabV2" polymorphic-id-expression="%1->type == QStyleOptionTabV2::Type && %1->version == QStyleOptionTabV2::Version" > - <modify-function signature="operator=(const QStyleOptionTab &)" remove="all"/> - </value-type> - <value-type name="QStyleOptionTabV3" polymorphic-id-expression="%1->type == QStyleOptionTabV3::Type && %1->version == QStyleOptionTabV3::Version"> - <modify-function signature="operator=(QStyleOptionTab)" remove="all" /> - </value-type> + <value-type name="QStyleOptionTabV2" polymorphic-id-expression="%1->type == QStyleOptionTabV2::Type && %1->version == QStyleOptionTabV2::Version" /> + <value-type name="QStyleOptionTabV3" polymorphic-id-expression="%1->type == QStyleOptionTabV3::Type && %1->version == QStyleOptionTabV3::Version" /> <value-type name="QStyleOptionTabBarBase" polymorphic-id-expression="%1->type == QStyleOptionTabBarBase::Type && %1->version == QStyleOptionTabBarBase::Version" /> - <value-type name="QStyleOptionTabBarBaseV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabBarBaseV2::Type && %1->version == QStyleOptionTabBarBaseV2::Version"> - <modify-function signature="operator=(QStyleOptionTabBarBase)" remove="all" /> - </value-type> + <value-type name="QStyleOptionTabBarBaseV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabBarBaseV2::Type && %1->version == QStyleOptionTabBarBaseV2::Version" /> <value-type name="QStyleOptionTabWidgetFrame" polymorphic-id-expression="%1->type == QStyleOptionTabWidgetFrame::Type && %1->version == QStyleOptionTabWidgetFrame::Version" /> <value-type name="QStyleOptionTitleBar" polymorphic-id-expression="%1->type == QStyleOptionTitleBar::Type && %1->version == QStyleOptionTitleBar::Version" /> <value-type name="QStyleOptionToolBar" polymorphic-id-expression="%1->type == QStyleOptionToolBar::Type && %1->version == QStyleOptionToolBar::Version" /> <value-type name="QStyleOptionToolBox" polymorphic-id-expression="%1->type == QStyleOptionToolBox::Type && %1->version == QStyleOptionToolBox::Version" /> - <value-type name="QStyleOptionToolBoxV2" polymorphic-id-expression="%1->type == QStyleOptionToolBoxV2::Type && %1->version == QStyleOptionToolBoxV2::Version" > - <modify-function signature="operator=(QStyleOptionToolBox)" remove="all"/> - </value-type> + <value-type name="QStyleOptionToolBoxV2" polymorphic-id-expression="%1->type == QStyleOptionToolBoxV2::Type && %1->version == QStyleOptionToolBoxV2::Version" /> <value-type name="QStyleOptionToolButton" polymorphic-id-expression="%1->type == QStyleOptionToolButton::Type && %1->version == QStyleOptionToolButton::Version" /> <value-type name="QStyleOptionViewItem" polymorphic-id-expression="%1->type == QStyleOptionViewItem::Type && %1->version == QStyleOptionViewItem::Version" /> - <value-type name="QStyleOptionViewItemV2" polymorphic-id-expression="%1->type == QStyleOptionViewItemV2::Type && %1->version == QStyleOptionViewItemV2::Version" > - <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/> - </value-type> - <value-type name="QStyleOptionViewItemV3" polymorphic-id-expression="%1->type == QStyleOptionViewItemV3::Type && %1->version == QStyleOptionViewItemV3::Version" > - <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/> - </value-type> - <value-type name="QStyleOptionViewItemV4" polymorphic-id-expression="%1->type == QStyleOptionViewItemV4::Type && %1->version == QStyleOptionViewItemV4::Version" > - <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/> - </value-type> - <value-type name="QTextFragment" > - <modify-function signature="operator=(QTextFragment)" remove="all"/> - </value-type> + <value-type name="QStyleOptionViewItemV2" polymorphic-id-expression="%1->type == QStyleOptionViewItemV2::Type && %1->version == QStyleOptionViewItemV2::Version" /> + <value-type name="QStyleOptionViewItemV3" polymorphic-id-expression="%1->type == QStyleOptionViewItemV3::Type && %1->version == QStyleOptionViewItemV3::Version" /> + <value-type name="QStyleOptionViewItemV4" polymorphic-id-expression="%1->type == QStyleOptionViewItemV4::Type && %1->version == QStyleOptionViewItemV4::Version" /> + <value-type name="QTextFragment" /> <value-type name="QBitmap" > - <modify-function signature="operator=(const QPixmap &)" remove="all"/> <modify-function signature="QBitmap(QString,const char*)" remove="all" /> <modify-function signature="fromData(QSize,const uchar*,QImage::Format)" remove="all" /> <modify-function signature="fromData(QSize,const uchar*,QImage::Format)" remove="all"/> @@ -519,12 +491,8 @@ <value-type name="QTextInlineObject" /> <value-type name="QSizePolicy"/> <value-type name="QTableWidgetSelectionRange"/> - <value-type name="QTextDocumentFragment" > - <modify-function signature="operator=(QTextDocumentFragment)" remove="all"/> - </value-type> - <value-type name="QTextOption" > - <modify-function signature="operator=(const QTextOption &)" remove="all"/> - </value-type> + <value-type name="QTextDocumentFragment" /> + <value-type name="QTextOption" /> <value-type name="QTextLine" > <modify-function signature="cursorToX(int*,QTextLine::Edge)const" remove="all" /> <modify-function signature="xToCursor(qreal,QTextLine::CursorPosition)const"> @@ -543,11 +511,8 @@ <modify-function signature="intersect(QItemSelectionRange)const" remove="all"/> <!--### Obsolete in 4.3--> </value-type> - <value-type name="QPainterPath"> - <modify-function signature="operator=(QPainterPath)" remove="all"/> - </value-type> + <value-type name="QPainterPath" /> <value-type name="QPalette"> - <modify-function signature="operator=(const QPalette&)" remove="all"/> <modify-function signature="QPalette(QColor, QColor, QColor, QColor, QColor, QColor, QColor)" remove="all"/> <!--### Obsolete in 4.3--> <modify-function signature="background()const" remove="all"/> @@ -558,8 +523,6 @@ <!--### Obsolete in 4.3--> </value-type> <value-type name="QKeySequence"> - <modify-function signature="operator=(QKeySequence)" remove="all"/> - <!-- TODO: QVariant operator temporarily removed due to compilation problems. --> <modify-function signature="operator QVariant()const" remove="all"/> <modify-function signature="operator int()const" remove="all"/> <modify-function signature="operator[](uint)const" remove="all"/> @@ -569,7 +532,6 @@ <modify-function signature="load(const QString&, const char*)" allow-thread="yes"/> <modify-function signature="save(QIODevice*, const char*)" allow-thread="yes"/> <modify-function signature="save(const QString&, const char*)" allow-thread="yes"/> - <modify-function signature="operator=(QPicture)" remove="all"/> <modify-function signature="pictureFormat(QString)" remove="all" /> <modify-function signature="inputFormatList()" remove="all"/> <!--### Obsolete in 4.3--> @@ -582,7 +544,6 @@ <modify-function signature="setData(const char*,uint)" remove="all"/> </value-type> <value-type name="QRegion" > - <modify-function signature="operator=(QRegion)" remove="all"/> <modify-function signature="operator&=(QRegion)" remove="all"/> <modify-function signature="eor(QRegion)const" remove="all"/> <!--### Obsolete in 4.3--> @@ -595,9 +556,7 @@ <modify-function signature="operator&=(QRect)" remove="all"/> <modify-function signature="operator+=(QRect)" remove="all"/> </value-type> - <value-type name="QTextBlock" > - <modify-function signature="operator=(QTextBlock)" remove="all"/> - </value-type> + <value-type name="QTextBlock" /> <value-type name="QTextBlockFormat" /> <value-type name="QTextTableCellFormat" /> <value-type name="QTextCharFormat" > @@ -608,7 +567,6 @@ <!--### Obsolete in 4.3--> </value-type> <value-type name="QTextFormat" > - <modify-function signature="operator=(QTextFormat)" remove="all"/> <modify-function signature="isValid()const" access="non-final"/> <modify-function signature="setProperty(int,QVector<QTextLength>)" rename="setLengthVectorProperty"/> </value-type> @@ -633,7 +591,6 @@ <modify-function signature="operator<<(QVector<QPointF>)" remove="all"/> </value-type> <value-type name="QIcon" > - <modify-function signature="operator=(QIcon)" remove="all"/> <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3--> <modify-function signature="QIcon(QIconEngineV2 *)"> @@ -651,12 +608,10 @@ <include file-name="QTextFrame" location="global"/> <modify-function signature="operator++(int)" remove="all"/> <modify-function signature="operator--(int)" remove="all"/> - <modify-function signature="operator=(QTextFrame::iterator)" remove="all"/> <modify-function signature="operator++()" remove="all"/> <modify-function signature="operator--()" remove="all"/> </value-type> <value-type name="QTreeWidgetItemIterator" > - <modify-function signature="operator=(QTreeWidgetItemIterator)" remove="all"/> <modify-function signature="operator++(int)" remove="all"/> <modify-function signature="operator--(int)" remove="all"/> <modify-function signature="operator+=(int)" remove="all"/> @@ -692,7 +647,6 @@ </inject-code> </add-function> - <modify-function signature="operator=(QPixmap)" remove="all"/> <modify-function signature="operator!()const" remove="all"/> <modify-function signature="QPixmap(const char **)" remove="all"/> <modify-function signature="serialNumber()const" remove="all"/> @@ -717,7 +671,6 @@ <include file-name="QTextBlock" location="global"/> <include file-name="QTextDocumentFragment" location="global"/> </extra-includes> - <modify-function signature="operator=(QTextCursor)" remove="all"/> <modify-function signature="selectedTableCells(int*,int*,int*,int*)const" remove="all" /> <modify-function signature="currentFrame()const"> <modify-argument index="return"> @@ -763,7 +716,6 @@ </extra-includes> <modify-function signature="map(int,int,int*,int*)const" remove="all"/> <modify-function signature="map(qreal,qreal,qreal*,qreal*)const" remove="all"/> - <modify-function signature="operator=(QMatrix)" remove="all"/> <modify-function signature="inverted(bool*)const"> <modify-argument index="1"> <remove-argument/> @@ -777,9 +729,7 @@ </modify-function> </value-type> <value-type name="QConicalGradient" polymorphic-id-expression="%1->type() == QGradient::ConicalGradient" /> - <value-type name="QFontInfo" > - <modify-function signature="operator=(QFontInfo)" remove="all"/> - </value-type> + <value-type name="QFontInfo" /> <value-type name="QRadialGradient" polymorphic-id-expression="%1->type() == QGradient::RadialGradient" /> <value-type name="QPainterPath::Element"> <modify-field name="x" write="false"/> @@ -795,7 +745,6 @@ <extra-includes> <include file-name="QStringList" location="global"/> </extra-includes> - <modify-function signature="operator=(QFont)" remove="all"/> <modify-function signature="setStyleHint(QFont::StyleHint, QFont::StyleStrategy)"> <modify-argument index="2"> <rename to="strategy"/> @@ -806,7 +755,6 @@ <extra-includes> <include file-name="QTextCursor" location="global"/> </extra-includes> - <modify-function signature="operator=(QTextTableCell)" remove="all"/> </value-type> <value-type name="QImage"> <extra-includes> @@ -822,7 +770,6 @@ <modify-function signature="QImage(const uchar *, int, int, QImage::Format)" remove="all" /> <modify-function signature="QImage(uchar*,int,int,QImage::Format)" remove="all" /> <modify-function signature="loadFromData(const uchar*,int,const char*)" remove="all" /> - <modify-function signature="operator=(QImage)" remove="all"/> <modify-function signature="setText(const char*,const char*,QString)" remove="all" /> <modify-function signature="text(const char*,const char*)const" remove="all" /> <modify-function signature="serialNumber()const" remove="all"/> @@ -850,7 +797,6 @@ <include file-name="QPixmap" location="global"/> <include file-name="Qt" location="global"/> </extra-includes> - <modify-function signature="operator=(QCursor)" remove="all"/> </value-type> <value-type name="QFontDatabase" > <extra-includes> @@ -861,10 +807,8 @@ <extra-includes> <include file-name="QBrush" location="global"/> </extra-includes> - <modify-function signature="operator=(QPen)" remove="all"/> </value-type> <value-type name="QBrush"> - <modify-function signature="operator=(const QBrush &)" remove="all"/> <extra-includes> <include file-name="QPixmap" location="global"/> </extra-includes> @@ -874,8 +818,6 @@ <include file-name="QVariant" location="global"/> </extra-includes> <modify-function signature="QColor(QColor::Spec)" remove="all"/> - <modify-function signature="operator=(QColor)" remove="all"/> - <modify-function signature="operator=(Qt::GlobalColor)" remove="all"/> <modify-function signature="QColor(const char*)" remove="all" /> <add-function signature="QColor(QVariant)"> <inject-code class="target" position="beginning"> @@ -1141,9 +1083,6 @@ } </inject-code> </modify-function> - - <modify-function signature="operator=(QFontMetricsF)" remove="all"/> - <modify-function signature="operator=(QFontMetricsF)" remove="all"/> </value-type> <value-type name="QTextOption::Tab"/> <value-type name="QFontMetrics" > @@ -1250,14 +1189,10 @@ </inject-code> </modify-function> - - <modify-function signature="operator=(QFontMetrics)" remove="all"/> </value-type> <value-type name="QGradient" force-abstract="yes" polymorphic-id-expression="%1->type() == QGradient::NoGradient" /> <value-type name="QLinearGradient" polymorphic-id-expression="%1->type() == QGradient::LinearGradient" /> - <value-type name="QPrinterInfo"> - <modify-function signature="operator=(const QPrinterInfo &)" remove="all"/> - </value-type> + <value-type name="QPrinterInfo" /> <object-type name="QLayoutItem"> <modify-function signature="widget()"> @@ -1567,8 +1502,6 @@ </object-type> <object-type name="QFileIconProvider"/> <object-type name="QWizard"> - <!-- ### Requires correct class name in meta object --> - <modify-function signature="setDefaultProperty(const char *, const char *, const char *)" remove="all"/> <modify-function signature="addPage(QWizardPage*)"> <modify-argument index="1"> <no-null-pointer/> @@ -1581,10 +1514,7 @@ </modify-argument> </modify-function> </object-type> - <object-type name="QWizardPage"> - <!-- ### Reduced functionality due to meta object having missing information --> - <modify-function signature="registerField(const QString &, QWidget *, const char *, const char *)" remove="all" /> - </object-type> + <object-type name="QWizardPage" /> <object-type name="QFocusFrame"> <modify-function signature="setWidget(QWidget*)"> <modify-argument index="1"> @@ -2059,7 +1989,6 @@ <object-type name="QSpacerItem"/> <object-type name="QStandardItem"> <modify-function signature="QStandardItem(const QStandardItem &)" remove="all"/> - <modify-function signature="operator=(QStandardItem)" remove="all"/> <modify-function signature="operator<(QStandardItem)const"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> @@ -2071,7 +2000,6 @@ </modify-function> <modify-function signature="read(QDataStream &)" remove="all"/> <modify-function signature="write(QDataStream &)const" remove="all"/> - <modify-function signature="operator=(QStandardItem)" remove="all"/> <modify-function signature="operator<(QStandardItem)const" remove="all"/> </object-type> <object-type name="QStatusBar"> @@ -2987,7 +2915,6 @@ <!--### Obsolete in 4.3--> </object-type> <object-type name="QTableWidgetItem" > - <modify-function signature="operator=(const QTableWidgetItem&)" remove="all"/> <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3--> <modify-function signature="setBackgroundColor(QColor)" remove="all"/> @@ -3008,7 +2935,6 @@ <modify-function signature="read(QDataStream &)" remove="all"/> <modify-function signature="write(QDataStream &)const" remove="all"/> <modify-function signature="QTableWidgetItem(QTableWidgetItem)" remove="all"/> - <modify-function signature="operator=(QTableWidgetItem)" remove="all"/> <modify-function signature="operator<(QTableWidgetItem)const" remove="all"/> </object-type> <object-type name="QListWidgetItem" > @@ -3036,7 +2962,6 @@ <modify-function signature="write(QDataStream&)const"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> - <modify-function signature="operator=(const QListWidgetItem&)" remove="all"/> <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3--> <modify-function signature="setBackgroundColor(QColor)" remove="all"/> @@ -3048,7 +2973,6 @@ <modify-function signature="read(QDataStream &)" remove="all"/> <modify-function signature="write(QDataStream &)const" remove="all"/> <modify-function signature="QListWidgetItem(QListWidgetItem)" remove="all"/> - <modify-function signature="operator=(QListWidgetItem)" remove="all"/> <modify-function signature="operator<(QListWidgetItem)const" remove="all"/> </object-type> <object-type name="QGraphicsTextItem"> @@ -3090,7 +3014,6 @@ <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> <modify-function signature="QTreeWidgetItem(const QTreeWidgetItem &)" remove="all"/> - <modify-function signature="operator=(const QTreeWidgetItem&)" remove="all"/> <modify-function signature="QTreeWidgetItem(QTreeWidget *,int)"> <modify-argument index="this"> <parent index="1" action="add"/> @@ -3167,7 +3090,6 @@ <modify-function signature="read(QDataStream &)" remove="all"/> <modify-function signature="write(QDataStream &)const" remove="all"/> <modify-function signature="QTreeWidgetItem(QTreeWidgetItem)" remove="all"/> - <modify-function signature="operator=(QTreeWidgetItem)" remove="all"/> <modify-function signature="operator<(QTreeWidgetItem)const" remove="all"/> </object-type> <object-type name="QListWidget"> diff --git a/PySide/QtNetwork/typesystem_network.xml b/PySide/QtNetwork/typesystem_network.xml index 596aa2cfe..9a56b74b9 100644 --- a/PySide/QtNetwork/typesystem_network.xml +++ b/PySide/QtNetwork/typesystem_network.xml @@ -137,8 +137,6 @@ </object-type> <object-type name="QHttpHeader"> - <modify-function signature="operator=(QHttpHeader)" remove="all"/> - <modify-function signature="QHttpHeader(QHttpHeader)" remove="all"/> </object-type> <object-type name="QLocalServer"> @@ -177,61 +175,36 @@ <value-type name="QHostAddress" hash-function="qHash"> <modify-function signature="QHostAddress(quint8*)" remove="all" /> - <modify-function signature="operator=(QString)" remove="all"/> - <modify-function signature="operator=(QHostAddress)" remove="all"/> </value-type> <value-type name="QHostInfo"> - <modify-function signature="operator=(QHostInfo)" remove="all"/> <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private"/> </value-type> - <value-type name="QHttpRequestHeader"> - <modify-function signature="operator=(QHttpRequestHeader)" remove="all"/> - </value-type> + <value-type name="QHttpRequestHeader" /> - <value-type name="QHttpResponseHeader"> - <modify-function signature="operator=(QHttpResponseHeader)" remove="all"/> - </value-type> + <value-type name="QHttpResponseHeader" /> - <value-type name="QNetworkAddressEntry"> - <modify-function signature="operator=(QNetworkAddressEntry)" remove="all"/> - </value-type> + <value-type name="QNetworkAddressEntry" /> - <value-type name="QNetworkInterface"> - <modify-function signature="operator=(QNetworkInterface)" remove="all"/> - </value-type> + <value-type name="QNetworkInterface" /> - <value-type name="QNetworkProxy"> - <modify-function signature="operator=(QNetworkProxy)" remove="all"/> - </value-type> + <value-type name="QNetworkProxy" /> - <value-type name="QUrlInfo"> - <modify-function signature="operator=(QUrlInfo)" remove="all"/> - </value-type> + <value-type name="QUrlInfo" /> <value-type name="QIPv6Address"> - <modify-function signature="operator[](int)const"> - <remove/> - </modify-function> - <modify-function signature="operator[](int)"> - <remove/> - </modify-function> + <modify-function signature="operator[](int)const" remove="all" /> + <modify-function signature="operator[](int)" remove="all" /> </value-type> - <value-type name="QAuthenticator"> - <modify-function signature="operator=(QAuthenticator)" remove="all"/> - </value-type> + <value-type name="QAuthenticator" /> <value-type name="QNetworkCookie"> - <modify-function signature="operator=(QNetworkCookie)" remove="all"/> - <extra-includes> <include file-name="QDateTime" location="global"/> </extra-includes> </value-type> - <value-type name="QNetworkRequest"> - <modify-function signature="operator=(QNetworkRequest)" remove="all"/> - </value-type> + <value-type name="QNetworkRequest" /> <enum-type name="QSslError::SslError"/> <enum-type name="QSslCertificate::SubjectInfo"/> diff --git a/PySide/QtOpenGL/typesystem_opengl.xml b/PySide/QtOpenGL/typesystem_opengl.xml index c2f3ba383..202b11595 100644 --- a/PySide/QtOpenGL/typesystem_opengl.xml +++ b/PySide/QtOpenGL/typesystem_opengl.xml @@ -18,16 +18,12 @@ </namespace-type> <value-type name="QGLColormap"> - <modify-function signature="operator=(QGLColormap)" remove="all"/> - <modify-function signature="setEntries(int,const unsigned int*,int)"> <access modifier="private"/> </modify-function> </value-type> - <value-type name="QGLFormat"> - <modify-function signature="operator=(QGLFormat)" remove="all"/> - </value-type> + <value-type name="QGLFormat" /> <object-type name="QGLContext"> <modify-function signature="chooseContext(const QGLContext*)"> diff --git a/PySide/QtSql/typesystem_sql.xml b/PySide/QtSql/typesystem_sql.xml index 31cc8d329..7c15c69ec 100644 --- a/PySide/QtSql/typesystem_sql.xml +++ b/PySide/QtSql/typesystem_sql.xml @@ -21,7 +21,6 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> - <modify-function signature="operator=(QSqlDatabase)" remove="all"/> <modify-function signature="exec(QString)const" rename="exec_" allow-thread="yes" /> <modify-function signature="open()" allow-thread="yes" /> <modify-function signature="open(const QString&, const QString&)" allow-thread="yes" /> @@ -44,7 +43,6 @@ </extra-includes> <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> <modify-function signature="exec(const QString &)" rename="exec_" allow-thread="yes" /> - <modify-function signature="operator=(QSqlQuery)" remove="all"/> <modify-function signature="prepare(const QString&)" allow-thread="yes" /> <modify-function signature="clear()" allow-thread="yes" /> <modify-function signature="last()" allow-thread="yes" /> @@ -59,24 +57,17 @@ <include file-name="QSqlField" location="global"/> </extra-includes> <modify-function signature="append(QSqlField)" access="non-final"/> - <modify-function signature="operator=(QSqlRecord)" remove="all"/> </value-type> - <value-type name="QSqlError"> - <modify-function signature="operator=(QSqlError)" remove="all"/> - </value-type> + <value-type name="QSqlError" /> - <value-type name="QSqlIndex"> - <modify-function signature="operator=(QSqlIndex)" remove="all"/> - </value-type> + <value-type name="QSqlIndex" /> <value-type name="QSqlRelation"/> <object-type name="QSqlRelationalDelegate"/> - <value-type name="QSqlField"> - <modify-function signature="operator=(QSqlField)" remove="all"/> - </value-type> + <value-type name="QSqlField" /> <object-type name="QSqlDriver"> <extra-includes> diff --git a/PySide/QtXml/typesystem_xml.xml b/PySide/QtXml/typesystem_xml.xml index 5c0811eea..40b387982 100644 --- a/PySide/QtXml/typesystem_xml.xml +++ b/PySide/QtXml/typesystem_xml.xml @@ -16,23 +16,19 @@ <enum-type name="QXmlStreamReader::TokenType" /> --> - <value-type name="QDomAttr"> - <modify-function signature="operator=(QDomAttr)" remove="all"/> + <value-type name="QDomAttr" /> <modify-function signature="nodeType()const" remove="all"/> </value-type> <value-type name="QDomCDATASection"> - <modify-function signature="operator=(QDomCDATASection)" remove="all"/> <modify-function signature="nodeType()const" remove="all"/> </value-type> <value-type name="QDomCharacterData"> - <modify-function signature="operator=(QDomCharacterData)" remove="all"/> <modify-function signature="nodeType()const" remove="all"/> </value-type> <value-type name="QDomComment"> - <modify-function signature="operator=(QDomComment)" remove="all"/> <modify-function signature="nodeType()const" remove="all"/> </value-type> @@ -46,7 +42,6 @@ <value-type name="QDomDocument"> <modify-function signature="nodeType()const" remove="all"/> - <modify-function signature="operator=(QDomDocument)" remove="all"/> <!-- will be replaced in inject code --> <modify-function signature="setContent(const QByteArray&, bool, QString*, int*, int*)"> @@ -189,55 +184,41 @@ <value-type name="QDomDocumentFragment"> <modify-function signature="nodeType()const" remove="all"/> - <modify-function signature="operator=(QDomDocumentFragment)" remove="all"/> </value-type> <value-type name="QDomDocumentType"> <modify-function signature="nodeType()const" remove="all"/> - <modify-function signature="operator=(QDomDocumentType)" remove="all"/> </value-type> <value-type name="QDomEntity"> <modify-function signature="nodeType()const" remove="all"/> - <modify-function signature="operator=(QDomEntity)" remove="all"/> </value-type> <value-type name="QDomEntityReference"> <modify-function signature="nodeType()const" remove="all"/> - <modify-function signature="operator=(QDomEntityReference)" remove="all"/> </value-type> - <value-type name="QDomImplementation"> - <modify-function signature="operator=(QDomImplementation)" remove="all"/> - </value-type> + <value-type name="QDomImplementation" /> - <value-type name="QDomNamedNodeMap"> - <modify-function signature="operator=(QDomNamedNodeMap)" remove="all"/> - </value-type> + <value-type name="QDomNamedNodeMap" /> <value-type name="QDomNode"> - <modify-function signature="operator=(QDomNode)" remove="all"/> <modify-function signature="save(QTextStream&, int)const" allow-thread="yes"/> <modify-function signature="save(QTextStream&, int, QDomNode::EncodingPolicy)const" allow-thread="yes"/> </value-type> - <value-type name="QDomNodeList"> - <modify-function signature="operator=(const QDomNodeList &)" remove="all"/> - </value-type> + <value-type name="QDomNodeList" /> <value-type name="QDomNotation"> <modify-function signature="nodeType()const" remove="all"/> - <modify-function signature="operator=(QDomNotation)" remove="all"/> </value-type> <value-type name="QDomProcessingInstruction"> <modify-function signature="nodeType()const" remove="all"/> - <modify-function signature="operator=(QDomProcessingInstruction)" remove="all"/> </value-type> <value-type name="QDomText"> <modify-function signature="nodeType()const" remove="all"/> - <modify-function signature="operator=(const QDomText &)" remove="all"/> </value-type> <value-type name="QXmlParseException"/> @@ -253,8 +234,6 @@ <value-type name="QXmlAttributes"/> - <!-- FIXME: This needs to be changed to value-type if - QXmlNamespaceSupport is ever passed by value --> <object-type name="QXmlNamespaceSupport"/> <value-type name="QDomElement"/> |