From 94844816550ad672ccfcdc25659c625546239998 Mon Sep 17 00:00:00 2001
From: Timothy Pearson
Date: Thu, 15 Dec 2011 15:32:11 -0600
Subject: Rename a number of old tq methods that are no longer tq specific
---
lib/kross/python/cxx/Objects.hxx | 16 ++++++++--------
lib/kross/python/cxx/PyCXX.html | 12 ++++++------
lib/kross/python/cxx/cxxsupport.cxx | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
(limited to 'lib/kross/python/cxx')
diff --git a/lib/kross/python/cxx/Objects.hxx b/lib/kross/python/cxx/Objects.hxx
index 900a347b..41648320 100644
--- a/lib/kross/python/cxx/Objects.hxx
+++ b/lib/kross/python/cxx/Objects.hxx
@@ -54,7 +54,7 @@ namespace Py
// The purpose of this class is to serve as the most general kind of
// Python object, for the purpose of writing C++ extensions in Python
// Objects hold a PyObject* which they own. This pointer is always a
- // valid pointer to a Python object. In tqchildren we must maintain this behavior.
+ // valid pointer to a Python object. In children we must maintain this behavior.
//
// Instructions on how to make your own class MyType descended from Object:
// (0) Pick a base class, either Object or perhaps SeqBase or MapBase.
@@ -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 tqunicodestring;
- extern Py_UNICODE tqunicode_null_string[1];
+ typedef std::basic_string 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(v.data()),1), true);
return *this;
@@ -1650,7 +1650,7 @@ namespace Py
static_cast( v.length() ) ), true );
return *this;
}
- String& operator= (const tqunicodestring& v)
+ String& operator= (const unicodestring& v)
{
set( PyUnicode_FromUnicode( const_cast( v.data() ),
static_cast( 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( 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 7213ad70..46d065bb 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:
Download PyCXX from http://sourceforge.net/projects/cxx/.
-The distribution tqlayout is:
+The distribution layout is:
Directory | Description |
. | Makefile for Unix and Windows, Release documentation |
@@ -303,7 +303,7 @@ returned by such a function, you need to know if the function returns you an
or unowned reference. Unowned references are unusual but there are some cases where
unowned references are returned.
-Usually, Object and its tqchildren acquire a new reference when constructed from a
+
Usually, Object and its children acquire a new reference when constructed from a
PyObject *. This is usually not the right behavior if the reference comes from one
of the Python C API calls.
@@ -1188,8 +1188,8 @@ sequence.
as_std_string() const |
- tqunicodestring |
- as_tqunicodestring() const |
+ unicodestring |
+ as_unicodestring() const |
@@ -1571,7 +1571,7 @@ converted to a standard string which is passed to std::ostream& operator<
The Python exception facility and the C++ exception facility can be merged via the use
of try/catch blocks in the bodies of extension objects and module functions.
-Class Exception and its tqchildren
+Class Exception and its children
A set of classes is provided. Each is derived from class Exception, and represents a
particular sort of Python exception, such as IndexError, RuntimeError, ValueError. Each of
@@ -1612,7 +1612,7 @@ classes are shown here.
|
- Constructors for other tqchildren of class Exception |
+ Constructors for other children of class Exception |
|
diff --git a/lib/kross/python/cxx/cxxsupport.cxx b/lib/kross/python/cxx/cxxsupport.cxx
index b7bcaa0a..61329b60 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.1