diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-04-06 19:49:37 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:54:07 -0300 |
| commit | 00f0ea88cfd1020ff3765597ca9525eb73a783b2 (patch) | |
| tree | 76552abdc5711e8e84a8212529663155c5df6bdd /PySide | |
| parent | 4b1986f9179293103d14edcefec80571f92db227 (diff) | |
Merged fix_int*... and fix_qreal*... type system templates.
Also modified the method call to be friendlier with virtual methods.
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 36 | ||||
| -rw-r--r-- | PySide/typesystem_templates.xml | 14 |
2 files changed, 30 insertions, 20 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 70535e664..fa819f583 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -1029,7 +1029,9 @@ <remove-default-expression/> </modify-argument> <inject-code class="target" position="beginning"> - <insert-template name="fix_int*,int*,int*,int*"/> + <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"> @@ -1050,7 +1052,9 @@ <remove-default-expression/> </modify-argument> <inject-code class="target" position="beginning"> - <insert-template name="fix_qreal*,qreal*,qreal*,qreal*"/> + <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"> @@ -1071,7 +1075,9 @@ <remove-default-expression/> </modify-argument> <inject-code class="target" position="beginning"> - <insert-template name="fix_int*,int*,int*,int*"/> + <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"> @@ -1092,7 +1098,9 @@ <remove-default-expression/> </modify-argument> <inject-code class="target" position="beginning"> - <insert-template name="fix_qreal*,qreal*,qreal*,qreal*"/> + <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"> @@ -1113,7 +1121,9 @@ <remove-default-expression/> </modify-argument> <inject-code class="target" position="beginning"> - <insert-template name="fix_int*,int*,int*,int*"/> + <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"> @@ -1134,7 +1144,9 @@ <remove-default-expression/> </modify-argument> <inject-code class="target" position="beginning"> - <insert-template name="fix_qreal*,qreal*,qreal*,qreal*"/> + <insert-template name="fix_number*,number*,number*,number*"> + <replace from="$TYPE" to="qreal" /> + </insert-template> </inject-code> </modify-function> <!--### Obsolete in 4.3--> @@ -4531,7 +4543,9 @@ <remove-argument/> </modify-argument> <inject-code class="target" position="beginning"> - <insert-template name="fix_int*,int*,int*,int*"/> + <insert-template name="fix_number*,number*,number*,number*"> + <replace from="$TYPE" to="int" /> + </insert-template> </inject-code> </modify-function> </object-type> @@ -5203,7 +5217,9 @@ </modify-argument> <inject-code class="target" position="beginning"> - <insert-template name="fix_qreal*,qreal*,qreal*,qreal*"/> + <insert-template name="fix_number*,number*,number*,number*"> + <replace from="$TYPE" to="qreal" /> + </insert-template> </inject-code> </modify-function> <modify-function signature="getWindowFrameMargins(qreal*,qreal*,qreal*,qreal*)const"> @@ -5224,7 +5240,9 @@ </modify-argument> <inject-code class="target" position="beginning"> - <insert-template name="fix_qreal*,qreal*,qreal*,qreal*"/> + <insert-template name="fix_number*,number*,number*,number*"> + <replace from="$TYPE" to="qreal" /> + </insert-template> </inject-code> </modify-function> <!-- a QObject so main-thread delete redundant --> diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml index 9ef317d55..e42193e74 100644 --- a/PySide/typesystem_templates.xml +++ b/PySide/typesystem_templates.xml @@ -142,18 +142,10 @@ %PYARG_0 = Shiboken::makeTuple(retval_, val_); </template> - <template name="fix_int*,int*,int*,int*"> - int a, b, c, d; + <template name="fix_number*,number*,number*,number*"> + $TYPE a, b, c, d; PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS - %CPPSELF.%FUNCTION_NAME(&a, &b, &c, &d); - PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS - %PYARG_0 = Shiboken::makeTuple(a, b, c, d); - </template> - - <template name="fix_qreal*,qreal*,qreal*,qreal*"> - qreal a, b, c, d; - PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS - %CPPSELF.%FUNCTION_NAME(&a, &b, &c, &d); + %CPPSELF->::%TYPE::%FUNCTION_NAME(&a, &b, &c, &d); PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS %PYARG_0 = Shiboken::makeTuple(a, b, c, d); </template> |