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

1 files changed, 16 insertions, 16 deletions

diff --git a/kexi/plugins/macros/tests/commontests.cpp b/kexi/plugins/macros/tests/commontests.cpp
index 1086a340..bdc2e6ad 100644
--- a/kexi/plugins/macros/tests/commontests.cpp
+++ b/kexi/plugins/macros/tests/commontests.cpp
@@ -424,7 +424,7 @@ void CommonTests::testFunction()
 	domdocument.setContent(TQString(
 		"<function name=\"" + name + "\" text=\"" + text + "\" comment=\"" + comment + "\" receiver=\"" + receiver + "\" slot=\"myslot(const TQString &amp; , int)\">"
 			"<argument>" + argument1 + "</argument>"
-			"<argument>" + TQString("%1").tqarg(argument2) + "</argument>"
+			"<argument>" + TQString("%1").arg(argument2) + "</argument>"
 		"</function>"
 	));
 
@@ -677,7 +677,7 @@ void CommonTests::testMacro()
 //	KOMACROTEST_ASSERT( actionptr->comment(), TQString("") );
 /*
 	//fetch the second one
-	KSharedPtr<KoMacro::Action> myfuncptr = tqchildren[1];
+	KSharedPtr<KoMacro::Action> myfuncptr = children[1];
 	//cast it to function
 	
                                                                                     KoMacro::Function* myfunc = dynamic_cast<KoMacro::Function*>( myfuncptr.data() );
@@ -712,8 +712,8 @@ void CommonTests::testMacro()
 	//KOMACROTEST_XASSERT((int) yanActionptr2.data(), 0);
 	//KOMACROTEST_XASSERT((int) yanActionptr3.data(), 0);
 	
-	//create a list of the tqchildren from yanMacro
-	//TQValueList< KSharedPtr<KoMacro::Action> > yanChildren = yanMacro->tqchildren();
+	//create a list of the children from yanMacro
+	//TQValueList< KSharedPtr<KoMacro::Action> > yanChildren = yanMacro->children();
 	//check that there are two
 	//KOMACROTEST_ASSERT(yanChildren.count(), uint(2));
 /*
@@ -722,9 +722,9 @@ void CommonTests::testMacro()
 		const int oldsize = yanChildren.count();
 		//add a new child to the macro
 		yanMacro->addChild(yanActionptr2);
-		//get the tqchildren
-		yanChildren = yanMacro->tqchildren();
-		//get count of tqchildren
+		//get the children
+		yanChildren = yanMacro->children();
+		//get count of children
 		const int size = yanChildren.count();
 		//check count has changed
 		KOMACROTEST_XASSERT(size, oldsize);
@@ -735,9 +735,9 @@ void CommonTests::testMacro()
 		const int oldsize = yanChildren.count();
 		//add a new child to the macro		
 		yanMacro->addChild(yanActionptr3);
-		//get the tqchildren
-		yanChildren = yanMacro->tqchildren();
-		//get count of tqchildren
+		//get the children
+		yanChildren = yanMacro->children();
+		//get count of children
 		const int size = yanChildren.count();
 		//check count has changed
 		KOMACROTEST_XASSERT(size, oldsize);
@@ -859,12 +859,12 @@ void CommonTests::testVariables()
 		//check that it is not null
 	KOMACROTEST_XASSERT((int) macro, 0);
 		
-	//create a list of its tqchildren
-	TQValueList< KSharedPtr<KoMacro::Action> > tqchildren = macro->tqchildren();
-	//Check that there are two tqchildren. The first child is always the returnvalue.
-	KOMACROTEST_ASSERT( tqchildren.count(), uint(2) );
-	//fetch the tqchildren
-	KSharedPtr<KoMacro::Action> func1ptr = tqchildren[1];
+	//create a list of its children
+	TQValueList< KSharedPtr<KoMacro::Action> > children = macro->children();
+	//Check that there are two children. The first child is always the returnvalue.
+	KOMACROTEST_ASSERT( children.count(), uint(2) );
+	//fetch the children
+	KSharedPtr<KoMacro::Action> func1ptr = children[1];
 
 	//create new context
 	KSharedPtr<KoMacro::Context> context = new KoMacro::Context(macroptr);