Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 03:20:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update sip to version 4.14.7

Browse Source
This commit is contained in:
Robin Dunn
2015-03-05 15:37:36 -08:00
parent 4d5810d5c1
commit cd377cdfe0
10 changed files with 225 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sip/siplib/qtlib.c
View File

@@ -72,7 +72,11 @@ static void *newSignal(void *txrx, const char **sig)
static void *createUniversalSlot(sipWrapper *txSelf, const char *sig,
PyObject *rxObj, const char *slot, const char **member, int flags)
{
void *us = sipQtSupport->qt_create_universal_slot(txSelf, sig, rxObj, slot,
void *us;
assert(sipQtSupport->qt_create_universal_slot);
us = sipQtSupport->qt_create_universal_slot(txSelf, sig, rxObj, slot,
member, flags);
if (us && txSelf)
@@ -89,6 +93,8 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs)
{
PyObject *sa, *oxtype, *oxvalue, *oxtb, *sfunc, *sref;
assert(sipQtSupport);
/* Keep some compilers quiet. */
oxtype = oxvalue = oxtb = NULL;
@@ -301,6 +307,9 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs)
*/
int sip_api_same_slot(const sipSlot *sp, PyObject *rxObj, const char *slot)
{
assert(sipQtSupport);
assert(sipQtSupport->qt_same_name);
/* See if they are signals or Qt slots, ie. they have a name. */
if (slot != NULL)
{
@@ -345,6 +354,9 @@ int sip_api_same_slot(const sipSlot *sp, PyObject *rxObj, const char *slot)
void *sipGetRx(sipSimpleWrapper *txSelf, const char *sigargs, PyObject *rxObj,
const char *slot, const char **memberp)
{
assert(sipQtSupport);
assert(sipQtSupport->qt_find_slot);
if (slot != NULL)
if (isQtSlot(slot) || isQtSignal(slot))
{
@@ -377,6 +389,8 @@ void *sipGetRx(sipSimpleWrapper *txSelf, const char *sigargs, PyObject *rxObj,
void *sip_api_convert_rx(sipWrapper *txSelf, const char *sigargs,
PyObject *rxObj, const char *slot, const char **memberp, int flags)
{
assert(sipQtSupport);
if (slot == NULL)
return createUniversalSlot(txSelf, sigargs, rxObj, NULL, memberp, flags);
@@ -407,6 +421,9 @@ void *sip_api_convert_rx(sipWrapper *txSelf, const char *sigargs,
PyObject *sip_api_connect_rx(PyObject *txObj, const char *sig, PyObject *rxObj,
const char *slot, int type)
{
assert(sipQtSupport);
assert(sipQtSupport->qt_connect);
/* Handle Qt signals. */
if (isQtSignal(sig))
{
@@ -447,6 +464,10 @@ PyObject *sip_api_connect_rx(PyObject *txObj, const char *sig, PyObject *rxObj,
PyObject *sip_api_disconnect_rx(PyObject *txObj,const char *sig,
PyObject *rxObj,const char *slot)
{
assert(sipQtSupport);
assert(sipQtSupport->qt_disconnect);
assert(sipQtSupport->qt_destroy_universal_slot);
/* Handle Qt signals. */
if (isQtSignal(sig))
{
@@ -494,6 +515,8 @@ PyObject *sip_api_disconnect_rx(PyObject *txObj,const char *sig,
*/
void sip_api_free_sipslot(sipSlot *slot)
{
assert(sipQtSupport);
if (slot->name != NULL)
{
sip_api_free(slot->name);
@@ -529,6 +552,8 @@ static char *sipStrdup(const char *s)
*/
int sip_api_save_slot(sipSlot *sp, PyObject *rxObj, const char *slot)
{
assert(sipQtSupport);
sp -> weakSlot = NULL;
if (slot == NULL)