From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 25 Jun 2011 05:28:35 +0000
Subject: TQt4 port koffice This should enable compilation under both Qt3 and
 Qt4; fixes for any missed components will be forthcoming

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 lib/kross/python/cxx/Objects.hxx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/kross/python/cxx/Objects.hxx')

diff --git a/lib/kross/python/cxx/Objects.hxx b/lib/kross/python/cxx/Objects.hxx
index 416483206..900a347bb 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 children we must maintain this behavior.
+	// valid pointer to a Python object. In tqchildren 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<T> or MapBase<T>.
@@ -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> unicodestring;
-	extern Py_UNICODE unicode_null_string[1];
+	typedef std::basic_string<Py_UNICODE> tqunicodestring;
+	extern Py_UNICODE tqunicode_null_string[1];
 
 	class Char: public Object
 		{
@@ -1535,7 +1535,7 @@ namespace Py
 			return *this;
 			}
 
-		Char& operator= (const unicodestring& v)
+		Char& operator= (const tqunicodestring& 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 unicodestring& v)
+		String& operator= (const tqunicodestring& v)
 			{
 			set( PyUnicode_FromUnicode( const_cast<Py_UNICODE*>( v.data() ),
 					static_cast<int>( v.length() ) ), true );
@@ -1706,16 +1706,16 @@ namespace Py
 			}
 			}
 
-		unicodestring as_unicodestring() const
+		tqunicodestring as_tqunicodestring() const
 			{
 			if( isUnicode() )
 			{
-				return unicodestring( PyUnicode_AS_UNICODE( ptr() ),
+				return tqunicodestring( PyUnicode_AS_UNICODE( ptr() ),
 					static_cast<size_type>( PyUnicode_GET_SIZE( ptr() ) ) );
 			}
 			else
 			{
-				throw TypeError("can only return unicodestring from Unicode object");
+				throw TypeError("can only return tqunicodestring from Unicode object");
 			}
 			}
 		};
-- 
cgit v1.2.3