rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

57 files changed, 230 insertions, 230 deletions

diff --git a/lib/koproperty/customproperty.cpp b/lib/koproperty/customproperty.cpp
index f2c17808..c5a33ef6 100644
--- a/lib/koproperty/customproperty.cpp
+++ b/lib/koproperty/customproperty.cpp
@@ -30,8 +30,8 @@
 
 using namespace KoProperty;
 
-CustomProperty::CustomProperty(Property *tqparent)
- : m_property(tqparent)
+CustomProperty::CustomProperty(Property *parent)
+ : m_property(parent)
 {
 }
 
@@ -80,15 +80,15 @@ SizeCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 	if(!m_property)
 		return;
 
-	if(m_property->tqparent()) {
-		TQSize s = m_property->tqparent()->value().toSize();
+	if(m_property->parent()) {
+		TQSize s = m_property->parent()->value().toSize();
 
 		if(m_property->type() == Size_Height)
 			s.setHeight(value.toInt());
 		else if(m_property->type() == Size_Width)
 			s.setWidth(value.toInt());
 
-		m_property->tqparent()->setValue(s, true, false);
+		m_property->parent()->setValue(s, true, false);
 	}
 	else{
 		TQSize s = value.toSize();
@@ -100,13 +100,13 @@ SizeCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 TQVariant
 SizeCustomProperty::value() const
 {
-	if(!m_property || !m_property->tqparent())
+	if(!m_property || !m_property->parent())
 		return TQVariant();
 
 	if(m_property->type() == Size_Height)
-		return m_property->tqparent()->value().toSize().height();
+		return m_property->parent()->value().toSize().height();
 	else if(m_property->type() == Size_Width)
-		return m_property->tqparent()->value().toSize().width();
+		return m_property->parent()->value().toSize().width();
 
 	return TQVariant();
 }
@@ -146,15 +146,15 @@ PointCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 	if(!m_property)
 		return;
 
-	if(m_property->tqparent()) {
-		TQPoint p = m_property->tqparent()->value().toPoint();
+	if(m_property->parent()) {
+		TQPoint p = m_property->parent()->value().toPoint();
 
 		if(m_property->type() == Point_X)
 			p.setX(value.toInt());
 		else if(m_property->type() == Point_Y)
 			p.setY(value.toInt());
 
-		m_property->tqparent()->setValue(p, true, false);
+		m_property->parent()->setValue(p, true, false);
 	}
 	else {
 		TQPoint p = value.toPoint();
@@ -166,13 +166,13 @@ PointCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 TQVariant
 PointCustomProperty::value() const
 {
-	if(!m_property || !m_property->tqparent())
+	if(!m_property || !m_property->parent())
 		return TQVariant();
 
 	if(m_property->type() == Point_X)
-		return m_property->tqparent()->value().toPoint().x();
+		return m_property->parent()->value().toPoint().x();
 	else if(m_property->type() == Point_Y)
-		return m_property->tqparent()->value().toPoint().y();
+		return m_property->parent()->value().toPoint().y();
 
 	return TQVariant();
 }
@@ -214,8 +214,8 @@ RectCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 	if(!m_property)
 		return;
 
-	if(m_property->tqparent()) {
-		TQRect r = m_property->tqparent()->value().toRect();
+	if(m_property->parent()) {
+		TQRect r = m_property->parent()->value().toRect();
 
 		if(m_property->type() == Rect_X) {
 			//changing x component of Rect shouldn't change width
@@ -234,7 +234,7 @@ RectCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 		else if(m_property->type() == Rect_Height)
 			r.setHeight(value.toInt());
 
-		m_property->tqparent()->setValue(r, true, false);
+		m_property->parent()->setValue(r, true, false);
 	}
 	else {
 		TQRect r = value.toRect();
@@ -248,17 +248,17 @@ RectCustomProperty::setValue(const TQVariant &value, bool rememberOldValue)
 TQVariant
 RectCustomProperty::value() const
 {
-	if(!m_property || !m_property->tqparent())
+	if(!m_property || !m_property->parent())
 		return TQVariant();
 
 	if(m_property->type() == Rect_X)
-		return m_property->tqparent()->value().toRect().x();
+		return m_property->parent()->value().toRect().x();
 	else if(m_property->type() == Rect_Y)
-		return m_property->tqparent()->value().toRect().y();
+		return m_property->parent()->value().toRect().y();
 	else if(m_property->type() == Rect_Width)
-		return m_property->tqparent()->value().toRect().width();
+		return m_property->parent()->value().toRect().width();
 	else if(m_property->type() == Rect_Height)
-		return m_property->tqparent()->value().toRect().height();
+		return m_property->parent()->value().toRect().height();
 
 	return TQVariant();
 }
@@ -334,8 +334,8 @@ SizePolicyCustomProperty::setValue(const TQVariant &value, bool rememberOldValue
 	if(!m_property)
 		return;
 
-	if(m_property->tqparent()) {
-		TQSizePolicy v = m_property->tqparent()->value().toSizePolicy();
+	if(m_property->parent()) {
+		TQSizePolicy v = m_property->parent()->value().toSizePolicy();
 
 		if(m_property->type() == SizePolicy_HorData)
 			v.setHorData(TQSizePolicy::SizeType(value.toInt()));
@@ -346,7 +346,7 @@ SizePolicyCustomProperty::setValue(const TQVariant &value, bool rememberOldValue
 		else if(m_property->type() == SizePolicy_VerStretch)
 			v.setVerStretch(value.toInt());
 
-		m_property->tqparent()->setValue(v, true, false);
+		m_property->parent()->setValue(v, true, false);
 	}
 	else {
 		TQSizePolicy v = value.toSizePolicy();
@@ -360,17 +360,17 @@ SizePolicyCustomProperty::setValue(const TQVariant &value, bool rememberOldValue
 TQVariant
 SizePolicyCustomProperty::value() const
 {
-	if(!m_property || !m_property->tqparent())
+	if(!m_property || !m_property->parent())
 		return TQVariant();
 
 	if(m_property->type() == SizePolicy_HorData)
-		return m_property->tqparent()->value().toSizePolicy().horData();
+		return m_property->parent()->value().toSizePolicy().horData();
 	else if(m_property->type() == SizePolicy_VerData)
-		return m_property->tqparent()->value().toSizePolicy().verData();
+		return m_property->parent()->value().toSizePolicy().verData();
 	else if(m_property->type() == SizePolicy_HorStretch)
-		return m_property->tqparent()->value().toSizePolicy().horStretch();
+		return m_property->parent()->value().toSizePolicy().horStretch();
 	else if(m_property->type() == SizePolicy_VerStretch)
-		return m_property->tqparent()->value().toSizePolicy().verStretch();
+		return m_property->parent()->value().toSizePolicy().verStretch();
 
 	return TQVariant();
 }
diff --git a/lib/koproperty/customproperty.h b/lib/koproperty/customproperty.h
index 60584ca3..45107eb3 100644
--- a/lib/koproperty/customproperty.h
+++ b/lib/koproperty/customproperty.h
@@ -40,20 +40,20 @@ class Property;
 class KOPROPERTY_EXPORT CustomProperty
 {
 	public:
-		CustomProperty(Property *tqparent);
+		CustomProperty(Property *parent);
 		virtual ~CustomProperty();
 
 		/*! This function is called by \ref Property::setValue() when
 		a custom property is set.
 		You don't have to modify the property value, it is done by Property class.
-		You just have to update child or tqparent properties value (m_property->tqparent()->setValue()).
+		You just have to update child or parent properties value (m_property->parent()->setValue()).
 		Note that, when calling Property::setValue, you <b>need</b> to set
 		useCustomProperty (3rd parameter) to false, or there will be infinite recursion. */
 		virtual void setValue(const TQVariant &value, bool rememberOldValue) = 0;
 
 		/*! This function is called by \ref Property::value() when
 		a custom property is set and \ref handleValue() is true.
-		You should return property's value, taken from tqparent's value.*/
+		You should return property's value, taken from parent's value.*/
 		virtual TQVariant value() const = 0;
 
 		/*! Tells whether CustomProperty should be used to get the property's value.
@@ -66,7 +66,7 @@ class KOPROPERTY_EXPORT CustomProperty
 		Property  *m_property;
 
 		/*! This method emits the \a Set::propertyChanged() signal for all
-		sets our tqparent-property is registered in. */
+		sets our parent-property is registered in. */
 		void emitPropertyChanged();
 };
 
@@ -74,7 +74,7 @@ class KOPROPERTY_EXPORT CustomProperty
 class KOPROPERTY_EXPORT SizeCustomProperty : public CustomProperty
 {
 	public:
-		SizeCustomProperty(Property *tqparent);
+		SizeCustomProperty(Property *parent);
 		~SizeCustomProperty();
 
 		void setValue(const TQVariant &value, bool rememberOldValue);
@@ -86,7 +86,7 @@ class KOPROPERTY_EXPORT SizeCustomProperty : public CustomProperty
 class KOPROPERTY_EXPORT PointCustomProperty : public CustomProperty
 {
 	public:
-		PointCustomProperty(Property *tqparent);
+		PointCustomProperty(Property *parent);
 		~PointCustomProperty();
 
 		void setValue(const TQVariant &value, bool rememberOldValue);
@@ -98,7 +98,7 @@ class KOPROPERTY_EXPORT PointCustomProperty : public CustomProperty
 class KOPROPERTY_EXPORT RectCustomProperty : public CustomProperty
 {
 	public:
-		RectCustomProperty(Property *tqparent);
+		RectCustomProperty(Property *parent);
 		~RectCustomProperty();
 
 		void setValue(const TQVariant &value, bool rememberOldValue);
@@ -110,7 +110,7 @@ class KOPROPERTY_EXPORT RectCustomProperty : public CustomProperty
 class KOPROPERTY_EXPORT SizePolicyCustomProperty : public CustomProperty
 {
 	public:
-		SizePolicyCustomProperty(Property *tqparent);
+		SizePolicyCustomProperty(Property *parent);
 		~SizePolicyCustomProperty();
 
 		void setValue(const TQVariant &value, bool rememberOldValue);
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index f15cab20..7d6c809e 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -49,14 +49,14 @@ namespace KoProperty {
 //! @internal
 static bool kofficeAppDirAdded = false;
 
-//! \return true if \a o has tqparent \a par.
+//! \return true if \a o has parent \a par.
 //! @internal
 inline bool hasParent(TQObject* par, TQObject* o)
 {
 	if (!o || !par)
 		return false;
 	while (o && o != par)
-		o = o->tqparent();
+		o = o->parent();
 	return o == par;
 }
 
@@ -119,8 +119,8 @@ class EditorPrivate
 
 using namespace KoProperty;
 
-Editor::Editor(TQWidget *tqparent, bool autoSync, const char *name)
- : KListView(tqparent, name)
+Editor::Editor(TQWidget *parent, bool autoSync, const char *name)
+ : KListView(parent, name)
 {
 	d = new EditorPrivate(this);
 	d->itemDict.setAutoDelete(false);
@@ -248,7 +248,7 @@ Editor::fill()
 }
 
 void
-Editor::addItem(const TQCString &name, EditorItem *tqparent)
+Editor::addItem(const TQCString &name, EditorItem *parent)
 {
 	if(!d->set || !d->set->contains(name))
 		return;
@@ -258,13 +258,13 @@ Editor::addItem(const TQCString &name, EditorItem *tqparent)
 //		kopropertydbg << "Property is not visible: " << name << endl;
 		return;
 	}
-	TQListViewItem *last = tqparent ? tqparent->firstChild() : d->topItem->firstChild();
+	TQListViewItem *last = parent ? parent->firstChild() : d->topItem->firstChild();
 	while(last && last->nextSibling())
 		last = last->nextSibling();
 
 	EditorItem *item=0;
-	if(tqparent)
-		item = new EditorItem(this, tqparent, property, last);
+	if(parent)
+		item = new EditorItem(this, parent, property, last);
 	else
 		item = new EditorItem(this, d->topItem, property, last);
 	d->itemDict.insert(name, item);
@@ -456,8 +456,8 @@ Editor::slotPropertyChanged(Set& set, Property& property)
 	else  {
 		// prop not in the dict, might be a child property:
 		EditorItem *item = d->itemDict[property.name()];
-		if(!item && property.tqparent())
-			item = d->itemDict[property.tqparent()->name()];
+		if(!item && property.parent())
+			item = d->itemDict[property.parent()->name()];
 		if (item) {
 			repaintItem(item);
 			for(TQListViewItem *it = item->firstChild(); it; it = it->nextSibling())
@@ -467,14 +467,14 @@ Editor::slotPropertyChanged(Set& set, Property& property)
 
 //! @todo should we move this somewhere?
 #if 0
-	if (property.tqparent() && property.tqparent()->type()==Rect) {
+	if (property.parent() && property.parent()->type()==Rect) {
 		const int delta = property.value().toInt()-previousValue.toInt();
 		if (property.type()==Rect_X) { //|| property.type()==Rect_Y)
-			property.tqparent()->child("width")->setValue(delta, false);
+			property.parent()->child("width")->setValue(delta, false);
 		}
 
-/*	if (widget->property() && (TQWidget*)d->currentWidget==widget && d->currentItem->tqparent()) {
-		EditorItem *parentItem = static_cast<EditorItem*>(d->currentItem->tqparent());
+/*	if (widget->property() && (TQWidget*)d->currentWidget==widget && d->currentItem->parent()) {
+		EditorItem *parentItem = static_cast<EditorItem*>(d->currentItem->parent());
 		const int thisType = ;
 			&& parentItem->property()->type()==Rect) {
 			//changing x or y components of Rect type shouldn't change width or height, respectively
@@ -504,8 +504,8 @@ Editor::slotPropertyReset(Set& set, Property& property)
 	else  {
 		EditorItem *item = d->itemDict[property.name()];
 		// prop not in the dict, might be a child prop.
-		if(!item && property.tqparent())
-			item = d->itemDict[property.tqparent()->name()];
+		if(!item && property.parent())
+			item = d->itemDict[property.parent()->name()];
 		if (item) {
 			repaintItem(item);
 			for(TQListViewItem *it = item->firstChild(); it; it = it->nextSibling())
@@ -801,8 +801,8 @@ Editor::slotCollapsed(TQListViewItem *item)
 		return;
 	//unselect child item and hide editor if a group item has been collapsed
 	if (dynamic_cast<EditorGroupItem*>(item)) {
-		for (TQListViewItem *i = selectedItem(); i; i = i->tqparent()) {
-			if (i->tqparent()==item) {
+		for (TQListViewItem *i = selectedItem(); i; i = i->parent()) {
+			if (i->parent()==item) {
 				d->previouslyCollapsedGroupItem = item;
 				d->childFormPreviouslyCollapsedGroupItem = selectedItem();
 				hideEditor();
diff --git a/lib/koproperty/editor.h b/lib/koproperty/editor.h
index 677208de..c3ab0c2e 100644
--- a/lib/koproperty/editor.h
+++ b/lib/koproperty/editor.h
@@ -66,14 +66,14 @@ class KOPROPERTY_EXPORT Editor : public KListView
   TQ_OBJECT
 
 	public:
-		/*! Creates an empty Editor with \a tqparent as tqparent widget.
+		/*! Creates an empty Editor with \a parent as parent widget.
 		If \a autoSync == true, properties values are automatically synced as
 		soon as editor contents change (eg the user types text, etc.)
 		and the values are written in the property set. Otherwise, property set
 		is updated only when selected item changes or user presses Enter key.
 		Each property can overwrite this if its autoSync() == 0 or 1.
 		*/
-		Editor(TQWidget *tqparent=0, bool autoSync=true, const char *name=0);
+		Editor(TQWidget *parent=0, bool autoSync=true, const char *name=0);
 
 		virtual ~Editor();
 
@@ -160,7 +160,7 @@ class KOPROPERTY_EXPORT Editor : public KListView
 		void clearWidgetCache();
 
 		void fill();
-		void addItem(const TQCString &name, EditorItem *tqparent);
+		void addItem(const TQCString &name, EditorItem *parent);
 
 		void showUndoButton( bool show );
 
diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp
index 1c0e1b72..653cbe0a 100644
--- a/lib/koproperty/editoritem.cpp
+++ b/lib/koproperty/editoritem.cpp
@@ -93,8 +93,8 @@ static void paintListViewExpander(TQPainter* p, TQWidget* w, int height, const T
 class GroupWidgetBase : public TQWidget
 {
 	public:
-		GroupWidgetBase(TQWidget* tqparent)
-		: TQWidget(tqparent)
+		GroupWidgetBase(TQWidget* parent)
+		: TQWidget(parent)
 		, m_isOpen(true)
 		, m_mouseDown(false)
 		{
@@ -204,8 +204,8 @@ class GroupContainer::Private
 
 using namespace KoProperty;
 
-GroupContainer::GroupContainer(const TQString& title, TQWidget* tqparent)
-: TQWidget(tqparent)
+GroupContainer::GroupContainer(const TQString& title, TQWidget* parent)
+: TQWidget(parent)
 , d(new Private())
 {
 	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1));
@@ -254,8 +254,8 @@ bool GroupContainer::event( TQEvent * e ) {
 
 //////////////////////////////////////////////////////
 
-EditorItem::EditorItem(Editor *editor, EditorItem *tqparent, Property *property, TQListViewItem *after)
- : KListViewItem(tqparent, after,
+EditorItem::EditorItem(Editor *editor, EditorItem *parent, Property *property, TQListViewItem *after)
+ : KListViewItem(parent, after,
 	property->captionForDisplaying().isEmpty() ? property->name() : property->captionForDisplaying())
 {
 	d = new EditorItemPrivate();
@@ -280,8 +280,8 @@ EditorItem::EditorItem(Editor *editor, EditorItem *tqparent, Property *property,
 */
 }
 
-EditorItem::EditorItem(KListView *tqparent)
- : KListViewItem(tqparent)
+EditorItem::EditorItem(KListView *parent)
+ : KListViewItem(parent)
 {
 	d = new EditorItemPrivate();
 	d->property = 0;
@@ -289,8 +289,8 @@ EditorItem::EditorItem(KListView *tqparent)
 	setMultiLinesEnabled(true);
 }
 
-EditorItem::EditorItem(EditorItem *tqparent, const TQString &text)
- : KListViewItem(tqparent, text)
+EditorItem::EditorItem(EditorItem *parent, const TQString &text)
+ : KListViewItem(parent, text)
 {
 	d = new EditorItemPrivate();
 	d->property = 0;
@@ -298,8 +298,8 @@ EditorItem::EditorItem(EditorItem *tqparent, const TQString &text)
 	setMultiLinesEnabled(true);
 }
 
-EditorItem::EditorItem(EditorItem *tqparent, EditorItem *after, const TQString &text)
- : KListViewItem(tqparent, after, text)
+EditorItem::EditorItem(EditorItem *parent, EditorItem *after, const TQString &text)
+ : KListViewItem(parent, after, text)
 {
 	d = new EditorItemPrivate();
 	d->property = 0;
@@ -334,18 +334,18 @@ EditorItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, int wid
 		p->setBrush(cg.highlight());
 		p->setPen(cg.highlightedText());
 		KListViewItem::paintCell(p, cg, column, width, align);
-		p->fillRect(tqparent() ? 0 : 50, 0, width, height()-1,
+		p->fillRect(parent() ? 0 : 50, 0, width, height()-1,
 			TQBrush(isSelected() ? cg.highlight() : backgroundColor()));
 		p->setPen(isSelected() ? cg.highlightedText() : cg.text());
 		int delta = -20+KPROPEDITOR_ITEM_MARGIN;
-		if ((firstChild() && dynamic_cast<EditorGroupItem*>(tqparent()))) {
+		if ((firstChild() && dynamic_cast<EditorGroupItem*>(parent()))) {
 			delta = -KPROPEDITOR_ITEM_MARGIN-1;
 		}
-		if (dynamic_cast<EditorDummyItem*>(tqparent())) {
+		if (dynamic_cast<EditorDummyItem*>(parent())) {
 			delta = KPROPEDITOR_ITEM_MARGIN*2;
 		}
-		else if (tqparent() && dynamic_cast<EditorDummyItem*>(tqparent()->tqparent())) {
-			if (dynamic_cast<EditorGroupItem*>(tqparent()))
+		else if (parent() && dynamic_cast<EditorDummyItem*>(parent()->parent())) {
+			if (dynamic_cast<EditorGroupItem*>(parent()))
 				delta += KPROPEDITOR_ITEM_MARGIN*2;
 			else
 				delta += KPROPEDITOR_ITEM_MARGIN*5;
@@ -359,7 +359,7 @@ EditorItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, int wid
 		p->drawLine(0, -1, width-1, -1);
 
 		p->setPen( KPROPEDITOR_ITEM_BORDER_COLOR ); //! \todo custom color?
-		if (dynamic_cast<EditorDummyItem*>(tqparent()))
+		if (dynamic_cast<EditorDummyItem*>(parent()))
 			p->drawLine(0, 0, 0, height()-1 );
 	}
 	else if(column == 1)
@@ -408,21 +408,21 @@ EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, in
 		int delta = 0;
 		int fillWidth = w;
 		int x = 0;
-		if (dynamic_cast<EditorGroupItem*>(item->tqparent())) {
+		if (dynamic_cast<EditorGroupItem*>(item->parent())) {
 			delta = 0;//-19;
 			fillWidth += 19;
 		}
 		else {
-			if (dynamic_cast<EditorGroupItem*>(item) || /*for flat mode*/ dynamic_cast<EditorDummyItem*>(item->tqparent()))
+			if (dynamic_cast<EditorGroupItem*>(item) || /*for flat mode*/ dynamic_cast<EditorDummyItem*>(item->parent()))
 				x = 19;
 			else
 				x = -19;
 			fillWidth += 19;
 		}
-		if (dynamic_cast<EditorDummyItem*>(item->tqparent())) {
+		if (dynamic_cast<EditorDummyItem*>(item->parent())) {
 			x = 19;
 		}
-		else if (item->tqparent() && dynamic_cast<EditorDummyItem*>(item->tqparent()->tqparent())) {
+		else if (item->parent() && dynamic_cast<EditorDummyItem*>(item->parent()->parent())) {
 			x = 0;
 		}
 		p->fillRect(x+1, 0, fillWidth-1, item->height()-1, TQBrush(backgroundColor));
@@ -434,7 +434,7 @@ EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, in
 //	for (int i=0; i<10000000; i++)
 //		;
 //		if(item->isSelected())  {
-//			p->fillRect(tqparent() ? 0 : 50, 0, w, item->height()-1, TQBrush(cg.highlight()));
+//			p->fillRect(parent() ? 0 : 50, 0, w, item->height()-1, TQBrush(cg.highlight()));
 //			p->fillRect(-50,0,50, item->height(), TQBrush(cg.highlight()));
 //		}
 
@@ -443,20 +443,20 @@ EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, in
 			|| (static_cast<EditorItem*>(item)->property() && static_cast<EditorItem*>(item)->property()->isModified()) );
 		p->setFont(font);
 		p->setPen(item->isSelected() ? cg.highlightedText() : cg.text());
-		if (item->firstChild() && dynamic_cast<EditorGroupItem*>(item->tqparent())) {
+		if (item->firstChild() && dynamic_cast<EditorGroupItem*>(item->parent())) {
 			delta = 19-KPROPEDITOR_ITEM_MARGIN-1;
 		}
-		else if (dynamic_cast<EditorDummyItem*>(item->tqparent())) {
+		else if (dynamic_cast<EditorDummyItem*>(item->parent())) {
 			delta = 19;
 		}
-		if (item->tqparent() && dynamic_cast<EditorDummyItem*>(item->tqparent()->tqparent())) {
-			if (dynamic_cast<EditorGroupItem*>(item->tqparent()))
+		if (item->parent() && dynamic_cast<EditorDummyItem*>(item->parent()->parent())) {
+			if (dynamic_cast<EditorGroupItem*>(item->parent()))
 				delta += KPROPEDITOR_ITEM_MARGIN*2;
 			else
 				delta += KPROPEDITOR_ITEM_MARGIN*5;
 		}
 
-		if (!dynamic_cast<EditorDummyItem*>(item->tqparent()))
+		if (!dynamic_cast<EditorDummyItem*>(item->parent()))
 			p->drawText(TQRect(delta+1,0, w+listView()->columnWidth(1), item->height()),
 			TQt::AlignLeft | TQt::AlignVCenter /*| TQt::SingleLine*/, item->text(0));
 
@@ -512,16 +512,16 @@ EditorItem::setHeight( int height )
 
 //////////////////////////////////////////////////////
 
-EditorGroupItem::EditorGroupItem(EditorItem *tqparent, EditorItem *after, const TQString &text, const TQString &icon, int sortOrder)
- : EditorItem(tqparent, after, text)
+EditorGroupItem::EditorGroupItem(EditorItem *parent, EditorItem *after, const TQString &text, const TQString &icon, int sortOrder)
+ : EditorItem(parent, after, text)
  , m_label(0)
  , m_sortOrder(sortOrder)
 {
 	init(icon);
 }
 
-EditorGroupItem::EditorGroupItem(EditorItem *tqparent, const TQString &text, const TQString &icon, int sortOrder)
- : EditorItem(tqparent, text)
+EditorGroupItem::EditorGroupItem(EditorItem *parent, const TQString &text, const TQString &icon, int sortOrder)
+ : EditorItem(parent, text)
  , m_label(0)
  , m_sortOrder(sortOrder)
 {
diff --git a/lib/koproperty/editoritem.h b/lib/koproperty/editoritem.h
index a3993d86..9f2c75c2 100644
--- a/lib/koproperty/editoritem.h
+++ b/lib/koproperty/editoritem.h
@@ -49,16 +49,16 @@ class EditorItem : public KListViewItem
 	public:
 		typedef TQAsciiDict<EditorItem> Dict;
 
-		/*! Creates an EditorItem child of \a tqparent, associated to \a property.
+		/*! Creates an EditorItem child of \a parent, associated to \a property.
 		 It \a property has not desctiption set, its name (i.e. not i18n'ed) is reused.
 		*/
-		EditorItem(Editor *editor, EditorItem *tqparent, Property *property,
+		EditorItem(Editor *editor, EditorItem *parent, Property *property,
 			TQListViewItem *after=0);
 
 		//! Two helper contructors for subclass
-		EditorItem(KListView *tqparent);
-		EditorItem(EditorItem *tqparent, const TQString &text);
-		EditorItem(EditorItem *tqparent, EditorItem *after, const TQString &text);
+		EditorItem(KListView *parent);
+		EditorItem(EditorItem *parent, const TQString &text);
+		EditorItem(EditorItem *parent, EditorItem *after, const TQString &text);
 
 		virtual ~EditorItem();
 
@@ -90,9 +90,9 @@ class EditorItem : public KListViewItem
 class EditorGroupItem : public EditorItem
 {
 	public:
-		EditorGroupItem(EditorItem *tqparent, EditorItem *after, const TQString &text, 
+		EditorGroupItem(EditorItem *parent, EditorItem *after, const TQString &text, 
 			const TQString &icon, int sortOrder);
-		EditorGroupItem(EditorItem *tqparent, const TQString &text, 
+		EditorGroupItem(EditorItem *parent, const TQString &text, 
 			const TQString &icon, int sortOrder);
 		virtual ~EditorGroupItem();
 
@@ -115,7 +115,7 @@ class EditorGroupItem : public EditorItem
 class EditorDummyItem : public EditorItem
 {
 	public:
-		EditorDummyItem(KListView *tqparent);
+		EditorDummyItem(KListView *parent);
 		virtual ~EditorDummyItem();
 
 	protected:
diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp
index 5c347c02..886f20d8 100644
--- a/lib/koproperty/editors/booledit.cpp
+++ b/lib/koproperty/editors/booledit.cpp
@@ -35,8 +35,8 @@
 
 using namespace KoProperty;
 
-BoolEdit::BoolEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
  , m_yesIcon( SmallIcon("button_ok") )
  , m_noIcon( SmallIcon("button_no") )
 {
@@ -150,8 +150,8 @@ BoolEdit::setReadOnlyInternal(bool readOnly)
 
 //--------------------------------------------------
 
-ThreeStateBoolEdit::ThreeStateBoolEdit(Property *property, TQWidget *tqparent, const char *name)
- : ComboBox(property, tqparent, name)
+ThreeStateBoolEdit::ThreeStateBoolEdit(Property *property, TQWidget *parent, const char *name)
+ : ComboBox(property, parent, name)
  , m_yesIcon( SmallIcon("button_ok") )
  , m_noIcon( SmallIcon("button_no") )
 {
diff --git a/lib/koproperty/editors/booledit.h b/lib/koproperty/editors/booledit.h
index 0cfbf48e..f93e4daa 100644
--- a/lib/koproperty/editors/booledit.h
+++ b/lib/koproperty/editors/booledit.h
@@ -36,7 +36,7 @@ class KOPROPERTY_EXPORT BoolEdit : public Widget
   TQ_OBJECT
 
 	public:
-		BoolEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		BoolEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~BoolEdit();
 
 		virtual TQVariant value() const;
@@ -63,7 +63,7 @@ class KOPROPERTY_EXPORT ThreeStateBoolEdit : public ComboBox
   TQ_OBJECT
 
 	public:
-		ThreeStateBoolEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		ThreeStateBoolEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~ThreeStateBoolEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/coloredit.cpp b/lib/koproperty/editors/coloredit.cpp
index d8504686..a9ab1f1a 100644
--- a/lib/koproperty/editors/coloredit.cpp
+++ b/lib/koproperty/editors/coloredit.cpp
@@ -29,8 +29,8 @@
 
 using namespace KoProperty;
 
-ColorButton::ColorButton(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+ColorButton::ColorButton(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new KColorCombo(this);
diff --git a/lib/koproperty/editors/coloredit.h b/lib/koproperty/editors/coloredit.h
index d869dc00..000e6e82 100644
--- a/lib/koproperty/editors/coloredit.h
+++ b/lib/koproperty/editors/coloredit.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT ColorButton : public Widget
   TQ_OBJECT
 
 	public:
-		ColorButton(Property *property, TQWidget *tqparent=0, const char *name=0);
+		ColorButton(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~ColorButton();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp
index 661aa1e0..343a9ed9 100644
--- a/lib/koproperty/editors/combobox.cpp
+++ b/lib/koproperty/editors/combobox.cpp
@@ -31,8 +31,8 @@
 
 using namespace KoProperty;
 
-ComboBox::ComboBox(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+ComboBox::ComboBox(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
  , m_setValueEnabled(true)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
diff --git a/lib/koproperty/editors/combobox.h b/lib/koproperty/editors/combobox.h
index dda5d067..709d07d6 100644
--- a/lib/koproperty/editors/combobox.h
+++ b/lib/koproperty/editors/combobox.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT ComboBox : public Widget
   TQ_OBJECT
 
 	public:
-		ComboBox(Property *property, TQWidget *tqparent=0, const char *name=0);
+		ComboBox(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~ComboBox();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp
index efcc0e44..61d44499 100644
--- a/lib/koproperty/editors/cursoredit.cpp
+++ b/lib/koproperty/editors/cursoredit.cpp
@@ -35,8 +35,8 @@ using namespace KoProperty;
 Property::ListData *m_cursorListData = 0;
 
 
-CursorEdit::CursorEdit(Property *property, TQWidget *tqparent, const char *name)
-: ComboBox(property, tqparent, name)
+CursorEdit::CursorEdit(Property *property, TQWidget *parent, const char *name)
+: ComboBox(property, parent, name)
 {
 	/*
 	if(!m_spValues) {
diff --git a/lib/koproperty/editors/cursoredit.h b/lib/koproperty/editors/cursoredit.h
index 850653df..c6c76e0e 100644
--- a/lib/koproperty/editors/cursoredit.h
+++ b/lib/koproperty/editors/cursoredit.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT CursorEdit : public ComboBox
   TQ_OBJECT
 
 	public:
-		CursorEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		CursorEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~CursorEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp
index b72fd7ce..0df8532a 100644
--- a/lib/koproperty/editors/dateedit.cpp
+++ b/lib/koproperty/editors/dateedit.cpp
@@ -32,8 +32,8 @@
 
 using namespace KoProperty;
 
-DateEdit::DateEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+DateEdit::DateEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQDateEdit(this);
diff --git a/lib/koproperty/editors/dateedit.h b/lib/koproperty/editors/dateedit.h
index f36e7b65..dde21f0c 100644
--- a/lib/koproperty/editors/dateedit.h
+++ b/lib/koproperty/editors/dateedit.h
@@ -34,7 +34,7 @@ class KOPROPERTY_EXPORT DateEdit : public Widget
   TQ_OBJECT
 
 	public:
-		DateEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		DateEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~DateEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp
index 7f88cb14..6e12641a 100644
--- a/lib/koproperty/editors/datetimeedit.cpp
+++ b/lib/koproperty/editors/datetimeedit.cpp
@@ -32,8 +32,8 @@
 
 using namespace KoProperty;
 
-DateTimeEdit::DateTimeEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+DateTimeEdit::DateTimeEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQDateTimeEdit(this);
diff --git a/lib/koproperty/editors/datetimeedit.h b/lib/koproperty/editors/datetimeedit.h
index b8745b01..1ee321b9 100644
--- a/lib/koproperty/editors/datetimeedit.h
+++ b/lib/koproperty/editors/datetimeedit.h
@@ -34,7 +34,7 @@ class KOPROPERTY_EXPORT DateTimeEdit : public Widget
   TQ_OBJECT
 
 	public:
-		DateTimeEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		DateTimeEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~DateTimeEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/dummywidget.cpp b/lib/koproperty/editors/dummywidget.cpp
index e9fbe3c9..71c3c74e 100644
--- a/lib/koproperty/editors/dummywidget.cpp
+++ b/lib/koproperty/editors/dummywidget.cpp
@@ -24,8 +24,8 @@
 
 using namespace KoProperty;
 
-DummyWidget::DummyWidget(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+DummyWidget::DummyWidget(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {}
 
 DummyWidget::~DummyWidget()
diff --git a/lib/koproperty/editors/dummywidget.h b/lib/koproperty/editors/dummywidget.h
index ef90ba8f..b06c571a 100644
--- a/lib/koproperty/editors/dummywidget.h
+++ b/lib/koproperty/editors/dummywidget.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT DummyWidget: public Widget
   TQ_OBJECT
 
 	public:
-		DummyWidget(Property *property, TQWidget *tqparent=0, const char *name=0);
+		DummyWidget(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~DummyWidget();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp
index 65ae80cf..0f3d438c 100644
--- a/lib/koproperty/editors/fontedit.cpp
+++ b/lib/koproperty/editors/fontedit.cpp
@@ -44,8 +44,8 @@ namespace KoProperty {
 class FontEditRequester : public KFontRequester
 {
 	public:
-		FontEditRequester(TQWidget* tqparent)
-			: KFontRequester(tqparent)
+		FontEditRequester(TQWidget* parent)
+			: KFontRequester(parent)
 		{
 			label()->setPaletteBackgroundColor(tqpalette().active().base());
 			label()->setMinimumWidth(0);
@@ -79,8 +79,8 @@ class FontEditRequester : public KFontRequester
 
 using namespace KoProperty;
 
-FontEdit::FontEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+FontEdit::FontEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	m_edit = new FontEditRequester(this);
 	m_edit->setMinimumHeight(5);
diff --git a/lib/koproperty/editors/fontedit.h b/lib/koproperty/editors/fontedit.h
index 6c3a46a4..091fafd0 100644
--- a/lib/koproperty/editors/fontedit.h
+++ b/lib/koproperty/editors/fontedit.h
@@ -34,7 +34,7 @@ class KOPROPERTY_EXPORT FontEdit : public Widget
   TQ_OBJECT
 
 	public:
-		FontEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		FontEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~FontEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/linestyledit.cpp b/lib/koproperty/editors/linestyledit.cpp
index 91783e20..e7f5b2f8 100644
--- a/lib/koproperty/editors/linestyledit.cpp
+++ b/lib/koproperty/editors/linestyledit.cpp
@@ -135,8 +135,8 @@ using namespace KoProperty;
     "................................................"};
 
 
-LineStyleEdit::LineStyleEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+LineStyleEdit::LineStyleEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQComboBox(this);
diff --git a/lib/koproperty/editors/linestyleedit.h b/lib/koproperty/editors/linestyleedit.h
index 8388b897..d5d386b5 100644
--- a/lib/koproperty/editors/linestyleedit.h
+++ b/lib/koproperty/editors/linestyleedit.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT LineStyleEdit : public Widget
   TQ_OBJECT
 
 	public:
-		LineStyleEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		LineStyleEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~LineStyleEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp
index edc19c80..92ab746d 100644
--- a/lib/koproperty/editors/pixmapedit.cpp
+++ b/lib/koproperty/editors/pixmapedit.cpp
@@ -51,8 +51,8 @@
 
 using namespace KoProperty;
 
-PixmapEdit::PixmapEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 
diff --git a/lib/koproperty/editors/pixmapedit.h b/lib/koproperty/editors/pixmapedit.h
index 61f75fba..3b6a6cd5 100644
--- a/lib/koproperty/editors/pixmapedit.h
+++ b/lib/koproperty/editors/pixmapedit.h
@@ -37,7 +37,7 @@ class KOPROPERTY_EXPORT PixmapEdit : public Widget
   TQ_OBJECT
 
 	public:
-		PixmapEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		PixmapEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~PixmapEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp
index d251e969..6983dd68 100644
--- a/lib/koproperty/editors/pointedit.cpp
+++ b/lib/koproperty/editors/pointedit.cpp
@@ -34,8 +34,8 @@
 
 using namespace KoProperty;
 
-PointEdit::PointEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+PointEdit::PointEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 	m_edit = new KActiveLabel(this);
diff --git a/lib/koproperty/editors/pointedit.h b/lib/koproperty/editors/pointedit.h
index 22c9a36a..ce7fc423 100644
--- a/lib/koproperty/editors/pointedit.h
+++ b/lib/koproperty/editors/pointedit.h
@@ -35,7 +35,7 @@ class KOPROPERTY_EXPORT PointEdit : public Widget
   TQ_OBJECT
 
 	public:
-		PointEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		PointEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~PointEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp
index 313e4e53..ba6fec49 100644
--- a/lib/koproperty/editors/rectedit.cpp
+++ b/lib/koproperty/editors/rectedit.cpp
@@ -33,8 +33,8 @@
 
 using namespace KoProperty;
 
-RectEdit::RectEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+RectEdit::RectEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 	m_edit = new KActiveLabel(this);
diff --git a/lib/koproperty/editors/rectedit.h b/lib/koproperty/editors/rectedit.h
index 261bf7d5..5ab25408 100644
--- a/lib/koproperty/editors/rectedit.h
+++ b/lib/koproperty/editors/rectedit.h
@@ -35,7 +35,7 @@ class KOPROPERTY_EXPORT RectEdit : public Widget
   TQ_OBJECT
 
 	public:
-		RectEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		RectEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~RectEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp
index db8fb44f..05422119 100644
--- a/lib/koproperty/editors/sizeedit.cpp
+++ b/lib/koproperty/editors/sizeedit.cpp
@@ -34,8 +34,8 @@
 
 using namespace KoProperty;
 
-SizeEdit::SizeEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+SizeEdit::SizeEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 	m_edit = new KActiveLabel(this);
diff --git a/lib/koproperty/editors/sizeedit.h b/lib/koproperty/editors/sizeedit.h
index 743f630f..87b1c2dd 100644
--- a/lib/koproperty/editors/sizeedit.h
+++ b/lib/koproperty/editors/sizeedit.h
@@ -35,7 +35,7 @@ class KOPROPERTY_EXPORT SizeEdit : public Widget
   TQ_OBJECT
 
 	public:
-		SizeEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		SizeEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~SizeEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp
index 0c616665..125e0a26 100644
--- a/lib/koproperty/editors/sizepolicyedit.cpp
+++ b/lib/koproperty/editors/sizepolicyedit.cpp
@@ -34,8 +34,8 @@ using namespace KoProperty;
 
 TQMap<TQString, TQVariant> *SizePolicyEdit::m_spValues = 0;
 
-SizePolicyEdit::SizePolicyEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+SizePolicyEdit::SizePolicyEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 //	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
diff --git a/lib/koproperty/editors/sizepolicyedit.h b/lib/koproperty/editors/sizepolicyedit.h
index 81ffab40..a33ef731 100644
--- a/lib/koproperty/editors/sizepolicyedit.h
+++ b/lib/koproperty/editors/sizepolicyedit.h
@@ -37,7 +37,7 @@ class KOPROPERTY_EXPORT SizePolicyEdit : public Widget
   TQ_OBJECT
 
 	public:
-		SizePolicyEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		SizePolicyEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~SizePolicyEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp
index 8ae4e30a..8e890419 100644
--- a/lib/koproperty/editors/spinbox.cpp
+++ b/lib/koproperty/editors/spinbox.cpp
@@ -33,8 +33,8 @@
 
 using namespace KoProperty;
 
-IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntEdit *tqparent, const char *name)
-: KIntSpinBox(lower, upper, step, value, base, tqparent, name)
+IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntEdit *parent, const char *name)
+: KIntSpinBox(lower, upper, step, value, base, parent, name)
 {
 	editor()->tqsetAlignment(TQt::AlignLeft);
 	installEventFilter(editor());
@@ -71,7 +71,7 @@ IntSpinBox::eventFilter(TQObject *o, TQEvent *e)
 			}
 		}
 	}
-	if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->tqparent()) == TQT_BASE_OBJECT(this)) 
+	if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->parent()) == TQT_BASE_OBJECT(this)) 
 		&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly())
 	{
 		return true; //avoid value changes for read-only widget
@@ -83,8 +83,8 @@ IntSpinBox::eventFilter(TQObject *o, TQEvent *e)
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-IntEdit::IntEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+IntEdit::IntEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQVariant minVal( property ? property->option("min") : 0 );
 	TQVariant maxVal( property ? property->option("max") : TQVariant() );
@@ -176,8 +176,8 @@ IntEdit::setReadOnlyInternal(bool readOnly)
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double value, int precision, DoubleEdit *tqparent)
-: KDoubleSpinBox(lower, upper, step, value, precision, tqparent)
+DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double value, int precision, DoubleEdit *parent)
+: KDoubleSpinBox(lower, upper, step, value, precision, parent)
 {
 	editor()->tqsetAlignment(TQt::AlignLeft);
 	installEventFilter(editor());
@@ -204,7 +204,7 @@ DoubleSpinBox::eventFilter(TQObject *o, TQEvent *e)
 			}
 		}
 	}
-	if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->tqparent()) == TQT_BASE_OBJECT(this)) 
+	if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->parent()) == TQT_BASE_OBJECT(this)) 
 		&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly())
 	{
 		return true; //avoid value changes for read-only widget
@@ -226,8 +226,8 @@ void DoubleSpinBox::setValue( const TQVariant& value )
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-DoubleEdit::DoubleEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+DoubleEdit::DoubleEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQVariant minVal( property ? property->option("min") : 0 );
 	TQVariant maxVal( property ? property->option("max") : TQVariant() );
diff --git a/lib/koproperty/editors/spinbox.h b/lib/koproperty/editors/spinbox.h
index d16cc3e9..668b7b2b 100644
--- a/lib/koproperty/editors/spinbox.h
+++ b/lib/koproperty/editors/spinbox.h
@@ -39,7 +39,7 @@ class IntSpinBox : public KIntSpinBox
 
 	public:
 		IntSpinBox(int lower, int upper, int step, int value, int base=10, 
-			IntEdit *tqparent=0, const char *name=0);
+			IntEdit *parent=0, const char *name=0);
 		virtual ~IntSpinBox() {;}
 
 		virtual void setValue(const TQVariant &value);
@@ -54,7 +54,7 @@ class KOPROPERTY_EXPORT IntEdit : public Widget
 	TQ_OBJECT
 
 	public:
-		IntEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		IntEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~IntEdit();
 
 		virtual TQVariant value() const;
@@ -82,7 +82,7 @@ class DoubleSpinBox : public KDoubleSpinBox
 	public:
 		//! \todo Support setting precision limits, step, etc.
 		DoubleSpinBox(double lower, double upper, double step, double value=0, 
-			int precision=2, DoubleEdit *tqparent=0);
+			int precision=2, DoubleEdit *parent=0);
 		virtual ~DoubleSpinBox() {;}
 
 		virtual bool eventFilter(TQObject *o, TQEvent *e);
@@ -98,7 +98,7 @@ class KOPROPERTY_EXPORT DoubleEdit : public Widget
 	TQ_OBJECT
 
 	public:
-		DoubleEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		DoubleEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~DoubleEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/stringedit.cpp b/lib/koproperty/editors/stringedit.cpp
index d878efa1..55d8b3ed 100644
--- a/lib/koproperty/editors/stringedit.cpp
+++ b/lib/koproperty/editors/stringedit.cpp
@@ -26,8 +26,8 @@
 
 using namespace KoProperty;
 
-StringEdit::StringEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+StringEdit::StringEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQLineEdit(this);
diff --git a/lib/koproperty/editors/stringedit.h b/lib/koproperty/editors/stringedit.h
index fff36609..1e5e3c5c 100644
--- a/lib/koproperty/editors/stringedit.h
+++ b/lib/koproperty/editors/stringedit.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT StringEdit : public Widget
   TQ_OBJECT
 
 	public:
-		StringEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		StringEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~StringEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp
index eb4dd659..56bf1145 100644
--- a/lib/koproperty/editors/stringlistedit.cpp
+++ b/lib/koproperty/editors/stringlistedit.cpp
@@ -37,8 +37,8 @@
 
 using namespace KoProperty;
 
-StringListEdit::StringListEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+StringListEdit::StringListEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
diff --git a/lib/koproperty/editors/stringlistedit.h b/lib/koproperty/editors/stringlistedit.h
index 846e2362..994b186b 100644
--- a/lib/koproperty/editors/stringlistedit.h
+++ b/lib/koproperty/editors/stringlistedit.h
@@ -36,7 +36,7 @@ class KOPROPERTY_EXPORT StringListEdit : public Widget
   TQ_OBJECT
 
 	public:
-		StringListEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		StringListEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~StringListEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp
index 289badbb..53394d54 100644
--- a/lib/koproperty/editors/symbolcombo.cpp
+++ b/lib/koproperty/editors/symbolcombo.cpp
@@ -32,8 +32,8 @@
 
 using namespace KoProperty;
 
-SymbolCombo::SymbolCombo(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+SymbolCombo::SymbolCombo(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	setHasBorders(false);
 	TQHBoxLayout *l = new TQHBoxLayout(this);
diff --git a/lib/koproperty/editors/symbolcombo.h b/lib/koproperty/editors/symbolcombo.h
index 7f3e89e1..50ffcf96 100644
--- a/lib/koproperty/editors/symbolcombo.h
+++ b/lib/koproperty/editors/symbolcombo.h
@@ -34,7 +34,7 @@ class KOPROPERTY_EXPORT SymbolCombo : public Widget
   TQ_OBJECT
 
 	public:
-		SymbolCombo(Property *property, TQWidget *tqparent=0, const char *name=0);
+		SymbolCombo(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~SymbolCombo();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp
index 25972f0b..674d2c89 100644
--- a/lib/koproperty/editors/timeedit.cpp
+++ b/lib/koproperty/editors/timeedit.cpp
@@ -33,8 +33,8 @@
 
 using namespace KoProperty;
 
-TimeEdit::TimeEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+TimeEdit::TimeEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQTimeEdit(this);
diff --git a/lib/koproperty/editors/timeedit.h b/lib/koproperty/editors/timeedit.h
index 1dbec46b..642f4101 100644
--- a/lib/koproperty/editors/timeedit.h
+++ b/lib/koproperty/editors/timeedit.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT TimeEdit : public Widget
   TQ_OBJECT
 
 	public:
-		TimeEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		TimeEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~TimeEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/editors/urledit.cpp b/lib/koproperty/editors/urledit.cpp
index fc16268f..8c150de2 100644
--- a/lib/koproperty/editors/urledit.cpp
+++ b/lib/koproperty/editors/urledit.cpp
@@ -31,8 +31,8 @@
 
 using namespace KoProperty;
 
-URLEdit::URLEdit(Property *property, TQWidget *tqparent, const char *name)
- : Widget(property, tqparent, name)
+URLEdit::URLEdit(Property *property, TQWidget *parent, const char *name)
+ : Widget(property, parent, name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new KURLRequester(this);
diff --git a/lib/koproperty/editors/urledit.h b/lib/koproperty/editors/urledit.h
index 167738df..bba72091 100644
--- a/lib/koproperty/editors/urledit.h
+++ b/lib/koproperty/editors/urledit.h
@@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT URLEdit : public Widget
   TQ_OBJECT
 
 	public:
-		URLEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
+		URLEdit(Property *property, TQWidget *parent=0, const char *name=0);
 		virtual ~URLEdit();
 
 		virtual TQVariant value() const;
diff --git a/lib/koproperty/factory.cpp b/lib/koproperty/factory.cpp
index 864d4895..03d466f4 100644
--- a/lib/koproperty/factory.cpp
+++ b/lib/koproperty/factory.cpp
@@ -53,8 +53,8 @@ static KoProperty::FactoryManager* m_manager = 0;
 
 namespace KoProperty {
 
-CustomPropertyFactory::CustomPropertyFactory(TQObject *tqparent)
- : TQObject(tqparent)
+CustomPropertyFactory::CustomPropertyFactory(TQObject *parent)
+ : TQObject(parent)
 {
 }
 
@@ -241,23 +241,23 @@ FactoryManager::registerFactoryForProperties(const TQValueList<int> &propertyTyp
 }
 
 CustomProperty*
-FactoryManager::createCustomProperty(Property *tqparent)
+FactoryManager::createCustomProperty(Property *parent)
 {
-	const int type = tqparent->type();
+	const int type = parent->type();
 	CustomPropertyFactory *factory = d->registeredWidgets.find(type);
 	if (factory)
-		return factory->createCustomProperty(tqparent);
+		return factory->createCustomProperty(parent);
 
 	switch(type) {
 		case Size: case Size_Width: case Size_Height:
-			return new SizeCustomProperty(tqparent);
+			return new SizeCustomProperty(parent);
 		case Point: case Point_X: case Point_Y:
-			return new PointCustomProperty(tqparent);
+			return new PointCustomProperty(parent);
 		case Rect: case Rect_X: case Rect_Y: case Rect_Width: case Rect_Height:
-			return new RectCustomProperty(tqparent);
+			return new RectCustomProperty(parent);
 		case SizePolicy: case SizePolicy_HorStretch: case SizePolicy_VerStretch:
 		case SizePolicy_HorData: case SizePolicy_VerData:
-			return new SizePolicyCustomProperty(tqparent);
+			return new SizePolicyCustomProperty(parent);
 		default:
 			return 0;
 	}
diff --git a/lib/koproperty/factory.h b/lib/koproperty/factory.h
index 8abc93b3..8aca5538 100644
--- a/lib/koproperty/factory.h
+++ b/lib/koproperty/factory.h
@@ -43,17 +43,17 @@ class FactoryManagerPrivate;
 class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject
 {
 	public:
-		CustomPropertyFactory(TQObject *tqparent);
+		CustomPropertyFactory(TQObject *parent);
 		virtual ~CustomPropertyFactory();
 
-		/*! \return a new instance of custom property for \a tqparent.
+		/*! \return a new instance of custom property for \a parent.
 		 Implement this for property types you want to support.
-		 Use tqparent->type() to get type of the property. */
-		virtual CustomProperty* createCustomProperty(Property *tqparent) = 0;
+		 Use parent->type() to get type of the property. */
+		virtual CustomProperty* createCustomProperty(Property *parent) = 0;
 
 		/*! \return a new instance of custom property for \a property.
 		 Implement this for property editor types you want to support.
-		 Use tqparent->type() to get type of the property. */
+		 Use parent->type() to get type of the property. */
 		virtual Widget* createCustomWidget(Property *property) = 0;
 };
 
@@ -81,12 +81,12 @@ class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject
      \section custom_prop_composed Using Custom Properties to create composed properties
      Use a composed property when you need more than one editor for a property. Examples
      are rect, size or point properties.
-     If you create a composed property, both tqparent and tqchildren properties must have custom
+     If you create a composed property, both parent and tqchildren properties must have custom
      (different) types.
-     Child properties are created in CustomProperty constructor of the <b>tqparent</b> type,
-     by adding CustomProperty::property() as tqparent in Property constructor.\n
+     Child properties are created in CustomProperty constructor of the <b>parent</b> type,
+     by adding CustomProperty::property() as parent in Property constructor.\n
      Child properties should return handleValue() == true and in CustomProperty::setValue(),
-     tqparent's Property::setValue() should be called, making sure that useCustomProperty argument is set
+     parent's Property::setValue() should be called, making sure that useCustomProperty argument is set
      to false.\n
      Parent's handleValue() should be set to false, unless you cannot store the property in a TQVariant.
      You just need to update tqchildren's value, making sure that useCustomProperty argument is set
@@ -116,7 +116,7 @@ class KOPROPERTY_EXPORT FactoryManager : public TQObject
 		/*! Registers a custom factory \a factory for handling property editor for \a editorType.
 		This custom factory will be used before defaults when widgetForProperty() is called.
 		\a creator is not owned by this Factory object, but it's good idea
-		to instantiate CustomPropertyFactory object itself as a child of Factory tqparent. For example:
+		to instantiate CustomPropertyFactory object itself as a child of Factory parent. For example:
 		\code
 			MyCustomPropertyFactory *f = new MyCustomPropertyFactory(KoProperty::Factory::self());
 			KoProperty::Factory::self()->registerEditor( MyCustomType, f );
@@ -133,7 +133,7 @@ class KOPROPERTY_EXPORT FactoryManager : public TQObject
 		CustomPropertyFactory *factoryForEditorType(int type);
 
 		/*! Creates and returns the editor for given property type.
-		Warning: editor and viewer widgets won't have tqparent widget. Property editor
+		Warning: editor and viewer widgets won't have parent widget. Property editor
 		cares about reparenting and deletion of returned widgets in machines.
 		If \a createWidget is false, just create child properties, not widget.*/
 		Widget* createWidgetForProperty(Property *property);
@@ -150,7 +150,7 @@ class KOPROPERTY_EXPORT FactoryManager : public TQObject
 		/*! This function is called in Property::Property() to create (optional)
 		  custom property. It creates the custom property for built-in types, or
 		  calls one of createCustomProperty function previously registered for other types. */
-		CustomProperty* createCustomProperty(Property *tqparent);
+		CustomProperty* createCustomProperty(Property *parent);
 
 		/*! \return a pointer to a property factory instance.*/
 		static FactoryManager* self();
diff --git a/lib/koproperty/property.cpp b/lib/koproperty/property.cpp
index 0add7b91..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), tqparent(0), tqchildren(0), relatedProperties(0),
+		 sets(0), parent(0), tqchildren(0), relatedProperties(0),
 		 sortingKey(0)
 		{
 		}
@@ -98,7 +98,7 @@ class PropertyPrivate
 	TQPtrDict< TQGuardedPtr<Set> > *sets;
 //	TQValueList<Set*>  sets;
 
-	Property  *tqparent;
+	Property  *parent;
 	TQValueList<Property*>  *tqchildren;
 	//! list of properties with the same name (when intersecting buffers)
 	TQValueList<Property*>  *relatedProperties;
@@ -172,7 +172,7 @@ KoProperty::createValueListFromStringLists(const TQStringList &keys, const TQStr
 
 Property::Property(const TQCString &name, const TQVariant &value,
 	const TQString &caption, const TQString &description,
-	int type, Property* tqparent)
+	int type, Property* parent)
  : d( new PropertyPrivate() )
 {
 	d->name = name;
@@ -186,14 +186,14 @@ Property::Property(const TQCString &name, const TQVariant &value,
 
 	d->custom = FactoryManager::self()->createCustomProperty(this);
 
-	if (tqparent)
-		tqparent->addChild(this);
+	if (parent)
+		parent->addChild(this);
 	setValue(value, false);
 }
 
 Property::Property(const TQCString &name, const TQStringList &keys, const TQStringList &strings,
 	const TQVariant &value, const TQString &caption, const TQString &description, 
-	int type, Property* tqparent)
+	int type, Property* parent)
  : d( new PropertyPrivate() )
 {
 	d->name = name;
@@ -204,14 +204,14 @@ Property::Property(const TQCString &name, const TQStringList &keys, const TQStri
 
 	d->custom = FactoryManager::self()->createCustomProperty(this);
 
-	if (tqparent)
-		tqparent->addChild(this);
+	if (parent)
+		parent->addChild(this);
 	setValue(value, false);
 }
 
 Property::Property(const TQCString &name, ListData* listData, 
 	const TQVariant &value, const TQString &caption, const TQString &description, 
-	int type, Property* tqparent)
+	int type, Property* parent)
  : d( new PropertyPrivate() )
 {
 	d->name = name;
@@ -222,8 +222,8 @@ Property::Property(const TQCString &name, ListData* listData,
 
 	d->custom = FactoryManager::self()->createCustomProperty(this);
 
-	if (tqparent)
-		tqparent->addChild(this);
+	if (parent)
+		parent->addChild(this);
 	setValue(value, false);
 }
 
@@ -408,9 +408,9 @@ Property::resetValue()
 	if (cleared)
 		return; //property set has been cleared: no further actions make sense as 'this' is dead
 
-	// maybe tqparent  prop is also unchanged now
-	if(d->tqparent && d->tqparent->value() == d->tqparent->oldValue())
-		d->tqparent->d->changed = false;
+	// maybe parent  prop is also unchanged now
+	if(d->parent && d->parent->value() == d->parent->oldValue())
+		d->parent->d->changed = false;
 
 	if (d->sets) {
 		for (TQPtrDictIterator< TQGuardedPtr<Set> > it(*d->sets); it.current(); ++it) {
@@ -648,9 +648,9 @@ Property::child(const TQCString &name)
 }
 
 Property*
-Property::tqparent() const
+Property::parent() const
 {
-	return d->tqparent;
+	return d->parent;
 }
 
 void
@@ -664,7 +664,7 @@ Property::addChild(Property *prop)
 			d->tqchildren = new TQValueList<Property*>();
 		d->tqchildren->append(prop);
 		prop->setSortingKey(d->tqchildren->count());
-		prop->d->tqparent = this;
+		prop->d->parent = this;
 	}
 	else {
 		kopropertywarn << "Property::addChild(): property \"" << name() 
diff --git a/lib/koproperty/property.h b/lib/koproperty/property.h
index 8d7f01d6..bc8a503e 100644
--- a/lib/koproperty/property.h
+++ b/lib/koproperty/property.h
@@ -222,20 +222,20 @@ class KOPROPERTY_EXPORT Property
 		 (with newline, if any) for displaying within a property editor. */
 		Property(const TQCString &name, const TQVariant &value = TQVariant(),
 			const TQString &caption = TQString(), const TQString &description = TQString(),
-			int type = Auto, Property* tqparent = 0);
+			int type = Auto, Property* parent = 0);
 
 		/*! Constructs property of \ref ValueFromList type. */
 		Property(const TQCString &name, const TQStringList &keys, const TQStringList &strings,
 			const TQVariant &value = TQVariant(),
 			const TQString &caption = TQString(), const TQString &description = TQString(),
-			int type = ValueFromList, Property* tqparent = 0);
+			int type = ValueFromList, Property* parent = 0);
 
 		/*! Constructs property of \ref ValueFromList type.
 		 This is overload of the above ctor added for convenience. */
 		Property(const TQCString &name, ListData* listData,
 			const TQVariant &value = TQVariant(),
 			const TQString &caption = TQString(), const TQString &description = TQString(),
-			int type = ValueFromList, Property* tqparent = 0);
+			int type = ValueFromList, Property* parent = 0);
 
 		/*! Constructs a deep copy of \a prop property. */
 		Property(const Property &prop);
@@ -313,8 +313,8 @@ class KOPROPERTY_EXPORT Property
 		/*! \return a child property for \a name, or NULL if there is no property with that name. */
 		Property* child(const TQCString &name);
 
-		/*! \return tqparent property for this property, or NULL if there is no tqparent property. */
-		Property* tqparent() const;
+		/*! \return parent property for this property, or NULL if there is no parent property. */
+		Property* parent() const;
 
 		/*! \return the custom property for this property.or NULL if there was
 		no custom property defined. */
diff --git a/lib/koproperty/set.cpp b/lib/koproperty/set.cpp
index d508fc0a..5845365f 100644
--- a/lib/koproperty/set.cpp
+++ b/lib/koproperty/set.cpp
@@ -129,8 +129,8 @@ Set::Iterator::current() const
 
 //////////////////////////////////////////////
 
-Set::Set(TQObject *tqparent, const TQString &typeName)
-: TQObject(tqparent, typeName.latin1())
+Set::Set(TQObject *parent, const TQString &typeName)
+: TQObject(parent, typeName.latin1())
 {
 	d = new SetPrivate();
 	d->ownProperty = true;
@@ -140,7 +140,7 @@ Set::Set(TQObject *tqparent, const TQString &typeName)
 
 
 Set::Set(const Set &set)
- : TQObject(0 /* implicit sharing the tqparent is dangerous */, set.name())
+ : TQObject(0 /* implicit sharing the parent is dangerous */, set.name())
 {
 	d = new SetPrivate();
 	*this = set;
diff --git a/lib/koproperty/set.h b/lib/koproperty/set.h
index 9004c2c4..efb90cd9 100644
--- a/lib/koproperty/set.h
+++ b/lib/koproperty/set.h
@@ -65,10 +65,10 @@ class KOPROPERTY_EXPORT Set : public TQObject
 				friend class Set;
 		};
 
-		explicit Set(TQObject *tqparent=0, const TQString &typeName=TQString());
+		explicit Set(TQObject *parent=0, const TQString &typeName=TQString());
 
 		/*! Constructs a deep copy of \a set. 
-		 The new object will not have a TQObject tqparent even if \a set has such tqparent. */
+		 The new object will not have a TQObject parent even if \a set has such parent. */
 		explicit Set(const Set& set);
 
 		virtual ~Set();
diff --git a/lib/koproperty/utils.h b/lib/koproperty/utils.h
index ad77bf90..c731624c 100644
--- a/lib/koproperty/utils.h
+++ b/lib/koproperty/utils.h
@@ -30,7 +30,7 @@ namespace KoProperty {
 class KOPROPERTY_EXPORT GroupContainer : public TQWidget
 {
 	public:
-		GroupContainer(const TQString& title, TQWidget* tqparent);
+		GroupContainer(const TQString& title, TQWidget* parent);
 		~GroupContainer();
 
 		void setContents( TQWidget* contents );
diff --git a/lib/koproperty/widget.cpp b/lib/koproperty/widget.cpp
index dd44c2b0..b0169a96 100644
--- a/lib/koproperty/widget.cpp
+++ b/lib/koproperty/widget.cpp
@@ -55,8 +55,8 @@ class WidgetPrivate
 };
 }
 
-Widget::Widget(Property *property, TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+Widget::Widget(Property *property, TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
 {
 	d = new WidgetPrivate();
 	d->property = property;
diff --git a/lib/koproperty/widget.h b/lib/koproperty/widget.h
index 9646ecc9..5ed85885 100644
--- a/lib/koproperty/widget.h
+++ b/lib/koproperty/widget.h
@@ -39,7 +39,7 @@ class KOPROPERTY_EXPORT Widget : public TQWidget
   TQ_OBJECT
 
 	public:
-		Widget(Property *property, TQWidget *tqparent, const char *name="property_editor");
+		Widget(Property *property, TQWidget *parent, const char *name="property_editor");
 		virtual ~Widget();
 
 		/*! \return the value currently entered in the item editor widget.*/
diff --git a/lib/koproperty/widgetproxy.cpp b/lib/koproperty/widgetproxy.cpp
index 94656038..a4558319 100644
--- a/lib/koproperty/widgetproxy.cpp
+++ b/lib/koproperty/widgetproxy.cpp
@@ -44,8 +44,8 @@ class WidgetProxyPrivate
 
 using namespace KoProperty;
 
-WidgetProxy::WidgetProxy(TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+WidgetProxy::WidgetProxy(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
 {
 	d = new WidgetProxyPrivate();
 	d->property = new Property();
diff --git a/lib/koproperty/widgetproxy.h b/lib/koproperty/widgetproxy.h
index 4724eb61..f63cbdd1 100644
--- a/lib/koproperty/widgetproxy.h
+++ b/lib/koproperty/widgetproxy.h
@@ -40,7 +40,7 @@ class KOPROPERTY_EXPORT WidgetProxy : public TQWidget
   TQ_OBJECT
 
 	public:
-		WidgetProxy(TQWidget *tqparent, const char *name=0);
+		WidgetProxy(TQWidget *parent, const char *name=0);
 		WidgetProxy();
 
 		void setPropertyType(int propertyType);