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/QtSql | |
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/QtSql')
-rw-r--r-- | sources/pyside2/PySide2/QtSql/typesystem_sql.xml | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml index 3eab73307..c8a56a213 100644 --- a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml +++ b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml @@ -65,12 +65,12 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> - <modify-function signature="exec(QString)const" rename="exec_" allow-thread="yes" /> - <modify-function signature="open()" allow-thread="yes" /> - <modify-function signature="open(const QString&, const QString&)" allow-thread="yes" /> - <modify-function signature="commit()" allow-thread="yes" /> - <modify-function signature="rollback()" allow-thread="yes" /> - <modify-function signature="transaction()" allow-thread="yes" /> + <modify-function signature="exec(QString)const" rename="exec_" allow-thread="yes"/> + <modify-function signature="open()" allow-thread="yes"/> + <modify-function signature="open(const QString&, const QString&)" allow-thread="yes"/> + <modify-function signature="commit()" allow-thread="yes"/> + <modify-function signature="rollback()" allow-thread="yes"/> + <modify-function signature="transaction()" allow-thread="yes"/> <modify-function signature="registerSqlDriver(const QString&,QSqlDriverCreatorBase*)"> <modify-argument index="2"> <define-ownership owner="c++"/> @@ -86,15 +86,15 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> - <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> - <modify-function signature="exec(const QString&)" rename="exec_" allow-thread="yes" /> - <modify-function signature="prepare(const QString&)" allow-thread="yes" /> - <modify-function signature="clear()" allow-thread="yes" /> - <modify-function signature="last()" allow-thread="yes" /> - <modify-function signature="first()" allow-thread="yes" /> - <modify-function signature="previous()" allow-thread="yes" /> - <modify-function signature="next()" allow-thread="yes" /> - <modify-function signature="seek(int,bool)" allow-thread="yes" /> + <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> + <modify-function signature="exec(const QString&)" rename="exec_" allow-thread="yes"/> + <modify-function signature="prepare(const QString&)" allow-thread="yes"/> + <modify-function signature="clear()" allow-thread="yes"/> + <modify-function signature="last()" allow-thread="yes"/> + <modify-function signature="first()" allow-thread="yes"/> + <modify-function signature="previous()" allow-thread="yes"/> + <modify-function signature="next()" allow-thread="yes"/> + <modify-function signature="seek(int,bool)" allow-thread="yes"/> </value-type> <value-type name="QSqlRecord"> @@ -107,7 +107,7 @@ <enum-type name="ErrorType"/> </value-type> - <value-type name="QSqlIndex" /> + <value-type name="QSqlIndex"/> <value-type name="QSqlRelation"/> @@ -118,10 +118,10 @@ </value-type> <object-type name="QSqlDriver"> - <enum-type name="DbmsType" /> + <enum-type name="DbmsType"/> <enum-type name="DriverFeature"/> <enum-type name="IdentifierType"/> - <enum-type name="NotificationSource" /> + <enum-type name="NotificationSource"/> <enum-type name="StatementType"/> <extra-includes> <include file-name="QSqlQuery" location="global"/> @@ -131,10 +131,10 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> - <modify-function signature="beginTransaction()" allow-thread="yes" /> - <modify-function signature="commitTransaction()" allow-thread="yes" /> - <modify-function signature="rollbackTransaction()" allow-thread="yes" /> - <modify-function signature="open(const QString&,const QString&,const QString&,const QString&,int,const QString&)" allow-thread="yes" /> + <modify-function signature="beginTransaction()" allow-thread="yes"/> + <modify-function signature="commitTransaction()" allow-thread="yes"/> + <modify-function signature="rollbackTransaction()" allow-thread="yes"/> + <modify-function signature="open(const QString&,const QString&,const QString&,const QString&,int,const QString&)" allow-thread="yes"/> <!-- ### This is too low level for Python, and pointer would be useless for the Python programmer --> <modify-function signature="handle()const" remove="all"/> <!-- ### --> @@ -150,7 +150,7 @@ </extra-includes> </object-type> <object-type name="QSqlRelationalTableModel"> - <enum-type name="JoinMode" /> + <enum-type name="JoinMode"/> <extra-includes> <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> @@ -167,15 +167,15 @@ <include file-name="QSize" location="global"/> </extra-includes> <!-- ### This isn't part of Qt public API --> - <modify-function signature="virtual_hook(int,void*)" remove="all" /> + <modify-function signature="virtual_hook(int,void*)" remove="all"/> <!-- ### --> - <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> - <modify-function signature="fetchLast()" allow-thread="yes" /> - <modify-function signature="fetchFirst()" allow-thread="yes" /> - <modify-function signature="fetchNext()" allow-thread="yes" /> - <modify-function signature="fetchPrevious()" allow-thread="yes" /> - <modify-function signature="fetch(int)" allow-thread="yes" /> - <modify-function signature="prepare(QString)" allow-thread="yes" /> + <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> + <modify-function signature="fetchLast()" allow-thread="yes"/> + <modify-function signature="fetchFirst()" allow-thread="yes"/> + <modify-function signature="fetchNext()" allow-thread="yes"/> + <modify-function signature="fetchPrevious()" allow-thread="yes"/> + <modify-function signature="fetch(int)" allow-thread="yes"/> + <modify-function signature="prepare(QString)" allow-thread="yes"/> </object-type> <object-type name="QSqlTableModel"> <enum-type name="EditStrategy"/> |