From 2d6954f69caf63ed5057bd8e1405a65d7d970292 Mon Sep 17 00:00:00 2001 From: Timothy Pearson 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 +- lib/kross/python/pythonextension.cpp | 2 +- lib/kross/python/scripts/RestrictedPython/Guards.py | 2 +- lib/kross/python/scripts/gui.py | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'lib/kross/python') 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 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 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:

Download PyCXX from http://sourceforge.net/projects/cxx/.

-

The distribution tqlayout is:

+

The distribution layout is:

@@ -1188,8 +1188,8 @@ sequence.

- - + +
DirectoryDescription
.Makefile for Unix and Windows, Release documentation as_std_string() const
tqunicodestringas_tqunicodestring() constunicodestringas_unicodestring() const
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 { diff --git a/lib/kross/python/pythonextension.cpp b/lib/kross/python/pythonextension.cpp index 9d8c3eceb..dbbe9bf6c 100644 --- a/lib/kross/python/pythonextension.cpp +++ b/lib/kross/python/pythonextension.cpp @@ -206,7 +206,7 @@ Kross::Api::Object::Ptr PythonExtension::toObject(const Py::Object& object) #ifdef Py_USING_UNICODE /* TODO if(type == &PyUnicode_Type) { - Py::tqunicodestring u = Py::String(object).as_tqunicodestring(); + Py::unicodestring u = Py::String(object).as_unicodestring(); std::string s; std::copy(u.begin(), u.end(), std::back_inserter(s)); return new Kross::Api::Variant(s.c_str()); diff --git a/lib/kross/python/scripts/RestrictedPython/Guards.py b/lib/kross/python/scripts/RestrictedPython/Guards.py index 295ba7913..4fbdcad1c 100644 --- a/lib/kross/python/scripts/RestrictedPython/Guards.py +++ b/lib/kross/python/scripts/RestrictedPython/Guards.py @@ -24,7 +24,7 @@ for name in ['False', 'None', 'True', 'abs', 'basestring', 'bool', 'callable', 'chr', 'cmp', 'complex', 'divmod', 'float', 'hash', 'hex', 'id', 'int', 'isinstance', 'issubclass', 'len', 'long', 'oct', 'ord', 'pow', 'range', 'repr', 'round', - 'str', 'tuple', 'unichr', 'tqunicode', 'xrange', 'zip']: + 'str', 'tuple', 'unichr', 'unicode', 'xrange', 'zip']: safe_builtins[name] = __builtins__[name] diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py index 7461447a5..9b8e0f8c4 100755 --- a/lib/kross/python/scripts/gui.py +++ b/lib/kross/python/scripts/gui.py @@ -190,9 +190,9 @@ class QtDialog: def __init__(self, parent = None, name = None, modal = 0, fl = 0): qt.QDialog.__init__(self, parent, name, modal, fl) qt.QDialog.accept = self.accept - self.tqlayout = qt.QVBoxLayout(self) - self.tqlayout.setSpacing(6) - self.tqlayout.setMargin(11) + self.layout = qt.QVBoxLayout(self) + self.layout.setSpacing(6) + self.layout.setMargin(11) class Label(qt.QLabel): def __init__(self, dialog, parent, caption): @@ -323,7 +323,7 @@ class QtDialog: self.widget = qt.QVBox(self.dialog) self.widget.setSpacing(6) - self.dialog.tqlayout.addWidget(self.widget) + self.dialog.layout.addWidget(self.widget) self.Frame = Frame self.Label = Label -- cgit v1.2.3