summaryrefslogtreecommitdiffstats
path: root/siplib/siplib.c
diff options
context:
space:
mode:
Diffstat (limited to 'siplib/siplib.c')
-rw-r--r--siplib/siplib.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/siplib/siplib.c b/siplib/siplib.c
index ea9bbd1..d90970c 100644
--- a/siplib/siplib.c
+++ b/siplib/siplib.c
@@ -1221,7 +1221,7 @@ static int sip_api_export_module(sipExportedModuleDef *client,
}
/* Only one module can claim to wrap TQObject. */
- if (em->em_qt_api != NULL && client->em_qt_api != NULL)
+ if (em->em_tqt_api != NULL && client->em_tqt_api != NULL)
{
PyErr_Format(PyExc_RuntimeError,
"the %s and %s modules both wrap the TQObject class",
@@ -1369,10 +1369,10 @@ static int sip_api_init_module(sipExportedModuleDef *client,
}
/* Set any TQt support API. */
- if (client->em_qt_api != NULL)
+ if (client->em_tqt_api != NULL)
{
- sipTQtSupport = client->em_qt_api;
- sipTQObjectType = *sipTQtSupport->qt_qobject;
+ sipTQtSupport = client->em_tqt_api;
+ sipTQObjectType = *sipTQtSupport->tqt_tqobject;
}
/* Append any initialiser extenders to the relevant classes. */
@@ -7045,7 +7045,7 @@ void *sip_api_get_address(sipSimpleWrapper *sw)
/*
* Get the C/C++ pointer for a complex object. Note that not casting the C++
- * pointer is a bug. However this is only ever called by PyTQt3 signal emitter
+ * pointer is a bug. However this is only ever called by PyTQt signal emitter
* code and PyTQt doesn't contain anything that multiply inherits from TQObject.
*/
static void *sip_api_get_complex_cpp_ptr(sipSimpleWrapper *sw)
@@ -8778,7 +8778,7 @@ static int sipWrapper_clear(sipWrapper *self)
sipSlot *slot;
void *context = NULL;
- while ((slot = sipTQtSupport->qt_find_sipslot(tx, &context)) != NULL)
+ while ((slot = sipTQtSupport->tqt_find_sipslot(tx, &context)) != NULL)
{
sip_api_clear_any_slot_reference(slot);
@@ -8846,7 +8846,7 @@ static int sipWrapper_traverse(sipWrapper *self, visitproc visit, void *arg)
sipSlot *slot;
void *context = NULL;
- while ((slot = sipTQtSupport->qt_find_sipslot(tx, &context)) != NULL)
+ while ((slot = sipTQtSupport->tqt_find_sipslot(tx, &context)) != NULL)
{
if ((vret = sip_api_visit_slot(slot, visit, arg)) != 0)
return vret;
@@ -9297,7 +9297,7 @@ static void *sip_api_import_symbol(const char *name)
/*
* Visit a slot connected to an object for the cyclic garbage collector. This
- * is only called externally by PyTQt3.
+ * is only called externally by PyTQt.
*/
static int sip_api_visit_slot(sipSlot *slot, visitproc visit, void *arg)
{
@@ -9311,7 +9311,7 @@ static int sip_api_visit_slot(sipSlot *slot, visitproc visit, void *arg)
/*
* Clear a slot if it has an extra reference to keep it alive. This is only
- * called externally by PyTQt3.
+ * called externally by PyTQt.
*/
static void sip_api_clear_any_slot_reference(sipSlot *slot)
{