From c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:31 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 94844816550ad672ccfcdc25659c625546239998. --- lib/kross/api/callable.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'lib/kross/api/callable.cpp') diff --git a/lib/kross/api/callable.cpp b/lib/kross/api/callable.cpp index b85aa4cd..f095f596 100644 --- a/lib/kross/api/callable.cpp +++ b/lib/kross/api/callable.cpp @@ -47,26 +47,26 @@ const TQString Callable::getClassName() const bool Callable::hasChild(const TQString& name) const { - return m_children.contains(name); + return m_tqchildren.contains(name); } Object::Ptr Callable::getChild(const TQString& name) const { - return m_children[name]; + return m_tqchildren[name]; } TQMap Callable::getChildren() const { - return m_children; + return m_tqchildren; } bool Callable::addChild(const TQString& name, Object* object) { #ifdef KROSS_API_OBJECT_ADDCHILD_DEBUG krossdebug( TQString("Kross::Api::Callable::addChild() object.name='%1' object.classname='%2'") - .arg(name).arg(object->getClassName()) ); + .tqarg(name).tqarg(object->getClassName()) ); #endif - m_children.replace(name, Object::Ptr(object)); + m_tqchildren.replace(name, Object::Ptr(object)); return true; } @@ -78,9 +78,9 @@ bool Callable::addChild(Callable* object) void Callable::removeChild(const TQString& name) { #ifdef KROSS_API_OBJECT_REMCHILD_DEBUG - krossdebug( TQString("Kross::Api::Callable::removeChild() name='%1'").arg(name) ); + krossdebug( TQString("Kross::Api::Callable::removeChild() name='%1'").tqarg(name) ); #endif - m_children.remove(name); + m_tqchildren.remove(name); } void Callable::removeAllChildren() @@ -88,13 +88,13 @@ void Callable::removeAllChildren() #ifdef KROSS_API_OBJECT_REMCHILD_DEBUG krossdebug( "Kross::Api::Callable::removeAllChildren()" ); #endif - m_children.clear(); + m_tqchildren.clear(); } Object::Ptr Callable::call(const TQString& name, List::Ptr args) { #ifdef KROSS_API_CALLABLE_CALL_DEBUG - krossdebug( TQString("Kross::Api::Callable::call() name=%1 getName()=%2 arguments=%3").arg(name).arg(getName()).arg(args ? args->toString() : TQString("")) ); + krossdebug( TQString("Kross::Api::Callable::call() name=%1 getName()=%2 arguments=%3").tqarg(name).tqarg(getName()).tqarg(args ? args->toString() : TQString("")) ); #endif if(name.isEmpty()) // return a self-reference if no functionname is defined. @@ -111,7 +111,7 @@ Object::Ptr Callable::call(const TQString& name, List::Ptr args) TQString s = Variant::toString(args->item(0)); Object::Ptr obj = getChild(s); if(! obj) - throw Exception::Ptr( new Exception(TQString("The object '%1' has no child object '%2'").arg(getName()).arg(s)) ); + throw Exception::Ptr( new Exception(TQString("The object '%1' has no child object '%2'").tqarg(getName()).tqarg(s)) ); return obj; } else if(name == "has") { @@ -123,9 +123,9 @@ Object::Ptr Callable::call(const TQString& name, List::Ptr args) } else if(name == "list") { TQStringList list; - TQMap children = getChildren(); - TQMap::Iterator it( children.begin() ); - for(; it != children.end(); ++it) + TQMap tqchildren = getChildren(); + TQMap::Iterator it( tqchildren.begin() ); + for(; it != tqchildren.end(); ++it) list.append( it.key() ); return new Variant(list); } @@ -134,6 +134,6 @@ Object::Ptr Callable::call(const TQString& name, List::Ptr args) } // If there exists no such object return NULL. - krossdebug( TQString("Object '%1' has no callable object named '%2'.").arg(getName()).arg(name) ); + krossdebug( TQString("Object '%1' has no callable object named '%2'.").tqarg(getName()).tqarg(name) ); return 0; } -- cgit v1.2.1