summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sip/khtml/khtml_settings.sip14
-rw-r--r--sip/kio/authinfo.sip12
-rw-r--r--sip/kio/global.sip14
-rw-r--r--sip/kio/kacl.sip6
-rw-r--r--sip/kio/kdirlister.sip4
-rw-r--r--sip/kio/kservicetype.sip8
-rw-r--r--sip/kmdi/kmdichildfrm.sip8
-rw-r--r--sip/kmdi/kmdimainfrm.sip4
-rw-r--r--sip/kparts/browserextension.sip12
-rw-r--r--sip/tdecore/bytearray.sip74
-rw-r--r--sip/tdecore/kaccel.sip4
-rw-r--r--sip/tdecore/kconfig.sip14
-rw-r--r--sip/tdecore/kmacroexpander.sip38
-rw-r--r--sip/tdecore/ktimezones.sip8
-rw-r--r--sip/tdeui/kaboutapplication.sip2
-rw-r--r--sip/tdeui/kkeydialog.sip8
-rw-r--r--sip/tdeui/klistview.sip4
-rw-r--r--sip/tdeui/kxmlguifactory.sip4
18 files changed, 119 insertions, 119 deletions
diff --git a/sip/khtml/khtml_settings.sip b/sip/khtml/khtml_settings.sip
index 54a8f70..e366127 100644
--- a/sip/khtml/khtml_settings.sip
+++ b/sip/khtml/khtml_settings.sip
@@ -235,8 +235,8 @@ typedef TQPair<TQString,TQChar> AssignPair;
PyObject *inst = NULL;
TQString s = (*it).first;
TQChar c = (*it).second;
- PyObject *pys = sipConvertFromNewType(new TQString(s), sipType_QString, sipTransferObj);
- PyObject *pyc = sipConvertFromNewType(new TQChar(c), sipType_QChar, sipTransferObj);
+ PyObject *pys = sipConvertFromNewType(new TQString(s), sipType_TQString, sipTransferObj);
+ PyObject *pyc = sipConvertFromNewType(new TQChar(c), sipType_TQChar, sipTransferObj);
if ((pys == NULL) || ((inst = Py_BuildValue ("NN", pys, pyc)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
@@ -269,13 +269,13 @@ typedef TQPair<TQString,TQChar> AssignPair;
PyObject *elem = PyList_GET_ITEM (sipPy, i);
PyObject *pyp1 = PyTuple_GET_ITEM (elem, 0);
PyObject *pyp2 = PyTuple_GET_ITEM (elem, 1);
- p1 = (TQString *)sipForceConvertToType(pyp1, sipType_QString, sipTransferObj, SIP_NOT_NONE, &p1_state, &iserr);
- p2 = (TQChar *)sipForceConvertToType(pyp2, sipType_QChar, sipTransferObj, SIP_NOT_NONE, &p2_state, &iserr);
+ p1 = (TQString *)sipForceConvertToType(pyp1, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &p1_state, &iserr);
+ p2 = (TQChar *)sipForceConvertToType(pyp2, sipType_TQChar, sipTransferObj, SIP_NOT_NONE, &p2_state, &iserr);
if (iserr)
{
if (p1)
- sipReleaseType(p1, sipType_QString, p1_state);
+ sipReleaseType(p1, sipType_TQString, p1_state);
*sipIsErr = 1;
delete cpplist;
@@ -284,8 +284,8 @@ typedef TQPair<TQString,TQChar> AssignPair;
cpplist->append (AssignPair (*p1, *p2));
- sipReleaseType(p1, sipType_QString, p1_state);
- sipReleaseType(p2, sipType_QChar, p2_state);
+ sipReleaseType(p1, sipType_TQString, p1_state);
+ sipReleaseType(p2, sipType_TQChar, p2_state);
}
*sipCppPtr = cpplist;
diff --git a/sip/kio/authinfo.sip b/sip/kio/authinfo.sip
index 0832cd8..fdf0c1a 100644
--- a/sip/kio/authinfo.sip
+++ b/sip/kio/authinfo.sip
@@ -152,7 +152,7 @@ typedef TQMap<TQString, TQStringList> KStringListMap;
for (it = map.begin (); it != map.end (); ++it)
{
PyObject *sKey = PyString_FromString ((const char *)((TQString)it.key ()));
- PyObject *sData = sipConvertFromInstance ((void *)&it.data (), sipClass_QStringList, sipTransferObj);
+ PyObject *sData = sipConvertFromInstance ((void *)&it.data (), sipClass_TQStringList, sipTransferObj);
if ((sKey == NULL) || (sData == NULL) || (PyDict_SetItem (dict, sKey, sData) < 0))
{
@@ -182,13 +182,13 @@ typedef TQMap<TQString, TQStringList> KStringListMap;
{
int iserr = 0, sKey_state, sData_state;
- sKey = (TQString *)sipForceConvertToType(key, sipType_QString, sipTransferObj, SIP_NOT_NONE, &sKey_state, &iserr);
- sData = (TQStringList *)sipForceConvertToType(value, sipType_QStringList, sipTransferObj, SIP_NOT_NONE, &sData_state, &iserr);
+ sKey = (TQString *)sipForceConvertToType(key, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &sKey_state, &iserr);
+ sData = (TQStringList *)sipForceConvertToType(value, sipType_TQStringList, sipTransferObj, SIP_NOT_NONE, &sData_state, &iserr);
if (iserr)
{
if (sKey)
- sipReleaseType(sKey, sipType_QString, sKey_state);
+ sipReleaseType(sKey, sipType_TQString, sKey_state);
*sipIsErr = 1;
delete map;
@@ -197,8 +197,8 @@ typedef TQMap<TQString, TQStringList> KStringListMap;
map->insert (*sKey, *sData);
- sipReleaseType(sKey, sipType_QString, sKey_state);
- sipReleaseType(sData, sipType_QStringList, sData_state);
+ sipReleaseType(sKey, sipType_TQString, sKey_state);
+ sipReleaseType(sData, sipType_TQStringList, sData_state);
}
*sipCppPtr = map;
diff --git a/sip/kio/global.sip b/sip/kio/global.sip
index e46997a..9812d44 100644
--- a/sip/kio/global.sip
+++ b/sip/kio/global.sip
@@ -653,8 +653,8 @@ KIO::MetaData testKIOMetaData (KIO::MetaData);
TQString bcpp = it.data ();
PyObject *ainst;
PyObject *binst;
- if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_QString, sipTransferObj)) == NULL)
- || ((binst = sipConvertFromNewType(new TQString(bcpp), sipType_QString, sipTransferObj)) == NULL)
+ if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) == NULL)
+ || ((binst = sipConvertFromNewType(new TQString(bcpp), sipType_TQString, sipTransferObj)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
Py_XDECREF (ainst);
@@ -686,13 +686,13 @@ KIO::MetaData testKIOMetaData (KIO::MetaData);
{
int iserr = 0, acpp_state, bcpp_state;
- acpp = (TQString *)sipForceConvertToType(aelem, sipType_QString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
- bcpp = (TQString *)sipForceConvertToType(belem, sipType_QString, sipTransferObj, SIP_NOT_NONE, &bcpp_state, &iserr);
+ acpp = (TQString *)sipForceConvertToType(aelem, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
+ bcpp = (TQString *)sipForceConvertToType(belem, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &bcpp_state, &iserr);
if (iserr)
{
if (acpp)
- sipReleaseType(acpp, sipType_QString, acpp_state);
+ sipReleaseType(acpp, sipType_TQString, acpp_state);
*sipIsErr = 1;
delete cppmap;
@@ -701,8 +701,8 @@ KIO::MetaData testKIOMetaData (KIO::MetaData);
cppmap->insert (*acpp, *bcpp);
- sipReleaseType(acpp, sipType_QString, acpp_state);
- sipReleaseType(bcpp, sipType_QString, bcpp_state);
+ sipReleaseType(acpp, sipType_TQString, acpp_state);
+ sipReleaseType(bcpp, sipType_TQString, bcpp_state);
}
*sipCppPtr = (KIO::MetaData *)cppmap;
diff --git a/sip/kio/kacl.sip b/sip/kio/kacl.sip
index 8997ce3..bcd9a1b 100644
--- a/sip/kio/kacl.sip
+++ b/sip/kio/kacl.sip
@@ -114,7 +114,7 @@ typedef ACLUserPermissionsList ACLGroupPermissionsList;
{
TQString s = (*it).first;
ushort u = (*it).second;
- PyObject *pys = sipConvertFromNewType(new TQString(s), sipType_QString, sipTransferObj);
+ PyObject *pys = sipConvertFromNewType(new TQString(s), sipType_TQString, sipTransferObj);
if ((pys == NULL) || ((inst = Py_BuildValue ("Ni", pys, u)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
@@ -144,7 +144,7 @@ typedef ACLUserPermissionsList ACLGroupPermissionsList;
PyObject *elem = PyList_GET_ITEM (sipPy, i);
PyObject *pyp1 = PyTuple_GET_ITEM (elem, 0);
- p1 = (TQString *)sipForceConvertToType(pyp1, sipType_QString, sipTransferObj, SIP_NOT_NONE, &p1_state, &iserr);
+ p1 = (TQString *)sipForceConvertToType(pyp1, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &p1_state, &iserr);
if (iserr)
{
@@ -156,7 +156,7 @@ typedef ACLUserPermissionsList ACLGroupPermissionsList;
cpplist->append (ACLUserPermissions (*p1, p2));
- sipReleaseType(p1, sipType_QString, p1_state);
+ sipReleaseType(p1, sipType_TQString, p1_state);
}
*sipCppPtr = cpplist;
diff --git a/sip/kio/kdirlister.sip b/sip/kio/kdirlister.sip
index e48bea0..96196d5 100644
--- a/sip/kio/kdirlister.sip
+++ b/sip/kio/kdirlister.sip
@@ -222,7 +222,7 @@ protected:
// the loop depends on the type of iterator the tmeplate makes available
for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () )
{
- if (((inst = sipConvertFromInstance (cpp, sipClass_QRegExp, sipTransferObj)) == NULL)
+ if (((inst = sipConvertFromInstance (cpp, sipClass_TQRegExp, sipTransferObj)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
@@ -246,7 +246,7 @@ protected:
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (TQRegExp *)sipForceConvertToType(elem, sipType_QRegExp, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
+ cpp = (TQRegExp *)sipForceConvertToType(elem, sipType_TQRegExp, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff --git a/sip/kio/kservicetype.sip b/sip/kio/kservicetype.sip
index da8099b..1862ce8 100644
--- a/sip/kio/kservicetype.sip
+++ b/sip/kio/kservicetype.sip
@@ -156,7 +156,7 @@ protected:
int bcpp = (int) it.data ();
PyObject *ainst;
PyObject *binst = PyInt_FromLong (bcpp);
- if (((ainst = sipConvertFromNewType(new TQString (acpp), sipType_QString, sipTransferObj)) == NULL)
+ if (((ainst = sipConvertFromNewType(new TQString (acpp), sipType_TQString, sipTransferObj)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
Py_XDECREF (ainst);
@@ -187,12 +187,12 @@ protected:
{
int iserr = 0, acpp_state;
- acpp = (TQString *)sipForceConvertToType(aelem, sipType_QString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
+ acpp = (TQString *)sipForceConvertToType(aelem, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
if (iserr || !PyInt_Check(belem))
{
if (acpp_state)
- sipReleaseType(acpp, sipType_QString, acpp_state);
+ sipReleaseType(acpp, sipType_TQString, acpp_state);
*sipIsErr = 1;
delete cppmap;
@@ -203,7 +203,7 @@ protected:
cppmap->insert (*acpp, bcpp);
- sipReleaseType(acpp, sipType_QString, acpp_state);
+ sipReleaseType(acpp, sipType_TQString, acpp_state);
}
*sipCppPtr = cppmap;
diff --git a/sip/kmdi/kmdichildfrm.sip b/sip/kmdi/kmdichildfrm.sip
index 0bfe8b4..b47024a 100644
--- a/sip/kmdi/kmdichildfrm.sip
+++ b/sip/kmdi/kmdichildfrm.sip
@@ -219,7 +219,7 @@ protected:
while (it.current ())
{
TQString current_key = it.currentKey ();
- PyObject *a0 = sipConvertFromInstance (&current_key, sipClass_QString, sipTransferObj);
+ PyObject *a0 = sipConvertFromInstance (&current_key, sipClass_TQString, sipTransferObj);
PyObject *a1 = PyInt_FromLong ((long) it.current ());
if ((a0 == NULL) || (a1 == NULL) || (PyDict_SetItem (dict, a0, a1) < 0))
@@ -252,12 +252,12 @@ protected:
{
int iserr = 0, a0_state;
- a0 = (TQString *)sipForceConvertToType(key, sipType_QString, sipTransferObj, SIP_NOT_NONE, &a0_state, &iserr);
+ a0 = (TQString *)sipForceConvertToType(key, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &a0_state, &iserr);
if (iserr || !PyInt_Check(value))
{
if (a0)
- sipReleaseType(a0, sipType_QString, a0_state);
+ sipReleaseType(a0, sipType_TQString, a0_state);
*sipIsErr = 1;
delete qdict;
@@ -268,7 +268,7 @@ protected:
qdict->insert (*a0, &a1);
- sipReleaseType(a0, sipType_QString, a0_state);
+ sipReleaseType(a0, sipType_TQString, a0_state);
}
*sipCppPtr = qdict;
diff --git a/sip/kmdi/kmdimainfrm.sip b/sip/kmdi/kmdimainfrm.sip
index 9f39aef..aa5fceb 100644
--- a/sip/kmdi/kmdimainfrm.sip
+++ b/sip/kmdi/kmdimainfrm.sip
@@ -293,7 +293,7 @@ signals:
TQValueList<TQRect>::Iterator it;
for( it = cpplist->begin(); it != cpplist->end(); ++it )
{
- if (((inst = sipConvertFromNewType(new TQRect(*it), sipType_QRect, NULL)) == NULL)
+ if (((inst = sipConvertFromNewType(new TQRect(*it), sipType_TQRect, NULL)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
@@ -318,7 +318,7 @@ signals:
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (TQRect *)sipForceConvertToType(elem, sipType_QRect, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+ cpp = (TQRect *)sipForceConvertToType(elem, sipType_TQRect, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff --git a/sip/kparts/browserextension.sip b/sip/kparts/browserextension.sip
index b994de5..a2d2497 100644
--- a/sip/kparts/browserextension.sip
+++ b/sip/kparts/browserextension.sip
@@ -393,8 +393,8 @@ TQMap<TQCString,int> testTQMapTQCStringInt (TQMap<TQCString,int>);
TQCString bcpp = it.data ();
PyObject *ainst;
PyObject *binst = NULL;
- if (((ainst = sipConvertFromNewType(new TQCString (acpp), sipType_QCString, NULL)) == NULL)
- || ((binst = sipConvertFromNewType(new TQCString (bcpp), sipType_QCString, NULL)) == NULL)
+ if (((ainst = sipConvertFromNewType(new TQCString (acpp), sipType_TQCString, NULL)) == NULL)
+ || ((binst = sipConvertFromNewType(new TQCString (bcpp), sipType_TQCString, NULL)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
Py_XDECREF (ainst);
@@ -425,8 +425,8 @@ TQMap<TQCString,int> testTQMapTQCStringInt (TQMap<TQCString,int>);
{
int iserr = 0;
- acpp = (TQCString *)sipForceConvertToType(aelem, sipType_QCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
- bcpp = (TQCString *)sipForceConvertToType(belem, sipType_QCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+ acpp = (TQCString *)sipForceConvertToType(aelem, sipType_TQCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+ bcpp = (TQCString *)sipForceConvertToType(belem, sipType_TQCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
@@ -476,7 +476,7 @@ TQMap<TQCString,int> testTQMapTQCStringInt (TQMap<TQCString,int>);
int bcpp = it.data ();
PyObject *ainst;
PyObject *binst = NULL;
- if (((ainst = sipConvertFromNewType(new TQCString (acpp), sipType_QCString, NULL)) == NULL)
+ if (((ainst = sipConvertFromNewType(new TQCString (acpp), sipType_TQCString, NULL)) == NULL)
|| ((binst = PyInt_FromLong (bcpp)) < 0)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
@@ -508,7 +508,7 @@ TQMap<TQCString,int> testTQMapTQCStringInt (TQMap<TQCString,int>);
{
int iserr = 0;
- acpp = (TQCString *)sipForceConvertToType(aelem, sipType_QCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+ acpp = (TQCString *)sipForceConvertToType(aelem, sipType_TQCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr || !PyInt_Check (belem))
{
diff --git a/sip/tdecore/bytearray.sip b/sip/tdecore/bytearray.sip
index 67367d6..a5acc9c 100644
--- a/sip/tdecore/bytearray.sip
+++ b/sip/tdecore/bytearray.sip
@@ -219,19 +219,19 @@ void dcop_next (TQDataStream&, TQCString&);
{
TQString res;
*a0 >> res;
- return sipConvertFromNewType(new TQString(res), sipType_QString, NULL);
+ return sipConvertFromNewType(new TQString(res), sipType_TQString, NULL);
}
else if (*a1 == "TQStringList")
{
TQStringList res;
*a0 >> res;
- return sipConvertFromNewType(new TQStringList(res), sipType_QStringList, NULL);
+ return sipConvertFromNewType(new TQStringList(res), sipType_TQStringList, NULL);
}
else if (*a1 == "TQCString")
{
TQCString res;
*a0 >> res;
- return sipConvertFromNewType(new TQCString(res), sipType_QCString, NULL);
+ return sipConvertFromNewType(new TQCString(res), sipType_TQCString, NULL);
}
else if (*a1 == "KURL")
{
@@ -249,67 +249,67 @@ void dcop_next (TQDataStream&, TQCString&);
{
TQSize res;
*a0 >> res;
- return sipConvertFromNewType(new TQSize(res), sipType_QSize, NULL);
+ return sipConvertFromNewType(new TQSize(res), sipType_TQSize, NULL);
}
else if (*a1 == "TQRect")
{
TQRect res;
*a0 >> res;
- return sipConvertFromNewType(new TQRect(res), sipType_QRect, NULL);
+ return sipConvertFromNewType(new TQRect(res), sipType_TQRect, NULL);
}
else if (*a1 == "TQRegion")
{
TQRect res;
*a0 >> res;
- return sipConvertFromNewType(new TQRegion(res), sipType_QRegion, NULL);
+ return sipConvertFromNewType(new TQRegion(res), sipType_TQRegion, NULL);
}
else if (*a1 == "TQPoint")
{
TQPoint res;
*a0 >> res;
- return sipConvertFromNewType(new TQPoint(res), sipType_QPoint, NULL);
+ return sipConvertFromNewType(new TQPoint(res), sipType_TQPoint, NULL);
}
else if (*a1 == "TQFont")
{
TQFont res;
*a0 >> res;
- return sipConvertFromNewType(new TQFont(res), sipType_QFont, NULL);
+ return sipConvertFromNewType(new TQFont(res), sipType_TQFont, NULL);
}
else if (*a1 == "TQCursor")
{
TQCursor res;
*a0 >> res;
- return sipConvertFromNewType(new TQCursor(res), sipType_QCursor, NULL);
+ return sipConvertFromNewType(new TQCursor(res), sipType_TQCursor, NULL);
}
else if (*a1 == "TQPixmap")
{
TQPixmap res;
*a0 >> res;
- return sipConvertFromNewType(new TQPixmap(res), sipType_QPixmap, NULL);
+ return sipConvertFromNewType(new TQPixmap(res), sipType_TQPixmap, NULL);
}
else if (*a1 == "TQColor")
{
TQColor res;
*a0 >> res;
- return sipConvertFromNewType(new TQColor(res), sipType_QColor, NULL);
+ return sipConvertFromNewType(new TQColor(res), sipType_TQColor, NULL);
}
else if (*a1 == "TQColorGroup")
{
TQColorGroup res;
*a0 >> res;
- return sipConvertFromNewType(new TQColorGroup(res), sipType_QColorGroup, NULL);
+ return sipConvertFromNewType(new TQColorGroup(res), sipType_TQColorGroup, NULL);
}
else if (*a1 == "TQPalette")
{
TQPalette res;
*a0 >> res;
- return sipConvertFromNewType(new TQPalette(res), sipType_QPalette, NULL);
+ return sipConvertFromNewType(new TQPalette(res), sipType_TQPalette, NULL);
}
else if (*a1 == "TQBrush")
{
TQBrush res;
*a0 >> res;
- return sipConvertFromNewType(new TQBrush(res), sipType_QBrush, NULL);
+ return sipConvertFromNewType(new TQBrush(res), sipType_TQBrush, NULL);
}
else if (*a1 == "FocusPolicy")
{
@@ -327,61 +327,61 @@ void dcop_next (TQDataStream&, TQCString&);
{
TQVariant res;
*a0 >> res;
- return sipConvertFromNewType(new TQVariant(res), sipType_QVariant, NULL);
+ return sipConvertFromNewType(new TQVariant(res), sipType_TQVariant, NULL);
}
else if (*a1 == "TQDate")
{
TQDate res;
*a0 >> res;
- return sipConvertFromNewType(new TQDate(res), sipType_QDate, NULL);
+ return sipConvertFromNewType(new TQDate(res), sipType_TQDate, NULL);
}
else if (*a1 == "TQTime")
{
TQTime res;
*a0 >> res;
- return sipConvertFromNewType(new TQTime(res), sipType_QTime, NULL);
+ return sipConvertFromNewType(new TQTime(res), sipType_TQTime, NULL);
}
else if (*a1 == "TQDateTime")
{
TQDateTime res;
*a0 >> res;
- return sipConvertFromNewType(new TQDateTime(res), sipType_QDateTime, NULL);
+ return sipConvertFromNewType(new TQDateTime(res), sipType_TQDateTime, NULL);
}
else if (*a1 == "TQImage")
{
TQImage res;
*a0 >> res;
- return sipConvertFromNewType(new TQImage(res), sipType_QImage, NULL);
+ return sipConvertFromNewType(new TQImage(res), sipType_TQImage, NULL);
}
else if (*a1 == "TQKeySequence")
{
TQKeySequence res;
*a0 >> res;
- return sipConvertFromNewType(new TQKeySequence(res), sipType_QKeySequence, NULL);
+ return sipConvertFromNewType(new TQKeySequence(res), sipType_TQKeySequence, NULL);
}
else if (*a1 == "TQPen")
{
TQPen res;
*a0 >> res;
- return sipConvertFromNewType(new TQPen(res), sipType_QPen, NULL);
+ return sipConvertFromNewType(new TQPen(res), sipType_TQPen, NULL);
}
else if (*a1 == "TQPicture")
{
TQPicture res;
*a0 >> res;
- return sipConvertFromNewType(new TQPicture(res), sipType_QPicture, NULL);
+ return sipConvertFromNewType(new TQPicture(res), sipType_TQPicture, NULL);
}
else if (*a1 == "TQPointArray")
{
TQPointArray res;
*a0 >> res;
- return sipConvertFromNewType(new TQPointArray(res), sipType_QPointArray, NULL);
+ return sipConvertFromNewType(new TQPointArray(res), sipType_TQPointArray, NULL);
}
else if (*a1 == "TQByteArray")
{
TQByteArray res;
*a0 >> res;
- return sipConvertFromNewType(new TQByteArray(res), sipType_QByteArray, NULL);
+ return sipConvertFromNewType(new TQByteArray(res), sipType_TQByteArray, NULL);
}
else if (*a1 == "TQMap<TQCString,DCOPRef>")
{
@@ -645,7 +645,7 @@ void dcop_add (TQDataStream& s, TQByteArray value)
DCOPRef bcpp = it.data ();
PyObject *ainst;
PyObject *binst = NULL;
- if (((ainst = sipConvertFromNewType(new TQCString(acpp), sipType_QCString, NULL)) == NULL)
+ if (((ainst = sipConvertFromNewType(new TQCString(acpp), sipType_TQCString, NULL)) == NULL)
|| ((binst = sipConvertFromNewType(new DCOPRef(bcpp), sipType_DCOPRef, NULL)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
@@ -677,7 +677,7 @@ void dcop_add (TQDataStream& s, TQByteArray value)
{
int iserr = 0;
- acpp = (TQCString *)sipForceConvertToType(aelem, sipType_QCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+ acpp = (TQCString *)sipForceConvertToType(aelem, sipType_TQCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
bcpp = (DCOPRef *)sipForceConvertToType(belem, sipType_DCOPRef, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
@@ -728,7 +728,7 @@ void dcop_add (TQDataStream& s, TQByteArray value)
DCOPRef bcpp = it.data ();
PyObject *ainst;
PyObject *binst = NULL;
- if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_QString, sipTransferObj)) == NULL)
+ if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) == NULL)
|| ((binst = sipConvertFromNewType(new DCOPRef(bcpp), sipType_DCOPRef, sipTransferObj)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
@@ -760,13 +760,13 @@ void dcop_add (TQDataStream& s, TQByteArray value)
{
int iserr = 0, acpp_state;
- acpp = (TQString *)sipForceConvertToType(aelem, sipType_QString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
+ acpp = (TQString *)sipForceConvertToType(aelem, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
bcpp = (DCOPRef *)sipForceConvertToType(belem, sipType_DCOPRef, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
if (acpp)
- sipReleaseType(acpp, sipType_QString, acpp_state);
+ sipReleaseType(acpp, sipType_TQString, acpp_state);
*sipIsErr = 1;
delete cppmap;
@@ -775,7 +775,7 @@ void dcop_add (TQDataStream& s, TQByteArray value)
cppmap->insert (*acpp, *bcpp);
- sipReleaseType(acpp, sipType_QString, acpp_state);
+ sipReleaseType(acpp, sipType_TQString, acpp_state);
}
*sipCppPtr = cppmap;
@@ -819,8 +819,8 @@ void dcop_add (TQDataStream& s, TQByteArray value)
TQByteArray bcpp = it.data ();
PyObject *ainst;
PyObject *binst = NULL;
- if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_QString, sipTransferObj)) == NULL)
- || ((binst = sipConvertFromNewType(new TQByteArray(bcpp), sipType_QByteArray, sipTransferObj)) == NULL)
+ if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) == NULL)
+ || ((binst = sipConvertFromNewType(new TQByteArray(bcpp), sipType_TQByteArray, sipTransferObj)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
Py_XDECREF (ainst);
@@ -851,13 +851,13 @@ void dcop_add (TQDataStream& s, TQByteArray value)
{
int iserr = 0, acpp_state, bcpp_state;
- acpp = (TQString *)sipForceConvertToType(aelem, sipType_QString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
- bcpp = (TQByteArray *)sipForceConvertToType(belem, sipType_QByteArray, sipTransferObj, SIP_NOT_NONE, &bcpp_state, &iserr);
+ acpp = (TQString *)sipForceConvertToType(aelem, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
+ bcpp = (TQByteArray *)sipForceConvertToType(belem, sipType_TQByteArray, sipTransferObj, SIP_NOT_NONE, &bcpp_state, &iserr);
if (iserr)
{
if (acpp)
- sipReleaseType(acpp, sipType_QString, acpp_state);
+ sipReleaseType(acpp, sipType_TQString, acpp_state);
*sipIsErr = 1;
delete cppmap;
@@ -866,8 +866,8 @@ void dcop_add (TQDataStream& s, TQByteArray value)
cppmap->insert (*acpp, *bcpp);
- sipReleaseType(acpp, sipType_QString, acpp_state);
- sipReleaseType(bcpp, sipType_QByteArray, bcpp_state);
+ sipReleaseType(acpp, sipType_TQString, acpp_state);
+ sipReleaseType(bcpp, sipType_TQByteArray, bcpp_state);
}
*sipCppPtr = cppmap;
diff --git a/sip/tdecore/kaccel.sip b/sip/tdecore/kaccel.sip
index 2222223..54655a7 100644
--- a/sip/tdecore/kaccel.sip
+++ b/sip/tdecore/kaccel.sip
@@ -217,7 +217,7 @@ public:
int iserr = 0, sData_state;
iKey = PyInt_AS_LONG (key);
- sData = (TQString *)sipForceConvertToType(value, sipType_QString, sipTransferObj, SIP_NOT_NONE, &sData_state, &iserr);
+ sData = (TQString *)sipForceConvertToType(value, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &sData_state, &iserr);
if (iserr)
{
@@ -228,7 +228,7 @@ public:
map->insert (iKey, *sData);
- sipReleaseType(sData, sipType_QString, sData_state);
+ sipReleaseType(sData, sipType_TQString, sData_state);
}
*sipCppPtr = map;
diff --git a/sip/tdecore/kconfig.sip b/sip/tdecore/kconfig.sip
index 1458aa6..b0509f0 100644
--- a/sip/tdecore/kconfig.sip
+++ b/sip/tdecore/kconfig.sip
@@ -133,8 +133,8 @@ private:
TQString bcpp = it.data ();
PyObject *ainst;
PyObject *binst = NULL;
- if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_QString, sipTransferObj)) == NULL)
- || ((binst = sipConvertFromNewType(new TQString(bcpp), sipType_QString, sipTransferObj)) == NULL)
+ if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) == NULL)
+ || ((binst = sipConvertFromNewType(new TQString(bcpp), sipType_TQString, sipTransferObj)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
Py_XDECREF (ainst);
@@ -165,13 +165,13 @@ private:
{
int iserr = 0, acpp_state, bcpp_state;
- acpp = (TQString *)sipForceConvertToType(aelem, sipType_QString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
- bcpp = (TQString *)sipForceConvertToType(belem, sipType_QString, sipTransferObj, SIP_NOT_NONE, &bcpp_state, &iserr);
+ acpp = (TQString *)sipForceConvertToType(aelem, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
+ bcpp = (TQString *)sipForceConvertToType(belem, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &bcpp_state, &iserr);
if (iserr)
{
if (acpp)
- sipReleaseType(acpp, sipType_QString, acpp_state);
+ sipReleaseType(acpp, sipType_TQString, acpp_state);
*sipIsErr = 1;
delete cppmap;
@@ -180,8 +180,8 @@ private:
cppmap->insert (*acpp, *bcpp);
- sipReleaseType(acpp, sipType_QString, acpp_state);
- sipReleaseType(bcpp, sipType_QString, bcpp_state);
+ sipReleaseType(acpp, sipType_TQString, acpp_state);
+ sipReleaseType(bcpp, sipType_TQString, bcpp_state);
}
*sipCppPtr = cppmap;
diff --git a/sip/tdecore/kmacroexpander.sip b/sip/tdecore/kmacroexpander.sip
index b70d2df..0d2c2f7 100644
--- a/sip/tdecore/kmacroexpander.sip
+++ b/sip/tdecore/kmacroexpander.sip
@@ -145,7 +145,7 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap<TQStr
TQChar acpp = it.key ();
PyObject *binst = PyString_FromString ((char *)((TQString *)&it.data ()));
PyObject *ainst;
- if (((ainst = sipConvertFromNewType(new TQChar(acpp), sipType_QChar, sipTransferObj)) == NULL)
+ if (((ainst = sipConvertFromNewType(new TQChar(acpp), sipType_TQChar, sipTransferObj)) == NULL)
|| (binst == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
@@ -177,13 +177,13 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap<TQStr
{
int iserr = 0, cKey_state, sData_state;
- cKey = (TQChar *)sipForceConvertToType(key, sipType_QChar, sipTransferObj, SIP_NOT_NONE, &cKey_state, &iserr);
- sData = (TQString *)sipForceConvertToType(value, sipType_QString, sipTransferObj, SIP_NOT_NONE, &sData_state, &iserr);
+ cKey = (TQChar *)sipForceConvertToType(key, sipType_TQChar, sipTransferObj, SIP_NOT_NONE, &cKey_state, &iserr);
+ sData = (TQString *)sipForceConvertToType(value, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &sData_state, &iserr);
if (iserr)
{
if (cKey)
- sipReleaseType(cKey, sipType_QChar, cKey_state);
+ sipReleaseType(cKey, sipType_TQChar, cKey_state);
*sipIsErr = 1;
delete map;
@@ -192,8 +192,8 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap<TQStr
map->insert (*cKey, *sData);
- sipReleaseType(cKey, sipType_QChar, cKey_state);
- sipReleaseType(sData, sipType_QString, sData_state);
+ sipReleaseType(cKey, sipType_TQChar, cKey_state);
+ sipReleaseType(sData, sipType_TQString, sData_state);
}
*sipCppPtr = map;
@@ -234,7 +234,7 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap<TQStr
TQStringList bcpp = it.data ();
PyObject *ainst = PyString_FromString ((char *)((TQString *)&it.key ()));
PyObject *binst;
- if (((binst = sipConvertFromNewType(new TQStringList(bcpp), sipType_QStringList, sipTransferObj)) == NULL)
+ if (((binst = sipConvertFromNewType(new TQStringList(bcpp), sipType_TQStringList, sipTransferObj)) == NULL)
|| (ainst == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
@@ -266,13 +266,13 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap<TQStr
{
int iserr = 0, sKey_state, slData_state;
- sKey = (TQString *)sipForceConvertToType(key, sipType_QString, sipTransferObj, SIP_NOT_NONE, &sKey_state, &iserr);
- slData = (TQStringList *)sipForceConvertToType(value, sipType_QStringList, sipTransferObj, SIP_NOT_NONE, &slData_state, &iserr);
+ sKey = (TQString *)sipForceConvertToType(key, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &sKey_state, &iserr);
+ slData = (TQStringList *)sipForceConvertToType(value, sipType_TQStringList, sipTransferObj, SIP_NOT_NONE, &slData_state, &iserr);
if (iserr)
{
if (sKey)
- sipReleaseType(sKey, sipType_QString, sKey_state);
+ sipReleaseType(sKey, sipType_TQString, sKey_state);
*sipIsErr = 1;
delete map;
@@ -281,8 +281,8 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap<TQStr
map->insert (*sKey, *slData);
- sipReleaseType(sKey, sipType_QString, sKey_state);
- sipReleaseType(slData, sipType_QStringList, slData_state);
+ sipReleaseType(sKey, sipType_TQString, sKey_state);
+ sipReleaseType(slData, sipType_TQStringList, slData_state);
}
*sipCppPtr = map;
@@ -324,8 +324,8 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap<TQStr
TQStringList bcpp = it.data ();
PyObject *binst;
PyObject *ainst;
- if (((ainst = sipConvertFromNewType(new TQChar(acpp), sipType_QChar, sipTransferObj)) == NULL)
- || (binst = sipConvertFromNewType(new TQStringList(bcpp), sipType_QStringList, sipTransferObj))
+ if (((ainst = sipConvertFromNewType(new TQChar(acpp), sipType_TQChar, sipTransferObj)) == NULL)
+ || (binst = sipConvertFromNewType(new TQStringList(bcpp), sipType_TQStringList, sipTransferObj))
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
Py_XDECREF (ainst);
@@ -356,13 +356,13 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap<TQStr
{
int iserr = 0, cKey_state, slData_state;
- cKey = (TQChar *)sipForceConvertToType(key, sipType_QChar, sipTransferObj, SIP_NOT_NONE, &cKey_state, &iserr);
- slData = (TQStringList *)sipForceConvertToType(value, sipType_QStringList, sipTransferObj, SIP_NOT_NONE, &slData_state, &iserr);
+ cKey = (TQChar *)sipForceConvertToType(key, sipType_TQChar, sipTransferObj, SIP_NOT_NONE, &cKey_state, &iserr);
+ slData = (TQStringList *)sipForceConvertToType(value, sipType_TQStringList, sipTransferObj, SIP_NOT_NONE, &slData_state, &iserr);
if (iserr)
{
if (cKey)
- sipReleaseType(cKey, sipType_QChar, cKey_state);
+ sipReleaseType(cKey, sipType_TQChar, cKey_state);
*sipIsErr = 1;
delete map;
@@ -371,8 +371,8 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap<TQStr
map->insert (*cKey, *slData);
- sipReleaseType(cKey, sipType_QChar, cKey_state);
- sipReleaseType(slData, sipType_QStringList, slData_state);
+ sipReleaseType(cKey, sipType_TQChar, cKey_state);
+ sipReleaseType(slData, sipType_TQStringList, slData_state);
}
*sipCppPtr = map;
diff --git a/sip/tdecore/ktimezones.sip b/sip/tdecore/ktimezones.sip
index fb92fdb..db7808d 100644
--- a/sip/tdecore/ktimezones.sip
+++ b/sip/tdecore/ktimezones.sip
@@ -212,7 +212,7 @@ private:
KTimezone *bcpp = it.data ();
PyObject *ainst;
PyObject *binst = NULL;
- if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_QString, sipTransferObj)) == NULL)
+ if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) == NULL)
|| ((binst = sipConvertFromType(bcpp, sipType_KTimezone, sipTransferObj)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
@@ -244,13 +244,13 @@ private:
{
int iserr = 0, acpp_state;
- acpp = (TQString *)sipForceConvertToType(aelem, sipType_QString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
+ acpp = (TQString *)sipForceConvertToType(aelem, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr);
bcpp = (KTimezone *)sipForceConvertToType(belem, sipType_KTimezone, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
if (acpp)
- sipReleaseType(acpp, sipType_QString, acpp_state);
+ sipReleaseType(acpp, sipType_TQString, acpp_state);
*sipIsErr = 1;
delete cppmap;
@@ -259,7 +259,7 @@ private:
cppmap->insert (*acpp, bcpp);
- sipReleaseType(acpp, sipType_QString, acpp_state);
+ sipReleaseType(acpp, sipType_TQString, acpp_state);
}
*sipCppPtr = cppmap;
diff --git a/sip/tdeui/kaboutapplication.sip b/sip/tdeui/kaboutapplication.sip
index 3d7d5ef..e87fd5a 100644
--- a/sip/tdeui/kaboutapplication.sip
+++ b/sip/tdeui/kaboutapplication.sip
@@ -194,7 +194,7 @@ protected:
{sipName_KXMLGUIFactory, &sipClass_KXMLGUIFactory},
{sipName_KXYSelector, &sipClass_KXYSelector},
// {sipName_PyKPanelApplet, &sipClass_PyKPanelApplet},
-// {sipName_QXEmbed, &sipClass_QXEmbed},
+// {sipName_TQXEmbed, &sipClass_TQXEmbed},
};
sipClass = sipMapStringToClass(sipCpp -> className(),map,sizeof (map)/sizeof (map[0]));
diff --git a/sip/tdeui/kkeydialog.sip b/sip/tdeui/kkeydialog.sip
index 843e466..c612fd1 100644
--- a/sip/tdeui/kkeydialog.sip
+++ b/sip/tdeui/kkeydialog.sip
@@ -205,7 +205,7 @@ typedef TQDict<int> IntDict;
while (it.current ())
{
TQString current_key = it.currentKey ();
- PyObject *a0 = sipConvertFromInstance (&current_key, sipClass_QCString, sipTransferObj);
+ PyObject *a0 = sipConvertFromInstance (&current_key, sipClass_TQCString, sipTransferObj);
PyObject *a1 = PyInt_FromLong ((long) it.current ());
if ((a0 == NULL) || (a1 == NULL) || (PyDict_SetItem (dict, a0, a1) < 0))
@@ -238,12 +238,12 @@ typedef TQDict<int> IntDict;
{
int iserr = 0, a0_state;
- a0 = (TQString *)sipForceConvertToType(key, sipType_QString, sipTransferObj, SIP_NOT_NONE, &a0_state, &iserr);
+ a0 = (TQString *)sipForceConvertToType(key, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &a0_state, &iserr);
if ((iserr) || (!PyInt_Check (value)))
{
if (a0)
- sipReleaseType(a0, sipType_QString, a0_state);
+ sipReleaseType(a0, sipType_TQString, a0_state);
*sipIsErr = 1;
delete qdict;
@@ -254,7 +254,7 @@ typedef TQDict<int> IntDict;
qdict->insert (*a0, &a1);
- sipReleaseType(a0, sipType_QString, a0_state);
+ sipReleaseType(a0, sipType_TQString, a0_state);
}
*sipCppPtr = qdict;
diff --git a/sip/tdeui/klistview.sip b/sip/tdeui/klistview.sip
index 29a5a4e..8c68639 100644
--- a/sip/tdeui/klistview.sip
+++ b/sip/tdeui/klistview.sip
@@ -291,7 +291,7 @@ typedef TQPtrList<TQListViewItem> ListViewItems;
// the loop depends on the type of iterator the template makes available
for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () )
{
- if (((inst = sipConvertFromInstance (cpp, sipClass_QListViewItem, sipTransferObj)) == NULL)
+ if (((inst = sipConvertFromInstance (cpp, sipClass_TQListViewItem, sipTransferObj)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
@@ -315,7 +315,7 @@ typedef TQPtrList<TQListViewItem> ListViewItems;
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (TQListViewItem *)sipForceConvertToType(elem, sipType_QListViewItem, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
+ cpp = (TQListViewItem *)sipForceConvertToType(elem, sipType_TQListViewItem, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff --git a/sip/tdeui/kxmlguifactory.sip b/sip/tdeui/kxmlguifactory.sip
index 0f39344..aa55200 100644
--- a/sip/tdeui/kxmlguifactory.sip
+++ b/sip/tdeui/kxmlguifactory.sip
@@ -252,7 +252,7 @@ TQPtrList<KAction> testKActionList (TQPtrList<KAction>);
// the loop depends on the type of iterator the tmeplate makes available
for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () )
{
- if (((inst = sipConvertFromInstance (cpp, sipClass_QWidget, sipTransferObj)) == NULL)
+ if (((inst = sipConvertFromInstance (cpp, sipClass_TQWidget, sipTransferObj)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
@@ -276,7 +276,7 @@ TQPtrList<KAction> testKActionList (TQPtrList<KAction>);
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (TQWidget *)sipForceConvertToType(elem, sipType_QWidget, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
+ cpp = (TQWidget *)sipForceConvertToType(elem, sipType_TQWidget, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{