diff options
| author | Christian Tismer <ctismer@gmail.com> | 2015-07-13 01:48:18 +0200 |
|---|---|---|
| committer | Christian Tismer <ctismer@gmail.com> | 2015-07-13 01:48:18 +0200 |
| commit | cac0107381be97f15d3a8cb1a96c2fad37ffe319 (patch) | |
| tree | 3cb8dde880885961cafe564549b88f6372d55264 /PySide | |
| parent | c36ef75f3d9f95935beff18d7c53fc92c54ddbed (diff) | |
edited the QtWidgets Xml, things start to fit together. Not yet compiling...
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | PySide/QtCore/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | PySide/QtGui/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 13 | ||||
| -rw-r--r-- | PySide/QtWidgets/CMakeLists.txt | 47 | ||||
| -rw-r--r-- | PySide/QtWidgets/typesystem_widgets.xml.in | 8 | ||||
| -rw-r--r-- | PySide/QtWidgets/typesystem_widgets_common.xml | 2859 | ||||
| -rw-r--r-- | PySide/QtWidgets/typesystem_widgets_mac.xml | 2 | ||||
| -rw-r--r-- | PySide/QtWidgets/typesystem_widgets_simulator.xml | 2 | ||||
| -rw-r--r-- | PySide/QtWidgets/typesystem_widgets_win.xml | 2 | ||||
| -rw-r--r-- | PySide/QtWidgets/typesystem_widgets_x11.xml | 2 |
11 files changed, 66 insertions, 2875 deletions
diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt index d4b80ab63..fb9922723 100644 --- a/PySide/CMakeLists.txt +++ b/PySide/CMakeLists.txt @@ -50,6 +50,7 @@ CHECK_VAR(Qt5Webkit_FOUND) HAS_QT_MODULE(Qt5Core_FOUND QtCore) HAS_QT_MODULE(Qt5Gui_FOUND QtGui) +HAS_QT_MODULE(Qt5Widgets_FOUND QtWidgets) ### depends on QtGui HAS_QT_MODULE(Qt5Sql_FOUND QtSql) # compiles, skip HAS_QT_MODULE(Qt5Network_FOUND QtNetwork) # need to split this HAS_QT_MODULE(Qt5Gui_FOUND QtGui) diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt index 3350a6739..7a2383765 100644 --- a/PySide/QtCore/CMakeLists.txt +++ b/PySide/QtCore/CMakeLists.txt @@ -141,7 +141,7 @@ file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/fake_shiboken.sh" " echo \"$*\" ${prev_shiboken_binary} $* -python3 ${CMAKE_CURRENT_BINARY_DIR}/filter_init.py "${QtCore_SRC_escape}" +python3 ${CMAKE_CURRENT_BINARY_DIR}/filter_init.py ${QtCore_SRC_escape} ") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/filter_init.py" "#! env python diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index bff4f7489..027deb5ff 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -159,7 +159,7 @@ file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/fake_shiboken.sh" " echo \"$*\" ${prev_shiboken_binary} $* -python3 ${CMAKE_CURRENT_BINARY_DIR}/filter_init.py "${QtGui_SRC_escape}" +python3 ${CMAKE_CURRENT_BINARY_DIR}/filter_init.py ${QtGui_SRC_escape} ") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/filter_init.py" "#! env python @@ -206,6 +206,7 @@ set(QtGui_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/ ${pyside_SOURCE_DIR} ${Qt5Core_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} ${SHIBOKEN_PYTHON_INCLUDE_DIR} diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 756e0a76a..85dfd8a3e 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -256,8 +256,8 @@ } </inject-code> </add-function> - </value-type> + <value-type name="QTextFragment" /> <value-type name="QBitmap" > <modify-function signature="fromData(QSize,const uchar*,QImage::Format)"> @@ -1497,7 +1497,7 @@ <!-- Qt5: gone. Use the new fusion style. <object-type name="QMotifStyle"> </object-type> ---> + --> <object-type name="QPainterPathStroker" copyable="false"/> <object-type name="QPictureIO"> @@ -2390,13 +2390,6 @@ </inject-code> </modify-function> </object-type> - <!-- Qt5: move to QtWidgets - qApp macro - <inject-code class="native" position="beginning"> - PyObject* moduleQtGui; - </inject-code> - <inject-code class="target" file="glue/qtgui_qapp.cpp" position="end" /> - --> <!-- _______ Qt5: begin of matrix block _________ @@ -3324,8 +3317,6 @@ <!-- ### --> </object-type> - <!-- The above entries may be present in the system or not. Keep this section organized. --> - <!-- This enum is present on QtCore --> <suppress-warning text="enum 'QCoreApplication::ApplicationFlags' is specified in typesystem, but not declared" /> diff --git a/PySide/QtWidgets/CMakeLists.txt b/PySide/QtWidgets/CMakeLists.txt index 4745301fb..09a384f75 100644 --- a/PySide/QtWidgets/CMakeLists.txt +++ b/PySide/QtWidgets/CMakeLists.txt @@ -26,18 +26,63 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWidgets/qtwidgets_module_wrapper.cpp ) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/typesystem_widgets.xml.in" - "${CMAKE_CURRENT_BINARY_DIR}/typesystem_widgetsi.xml" @ONLY) + "${CMAKE_CURRENT_BINARY_DIR}/typesystem_widgets.xml" @ONLY) # fake these variables for qt5 set(QtWidgets_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(QtWidgets_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWidgets) +set(prev_shiboken_binary ${SHIBOKEN_BINARY}) +string(REPLACE ";" " " QtWidgets_SRC_escape "${QtWidgets_SRC}") +file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/fake_shiboken.sh" + " +echo \"$*\" +${prev_shiboken_binary} $* +python3 ${CMAKE_CURRENT_BINARY_DIR}/filter_init.py ${QtCore_SRC_escape} + ") +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/filter_init.py" + "#! env python +import sys, os, re, pprint +pprint.pprint(sys.argv) +nset = set() +for fname in sys.argv[1:]: + name = os.path.splitext(os.path.basename(fname))[0] + print(name) + if name.endswith('module_wrapper'): + fn = fname + else: + name = name.split('_wrapper') + assert name[1] == '' + nset.add(name[0]) +print(fn) +with open(fn) as f: + lines = f.readlines() +removals = set() +for idx, line in enumerate(lines): + res = re.search(' init_(\\w+)', line) + if res and res.group(1).lower() not in nset: + removals.add(res.group(1)) + lines[idx] = '//' + line +with open(fn, 'w') as f: + f.writelines(lines) +removals = sorted(list(removals)) +print('Removals:', removals) +") +file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/fake_shiboken.sh + DESTINATION ${CMAKE_CURRENT_BINARY_DIR} + FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ + GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + +set(SHIBOKEN_BINARY "${CMAKE_CURRENT_BINARY_DIR}/fake_shiboken.sh") + set(QtWidgets_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}${PATH_SEP}${QtWidgets_SOURCE_DIR}") set(QtWidgets_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWidgets/ ${pyside_SOURCE_DIR} ${Qt5Core_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} + ${Qt5Widgets_INCLUDE_DIRS} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} ${SHIBOKEN_PYTHON_INCLUDE_DIR} diff --git a/PySide/QtWidgets/typesystem_widgets.xml.in b/PySide/QtWidgets/typesystem_widgets.xml.in index 8c5cfa9a5..c7538dbcc 100644 --- a/PySide/QtWidgets/typesystem_widgets.xml.in +++ b/PySide/QtWidgets/typesystem_widgets.xml.in @@ -18,8 +18,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> - <load-typesystem name="typesystem_core.xml" generate="no"/> - <load-typesystem name="typesystem_gui_@AUTO_OS@.xml" generate="yes"/> - <load-typesystem name="typesystem_gui_common.xml" generate="yes"/> +<typesystem package="PySide.QtWidgets"> + <load-typesystem name="typesystem_gui.xml" generate="no"/> + <load-typesystem name="typesystem_widgets_@AUTO_OS@.xml" generate="yes"/> + <load-typesystem name="typesystem_widgets_common.xml" generate="yes"/> </typesystem> diff --git a/PySide/QtWidgets/typesystem_widgets_common.xml b/PySide/QtWidgets/typesystem_widgets_common.xml index 67855a01d..5a09ceb7a 100644 --- a/PySide/QtWidgets/typesystem_widgets_common.xml +++ b/PySide/QtWidgets/typesystem_widgets_common.xml @@ -19,63 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> <typesystem package="PySide.QtWidgets"> - <load-typesystem name="typesystem_core.xml" generate="no"/> - - <template name="QFontCharFix"> - int size = Shiboken::String::len(%PYARG_1); - if (size == 1) { - const char *str = Shiboken::String::toCString(%PYARG_1); - QChar ch(str[0]); - %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(ch); - %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); - } else { - PyErr_SetString(PyExc_TypeError, "String must have only one character"); - } - </template> - - <function signature="qAlpha(uint)" /> - <function signature="qBlue(uint)" /> - <function signature="qGray(int,int,int)" /> - <function signature="qGray(uint)" /> - <function signature="qGreen(uint)" /> - <function signature="qIsGray(uint)" /> - <function signature="qRed(uint)" /> - <function signature="qRgb(int,int,int)" /> - <function signature="qRgba(int,int,int,int)" /> - <function signature="qFuzzyCompare(QMatrix,QMatrix)" /> - <function signature="qFuzzyCompare(QTransform,QTransform)" /> - <function signature="qFuzzyCompare(QQuaternion,QQuaternion)" /> - <function signature="qFuzzyCompare(QMatrix4x4,QMatrix4x4)" /> - <function signature="qFuzzyCompare(QVector2D,QVector2D)" /> - <function signature="qFuzzyCompare(QVector3D,QVector3D)" /> - <function signature="qFuzzyCompare(QVector4D,QVector4D)" /> - <rejection class="*" function-name="qobject_interface_iid<QStyleFactoryInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QAccessibleFactoryInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QInputContextFactoryInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QGraphicsItem*>"/> - <rejection class="*" function-name="qobject_interface_iid<QGraphicsLayout*>"/> - <rejection class="*" function-name="qobject_interface_iid<QAccessibleBridgeFactoryInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QImageIOHandlerFactoryInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QIconEngineFactoryInterfaceV2*>"/> - <rejection class="*" function-name="qobject_interface_iid<QAccessibleInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QTextObjectInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QGraphicsLayoutItem*>"/> - <rejection class="*" function-name="qobject_interface_iid<QIconEngineFactoryInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QPictureFormatInterface*>"/> - - <rejection class="*" function-name="qobject_cast<QGraphicsLayout*>"/> - <rejection class="*" function-name="qobject_cast<QGraphicsItem*>"/> - <rejection class="*" function-name="qobject_cast<QGraphicsLayoutItem*>"/> - <rejection class="*" function-name="qobject_cast<QGraphicsLayoutItem*>"/> - - <rejection class="*" function-name="qGenericMatrixFromMatrix4x4"/> - <rejection class="*" function-name="qDrawBorderPixmap"/> - <rejection class="*" function-name="qDrawPixmaps"/> - <rejection class="*" function-name="qGenericMatrixToMatrix4x4"/> - - <rejection class="*" function-name="d_func"/> - <rejection class="*" field-name="d_ptr"/> - <rejection class="*" field-name="d"/> + <load-typesystem name="typesystem_gui.xml" generate="no"/> <!-- Event classes have a lot of non-documented protected fields, those fields @@ -83,184 +27,6 @@ besides the fact they are accessible by ordinary event methods. --> - <rejection class="QInputEvent" field-name="modState"/> - <rejection class="QInputEvent" field-name="modState"/> - - <rejection class="QMouseEvent" field-name="p"/> - <rejection class="QMouseEvent" field-name="g"/> - <rejection class="QMouseEvent" field-name="b"/> - <rejection class="QMouseEvent" field-name="mouseState"/> - - <rejection class="QHoverEvent" field-name="p"/> - <rejection class="QHoverEvent" field-name="op"/> - - <rejection class="QWheelEvent" field-name="p"/> - <rejection class="QWheelEvent" field-name="g"/> - <rejection class="QWheelEvent" field-name="mouseState"/> - <rejection class="QWheelEvent" field-name="o"/> - - <rejection class="QTabletEvent" field-name="mPos"/> - <rejection class="QTabletEvent" field-name="mGPos"/> - <rejection class="QTabletEvent" field-name="mHiResGlobalPos"/> - <rejection class="QTabletEvent" field-name="mDev"/> - <rejection class="QTabletEvent" field-name="mPointerType"/> - <rejection class="QTabletEvent" field-name="mXT"/> - <rejection class="QTabletEvent" field-name="mYT"/> - <rejection class="QTabletEvent" field-name="mZ"/> - <rejection class="QTabletEvent" field-name="mPress"/> - <rejection class="QTabletEvent" field-name="mTangential"/> - <rejection class="QTabletEvent" field-name="mRot"/> - <rejection class="QTabletEvent" field-name="mUnique"/> - <rejection class="QTabletEvent" field-name="mExtra"/> - - <rejection class="QKeyEvent" field-name="txt"/> - <rejection class="QKeyEvent" field-name="k"/> - <rejection class="QKeyEvent" field-name="c"/> - <rejection class="QKeyEvent" field-name="auto"/> - - <rejection class="QPaintEvent" field-name="m_rect"/> - <rejection class="QPaintEvent" field-name="m_region"/> - <rejection class="QPaintEvent" field-name="m_erased"/> - - <rejection class="QMoveEvent" field-name="p"/> - <rejection class="QMoveEvent" field-name="oldp"/> - - <rejection class="QResizeEvent" field-name="s"/> - <rejection class="QResizeEvent" field-name="olds"/> - - <rejection class="QContextMenuEvent" field-name="p"/> - <rejection class="QContextMenuEvent" field-name="gp"/> - <rejection class="QContextMenuEvent" field-name="reas"/> - - <rejection class="QDropEvent" field-name="p"/> - <rejection class="QDropEvent" field-name="mouseState"/> - <rejection class="QDropEvent" field-name="modState"/> - <rejection class="QDropEvent" field-name="act"/> - <rejection class="QDropEvent" field-name="drop_action"/> - <rejection class="QDropEvent" field-name="default_action"/> - <rejection class="QDropEvent" field-name="mdata"/> - <rejection class="QDropEvent" field-name="fmts"/> - - <rejection class="QDragMoveEvent" field-name="rect"/> - - <rejection class="QShortcutEvent" field-name="sequence"/> - <rejection class="QShortcutEvent" field-name="ambig"/> - <rejection class="QShortcutEvent" field-name="sid"/> - - <rejection class="QTouchEvent" field-name="_widget"/> - <rejection class="QTouchEvent" field-name="_deviceType"/> - <rejection class="QTouchEvent" field-name="_touchPointStates"/> - <rejection class="QTouchEvent" field-name="_touchPoints"/> - - <rejection class="QAbstractTextDocumentLayout::PaintContext" field-name="selections"/> - <rejection class="QApplication" function-name="compressEvent"/> - <rejection class="QBrush" function-name="cleanUp"/> - <rejection class="QFont" enum-name="ResolveProperties"/> - <rejection class="QMotifStyle" field-name="focus"/> - <rejection class="QPictureIO" function-name="defineIOHandler"/> - <rejection class="QPolygon" function-name="putPoints"/> - <rejection class="QPolygon" function-name="setPoints"/> - <rejection class="QPolygon" function-name="setPoint"/> - <rejection class="QPolygon" function-name="points"/> - <rejection class="QPolygon" function-name="point"/> - <rejection class="QWidget" function-name="create"/> - <rejection class="QWidget" function-name="find"/> - <rejection class="QWidget" function-name="handle"/> - <rejection class="QWidget" function-name="styleChange"/> - <rejection class="QWidget" function-name="internalWinId"/> - <rejection class="QWidgetItem" field-name="wid"/> - <rejection class="QActionGroup" function-name="selected"/> - <rejection class="QPaintEngine" function-name="fix_neg_rect"/> - <rejection class="*" enum-name="enum_1"/> - <value-type name="QTransform"> - <enum-type name="TransformationType"/> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code"> - <replace from="%REPR_FORMAT" to="%f, %f, %f, %f, %f, %f, %f, %f, %f" /> - <replace from="%REPR_ARGS" - to="%CPPSELF.m11(), %CPPSELF.m12(), %CPPSELF.m13(), %CPPSELF.m21(), %CPPSELF.m22(), %CPPSELF.m23(), %CPPSELF.m31(), %CPPSELF.m32(), %CPPSELF.m33()" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code"> - <replace from="%REDUCE_FORMAT" to="ddddddddd" /> - <replace from="%REDUCE_ARGS" - to="%CPPSELF.m11(), %CPPSELF.m12(), %CPPSELF.m13(), %CPPSELF.m21(), %CPPSELF.m22(), %CPPSELF.m23(), %CPPSELF.m31(), %CPPSELF.m32(), %CPPSELF.m33()" /> - </insert-template> - </inject-code> - </add-function> - - <modify-function signature="map(qreal,qreal,qreal*,qreal*)const"> - <modify-argument index="0"> - <replace-type modified-type="PyObject" /> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_args,number*,number*"> - <replace from="$TYPE" to="qreal" /> - </insert-template> - </inject-code> - </modify-function> - <!-- ### This is just an overload to "map(qreal,qreal,qreal*,qreal*)const" and can be discarded in Python --> - <modify-function signature="map(int,int,int*,int*)const" remove="all"/> - <!-- ### --> - - <modify-function signature="inverted(bool*)const"> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="return"> - <replace-type modified-type="PyTuple"/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_bool*"/> - </inject-code> - </modify-function> - <add-function signature="quadToQuad(QPolygonF&, QPolygonF&)" return-type="PyObject*" static="true"> - <inject-code> - QTransform _result; - if (QTransform::quadToQuad(%1, %2, _result)) { - %PYARG_0 = %CONVERTTOPYTHON[QTransform](_result); - } else { - Py_INCREF(Py_None); - %PYARG_0 = Py_None; - } - </inject-code> - </add-function> - <add-function signature="quadToSquare(QPolygonF &)" return-type="PyObject*" static="true"> - <inject-code> - QTransform _result; - if (QTransform::quadToSquare(%1, _result)) { - %PYARG_0 = %CONVERTTOPYTHON[QTransform](_result); - } else { - Py_INCREF(Py_None); - %PYARG_0 = Py_None; - } - </inject-code> - </add-function> - - <add-function signature="squareToQuad(QPolygonF &)" return-type="PyObject*" static="true"> - <inject-code> - QTransform _result; - if (QTransform::squareToQuad(%1, _result)) { - %PYARG_0 = %CONVERTTOPYTHON[QTransform](_result); - } else { - Py_INCREF(Py_None); - %PYARG_0 = Py_None; - } - </inject-code> - </add-function> - - </value-type> <object-type name="QStyleOption" polymorphic-id-expression="%1->type == QStyleOption::SO_Default"> <enum-type name="OptionType" extensible="yes"/> <enum-type name="StyleOptionType"/> @@ -412,332 +178,14 @@ <enum-type name="StyleOptionVersion"/> <enum-type name="ViewItemPosition"/> </value-type> - <value-type name="QTextFragment" /> - <value-type name="QBitmap" > - <modify-function signature="fromData(QSize,const uchar*,QImage::Format)"> - <modify-argument index="2"> - <replace-type modified-type="PyBuffer"/> - </modify-argument> - <inject-code> - uchar* buffer = (uchar*) Shiboken::Buffer::getPointer(%PYARG_2); - QBitmap %0 = QBitmap::fromData(%1, buffer, %3); - %PYARG_0 = %CONVERTTOPYTHON[QBitmap](%0); - </inject-code> - </modify-function> - </value-type> - <value-type name="QTextInlineObject" /> + <value-type name="QSizePolicy"> <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="Flags"/> - <enum-type name="TabType"/> - <enum-type name="WrapMode"/> - <value-type name="Tab"/> - </value-type> - <value-type name="QTextLine" > - <enum-type name="CursorPosition"/> - <enum-type name="Edge"/> - <modify-function signature="cursorToX(int*,QTextLine::Edge)const" remove="all" /> - <modify-function signature="cursorToX(int,QTextLine::Edge)const"> - <modify-argument index="0"> - <replace-type modified-type="PyObject" /> - </modify-argument> - <inject-code class="target" position="beginning"> - %BEGIN_ALLOW_THREADS - %RETURN_TYPE %0 = %CPPSELF->::%TYPE::%FUNCTION_NAME(&%1, %2); - %END_ALLOW_THREADS - %PYARG_0 = PyTuple_New(2); - PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0)); - PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](%1)); - </inject-code> - </modify-function> - <modify-function signature="xToCursor(qreal,QTextLine::CursorPosition)const"> - <modify-argument index="2"> - <rename to="edge"/> - </modify-argument> - </modify-function> - </value-type> - <value-type name="QTextTableFormat" /> - <value-type name="QTextImageFormat" /> - <value-type name="QTextFrameFormat" > - <enum-type name="BorderStyle"/> - <enum-type name="Position"/> - <modify-function signature="isValid()const" access="non-final"/> - </value-type> - <value-type name="QTextLength"> - <enum-type name="Type"/> - </value-type> - <value-type name="QItemSelectionRange" hash-function="qHash"> - <!--### Obsolete in 4.3--> - <modify-function signature="intersect(QItemSelectionRange)const" remove="all"/> - </value-type> - <value-type name="QPainterPath"> - <enum-type name="ElementType"/> - <value-type name="Element"> - <modify-field name="x" write="false"/> - <modify-field name="y" write="false"/> - <modify-field name="type" write="false"/> - <include file-name="QPainterPath" location="global"/> - </value-type> - </value-type> - <value-type name="QPalette"> - <enum-type name="ColorGroup" /> - <enum-type name="ColorRole" /> - <!--### Obsolete in 4.3--> - <modify-function signature="QPalette(QColor, QColor, QColor, QColor, QColor, QColor, QColor)" remove="all"/> - <modify-function signature="background()const" remove="all"/> - <modify-function signature="foreground()const" remove="all"/> - <modify-function signature="serialNumber()const" remove="all"/> - <!--### End of obsolete section --> - </value-type> - <value-type name="QKeySequence"> - <enum-type name="SequenceFormat"/> - <enum-type name="SequenceMatch"/> - <enum-type name="StandardKey"/> - - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code"> - <replace from="%REPR_FORMAT" to="%i, %i, %i, %i" /> - <replace from="%REPR_ARGS" - to="(*%CPPSELF)[0], (*%CPPSELF)[1], (*%CPPSELF)[2], (*%CPPSELF)[3]" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code"> - <replace from="%REDUCE_FORMAT" to="iiii" /> - <replace from="%REDUCE_ARGS" to="(*%CPPSELF)[0], (*%CPPSELF)[1], (*%CPPSELF)[2], (*%CPPSELF)[3]" /> - </insert-template> - </inject-code> - </add-function> - - <modify-function signature="operator[](uint) const" remove="all"/> - <add-function signature="__getitem__"> - <inject-code class="target" position="beginning"> - if (_i < 0 || _i >= %CPPSELF.count()) { - PyErr_SetString(PyExc_IndexError, "index out of bounds"); - return 0; - } - int item = (*%CPPSELF)[_i]; - return %CONVERTTOPYTHON[int](item); - </inject-code> - </add-function> - - <!-- ### Not necessary due the PySide QVariant conversion rules --> - <modify-function signature="operator QVariant()const" remove="all"/> - <!-- ### Obsolete --> - <modify-function signature="operator int()const" remove="all"/> - <modify-function signature="operator QString()const" remove="all"/> - <!-- ### End of obsolete section --> - </value-type> - <value-type name="QPicture" > - <modify-function signature="load(QIODevice*, const char*)" allow-thread="yes"/> - <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"/> - <!-- ### Obsolete in 4.3--> - <modify-function signature="pictureFormat(QString)" remove="all" /> - <modify-function signature="inputFormatList()" remove="all"/> - <modify-function signature="inputFormats()" remove="all"/> - <modify-function signature="outputFormatList()" remove="all"/> - <modify-function signature="outputFormats()" remove="all"/> - <!-- ### End of obsolete section --> - <!-- See bug 759 --> - <modify-function signature="data() const"> - <modify-argument index="return"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <inject-code> - %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.data(), %CPPSELF.size()); - </inject-code> - </modify-function> - <modify-function signature="setData(const char*,uint)"> - <modify-argument index="1"> - <replace-type modified-type="PyBuffer"/> - <conversion-rule class="target"> - PyObject* %out = Shiboken::Buffer::newObject(%in, size); - </conversion-rule> - <conversion-rule class="native"> - Py_ssize_t bufferLen; - char* %out = (char*) Shiboken::Buffer::getPointer(%PYARG_1, &bufferLen); - </conversion-rule> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - <conversion-rule class="native"> - uint %out = bufferLen; - </conversion-rule> - </modify-argument> - </modify-function> - </value-type> - <value-type name="QRegion" > - <enum-type name="RegionType"/> - <!-- ### Obsolete in 4.3--> - <modify-function signature="eor(QRegion)const" remove="all"/> - <modify-function signature="intersect(QRect)const" remove="all" /> - <modify-function signature="intersect(QRegion)const" remove="all" /> - <modify-function signature="subtract(QRegion)const" remove="all"/> - <modify-function signature="unite(QRegion)const" remove="all"/> - <modify-function signature="unite(QRect)const" remove="all"/> - <!-- ### End of obsolete section --> - <!-- ### This operator does not make sense in Python. --> - <modify-function signature="operator&=(QRegion)" remove="all"/> - <modify-function signature="operator&=(QRect)" remove="all"/> - <!-- ### --> - </value-type> - <value-type name="QTextBlock"> - <value-type name="iterator" > - <include file-name="QTextBlock" location="global"/> - <!-- ### These operators where removed because they don't make sense in Python. - The iterator methods (__iter__, next) replace this functionality. --> - <modify-function signature="operator++()" remove="all"/> - <modify-function signature="operator--()" remove="all"/> - <!-- ### --> - <add-function signature="__iter__()" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="__iter__" /> - </inject-code> - </add-function> - <add-function signature="__next__()" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="__next__"> - <replace from="%CPPSELF_TYPE" to="QTextBlock::iterator" /> - </insert-template> - </inject-code> - </add-function> - </value-type> - <add-function signature="__iter__()" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="__iter_parent__"> - <replace from="%CPPSELF_TYPE" to="QTextBlock::iterator" /> - </insert-template> - </inject-code> - </add-function> - <modify-function signature="setUserData(QTextBlockUserData*)"> - <inject-code class="target" position="end"> - const QTextDocument* doc = %CPPSELF.document(); - if (doc) { - Shiboken::AutoDecRef pyDocument(%CONVERTTOPYTHON[QTextDocument*](doc)); - Shiboken::Object::setParent(pyDocument, %PYARG_1); - } - </inject-code> - </modify-function> - <modify-function signature="userData() const"> - <modify-argument index="return"> - <define-ownership class="target" owner="default"/> - </modify-argument> - <inject-code class="target" position="end"> - const QTextDocument* doc = %CPPSELF.document(); - if (doc) { - Shiboken::AutoDecRef pyDocument(%CONVERTTOPYTHON[QTextDocument*](doc)); - Shiboken::Object::setParent(pyDocument, %PYARG_0); - } - </inject-code> - </modify-function> - </value-type> - <value-type name="QTextBlockFormat"> - <enum-type name="LineHeightTypes" since="4.8" revision="4800"/> - </value-type> - <value-type name="QTextTableCellFormat" /> - <value-type name="QTextCharFormat" > - <enum-type name="UnderlineStyle"/> - <enum-type name="VerticalAlignment"/> - <modify-function signature="isValid()const" access="non-final"/> - <!--### Obsolete in 4.3--> - <modify-function signature="anchorName()const" remove="all"/> - <modify-function signature="setAnchorName(QString)" remove="all"/> - <!--### End of obsolete section --> - </value-type> - <value-type name="QTextFormat" > - <enum-type name="FormatType"/> - <enum-type name="ObjectTypes"/> - <enum-type name="PageBreakFlag" flags="PageBreakFlags"/> - <enum-type name="Property" /> - <modify-function signature="isValid()const" access="non-final"/> - </value-type> - <value-type name="QTextListFormat"> - <enum-type name="Style"/> - </value-type> - <value-type name="QPolygon"> - <extra-includes> - <include file-name="QMatrix" location="global"/> - <include file-name="QTransform" location="global"/> - </extra-includes> - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - PyObject* points = PyList_New(%CPPSELF.count()); - for (int i = 0, max = %CPPSELF.count(); i < max; ++i){ - int x, y; - %CPPSELF.point(i, &x, &y); - QPoint pt = QPoint(x, y); - PyList_SET_ITEM(points, i, %CONVERTTOPYTHON[QPoint](pt)); - } - <insert-template name="reduce_code"> - <replace from="%REDUCE_FORMAT" to="N" /> - <replace from="%REDUCE_ARGS" to="points" /> - </insert-template> - </inject-code> - </add-function> - <!-- ### "QPolygon(int, const int*)" is an internal constructor. --> - <modify-function signature="QPolygon(int, const int *)" remove="all"/> - <!-- ### A QVector parameter, for no defined type, will generate wrong code. --> - <modify-function signature="operator+=(QVector<QPoint>)" remove="all"/> - <modify-function signature="operator<<(QPoint)"> - <inject-code> - // %FUNCTION_NAME() - *%CPPSELF << %1; - %PYARG_0 = %CONVERTTOPYTHON[QPolygon*](%CPPSELF); - </inject-code> - </modify-function> - <modify-function signature="operator<<(QVector<QPoint>)"> - <inject-code> - // %FUNCTION_NAME() - *%CPPSELF << %1; - %PYARG_0 = %CONVERTTOPYTHON[QPolygon*](%CPPSELF); - </inject-code> - </modify-function> - <!-- ### --> - </value-type> - <value-type name="QPolygonF"> - <extra-includes> - <include file-name="QMatrix" location="global"/> - <include file-name="QTransform" location="global"/> - </extra-includes> - <!-- ### A QVector parameter, for no defined type, will generate wrong code. --> - <modify-function signature="operator+=(QVector<QPointF>)" remove="all"/> - <!-- ### See bug 776 --> - <modify-function signature="operator<<(QPointF)" remove="all"/> - <!-- ### See bug 777 --> - <modify-function signature="operator<<(QVector<QPointF>)" remove="all"/> - <!-- ### --> - </value-type> - <value-type name="QIcon" > - <enum-type name="Mode"/> - <enum-type name="State"/> - <!--### Obsolete in 4.3--> - <modify-function signature="serialNumber()const" remove="all"/> - <modify-function signature="QIcon(QIconEngineV2 *)"> - <modify-argument index="1"> - <no-null-pointer/> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="QIcon(QIconEngine *)"> - <modify-argument index="1"> - <no-null-pointer/> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </value-type> <value-type name="QTreeWidgetItemIterator" > <modify-function signature="QTreeWidgetItemIterator(QTreeWidget *, QFlags<QTreeWidgetItemIterator::IteratorFlag>)"> <modify-argument index="this"> @@ -777,899 +225,6 @@ <!-- ### --> </value-type> - <template name="load_xpm"> - Shiboken::AutoDecRef strList(PySequence_Fast(%PYARG_1, "Invalid sequence.")); - int lineCount = PySequence_Fast_GET_SIZE(strList.object()); - for (int line = 0; line < lineCount; ++line) { - if (!Shiboken::String::check(PySequence_Fast_GET_ITEM(strList.object(), line))) { - PyErr_SetString(PyExc_TypeError, "The argument must be a sequence of strings."); - break; - } - } - - const char** xpm = (const char**) malloc (lineCount * sizeof(const char**)); - for (int line = 0; line < lineCount; ++line) - xpm[line] = Shiboken::String::toCString(PySequence_Fast_GET_ITEM(strList.object(), line)); - - %BEGIN_ALLOW_THREADS - %0 = new %TYPE(xpm); - %END_ALLOW_THREADS - - free(xpm); - </template> - <value-type name="QPixmap" > - <!--<conversion-rule>--> - <!--<target-to-native replace="no">--> - <!--<add-conversion type="QVariant" check="%CHECKTYPE[QVariant](%in)">--> - <!--QVariant in = %CONVERTTOCPP[QVariant](%in);--> - <!--%out = in.value<%OUTTYPE>();--> - <!--</add-conversion>--> - <!--</target-to-native>--> - <!--</conversion-rule>--> - <add-function signature="QPixmap(const QImage&)"> - <modify-argument index="1"> - <rename to="image"/> - </modify-argument> - <inject-code class="target" position="beginning"> - %0 = new %TYPE(QPixmap::fromImage(%1)); - </inject-code> - </add-function> - <modify-function signature="QPixmap(const char **)"> - <modify-argument index="1"> - <replace-type modified-type="PySequence" /> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="load_xpm" /> - </inject-code> - </modify-function> - - <!-- ### Operator ! doesn't make sense in Python. --> - <modify-function signature="operator!()const" remove="all"/> - <!--### Obsolete in 4.3--> - <modify-function signature="serialNumber()const" remove="all"/> - <!-- ### --> - - <modify-function signature="loadFromData(const uchar*,uint,const char*,QFlags<Qt::ImageConversionFlag>)"> - <modify-argument index="1"> - <replace-type modified-type="PyBytes"/> - <conversion-rule class="native"> - const uchar* %out = reinterpret_cast<const uchar*>(PyBytes_AS_STRING(%PYARG_1)); - </conversion-rule> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - <conversion-rule class="native"> - uint %out = static_cast<uint>(PyBytes_Size(%PYARG_1)); - </conversion-rule> - </modify-argument> - </modify-function> - </value-type> - <value-type name="QTextCursor" > - <extra-includes> - <include file-name="QTextBlock" location="global"/> - <include file-name="QTextDocumentFragment" location="global"/> - </extra-includes> - <enum-type name="MoveMode"/> - <enum-type name="MoveOperation"/> - <enum-type name="SelectionType"/> - <modify-function signature="selectedTableCells(int*,int*,int*,int*)const"> - <modify-argument index="0"> - <replace-type modified-type="PyObject" /> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*"> - <replace from="$TYPE" to="int" /> - </insert-template> - </inject-code> - <inject-code class="native" position="end"> - <insert-template name="fix_native_return_number*,number*,number*,number*"> - <replace from="$TYPE" to="int" /> - </insert-template> - </inject-code> - </modify-function> - <modify-function signature="currentFrame()const"> - <modify-argument index="return"> - <define-ownership class="target" owner="default"/> - </modify-argument> - </modify-function> - <modify-function signature="insertTable(int,int,const QTextTableFormat &)"> - <modify-argument index="return"> - <define-ownership class="target" owner="default"/> - </modify-argument> - </modify-function> - <modify-function signature="insertTable(int,int)"> - <modify-argument index="return"> - <define-ownership class="target" owner="default"/> - </modify-argument> - </modify-function> - </value-type> - - <value-type name="QItemSelection" /> - <value-type name="QMatrix"> - <extra-includes> - <include file-name="QPainterPath" location="global"/> - </extra-includes> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code"> - <replace from="%REPR_FORMAT" to="%f, %f, %f, %f, %f, %f" /> - <replace from="%REPR_ARGS" - to="%CPPSELF.m11(), %CPPSELF.m12(), %CPPSELF.m21(), %CPPSELF.m22(), %CPPSELF.dx(), %CPPSELF.dy()" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code"> - <replace from="%REDUCE_FORMAT" to="dddddd" /> - <replace from="%REDUCE_ARGS" to="%CPPSELF.m11(), %CPPSELF.m12(), %CPPSELF.m21(), %CPPSELF.m22(), %CPPSELF.dx(), %CPPSELF.dy()" /> - </insert-template> - </inject-code> - </add-function> - <template name="qmatrix_map"> - %ARG1_TYPE a, b; - %CPPSELF.%FUNCTION_NAME(%1, %2, &a, &b); - %PYARG_0 = PyTuple_New(2); - PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%ARG1_TYPE](a)); - PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](b)); - </template> - <modify-function signature="map(int,int,int*,int*)const"> - <modify-argument index="3"> - <remove-argument /> - </modify-argument> - <modify-argument index="4"> - <remove-argument /> - </modify-argument> - <inject-code> - <insert-template name="qmatrix_map" /> - </inject-code> - </modify-function> - <modify-function signature="map(qreal,qreal,qreal*,qreal*)const"> - <modify-argument index="3"> - <remove-argument /> - </modify-argument> - <modify-argument index="4"> - <remove-argument /> - </modify-argument> - <inject-code> - <insert-template name="qmatrix_map" /> - </inject-code> - </modify-function> - <modify-function signature="inverted(bool*)const"> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="return"> - <replace-type modified-type="PyTuple"/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_bool*"/> - </inject-code> - </modify-function> - </value-type> - <value-type name="QConicalGradient" polymorphic-id-expression="%1->type() == QGradient::ConicalGradient" /> - <value-type name="QFontInfo" /> - <value-type name="QRadialGradient" polymorphic-id-expression="%1->type() == QGradient::RadialGradient" /> - <value-type name="QFont" > - <enum-type name="Capitalization"/> - <enum-type name="SpacingType"/> - <enum-type name="Stretch"/> - <enum-type name="Style"/> - <enum-type name="StyleHint" /> - <enum-type name="StyleStrategy"/> - <enum-type name="Weight"/> - <enum-type name="HintingPreference" since="4.8" revision="4800"/> - <extra-includes> - <include file-name="QStringList" location="global"/> - </extra-includes> - <modify-function signature="setStyleHint(QFont::StyleHint, QFont::StyleStrategy)"> - <modify-argument index="2"> - <rename to="strategy"/> - </modify-argument> - </modify-function> - </value-type> - <value-type name="QTextTableCell" > - <extra-includes> - <include file-name="QTextCursor" location="global"/> - </extra-includes> - </value-type> - <value-type name="QImage"> - <enum-type name="Format"/> - <enum-type name="InvertMode"/> - <extra-includes> - <include file-name="QStringList" location="global"/> - <include file-name="QMatrix" location="global"/> - </extra-includes> - - <template name="qimage_buffer_constructor"> - uchar* ptr = (uchar*) Shiboken::Buffer::getPointer(%PYARG_1); - %0 = new %TYPE(ptr, %ARGS); - </template> - <modify-function signature="QImage(uchar *,int,int,int,QImage::Format)"> - <modify-argument index="1"> - <replace-type modified-type="PyBuffer"/> - </modify-argument> - <inject-code> - <insert-template name="qimage_buffer_constructor"> - <replace from="%ARGS" to="%2, %3, %4, %5" /> - </insert-template> - </inject-code> - </modify-function> - <modify-function signature="QImage(uchar*,int,int,QImage::Format)"> - <modify-argument index="1"> - <replace-type modified-type="PyBuffer"/> - </modify-argument> - <inject-code> - <insert-template name="qimage_buffer_constructor"> - <replace from="%ARGS" to="%2, %3, %4" /> - </insert-template> - </inject-code> - </modify-function> - - <add-function signature="QImage(QString&,int,int,int,QImage::Format)"> - <inject-code> - <insert-template name="qimage_buffer_constructor"> - <replace from="%ARGS" to="%2, %3, %4, %5" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="QImage(QString&,int,int,QImage::Format)"> - <inject-code> - <insert-template name="qimage_buffer_constructor"> - <replace from="%ARGS" to="%2, %3, %4" /> - </insert-template> - </inject-code> - </add-function> - - <!-- The non-const versions are already used --> - <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)" remove="all"/> - <modify-function signature="QImage(const uchar*,int,int,QImage::Format)" remove="all" /> - <!-- ### --> - - <modify-function signature="QImage(const char**)"> - <modify-argument index="1"> - <replace-type modified-type="PySequence" /> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="load_xpm" /> - </inject-code> - </modify-function> - <!-- ### "QImage(const char*,const char*)" is just an overload for "QImage(QString,const char*)" --> - <modify-function signature="QImage(const char*,const char*)" remove="all" /> - <!-- ### There is already an fromData with a QByteArray type (that is convertible from Python's str) as the first type. --> - <modify-function signature="fromData(const uchar*,int,const char*)" remove="all"/> - <!-- ### There is already an loadFromData with a QByteArray type (that is convertible from Python's str) as the first type. --> - <modify-function signature="loadFromData(const uchar*,int,const char*)" remove="all" /> - - <!-- ### Functions removed because we already have overloads using QString --> - <modify-function signature="setText(const char*,const char*,QString)" remove="all" /> - <modify-function signature="text(const char*,const char*)const" remove="all" /> - <!-- ### --> - - <!--### Obsolete in 4.3--> - <modify-function signature="serialNumber()const" remove="all"/> - <modify-function signature="textLanguages()const" remove="all"/> - <!--### end of obsolete section --> - - <modify-function signature="constBits()const" since="4.7"> - <inject-code> - %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(), %CPPSELF.byteCount()); - </inject-code> - </modify-function> - <modify-function signature="bits()"> - <inject-code> - // byteCount() is only available on Qt4.7, so we use bytesPerLine * height - %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(), %CPPSELF.bytesPerLine() * %CPPSELF.height(), Shiboken::Buffer::ReadWrite); - </inject-code> - </modify-function> - <modify-function signature="constScanLine(int)const" since="4.7"> - <inject-code> - %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(%1), %CPPSELF.bytesPerLine()); - </inject-code> - <modify-argument index="return"> - <replace-type modified-type="PyObject" /> - </modify-argument> - </modify-function> - <modify-function signature="scanLine(int)"> - <inject-code> - %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(%1), %CPPSELF.bytesPerLine(), Shiboken::Buffer::ReadWrite); - </inject-code> - <modify-argument index="return"> - <replace-type modified-type="PyObject" /> - </modify-argument> - </modify-function> - <!-- - Only the non-const version of bits() and scanLine() is exported to Python - If the user don't want to detach the QImage data he must use constBits or constScanLine - as Python doesn't have the concept of constness. - --> - <modify-function signature="bits()const" remove="all"/> - <modify-function signature="scanLine(int)const" remove="all"/> - - <modify-function signature="invertPixels(QImage::InvertMode)"> - <modify-argument index="1"> - <rename to="mode"/> - </modify-argument> - </modify-function> - </value-type> - <value-type name="QCursor" > - <extra-includes> - <include file-name="QPixmap" location="global"/> - <include file-name="Qt" location="global"/> - </extra-includes> - </value-type> - <value-type name="QFontDatabase" > - <extra-includes> - <include file-name="QStringList" location="global"/> - </extra-includes> - <enum-type name="WritingSystem" /> - </value-type> - <value-type name="QPen"> - <extra-includes> - <include file-name="QBrush" location="global"/> - </extra-includes> - </value-type> - <value-type name="QBrush"> - <extra-includes> - <include file-name="QPixmap" location="global"/> - </extra-includes> - </value-type> - - <template name="qcolor_repr"> - switch(%CPPSELF.spec()) { - case QColor::Rgb: - { - qreal r, g, b, a; - %CPPSELF.getRgbF(&r, &g, &b, &a); - QString repr = QString().sprintf("PySide.QtGui.QColor.fromRgbF(%.6f, %.6f, %.6f, %.6f)", r, g, b, a); - %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr)); - break; - } - case QColor::Hsv: - { - qreal h, s, v, a; - %CPPSELF.getHsvF(&h, &s, &v, &a); - QString repr = QString().sprintf("PySide.QtGui.QColor.fromHsvF(%.6f, %.6f, %.6f, %.6f)", h, s, v, a); - %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr)); - break; - } - case QColor::Cmyk: - { - qreal c, m, y, k, a; - %CPPSELF.getCmykF(&c, &m, &y, &k, &a); - QString repr = QString().sprintf("PySide.QtGui.QColor.fromCmykF(%.6f, %.6f, %.6f, %.6f, %.6f)", c, m, y, k, a); - %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr)); - break; - } - #if QT_VERSION >= 0x040600 - case QColor::Hsl: - { - qreal h, s, l, a; - %CPPSELF.getHslF(&h, &s, &l, &a); - QString repr = QString().sprintf("PySide.QtGui.QColor.fromHslF(%.6f, %.6f, %.6f, %.6f)", h, s, l, a); - %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr)); - break; - } - #endif - default: - { - %PYARG_0 = Shiboken::String::fromCString("PySide.QtGui.QColor()"); - } - } - </template> - <value-type name="QColor"> - <enum-type name="Spec"/> - <extra-includes> - <include file-name="QVariant" location="global"/> - </extra-includes> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="qcolor_repr" /> - </inject-code> - </add-function> - <add-function signature="__str__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="qcolor_repr" /> - </inject-code> - </add-function> - <add-function signature="__setstate__(PyObject*)" return-type="PyObject"> - <inject-code> - Shiboken::AutoDecRef func(PyObject_GetAttr(%PYSELF, PyTuple_GET_ITEM(%1, 0))); - PyObject* args = PyTuple_GET_ITEM(%1, 1); - %PYARG_0 = PyObject_Call(func, args, NULL); - </inject-code> - </add-function> - <add-function signature="__reduce__" return-type="PyObject"> - <inject-code class="target" position="beginning"> - switch(%CPPSELF.spec()) { - case QColor::Rgb: - { - qreal r, g, b, a; - %CPPSELF.getRgbF(&r, &g, &b, &a); - %PYARG_0 = Py_BuildValue("(ON(s(ffff)))", Py_TYPE(%PYSELF), PyTuple_New(0), "setRgbF", (float)r, (float)g, (float)b, (float)a); - break; - } - case QColor::Hsv: - { - qreal h, s, v, a; - %CPPSELF.getHsvF(&h, &s, &v, &a); - %PYARG_0 = Py_BuildValue("(ON(s(ffff)))", Py_TYPE(%PYSELF), PyTuple_New(0), "setHsvF", (float)h, (float)s, (float)v, (float)a); - break; - } - case QColor::Cmyk: - { - qreal c, m, y, k, a; - %CPPSELF.getCmykF(&c, &m, &y, &k, &a); - %PYARG_0 = Py_BuildValue("(ON(s(fffff)))", Py_TYPE(%PYSELF), PyTuple_New(0), "setCmykF", (float)c, (float)m, (float)y, (float)k, (float)a); - break; - } - #if QT_VERSION >= 0x040600 - case QColor::Hsl: - { - qreal h, s, l, a; - %CPPSELF.getHslF(&h, &s, &l, &a); - %PYARG_0 = Py_BuildValue("(ON(s(ffff)))", Py_TYPE(%PYSELF), PyTuple_New(0), "setHslF", (float)h, (float)s, (float)l, (float)a); - break; - } - #endif - default: - { - %PYARG_0 = Py_BuildValue("(N(O))", PyObject_Type(%PYSELF), Py_None); - } - } - </inject-code> - </add-function> - - <add-function signature="toTuple" return-type="PyObject"> - <inject-code class="target" position="beginning"> - switch(%CPPSELF.spec()) { - case QColor::Rgb: - { - int r, g, b, a; - %CPPSELF.getRgb(&r, &g, &b, &a); - %PYARG_0 = Py_BuildValue("iiii", r, g, b, a); - break; - } - case QColor::Hsv: - { - int h, s, v, a; - %CPPSELF.getHsv(&h, &s, &v, &a); - %PYARG_0 = Py_BuildValue("iiii", h, s, v, a); - break; - } - case QColor::Cmyk: - { - int c, m, y, k, a; - %CPPSELF.getCmyk(&c, &m, &y, &k, &a); - %PYARG_0 = Py_BuildValue("iiiii", c, m, y, k, a); - break; - } - case QColor::Hsl: - { - int h, s, l, a; - %CPPSELF.getHsl(&h, &s, &l, &a); - %PYARG_0 = Py_BuildValue("iiii", h, s, l, a); - break; - } - default: - { - %PYARG_0 = 0; - } - } - </inject-code> - </add-function> - <!-- ### "QColor(QColor::Spec)" is an internal method. --> - <modify-function signature="QColor(QColor::Spec)" remove="all"/> - <!-- ### Constructor removed because we already have an overload using QString. --> - <modify-function signature="QColor(const char*)" remove="all" /> - <!-- ### --> - <add-function signature="QColor(QVariant)"> - <inject-code class="target" position="beginning"> - if (%1.type() == QVariant::Color) - %0 = new %TYPE(%1.value<QColor>()); - else - PyErr_SetString(PyExc_TypeError, "QVariant must be holding a QColor"); - </inject-code> - </add-function> - <!-- get* methods. Inject code --> - <modify-function signature="getCmyk(int*,int*,int*,int*,int*)"> - <modify-argument index="0"> - <replace-type modified-type="PyObject *" /> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - </modify-argument> - <modify-argument index="5"> - <remove-argument/> - <remove-default-expression/> - </modify-argument> - - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*,number*"> - <replace from="$TYPE" to="int" /> - </insert-template> - </inject-code> - </modify-function> - <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)"> - <modify-argument index="0"> - <replace-type modified-type="PyObject *" /> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - </modify-argument> - <modify-argument index="5"> - <remove-argument/> - <remove-default-expression/> - </modify-argument> - - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*,number*"> - <replace from="$TYPE" to="qreal" /> - </insert-template> - </inject-code> - </modify-function> - <modify-function signature="getHsl(int*,int*,int*,int*)const" since="4.6"> - <modify-argument index="0"> - <replace-type modified-type="PyObject *" /> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - <remove-default-expression/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*"> - <replace from="$TYPE" to="int" /> - </insert-template> - </inject-code> - </modify-function> - <modify-function signature="getHslF(qreal*,qreal*,qreal*,qreal*)const" since="4.6"> - <modify-argument index="0"> - <replace-type modified-type="PyObject *" /> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - <remove-default-expression/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*"> - <replace from="$TYPE" to="qreal" /> - </insert-template> - </inject-code> - </modify-function> - <modify-function signature="getHsv(int*,int*,int*,int*)const"> - <modify-argument index="0"> - <replace-type modified-type="PyObject *" /> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - <remove-default-expression/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*"> - <replace from="$TYPE" to="int" /> - </insert-template> - </inject-code> - </modify-function> - <modify-function signature="getHsvF(qreal*,qreal*,qreal*,qreal*)const"> - <modify-argument index="0"> - <replace-type modified-type="PyObject *" /> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - <remove-default-expression/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*"> - <replace from="$TYPE" to="qreal" /> - </insert-template> - </inject-code> - </modify-function> - <modify-function signature="getRgb(int*,int*,int*,int*)const"> - <modify-argument index="0"> - <replace-type modified-type="PyObject *" /> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - <remove-default-expression/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*"> - <replace from="$TYPE" to="int" /> - </insert-template> - </inject-code> - </modify-function> - <modify-function signature="getRgbF(qreal*,qreal*,qreal*,qreal*)const"> - <modify-argument index="0"> - <replace-type modified-type="PyObject *" /> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - <remove-default-expression/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*"> - <replace from="$TYPE" to="qreal" /> - </insert-template> - </inject-code> - </modify-function> - <!--### Obsolete in 4.3--> - <modify-function signature="dark(int)const" remove="all"/> - <modify-function signature="light(int)const" remove="all"/> - <!--### End of obsolete section --> - </value-type> - <value-type name="QFontMetricsF" > - - <modify-function signature="boundingRect(QChar)const" rename="boundingRectChar"> - <modify-argument index="1"> - <replace-type modified-type="char"/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="QFontCharFix"/> - </inject-code> - </modify-function> - - <modify-function signature="width(QChar)const" rename="widthChar"> - <modify-argument index="1"> - <replace-type modified-type="char"/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="QFontCharFix"/> - </inject-code> - </modify-function> - - <modify-function signature="boundingRect(QRectF,int,QString,int,int*)const"> - <modify-argument index="5"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <inject-code class="target" position="beginning"> - int* array = NULL; - bool errorOccurred = false; - - if (numArgs == 5) { - array = Shiboken::sequenceToIntArray(%PYARG_5, true); - if (PyErr_Occurred()) { - if (array) - delete []array; - errorOccurred = true; - } - } - - if (!errorOccurred) { - %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, array); - - if (array) - delete []array; - - %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](retval); - } - </inject-code> - </modify-function> - - <modify-function signature="size(int,QString,int,int*)const"> - <modify-argument index="4"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <inject-code class="target" position="beginning"> - int* array = NULL; - bool errorOccurred = false; - - if (numArgs == 4) { - array = Shiboken::sequenceToIntArray(%PYARG_4, true); - if (PyErr_Occurred()) { - if (array) - delete []array; - errorOccurred = true; - } - } - - if (!errorOccurred) { - %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, array); - - if (array) - delete []array; - - %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](retval); - } - </inject-code> - </modify-function> - </value-type> - <value-type name="QFontMetrics" > - - <modify-function signature="boundingRect(QChar)const" rename="boundingRectChar"> - <modify-argument index="1"> - <replace-type modified-type="char"/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="QFontCharFix"/> - </inject-code> - </modify-function> - - <modify-function signature="width(QChar)const" rename="widthChar"> - <modify-argument index="1"> - <replace-type modified-type="char"/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="QFontCharFix"/> - </inject-code> - </modify-function> - - <modify-function signature="boundingRect(int,int,int,int,int,QString,int,int*)const"> - <modify-argument index="8"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <inject-code class="target" position="beginning"> - int* array = NULL; - bool errorOccurred = false; - - if (numArgs == 8) { - array = Shiboken::sequenceToIntArray(%PYARG_8, true); - if (PyErr_Occurred()) { - if (array) - delete []array; - errorOccurred = true; - } - } - - if (!errorOccurred) { - %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, %7, array); - - if (array) - delete []array; - - %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](retval); - } - </inject-code> - </modify-function> - - <modify-function signature="boundingRect(QRect,int,QString,int,int*)const"> - <modify-argument index="5"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <inject-code class="target" position="beginning"> - int* array = NULL; - bool errorOccurred = false; - - if (numArgs == 5) { - array = Shiboken::sequenceToIntArray(%PYARG_5, true); - if (PyErr_Occurred()) { - if (array) - delete []array; - errorOccurred = true; - } - } - - if (!errorOccurred) { - %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, array); - - if (array) - delete []array; - - %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](retval); - } - </inject-code> - </modify-function> - - <modify-function signature="size(int,QString,int,int*)const"> - <modify-argument index="4"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <inject-code class="target" position="beginning"> - int* array = NULL; - bool errorOccurred = false; - - if (numArgs == 4) { - array = Shiboken::sequenceToIntArray(%PYARG_4, true); - if (PyErr_Occurred()) { - if (array) - delete []array; - errorOccurred = true; - } - } - - if (!errorOccurred) { - %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, array); - - if (array) - delete []array; - - %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](retval); - } - - </inject-code> - </modify-function> - </value-type> - <value-type name="QGradient" force-abstract="yes" polymorphic-id-expression="%1->type() == QGradient::NoGradient"> - <enum-type name="CoordinateMode"/> - <enum-type name="InterpolationMode"/> - <enum-type name="Spread" lower-bound="QGradient.PadSpread" upper-bound="QGradient.RepeatSpread"/> - <enum-type name="Type"/> - </value-type> - <value-type name="QLinearGradient" polymorphic-id-expression="%1->type() == QGradient::LinearGradient" /> <object-type name="QLayoutItem"> <modify-function signature="widget()"> @@ -2882,64 +1437,6 @@ </object-type> <object-type name="QVBoxLayout"/> - <template name="validator_conversionrule"> - QValidator::State %out; - - if (PySequence_Check(%PYARG_0)) { - Shiboken::AutoDecRef seq(PySequence_Fast(%PYARG_0, 0)); - int size = PySequence_Fast_GET_SIZE(seq.object()); - - if (size > 1) { - if (%ISCONVERTIBLE[QString](PySequence_Fast_GET_ITEM(seq.object(), 1))) - %1 = %CONVERTTOCPP[QString](PySequence_Fast_GET_ITEM(seq.object(), 1)); - else - qWarning("%TYPE::%FUNCTION_NAME: Second tuple element is not convertible to unicode."); - } - - if (size > 2) { - if (%ISCONVERTIBLE[int](PySequence_Fast_GET_ITEM(seq.object(), 2))) - %2 = %CONVERTTOCPP[int](PySequence_Fast_GET_ITEM(seq.object(), 2)); - else - qWarning("%TYPE::%FUNCTION_NAME: Second tuple element is not convertible to int."); - } - %PYARG_0 = PySequence_Fast_GET_ITEM(seq.object(), 0); - Py_INCREF(%PYARG_0); // we need to incref, because "%PYARG_0 = ..." will decref the tuple and the tuple will be decrefed again at the end of this scope. - } - - // check retrun value - if (%ISCONVERTIBLE[QValidator::State](%PYARG_0)) { - %out = %CONVERTTOCPP[QValidator::State](%PYARG_0); - } else { - PyErr_Format(PyExc_TypeError, "Invalid return value in function %s, expected %s, got %s.", - "QValidator.validate", - "PySide.QtGui.QValidator.State, (PySide.QtGui.QValidator.State,), (PySide.QtGui.QValidator.State, unicode) or (PySide.QtGui.QValidator.State, unicode, int)", - pyResult->ob_type->tp_name); - return QValidator::State(); - } - </template> - - <object-type name="QValidator"> - <enum-type name="State"/> - <modify-function signature="fixup(QString &)const"> - <modify-argument index="return"> - <replace-type modified-type="QString"/> - </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_QString"/> - </inject-code> - </modify-function> - <modify-function signature="validate(QString &, int &)const"> - <modify-argument index="return"> - <replace-type modified-type="PyObject"/> - <conversion-rule class="native"> - <insert-template name="validator_conversionrule"/> - </conversion-rule> - </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_tuple_QValidator_QString_int"/> - </inject-code> - </modify-function> - </object-type> <object-type name="QWhatsThis"/> <object-type name="QWidgetAction"> <modify-function signature="setDefaultWidget(QWidget*)"> @@ -2954,44 +1451,7 @@ </modify-function> </object-type> <object-type name="QWidgetItem" polymorphic-id-expression="%1->widget()" /> - <object-type name="QWindowsStyle"> - <!--### Obsolete in 4.3--> - <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> - <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> - </object-type> - <object-type name="QWorkspace"> - <enum-type name="WindowOrder"/> - <modify-function signature="addWindow(QWidget*, QFlags<Qt::WindowType>)"> - <modify-argument index="1"> - <parent index="this" action="add" /> - </modify-argument> - </modify-function> - </object-type> - <object-type name="QActionEvent" polymorphic-id-expression="%1->type() == QEvent::ActionAdded || %1->type() == QEvent::ActionRemoved || %1->type() == QEvent::ActionChanged" /> - <object-type name="QClipboardEvent" polymorphic-id-expression="%1->type() == QEvent::Clipboard"/> - <object-type name="QCloseEvent" polymorphic-id-expression="%1->type() == QEvent::Close"/> - <object-type name="QContextMenuEvent" polymorphic-id-expression="%1->type() == QEvent::ContextMenu"> - <enum-type name="Reason"/> - </object-type> - <object-type name="QDragEnterEvent" polymorphic-id-expression="%1->type() == QEvent::DragEnter"/> - <object-type name="QDragLeaveEvent" polymorphic-id-expression="%1->type() == QEvent::DragLeave"/> - <object-type name="QDragMoveEvent" polymorphic-id-expression="%1->type() == QEvent::DragMove" /> - <object-type name="QDropEvent" polymorphic-id-expression="%1->type() == QEvent::Drop"> - <modify-function signature="source() const"> - <modify-argument index="return"> - <define-ownership owner="target"/> - </modify-argument> - </modify-function> - <!--### Method encodedData(const char*) exists only for Qt3 compatibility. --> - <modify-function signature="encodedData(const char*)const" remove="all"/> - <!--### Method format(int) exists only for Qt3 compatibility. --> - <modify-function signature="format(int)const" remove="all"/> - <!--### Method provides(const char*) exists only for Qt3 compatibility. --> - <modify-function signature="provides(const char*)const" remove="all"/> - <!-- ### --> - </object-type> - <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen" /> - <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut" /> + <object-type name="QGraphicsSceneContextMenuEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneContextMenu"> <enum-type name="Reason"/> </object-type> @@ -3012,53 +1472,7 @@ <object-type name="QGraphicsSceneHoverEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneHoverEnter || %1->type() == QEvent::GraphicsSceneHoverLeave || %1->type() == QEvent::GraphicsSceneHoverMove" /> <object-type name="QGraphicsSceneMouseEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneMouseDoubleClick || %1->type() == QEvent::GraphicsSceneMouseMove || %1->type() == QEvent::GraphicsSceneMousePress || %1->type() == QEvent::GraphicsSceneMouseRelease"/> <object-type name="QGraphicsSceneWheelEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneWheel"/> - <object-type name="QHelpEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::ToolTip || %1->type() == QEvent::WhatsThis"/> - <object-type name="QHideEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::Hide"/> - <object-type name="QHoverEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::HoverEnter || %1->type() == QEvent::HoverLeave || %1->type() == QEvent::HoverMove"/> - <object-type name="QIconDragEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::IconDrag"/> - - <object-type name="QInputMethodEvent" copyable="no" polymorphic-id-expression="%1->type() == QEvent::InputMethod"> - <!-- only declare this if ndef QT_NO_INPUTMETHOD --> - <enum-type name="AttributeType"/> - <value-type name="Attribute"> - <include file-name="QInputMethodEvent" location="global"/> - </value-type> - <!-- endif ndef QT_NO_INPUTMETHOD --> - </object-type> - <object-type name="QMoveEvent" copyable = "false" polymorphic-id-expression="%1->type() == QEvent::Move" /> - <object-type name="QResizeEvent" copyable = "false" polymorphic-id-expression="%1->type() == QEvent::Resize"/> - <object-type name="QShortcutEvent" copyable = "false" polymorphic-id-expression="%1->type() == QEvent::Shortcut"> - <!-- All these have const overloads that are used instead --> - <modify-function signature="isAmbiguous()" remove="all"/> - <modify-function signature="shortcutId()" remove="all"/> - <modify-function signature="key()" remove="all"/> - <!-- ### --> - </object-type> - <object-type name="QShowEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::Show"/> - <object-type name="QStatusTipEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::StatusTip"/> - <object-type name="QTabletEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::TabletMove || %1->type() == QEvent::TabletPress || %1->type() == QEvent::TabletRelease"> - <enum-type name="PointerType"/> - <enum-type name="TabletDevice"/> - </object-type> - <object-type name="QToolBarChangeEvent" polymorphic-id-expression="%1->type() == QEvent::ToolBarChange"/> - <object-type name="QWhatsThisClickedEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::WhatsThisClicked"/> - <object-type name="QWheelEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::Wheel"/> - <object-type name="QWindowStateChangeEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::WindowStateChange"/> - <object-type name="QInputEvent" copyable="false"> - <modify-function signature="modifiers()const" access="non-final"/> - </object-type> - <object-type name="QKeyEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::KeyPress || %1->type() == QEvent::KeyRelease || %1->type() == QEvent::ShortcutOverride"> - <add-function signature="operator!=(QKeySequence::StandardKey)"> - <inject-code class="target"> - bool ret = !(&%CPPSELF == %1); - %PYARG_0 = %CONVERTTOPYTHON[bool](ret); - </inject-code> - </add-function> - </object-type> - <object-type name="QMouseEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::MouseButtonDblClick || %1->type() == QEvent::MouseButtonPress || %1->type() == QEvent::MouseButtonRelease || %1->type() == QEvent::MouseMove"/> - <object-type name="QPaintEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::Paint"/> - <object-type name="QAccessibleEvent" polymorphic-id-expression="%1->type() == QEvent::AccessibilityDescription || %1->type() == QEvent::AccessibilityHelp"/> <object-type name="QGestureEvent" polymorphic-id-expression="%1->type() == QEvent::Gesture || %1->type() == QEvent::GestureOverride" since="4.6"> <modify-function signature="activeGestures()const"> <modify-argument index="return"> @@ -4364,103 +2778,7 @@ </inject-code> </modify-function> </object-type> - <object-type name="QTextFrame" > - <extra-includes> - <include file-name="QTextCursor" location="global"/> - </extra-includes> - <value-type name="iterator" > - <include file-name="QTextFrame" location="global"/> - <!-- ### These operators where removed because they don't make sense in Python. - Instead iterator methods (__iter__, next) should be implemented. - See bug 688 --> - <modify-function signature="operator++()" remove="all"/> - <modify-function signature="operator--()" remove="all"/> - <!-- ### --> - <add-function signature="__iter__()" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="__iter__" /> - </inject-code> - </add-function> - <add-function signature="__next__()" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="__next__"> - <replace from="%CPPSELF_TYPE" to="QTextFrame::iterator" /> - </insert-template> - </inject-code> - </add-function> - </value-type> - <add-function signature="__iter__()" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="__iter_parent__"> - <replace from="%CPPSELF_TYPE" to="QTextFrame::iterator" /> - </insert-template> - </inject-code> - </add-function> - </object-type> - <object-type name="QImageIOHandler"> - <extra-includes> - <include file-name="QRect" location="global"/> - </extra-includes> - <enum-type name="ImageOption"/> - <modify-function signature="setDevice(QIODevice*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <!--### Obsolete in 4.3--> - <modify-function signature="name()const" remove="all"/> - </object-type> - <object-type name="QProxyModel" polymorphic-id-expression="qobject_cast<QProxyModel*>(%1)"> - <!-- ### This reimplementation of "QObject::parent()" is used in C++ only - when "using QObject::parent;" is not available. It's useless in Python. --> - <modify-function signature="parent()const" remove="all"/> - <extra-includes> - <include file-name="QPixmap" location="global"/> - <include file-name="QStringList" location="global"/> - <include file-name="QSize" location="global"/> - </extra-includes> - <modify-function signature="setModel(QAbstractItemModel*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - </modify-function> - </object-type> - <object-type name="QImageReader"> - <extra-includes> - <include file-name="QColor" location="global"/> - <include file-name="QRect" location="global"/> - <include file-name="QSize" location="global"/> - <include file-name="QStringList" location="global"/> - <include file-name="QImage" location="global"/> - </extra-includes> - <enum-type name="ImageReaderError"/> - <!-- ### This method does not make sense in Python. - Update: perhaps it does, but no one is missing it. --> - <modify-function signature="read(QImage*)" remove="all" /> - <modify-function signature="setDevice(QIODevice*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> - <object-type name="QMovie"> - <extra-includes> - <include file-name="QColor" location="global"/> - <include file-name="QImage" location="global"/> - <include file-name="QPixmap" location="global"/> - <include file-name="QRect" location="global"/> - <include file-name="QSize" location="global"/> - </extra-includes> - <enum-type name="CacheMode"/> - <enum-type name="MovieState"/> - <!-- ### "cacheMode()" is an internal method. --> - <modify-function signature="cacheMode()" remove="all"/> - <modify-function signature="setDevice(QIODevice*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> + <object-type name="QTabWidget"> <enum-type name="TabPosition"/> <enum-type name="TabShape"/> @@ -4516,35 +2834,6 @@ </inject-code> </modify-function> </object-type> - <object-type name="QDrag"> - <extra-includes> - <include file-name="QPoint" location="global"/> - <include file-name="QPixmap" location="global"/> - </extra-includes> - <modify-function signature="QDrag(QWidget*)"> - <modify-argument index="this"> - <parent index="1" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="source() const"> - <modify-argument index="return"> - <define-ownership owner="target"/> - </modify-argument> - </modify-function> - <modify-function signature="target() const"> - <modify-argument index="return"> - <define-ownership owner="target"/> - </modify-argument> - </modify-function> - <modify-function signature="setMimeData(QMimeData*)"> - <modify-argument index="1"> - <!-- TODO: maybe this is not the best solution --> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="exec(QFlags<Qt::DropAction>)" rename="exec_" allow-thread="yes"/> - <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="Sections"/> <modify-function signature="setCalendarWidget(QCalendarWidget*)"> @@ -4553,40 +2842,9 @@ </modify-argument> </modify-function> </object-type> - <object-type name="QSortFilterProxyModel"> - <!-- ### This reimplementation of "QObject::parent()" is used in C++ only - when "using QObject::parent;" is not available. It's useless in Python. --> - <modify-function signature="parent()const" remove="all"/> - <extra-includes> - <include file-name="QItemSelection" location="global"/> - <include file-name="QStringList" location="global"/> - <include file-name="QSize" location="global"/> - </extra-includes> - <modify-function signature="setSourceModel(QAbstractItemModel*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - </modify-function> - <!--### Obsolete in 4.3--> - <modify-function signature="clear()" remove="all"/> - <modify-function signature="filterChanged()" remove="all"/> - <!--### End of obsolete section --> - </object-type> <object-type name="QSlider"> <enum-type name="TickPosition" /> </object-type> - <object-type name="QInputContext"> - <extra-includes> - <include file-name="QTextFormat" location="global"/> - </extra-includes> - <enum-type name="StandardFormat"/> - <modify-function signature="filterEvent(const QEvent*)"> - <modify-argument index="1" invalidate-after-use="yes"/> - </modify-function> - <modify-function signature="mouseHandler(int,QMouseEvent*)"> - <modify-argument index="2" invalidate-after-use="yes"/> - </modify-function> - </object-type> <object-type name="QProgressDialog"> <modify-function signature="setBar(QProgressBar*)"> <modify-argument index="1"> @@ -4618,7 +2876,6 @@ </modify-function> </object-type> - <object-type name="QFileDialog"> <enum-type name="AcceptMode"/> <enum-type name="DialogLabel"/> @@ -4747,7 +3004,7 @@ <modify-argument index="1"> <parent index="this" action="add" /> </modify-argument> - </modify-function> + </modify-function> <modify-function signature="insertRow(int, QStandardItem*)"> <modify-argument index="2"> @@ -4947,15 +3204,6 @@ </modify-argument> </modify-function> </object-type> - <object-type name="QTextLayout"> - <extra-includes> - <include file-name="QTextOption" location="global"/> - </extra-includes> - <enum-type name="CursorMode"/> - <value-type name="FormatRange"> - <include file-name="QTextLayout" location="global"/> - </value-type> - </object-type> <object-type name="QTableWidget"> <modify-function signature="setHorizontalHeaderItem(int, QTableWidgetItem *)"> <modify-argument index="2"> @@ -5334,27 +3582,6 @@ </inject-code> </modify-function> </object-type> - <object-type name="QPaintEngine"> - <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*)"> - <modify-argument index="1" invalidate-after-use="yes"/> - </modify-function> - <modify-function signature="updateState(QPaintEngineState)"> - <modify-argument index="1" invalidate-after-use="yes"/> - </modify-function> - <modify-function signature="drawTextItem(QPointF,QTextItem)"> - <modify-argument index="2" invalidate-after-use="yes"/> - </modify-function> - <extra-includes> - <include file-name="QVarLengthArray" location="global"/> - </extra-includes> - <!-- ### "setPaintDevice(QPaintDevice*)" is an internal method. --> - <modify-function signature="setPaintDevice(QPaintDevice*)" remove="all"/> - <modify-field name="state" read="false" write="false"/> - </object-type> <object-type name="QComboBox"> <enum-type name="InsertPolicy"/> <enum-type name="SizeAdjustPolicy"/> @@ -5429,173 +3656,12 @@ </modify-argument> </modify-function> </object-type> - <object-type name="QPainter"> - <extra-includes> - <include file-name="QWidget" location="global"/> - <include file-name="QPainterPath" location="global"/> - <include file-name="QPixmap" location="global"/> - </extra-includes> - <enum-type name="CompositionMode"/> - <enum-type name="PixmapFragmentHint" flags="PixmapFragmentHints" since="4.7"/> - <enum-type name="RenderHint" flags="RenderHints"/> - <value-type name="PixmapFragment" since="4.7"> - <include file-name="QPainter" location="global"/> - </value-type> - <!-- ### "drawText(...)" is an internal method. --> - <modify-function signature="drawText(const QPointF&, const QString&, int, int)" remove="all"/> - - <template name="qpainter_drawlist"> - %BEGIN_ALLOW_THREADS - %CPPSELF.%FUNCTION_NAME(%1.data(), %1.size()); - %END_ALLOW_THREADS - </template> - - <modify-function signature="drawConvexPolygon(const QPoint*, int)" remove="all" /> - <add-function signature="drawConvexPolygon(QVector<QPoint>)"> - <inject-code> - <insert-template name="qpainter_drawlist" /> - </inject-code> - </add-function> - <modify-function signature="drawConvexPolygon(const QPointF*, int)" remove="all" /> - <add-function signature="drawConvexPolygon(QVector<QPointF>)"> - <inject-code> - <insert-template name="qpainter_drawlist" /> - </inject-code> - </add-function> - <!-- ### Overloads using QVector<T> does the job of these methods --> - <modify-function signature="drawLines(const QLine*, int)" remove="all" /> - <modify-function signature="drawLines(const QLineF*, int)" remove="all" /> - <modify-function signature="drawLines(const QPoint*, int)" remove="all" /> - <modify-function signature="drawLines(const QPointF*, int)" remove="all" /> - <modify-function signature="drawRects(const QRect*, int)" remove="all" /> - <modify-function signature="drawRects(const QRectF*, int)" remove="all" /> - <!-- ### --> - <modify-function signature="drawPoints(const QPoint*, int)" remove="all" /> - <add-function signature="drawPoints(QVector<QPoint>)"> - <inject-code> - <insert-template name="qpainter_drawlist" /> - </inject-code> - </add-function> - <modify-function signature="drawPoints(const QPointF*, int)" remove="all" /> - <add-function signature="drawPoints(QVector<QPointF>)"> - <inject-code> - <insert-template name="qpainter_drawlist" /> - </inject-code> - </add-function> - <modify-function signature="drawPolygon(const QPoint*, int, Qt::FillRule)" remove="all" /> - <add-function signature="drawPolygon(QVector<QPoint>, Qt::FillRule)"> - <inject-code> - %BEGIN_ALLOW_THREADS - %CPPSELF.%FUNCTION_NAME(%1.data(), %1.size(), %2); - %END_ALLOW_THREADS - </inject-code> - </add-function> - <modify-function signature="drawPolygon(const QPointF*, int, Qt::FillRule)" remove="all" /> - <add-function signature="drawPolygon(QVector<QPointF>, Qt::FillRule)"> - <inject-code> - %BEGIN_ALLOW_THREADS - %CPPSELF.%FUNCTION_NAME(%1.data(), %1.size(), %2); - %END_ALLOW_THREADS - </inject-code> - </add-function> - <modify-function signature="drawPolyline(const QPoint*, int)" remove="all" /> - <add-function signature="drawPolyline(QVector<QPoint>)"> - <inject-code> - <insert-template name="qpainter_drawlist" /> - </inject-code> - </add-function> - <modify-function signature="drawPolyline(const QPointF*, int)" remove="all" /> - <add-function signature="drawPolyline(QVector<QPointF>)"> - <inject-code> - <insert-template name="qpainter_drawlist" /> - </inject-code> - </add-function> - <modify-function signature="drawRoundRect(int, int, int, int, int, int)"> - <modify-argument index="5"> - <rename to="xRound"/> - </modify-argument> - <modify-argument index="6"> - <rename to="yRound"/> - </modify-argument> - </modify-function> - <modify-function signature="drawTiledPixmap(const QRect&,const QPixmap&, const QPoint&)"> - <modify-argument index="3"> - <rename to="pos"/> - </modify-argument> - </modify-function> - <modify-function signature="QPainter(QPaintDevice*)"> - <modify-argument index="1"> - <no-null-pointer/> - </modify-argument> - </modify-function> - <modify-function signature="begin(QPaintDevice*)"> - <modify-argument index="1"> - <no-null-pointer/> - </modify-argument> - </modify-function> - <modify-function signature="initFrom(const QWidget*)"> - <modify-argument index="1"> - <no-null-pointer/> - </modify-argument> - </modify-function> - <modify-function signature="setRedirected(const QPaintDevice*, QPaintDevice*, const QPoint&)"> - <modify-argument index="1"> - <no-null-pointer/> - </modify-argument> - </modify-function> - <modify-function signature="restoreRedirected(const QPaintDevice*)"> - <modify-argument index="1"> - <no-null-pointer/> - </modify-argument> - </modify-function> - <modify-function signature="drawText(QRectF,int,QString,QRectF*)"> - <modify-argument index="4"> - <remove-argument/> - <remove-default-expression/> - </modify-argument> - <modify-argument index="return"> - <replace-type modified-type="QRectF"/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_args,QRectF*"/> - </inject-code> - </modify-function> - <modify-function signature="drawText(QRect,int,QString,QRect*)"> - <modify-argument index="4"> - <remove-argument/> - <remove-default-expression/> - </modify-argument> - <modify-argument index="return"> - <replace-type modified-type="QRect"/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_args,QRect*"/> - </inject-code> - </modify-function> - <modify-function signature="drawText(int,int,int,int,int,QString,QRect*)"> - <modify-argument index="7"> - <remove-argument/> - <remove-default-expression/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_args,QRect*"/> - </inject-code> - </modify-function> - <!--### Obsoleted by QWidget::render() --> - <modify-function signature="redirected(const QPaintDevice*,QPoint*)" remove="all" /> - <!--### Obsolete in 4.3--> - <modify-function signature="matrix()const" remove="all"/> - <modify-function signature="matrixEnabled()const" remove="all"/> - <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> - <modify-function signature="setMatrixEnabled(bool)" remove="all"/> - <!--### End of obsolete section --> - </object-type> <!-- qApp macro --> <inject-code class="native" position="beginning"> PyObject* moduleQtGui; </inject-code> - <inject-code class="target" file="glue/qtgui_qapp.cpp" position="end" /> + <inject-code class="target" file="glue/qtwidgets_qapp.cpp" position="end" /> <object-type name="QApplication"> <enum-type name="ColorSpec"/> <enum-type name="Type"/> @@ -6121,687 +4187,6 @@ </modify-function> </object-type> - <value-type name="QMatrix2x2" since="4.6"> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code_matrix"> - <replace from="%MATRIX_SIZE" to="4" /> - <replace from="%MATRIX_TYPE" to="qreal" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code_matrix"> - <replace from="%MATRIX_TYPE" to="qreal" /> - <replace from="%MATRIX_SIZE" to="4" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="QMatrix2x2(PySequence*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_constructor"> - <replace from="%SIZE" to="4" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="data()" return-type="qreal"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_data_function"> - <replace from="%MATRIX_SIZE" to="4" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="fill(PyObject*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_fill_function"> - <replace from="%MATRIX_SIZE" to="4" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="transposed()" return-type="PyObject"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_transposed_function"> - <replace from="%TRANSPOSED_TYPE" to="QMatrix2x2" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="operator!=(const QMatrix2x2&)" return-type="bool" /> - - <template name="inplace_add"> - *%CPPSELF += %1; - return %CONVERTTOPYTHON[%RETURN_TYPE](*%CPPSELF); - </template> - <template name="inplace_sub"> - *%CPPSELF -= %1; - return %CONVERTTOPYTHON[%RETURN_TYPE](*%CPPSELF); - </template> - <template name="inplace_mult"> - *%CPPSELF *= %1; - return %CONVERTTOPYTHON[%RETURN_TYPE](*%CPPSELF); - </template> - <template name="inplace_div"> - *%CPPSELF /= %1; - return %CONVERTTOPYTHON[%RETURN_TYPE](*%CPPSELF); - </template> - - <add-function signature="operator*=(qreal)" return-type="QMatrix2x2" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_mult"/> - </inject-code> - </add-function> - <add-function signature="operator+=(const QMatrix2x2&)" return-type="QMatrix2x2" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_add"/> - </inject-code> - </add-function> - <add-function signature="operator-=(const QMatrix2x2&)" return-type="QMatrix2x2" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_sub"/> - </inject-code> - </add-function> - <add-function signature="operator/=(qreal)" return-type="QMatrix2x2" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_div"/> - </inject-code> - </add-function> - <add-function signature="operator==(const QMatrix2x2&)" return-type="bool" /> - </value-type> - - <value-type name="QMatrix2x3" since="4.6"> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code_matrix"> - <replace from="%MATRIX_SIZE" to="6" /> - <replace from="%MATRIX_TYPE" to="qreal" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code_matrix"> - <replace from="%MATRIX_TYPE" to="qreal" /> - <replace from="%MATRIX_SIZE" to="6" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="QMatrix2x3(PySequence*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_constructor"> - <replace from="%SIZE" to="6" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="data()" return-type="qreal"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_data_function"> - <replace from="%MATRIX_SIZE" to="6" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="fill(PyObject*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_fill_function"> - <replace from="%MATRIX_SIZE" to="6" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="transposed()" return-type="PyObject"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_transposed_function"> - <replace from="%TRANSPOSED_TYPE" to="QMatrix3x2" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="operator!=(const QMatrix2x3&)" return-type="bool" /> - <add-function signature="operator*=(qreal)" return-type="QMatrix2x3" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_mult"/> - </inject-code> - </add-function> - <add-function signature="operator+=(const QMatrix2x3&)" return-type="QMatrix2x3" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_add"/> - </inject-code> - </add-function> - <add-function signature="operator-=(const QMatrix2x3&)" return-type="QMatrix2x3" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_sub"/> - </inject-code> - </add-function> - <add-function signature="operator/=(qreal)" return-type="QMatrix2x3" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_div"/> - </inject-code> - </add-function> - <add-function signature="operator==(const QMatrix2x3&)" return-type="bool" /> - </value-type> - - <value-type name="QMatrix2x4" since="4.6"> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code_matrix"> - <replace from="%MATRIX_SIZE" to="8" /> - <replace from="%MATRIX_TYPE" to="qreal" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code_matrix"> - <replace from="%MATRIX_TYPE" to="qreal" /> - <replace from="%MATRIX_SIZE" to="8" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="QMatrix2x4(PySequence*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_constructor"> - <replace from="%SIZE" to="8" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="data()" return-type="qreal"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_data_function"> - <replace from="%MATRIX_SIZE" to="8" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="fill(PyObject*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_fill_function"> - <replace from="%MATRIX_SIZE" to="8" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="transposed()" return-type="PyObject"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_transposed_function"> - <replace from="%TRANSPOSED_TYPE" to="QMatrix4x2" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="operator!=(const QMatrix2x4&)" return-type="bool" /> - <add-function signature="operator*=(qreal)" return-type="QMatrix2x4" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_mult"/> - </inject-code> - </add-function> - <add-function signature="operator+=(const QMatrix2x4&)" return-type="QMatrix2x4" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_add"/> - </inject-code> - </add-function> - <add-function signature="operator-=(const QMatrix2x4&)" return-type="QMatrix2x4" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_sub"/> - </inject-code> - </add-function> - <add-function signature="operator/=(qreal)" return-type="QMatrix2x4" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_div"/> - </inject-code> - </add-function> - <add-function signature="operator==(const QMatrix2x4&)" return-type="bool" /> - </value-type> - - <value-type name="QMatrix3x2" since="4.6"> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code_matrix"> - <replace from="%MATRIX_SIZE" to="6" /> - <replace from="%MATRIX_TYPE" to="qreal" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code_matrix"> - <replace from="%MATRIX_TYPE" to="qreal" /> - <replace from="%MATRIX_SIZE" to="6" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="QMatrix3x2(PySequence*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_constructor"> - <replace from="%SIZE" to="6" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="data()" return-type="qreal"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_data_function"> - <replace from="%MATRIX_SIZE" to="6" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="fill(PyObject*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_fill_function"> - <replace from="%MATRIX_SIZE" to="6" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="transposed()" return-type="PyObject"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_transposed_function"> - <replace from="%TRANSPOSED_TYPE" to="QMatrix2x3" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="operator!=(const QMatrix3x2&)" return-type="bool" /> - <add-function signature="operator*=(qreal)" return-type="QMatrix3x2" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_mult"/> - </inject-code> - </add-function> - <add-function signature="operator+=(const QMatrix3x2&)" return-type="QMatrix3x2" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_add"/> - </inject-code> - </add-function> - <add-function signature="operator-=(const QMatrix3x2&)" return-type="QMatrix3x2" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_sub"/> - </inject-code> - </add-function> - <add-function signature="operator/=(qreal)" return-type="QMatrix3x2" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_div"/> - </inject-code> - </add-function> - <add-function signature="operator==(const QMatrix3x2&)" return-type="bool" /> - </value-type> - - <value-type name="QMatrix3x3" since="4.6"> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code_matrix"> - <replace from="%MATRIX_SIZE" to="9" /> - <replace from="%MATRIX_TYPE" to="qreal" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code_matrix"> - <replace from="%MATRIX_TYPE" to="qreal" /> - <replace from="%MATRIX_SIZE" to="9" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="QMatrix3x3(PySequence*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_constructor"> - <replace from="%SIZE" to="9" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="data()" return-type="qreal"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_data_function"> - <replace from="%MATRIX_SIZE" to="9" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="fill(PyObject*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_fill_function"> - <replace from="%MATRIX_SIZE" to="9" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="transposed()" return-type="PyObject"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_transposed_function"> - <replace from="%TRANSPOSED_TYPE" to="QMatrix3x3" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="operator!=(const QMatrix3x3&)" return-type="bool" /> - <add-function signature="operator*=(qreal)" return-type="QMatrix3x3" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_mult"/> - </inject-code> - </add-function> - <add-function signature="operator+=(const QMatrix3x3&)" return-type="QMatrix3x3" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_add"/> - </inject-code> - </add-function> - <add-function signature="operator-=(const QMatrix3x3&)" return-type="QMatrix3x3" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_sub"/> - </inject-code> - </add-function> - <add-function signature="operator/=(qreal)" return-type="QMatrix3x3" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_div"/> - </inject-code> - </add-function> - <add-function signature="operator==(const QMatrix3x3&)" return-type="bool" /> - </value-type> - - <value-type name="QMatrix3x4" since="4.6"> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code_matrix"> - <replace from="%MATRIX_SIZE" to="12" /> - <replace from="%MATRIX_TYPE" to="qreal" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code_matrix"> - <replace from="%MATRIX_TYPE" to="qreal" /> - <replace from="%MATRIX_SIZE" to="12" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="QMatrix3x4(PySequence*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_constructor"> - <replace from="%SIZE" to="12" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="data()" return-type="qreal"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_data_function"> - <replace from="%MATRIX_SIZE" to="12" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="fill(PyObject*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_fill_function"> - <replace from="%MATRIX_SIZE" to="12" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="transposed()" return-type="PyObject"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_transposed_function"> - <replace from="%TRANSPOSED_TYPE" to="QMatrix4x3" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="operator!=(const QMatrix3x4&)" return-type="bool" /> - <add-function signature="operator*=(qreal)" return-type="QMatrix3x4" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_mult"/> - </inject-code> - </add-function> - <add-function signature="operator+=(const QMatrix3x4&)" return-type="QMatrix3x4" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_add"/> - </inject-code> - </add-function> - <add-function signature="operator-=(const QMatrix3x4&)" return-type="QMatrix3x4" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_sub"/> - </inject-code> - </add-function> - <add-function signature="operator/=(qreal)" return-type="QMatrix3x4" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_div"/> - </inject-code> - </add-function> - <add-function signature="operator==(const QMatrix3x4&)" return-type="bool" /> - </value-type> - - <value-type name="QMatrix4x2" since="4.6"> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code_matrix"> - <replace from="%MATRIX_SIZE" to="8" /> - <replace from="%MATRIX_TYPE" to="qreal" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code_matrix"> - <replace from="%MATRIX_TYPE" to="qreal" /> - <replace from="%MATRIX_SIZE" to="8" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="QMatrix4x2(PySequence*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_constructor"> - <replace from="%SIZE" to="8" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="data()" return-type="qreal"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_data_function"> - <replace from="%MATRIX_SIZE" to="8" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="fill(PyObject*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_fill_function"> - <replace from="%MATRIX_SIZE" to="8" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="transposed()" return-type="PyObject"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_transposed_function"> - <replace from="%TRANSPOSED_TYPE" to="QMatrix2x4" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="operator!=(const QMatrix4x2&)" return-type="bool" /> - <add-function signature="operator*=(qreal)" return-type="QMatrix4x2" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_mult"/> - </inject-code> - </add-function> - <add-function signature="operator+=(const QMatrix4x2&)" return-type="QMatrix4x2" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_add"/> - </inject-code> - </add-function> - <add-function signature="operator-=(const QMatrix4x2&)" return-type="QMatrix4x2" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_sub"/> - </inject-code> - </add-function> - <add-function signature="operator/=(qreal)" return-type="QMatrix4x2" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_div"/> - </inject-code> - </add-function> - <add-function signature="operator==(const QMatrix4x2&)" return-type="bool" /> - </value-type> - - <value-type name="QMatrix4x3" since="4.6"> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code_matrix"> - <replace from="%MATRIX_SIZE" to="12" /> - <replace from="%MATRIX_TYPE" to="qreal" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code_matrix"> - <replace from="%MATRIX_TYPE" to="qreal" /> - <replace from="%MATRIX_SIZE" to="12" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="QMatrix4x3(PySequence*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_constructor"> - <replace from="%SIZE" to="12" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="data()" return-type="qreal"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_data_function"> - <replace from="%MATRIX_SIZE" to="12" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="fill(PyObject*)"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_fill_function"> - <replace from="%MATRIX_SIZE" to="12" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="transposed()" return-type="PyObject"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_transposed_function"> - <replace from="%TRANSPOSED_TYPE" to="QMatrix3x4" /> - </insert-template> - </inject-code> - </add-function> - <add-function signature="operator!=(const QMatrix4x3&)" return-type="bool" /> - <add-function signature="operator*=(qreal)" return-type="QMatrix4x3" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_mult"/> - </inject-code> - </add-function> - <add-function signature="operator+=(const QMatrix4x3&)" return-type="QMatrix4x3" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_add"/> - </inject-code> - </add-function> - <add-function signature="operator-=(const QMatrix4x3&)" return-type="QMatrix4x3" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_sub"/> - </inject-code> - </add-function> - <add-function signature="operator/=(qreal)" return-type="QMatrix4x3" > - <inject-code class="target" position="beginning"> - <insert-template name="inplace_div"/> - </inject-code> - </add-function> - <add-function signature="operator==(const QMatrix4x3&)" return-type="bool" /> - </value-type> - - <value-type name="QMatrix4x4" since="4.6"> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code_matrix"> - <replace from="%MATRIX_SIZE" to="16" /> - <replace from="%MATRIX_TYPE" to="qreal" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code_matrix"> - <replace from="%MATRIX_TYPE" to="qreal" /> - <replace from="%MATRIX_SIZE" to="16" /> - </insert-template> - </inject-code> - </add-function> - - <!-- ### "QMatrix4x4(const qreal*,int,int)" is an internal constructor. --> - <modify-function signature="QMatrix4x4(const qreal*,int,int)" remove="all"/> - - <modify-function signature="QMatrix4x4(const qreal*)"> - <modify-argument index="1"> - <replace-type modified-type="PySequence" /> - </modify-argument> - <inject-code class="target" position="beginning"> - if (PySequence_Size(%PYARG_1) == 16) { - qreal values[16]; - for(int i=0; i < 16; i++) { - PyObject *pv = PySequence_Fast_GET_ITEM(%PYARG_1, i); - values[i] = PyFloat_AsDouble(pv); - } - - %0 = new %TYPE(values[0], values[1], values[2], values[3], - values[4], values[5], values[6], values[7], - values[8], values[9], values[10], values[11], - values[12], values[13], values[14], values[15]); - } - </inject-code> - </modify-function> - <modify-function signature="data()"> - <inject-code class="target" position="beginning"> - <insert-template name="matrix_data_function"> - <replace from="%MATRIX_SIZE" to="16" /> - </insert-template> - </inject-code> - </modify-function> - <modify-function signature="copyDataTo(qreal *) const"> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="return"> - <replace-type modified-type="PyTupleObject*"/> - </modify-argument> - <inject-code class="target" position="beginning"> - qreal values[16]; - %CPPSELF.%FUNCTION_NAME(values); - %PYARG_0 = PyTuple_New(16); - for(int i=0; i < 16; i++) { - PyObject *v = PyFloat_FromDouble(values[i]); - PyTuple_SET_ITEM(%PYARG_0, i, v); - } - </inject-code> - </modify-function> - - <modify-function signature="inverted(bool*)const"> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="return"> - <replace-type modified-type="PyTuple"/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_bool*"/> - </inject-code> - </modify-function> - - <!-- ### "constData() const" and "data() const" are unnecessary in Python and their function is performed by "data()". --> - <modify-function signature="data() const" remove="all"/> - <modify-function signature="constData() const" remove="all"/> - <!-- ### --> - <modify-function signature="operator()(int, int) const" remove="all"/> - <modify-function signature="operator()(int, int)" remove="all"/> - <add-function signature="__mgetitem__" return-type="PyObject*"> - <inject-code> - if (PySequence_Check(_key)) { - Shiboken::AutoDecRef key(PySequence_Fast(_key, "Invalid matrix index.")); - if (PySequence_Fast_GET_SIZE(key.object()) == 2) { - PyObject* posx = PySequence_Fast_GET_ITEM(key.object(), 0); - PyObject* posy = PySequence_Fast_GET_ITEM(key.object(), 1); - Py_ssize_t x = PyInt_AsSsize_t(posx); - Py_ssize_t y = PyInt_AsSsize_t(posy); - qreal ret = (*%CPPSELF)(x,y); - return %CONVERTTOPYTHON[qreal](ret); - } - } - PyErr_SetString(PyExc_IndexError, "Invalid matrix index."); - return 0; - </inject-code> - </add-function> - </value-type> - <object-type name="QGesture" since="4.6"> <enum-type name="GestureCancelPolicy"/> </object-type> @@ -6823,10 +4208,6 @@ <enum-type name="PixmapPadMode"/> </object-type> - <!-- QtInternal - <object-type name="QGraphicsEffectSource"/> - --> - <object-type name="QGraphicsObject" since="4.6" /> <object-type name="QGraphicsOpacityEffect" since="4.6"/> <object-type name="QGraphicsRotation" since="4.6"/> @@ -6838,142 +4219,12 @@ <object-type name="QPinchGesture" since="4.6"> <enum-type name="ChangeFlag" flags="ChangeFlags"/> </object-type> - <value-type name="QQuaternion" since="4.6"> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code"> - <replace from="%REPR_FORMAT" to="%f, %f, %f, %f" /> - <replace from="%REPR_ARGS" to="%CPPSELF.scalar(), %CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z()" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code"> - <replace from="%REDUCE_FORMAT" to="dddd" /> - <replace from="%REDUCE_ARGS" to="%CPPSELF.scalar(), %CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z()" /> - </insert-template> - </inject-code> - </add-function> - </value-type> - - - <!-- Symbian - <value-type name="QS60MainApplication"/> - <value-type name="QS60MainAppUi"/> - <object-type name="QS60MainDocument"/> - <value-type name="QS60Style"/> - - <object-type name="QSymbianEvent"> - <enum-type name="Type"/> - </object-type> - --> - <object-type name="QSwipeGesture" since="4.6"> <enum-type name="SwipeDirection"/> </object-type> <value-type name="QTileRules" since="4.6"/> - <object-type name="QTouchEvent" since="4.6"> - <enum-type name="DeviceType"/> - <value-type name="TouchPoint" since="4.6"/> - </object-type> - - <value-type name="QVector2D" since="4.6"> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code"> - <replace from="%REPR_FORMAT" to="%f, %f" /> - <replace from="%REPR_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code"> - <replace from="%REDUCE_FORMAT" to="dd" /> - <replace from="%REDUCE_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="toTuple" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="to_tuple"> - <replace from="%TT_FORMAT" to="dd" /> - <replace from="%TT_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" /> - </insert-template> - </inject-code> - </add-function> - - </value-type> - <value-type name="QVector3D" since="4.6"> - <extra-includes> - <include file-name="QMatrix4x4" location="global"/> - </extra-includes> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code"> - <replace from="%REPR_FORMAT" to="%f, %f, %f" /> - <replace from="%REPR_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z()" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code"> - <replace from="%REDUCE_FORMAT" to="ddd" /> - <replace from="%REDUCE_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z()" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="toTuple" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="to_tuple"> - <replace from="%TT_FORMAT" to="ddd" /> - <replace from="%TT_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z()" /> - </insert-template> - </inject-code> - </add-function> - - </value-type> - <value-type name="QVector4D" since="4.6"> - <extra-includes> - <include file-name="QMatrix4x4" location="global"/> - </extra-includes> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code"> - <replace from="%REPR_FORMAT" to="%f, %f, %f, %f" /> - <replace from="%REPR_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z(), %CPPSELF.w()" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code"> - <replace from="%REDUCE_FORMAT" to="dddd" /> - <replace from="%REDUCE_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z(), %CPPSELF.w()" /> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="toTuple" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="to_tuple"> - <replace from="%TT_FORMAT" to="dddd" /> - <replace from="%TT_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z(), %CPPSELF.w()" /> - </insert-template> - </inject-code> - </add-function> - </value-type> - <suppress-warning text="template baseclass 'QGenericMatrix<qreal>' of '*' is not known"/> <suppress-warning text="signature 'QApplication(int&,char**)' for function modification in 'QApplication' not found."/> <suppress-warning text="signature 'QApplication(int&,char**,bool)' for function modification in 'QApplication' not found."/> @@ -6987,104 +4238,6 @@ <suppress-warning text="class not found for setup inheritance 'QMimeSource'"/> <suppress-warning text="class 'QDropEvent' inherits from unknown base class 'QMimeSource'"/> - - <!-- 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="PrintDialogOptions"/> - <enum-type name="PrintRange"/> - <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> - </object-type> - - <object-type name="QGtkStyle"> - <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const"> - <modify-argument index="2"> - <replace-default-expression with="0"/> - </modify-argument> - <modify-argument index="3"> - <replace-default-expression with="0"/> - </modify-argument> - </modify-function> - </object-type> - - <object-type name="QPageSetupDialog"> - <enum-type name="PageSetupDialogOption" flags="PageSetupDialogOptions"/> - <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> - </object-type> - - <object-type name="QPrintDialog"> - <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> - </object-type> - <object-type name="QPrintEngine"> - <enum-type name="PrintEnginePropertyKey" /> - </object-type> - <value-type name="QPrinterInfo" /> - <rejection class="QPrinter" function-name="printerSelectionOption"/> - <rejection class="QPrinter" function-name="setPrinterSelectionOption"/> - - <object-type name="QPrinter" > - <enum-type name="ColorMode"/> - <enum-type name="DuplexMode"/> - <enum-type name="Orientation"/> - <enum-type name="OutputFormat"/> - <enum-type name="PageOrder"/> - <enum-type name="PageSize" /> - <enum-type name="PaperSource"/> - <enum-type name="PrintRange"/> - <enum-type name="PrinterMode"/> - <enum-type name="PrinterState"/> - <enum-type name="Unit"/> - <modify-function signature="getPageMargins(qreal*,qreal*,qreal*,qreal*,QPrinter::Unit)const"> - <modify-argument index="0"> - <replace-type modified-type="PyObject" /> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*,args"> - <replace from="$TYPE" to="qreal" /> - </insert-template> - </inject-code> - </modify-function> - <modify-function signature="setEngines(QPrintEngine*,QPaintEngine*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <extra-includes> - <include file-name="QPrinterInfo" location="global"/> - </extra-includes> - </object-type> - - <object-type name="QPrintPreviewDialog"/> - <object-type name="QPrintPreviewWidget"> - <enum-type name="ViewMode"/> - <enum-type name="ZoomMode"/> - <modify-function signature="print()" rename="print_" /> - </object-type> - - <object-type name="QSessionManager"> - <extra-includes> - </extra-includes> - <enum-type name="RestartHint"/> - <!-- ### "handle()const" is an internal method. --> - <modify-function signature="handle()const" remove="all"/> - <!-- ### --> - </object-type> - <object-type name="QSizeGrip"/> <object-type name="QSystemTrayIcon"> diff --git a/PySide/QtWidgets/typesystem_widgets_mac.xml b/PySide/QtWidgets/typesystem_widgets_mac.xml index 75565cb23..3749237f7 100644 --- a/PySide/QtWidgets/typesystem_widgets_mac.xml +++ b/PySide/QtWidgets/typesystem_widgets_mac.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide.QtWidgets"> <rejection class="*" function-name="qt_mac_set_cursor"/> <rejection class="*" function-name="macMenu"/> diff --git a/PySide/QtWidgets/typesystem_widgets_simulator.xml b/PySide/QtWidgets/typesystem_widgets_simulator.xml index da5eb2fa0..23f093cb0 100644 --- a/PySide/QtWidgets/typesystem_widgets_simulator.xml +++ b/PySide/QtWidgets/typesystem_widgets_simulator.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide.QtWidgets"> <!-- These classes are not present in Qt Simulator build, even though QT_NO_PRINTER is *not* set --> <rejection class="QAbstractPageSetupDialog"/> diff --git a/PySide/QtWidgets/typesystem_widgets_win.xml b/PySide/QtWidgets/typesystem_widgets_win.xml index a3d9b7328..2e030ab25 100644 --- a/PySide/QtWidgets/typesystem_widgets_win.xml +++ b/PySide/QtWidgets/typesystem_widgets_win.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide.QtWidgets"> <primitive-type name="WId" target-lang-api-name="PyObject"> <conversion-rule> <native-to-target> diff --git a/PySide/QtWidgets/typesystem_widgets_x11.xml b/PySide/QtWidgets/typesystem_widgets_x11.xml index 5d70c47ec..ca56332e7 100644 --- a/PySide/QtWidgets/typesystem_widgets_x11.xml +++ b/PySide/QtWidgets/typesystem_widgets_x11.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide.QtWidgets"> <rejection class="" function-name="qt_x11_getX11InfoForWindow"/> <rejection class="QX11Info" field-name="x11data"/> |