diff options
Diffstat (limited to 'siplib/tqtlib.c')
| -rw-r--r-- | siplib/tqtlib.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/siplib/tqtlib.c b/siplib/tqtlib.c index 702b679..7b8bb67 100644 --- a/siplib/tqtlib.c +++ b/siplib/tqtlib.c @@ -44,8 +44,8 @@ static void *newSignal(void *txrx, const char **sig); */ static void *findSignal(void *txrx, const char **sig) { - if (sipTQtSupport->qt_find_universal_signal != NULL) - txrx = sipTQtSupport->qt_find_universal_signal(txrx, sig); + if (sipTQtSupport->tqt_find_universal_signal != NULL) + txrx = sipTQtSupport->tqt_find_universal_signal(txrx, sig); return txrx; } @@ -58,8 +58,8 @@ static void *newSignal(void *txrx, const char **sig) { void *new_txrx = findSignal(txrx, sig); - if (new_txrx == NULL && sipTQtSupport->qt_create_universal_signal != NULL) - new_txrx = sipTQtSupport->qt_create_universal_signal(txrx, sig); + if (new_txrx == NULL && sipTQtSupport->tqt_create_universal_signal != NULL) + new_txrx = sipTQtSupport->tqt_create_universal_signal(txrx, sig); return new_txrx; } @@ -72,7 +72,7 @@ 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 = sipTQtSupport->qt_create_universal_slot(txSelf, sig, rxObj, slot, + void *us = sipTQtSupport->tqt_create_universal_slot(txSelf, sig, rxObj, slot, member, flags); if (us && txSelf) @@ -92,7 +92,7 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs) /* Keep some compilers quiet. */ oxtype = oxvalue = oxtb = NULL; - /* Fan out TQt signals. (Only PyTQt3 will do this.) */ + /* Fan out TQt signals. (Only PyTQt will do this.) */ if (slot->name != NULL && slot->name[0] != '\0') { assert(sipTQtSupport->tqt_emit_signal); @@ -309,7 +309,7 @@ int sip_api_same_slot(const sipSlot *sp, PyObject *rxObj, const char *slot) if (sp->name == NULL || sp->name[0] == '\0') return 0; - return (sipTQtSupport->qt_same_name(sp->name, slot) && sp->pyobj == rxObj); + return (sipTQtSupport->tqt_same_name(sp->name, slot) && sp->pyobj == rxObj); } /* See if they are pure Python methods. */ @@ -361,10 +361,10 @@ void *sipGetRx(sipSimpleWrapper *txSelf, const char *sigargs, PyObject *rxObj, } /* - * The slot was either a Python callable or PyTQt3 Python signal so there + * The slot was either a Python callable or PyTQt Python signal so there * should be a universal slot. */ - return sipTQtSupport->qt_find_slot(sip_api_get_address(txSelf), sigargs, rxObj, slot, memberp); + return sipTQtSupport->tqt_find_slot(sip_api_get_address(txSelf), sigargs, rxObj, slot, memberp); } @@ -424,15 +424,15 @@ PyObject *sip_api_connect_rx(PyObject *txObj, const char *sig, PyObject *rxObj, if ((rx = sip_api_convert_rx((sipWrapper *)txObj, sig, rxObj, slot, &member, 0)) == NULL) return NULL; - res = sipTQtSupport->qt_connect(tx, real_sig, rx, member, type); + res = sipTQtSupport->tqt_connect(tx, real_sig, rx, member, type); return PyBool_FromLong(res); } - /* Handle Python signals. Only PyTQt3 will get this far. */ - assert(sipTQtSupport->qt_connect_py_signal); + /* Handle Python signals. Only PyTQt will get this far. */ + assert(sipTQtSupport->tqt_connect_py_signal); - if (sipTQtSupport->qt_connect_py_signal(txObj, sig, rxObj, slot) < 0) + if (sipTQtSupport->tqt_connect_py_signal(txObj, sig, rxObj, slot) < 0) return NULL; Py_INCREF(Py_True); @@ -466,22 +466,22 @@ PyObject *sip_api_disconnect_rx(PyObject *txObj,const char *sig, /* Handle Python signals. */ tx = findSignal(tx, &sig); - res = sipTQtSupport->qt_disconnect(tx, sig, rx, member); + res = sipTQtSupport->tqt_disconnect(tx, sig, rx, member); /* * Delete it if it is a universal slot as this will be it's only * connection. If the slot is actually a universal signal then it * should leave it in place. */ - sipTQtSupport->qt_destroy_universal_slot(rx); + sipTQtSupport->tqt_destroy_universal_slot(rx); return PyBool_FromLong(res); } - /* Handle Python signals. Only PyTQt3 will get this far. */ - assert(sipTQtSupport->qt_disconnect_py_signal); + /* Handle Python signals. Only PyTQt will get this far. */ + assert(sipTQtSupport->tqt_disconnect_py_signal); - sipTQtSupport->qt_disconnect_py_signal(txObj, sig, rxObj, slot); + sipTQtSupport->tqt_disconnect_py_signal(txObj, sig, rxObj, slot); Py_INCREF(Py_True); return Py_True; |