summaryrefslogtreecommitdiffstats
path: root/sip/tqt
diff options
context:
space:
mode:
Diffstat (limited to 'sip/tqt')
-rw-r--r--sip/tqt/tqdir.sip12
-rw-r--r--sip/tqt/tqmemarray.sip20
-rw-r--r--sip/tqt/tqobject.sip66
-rw-r--r--sip/tqt/tqptrlist.sip8
-rw-r--r--sip/tqt/tqtextstream.sip4
-rw-r--r--sip/tqt/tqtmod.sip2
-rw-r--r--sip/tqt/tqvaluelist.sip16
-rw-r--r--sip/tqt/tqwidgetlist.sip12
8 files changed, 70 insertions, 70 deletions
diff --git a/sip/tqt/tqdir.sip b/sip/tqt/tqdir.sip
index 1d4c8db..1f1186f 100644
--- a/sip/tqt/tqdir.sip
+++ b/sip/tqt/tqdir.sip
@@ -89,27 +89,27 @@ the return type of a function or the type of an argument, a Python list of
return 1;
}
- TQFileInfoList *qfil = new TQFileInfoList;
+ TQFileInfoList *tqfil = new TQFileInfoList;
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
- TQFileInfo *qfi;
+ TQFileInfo *tqfi;
// We apply the transfer to the list itself, not the elements.
// Note that any temporary element will never be destroyed.
// There is nothing that can be done about this.
- qfi = reinterpret_cast<TQFileInfo *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQFileInfo,0,0,0,sipIsErr));
+ tqfi = reinterpret_cast<TQFileInfo *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQFileInfo,0,0,0,sipIsErr));
if (*sipIsErr)
{
- delete qfil;
+ delete tqfil;
return 0;
}
- qfil -> append(qfi);
+ tqfil -> append(tqfi);
}
- *sipCppPtr = qfil;
+ *sipCppPtr = tqfil;
return sipGetState(sipTransferObj);
%End
diff --git a/sip/tqt/tqmemarray.sip b/sip/tqt/tqmemarray.sip
index aebbcb4..2df5299 100644
--- a/sip/tqt/tqmemarray.sip
+++ b/sip/tqt/tqmemarray.sip
@@ -64,24 +64,24 @@ converted to and from Python lists of the type.
if (sipIsErr == NULL)
return PyList_Check(sipPy);
- TQMemArray<int> *qma = new TQMemArray<int>(PyList_GET_SIZE(sipPy));
+ TQMemArray<int> *tqma = new TQMemArray<int>(PyList_GET_SIZE(sipPy));
PyErr_Clear();
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
- (*qma)[i] = (int)PyLong_AsLong(PyList_GET_ITEM(sipPy,i));
+ (*tqma)[i] = (int)PyLong_AsLong(PyList_GET_ITEM(sipPy,i));
if (PyErr_Occurred() != NULL)
{
- delete qma;
+ delete tqma;
*sipIsErr = 1;
return 0;
}
}
- *sipCppPtr = qma;
+ *sipCppPtr = tqma;
return sipGetState(sipTransferObj);
%End
@@ -135,7 +135,7 @@ template<TYPE>
return 1;
}
- TQMemArray<TYPE> *ql = new TQMemArray<TYPE>;
+ TQMemArray<TYPE> *tql = new TQMemArray<TYPE>;
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
@@ -146,18 +146,18 @@ template<TYPE>
{
sipReleaseInstance(t, sipClass_TYPE, state);
- delete ql;
+ delete tql;
return 0;
}
- uint idx = ql->size();
- ql->resize(idx + 1);
- ql->at(idx) = *t;
+ uint idx = tql->size();
+ tql->resize(idx + 1);
+ tql->at(idx) = *t;
sipReleaseInstance(t, sipClass_TYPE, state);
}
- *sipCppPtr = ql;
+ *sipCppPtr = tql;
return sipGetState(sipTransferObj);
%End
diff --git a/sip/tqt/tqobject.sip b/sip/tqt/tqobject.sip
index 2fb2ac2..ac0ad5f 100644
--- a/sip/tqt/tqobject.sip
+++ b/sip/tqt/tqobject.sip
@@ -1050,8 +1050,8 @@ enum pytqt3SigArgType {
classp_sat,
mtype_sat,
mtypep_sat,
- qvariant_sat,
- qvariantp_sat,
+ tqvariant_sat,
+ tqvariantp_sat,
pyobject_sat,
schar_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)
- return TQObject::tqt_invoke(id, qargs);
+ return TQObject::tqt_invoke(id, tqargs);
bool ok = TRUE;
const pytqt3Signature *psig = conn.sc_signature;
- TQVariant *qv;
+ TQVariant *tqv;
// Save in case it is asked for later.
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
// that is all that is needed by PyTQt (and PyKDE).
if (lastSender->inherits("TQSignal"))
- qv = &static_QUType_TQVariant.get(qargs + 1);
+ tqv = &static_QUType_TQVariant.get(tqargs + 1);
else
- qv = 0;
+ tqv = 0;
#ifdef WITH_THREAD
PyGILState_STATE state = PyGILState_Ensure();
@@ -1257,94 +1257,94 @@ bool UniversalSlot::tqt_invoke(int id, TQUObject *qargs)
{
PyObject *arg;
- ++qargs;
+ ++tqargs;
switch (psig->sg_args[a].atype)
{
case char_sat:
case schar_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;
case string_sat:
case sstring_sat:
case ustring_sat:
- arg = PyBytes_FromString((char *)static_QUType_ptr.get(qargs));
+ arg = PyBytes_FromString((char *)static_QUType_ptr.get(tqargs));
break;
case short_sat:
- arg = PyLong_FromLong(*(short *)static_QUType_ptr.get(qargs));
+ arg = PyLong_FromLong(*(short *)static_QUType_ptr.get(tqargs));
break;
case ushort_sat:
- arg = PyLong_FromUnsignedLong(*(unsigned short *)static_QUType_ptr.get(qargs));
+ arg = PyLong_FromUnsignedLong(*(unsigned short *)static_QUType_ptr.get(tqargs));
break;
case int_sat:
- if (qv)
- arg = PyLong_FromLong(qv -> asInt());
+ if (tqv)
+ arg = PyLong_FromLong(tqv -> asInt());
else
- arg = PyLong_FromLong(static_QUType_int.get(qargs));
+ arg = PyLong_FromLong(static_QUType_int.get(tqargs));
break;
case uint_sat:
- arg = PyLong_FromUnsignedLong(*(unsigned *)static_QUType_ptr.get(qargs));
+ arg = PyLong_FromUnsignedLong(*(unsigned *)static_QUType_ptr.get(tqargs));
break;
case long_sat:
- arg = PyLong_FromLong(*(long *)static_QUType_ptr.get(qargs));
+ arg = PyLong_FromLong(*(long *)static_QUType_ptr.get(tqargs));
break;
case ulong_sat:
- arg = PyLong_FromUnsignedLong(*(unsigned long *)static_QUType_ptr.get(qargs));
+ arg = PyLong_FromUnsignedLong(*(unsigned long *)static_QUType_ptr.get(tqargs));
break;
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;
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;
case float_sat:
- arg = PyFloat_FromDouble(*(float *)static_QUType_ptr.get(qargs));
+ arg = PyFloat_FromDouble(*(float *)static_QUType_ptr.get(tqargs));
break;
case double_sat:
- arg = PyFloat_FromDouble(static_QUType_double.get(qargs));
+ arg = PyFloat_FromDouble(static_QUType_double.get(tqargs));
break;
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;
case bool_sat:
- arg = PyLong_FromLong(static_QUType_bool.get(qargs));
+ arg = PyLong_FromLong(static_QUType_bool.get(tqargs));
break;
case void_sat:
- arg = sipConvertFromVoidPtr((void *)static_QUType_ptr.get(qargs));
+ arg = sipConvertFromVoidPtr((void *)static_QUType_ptr.get(tqargs));
break;
case class_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;
case mtype_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;
- case qvariant_sat:
- case qvariantp_sat:
- arg = sipConvertFromInstance((void *)&static_QUType_TQVariant.get(qargs),sipClass_TQVariant,0);
+ case tqvariant_sat:
+ case tqvariantp_sat:
+ arg = sipConvertFromInstance((void *)&static_QUType_TQVariant.get(tqargs),sipClass_TQVariant,0);
break;
case pyobject_sat:
- arg = (PyObject *)static_QUType_ptr.get(qargs);
+ arg = (PyObject *)static_QUType_ptr.get(tqargs);
break;
default:
@@ -1665,12 +1665,12 @@ static void parseType(const char *type, pytqt3SigArg *arg)
{
if (indir == 0)
{
- sat = qvariant_sat;
+ sat = tqvariant_sat;
unsup = FALSE;
}
else if (indir == 1)
{
- sat = qvariantp_sat;
+ sat = tqvariantp_sat;
unsup = FALSE;
}
}
diff --git a/sip/tqt/tqptrlist.sip b/sip/tqt/tqptrlist.sip
index 5250eb8..bd162cf 100644
--- a/sip/tqt/tqptrlist.sip
+++ b/sip/tqt/tqptrlist.sip
@@ -83,24 +83,24 @@ template<Type>
return 1;
}
- TQPtrList<Type> *qpl = new TQPtrList<Type>;
+ TQPtrList<Type> *tqpl = new TQPtrList<Type>;
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
// We apply the transfer to the list itself, not the elements.
// Note that any temporary element will never be destroyed.
// There is nothing that can be done about this.
- qpl -> append(reinterpret_cast<Type *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_Type,0,0,0,sipIsErr)));
+ tqpl -> append(reinterpret_cast<Type *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_Type,0,0,0,sipIsErr)));
if (*sipIsErr)
{
- delete qpl;
+ delete tqpl;
return 0;
}
}
- *sipCppPtr = qpl;
+ *sipCppPtr = tqpl;
return sipGetState(sipTransferObj);
%End
diff --git a/sip/tqt/tqtextstream.sip b/sip/tqt/tqtextstream.sip
index 83778c3..adeccb7 100644
--- a/sip/tqt/tqtextstream.sip
+++ b/sip/tqt/tqtextstream.sip
@@ -152,12 +152,12 @@ public:
int precision() const;
int precision(int);
- // These are defined in qmainwindow.h as global operators so we have
+ // These are defined in tqmainwindow.h as global operators so we have
// to implement them here and pretend they are class operators.
TQTextStream &operator<<(const TQMainWindow &);
TQTextStream &operator>>(TQMainWindow &);
- // These are defined in qdockarea.h as global operators so we have
+ // These are defined in tqdockarea.h as global operators so we have
// to implement them here and pretend they are class operators.
TQTextStream &operator<<(const TQDockArea &);
TQTextStream &operator>>(TQDockArea &);
diff --git a/sip/tqt/tqtmod.sip b/sip/tqt/tqtmod.sip
index 5996a15..b9dc958 100644
--- a/sip/tqt/tqtmod.sip
+++ b/sip/tqt/tqtmod.sip
@@ -270,7 +270,7 @@ DESTDIR = @PYTQT_MODDIR@
CONFIG += @BLX_CONFIG_LIB@ @PYTQT_WARN@
INCLUDEPATH = @BLX_INCLUDEPATH@
DEFINES = @BLX_DEFINES@
-LIBS += @PYTQT_QASSISTANTCLIENT_LIB@ @BLX_LIBS@
+LIBS += @PYTQT_TQASSISTANTCLIENT_LIB@ @BLX_LIBS@
macx:QMAKE_LFLAGS += -framework Python
SOURCES = $B
diff --git a/sip/tqt/tqvaluelist.sip b/sip/tqt/tqvaluelist.sip
index d803861..8b3b8d6 100644
--- a/sip/tqt/tqvaluelist.sip
+++ b/sip/tqt/tqvaluelist.sip
@@ -83,7 +83,7 @@ template<Type>
return 1;
}
- TQValueList<Type> *qvl = new TQValueList<Type>;
+ TQValueList<Type> *tqvl = new TQValueList<Type>;
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
@@ -97,17 +97,17 @@ template<Type>
sipReleaseInstance(itm,sipClass_Type,state);
*sipIsErr = 1;
- delete qvl;
+ delete tqvl;
return 0;
}
- qvl -> append(*itm);
+ tqvl -> append(*itm);
sipReleaseInstance(itm,sipClass_Type,state);
}
- *sipCppPtr = qvl;
+ *sipCppPtr = tqvl;
return sipGetState(sipTransferObj);
%End
@@ -149,24 +149,24 @@ template<Type>
if (sipIsErr == NULL)
return PyList_Check(sipPy);
- TQValueList<int> *qvl = new TQValueList<int>;
+ TQValueList<int> *tqvl = new TQValueList<int>;
PyErr_Clear();
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
- qvl -> append(PyLong_AsLong(PyList_GET_ITEM(sipPy,i)));
+ tqvl -> append(PyLong_AsLong(PyList_GET_ITEM(sipPy,i)));
if (PyErr_Occurred() != NULL)
{
- delete qvl;
+ delete tqvl;
*sipIsErr = 1;
return 0;
}
}
- *sipCppPtr = qvl;
+ *sipCppPtr = tqvl;
return 1;
%End
diff --git a/sip/tqt/tqwidgetlist.sip b/sip/tqt/tqwidgetlist.sip
index 9010b86..0d060b8 100644
--- a/sip/tqt/tqwidgetlist.sip
+++ b/sip/tqt/tqwidgetlist.sip
@@ -80,27 +80,27 @@ instances is used instead.
return 1;
}
- TQWidgetList *qwl = new TQWidgetList;
+ TQWidgetList *tqwl = new TQWidgetList;
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
- TQWidget *qw;
+ TQWidget *tqw;
// We apply the transfer to the list itself, not the elements.
// Note that any temporary element will never be destroyed.
// There is nothing that can be done about this.
- qw = reinterpret_cast<TQWidget *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQWidget,0,0,0,sipIsErr));
+ tqw = reinterpret_cast<TQWidget *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_TQWidget,0,0,0,sipIsErr));
if (*sipIsErr)
{
- delete qwl;
+ delete tqwl;
return 0;
}
- qwl -> append(qw);
+ tqwl -> append(tqw);
}
- *sipCppPtr = qwl;
+ *sipCppPtr = tqwl;
return sipGetState(sipTransferObj);
%End