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

11 files changed, 48 insertions, 48 deletions

diff --git a/kexi/plugins/macros/lib/action.cpp b/kexi/plugins/macros/lib/action.cpp
index 45c03d12..fc729b57 100644
--- a/kexi/plugins/macros/lib/action.cpp
+++ b/kexi/plugins/macros/lib/action.cpp
@@ -81,7 +81,7 @@ Action::Action(const TQString& name, const TQString& text)
 
 Action::~Action()
 {
-	//kdDebug() << TQString("Action::~Action() name=\"%1\"").tqarg(name()) << endl;
+	//kdDebug() << TQString("Action::~Action() name=\"%1\"").arg(name()) << endl;
 
 	// destroy the private d-pointer instance.
 	delete d;
@@ -89,7 +89,7 @@ Action::~Action()
 
 const TQString Action::toString() const
 {
-	return TQString("Action:%1").tqarg(name());
+	return TQString("Action:%1").arg(name());
 }
 
 const TQString Action::name() const
diff --git a/kexi/plugins/macros/lib/context.cpp b/kexi/plugins/macros/lib/context.cpp
index 7c0b6ee8..c0eea250 100644
--- a/kexi/plugins/macros/lib/context.cpp
+++ b/kexi/plugins/macros/lib/context.cpp
@@ -44,7 +44,7 @@ namespace KoMacro {
 			KSharedPtr<Macro> macro;
 
 			/**
-			* List of @a Action instances that are tqchildren of the
+			* List of @a Action instances that are children of the
 			* macro.
 			*/
 			TQValueList<KSharedPtr<MacroItem > > items;
@@ -70,7 +70,7 @@ namespace KoMacro {
 			/// Constructor.
 			explicit Private(KSharedPtr<Macro> m)
 				: macro(m) // remember the macro
-				, items(m->items()) // set d-pointer tqchildren to macro tqchildren
+				, items(m->items()) // set d-pointer children to macro children
 				, exception(0) // no exception yet.
 			{
 			}
@@ -119,7 +119,7 @@ KSharedPtr<Variable> Context::variable(const TQString& name) const
 		}
 	}
 	//none found throw exception
-	throw Exception(TQString("Variable name='%1' does not exist.").tqarg(name));
+	throw Exception(TQString("Variable name='%1' does not exist.").arg(name));
 }
 
 //return a map of our (d-pointer) variables
@@ -132,7 +132,7 @@ Variable::Map Context::variables() const
 void Context::setVariable(const TQString& name, KSharedPtr<Variable> variable)
 {
 	//debuging infos
-	kdDebug() << TQString("KoMacro::Context::setVariable name='%1' variable='%2'").tqarg(name).tqarg(variable->toString()) << endl;
+	kdDebug() << TQString("KoMacro::Context::setVariable name='%1' variable='%2'").arg(name).arg(variable->toString()) << endl;
 	//Use TQMap?s replace to set/replace the variable named name
 	d->variables.replace(name, variable);
 }
@@ -198,14 +198,14 @@ void Context::activate(TQValueList<KSharedPtr<MacroItem > >::ConstIterator it)
 			d->exception = new Exception(e);
 			//add new tracemessages
 			//the macro name
-			d->exception->addTraceMessage( TQString("macro=%1").tqarg(d->macro->name()) );
+			d->exception->addTraceMessage( TQString("macro=%1").arg(d->macro->name()) );
 			//the action name
-			d->exception->addTraceMessage( TQString("action=%1").tqarg(action->name()) );
+			d->exception->addTraceMessage( TQString("action=%1").arg(action->name()) );
 			//and all variables wich belong to the action/macro
 			TQStringList variables = action->variableNames();
 			for(TQStringList::Iterator vit = variables.begin(); vit != variables.end(); ++vit) {
 				KSharedPtr<Variable> v = d->macroitem->variable(*vit, true);
-				d->exception->addTraceMessage( TQString("%1=%2").tqarg(*vit).tqarg(v->toString()) );
+				d->exception->addTraceMessage( TQString("%1=%2").arg(*vit).arg(v->toString()) );
 			}
 			return; // abort execution
 		}
diff --git a/kexi/plugins/macros/lib/context.h b/kexi/plugins/macros/lib/context.h
index 2bb1bef3..a7986167 100644
--- a/kexi/plugins/macros/lib/context.h
+++ b/kexi/plugins/macros/lib/context.h
@@ -35,7 +35,7 @@ namespace KoMacro {
 
 	/**
 	* The context of an execution. If a @a Macro got executed it creates
-	* an instance of this class and passes it around all it's tqchildren
+	* an instance of this class and passes it around all it's children
 	* as local execution context.
 	*/
 	class KOMACRO_EXPORT Context
diff --git a/kexi/plugins/macros/lib/exception.cpp b/kexi/plugins/macros/lib/exception.cpp
index 91cfa03c..b435f2f2 100644
--- a/kexi/plugins/macros/lib/exception.cpp
+++ b/kexi/plugins/macros/lib/exception.cpp
@@ -56,7 +56,7 @@ Exception::Exception(const TQString& errormessage)
 	: d( new Private(errormessage) ) // create the private d-pointer instance.
 {
 	//debuging infos
-	kdDebug() << TQString("Exception errormessage=\"%1\"").tqarg(errormessage) << endl;
+	kdDebug() << TQString("Exception errormessage=\"%1\"").arg(errormessage) << endl;
 }
 
 //copy constructor
diff --git a/kexi/plugins/macros/lib/macro.cpp b/kexi/plugins/macros/lib/macro.cpp
index 6bcdc21d..808c4043 100644
--- a/kexi/plugins/macros/lib/macro.cpp
+++ b/kexi/plugins/macros/lib/macro.cpp
@@ -84,7 +84,7 @@ void Macro::setName(const TQString& name)
 //get an "extended" name
 const TQString Macro::toString() const
 {
-	return TQString("Macro:%1").tqarg(name());
+	return TQString("Macro:%1").arg(name());
 }
 
 //get (d-pointer) itemlist
diff --git a/kexi/plugins/macros/lib/macro.h b/kexi/plugins/macros/lib/macro.h
index 86e0122a..5e5decf8 100644
--- a/kexi/plugins/macros/lib/macro.h
+++ b/kexi/plugins/macros/lib/macro.h
@@ -85,7 +85,7 @@ namespace KoMacro {
 
 			/**
 			* @return a list of @a MacroItem instances which
-			* are tqchildren of this @a Macro .
+			* are children of this @a Macro .
 			*/
 			TQValueList< KSharedPtr<MacroItem> >& items() const;
 
diff --git a/kexi/plugins/macros/lib/metamethod.cpp b/kexi/plugins/macros/lib/metamethod.cpp
index 16b93803..05bd22c3 100644
--- a/kexi/plugins/macros/lib/metamethod.cpp
+++ b/kexi/plugins/macros/lib/metamethod.cpp
@@ -92,12 +92,12 @@ MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr<MetaObje
 	int startpos = d->signature.find("(");
 	int endpos = d->signature.findRev(")");
 	if(startpos < 0 || startpos > endpos) {
-		throw Exception(TQString("Invalid signature \"%1\"").tqarg(d->signature));
+		throw Exception(TQString("Invalid signature \"%1\"").arg(d->signature));
 	}
 
 	d->signaturetag = d->signature.left(startpos).stripWhiteSpace();
 	if(d->signaturetag.isEmpty()) {
-		throw Exception(TQString("Invalid tagname in signature \"%1\"").tqarg(d->signature));
+		throw Exception(TQString("Invalid tagname in signature \"%1\"").arg(d->signature));
 	}
 
 	d->signaturearguments = d->signature.mid(startpos + 1, endpos - startpos - 1).stripWhiteSpace();
@@ -108,7 +108,7 @@ MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr<MetaObje
 		if(starttemplatepos >= 0 && (commapos < 0 || starttemplatepos < commapos)) {
 			int endtemplatepos = d->signaturearguments.find(">", starttemplatepos);
 			if(endtemplatepos <= 0) {
-				throw Exception(TQString("No closing template-definiton in signature \"%1\"").tqarg(d->signature));
+				throw Exception(TQString("No closing template-definiton in signature \"%1\"").arg(d->signature));
 			}
 			commapos = d->signaturearguments.find(",", endtemplatepos);
 		}
@@ -170,7 +170,7 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments)
 	uint argsize = d->arguments.size();
 
 	if(arguments.size() <= argsize) {
-		throw Exception(TQString("To less arguments for slot with siganture \"%1\"").tqarg(d->signature));
+		throw Exception(TQString("To less arguments for slot with siganture \"%1\"").arg(d->signature));
 	}
 
 	// The first item in the TQUObject-array is for the returnvalue
@@ -188,7 +188,7 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments)
 		}
 	
 		if(metaargument->type() != variable->type()) {
-			throw Exception(TQString("Wrong variable type in method \"%1\". Expected \"%2\" but got \"%3\"").tqarg(d->signature).tqarg(metaargument->type()).tqarg(variable->type()));
+			throw Exception(TQString("Wrong variable type in method \"%1\". Expected \"%2\" but got \"%3\"").arg(d->signature).arg(metaargument->type()).arg(variable->type()));
 		}
 
 		switch(metaargument->type()) {
@@ -287,7 +287,7 @@ KSharedPtr<Variable> MetaMethod::toVariable(TQUObject* uo)
 		return new Variable(v);
 	}
 
-	throw Exception(TQString("Invalid parameter '%1'").tqarg(desc));
+	throw Exception(TQString("Invalid parameter '%1'").arg(desc));
 }
 
 Variable::List MetaMethod::toVariableList(TQUObject* uo)
diff --git a/kexi/plugins/macros/lib/metaobject.cpp b/kexi/plugins/macros/lib/metaobject.cpp
index e9e56b44..ee865c82 100644
--- a/kexi/plugins/macros/lib/metaobject.cpp
+++ b/kexi/plugins/macros/lib/metaobject.cpp
@@ -77,31 +77,31 @@ TQObject* const MetaObject::object() const
 /*
 TQStrList MetaObject::signalNames() const
 {
-	return object()->tqmetaObject()->signalNames();
+	return object()->metaObject()->signalNames();
 }
 
 TQStrList MetaObject::slotNames() const
 {
-	return object()->tqmetaObject()->slotNames();
+	return object()->metaObject()->slotNames();
 }
 */
 
 int MetaObject::indexOfSignal(const char* signal) const
 {
-	TQMetaObject* metaobject = object()->tqmetaObject();
+	TQMetaObject* metaobject = object()->metaObject();
 	int signalid = metaobject->findSignal(signal, false);
 	if(signalid < 0) {
-		throw Exception(TQString("Invalid signal \"%1\"").tqarg(signal));
+		throw Exception(TQString("Invalid signal \"%1\"").arg(signal));
 	}
 	return signalid;
 }
 
 int MetaObject::indexOfSlot(const char* slot) const
 {
-	TQMetaObject* metaobject = object()->tqmetaObject();
+	TQMetaObject* metaobject = object()->metaObject();
 	int slotid = metaobject->findSlot(slot, false);
 	if(slotid < 0) {
-		throw Exception(TQString("Invalid slot \"%1\"").tqarg(slot));
+		throw Exception(TQString("Invalid slot \"%1\"").arg(slot));
 	}
 	return slotid;
 }
@@ -110,7 +110,7 @@ KSharedPtr<MetaMethod> MetaObject::method(int index)
 {
 	TQObject* obj = object();
 	MetaMethod::Type type = MetaMethod::Slot;
-	TQMetaObject* metaobject = obj->tqmetaObject();
+	TQMetaObject* metaobject = obj->metaObject();
 
 	const TQMetaData* metadata = metaobject->slot(index, true);
 	if(! metadata) {
@@ -119,13 +119,13 @@ KSharedPtr<MetaMethod> MetaObject::method(int index)
 
 		metadata = metaobject->signal(index, true);
 		if(! metadata) {
-			throw Exception(TQString("Invalid method index \"%1\" in object \"%2\"").tqarg(index).tqarg(obj->name()));
+			throw Exception(TQString("Invalid method index \"%1\" in object \"%2\"").arg(index).arg(obj->name()));
 		}
 		type = MetaMethod::Signal;
 	}
 
 	if(metadata->access != TQMetaData::Public) {
-		throw Exception(TQString("Not allowed to access method \"%1\" in object \"%2\"").tqarg(metadata->name).tqarg(obj->name()));
+		throw Exception(TQString("Not allowed to access method \"%1\" in object \"%2\"").arg(metadata->name).arg(obj->name()));
 	}
 
 	return new MetaMethod(metadata->name, type, this);
diff --git a/kexi/plugins/macros/lib/variable.cpp b/kexi/plugins/macros/lib/variable.cpp
index f64613b0..3661ef9a 100644
--- a/kexi/plugins/macros/lib/variable.cpp
+++ b/kexi/plugins/macros/lib/variable.cpp
@@ -58,10 +58,10 @@ namespace KoMacro {
 			const TQObject* object;
 
 			/**
-			* Optional list of tqchildren this @a Variable has.
+			* Optional list of children this @a Variable has.
 			*/
 			// TODO Dow we use this or is it for the future??
-			Variable::List tqchildren;
+			Variable::List children;
 
 			/**
 			* Defines if the variable is enabled or disabled.
@@ -199,7 +199,7 @@ const TQString Variable::toString() const
 			return variant().toString();
 		} break;
 		case KoMacro::MetaParameter::TypeObject: {
-			return TQString("[%1]").tqarg( object()->name() );
+			return TQString("[%1]").arg( object()->name() );
 		} break;
 		default: {
 			throw Exception("Type is undefined.");
@@ -213,24 +213,24 @@ int Variable::toInt() const
 	return variant().toInt();
 }
 
-Variable::List Variable::tqchildren() const
+Variable::List Variable::children() const
 {
-	return d->tqchildren;
+	return d->children;
 }
 
 void Variable::appendChild(KSharedPtr<Variable> variable)
 {
-	d->tqchildren.append(variable);
+	d->children.append(variable);
 }
 
 void Variable::clearChildren()
 {
-	d->tqchildren.clear();
+	d->children.clear();
 }
 
-void Variable::setChildren(const Variable::List& tqchildren)
+void Variable::setChildren(const Variable::List& children)
 {
-	d->tqchildren = tqchildren;
+	d->children = children;
 }
 
 /*
diff --git a/kexi/plugins/macros/lib/variable.h b/kexi/plugins/macros/lib/variable.h
index 108a6005..14adf09c 100644
--- a/kexi/plugins/macros/lib/variable.h
+++ b/kexi/plugins/macros/lib/variable.h
@@ -173,29 +173,29 @@ namespace KoMacro {
 
 			/**
 			* @return the optional list of @a Variable instances
-			* that are tqchildren of this @a Variable .
+			* that are children of this @a Variable .
 			*
 			* @note that the list is returned call-by-reference. The
 			* list is accessed as getter/setter (read/write). So,
 			* don't set this method to const!
 			*/
-			List tqchildren() const;
+			List children() const;
 
 			/**
-			* Append a @a Variable to the list of tqchildren this
+			* Append a @a Variable to the list of children this
 			* @a Variable has.
 			*/
 			void appendChild(KSharedPtr<Variable> variable);
 
 			/**
-			* Clear the list of tqchildren this @a Variable has.
+			* Clear the list of children this @a Variable has.
 			*/
 			void clearChildren();
 
 			/**
-			* Set the tqchildren this @a Variable has.
+			* Set the children this @a Variable has.
 			*/
-			void setChildren(const List& tqchildren);
+			void setChildren(const List& children);
 
 #if 0
 			/**
diff --git a/kexi/plugins/macros/lib/xmlhandler.cpp b/kexi/plugins/macros/lib/xmlhandler.cpp
index 4894c619..5b53d51b 100644
--- a/kexi/plugins/macros/lib/xmlhandler.cpp
+++ b/kexi/plugins/macros/lib/xmlhandler.cpp
@@ -75,7 +75,7 @@ bool XMLHandler::parseXML(const TQDomElement& element)
 	// We expect a <macro> element. Do we really need to be such strict or
 	// would it be more wise to trust the application in that case?
 	if(element.tagName() != "macro") {
-		kdDebug() << TQString("XMLHandler::parseXML() Invalid tagname \"%1\"").tqarg(element.tagName()) << endl;
+		kdDebug() << TQString("XMLHandler::parseXML() Invalid tagname \"%1\"").arg(element.tagName()) << endl;
 		return false;
 	}
 	
@@ -83,7 +83,7 @@ bool XMLHandler::parseXML(const TQDomElement& element)
 	// If there is more than one version, parsing should update old macro-data, so that it
 	// could write out in the newer version in toXML().
 	if( element.attribute("xmlversion") != "1"){
-		kdDebug() << TQString("XMLHandler::parseXML() Invalid xml-version \"%1\"").tqarg(element.attribute("xmlversion")) << endl;
+		kdDebug() << TQString("XMLHandler::parseXML() Invalid xml-version \"%1\"").arg(element.attribute("xmlversion")) << endl;
 		return false;
 	}
 
@@ -115,7 +115,7 @@ bool XMLHandler::parseXML(const TQDomElement& element)
 			// Set the comment
 			item->setComment( itemelem.attribute("comment") );
 
-			// Iterate through the tqchildren this item has and try
+			// Iterate through the children this item has and try
 			// to fill the list of variables our new MacroItem has.
 			for(TQDomNode childnode = itemnode.firstChild(); ! childnode.isNull(); childnode = childnode.nextSibling()) {
 				// The tagname should be "variable"
@@ -156,12 +156,12 @@ TQDomElement XMLHandler::toXML()
 	// redundancy at this point.
 	//macroelem.setAttribute("name",d->macro->name());
 
-	// The list of MacroItem-tqchildren a Macro provides.
+	// The list of MacroItem-children a Macro provides.
 	TQValueList<KSharedPtr<MacroItem > > items = d->macro->items();
 
 	// Create an iterator...
 	TQValueList<KSharedPtr<MacroItem > >::ConstIterator it(items.constBegin()), end(items.constEnd());
-	// ...and iterate over the list of tqchildren the Macro provides.
+	// ...and iterate over the list of children the Macro provides.
 	for(;it != end; ++it) {
 		// We are iterating over MacroItem instances.
 		KSharedPtr<MacroItem> item = *it;