diff options
author | Renato Filho <renato.filho@openbossa.org> | 2010-09-01 10:29:33 -0300 |
---|---|---|
committer | Renato Filho <renato.filho@openbossa.org> | 2010-09-01 16:48:32 -0300 |
commit | 589c40a6d60b59d90cec180bb54f8fe08a4bee17 (patch) | |
tree | 57bda69b4cfbdf87ca909004b7b5925de3c2b1ac | |
parent | 36a73c0ecd1d1a71a331663697e485e2fbece8b0 (diff) |
Fixed function modifications.
Fixes bug #336.
Reviewer: Hugo Parente Lima <hugo.pl@gmail.com>
Lauro Neto <lauro.neto@openbossa.org>
-rw-r--r-- | PySide/QtGui/glue/qapplication_init.cpp | 5 | ||||
-rw-r--r-- | PySide/QtGui/typesystem_gui_commom.xml | 139 |
2 files changed, 15 insertions, 129 deletions
diff --git a/PySide/QtGui/glue/qapplication_init.cpp b/PySide/QtGui/glue/qapplication_init.cpp index afbd3046f..699633a1d 100644 --- a/PySide/QtGui/glue/qapplication_init.cpp +++ b/PySide/QtGui/glue/qapplication_init.cpp @@ -4,8 +4,11 @@ extern PyObject* moduleQtGui; static int QApplicationArgCount; static char** QApplicationArgValues; static const char QAPP_MACRO[] = "qApp"; +static bool leavingPython = false; -void DeleteQApplicationAtExit() { +void DeleteQApplicationAtExit() +{ + leavingPython = true; PySide::SignalManager::instance().clear(); QCoreApplication* cpp = QApplication::instance(); if (cpp) { diff --git a/PySide/QtGui/typesystem_gui_commom.xml b/PySide/QtGui/typesystem_gui_commom.xml index 686fc5fd9..48bad7a7e 100644 --- a/PySide/QtGui/typesystem_gui_commom.xml +++ b/PySide/QtGui/typesystem_gui_commom.xml @@ -1485,17 +1485,8 @@ </modify-argument> </modify-function> </object-type> - <object-type name="QDoubleValidator"> - <modify-function signature="validate(QString &, int &)const"> - <modify-argument index="return"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_tuple_QValidator_QString_int"/> - </inject-code> - </modify-function> - </object-type> - <object-type name="QFileIconProvider"/> + <object-type name="QDoubleValidator" /> + <object-type name="QFileIconProvider" /> <object-type name="QWizard"> <modify-function signature="addPage(QWizardPage*)"> <modify-argument index="1"> @@ -2409,27 +2400,6 @@ <extra-includes> <include file-name="glue/qlayout_help_functions.h" location="local"/> </extra-includes> - - <modify-function signature="addItem(QLayoutItem *)"> - <inject-code class="target" position="beginning"> - addLayoutOwnership(%CPPSELF, %1); - </inject-code> - </modify-function> - - <modify-function signature="itemAt(int)const"> - <modify-argument index="return"> - <define-ownership owner="default"/> - </modify-argument> - <inject-code class="target" position="end"> - addLayoutOwnership(%CPPSELF, %0); - </inject-code> - </modify-function> - - <modify-function signature="addWidget(QWidget *)"> - <inject-code class="target" position="beginning"> - addLayoutOwnership(%CPPSELF, %1); - </inject-code> - </modify-function> <modify-function signature="insertWidget(int,QWidget*)"> <inject-code class="target" position="beginning"> addLayoutOwnership(%CPPSELF, %2); @@ -2440,33 +2410,20 @@ <object-type name="QBoxLayout"> <extra-includes> <include file-name="glue/qlayout_help_functions.h" location="local"/> - </extra-includes> - - <modify-function signature="itemAt(int)const"> - <modify-argument index="return"> - <define-ownership owner="default"/> - </modify-argument> - - <inject-code class="target" position="end"> - addLayoutOwnership(%CPPSELF, %0); - </inject-code> - </modify-function> + </extra-includes> <modify-function signature="addWidget(QWidget *, int, QFlags<Qt::AlignmentFlag>)"> <inject-code class="target" position="beginning"> addLayoutOwnership(%CPPSELF, %1); </inject-code> </modify-function> + <modify-function signature="addLayout(QLayout *, int)"> <inject-code class="target" position="beginning"> addLayoutOwnership(%CPPSELF, %1); </inject-code> </modify-function> - <modify-function signature="addItem(QLayoutItem *)"> - <inject-code class="target" position="beginning"> - addLayoutOwnership(%CPPSELF, %1); - </inject-code> - </modify-function> + <modify-function signature="insertWidget(int, QWidget *, int, QFlags<Qt::AlignmentFlag>)"> <inject-code class="target" position="beginning"> addLayoutOwnership(%CPPSELF, %2); @@ -2498,12 +2455,6 @@ <extra-includes> <include file-name="glue/qlayout_help_functions.h" location="local"/> </extra-includes> - - <modify-function signature="addWidget(QWidget *)"> - <inject-code class="target" position="beginning"> - addLayoutOwnership(%CPPSELF, %1); - </inject-code> - </modify-function> <modify-function signature="addWidget(QWidget *, int, int, QFlags<Qt::AlignmentFlag>)"> <modify-argument index="4"> <rename to="alignment"/> @@ -2550,17 +2501,6 @@ addLayoutOwnership(%CPPSELF, %1); </inject-code> </modify-function> - - <modify-function signature="itemAt(int)const"> - <modify-argument index="return"> - <define-ownership owner="default"/> - </modify-argument> - - <inject-code class="target" position="end"> - addLayoutOwnership(%CPPSELF, %0); - </inject-code> - </modify-function> - <modify-function signature="getItemPosition(int,int*,int*,int*,int*)" remove="all" /> </object-type> @@ -3491,22 +3431,6 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="fixup(QString &)const"> - <modify-argument index="return"> - <replace-type modified-type="QString"/> - </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_QString"/> - </inject-code> - </modify-function> - <modify-function signature="validate(QString &, int &)const"> - <modify-argument index="return"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_tuple_QValidator_QString_int"/> - </inject-code> - </modify-function> </object-type> <object-type name="QSortFilterProxyModel"> <modify-function signature="parent()const" remove="all"/> @@ -4039,43 +3963,9 @@ <include file-name="QTextCursor" location="global"/> </extra-includes> </object-type> - <object-type name="QSpinBox"> - <modify-function signature="fixup(QString &)const"> - <modify-argument index="return"> - <replace-type modified-type="QString"/> - </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_QString"/> - </inject-code> - </modify-function> - <modify-function signature="validate(QString &, int &)const"> - <modify-argument index="return"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_tuple_QValidator_QString_int"/> - </inject-code> - </modify-function> - </object-type> + <object-type name="QSpinBox"/> <object-type name="QTextBrowser"/> - <object-type name="QDoubleSpinBox"> - <modify-function signature="fixup(QString &)const"> - <modify-argument index="return"> - <replace-type modified-type="QString"/> - </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_QString"/> - </inject-code> - </modify-function> - <modify-function signature="validate(QString &, int &)const"> - <modify-argument index="return"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <inject-code class="target" position="end"> - <insert-template name="return_tuple_QValidator_QString_int"/> - </inject-code> - </modify-function> - </object-type> + <object-type name="QDoubleSpinBox"/> <object-type name="QButtonGroup"> <modify-function signature="addButton(QAbstractButton *)"> <modify-argument index="1"> @@ -4394,6 +4284,10 @@ </modify-function> </object-type> <object-type name="QFormLayout"> + <extra-includes> + <include file-name="glue/qlayout_help_functions.h" location="local"/> + </extra-includes> + <!-- FIXME: What to do with this function!? --> <modify-function signature="getLayoutPosition(QLayout*,int*,QFormLayout::ItemRole*)const" remove="all" /> <!-- FIXME: What to do with this function!? --> @@ -4483,16 +4377,6 @@ <modify-function signature="setItem(int,QFormLayout::ItemRole,QLayoutItem*)" remove="all"/> <!-- FIXME: Check what to do with this function! --> <modify-function signature="getItemPosition(int,int*,QFormLayout::ItemRole*)const" remove="all" /> - <modify-function signature="addItem(QLayoutItem*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="takeAt(int)"> - <modify-argument index="return"> - <parent index="this" action="remove"/> - </modify-argument> - </modify-function> </object-type> <object-type name="QGraphicsGridLayout" > <modify-function signature="addItem(QGraphicsLayoutItem*,int,int,QFlags<Qt::AlignmentFlag>)"> @@ -4820,7 +4704,6 @@ <suppress-warning text="signature 'addToolbar(QString)' for function modification in 'QMainWindow' not found."/> <suppress-warning text="namespace 'PySide.QtGui.QInputMethodEvent' for enum 'AttributeType' is not declared"/> <suppress-warning text="type 'QInputMethodEvent::Attribute' is specified in typesystem, but not defined."/> - <suppress-warning text="Shadowing: *"/> <suppress-warning text="unhandled enum value: ~FlagMask in QMessageBox::StandardButton"/> <suppress-warning text="unmatched enum ~FlagMask"/> <suppress-warning text="Argument 1 on function 'QTabWidget::setUpLayout(bool)' has default expressiont but does not have name."/> |