From 2d6954f69caf63ed5057bd8e1405a65d7d970292 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 21 Dec 2011 14:05:41 -0600
Subject: Rename obsolete tq methods to standard names

---
 lib/kross/python/cxx/Objects.hxx    | 14 +++++++-------
 lib/kross/python/cxx/PyCXX.html     |  6 +++---
 lib/kross/python/cxx/cxxsupport.cxx |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'lib/kross/python/cxx')

diff --git a/lib/kross/python/cxx/Objects.hxx b/lib/kross/python/cxx/Objects.hxx
index 3aa790e6a..416483206 100644
--- a/lib/kross/python/cxx/Objects.hxx
+++ b/lib/kross/python/cxx/Objects.hxx
@@ -1470,8 +1470,8 @@ namespace Py
 	// Python strings return strings as individual elements.
 	// I'll try having a class Char which is a String of length 1
 	//
-	typedef std::basic_string<Py_UNICODE> tqunicodestring;
-	extern Py_UNICODE tqunicode_null_string[1];
+	typedef std::basic_string<Py_UNICODE> unicodestring;
+	extern Py_UNICODE unicode_null_string[1];
 
 	class Char: public Object
 		{
@@ -1535,7 +1535,7 @@ namespace Py
 			return *this;
 			}
 
-		Char& operator= (const tqunicodestring& v)
+		Char& operator= (const unicodestring& v)
 			{
 			set(PyUnicode_FromUnicode (const_cast<Py_UNICODE*>(v.data()),1), true);
 			return *this;
@@ -1650,7 +1650,7 @@ namespace Py
 					static_cast<int>( v.length() ) ), true );
 			return *this;
 			}
-		String& operator= (const tqunicodestring& v)
+		String& operator= (const unicodestring& v)
 			{
 			set( PyUnicode_FromUnicode( const_cast<Py_UNICODE*>( v.data() ),
 					static_cast<int>( v.length() ) ), true );
@@ -1706,16 +1706,16 @@ namespace Py
 			}
 			}
 
-		tqunicodestring as_tqunicodestring() const
+		unicodestring as_unicodestring() const
 			{
 			if( isUnicode() )
 			{
-				return tqunicodestring( PyUnicode_AS_UNICODE( ptr() ),
+				return unicodestring( PyUnicode_AS_UNICODE( ptr() ),
 					static_cast<size_type>( PyUnicode_GET_SIZE( ptr() ) ) );
 			}
 			else
 			{
-				throw TypeError("can only return tqunicodestring from Unicode object");
+				throw TypeError("can only return unicodestring from Unicode object");
 			}
 			}
 		};
diff --git a/lib/kross/python/cxx/PyCXX.html b/lib/kross/python/cxx/PyCXX.html
index e162e6012..46d065bb7 100644
--- a/lib/kross/python/cxx/PyCXX.html
+++ b/lib/kross/python/cxx/PyCXX.html
@@ -62,7 +62,7 @@ integrates Python with C++ in these ways: </p>
 
 <p>Download PyCXX from <a href="http://sourceforge.net/projects/cxx/">http://sourceforge.net/projects/cxx/</a>.</p>
 
-<p>The distribution tqlayout is:</p>
+<p>The distribution layout is:</p>
 <table>
 <tr><th>Directory</th><th>Description</th></tr>
 <tr><td class=code>.</td><td>Makefile for Unix and Windows, Release documentation</td>
@@ -1188,8 +1188,8 @@ sequence.</p>
     <td class=code>as_std_string() const</td>
   </tr>
   <tr>
-    <td class=code>tqunicodestring</td>
-    <td class=code>as_tqunicodestring() const</td>
+    <td class=code>unicodestring</td>
+    <td class=code>as_unicodestring() const</td>
   </tr>
 </table>
 
diff --git a/lib/kross/python/cxx/cxxsupport.cxx b/lib/kross/python/cxx/cxxsupport.cxx
index b7bcaa0ae..61329b604 100644
--- a/lib/kross/python/cxx/cxxsupport.cxx
+++ b/lib/kross/python/cxx/cxxsupport.cxx
@@ -6,7 +6,7 @@
 #include "Objects.hxx"
 namespace Py {
 
-Py_UNICODE tqunicode_null_string[1] = { 0 };
+Py_UNICODE unicode_null_string[1] = { 0 };
 
 Type Object::type () const
 	{ 
-- 
cgit v1.2.3