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/QtPrintSupport | |
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/QtPrintSupport')
-rw-r--r-- | sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml b/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml index b6111a0e6..f85aadc79 100644 --- a/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml +++ b/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml @@ -40,24 +40,24 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtPrintSupport"> - <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" /> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> <object-type name="QPageSetupDialog"> <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> </object-type> <object-type name="QAbstractPrintDialog"> - <enum-type name="PrintDialogOption" flags="PrintDialogOptions" /> - <enum-type name="PrintRange" /> + <enum-type name="PrintDialogOption" flags="PrintDialogOptions"/> + <enum-type name="PrintRange"/> </object-type> <object-type name="QPrintDialog"> - <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> + <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> </object-type> <object-type name="QPrintEngine"> - <enum-type name="PrintEnginePropertyKey" /> + <enum-type name="PrintEnginePropertyKey"/> </object-type> - <value-type name="QPrinterInfo" /> + <value-type name="QPrinterInfo"/> <rejection class="QPrinter" function-name="printerSelectionOption"/> <rejection class="QPrinter" function-name="setPrinterSelectionOption"/> @@ -74,7 +74,7 @@ <enum-type name="Unit"/> <modify-function signature="getPageMargins(qreal*,qreal*,qreal*,qreal*,QPrinter::Unit)const"> <modify-argument index="0"> - <replace-type modified-type="PyObject" /> + <replace-type modified-type="PyObject"/> </modify-argument> <modify-argument index="1"> <remove-argument/> @@ -90,7 +90,7 @@ </modify-argument> <inject-code class="target" position="beginning"> <insert-template name="fix_number*,number*,number*,number*,args"> - <replace from="$TYPE" to="qreal" /> + <replace from="$TYPE" to="qreal"/> </insert-template> </inject-code> </modify-function> @@ -111,7 +111,7 @@ <object-type name="QPrintPreviewWidget"> <enum-type name="ViewMode"/> <enum-type name="ZoomMode"/> - <modify-function signature="print()" rename="print_" /> + <modify-function signature="print()" rename="print_"/> </object-type> </typesystem> |