diff options
| author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-29 10:29:34 +0100 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-30 08:08:06 +0000 |
| commit | 81e7fd946f172df3e567a6caef463b559505b106 (patch) | |
| tree | 1690da23470e3652a0ce5dfd0f95fa0de48b6050 /sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | |
| parent | eb84213e9cd16abd8f9eeed465e14c8f9181b7b6 (diff) | |
Move old glue code to snippets files
Most of the old glue code was directly injected into
the typesystem, so it was possible to add them
as snippets.
There are still a couple of header files that will remain
there, because the include tag does not have the file/snippet
tags.
A few lines of code were modified in favor of "modern" C++,
and good practices.
Task-number: PYSIDE-834
Change-Id: I3072298b16d7280550c6a7f6abae045250663ba6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index ca9a56c6e..25f5c3e65 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -1607,7 +1607,7 @@ </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-connect-3"/> </modify-function> - <inject-code class="native" position="beginning" file="glue/qobject_connect.cpp"/> + <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-connect"/> <add-function signature="connect(const QObject*,const char*,PyCallable*,Qt::ConnectionType)" return-type="bool" static="yes"> <modify-argument index="4"> <rename to="type"/> @@ -1642,7 +1642,7 @@ </add-function> - <inject-code class="native" file="glue/qobject_findchild.cpp"/> + <inject-code class="native" file="../glue/qtcore.cpp" snippet="qobject-findchild-1"/> <add-function signature="findChild(PyTypeObject*,const QString&)" return-type="PyObject*"> <inject-documentation format="target" mode="append"> To find the child of a certain QObject, the first argument of this function should be the child's type, and the second the name of the child: @@ -1657,7 +1657,7 @@ child2 = parent.findChild(QWidget, "child_widget") </inject-documentation> - <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-findchild"/> + <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-findchild-2"/> <modify-argument index="return"> <parent index="this" action="add"/> </modify-argument> @@ -1961,7 +1961,7 @@ <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qbytearray-3"/> </add-function> <!-- buffer protocol --> - <inject-code class="native" position="beginning" file="glue/qbytearray_bufferprotocol.cpp"/> + <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="qbytearray-bufferprotocol"/> <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="qbytearray-py3"/> <modify-function signature="data()"> @@ -2114,13 +2114,13 @@ <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qbytearray-getitem"/> </add-function> <add-function signature="__mgetitem__"> - <inject-code class="target" position="beginning" file="glue/qbytearray_mgetitem.cpp"/> + <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qbytearray-mgetitem"/> </add-function> <add-function signature="__setitem__"> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qbytearray-setitem"/> </add-function> <add-function signature="__msetitem__"> - <inject-code class="target" position="beginning" file="glue/qbytearray_msetitem.cpp"/> + <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qbytearray-msetitem"/> </add-function> </value-type> <value-type name="QTextBoundaryFinder"> @@ -2515,7 +2515,7 @@ <modify-argument index="2" invalidate-after-use="yes"/> </modify-function> <modify-function signature="QCoreApplication(int &,char **,int)" access="private"/> - <inject-code class="native" file="glue/qcoreapplication_init.cpp" position="beginning"/> + <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="qcoreapplication-init"/> <modify-function signature="postEvent(QObject*,QEvent*,int)"> <modify-argument index="2"> <define-ownership owner="c++"/> |