1 files changed, 22 insertions, 22 deletions

diff --git a/lib/koproperty/property.cpp b/lib/koproperty/property.cpp
index 6c4fa246..49ca2b6c 100644
--- a/lib/koproperty/property.cpp
+++ b/lib/koproperty/property.cpp
@@ -43,7 +43,7 @@ class PropertyPrivate
 		: caption(0), listData(0), changed(false), storable(true), 
 		 readOnly(false), visible(true),
 		 autosync(-1), custom(0), useCustomProperty(true),
-		 sets(0), parent(0), children(0), relatedProperties(0),
+		 sets(0), parent(0), tqchildren(0), relatedProperties(0),
 		 sortingKey(0)
 		{
 		}
@@ -63,7 +63,7 @@ class PropertyPrivate
 			delete caption;
 			caption = 0;
 			delete listData;
-			delete children;
+			delete tqchildren;
 			delete relatedProperties;
 			delete custom;
 			delete sets;
@@ -99,7 +99,7 @@ class PropertyPrivate
 //	TQValueList<Set*>  sets;
 
 	Property  *parent;
-	TQValueList<Property*>  *children;
+	TQValueList<Property*>  *tqchildren;
 	//! list of properties with the same name (when intersecting buffers)
 	TQValueList<Property*>  *relatedProperties;
 
@@ -564,9 +564,9 @@ Property::operator= (const Property &property)
 		delete d->listData;
 		d->listData = 0;
 	}
-	if(d->children) {
-		delete d->children;
-		d->children = 0;
+	if(d->tqchildren) {
+		delete d->tqchildren;
+		d->tqchildren = 0;
 	}
 	if(d->relatedProperties) {
 		delete d->relatedProperties;
@@ -594,16 +594,16 @@ Property::operator= (const Property &property)
 	}
 	if(property.d->custom) {
 		d->custom = FactoryManager::self()->createCustomProperty(this);
-		// updates all children value, using CustomProperty
+		// updates all tqchildren value, using CustomProperty
 		setValue(property.value());
 	}
 	else {
 		d->value = property.d->value;
-		if(property.d->children) {
-			// no CustomProperty (should never happen), simply copy all children
-			d->children = new TQValueList<Property*>();
-			TQValueList<Property*>::ConstIterator endIt = property.d->children->constEnd();
-			for(TQValueList<Property*>::ConstIterator it = property.d->children->constBegin(); it != endIt; ++it) {
+		if(property.d->tqchildren) {
+			// no CustomProperty (should never happen), simply copy all tqchildren
+			d->tqchildren = new TQValueList<Property*>();
+			TQValueList<Property*>::ConstIterator endIt = property.d->tqchildren->constEnd();
+			for(TQValueList<Property*>::ConstIterator it = property.d->tqchildren->constBegin(); it != endIt; ++it) {
 				Property *child = new Property( *(*it) );
 				addChild(child);
 			}
@@ -614,7 +614,7 @@ Property::operator= (const Property &property)
 		d->relatedProperties = new TQValueList<Property*>( *(property.d->relatedProperties));
 	}
 
-	// update these later because they may have been changed when creating children
+	// update these later because they may have been changed when creating tqchildren
 	d->oldValue = property.d->oldValue;
 	d->changed = property.d->changed;
 	d->sortingKey = property.d->sortingKey;
@@ -631,16 +631,16 @@ Property::operator ==(const Property &prop) const
 /////////////////////////////////////////////////////////////////
 
 const TQValueList<Property*>*
-Property::children() const
+Property::tqchildren() const
 {
-	return d->children;
+	return d->tqchildren;
 }
 
 Property*
 Property::child(const TQCString &name)
 {
-	TQValueList<Property*>::ConstIterator endIt = d->children->constEnd();
-	for(TQValueList<Property*>::ConstIterator it = d->children->constBegin(); it != endIt; ++it) {
+	TQValueList<Property*>::ConstIterator endIt = d->tqchildren->constEnd();
+	for(TQValueList<Property*>::ConstIterator it = d->tqchildren->constBegin(); it != endIt; ++it) {
 		if((*it)->name() == name)
 			return *it;
 	}
@@ -659,11 +659,11 @@ Property::addChild(Property *prop)
 	if (!prop)
 		return;
 
-	if(!d->children || tqFind( d->children->begin(), d->children->end(), prop) == d->children->end()) { // not in our list
-		if(!d->children)
-			d->children = new TQValueList<Property*>();
-		d->children->append(prop);
-		prop->setSortingKey(d->children->count());
+	if(!d->tqchildren || tqFind( d->tqchildren->begin(), d->tqchildren->end(), prop) == d->tqchildren->end()) { // not in our list
+		if(!d->tqchildren)
+			d->tqchildren = new TQValueList<Property*>();
+		d->tqchildren->append(prop);
+		prop->setSortingKey(d->tqchildren->count());
 		prop->d->parent = this;
 	}
 	else {