Fix accidental rename of strings to tqunicode

4 files changed, 18 insertions, 18 deletions

diff --git a/sphinx/annotations.rst b/sphinx/annotations.rst
index d43955a..05ab847 100644
--- a/sphinx/annotations.rst
+++ b/sphinx/annotations.rst
@@ -162,7 +162,7 @@ Argument Annotations
     encoding is ``"None"`` and the ``str`` type otherwise.
 
     Python v2 will use the ``str`` type to represent the argument if the
-    encoding is ``"None"`` and the ``tqunicode`` type otherwise.
+    encoding is ``"None"`` and the ``unicode`` type otherwise.
 
 
 .. argument-annotation:: GetWrapper
diff --git a/sphinx/c_api.rst b/sphinx/c_api.rst
index 7bcacc7..66e0af2 100644
--- a/sphinx/c_api.rst
+++ b/sphinx/c_api.rst
@@ -202,13 +202,13 @@ specification files.
     ``u`` (long) [unsigned int]
         Convert a C/C++ ``unsigned int`` to a Python long.
 
-    ``w`` (tqunicode/string) [wchar_t]
-        Convert a C/C++ wide character to a Python v2 tqunicode object or a
+    ``w`` (unicode/string) [wchar_t]
+        Convert a C/C++ wide character to a Python v2 unicode object or a
         Python v3 string object.
 
-    ``x`` (tqunicode/string) [wchar_t \*]
+    ``x`` (unicode/string) [wchar_t \*]
         Convert a C/C++ ``L'\0'`` terminated wide character string to a Python
-        v2 tqunicode object or a Python v3 string object.  If the string pointer
+        v2 unicode object or a Python v3 string object.  If the string pointer
         is ``NULL`` then the result is ``Py_None``.
 
     ``A`` (string) [char \*]
@@ -272,8 +272,8 @@ specification files.
         Convert a named C/C++ ``enum`` to an instance of the corresponding
         Python named enum type.
 
-    ``G`` (tqunicode) [wchar_t \*, :cmacro:`SIP_SSIZE_T`]
-        Convert a C/C++ wide character array and its length to a Python tqunicode
+    ``G`` (unicode) [wchar_t \*, :cmacro:`SIP_SSIZE_T`]
+        Convert a C/C++ wide character array and its length to a Python unicode
         object.  If the array is ``NULL`` then the length is ignored and the
         result is ``Py_None``.
 
@@ -1124,7 +1124,7 @@ specification files.
         Convert a Python string-like object of length 1 to a C/C++ ``char``
         according to the encoding ``e``.  ``e`` can either be ``A`` for ASCII,
         ``L`` for Latin-1, or ``8`` for UTF-8.  For Python v2 the object may be
-        either a string or a tqunicode object that can be encoded.  For Python v3
+        either a string or a unicode object that can be encoded.  For Python v3
         the object may either be a bytes object or a string object that can be
         encoded.  An object that supports the buffer protocol may also be used.
 
@@ -1182,12 +1182,12 @@ specification files.
     ``u`` (long) [unsigned int \*]
         Convert a Python long to a C/C++ ``unsigned int``.
 
-    ``w`` (tqunicode/string) [wchar_t \*]
-        Convert a Python v2 string or tqunicode object or a Python v3 string
+    ``w`` (unicode/string) [wchar_t \*]
+        Convert a Python v2 string or unicode object or a Python v3 string
         object of length 1 to a C/C++ wide character.
 
-    ``x`` (tqunicode/string) [wchar_t \*\*]
-        Convert a Python v2 string or tqunicode object or a Python v3 string
+    ``x`` (unicode/string) [wchar_t \*\*]
+        Convert a Python v2 string or unicode object or a Python v3 string
         object to a C/C++ ``L'\0'`` terminated wide character string.  If the
         Python object is ``Py_None`` then the string is ``NULL``.
 
@@ -1199,7 +1199,7 @@ specification files.
         identifies the object in the context defined by the ``S`` format
         character and allows an extra reference to the object to be kept to
         ensure that the string remains valid.  For Python v2 the object may be
-        either a string or a tqunicode object that can be encoded.  For Python v3
+        either a string or a unicode object that can be encoded.  For Python v3
         the object may either be a bytes object or a string object that can be
         encoded.  An object that supports the buffer protocol may also be used.
 
@@ -1258,8 +1258,8 @@ specification files.
     ``F`` (wrapped enum) [:ctype:`sipTypeDef` \*, enum \*]
         Convert a Python named enum type to the corresponding C/C++ ``enum``.
 
-    ``G`` (tqunicode/string) [wchar_t \*\*, :cmacro:`SIP_SSIZE_T` \*]
-        Convert a Python v2 string or tqunicode object or a Python v3 string
+    ``G`` (unicode/string) [wchar_t \*\*, :cmacro:`SIP_SSIZE_T` \*]
+        Convert a Python v2 string or unicode object or a Python v3 string
         object to a C/C++ wide character array and its length.  If the Python
         object is ``Py_None`` then the array and length are ``NULL`` and zero
         respectively.
diff --git a/sphinx/directives.rst b/sphinx/directives.rst
index 7c1a064..7e3a2e0 100644
--- a/sphinx/directives.rst
+++ b/sphinx/directives.rst
@@ -515,7 +515,7 @@ the correct type prior to conversion.
 When used as part of a class specification it can automatically convert
 additional types of Python object.  For example, PyQt uses it in the
 specification of the ``QString`` class to allow Python string objects and
-tqunicode objects to be used wherever ``QString`` instances are expected.
+unicode objects to be used wherever ``QString`` instances are expected.
 
 The following variables are made available to the handwritten code:
 
diff --git a/sphinx/using.rst b/sphinx/using.rst
index 99fd389..961ff94 100644
--- a/sphinx/using.rst
+++ b/sphinx/using.rst
@@ -552,8 +552,8 @@ Support for Wide Characters
 ---------------------------
 
 SIP v4.6 introduced support for wide characters (i.e. the ``wchar_t`` type).
-Python's C API includes support for converting between tqunicode objects and wide
-character strings and arrays.  When converting from a tqunicode object to wide
+Python's C API includes support for converting between unicode objects and wide
+character strings and arrays.  When converting from a unicode object to wide
 characters SIP creates the string or array on the heap (using memory allocated
 using :cfunc:`sipMalloc()`).  This then raises the problem of how this memory
 is subsequently freed.