|
|
|
@ -1050,8 +1050,8 @@ enum pytqt3SigArgType {
|
|
|
|
classp_sat,
|
|
|
|
classp_sat,
|
|
|
|
mtype_sat,
|
|
|
|
mtype_sat,
|
|
|
|
mtypep_sat,
|
|
|
|
mtypep_sat,
|
|
|
|
qvariant_sat,
|
|
|
|
tqvariant_sat,
|
|
|
|
qvariantp_sat,
|
|
|
|
tqvariantp_sat,
|
|
|
|
pyobject_sat,
|
|
|
|
pyobject_sat,
|
|
|
|
schar_sat,
|
|
|
|
schar_sat,
|
|
|
|
sstring_sat,
|
|
|
|
sstring_sat,
|
|
|
|
@ -1223,14 +1223,14 @@ TQMetaObject *UniversalSlot::staticMetaObject()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool UniversalSlot::tqt_invoke(int id, TQUObject *qargs)
|
|
|
|
bool UniversalSlot::tqt_invoke(int id, TQUObject *tqargs)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (id - staticMetaObject()->slotOffset() != 0)
|
|
|
|
if (id - staticMetaObject()->slotOffset() != 0)
|
|
|
|
return TQObject::tqt_invoke(id, qargs);
|
|
|
|
return TQObject::tqt_invoke(id, tqargs);
|
|
|
|
|
|
|
|
|
|
|
|
bool ok = TRUE;
|
|
|
|
bool ok = TRUE;
|
|
|
|
const pytqt3Signature *psig = conn.sc_signature;
|
|
|
|
const pytqt3Signature *psig = conn.sc_signature;
|
|
|
|
TQVariant *qv;
|
|
|
|
TQVariant *tqv;
|
|
|
|
|
|
|
|
|
|
|
|
// Save in case it is asked for later.
|
|
|
|
// Save in case it is asked for later.
|
|
|
|
lastSender = const_cast<TQObject *>(sender());
|
|
|
|
lastSender = const_cast<TQObject *>(sender());
|
|
|
|
@ -1239,9 +1239,9 @@ bool UniversalSlot::tqt_invoke(int id, TQUObject *qargs)
|
|
|
|
// in a TQVariant instance. At the moment we handle int argument as
|
|
|
|
// in a TQVariant instance. At the moment we handle int argument as
|
|
|
|
// that is all that is needed by PyTQt (and PyKDE).
|
|
|
|
// that is all that is needed by PyTQt (and PyKDE).
|
|
|
|
if (lastSender->inherits("TQSignal"))
|
|
|
|
if (lastSender->inherits("TQSignal"))
|
|
|
|
qv = &static_QUType_TQVariant.get(qargs + 1);
|
|
|
|
tqv = &static_QUType_TQVariant.get(tqargs + 1);
|
|
|
|
else
|
|
|
|
else
|
|
|
|
qv = 0;
|
|
|
|
tqv = 0;
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef WITH_THREAD
|
|
|
|
#ifdef WITH_THREAD
|
|
|
|
PyGILState_STATE state = PyGILState_Ensure();
|
|
|
|
PyGILState_STATE state = PyGILState_Ensure();
|
|
|
|
@ -1257,94 +1257,94 @@ bool UniversalSlot::tqt_invoke(int id, TQUObject *qargs)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
PyObject *arg;
|
|
|
|
PyObject *arg;
|
|
|
|
|
|
|
|
|
|
|
|
++qargs;
|
|
|
|
++tqargs;
|
|
|
|
|
|
|
|
|
|
|
|
switch (psig->sg_args[a].atype)
|
|
|
|
switch (psig->sg_args[a].atype)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
case char_sat:
|
|
|
|
case char_sat:
|
|
|
|
case schar_sat:
|
|
|
|
case schar_sat:
|
|
|
|
case uchar_sat:
|
|
|
|
case uchar_sat:
|
|
|
|
arg = PyBytes_FromStringAndSize((char *)static_QUType_ptr.get(qargs), 1);
|
|
|
|
arg = PyBytes_FromStringAndSize((char *)static_QUType_ptr.get(tqargs), 1);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case string_sat:
|
|
|
|
case string_sat:
|
|
|
|
case sstring_sat:
|
|
|
|
case sstring_sat:
|
|
|
|
case ustring_sat:
|
|
|
|
case ustring_sat:
|
|
|
|
arg = PyBytes_FromString((char *)static_QUType_ptr.get(qargs));
|
|
|
|
arg = PyBytes_FromString((char *)static_QUType_ptr.get(tqargs));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case short_sat:
|
|
|
|
case short_sat:
|
|
|
|
arg = PyLong_FromLong(*(short *)static_QUType_ptr.get(qargs));
|
|
|
|
arg = PyLong_FromLong(*(short *)static_QUType_ptr.get(tqargs));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case ushort_sat:
|
|
|
|
case ushort_sat:
|
|
|
|
arg = PyLong_FromUnsignedLong(*(unsigned short *)static_QUType_ptr.get(qargs));
|
|
|
|
arg = PyLong_FromUnsignedLong(*(unsigned short *)static_QUType_ptr.get(tqargs));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case int_sat:
|
|
|
|
case int_sat:
|
|
|
|
if (qv)
|
|
|
|
if (tqv)
|
|
|
|
arg = PyLong_FromLong(qv -> asInt());
|
|
|
|
arg = PyLong_FromLong(tqv -> asInt());
|
|
|
|
else
|
|
|
|
else
|
|
|
|
arg = PyLong_FromLong(static_QUType_int.get(qargs));
|
|
|
|
arg = PyLong_FromLong(static_QUType_int.get(tqargs));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case uint_sat:
|
|
|
|
case uint_sat:
|
|
|
|
arg = PyLong_FromUnsignedLong(*(unsigned *)static_QUType_ptr.get(qargs));
|
|
|
|
arg = PyLong_FromUnsignedLong(*(unsigned *)static_QUType_ptr.get(tqargs));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case long_sat:
|
|
|
|
case long_sat:
|
|
|
|
arg = PyLong_FromLong(*(long *)static_QUType_ptr.get(qargs));
|
|
|
|
arg = PyLong_FromLong(*(long *)static_QUType_ptr.get(tqargs));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case ulong_sat:
|
|
|
|
case ulong_sat:
|
|
|
|
arg = PyLong_FromUnsignedLong(*(unsigned long *)static_QUType_ptr.get(qargs));
|
|
|
|
arg = PyLong_FromUnsignedLong(*(unsigned long *)static_QUType_ptr.get(tqargs));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case longlong_sat:
|
|
|
|
case longlong_sat:
|
|
|
|
arg = PyLong_FromLongLong(*(PY_LONG_LONG *)static_QUType_ptr.get(qargs));
|
|
|
|
arg = PyLong_FromLongLong(*(PY_LONG_LONG *)static_QUType_ptr.get(tqargs));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case ulonglong_sat:
|
|
|
|
case ulonglong_sat:
|
|
|
|
arg = PyLong_FromUnsignedLongLong(*(unsigned PY_LONG_LONG *)static_QUType_ptr.get(qargs));
|
|
|
|
arg = PyLong_FromUnsignedLongLong(*(unsigned PY_LONG_LONG *)static_QUType_ptr.get(tqargs));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case float_sat:
|
|
|
|
case float_sat:
|
|
|
|
arg = PyFloat_FromDouble(*(float *)static_QUType_ptr.get(qargs));
|
|
|
|
arg = PyFloat_FromDouble(*(float *)static_QUType_ptr.get(tqargs));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case double_sat:
|
|
|
|
case double_sat:
|
|
|
|
arg = PyFloat_FromDouble(static_QUType_double.get(qargs));
|
|
|
|
arg = PyFloat_FromDouble(static_QUType_double.get(tqargs));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case enum_sat:
|
|
|
|
case enum_sat:
|
|
|
|
arg = sipConvertFromNamedEnum(*(int *)static_QUType_ptr.get(qargs), psig->sg_args[a].u.et);
|
|
|
|
arg = sipConvertFromNamedEnum(*(int *)static_QUType_ptr.get(tqargs), psig->sg_args[a].u.et);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case bool_sat:
|
|
|
|
case bool_sat:
|
|
|
|
arg = PyLong_FromLong(static_QUType_bool.get(qargs));
|
|
|
|
arg = PyLong_FromLong(static_QUType_bool.get(tqargs));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case void_sat:
|
|
|
|
case void_sat:
|
|
|
|
arg = sipConvertFromVoidPtr((void *)static_QUType_ptr.get(qargs));
|
|
|
|
arg = sipConvertFromVoidPtr((void *)static_QUType_ptr.get(tqargs));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case class_sat:
|
|
|
|
case class_sat:
|
|
|
|
case classp_sat:
|
|
|
|
case classp_sat:
|
|
|
|
arg = sipConvertFromInstance((void *)static_QUType_ptr.get(qargs),psig->sg_args[a].u.wt,0);
|
|
|
|
arg = sipConvertFromInstance((void *)static_QUType_ptr.get(tqargs),psig->sg_args[a].u.wt,0);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case mtype_sat:
|
|
|
|
case mtype_sat:
|
|
|
|
case mtypep_sat:
|
|
|
|
case mtypep_sat:
|
|
|
|
arg = sipConvertFromMappedType((void *)static_QUType_ptr.get(qargs),psig->sg_args[a].u.mt,0);
|
|
|
|
arg = sipConvertFromMappedType((void *)static_QUType_ptr.get(tqargs),psig->sg_args[a].u.mt,0);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case qvariant_sat:
|
|
|
|
case tqvariant_sat:
|
|
|
|
case qvariantp_sat:
|
|
|
|
case tqvariantp_sat:
|
|
|
|
arg = sipConvertFromInstance((void *)&static_QUType_TQVariant.get(qargs),sipClass_TQVariant,0);
|
|
|
|
arg = sipConvertFromInstance((void *)&static_QUType_TQVariant.get(tqargs),sipClass_TQVariant,0);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case pyobject_sat:
|
|
|
|
case pyobject_sat:
|
|
|
|
arg = (PyObject *)static_QUType_ptr.get(qargs);
|
|
|
|
arg = (PyObject *)static_QUType_ptr.get(tqargs);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
@ -1665,12 +1665,12 @@ static void parseType(const char *type, pytqt3SigArg *arg)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (indir == 0)
|
|
|
|
if (indir == 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
sat = qvariant_sat;
|
|
|
|
sat = tqvariant_sat;
|
|
|
|
unsup = FALSE;
|
|
|
|
unsup = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (indir == 1)
|
|
|
|
else if (indir == 1)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
sat = qvariantp_sat;
|
|
|
|
sat = tqvariantp_sat;
|
|
|
|
unsup = FALSE;
|
|
|
|
unsup = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
