diff options
author | Renato Filho <renato.filho@openbossa.org> | 2010-08-16 18:22:56 -0300 |
---|---|---|
committer | Renato Filho <renato.filho@openbossa.org> | 2010-08-16 19:05:11 -0300 |
commit | d686c687074708af1654131f603b767d52f611e6 (patch) | |
tree | f80460b2dc6ac5a1a145777991515fe31110af0d | |
parent | aedea32f131a553a9db0670cd89c43d171244951 (diff) |
Fixed gui typesystem to avoid warnings.
Reviewer: Hugo Parente <hugo.lima@openbossa.org>
Luciano Wolf <luciano.wolf@openbossa.org>
-rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 41 | ||||
-rw-r--r-- | libpyside/qsignal.cpp | 9 |
2 files changed, 6 insertions, 44 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 326d830db..111096488 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -547,18 +547,13 @@ <modify-function signature="operator&=(QRegion)" remove="all"/> <modify-function signature="eor(QRegion)const" remove="all"/> <!--### Obsolete in 4.3--> - <modify-function signature="intersect(QRegion)const" remove="all"/> - <!--### Obsolete in 4.3--> <modify-function signature="subtract(QRegion)const" remove="all"/> - <!--### Obsolete in 4.3--> <modify-function signature="unite(QRegion)const" remove="all"/> - <!--### Obsolete in 4.3--> <modify-function signature="operator&=(QRect)" remove="all"/> <modify-function signature="operator+=(QRect)" remove="all"/> - <modify-function signature="intersect(QRegion)" remove="all" /> - <!--### Obsolete in 4.x--> - <modify-function signature="intersect(QRect)" remove="all" /> <!--### Obsolete in 4.x--> + <modify-function signature="intersect(QRect)const" remove="all" /> + <modify-function signature="intersect(QRegion)const" remove="all" /> </value-type> <value-type name="QTextBlock" /> <value-type name="QTextBlockFormat" /> @@ -4241,36 +4236,6 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="QAction(const QString&, QObject*)" access="private" /> - <add-function signature="QAction(const QString&, QObject*, const QKeySequence&, PyObject*)"> - - <!-- NOT use this for now Fix bug #??? - <modify-argument index="2"> - <replace-default-expression with="0"/> - <rename to="parent"/> - </modify-argument> - --> - - <modify-argument index="3"> - <replace-default-expression with="QKeySequence()"/> - <rename to="shortcut"/> - </modify-argument> - - <modify-argument index="4"> - <replace-default-expression with="0"/> - <rename to="triggered"/> - </modify-argument> - - <inject-code class="target" position="beginning"> - %0 = new %TYPE(%1, %2); - %0->setShortcut(%3); - </inject-code> - - <inject-code class="target" position="end"> - if (%PYARG_4 && %PYARG_4 != Py_None) - Shiboken::AutoDecRef result(PyObject_CallMethod(%PYSELF, "connect", "OsO", %PYSELF, SIGNAL(triggered(bool)), %PYARG_4)); - </inject-code> - </add-function> </object-type> <object-type name="QPainter"> <extra-includes> @@ -4857,4 +4822,6 @@ <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."/> + + <suppress-warning text="type 'QGtkStyle' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> </typesystem> diff --git a/libpyside/qsignal.cpp b/libpyside/qsignal.cpp index c6a824074..f465a7b9b 100644 --- a/libpyside/qsignal.cpp +++ b/libpyside/qsignal.cpp @@ -460,14 +460,9 @@ bool signal_connect(PyObject* source, const char* signal, PyObject* callback) if (pyMethod.isNull()) return false; - Shiboken::AutoDecRef pyArgs(PyList_New(0)); Shiboken::AutoDecRef pySignature(PyString_FromString(signal)); - PyList_Append(pyArgs, source); - PyList_Append(pyArgs, pySignature); - PyList_Append(pyArgs, callback); - Shiboken::AutoDecRef tupleArgs(PyList_AsTuple(pyArgs)); - - return PyObject_CallObject(pyMethod, tupleArgs); + Shiboken::AutoDecRef pyArgs(PyTuple_Pack(3, source, pySignature.object(), callback)); + return PyObject_CallObject(pyMethod, pyArgs); } PyObject* signal_instance_disconnect(PyObject* self, PyObject* args) |