Rename a number of old tq methods that are no longer tq specific

1 files changed, 26 insertions, 26 deletions

diff --git a/lib/kross/python/pythonextension.cpp b/lib/kross/python/pythonextension.cpp
index f13cf93a..dbbe9bf6 100644
--- a/lib/kross/python/pythonextension.cpp
+++ b/lib/kross/python/pythonextension.cpp
@@ -31,7 +31,7 @@ PythonExtension::PythonExtension(Kross::Api::Object::Ptr object)
     , m_object(object)
 {
 #ifdef KROSS_PYTHON_EXTENSION_CTOR_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::Constructor objectname='%1' objectclass='%2'").tqarg(m_object->getName()).tqarg(m_object->getClassName()) );
+    krossdebug( TQString("Kross::Python::PythonExtension::Constructor objectname='%1' objectclass='%2'").arg(m_object->getName()).arg(m_object->getClassName()) );
 #endif
 
     behaviors().name("KrossPythonExtension");
@@ -55,7 +55,7 @@ PythonExtension::PythonExtension(Kross::Api::Object::Ptr object)
 PythonExtension::~PythonExtension()
 {
 #ifdef KROSS_PYTHON_EXTENSION_DTOR_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::Destructor objectname='%1' objectclass='%2'").tqarg(m_object->getName()).tqarg(m_object->getClassName()) );
+    krossdebug( TQString("Kross::Python::PythonExtension::Destructor objectname='%1' objectclass='%2'").arg(m_object->getName()).arg(m_object->getClassName()) );
 #endif
     delete m_proxymethod;
 }
@@ -77,7 +77,7 @@ Py::Object PythonExtension::repr()
 Py::Object PythonExtension::getattr(const char* n)
 {
 #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1'").tqarg(n) );
+    krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1'").arg(n) );
 #endif
 
     if(n[0] == '_') {
@@ -86,7 +86,7 @@ Py::Object PythonExtension::getattr(const char* n)
             TQStringList calls = m_object->getCalls();
             for(TQStringList::Iterator it = calls.begin(); it != calls.end(); ++it) {
 #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG
-                krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' callable='%2'").tqarg(n).tqarg(*it) );
+                krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' callable='%2'").arg(n).arg(*it) );
 #endif
                 methods.append(Py::String( (*it).latin1() ));
             }
@@ -97,11 +97,11 @@ Py::Object PythonExtension::getattr(const char* n)
             Py::List members;
             Kross::Api::Callable* callable = dynamic_cast<Kross::Api::Callable*>(m_object.data());
             if(callable) {
-                TQMap<TQString, Kross::Api::Object::Ptr> tqchildren = callable->getChildren();
-                TQMap<TQString, Kross::Api::Object::Ptr>::Iterator it( tqchildren.begin() );
-                for(; it != tqchildren.end(); ++it) {
+                TQMap<TQString, Kross::Api::Object::Ptr> children = callable->getChildren();
+                TQMap<TQString, Kross::Api::Object::Ptr>::Iterator it( children.begin() );
+                for(; it != children.end(); ++it) {
 #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG
-                    krossdebug( TQString("Kross::Python::PythonExtension::getattr n='%1' child='%2'").tqarg(n).tqarg(it.key()) );
+                    krossdebug( TQString("Kross::Python::PythonExtension::getattr n='%1' child='%2'").arg(n).arg(it.key()) );
 #endif
                     members.append(Py::String( it.key().latin1() ));
                 }
@@ -109,11 +109,11 @@ Py::Object PythonExtension::getattr(const char* n)
             return members;
         }
 
-        //if(n == "__dict__") { krosswarning( TQString("PythonExtension::getattr(%1) __dict__").tqarg(n) ); return Py::None(); }
-        //if(n == "__class__") { krosswarning( TQString("PythonExtension::getattr(%1) __class__").tqarg(n) ); return Py::None(); }
+        //if(n == "__dict__") { krosswarning( TQString("PythonExtension::getattr(%1) __dict__").arg(n) ); return Py::None(); }
+        //if(n == "__class__") { krosswarning( TQString("PythonExtension::getattr(%1) __class__").arg(n) ); return Py::None(); }
 
 #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG
-        krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' is a internal name.").tqarg(n) );
+        krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' is a internal name.").arg(n) );
 #endif
         return Py::PythonExtension<PythonExtension>::getattr_methods(n);
     }
@@ -130,7 +130,7 @@ Py::Object PythonExtension::getattr(const char* n)
 Py::Object PythonExtension::getattr_methods(const char* n)
 {
 #ifdef KROSS_PYTHON_EXTENSION_GETATTRMETHOD_DEBUG
-    krossdebug( TQString("PythonExtension::getattr_methods name=%1").tqarg(n) );
+    krossdebug( TQString("PythonExtension::getattr_methods name=%1").arg(n) );
 #endif
     return Py::PythonExtension<PythonExtension>::getattr_methods(n);
 }
@@ -138,7 +138,7 @@ Py::Object PythonExtension::getattr_methods(const char* n)
 int PythonExtension::setattr(const char* name, const Py::Object& value)
 {
 #ifdef KROSS_PYTHON_EXTENSION_SETATTR_DEBUG
-    krossdebug( TQString("PythonExtension::setattr name=%1 value=%2").tqarg(name).tqarg(value.as_string().c_str()) );
+    krossdebug( TQString("PythonExtension::setattr name=%1 value=%2").arg(name).arg(value.as_string().c_str()) );
 #endif
     return Py::PythonExtension<PythonExtension>::setattr(name, value);
 }
@@ -185,13 +185,13 @@ Kross::Api::Dict::Ptr PythonExtension::toObject(const Py::Dict& dict)
 Kross::Api::Object::Ptr PythonExtension::toObject(const Py::Object& object)
 {
 #ifdef KROSS_PYTHON_EXTENSION_TOOBJECT_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) object='%1'").tqarg(object.as_string().c_str()) );
+    krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) object='%1'").arg(object.as_string().c_str()) );
 #endif
     if(object == Py::None())
         return 0;
     PyTypeObject *type = (PyTypeObject*) object.type().ptr();
 #ifdef KROSS_PYTHON_EXTENSION_TOOBJECT_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) type='%1'").tqarg(type->tp_name) );
+    krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) type='%1'").arg(type->tp_name) );
 #endif
     if(type == &PyInt_Type)
         return new Kross::Api::Variant(int(Py::Int(object)));
@@ -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());
@@ -287,7 +287,7 @@ const Py::List PythonExtension::toPyObject(const TQValueList<TQVariant>& list)
 const Py::Object PythonExtension::toPyObject(const TQVariant& variant)
 {
 #ifdef KROSS_PYTHON_EXTENSION_TOPYOBJECT_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) typename='%1'").tqarg(variant.typeName()) );
+    krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) typename='%1'").arg(variant.typeName()) );
 #endif
 
     switch(variant.type()) {
@@ -331,7 +331,7 @@ const Py::Object PythonExtension::toPyObject(const TQVariant& variant)
         } break;
 
         default: {
-            krosswarning( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) Not possible to convert the TQVariant type '%1' to a Py::Object.").tqarg(variant.typeName()) );
+            krosswarning( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) Not possible to convert the TQVariant type '%1' to a Py::Object.").arg(variant.typeName()) );
             return Py::None();
         }
     }
@@ -350,7 +350,7 @@ const Py::Object PythonExtension::toPyObject(Kross::Api::Object::Ptr object)
     if(classname == "Kross::Api::Variant") {
         TQVariant v = static_cast<Kross::Api::Variant*>( object.data() )->getValue();
 #ifdef KROSS_PYTHON_EXTENSION_TOPYOBJECT_DEBUG
-        krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(Kross::Api::Object) is Kross::Api::Variant %1").tqarg(v.toString()) );
+        krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(Kross::Api::Object) is Kross::Api::Variant %1").arg(v.toString()) );
 #endif
         return toPyObject(v);
     }
@@ -382,7 +382,7 @@ const Py::Object PythonExtension::toPyObject(Kross::Api::Object::Ptr object)
     }
 
 #ifdef KROSS_PYTHON_EXTENSION_TOPYOBJECT_DEBUG
-    krossdebug( TQString("Trying to handle PythonExtension::toPyObject(%1) as PythonExtension").tqarg(object->getClassName()) );
+    krossdebug( TQString("Trying to handle PythonExtension::toPyObject(%1) as PythonExtension").arg(object->getClassName()) );
 #endif
     return Py::asObject( new PythonExtension(object) );
 }
@@ -390,7 +390,7 @@ const Py::Object PythonExtension::toPyObject(Kross::Api::Object::Ptr object)
 const Py::Tuple PythonExtension::toPyTuple(Kross::Api::List::Ptr list)
 {
 #ifdef KROSS_PYTHON_EXTENSION_TOPYOBJECT_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::toPyTuple(Kross::Api::List) name='%1'").tqarg(list ? list->getName() : "NULL") );
+    krossdebug( TQString("Kross::Python::PythonExtension::toPyTuple(Kross::Api::List) name='%1'").arg(list ? list->getName() : "NULL") );
 #endif
     uint count = list ? list->count() : 0;
     Py::Tuple tuple(count);
@@ -409,20 +409,20 @@ PyObject* PythonExtension::proxyhandler(PyObject *_self_and_name_tuple, PyObject
         Kross::Api::List::Ptr arguments = toObject( Py::Tuple(args) );
 
 #ifdef KROSS_PYTHON_EXTENSION_CALL_DEBUG
-        krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' arguments='%2'").tqarg(methodname).tqarg(arguments->toString()) );
+        krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' arguments='%2'").arg(methodname).arg(arguments->toString()) );
 #endif
 
         Kross::Api::Callable* callable = dynamic_cast<Kross::Api::Callable*>(self->m_object.data());
         if(callable && callable->hasChild(methodname)) {
 #ifdef KROSS_PYTHON_EXTENSION_CALL_DEBUG
-            krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' is a child object of '%2'.").tqarg(methodname).tqarg(self->m_object->getName()) );
+            krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' is a child object of '%2'.").arg(methodname).arg(self->m_object->getName()) );
 #endif
             Py::Object result = toPyObject( callable->getChild(methodname)->call(TQString(), arguments) );
             result.increment_reference_count();
             return result.ptr();
         }
 #ifdef KROSS_PYTHON_EXTENSION_CALL_DEBUG
-        krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler try to call function with methodname '%1' in object '%2'.").tqarg(methodname).tqarg(self->m_object->getName()) );
+        krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler try to call function with methodname '%1' in object '%2'.").arg(methodname).arg(self->m_object->getName()) );
 #endif
         Py::Object result = toPyObject( self->m_object->call(methodname, arguments) );
         result.increment_reference_count();
@@ -430,12 +430,12 @@ PyObject* PythonExtension::proxyhandler(PyObject *_self_and_name_tuple, PyObject
     }
     catch(Py::Exception& e) {
         const TQString err = Py::value(e).as_string().c_str();
-        krosswarning( TQString("Py::Exception in Kross::Python::PythonExtension::proxyhandler %1").tqarg(err) );
+        krosswarning( TQString("Py::Exception in Kross::Python::PythonExtension::proxyhandler %1").arg(err) );
         //throw e;
     }
     catch(Kross::Api::Exception::Ptr e) {
         const TQString err = e->toString();
-        krosswarning( TQString("Kross::Api::Exception in Kross::Python::PythonExtension::proxyhandler %1").tqarg(err) );
+        krosswarning( TQString("Kross::Api::Exception in Kross::Python::PythonExtension::proxyhandler %1").arg(err) );
         // Don't throw here cause it will end in a crash deep in python. The
         // error is already handled anyway.
         //throw Py::Exception( (char*) e->toString().latin1() );