summaryrefslogtreecommitdiffstats
path: root/sip/tqt/tqstring.sip
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-01-24 19:43:01 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-01-31 20:42:36 +0900
commit244f8405a7d3f1db7f128f07bcd1ed3c31a5beae (patch)
tree5b5b6298aff2c80e15987f012e7992e24ad6576e /sip/tqt/tqstring.sip
parent27f46d6031d41aa6ce071885a7e280e1097680e1 (diff)
downloadpytqt-244f8405.tar.gz
pytqt-244f8405.zip
Add support for python 3.12 and raise minimum required version to 3.4.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 15eb6c387b2bfd9f54bd8223d483dd8c3998ea2e)
Diffstat (limited to 'sip/tqt/tqstring.sip')
-rw-r--r--sip/tqt/tqstring.sip35
1 files changed, 0 insertions, 35 deletions
diff --git a/sip/tqt/tqstring.sip b/sip/tqt/tqstring.sip
index 116140e..8ef101f 100644
--- a/sip/tqt/tqstring.sip
+++ b/sip/tqt/tqstring.sip
@@ -752,7 +752,6 @@ PyObject *PyTQt_tqt_PyObject_FromTQString(const TQString *tqstr)
{
PyObject *obj;
-#if PY_VERSION_HEX >= 0x03030000
// We have to work out exactly which kind to use. We assume ASCII while we
// are checking so that we only go through the string once in the most
// common case. Note that we can't use PyUnicode_FromKindAndData() because
@@ -787,24 +786,6 @@ PyObject *PyTQt_tqt_PyObject_FromTQString(const TQString *tqstr)
Py_UCS4 uch = tqstr->at(tqt_i).unicode();
PyUnicode_WRITE(kind, data, tqt_i, uch);
}
-#elif defined(Py_UNICODE_WIDE)
- // Note that this doesn't handle code points greater than 0xffff. It could
- // but it's only an issue for old versions of TQt.
-
- if ((obj = PyUnicode_FromUnicode(NULL, tqstr->length())) == NULL)
- return NULL;
-
- Py_UNICODE *pyu = PyUnicode_AS_UNICODE(obj);
-
- for (unsigned int i = 0; i < tqstr->length(); ++i)
- *pyu++ = (tqstr->at(i)).unicode();
-#else
- if ((obj = PyUnicode_FromUnicode(NULL, tqstr->length())) == NULL)
- return NULL;
-
- memcpy(PyUnicode_AS_UNICODE(obj), tqstr->ucs2(),
- tqstr->length() * sizeof (Py_UNICODE));
-#endif
return obj;
}
@@ -821,7 +802,6 @@ TQString *PyTQt_tqt_PyObject_AsTQString(PyObject *obj)
{
if (PyUnicode_Check(obj))
{
-#if PY_VERSION_HEX >= 0x03030000
SIP_SSIZE_T len = PyUnicode_GET_LENGTH(obj);
switch (PyUnicode_KIND(obj))
@@ -848,21 +828,6 @@ TQString *PyTQt_tqt_PyObject_AsTQString(PyObject *obj)
}
return NULL;
-#else
- TQString *tqstr = new TQString;
-
-# ifdef Py_UNICODE_WIDE
- Py_UNICODE *ucode = PyUnicode_AS_UNICODE(obj);
- SIP_SSIZE_T len = PyUnicode_GET_SIZE(obj);
-
- for (SIP_SSIZE_T i = 0; i < len; ++i)
- tqstr->append(TQChar((uint)ucode[i]));
-# else
- tqstr->setUnicodeCodes((ushort *)PyUnicode_AS_UNICODE(obj),PyUnicode_GET_SIZE(obj));
-# endif
-
- return tqstr;
-#endif
}
else if (PyBytes_Check(obj))
{