diff options
author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-10-11 17:45:43 +0200 |
---|---|---|
committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-22 17:00:11 +0000 |
commit | a57a202a70801f766094c3ed11664b03c9a6a3e4 (patch) | |
tree | 73c2c1f4fc902ccbc10b73811bbf299a2c555728 /sources/pyside2/PySide2/QtDataVisualization | |
parent | f93a7369657814206bfbce49817c8fbd9a1bfcba (diff) |
Move inject-code snippets to separate files
When code must be modified or added to certain
functions, we currently have two options:
* Write a template and include it into the typesystem,
* inject code directly at a certain place of the function entry.
The problem with injecting raw code is that since it is an XML
file, one need to escape protected symbols, like "<" and "&".
Thanks to a couple of complementary commits, now we can place
this code snippets on a separate file without triggering
a whole module compiling process, since the typesystem itself
will not be alterered.
All the injected code from the typesystem was removed
and placed into a single file per module inside a top-level directory
called glue.
Some small fixes were included mainly regarding styling
of the code.
Task-number: PYSIDE-834
Change-Id: I823e92d241a528d75d5940090008db9bf297f49e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtDataVisualization')
-rw-r--r-- | sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml index d2018ffca..2777f5519 100644 --- a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml +++ b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml @@ -73,7 +73,7 @@ result.append(row); } </template> - <load-typesystem name="QtGui/typesystem_gui.xml" generate="no" /> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> <namespace-type name="QtDataVisualization"> <primitive-type name="QBarDataArray"> <include file-name="qbardataproxy.h" location="global"/> @@ -313,9 +313,7 @@ <modify-argument index="1"> <reference-count action="set"/> </modify-argument> - <inject-code> - Shiboken::Object::releaseOwnership(%PYARG_1); - </inject-code> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> </modify-function> <modify-function signature="setColumnAxis(QtDataVisualization::QCategory3DAxis*)"> <modify-argument index="1"> @@ -343,9 +341,7 @@ <modify-argument index="1"> <reference-count action="set"/> </modify-argument> - <inject-code> - Shiboken::Object::releaseOwnership(%PYARG_1); - </inject-code> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> </modify-function> <modify-function signature="setAxisX(QtDataVisualization::QValue3DAxis*)"> <modify-argument index="1"> @@ -374,9 +370,7 @@ <modify-argument index="1"> <reference-count action="set"/> </modify-argument> - <inject-code> - Shiboken::Object::releaseOwnership(%PYARG_1); - </inject-code> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> </modify-function> <modify-function signature="setAxisX(QtDataVisualization::QValue3DAxis*)"> <modify-argument index="1"> @@ -418,25 +412,19 @@ <modify-argument index="1"> <reference-count action="set"/> </modify-argument> - <inject-code> - Shiboken::Object::releaseOwnership(%PYARG_1); - </inject-code> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> </modify-function> <modify-function signature="releaseInputHandler(QtDataVisualization::QAbstract3DInputHandler*)"> <modify-argument index="1"> <reference-count action="set"/> </modify-argument> - <inject-code> - Shiboken::Object::releaseOwnership(%PYARG_1); - </inject-code> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> </modify-function> <modify-function signature="releaseTheme(QtDataVisualization::Q3DTheme*)"> <modify-argument index="1"> <reference-count action="set"/> </modify-argument> - <inject-code> - Shiboken::Object::releaseOwnership(%PYARG_1); - </inject-code> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> </modify-function> <modify-function signature="setActiveInputHandler(QtDataVisualization::QAbstract3DInputHandler*)"> <modify-argument index="1"> |