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
author: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-08-10 22:19:39 +0000
committer: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-08-10 22:19:39 +0000
commit: 04766b207afba7961d4d802313e426f5a2fbef63 (patch)
tree: c888ea1027c793e2d0386a7e5a1a0cd077b03cb3 /karbon
parent: b6edfe41c9395f2e20784cbf0e630af6426950a3 (diff)
download: koffice-04766b207afba7961d4d802313e426f5a2fbef63.tar.gz
koffice-04766b207afba7961d4d802313e426f5a2fbef63.zip
137 files changed, 387 insertions, 387 deletions
diff --git a/karbon/commands/vgroupcmd.cc b/karbon/commands/vgroupcmd.cc
index d6e9a7fa..bcad4d93 100644
--- a/karbon/commands/vgroupcmd.cc
+++ b/karbon/commands/vgroupcmd.cc
@@ -47,10 +47,10 @@ VGroupCmd::execute()
 	VObjectListIterator itr( m_selection->objects() );
 	for ( ; itr.current() ; ++itr )
 	{
-		// remove from corresponding tqparent
-		VGroup *tqparent = dynamic_cast<VGroup*>( itr.current()->tqparent() );
-		if( tqparent )
-			tqparent->take( *itr.current() );
+		// remove from corresponding parent
+		VGroup *parent = dynamic_cast<VGroup*>( itr.current()->parent() );
+		if( parent )
+			parent->take( *itr.current() );
 
 		m_group->append( itr.current() );
 	}
@@ -77,18 +77,18 @@ VGroupCmd::unexecute()
 		document()->selection()->append( itr.current() );
 	}
 
-	VGroup* tqparent;
-	if( ( tqparent = dynamic_cast<VGroup*>( m_group->tqparent() ) ) )
+	VGroup* parent;
+	if( ( parent = dynamic_cast<VGroup*>( m_group->parent() ) ) )
 	{
-		// unregister from tqparent:
-		tqparent->take( *m_group );
+		// unregister from parent:
+		parent->take( *m_group );
 
-		// inform all objects in this group about their new tqparent
+		// inform all objects in this group about their new parent
 		VObjectListIterator itr = m_selection->objects();
 
 		for ( ; itr.current() ; ++itr )
 		{
-			tqparent->append( itr.current() );
+			parent->append( itr.current() );
 		}
 
 		m_group->clear();
diff --git a/karbon/commands/vreplacingcmd.cc b/karbon/commands/vreplacingcmd.cc
index d99fe313..2275dba8 100644
--- a/karbon/commands/vreplacingcmd.cc
+++ b/karbon/commands/vreplacingcmd.cc
@@ -66,7 +66,7 @@ VReplacingCmd::execute()
 				successful = true;
 
 				// Insert new tqshape right before old tqshape.
-				itr.current()->tqparent()->insertInfrontOf(
+				itr.current()->parent()->insertInfrontOf(
 					newObject, itr.current() );
 
 				// Add new tqshape to list of new objects.
diff --git a/karbon/commands/vungroupcmd.cc b/karbon/commands/vungroupcmd.cc
index e1e00531..314a873e 100644
--- a/karbon/commands/vungroupcmd.cc
+++ b/karbon/commands/vungroupcmd.cc
@@ -53,19 +53,19 @@ VUnGroupCmd::execute()
 		document()->selection()->append( itr.current() );
 	}
 
-	VGroup* tqparent;
-	if( ( tqparent = dynamic_cast<VGroup*>( m_group->tqparent() ) ) )
+	VGroup* parent;
+	if( ( parent = dynamic_cast<VGroup*>( m_group->parent() ) ) )
 	{
-		// unregister from tqparent:
-		tqparent->take( *m_group );
+		// unregister from parent:
+		parent->take( *m_group );
 
-		// inform all objects in this group about their new tqparent
+		// inform all objects in this group about their new parent
 		VObjectListIterator itr = m_group->objects();
 
 		for ( ; itr.current() ; ++itr )
 		{
 			itr.current()->invalidateBoundingBox();
-			tqparent->append( itr.current() );
+			parent->append( itr.current() );
 		}
 
 		m_group->clear();
diff --git a/karbon/core/vclipgroup.cc b/karbon/core/vclipgroup.cc
index 2451f321..9a36c1c5 100644
--- a/karbon/core/vclipgroup.cc
+++ b/karbon/core/vclipgroup.cc
@@ -32,7 +32,7 @@
 #include "vsegment.h"
 #include <vpainter.h>
 #include "vtext.h"
-VClipGroup::VClipGroup( VObject* tqparent, VState state ) : VGroup( tqparent, state ) {}
+VClipGroup::VClipGroup( VObject* parent, VState state ) : VGroup( parent, state ) {}
 VClipGroup::VClipGroup( const VClipGroup& group ) : VGroup( group ) {}
 
 VClipGroup::~VClipGroup() { }
diff --git a/karbon/core/vclipgroup.h b/karbon/core/vclipgroup.h
index f53055c6..683c3b61 100644
--- a/karbon/core/vclipgroup.h
+++ b/karbon/core/vclipgroup.h
@@ -33,7 +33,7 @@ class VPainter;
 class KARBONBASE_EXPORT VClipGroup : public VGroup
 {
 public:
-	VClipGroup( VObject* tqparent, VState state = normal );
+	VClipGroup( VObject* parent, VState state = normal );
 	VClipGroup ( const VClipGroup& group );
 
 	virtual ~VClipGroup();
diff --git a/karbon/core/vcomposite.cc b/karbon/core/vcomposite.cc
index 7872df5f..570b06dc 100644
--- a/karbon/core/vcomposite.cc
+++ b/karbon/core/vcomposite.cc
@@ -44,8 +44,8 @@
 #include <kdebug.h>
 
 
-VPath::VPath( VObject* tqparent, VState state )
-	: VObject( tqparent, state ), m_fillRule( winding )
+VPath::VPath( VObject* parent, VState state )
+	: VObject( parent, state ), m_fillRule( winding )
 {
 	m_paths.setAutoDelete( true );
 
diff --git a/karbon/core/vcomposite.h b/karbon/core/vcomposite.h
index bcac57dd..c1f6e87f 100644
--- a/karbon/core/vcomposite.h
+++ b/karbon/core/vcomposite.h
@@ -47,7 +47,7 @@ typedef TQPtrListIterator<VSubpath> VSubpathListIterator;
 class KARBONBASE_EXPORT VPath : public VObject, SVGPathParser
 {
 public:
-	VPath( VObject* tqparent, VState state = normal );
+	VPath( VObject* parent, VState state = normal );
 	VPath( const VPath& path );
 	virtual ~VPath();
 
diff --git a/karbon/core/vcursor.cc b/karbon/core/vcursor.cc
index a44004f2..c5fb2f40 100644
--- a/karbon/core/vcursor.cc
+++ b/karbon/core/vcursor.cc
@@ -92,13 +92,13 @@ TQCursor VCursor::createCursor( CursorType type )
 	}
 }
 
-TQCursor VCursor::createCursor( const char * bitmap[], const char * tqmask[], int hotX, int hotY )
+TQCursor VCursor::createCursor( const char * bitmap[], const char * mask[], int hotX, int hotY )
 {
-	// the cursor bitmap and tqmask
+	// the cursor bitmap and mask
 	TQBitmap b, m;
 
 	b = TQPixmap( (const char**) bitmap );
-	m = TQPixmap( (const char**) tqmask );
+	m = TQPixmap( (const char**) mask );
 	
 	return TQCursor( b, m, hotX, hotY );
 }
diff --git a/karbon/core/vcursor.h b/karbon/core/vcursor.h
index 90ab1673..ccb4a36f 100644
--- a/karbon/core/vcursor.h
+++ b/karbon/core/vcursor.h
@@ -27,7 +27,7 @@
 * A helper class for easily creating cursors from XPMs.
 *
 * One can create a predefined unthemed cursor or create a cursor from two given XMPs, 
-* the cursor bitmap and the cursor tqmask.
+* the cursor bitmap and the cursor mask.
 */
 class KARBONBASE_EXPORT VCursor
 {
@@ -53,7 +53,7 @@ public:
 	 * Creates a cursor from two specified XPM images.
 	 * This is only a wrapper function for a TQCursor ctor.
 	 */
-	static TQCursor createCursor( const char * bitmap[], const char * tqmask[], int hotX = -1, int hotY = -1 );
+	static TQCursor createCursor( const char * bitmap[], const char * mask[], int hotX = -1, int hotY = -1 );
 
 	/** crosshair cursor */
 	static TQCursor crossHair();
diff --git a/karbon/core/vfill.cc b/karbon/core/vfill.cc
index 549045ae..d1cd9d13 100644
--- a/karbon/core/vfill.cc
+++ b/karbon/core/vfill.cc
@@ -48,7 +48,7 @@ VFill::VFill( const VColor &c )
 
 VFill::VFill( const VFill& fill )
 {
-	// doesn't copy tqparent:
+	// doesn't copy parent:
 	*this = fill;
 }
 
@@ -100,7 +100,7 @@ VFill::saveOasis( KoGenStyles &mainStyles, KoGenStyle &style ) const
 }
 
 void
-VFill::loadOasis( const TQDomElement &/*object*/, KoOasisLoadingContext &context, VObject* tqparent )
+VFill::loadOasis( const TQDomElement &/*object*/, KoOasisLoadingContext &context, VObject* parent )
 {
 	KoStyleStack &stack = context.styleStack();
 	if( stack.hasAttributeNS( KoXmlNS::draw, "fill" ) )
@@ -118,7 +118,7 @@ VFill::loadOasis( const TQDomElement &/*object*/, KoOasisLoadingContext &context
 			TQDomElement *grad = context.oasisStyles().drawStyles()[ style ];
 			kdDebug()<<" style gradient name :"<< grad <<endl;
 			if( grad )
-				m_gradient.loadOasis( *grad, stack, tqparent );
+				m_gradient.loadOasis( *grad, stack, parent );
 		}
 		if( stack.hasAttributeNS( KoXmlNS::draw, "opacity" ) )
 			m_color.setOpacity( stack.attributeNS( KoXmlNS::draw, "opacity" ).remove( '%' ).toFloat() / 100. );
@@ -161,7 +161,7 @@ VFill::operator=( const VFill& fill )
 {
 	if( this != &fill )
 	{
-		// dont copy the tqparent!
+		// dont copy the parent!
 		m_type = fill.m_type;
 		m_color = fill.m_color;
 		m_gradient = fill.m_gradient;
diff --git a/karbon/core/vfill.h b/karbon/core/vfill.h
index d05b8c88..0e562949 100644
--- a/karbon/core/vfill.h
+++ b/karbon/core/vfill.h
@@ -72,7 +72,7 @@ public:
 	void save( TQDomElement& element ) const;
 	void saveOasis( KoGenStyles &mainStyles, KoGenStyle &style ) const;
 	void load( const TQDomElement& element );
-	void loadOasis( const TQDomElement &object, KoOasisLoadingContext &context, VObject* tqparent = 0L );
+	void loadOasis( const TQDomElement &object, KoOasisLoadingContext &context, VObject* parent = 0L );
 
 	VFill& operator=( const VFill& fill );
 
diff --git a/karbon/core/vgradient.cc b/karbon/core/vgradient.cc
index 11d6239f..60d89241 100644
--- a/karbon/core/vgradient.cc
+++ b/karbon/core/vgradient.cc
@@ -221,15 +221,15 @@ VGradient::saveOasis( KoGenStyles &mainStyles ) const
 }
 
 void
-VGradient::loadOasis( const TQDomElement &object, KoStyleStack &/*stack*/, VObject* tqparent )
+VGradient::loadOasis( const TQDomElement &object, KoStyleStack &/*stack*/, VObject* parent )
 {
 	kdDebug(38000) << "namespaceURI: " << object.namespaceURI() << endl;
 	kdDebug(38000) << "localName: " << object.localName() << endl;
 
 	KoRect bb;
 	
-	if( tqparent )
-		bb =  tqparent->boundingBox();
+	if( parent )
+		bb =  parent->boundingBox();
 
 	if( object.namespaceURI() == KoXmlNS::draw && object.localName() == "gradient" )
 	{
diff --git a/karbon/core/vgradient.h b/karbon/core/vgradient.h
index 8341eeab..12b9d552 100644
--- a/karbon/core/vgradient.h
+++ b/karbon/core/vgradient.h
@@ -109,7 +109,7 @@ public:
 	void save( TQDomElement& element ) const;
 	TQString saveOasis( KoGenStyles &mainStyles ) const;
 	void load( const TQDomElement& element );
-	void loadOasis( const TQDomElement &object, KoStyleStack &stack, VObject* tqparent = 0L );
+	void loadOasis( const TQDomElement &object, KoStyleStack &stack, VObject* parent = 0L );
 
 	void transform( const TQWMatrix& m );
 
diff --git a/karbon/core/vgroup.cc b/karbon/core/vgroup.cc
index 35f3991e..51d991e1 100644
--- a/karbon/core/vgroup.cc
+++ b/karbon/core/vgroup.cc
@@ -51,8 +51,8 @@
 #include <kdebug.h>
 
 
-VGroup::VGroup( VObject* tqparent, VState state )
-	: VObject( tqparent, state )
+VGroup::VGroup( VObject* parent, VState state )
+	: VObject( parent, state )
 {
 	m_stroke = new VStroke( this );
 	m_fill = new VFill();
diff --git a/karbon/core/vgroup.h b/karbon/core/vgroup.h
index 29eb3842..dbb3d326 100644
--- a/karbon/core/vgroup.h
+++ b/karbon/core/vgroup.h
@@ -35,14 +35,14 @@ class KARBONBASE_EXPORT VGroup : public VObject
 {
 public:
 	/**
-	 * Constructs a new group object that is child of tqparent and has the given state.
+	 * Constructs a new group object that is child of parent and has the given state.
 	 *
 	 * The object's fill and stroke are created here.
 	 *
-	 * @param tqparent the new object's tqparent
+	 * @param parent the new object's parent
 	 * @param state the new object's state
 	 */
-	VGroup( VObject* tqparent, VState state = normal );
+	VGroup( VObject* parent, VState state = normal );
 
 	/**
 	 * Copy constructor.
diff --git a/karbon/core/vimage.cc b/karbon/core/vimage.cc
index 7f75254b..4e846661 100644
--- a/karbon/core/vimage.cc
+++ b/karbon/core/vimage.cc
@@ -17,7 +17,7 @@
 
 #include <kdebug.h>
 
-VImage::VImage( VObject *tqparent, const TQString &fname ) : VObject( tqparent ), m_image( 0L ), m_fname( fname )
+VImage::VImage( VObject *parent, const TQString &fname ) : VObject( parent ), m_image( 0L ), m_fname( fname )
 {
 	m_stroke = new VStroke( this );
 	m_stroke->setType( VStroke::none );
diff --git a/karbon/core/vimage.h b/karbon/core/vimage.h
index 2933b4eb..531c2bf5 100644
--- a/karbon/core/vimage.h
+++ b/karbon/core/vimage.h
@@ -14,7 +14,7 @@ class TQImage;
 class KARBONBASE_EXPORT VImage : public VObject
 {
 public:
-	VImage( VObject *tqparent, const TQString &fname = "" );
+	VImage( VObject *parent, const TQString &fname = "" );
 	VImage( const VImage & );
 	virtual ~VImage();
 
diff --git a/karbon/core/vkarbonplugin.cc b/karbon/core/vkarbonplugin.cc
index d05043d9..41fd47a8 100644
--- a/karbon/core/vkarbonplugin.cc
+++ b/karbon/core/vkarbonplugin.cc
@@ -19,7 +19,7 @@
 
 #include "vkarbonplugin.h"
 
-VKarbonPlugin::VKarbonPlugin( TQObject *tqparent, const char* name ) : Plugin( tqparent, name )
+VKarbonPlugin::VKarbonPlugin( TQObject *parent, const char* name ) : Plugin( parent, name )
 {
 }
 
diff --git a/karbon/core/vkarbonplugin.h b/karbon/core/vkarbonplugin.h
index e86680a0..84fed9c6 100644
--- a/karbon/core/vkarbonplugin.h
+++ b/karbon/core/vkarbonplugin.h
@@ -26,7 +26,7 @@
 class KARBONBASE_EXPORT VKarbonPlugin : public KParts::Plugin
 {
 public:
-	VKarbonPlugin( TQObject *tqparent, const char* name );
+	VKarbonPlugin( TQObject *parent, const char* name );
 	virtual ~VKarbonPlugin() {}
 };
 
diff --git a/karbon/core/vlayer.cc b/karbon/core/vlayer.cc
index dddfe6ce..47fe919d 100644
--- a/karbon/core/vlayer.cc
+++ b/karbon/core/vlayer.cc
@@ -35,8 +35,8 @@
 #include "vfill.h"
 #include "vstroke.h"
 
-VLayer::VLayer( VObject* tqparent, VState state )
-	: VGroup( tqparent, state )
+VLayer::VLayer( VObject* parent, VState state )
+	: VGroup( parent, state )
 {
 	setName( "Layer" );
 	// HACK : vlayer just shouldn't have fill/stroke at all
diff --git a/karbon/core/vlayer.h b/karbon/core/vlayer.h
index 7dbd126b..f52e7be4 100644
--- a/karbon/core/vlayer.h
+++ b/karbon/core/vlayer.h
@@ -37,12 +37,12 @@ class KARBONBASE_EXPORT VLayer : public VGroup
 {
 public:
 	/**
-	 * Constructs a new layer object that is child of tqparent and has the given state.
+	 * Constructs a new layer object that is child of parent and has the given state.
 	 *
-	 * @param tqparent the new object's tqparent
+	 * @param parent the new object's parent
 	 * @param state the new object's state
 	 */
-	VLayer( VObject* tqparent, VState state = normal );
+	VLayer( VObject* parent, VState state = normal );
 
 	/**
 	 * Copy constructor.
diff --git a/karbon/core/vobject.cc b/karbon/core/vobject.cc
index 5e9f74b6..897652c3 100644
--- a/karbon/core/vobject.cc
+++ b/karbon/core/vobject.cc
@@ -33,12 +33,12 @@
 #include <KoOasisLoadingContext.h>
 #include <KoOasisStyles.h>
 
-VObject::VObject( VObject* tqparent, VState state ) : m_dcop( 0L )
+VObject::VObject( VObject* parent, VState state ) : m_dcop( 0L )
 {
 	m_stroke = 0L;
 	m_fill = 0L;
 	
-	m_parent = tqparent;
+	m_parent = parent;
 	m_state = state;
 
 	invalidateBoundingBox();
@@ -205,9 +205,9 @@ VObject::addStyles( const TQDomElement* style, KoOasisLoadingContext & context )
 {
 	if(style)
 	{
-		// this function is necessary as tqparent styles can have parents themself
-		if( style->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) )
-			addStyles( context.oasisStyles().findStyle( style->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() ) ), context );
+		// this function is necessary as parent styles can have parents themself
+		if( style->hasAttributeNS( KoXmlNS::style, "parent-style-name" ) )
+			addStyles( context.oasisStyles().findStyle( style->attributeNS( KoXmlNS::style, "parent-style-name", TQString() ) ), context );
 		context.addStyles( style, "style-name" );
 	}
 }
@@ -216,8 +216,8 @@ VDocument *
 VObject::document() const
 {
 	VObject *obj = (VObject *)this;
-	while( obj->tqparent() )
-		obj = obj->tqparent();
+	while( obj->parent() )
+		obj = obj->parent();
 	return dynamic_cast<VDocument *>( obj );
 }
 
diff --git a/karbon/core/vobject.h b/karbon/core/vobject.h
index 7cbbb0e9..899422ee 100644
--- a/karbon/core/vobject.h
+++ b/karbon/core/vobject.h
@@ -44,7 +44,7 @@ class KoGenStyle;
  * have the ability to draw itself using a painter, perform
  * hit detection, transform on demand, clone and load/save itself.
  * Also each object manages its own bounding box and keeps track of its
- * tqparent object.
+ * parent object.
  */
 class KARBONBASE_EXPORT VObject
 {
@@ -63,16 +63,16 @@ public:
 	};
 
 	/**
-	 * Constructs a new object that is child of tqparent and has the given state.
+	 * Constructs a new object that is child of parent and has the given state.
 	 *
-	 * @param tqparent the new object's tqparent
+	 * @param parent the new object's parent
 	 * @param state the new object's state
 	 */
-	VObject( VObject* tqparent, VState state = edit );
+	VObject( VObject* parent, VState state = edit );
 	
 	/**
 	 * Copy constructor.
-	 * Copies tqparent, state and name of given object.
+	 * Copies parent, state and name of given object.
 	 *
 	 * @param obj the object to copy properties from
 	 */
@@ -133,18 +133,18 @@ public:
 	}
 
 	/**
-	 * Sets a new tqparent object.
+	 * Sets a new parent object.
 	 *
-	 * @param tqparent the new tqparent object
+	 * @param parent the new parent object
 	 */
-	void setParent( VObject* tqparent ) { m_parent = tqparent; }
+	void setParent( VObject* parent ) { m_parent = parent; }
 
 	/**
-	 * Returns pointer to current tqparent object.
+	 * Returns pointer to current parent object.
 	 *
-	 * @return pointer to current tqparent object or 0 if no tqparent object is set
+	 * @return pointer to current parent object or 0 if no parent object is set
 	 */
-	VObject* tqparent() const { return m_parent; }
+	VObject* parent() const { return m_parent; }
 
 	/**
 	 * Get the state the object is in.
@@ -266,7 +266,7 @@ public:
 	/**
 	 * Return document the object belongs to.
 	 *
-	 * @return pointer to tqparent document or 0 if object does not belong to a document
+	 * @return pointer to parent document or 0 if object does not belong to a document
 	 */
 	VDocument *document() const;
 
diff --git a/karbon/core/vobject_iface.cc b/karbon/core/vobject_iface.cc
index 09291ec4..c93b68d6 100644
--- a/karbon/core/vobject_iface.cc
+++ b/karbon/core/vobject_iface.cc
@@ -41,11 +41,11 @@ VObjectIface::setState( int state )
 }
 
 DCOPRef
-VObjectIface::tqparent() const
+VObjectIface::parent() const
 {
-	if( !m_object->tqparent() )
+	if( !m_object->parent() )
 		return DCOPRef();
 
-	return DCOPRef( kapp->dcopClient()->appId(), m_object->tqparent()->dcopObject()->objId() );
+	return DCOPRef( kapp->dcopClient()->appId(), m_object->parent()->dcopObject()->objId() );
 }
 
diff --git a/karbon/core/vobject_iface.h b/karbon/core/vobject_iface.h
index e3a081d3..bbf2c6c5 100644
--- a/karbon/core/vobject_iface.h
+++ b/karbon/core/vobject_iface.h
@@ -45,9 +45,9 @@ k_dcop:
 
 	bool boundingBoxIsInvalid() const;
 	void invalidateBoundingBox();
-	void setParent( VObject* tqparent ) { m_parent = tqparent; }*/
+	void setParent( VObject* parent ) { m_parent = parent; }*/
 
-	DCOPRef tqparent() const;
+	DCOPRef parent() const;
 
 	int state() const;
 	void setState( int state );
diff --git a/karbon/core/vpath.cc b/karbon/core/vpath.cc
index 1442d90c..e5366966 100644
--- a/karbon/core/vpath.cc
+++ b/karbon/core/vpath.cc
@@ -125,8 +125,8 @@ private:
 };
 
 
-VSubpath::VSubpath( VObject* tqparent )
-		: VObject( tqparent )
+VSubpath::VSubpath( VObject* parent )
+		: VObject( parent )
 {
 	m_isClosed = false;
 
@@ -654,7 +654,7 @@ VSubpath::revert()
 		return;
 
 
-	VSubpath list( tqparent() );
+	VSubpath list( parent() );
 	list.moveTo( getLast()->knot() );
 
 	VSegment* segment = getLast();
diff --git a/karbon/core/vpath.h b/karbon/core/vpath.h
index 48c89a4c..7ed6f9be 100644
--- a/karbon/core/vpath.h
+++ b/karbon/core/vpath.h
@@ -44,7 +44,7 @@ class KARBONBASE_EXPORT VSubpath : public VObject
 	friend class VSubpathIterator;
 
 public:
-	VSubpath( VObject* tqparent );
+	VSubpath( VObject* parent );
 	VSubpath( const VSubpath& list );
 	VSubpath( const VSegment& segment );
 	virtual ~VSubpath();
diff --git a/karbon/core/vselection.cc b/karbon/core/vselection.cc
index 77809ac5..5a10373f 100644
--- a/karbon/core/vselection.cc
+++ b/karbon/core/vselection.cc
@@ -32,8 +32,8 @@
 
 uint VSelection::m_handleNodeSize = 3;
 
-VSelection::VSelection( VObject* tqparent )
-	: VObject( tqparent ), m_showhandle( true )
+VSelection::VSelection( VObject* parent )
+	: VObject( parent ), m_showhandle( true )
 {
 	m_handleRect = new KoRect[ 10 ];
 	setStroke( VStroke( VColor( TQt::black ) ) );
@@ -90,7 +90,7 @@ VSelection::take( const KoRect& rect, bool selectObjects, bool exclusive )
 	if( selectObjects )
 	{
 		VSelectObjects op( m_objects, rect, false );
-		if( op.visit( *static_cast<VDocument*>( tqparent() ) ) )
+		if( op.visit( *static_cast<VDocument*>( parent() ) ) )
 		{
 			selectNodes();
 			success = true;
@@ -123,7 +123,7 @@ VSelection::append()
 	clear();
 
 	VSelectObjects op( m_objects );
-	op.visit( *static_cast<VDocument*>( tqparent() ) );
+	op.visit( *static_cast<VDocument*>( parent() ) );
 	selectNodes();
 
 	invalidateBoundingBox();
@@ -159,7 +159,7 @@ VSelection::append( const KoRect& rect, bool selectObjects, bool exclusive )
 	{
 		//m_objects.clear();
 		VSelectObjects op( m_objects, rect );
-		if( op.visit( *static_cast<VDocument*>( tqparent() ) ) )
+		if( op.visit( *static_cast<VDocument*>( parent() ) ) )
 		{
 			selectNodes();
 			success = true;
diff --git a/karbon/core/vselection.h b/karbon/core/vselection.h
index c98e5bf1..3db5d539 100644
--- a/karbon/core/vselection.h
+++ b/karbon/core/vselection.h
@@ -62,11 +62,11 @@ class KARBONBASE_EXPORT VSelection : public VObject, public VVisitor
 {
 public:
 	/** 
-	 * Constructs a vselection with the specified tqparent.
+	 * Constructs a vselection with the specified parent.
 	 * 
-	 * @param tqparent the selection's tqparent
+	 * @param parent the selection's parent
 	 */
-	VSelection( VObject* tqparent = 0L );
+	VSelection( VObject* parent = 0L );
 
 	/**
 	 * Constructs a vselection by copying the specified selection.
diff --git a/karbon/core/vstroke.cc b/karbon/core/vstroke.cc
index 043f4e27..0ec27fb2 100644
--- a/karbon/core/vstroke.cc
+++ b/karbon/core/vstroke.cc
@@ -33,10 +33,10 @@ VStroke::VStroke()
 : m_parent(0L), m_lineWidth(1.0), m_lineCap(capButt), m_lineJoin(joinMiter), m_miterLimit(10.0), m_type(none)
 {}
 
-VStroke::VStroke( VObject* tqparent, float width, const VLineCap cap, const VLineJoin join,
+VStroke::VStroke( VObject* parent, float width, const VLineCap cap, const VLineJoin join,
 			float miterLimit )
 {
-	m_parent = tqparent;
+	m_parent = parent;
 	m_type = solid;
 	m_lineWidth = width;
 	m_lineCap = cap;
@@ -44,10 +44,10 @@ VStroke::VStroke( VObject* tqparent, float width, const VLineCap cap, const VLin
 	m_miterLimit = miterLimit;
 }
 
-VStroke::VStroke( const VColor &c, VObject* tqparent, float width, const VLineCap cap, const VLineJoin join,
+VStroke::VStroke( const VColor &c, VObject* parent, float width, const VLineCap cap, const VLineJoin join,
 			float miterLimit )
 {
-	m_parent = tqparent;
+	m_parent = parent;
 	m_type = solid;
 	m_lineWidth = width;
 	m_lineCap = cap;
@@ -58,7 +58,7 @@ VStroke::VStroke( const VColor &c, VObject* tqparent, float width, const VLineCa
 
 VStroke::VStroke( const VStroke& stroke )
 {
-	// doesn't copy tqparent:
+	// doesn't copy parent:
 	*this = stroke;
 }
 
@@ -67,7 +67,7 @@ VStroke::setLineWidth( float width )
 {
 	m_lineWidth = width;
 
-	// tell our tqparent so he can update his bbox:
+	// tell our parent so he can update his bbox:
 	if( m_parent )
 		m_parent->invalidateBoundingBox();
 }
@@ -235,11 +235,11 @@ VStroke::operator=( const VStroke& stroke )
 {
 	if( this != &stroke )
 	{
-		// dont copy the tqparent!
+		// dont copy the parent!
 		m_type = stroke.m_type;
 
 		m_lineWidth = stroke.m_lineWidth;
-		// Tell our tqparent about the linewidth change, so he can update his bbox:
+		// Tell our parent about the linewidth change, so he can update his bbox:
 		//if( m_parent )
 		//	m_parent->invalidateBoundingBox();
 
diff --git a/karbon/core/vstroke.h b/karbon/core/vstroke.h
index 90eedc43..5be1eaf4 100644
--- a/karbon/core/vstroke.h
+++ b/karbon/core/vstroke.h
@@ -72,14 +72,14 @@ public:
 	};
 
 	VStroke();
-	VStroke( VObject* tqparent, float width = 1.0, const VLineCap cap = capButt,
+	VStroke( VObject* parent, float width = 1.0, const VLineCap cap = capButt,
 			 const VLineJoin join = joinMiter, float miterLimit = 10.0 );
-	VStroke( const VColor &c, VObject* tqparent = 0L, float width = 1.0, const VLineCap cap = capButt,
+	VStroke( const VColor &c, VObject* parent = 0L, float width = 1.0, const VLineCap cap = capButt,
 			 const VLineJoin join = joinMiter, float miterLimit = 10.0 );
 	VStroke( const VStroke& stroke );
 
-	void setParent( VObject* tqparent ) { m_parent = tqparent; }
-	VObject* tqparent()const { return m_parent; }
+	void setParent( VObject* parent ) { m_parent = parent; }
+	VObject* parent()const { return m_parent; }
 
 	VStrokeType type() const { return m_type; }
 	void setType( VStrokeType type ) { m_type = type; }
diff --git a/karbon/core/vtext.cc b/karbon/core/vtext.cc
index e73445ee..c45d91cb 100644
--- a/karbon/core/vtext.cc
+++ b/karbon/core/vtext.cc
@@ -120,8 +120,8 @@ FT_Outline_Funcs OutlineMethods =
 
 #endif // HAVE_KARBONTEXT
 
-VText::VText( VObject* tqparent, VState state )
-	: VObject( tqparent, state ), m_basePath( 0L )
+VText::VText( VObject* parent, VState state )
+	: VObject( parent, state ), m_basePath( 0L )
 {
 	m_glyphs.setAutoDelete( true );
 	m_boundingBoxIsInvalid = true;
@@ -287,7 +287,7 @@ VText::clone() const
 
 VGroup* VText::toVGroup() const
 {
-	VGroup* group = new VGroup( tqparent() );
+	VGroup* group = new VGroup( parent() );
 
 	VPathListIterator itr( m_glyphs );
 	for( itr.toFirst(); itr.current(); ++itr )
diff --git a/karbon/core/vtext.h b/karbon/core/vtext.h
index 55455c5f..ef40ac28 100644
--- a/karbon/core/vtext.h
+++ b/karbon/core/vtext.h
@@ -56,7 +56,7 @@ public:
 		Right
 	};
 
-	VText( VObject* tqparent, VState state = normal );
+	VText( VObject* parent, VState state = normal );
 	VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment tqalignment, const TQString& text );
 	VText( const VText& text );
 	virtual ~VText();
diff --git a/karbon/dialogs/vcolordlg.cc b/karbon/dialogs/vcolordlg.cc
index b12d983b..90548045 100644
--- a/karbon/dialogs/vcolordlg.cc
+++ b/karbon/dialogs/vcolordlg.cc
@@ -24,8 +24,8 @@
 #include "vcolordlg.h"
 #include "vcolortab.h"
 
-VColorDlg::VColorDlg( const VColor &c, TQWidget* tqparent, const char* name )
-	: KDialogBase ( tqparent, name, true, i18n( "Uniform Color" ),
+VColorDlg::VColorDlg( const VColor &c, TQWidget* parent, const char* name )
+	: KDialogBase ( parent, name, true, i18n( "Uniform Color" ),
 		KDialogBase::Ok | KDialogBase::Cancel )
 {
 	m_colortab = new VColorTab( VColor( c ), this, name );
diff --git a/karbon/dialogs/vcolordlg.h b/karbon/dialogs/vcolordlg.h
index 92fc0857..97e53d27 100644
--- a/karbon/dialogs/vcolordlg.h
+++ b/karbon/dialogs/vcolordlg.h
@@ -33,7 +33,7 @@ class VColorDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VColorDlg( const VColor &c, TQWidget* tqparent = 0L, const char* name = 0L );
+	VColorDlg( const VColor &c, TQWidget* parent = 0L, const char* name = 0L );
 
 	VColor Color();
 
diff --git a/karbon/dialogs/vcolortab.cc b/karbon/dialogs/vcolortab.cc
index f66a9ced..56fecc0b 100644
--- a/karbon/dialogs/vcolortab.cc
+++ b/karbon/dialogs/vcolortab.cc
@@ -34,8 +34,8 @@
 #include <kdebug.h>
 
 
-VColorTab::VColorTab( const VColor &c, TQWidget* tqparent, const char* name )
-	: TQTabWidget( tqparent, name )
+VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name )
+	: TQTabWidget( parent, name )
 {
 	TQGridLayout *mainLayout;
 
diff --git a/karbon/dialogs/vcolortab.h b/karbon/dialogs/vcolortab.h
index 5397cdb8..c705b675 100644
--- a/karbon/dialogs/vcolortab.h
+++ b/karbon/dialogs/vcolortab.h
@@ -37,7 +37,7 @@ class VColorTab : public TQTabWidget
   TQ_OBJECT
 
 public:
-	VColorTab( const VColor &c, TQWidget* tqparent = 0L, const char* name = 0L );
+	VColorTab( const VColor &c, TQWidget* parent = 0L, const char* name = 0L );
 
 	VColor Color();
 
diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc
index ba86b313..141006dc 100644
--- a/karbon/dialogs/vconfiguredlg.cc
+++ b/karbon/dialogs/vconfiguredlg.cc
@@ -43,29 +43,29 @@
 #include "vconfiguredlg.h"
 
 
-VConfigureDlg::VConfigureDlg( KarbonView* tqparent )
+VConfigureDlg::VConfigureDlg( KarbonView* parent )
 		: KDialogBase( KDialogBase::IconList, i18n( "Configure" ),
 					   KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::Default,
-					   KDialogBase::Ok, tqparent )
+					   KDialogBase::Ok, parent )
 
 {
 	TQVBox * page = addVBoxPage(
 					   i18n( "Interface" ), i18n( "Interface" ),
 					   BarIcon( "misc", KIcon::SizeMedium ) );
 
-	m_interfacePage = new VConfigInterfacePage( tqparent, page );
+	m_interfacePage = new VConfigInterfacePage( parent, page );
 
 	page = addVBoxPage(
 			   i18n( "Misc" ), i18n( "Misc" ),
 			   BarIcon( "misc", KIcon::SizeMedium ) );
 
-	m_miscPage = new VConfigMiscPage( tqparent, page );
+	m_miscPage = new VConfigMiscPage( parent, page );
 
 	page = addVBoxPage(
 			   i18n( "Grid" ), i18n( "Grid" ),
 			   BarIcon( "grid", KIcon::SizeMedium ) );
 
-	m_gridPage = new VConfigGridPage( tqparent, page );
+	m_gridPage = new VConfigGridPage( parent, page );
 
 	connect( m_miscPage, TQT_SIGNAL( unitChanged( int ) ), m_gridPage, TQT_SLOT( slotUnitChanged( int ) ) );
 
@@ -73,7 +73,7 @@ VConfigureDlg::VConfigureDlg( KarbonView* tqparent )
 			   i18n( "Document" ), i18n( "Document Settings" ),
 			   BarIcon( "document", KIcon::SizeMedium ) );
 
-	m_defaultDocPage = new VConfigDefaultPage( tqparent, page );
+	m_defaultDocPage = new VConfigDefaultPage( parent, page );
 	connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApply() ) );
 }
 
@@ -105,7 +105,7 @@ void VConfigureDlg::slotDefault()
 
 VConfigInterfacePage::VConfigInterfacePage( KarbonView* view,
 		TQVBox* box, char* name )
-		: TQObject( box->tqparent(), name )
+		: TQObject( box->parent(), name )
 {
 	m_view = view;
 	m_config = KarbonFactory::instance()->config();
@@ -210,7 +210,7 @@ void VConfigInterfacePage::slotDefault()
 
 
 VConfigMiscPage::VConfigMiscPage( KarbonView* view, TQVBox* box, char* name )
-		: TQObject( box->tqparent(), name )
+		: TQObject( box->parent(), name )
 {
     m_view = view;
     m_config = KarbonFactory::instance()->config();
@@ -283,7 +283,7 @@ void VConfigMiscPage::slotDefault()
 }
 
 VConfigGridPage::VConfigGridPage( KarbonView* view, TQVBox* page, char* name )
-		: TQObject( page->tqparent(), name )
+		: TQObject( page->parent(), name )
 {
 	m_view = view;
 	KoUnit::Unit unit = view->part()->document().unit();
@@ -378,7 +378,7 @@ void VConfigGridPage::slotDefault()
 
 VConfigDefaultPage::VConfigDefaultPage( KarbonView* view,
                                         TQVBox* box, char* name )
-    : TQObject( box->tqparent(), name )
+    : TQObject( box->parent(), name )
 {
     m_view = view;
 
diff --git a/karbon/dialogs/vconfiguredlg.h b/karbon/dialogs/vconfiguredlg.h
index dd12eba2..2ba989de 100644
--- a/karbon/dialogs/vconfiguredlg.h
+++ b/karbon/dialogs/vconfiguredlg.h
@@ -151,7 +151,7 @@ class VConfigureDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VConfigureDlg( KarbonView* tqparent );
+	VConfigureDlg( KarbonView* parent );
 
 public slots:
 	void slotApply();
diff --git a/karbon/dialogs/vstrokedlg.cc b/karbon/dialogs/vstrokedlg.cc
index 8dcfa9f9..2428de11 100644
--- a/karbon/dialogs/vstrokedlg.cc
+++ b/karbon/dialogs/vstrokedlg.cc
@@ -39,8 +39,8 @@
 #include "vstrokedlg.h"
 #include "vcolortab.h"
 
-VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* tqparent, const char* name )
-	: KDialogBase ( tqparent, name, true, i18n( "Stroke" ), Ok | Cancel ), m_part( part )
+VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* parent, const char* name )
+	: KDialogBase ( parent, name, true, i18n( "Stroke" ), Ok | Cancel ), m_part( part )
 {
 	enableButtonSeparator( true );
 	TQTabWidget *mainWidget = new TQTabWidget( this, "strokemain" );
diff --git a/karbon/dialogs/vstrokedlg.h b/karbon/dialogs/vstrokedlg.h
index a75a8727..eab40610 100644
--- a/karbon/dialogs/vstrokedlg.h
+++ b/karbon/dialogs/vstrokedlg.h
@@ -37,7 +37,7 @@ class VStrokeDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VStrokeDlg( KarbonPart* part, TQWidget* tqparent = 0L, const char* name = 0L );
+	VStrokeDlg( KarbonPart* part, TQWidget* parent = 0L, const char* name = 0L );
 
 private:
 	VColorTab* m_colortab;
diff --git a/karbon/dockers/vcolordocker.cc b/karbon/dockers/vcolordocker.cc
index 0babda00..c6453575 100644
--- a/karbon/dockers/vcolordocker.cc
+++ b/karbon/dockers/vcolordocker.cc
@@ -51,8 +51,8 @@
 
 #include <kdebug.h>
 
-VColorDocker::VColorDocker( KarbonPart* part, KarbonView* tqparent, const char* /*name*/ )
-	: TQWidget(), m_part ( part ), m_view( tqparent )
+VColorDocker::VColorDocker( KarbonPart* part, KarbonView* parent, const char* /*name*/ )
+	: TQWidget(), m_part ( part ), m_view( parent )
 {
 	m_isStrokeDocker = false;
 	setCaption( i18n( "Color Chooser" ) );
diff --git a/karbon/dockers/vcolordocker.h b/karbon/dockers/vcolordocker.h
index ea8e4c9d..a973d7c6 100644
--- a/karbon/dockers/vcolordocker.h
+++ b/karbon/dockers/vcolordocker.h
@@ -37,7 +37,7 @@ class VColorDocker : public TQWidget
   TQ_OBJECT
 
 public:
-	 VColorDocker( KarbonPart* part, KarbonView* tqparent = 0L, const char* name = 0L );
+	 VColorDocker( KarbonPart* part, KarbonView* parent = 0L, const char* name = 0L );
 	 virtual ~VColorDocker();
 
 	 virtual bool isStrokeDocker() { return m_isStrokeDocker; };
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index 23e4243c..98b0b883 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -61,8 +61,8 @@ static long g_lastKey = 0;
  *  Document tab                                                         *
  *************************************************************************/
 
-VDocumentPreview::VDocumentPreview( KarbonView* view, TQWidget* tqparent )
-		: TQWidget( tqparent, "DocumentPreview" ), m_document( &view->part()->document() ), m_view( view )
+VDocumentPreview::VDocumentPreview( KarbonView* view, TQWidget* parent )
+		: TQWidget( parent, "DocumentPreview" ), m_document( &view->part()->document() ), m_view( view )
 {
 	update();
 	installEventFilter( this );
@@ -220,8 +220,8 @@ VDocumentPreview::paintEvent( TQPaintEvent* )
 	bitBlt( this, 0, 0, &pixmap, 0, 0, width(), height() );
 } // VDocumentPreview::paintEvent
 
-VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* tqparent )
-		: TQWidget( tqparent, "DocumentTab" ), m_view( view )
+VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* parent )
+		: TQWidget( parent, "DocumentTab" ), m_view( view )
 {
 	TQFrame* frame;
 	TQGridLayout* tqlayout = new TQGridLayout( this );
@@ -303,8 +303,8 @@ VDocumentTab::slotCommandExecuted()
  *  Layers tab                                                           *
  *************************************************************************/
 
-VObjectListViewItem::VObjectListViewItem( TQListViewItem* tqparent, VObject* object, VDocument *doc, uint key, TQPtrDict<VObjectListViewItem> *map )
-	: TQListViewItem( tqparent, 0L ), m_object( object ), m_document( doc ), m_key( key ), m_map( map )
+VObjectListViewItem::VObjectListViewItem( TQListViewItem* parent, VObject* object, VDocument *doc, uint key, TQPtrDict<VObjectListViewItem> *map )
+	: TQListViewItem( parent, 0L ), m_object( object ), m_document( doc ), m_key( key ), m_map( map )
 {
 	update();
 	// add itself to object list item map
@@ -370,8 +370,8 @@ VObjectListViewItem::compare( TQListViewItem *i, int /*col*/, bool /*ascending*/
 	return m_key < objectItem->m_key ? -1 : 1;
 }
 
-VLayerListViewItem::VLayerListViewItem( TQListView* tqparent, VLayer* layer, VDocument *doc, TQPtrDict<VLayerListViewItem> *map )
-	: TQCheckListItem( tqparent, 0L, CheckBox ), m_layer( layer ), m_document( doc), m_map( map )
+VLayerListViewItem::VLayerListViewItem( TQListView* parent, VLayer* layer, VDocument *doc, TQPtrDict<VLayerListViewItem> *map )
+	: TQCheckListItem( parent, 0L, CheckBox ), m_layer( layer ), m_document( doc), m_map( map )
 {
 	update();
 	// add itself to layer list item map
@@ -449,8 +449,8 @@ VLayerListViewItem::compare( TQListViewItem *i, int /*col*/, bool /*ascending*/
 	return m_key < layerItem->m_key ? -1 : 1;
 }
 
-VLayersTab::VLayersTab( KarbonView* view, TQWidget* tqparent )
-		: TQWidget( tqparent, "LayersTab" ), m_view( view ), m_document( &view->part()->document() )
+VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent )
+		: TQWidget( parent, "LayersTab" ), m_view( view ), m_document( &view->part()->document() )
 {
 
 	TQToolButton* button;
@@ -584,12 +584,12 @@ VLayersTab::selectionChangedFromTool()
 			VObjectListViewItem *item = m_objects[ obj ];
 			if( ! item ) 
 			{
-				VLayerListViewItem *layerItem = m_layers[ obj->tqparent() ];
+				VLayerListViewItem *layerItem = m_layers[ obj->parent() ];
 				if( layerItem )
 					updateObjects( layerItem->layer(), layerItem );
 				else
 				{
-					VObjectListViewItem *objectItem = m_objects[ obj->tqparent() ];
+					VObjectListViewItem *objectItem = m_objects[ obj->parent() ];
 					if( objectItem )
 						updateObjects( objectItem->object(), objectItem );
 					else
@@ -982,10 +982,10 @@ VLayersTab::updateObjects( VObject *object, TQListViewItem *item )
 				objectItem = new VObjectListViewItem( item, itr.current(), m_document, objcount, &m_objects );
 				objectItem->update();
 			}
-			else if( objectItem->tqparent() != item )
+			else if( objectItem->parent() != item )
 			{
-				// object found, but has false tqparent -> reparent
-				objectItem->tqparent()->takeItem( objectItem );
+				// object found, but has false parent -> reparent
+				objectItem->parent()->takeItem( objectItem );
 				item->insertItem( objectItem );
 			}
 
@@ -1009,11 +1009,11 @@ VLayersTab::removeDeletedObjectsFromList()
 	// BEWARE: when deleting an item, the iterator is automatically incremented
 	for(; it.current(); )
 	{
-		VLayerListViewItem *layerItem = dynamic_cast<VLayerListViewItem*>( it.current()->tqparent() );
+		VLayerListViewItem *layerItem = dynamic_cast<VLayerListViewItem*>( it.current()->parent() );
 		if( layerItem )
 		{
 			VGroup *group = dynamic_cast<VGroup*>( layerItem->layer() );
-			// check if object of item is still child of object of tqparent item
+			// check if object of item is still child of object of parent item
 			if( group && ! group->objects().contains( it.current()->object() ) )
 			{
 				layerItem->takeItem( it.current() );
@@ -1023,11 +1023,11 @@ VLayersTab::removeDeletedObjectsFromList()
 		}
 		else
 		{
-			VObjectListViewItem *objectItem = dynamic_cast<VObjectListViewItem*>( it.current()->tqparent() );
+			VObjectListViewItem *objectItem = dynamic_cast<VObjectListViewItem*>( it.current()->parent() );
 			if( objectItem ) 
 			{
 				VGroup *group = dynamic_cast<VGroup*>( objectItem->object() );
-				// check if object of item is still child of object of tqparent item
+				// check if object of item is still child of object of parent item
 				if( group && ! group->objects().contains( it.current()->object() ) )
 				{
 					objectItem->takeItem( it.current() );
@@ -1085,12 +1085,12 @@ VLayersTab::slotCommandExecuted( VCommand* command )
  *  History tab                                                          *
  *************************************************************************/
 
-VHistoryGroupItem::VHistoryGroupItem( VHistoryItem* item, TQListView* tqparent, TQListViewItem* after )
-		: TQListViewItem( tqparent, after )
+VHistoryGroupItem::VHistoryGroupItem( VHistoryItem* item, TQListView* parent, TQListViewItem* after )
+		: TQListViewItem( parent, after )
 {
 	setPixmap( 0, *item->pixmap( 0 ) );
 	setText( 0, item->text( 0 ) );
-	tqparent->takeItem( item );
+	parent->takeItem( item );
 	insertItem( item );
 	m_key = item->key( 0, true );
 } // VHistoryItem::VHistoryItem
@@ -1145,14 +1145,14 @@ VHistoryGroupItem::paintFocus( TQPainter*, const TQColorGroup&, const TQRect& )
 
 } // VHistoryGroupItem::paintFocus
 
-VHistoryItem::VHistoryItem( VCommand* command, TQListView* tqparent, TQListViewItem* after )
-		: TQListViewItem( tqparent, after ), m_command( command )
+VHistoryItem::VHistoryItem( VCommand* command, TQListView* parent, TQListViewItem* after )
+		: TQListViewItem( parent, after ), m_command( command )
 {
 	init();
 } // VHistoryItem::VHistoryItem
 
-VHistoryItem::VHistoryItem( VCommand* command, VHistoryGroupItem* tqparent, TQListViewItem* after )
-		: TQListViewItem( tqparent, after ), m_command( command )
+VHistoryItem::VHistoryItem( VCommand* command, VHistoryGroupItem* parent, TQListViewItem* after )
+		: TQListViewItem( parent, after ), m_command( command )
 {
 	init();
 } // VHistoryItem::VHistoryItem
@@ -1200,8 +1200,8 @@ VHistoryItem::paintFocus( TQPainter*, const TQColorGroup&, const TQRect& )
 
 } // VHistoryItem::paintFocus
 
-VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* tqparent )
-		: TQWidget( tqparent ), m_part( part )
+VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* parent )
+		: TQWidget( parent ), m_part( part )
 {
 	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
 	tqlayout->setMargin( 3 );
@@ -1298,8 +1298,8 @@ VHistoryTab::commandExecuted( VCommand* command )
 	if ( found )
 	{
 		m_history->repaintItem( item );
-		if ( item->tqparent() )
-			m_history->repaintItem( item->tqparent() );
+		if ( item->parent() )
+			m_history->repaintItem( item->parent() );
 		m_history->ensureItemVisible( item );
 	}
 } // VHistoryTab::commandExecuted
diff --git a/karbon/dockers/vdocumentdocker.h b/karbon/dockers/vdocumentdocker.h
index 4f60949a..f88bdf7f 100644
--- a/karbon/dockers/vdocumentdocker.h
+++ b/karbon/dockers/vdocumentdocker.h
@@ -43,7 +43,7 @@ class VDocumentPreview : public TQWidget
   TQ_OBJECT
 
 	public:
-		VDocumentPreview( KarbonView* view, TQWidget* tqparent = 0 );
+		VDocumentPreview( KarbonView* view, TQWidget* parent = 0 );
 		~VDocumentPreview();
 
 		void reset();
@@ -67,7 +67,7 @@ class VDocumentTab : public TQWidget
   TQ_OBJECT
 
 	public:
-		VDocumentTab( KarbonView* view, TQWidget* tqparent );
+		VDocumentTab( KarbonView* view, TQWidget* parent );
 		~VDocumentTab();
 
 	public slots:
@@ -94,7 +94,7 @@ class VDocumentTab : public TQWidget
 class VLayerListViewItem : public TQCheckListItem
 {
 public:
-	VLayerListViewItem( TQListView* tqparent, VLayer* layer, VDocument *doc, TQPtrDict<VLayerListViewItem> *map );
+	VLayerListViewItem( TQListView* parent, VLayer* layer, VDocument *doc, TQPtrDict<VLayerListViewItem> *map );
 	virtual ~VLayerListViewItem();
 
 	VLayer* layer() { return m_layer; }
@@ -117,7 +117,7 @@ private:
 class VObjectListViewItem : public TQListViewItem
 {
 public:
-	VObjectListViewItem( TQListViewItem* tqparent, VObject* object, VDocument *doc, uint key, TQPtrDict<VObjectListViewItem> *map );
+	VObjectListViewItem( TQListViewItem* parent, VObject* object, VDocument *doc, uint key, TQPtrDict<VObjectListViewItem> *map );
 	virtual ~VObjectListViewItem();
 
 	VObject* object() { return m_object; }
@@ -138,7 +138,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	VLayersTab( KarbonView* view, TQWidget* tqparent = 0 );
+	VLayersTab( KarbonView* view, TQWidget* parent = 0 );
 	~VLayersTab();
 
 public slots:
@@ -185,7 +185,7 @@ class VHistoryItem;
 class VHistoryGroupItem : public TQListViewItem
 {
 	public:
-		VHistoryGroupItem( VHistoryItem* item, TQListView* tqparent, TQListViewItem* after );
+		VHistoryGroupItem( VHistoryItem* item, TQListView* parent, TQListViewItem* after );
 		~VHistoryGroupItem();
 
 		void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align );
@@ -201,8 +201,8 @@ class VHistoryGroupItem : public TQListViewItem
 class VHistoryItem : public TQListViewItem
 {
 	public:
-		VHistoryItem( VCommand* command, TQListView* tqparent, TQListViewItem* after );
-		VHistoryItem( VCommand* command, VHistoryGroupItem* tqparent, TQListViewItem* after );
+		VHistoryItem( VCommand* command, TQListView* parent, TQListViewItem* after );
+		VHistoryItem( VCommand* command, VHistoryGroupItem* parent, TQListViewItem* after );
 		~VHistoryItem();
 
 		VCommand* command() { return m_command; }
@@ -226,7 +226,7 @@ class VHistoryTab : public TQWidget
   TQ_OBJECT
 
 	public:
-		VHistoryTab( KarbonPart* part, TQWidget* tqparent );
+		VHistoryTab( KarbonPart* part, TQWidget* parent );
 		~VHistoryTab();
 
 		bool groupingEnabled();
diff --git a/karbon/dockers/vstrokedocker.cc b/karbon/dockers/vstrokedocker.cc
index fb3dce28..f30b3042 100644
--- a/karbon/dockers/vstrokedocker.cc
+++ b/karbon/dockers/vstrokedocker.cc
@@ -39,8 +39,8 @@
 
 #include "vstrokedocker.h"
 
-VStrokeDocker::VStrokeDocker( KarbonPart* part, KarbonView* tqparent, const char* /*name*/ )
-	: TQWidget(), m_part ( part ), m_view( tqparent )
+VStrokeDocker::VStrokeDocker( KarbonPart* part, KarbonView* parent, const char* /*name*/ )
+	: TQWidget(), m_part ( part ), m_view( parent )
 {
 	setCaption( i18n( "Stroke Properties" ) );
 
diff --git a/karbon/dockers/vstrokedocker.h b/karbon/dockers/vstrokedocker.h
index 742387a7..a470619a 100644
--- a/karbon/dockers/vstrokedocker.h
+++ b/karbon/dockers/vstrokedocker.h
@@ -36,7 +36,7 @@ class VStrokeDocker : public TQWidget
   TQ_OBJECT
 
 public:
-	 VStrokeDocker( KarbonPart* part, KarbonView* tqparent = 0L, const char* name = 0L );
+	 VStrokeDocker( KarbonPart* part, KarbonView* parent = 0L, const char* name = 0L );
 
 public slots:
 	virtual void setStroke( const VStroke & );
diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc
index fcf317f6..5b7633b1 100644
--- a/karbon/dockers/vstyledocker.cc
+++ b/karbon/dockers/vstyledocker.cc
@@ -46,8 +46,8 @@
 
 #include <unistd.h>
 
-ClipartChooser::ClipartChooser( TQSize iconSize, TQWidget *tqparent, const char *name )
-	: KoIconChooser( iconSize, tqparent, name )
+ClipartChooser::ClipartChooser( TQSize iconSize, TQWidget *parent, const char *name )
+	: KoIconChooser( iconSize, parent, name )
 {
 	setDragEnabled( true );
 }
@@ -72,8 +72,8 @@ ClipartChooser::startDrag()
 	kd->dragCopy();
 }
 
-VStyleDocker::VStyleDocker( KarbonPart* part, KarbonView* tqparent, const char* /*name*/ )
-	: TQWidget(), m_part ( part ), m_view( tqparent )
+VStyleDocker::VStyleDocker( KarbonPart* part, KarbonView* parent, const char* /*name*/ )
+	: TQWidget(), m_part ( part ), m_view( parent )
 {
 	setCaption( i18n( "Resources" ) );
 
@@ -123,8 +123,8 @@ VStyleDocker::mouseReleaseEvent( TQMouseEvent * )
 {
 }
 
-ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* tqparent )
-	: TQWidget( tqparent ), m_part( part )
+ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* parent )
+	: TQWidget( parent ), m_part( part )
 {
 	KIconLoader il;
 
diff --git a/karbon/dockers/vstyledocker.h b/karbon/dockers/vstyledocker.h
index 026a7d97..f994d53e 100644
--- a/karbon/dockers/vstyledocker.h
+++ b/karbon/dockers/vstyledocker.h
@@ -35,7 +35,7 @@ class VClipartIconItem;
 class ClipartChooser : public KoIconChooser
 {
 public:
-	ClipartChooser( TQSize iconSize, TQWidget *tqparent = 0L, const char *name = 0L );
+	ClipartChooser( TQSize iconSize, TQWidget *parent = 0L, const char *name = 0L );
 	virtual void startDrag();
 };
 
@@ -45,7 +45,7 @@ class ClipartWidget : public TQWidget
   TQ_OBJECT
 
 public:
-	ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* tqparent = 0L );
+	ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* parent = 0L );
 	~ClipartWidget();
 
 	VClipartIconItem* selectedClipart();
@@ -74,7 +74,7 @@ class VStyleDocker : public TQWidget
   TQ_OBJECT
 
 public:
-	 VStyleDocker( KarbonPart* part, KarbonView* tqparent = 0L, const char* name = 0L );
+	 VStyleDocker( KarbonPart* part, KarbonView* parent = 0L, const char* name = 0L );
 	 virtual ~VStyleDocker();
 
 public slots:
diff --git a/karbon/dockers/vtransformdocker.cc b/karbon/dockers/vtransformdocker.cc
index 76c91de6..7e93577b 100644
--- a/karbon/dockers/vtransformdocker.cc
+++ b/karbon/dockers/vtransformdocker.cc
@@ -37,8 +37,8 @@
 
 #include "vtransformdocker.h"
 
-VTransformDocker::VTransformDocker( KarbonPart* part, KarbonView* tqparent, const char* /*name*/ )
-	: TQWidget(), m_part ( part ), m_view( tqparent )
+VTransformDocker::VTransformDocker( KarbonPart* part, KarbonView* parent, const char* /*name*/ )
+	: TQWidget(), m_part ( part ), m_view( parent )
 {
 	setCaption( i18n( "Transform" ) );
 
diff --git a/karbon/dockers/vtransformdocker.h b/karbon/dockers/vtransformdocker.h
index 8e2f21e8..712b86f4 100644
--- a/karbon/dockers/vtransformdocker.h
+++ b/karbon/dockers/vtransformdocker.h
@@ -31,7 +31,7 @@ class VTransformDocker : public TQWidget
   TQ_OBJECT
 
 public:
-	VTransformDocker( KarbonPart* part, KarbonView* tqparent = 0L, const char* name = 0L );
+	VTransformDocker( KarbonPart* part, KarbonView* parent = 0L, const char* name = 0L );
 
 public slots:
 	void update();
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc
index 041de7ff..1d267e1b 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cc
@@ -41,8 +41,8 @@ KarbonResourceServer* KarbonFactory::s_rserver = 0;
 KInstance* KarbonFactory::s_instance = 0L;
 KAboutData* KarbonFactory::s_aboutData = 0L;
 
-KarbonFactory::KarbonFactory( TQObject* tqparent, const char* name )
-		: KoFactory( tqparent, name )
+KarbonFactory::KarbonFactory( TQObject* parent, const char* name )
+		: KoFactory( parent, name )
 {
 	instance();
 
@@ -77,7 +77,7 @@ KarbonFactory::~KarbonFactory()
 
 KParts::Part*
 KarbonFactory::createPartObject( TQWidget* parentWidget, const char* widgetName,
-								 TQObject* tqparent, const char* name, const char* classname, const TQStringList& )
+								 TQObject* parent, const char* name, const char* classname, const TQStringList& )
 {
 	// If classname is "KoDocument", our host is a koffice application
 	// otherwise, the host wants us as a simple part, so switch to readonly and
@@ -87,7 +87,7 @@ KarbonFactory::createPartObject( TQWidget* parentWidget, const char* widgetName,
 	// parentWidget and widgetName are used by KoDocument for the
 	// "readonly+singleView" case.
 	KarbonPart* part =
-		new KarbonPart( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
+		new KarbonPart( parentWidget, widgetName, parent, name, !bWantKoDocument );
 
 	if( !bWantKoDocument )
 		part->setReadWrite( false );
diff --git a/karbon/karbon_factory.h b/karbon/karbon_factory.h
index 436faa2c..db0351f6 100644
--- a/karbon/karbon_factory.h
+++ b/karbon/karbon_factory.h
@@ -34,11 +34,11 @@ class KARBONCOMMON_EXPORT KarbonFactory : public KoFactory
   TQ_OBJECT
 
 public:
-	KarbonFactory( TQObject* tqparent = 0, const char* name = 0 );
+	KarbonFactory( TQObject* parent = 0, const char* name = 0 );
 	~KarbonFactory();
 
 	virtual KParts::Part* createPartObject( TQWidget *parentWidget = 0,
-											const char* widgetName = 0L, TQObject* tqparent = 0L, const char* name = 0L,
+											const char* widgetName = 0L, TQObject* parent = 0L, const char* name = 0L,
 											const char* classname = "KoDocument", const TQStringList& args = TQStringList() );
 
 	static KInstance* instance();
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc
index 7aa145d3..64dafd6a 100644
--- a/karbon/karbon_part.cc
+++ b/karbon/karbon_part.cc
@@ -58,8 +58,8 @@
 // static const char * CURRENT_DTD_VERSION = "1.2";
 
 KarbonPart::KarbonPart( TQWidget* parentWidget, const char* widgetName,
-						TQObject* tqparent, const char* name, bool singleViewMode )
-		: KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
+						TQObject* parent, const char* name, bool singleViewMode )
+		: KoDocument( parentWidget, widgetName, parent, name, singleViewMode )
 {
 	setInstance( KarbonFactory::instance(), false );
 	setTemplateType( "karbon_template" );
@@ -158,9 +158,9 @@ KarbonPart::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 }
 
 KoView*
-KarbonPart::createViewInstance( TQWidget* tqparent, const char* name )
+KarbonPart::createViewInstance( TQWidget* parent, const char* name )
 {
-	KarbonView *result = new KarbonView( this, tqparent, name );
+	KarbonView *result = new KarbonView( this, parent, name );
 	return result;
 }
 
diff --git a/karbon/karbon_part.h b/karbon/karbon_part.h
index 762f9985..34e0e04b 100644
--- a/karbon/karbon_part.h
+++ b/karbon/karbon_part.h
@@ -48,7 +48,7 @@ class KARBONCOMMON_EXPORT KarbonPart : public KoDocument
   TQ_OBJECT
 public:
 	KarbonPart( TQWidget* parentWidget = 0L, const char* widgetName = 0L,
-				TQObject* tqparent = 0L, const char* name = 0L, bool singleViewMode = false );
+				TQObject* parent = 0L, const char* name = 0L, bool singleViewMode = false );
 	virtual ~KarbonPart();
 
 	virtual void paintContent( TQPainter& painter, const TQRect& rect,
@@ -115,7 +115,7 @@ public slots:
 	void slotUnitChanged( KoUnit::Unit unit );
 
 protected:
-	virtual KoView* createViewInstance( TQWidget* tqparent, const char* name );
+	virtual KoView* createViewInstance( TQWidget* parent, const char* name );
 	virtual void removeView( KoView *view );
 	void saveOasisSettings( KoXmlWriter &/*settingsWriter*/ );
 	void loadOasisSettings( const TQDomDocument&settingsDoc );
diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc
index 83db0edc..f099fad0 100644
--- a/karbon/karbon_view.cc
+++ b/karbon/karbon_view.cc
@@ -107,8 +107,8 @@
 const int rulerWidth = 20;  // vertical ruler width
 const int rulerHeight = 20; // horizontal ruler height
 
-KarbonView::KarbonView( KarbonPart* p, TQWidget* tqparent, const char* name )
-		: KoView( p, tqparent, name ), KXMLGUIBuilder( shell() ), m_part( p )
+KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name )
+		: KoView( p, parent, name ), KXMLGUIBuilder( shell() ), m_part( p )
 {
 	m_toolbox = 0L;
 	m_toolController = new VToolController( this );
@@ -249,7 +249,7 @@ static TQt::Dock stringToDock( const TQString& attrPosition )
 }
 
 TQWidget *
-KarbonView::createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id )
+KarbonView::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id )
 {
 	if( element.attribute( "name" ) == "Tools" )
 	{
@@ -291,11 +291,11 @@ KarbonView::createContainer( TQWidget *tqparent, int index, const TQDomElement &
 		}
 	}
 
-	return KXMLGUIBuilder::createContainer( tqparent, index, element, id );
+	return KXMLGUIBuilder::createContainer( parent, index, element, id );
 }
 
 void
-KarbonView::removeContainer( TQWidget *container, TQWidget *tqparent,
+KarbonView::removeContainer( TQWidget *container, TQWidget *parent,
 							 TQDomElement &element, int id )
 {
 	if( container )
@@ -318,7 +318,7 @@ KarbonView::removeContainer( TQWidget *container, TQWidget *tqparent,
 // 		m_selectToolBar = 0L;
 	}
 	else
-		KXMLGUIBuilder::removeContainer( container, tqparent, element, id );
+		KXMLGUIBuilder::removeContainer( container, parent, element, id );
 }
 
 
diff --git a/karbon/karbon_view.h b/karbon/karbon_view.h
index 3e232d5f..13afd9f1 100644
--- a/karbon/karbon_view.h
+++ b/karbon/karbon_view.h
@@ -77,7 +77,7 @@ class KARBONCOMMON_EXPORT KarbonView : public KoView, public KXMLGUIBuilder
   TQ_OBJECT
 
 public:
-	KarbonView( KarbonPart* part, TQWidget* tqparent = 0L,
+	KarbonView( KarbonPart* part, TQWidget* parent = 0L,
 				const char* name = 0L );
 	virtual ~KarbonView();
 
@@ -221,8 +221,8 @@ protected:
 	void createResourceDock();
 
 	//KXMLGUIBuilder
-	virtual TQWidget *createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id );
-	virtual void removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id );
+	virtual TQWidget *createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id );
+	virtual void removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id );
 	void addSelectionToClipboard() const;
 
 private:
diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cc b/karbon/plugins/flattenpath/flattenpathplugin.cc
index eff3cebd..aa5fb3cc 100644
--- a/karbon/plugins/flattenpath/flattenpathplugin.cc
+++ b/karbon/plugins/flattenpath/flattenpathplugin.cc
@@ -33,8 +33,8 @@
 typedef KGenericFactory<FlattenPathPlugin, KarbonView> FlattenPathPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_flattenpathplugin, FlattenPathPluginFactory( "karbonflattenpathplugin" ) )
 
-FlattenPathPlugin::FlattenPathPlugin( KarbonView *tqparent, const char* name, const TQStringList & )
-: Plugin( TQT_TQOBJECT(tqparent), name )
+FlattenPathPlugin::FlattenPathPlugin( KarbonView *parent, const char* name, const TQStringList & )
+: Plugin( TQT_TQOBJECT(parent), name )
 {
 	new KAction(
 		i18n( "&Flatten Path..." ), "14_flatten", 0, this,
@@ -47,13 +47,13 @@ FlattenPathPlugin::FlattenPathPlugin( KarbonView *tqparent, const char* name, co
 void
 FlattenPathPlugin::slotFlattenPath()
 {
-	KarbonPart *part = ((KarbonView *)tqparent())->part();
+	KarbonPart *part = ((KarbonView *)parent())->part();
 	if( part && m_flattenPathDlg->exec() )
 		part->addCommand( new VFlattenCmd( &part->document(), m_flattenPathDlg->flatness() ), true );
 }
 
-VFlattenDlg::VFlattenDlg( TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true,  i18n( "Flatten Path" ), Ok | Cancel )
+VFlattenDlg::VFlattenDlg( TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true,  i18n( "Flatten Path" ), Ok | Cancel )
 {
 	// add input fields on the left:
 	TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
diff --git a/karbon/plugins/flattenpath/flattenpathplugin.h b/karbon/plugins/flattenpath/flattenpathplugin.h
index d4a4e3a7..9837f688 100644
--- a/karbon/plugins/flattenpath/flattenpathplugin.h
+++ b/karbon/plugins/flattenpath/flattenpathplugin.h
@@ -31,7 +31,7 @@ class FlattenPathPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	FlattenPathPlugin( KarbonView *tqparent, const char* name, const TQStringList & );
+	FlattenPathPlugin( KarbonView *parent, const char* name, const TQStringList & );
 	virtual ~FlattenPathPlugin() {}
 
 private slots:
@@ -49,7 +49,7 @@ class VFlattenDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VFlattenDlg( TQWidget* tqparent = 0L, const char* name = 0L );
+	VFlattenDlg( TQWidget* parent = 0L, const char* name = 0L );
 
 	double flatness() const;
 	void setFlatness( double value );
diff --git a/karbon/plugins/imagetool/imagetoolplugin.cc b/karbon/plugins/imagetool/imagetoolplugin.cc
index 2bb9962a..5a0d49a8 100644
--- a/karbon/plugins/imagetool/imagetoolplugin.cc
+++ b/karbon/plugins/imagetool/imagetoolplugin.cc
@@ -31,17 +31,17 @@
 typedef KGenericFactory<ImageToolPlugin> ImageToolPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_imagetoolplugin, ImageToolPluginFactory( "karbonimagetoolplugin" ) )
 
-ImageToolPlugin::ImageToolPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name)
+ImageToolPlugin::ImageToolPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name)
 {
 	setInstance(ImageToolPluginFactory::instance());
 
 	kdDebug() << "VImageToolPlugin. Class: "
 		<< className()
 		<< ", Parent: "
-		<< tqparent -> className()
+		<< parent -> className()
 		<< "\n";
 
-	if ( tqparent->inherits("KarbonFactory") )
+	if ( parent->inherits("KarbonFactory") )
 	{
 		KarbonToolRegistry* r = KarbonToolRegistry::instance();
 		r->add(new KarbonToolFactory<VImageTool>());
diff --git a/karbon/plugins/imagetool/imagetoolplugin.h b/karbon/plugins/imagetool/imagetoolplugin.h
index 236b0ac6..ecd02709 100644
--- a/karbon/plugins/imagetool/imagetoolplugin.h
+++ b/karbon/plugins/imagetool/imagetoolplugin.h
@@ -32,7 +32,7 @@ class ImageToolPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	ImageToolPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+	ImageToolPlugin(TQObject *parent, const char *name, const TQStringList &);
 	virtual ~ImageToolPlugin();
 };
 
diff --git a/karbon/plugins/insertknots/insertknotsplugin.cc b/karbon/plugins/insertknots/insertknotsplugin.cc
index 9f462179..55fcde76 100644
--- a/karbon/plugins/insertknots/insertknotsplugin.cc
+++ b/karbon/plugins/insertknots/insertknotsplugin.cc
@@ -33,7 +33,7 @@
 typedef KGenericFactory<InsertKnotsPlugin, KarbonView> InsertKnotsPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_insertknotsplugin, InsertKnotsPluginFactory( "karboninsertknotsplugin" ) )
 
-InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(tqparent), name )
+InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name )
 {
 	new KAction(
 		i18n( "&Insert Knots..." ), "14_insertknots", 0, this,
@@ -45,13 +45,13 @@ InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *tqparent, const char* name, co
 void
 InsertKnotsPlugin::slotInsertKnots()
 {
-	KarbonPart *part = ((KarbonView *)tqparent())->part();
+	KarbonPart *part = ((KarbonView *)parent())->part();
 	if( part && m_insertKnotsDlg->exec() )
 		part->addCommand( new VInsertKnotsCmd( &part->document(), m_insertKnotsDlg->knots() ), true );
 }
 
-VInsertKnotsDlg::VInsertKnotsDlg( TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true,  i18n( "Insert Knots" ), Ok | Cancel )
+VInsertKnotsDlg::VInsertKnotsDlg( TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true,  i18n( "Insert Knots" ), Ok | Cancel )
 {
 	// add input fields:
 	TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
diff --git a/karbon/plugins/insertknots/insertknotsplugin.h b/karbon/plugins/insertknots/insertknotsplugin.h
index 4bd2b212..f8ea9a77 100644
--- a/karbon/plugins/insertknots/insertknotsplugin.h
+++ b/karbon/plugins/insertknots/insertknotsplugin.h
@@ -32,7 +32,7 @@ class InsertKnotsPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	InsertKnotsPlugin( KarbonView *tqparent, const char* name, const TQStringList & );
+	InsertKnotsPlugin( KarbonView *parent, const char* name, const TQStringList & );
 	virtual ~InsertKnotsPlugin() {}
 
 private slots:
@@ -50,7 +50,7 @@ class VInsertKnotsDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VInsertKnotsDlg( TQWidget* tqparent = 0L, const char* name = 0L );
+	VInsertKnotsDlg( TQWidget* parent = 0L, const char* name = 0L );
 
 	uint knots() const;
 	void setKnots( uint value );
diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cc b/karbon/plugins/roundcorners/roundcornersplugin.cc
index 7003e510..28ede19d 100644
--- a/karbon/plugins/roundcorners/roundcornersplugin.cc
+++ b/karbon/plugins/roundcorners/roundcornersplugin.cc
@@ -32,7 +32,7 @@
 typedef KGenericFactory<VRoundCornersPlugin, KarbonView> VRoundCornersPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_roundcornersplugin, VRoundCornersPluginFactory( "karbonroundcornersplugin" ) )
 
-VRoundCornersPlugin::VRoundCornersPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(tqparent), name )
+VRoundCornersPlugin::VRoundCornersPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name )
 {
 	new KAction(
 		i18n( "&Round Corners..." ), "14_roundcorners", 0, this,
@@ -49,14 +49,14 @@ VRoundCornersPlugin::~VRoundCornersPlugin()
 void
 VRoundCornersPlugin::slotRoundCorners()
 {
-	KarbonPart *part = ((KarbonView *)tqparent())->part();
+	KarbonPart *part = ((KarbonView *)parent())->part();
 	if( part && m_roundCornersDlg->exec() )
 		part->addCommand( new VRoundCornersCmd( &part->document(), m_roundCornersDlg->radius() ), true );
 }
 
 
-VRoundCornersDlg::VRoundCornersDlg( TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true,  i18n( "Polygonize" ), Ok | Cancel  )
+VRoundCornersDlg::VRoundCornersDlg( TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true,  i18n( "Polygonize" ), Ok | Cancel  )
 {
 	// add input:
 	TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
diff --git a/karbon/plugins/roundcorners/roundcornersplugin.h b/karbon/plugins/roundcorners/roundcornersplugin.h
index 74e49f88..7806375d 100644
--- a/karbon/plugins/roundcorners/roundcornersplugin.h
+++ b/karbon/plugins/roundcorners/roundcornersplugin.h
@@ -33,7 +33,7 @@ class KARBONBASE_EXPORT VRoundCornersPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	VRoundCornersPlugin( KarbonView *tqparent, const char* name, const TQStringList & );
+	VRoundCornersPlugin( KarbonView *parent, const char* name, const TQStringList & );
 	virtual ~VRoundCornersPlugin();
 
 private slots:
@@ -51,7 +51,7 @@ class VRoundCornersDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VRoundCornersDlg( TQWidget* tqparent = 0L, const char* name = 0L );
+	VRoundCornersDlg( TQWidget* parent = 0L, const char* name = 0L );
 
 	double radius() const;
 	void setRadius( double value );
diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cc b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
index 7040b042..dea09571 100644
--- a/karbon/plugins/shadoweffect/shadoweffectplugin.cc
+++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
@@ -37,8 +37,8 @@
 typedef KGenericFactory<ShadowEffectPlugin, KarbonView> ShadowEffectPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_shadoweffectplugin, ShadowEffectPluginFactory( "karbonshadoweffectplugin" ) )
 
-ShadowEffectPlugin::ShadowEffectPlugin( KarbonView *tqparent, const char* name, const TQStringList & )
-: Plugin( TQT_TQOBJECT(tqparent), name )
+ShadowEffectPlugin::ShadowEffectPlugin( KarbonView *parent, const char* name, const TQStringList & )
+: Plugin( TQT_TQOBJECT(parent), name )
 {
 	new KAction(
 		i18n( "&Shadow Effect..." ), "shadowRB", 0, this,
@@ -52,13 +52,13 @@ ShadowEffectPlugin::ShadowEffectPlugin( KarbonView *tqparent, const char* name,
 void
 ShadowEffectPlugin::slotShadowEffect()
 {
-	KarbonPart *part = ((KarbonView *)tqparent())->part();
+	KarbonPart *part = ((KarbonView *)parent())->part();
 	if( part && m_shadowEffectDlg->exec() )
 		part->addCommand( new VCreateShadowCmd( &part->document(), m_shadowEffectDlg->distance(), m_shadowEffectDlg->angle(), double( m_shadowEffectDlg->opacity() ) / 255.0 ), true );
 }
 
-VShadowEffectDlg::VShadowEffectDlg( TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true,  i18n( "Create Shadow Effect" ), Ok | Cancel )
+VShadowEffectDlg::VShadowEffectDlg( TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true,  i18n( "Create Shadow Effect" ), Ok | Cancel )
 {
 	// add input fields on the left:
 	TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
@@ -170,7 +170,7 @@ VCreateShadowCmd::execute()
 			if(newObject)
 			{
 				// Insert new tqshape right before old tqshape.
-				itr.current()->tqparent()->insertInfrontOf( 
+				itr.current()->parent()->insertInfrontOf( 
 					newObject, itr.current() );
 
 				// Add new tqshape to list of new objects.
diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.h b/karbon/plugins/shadoweffect/shadoweffectplugin.h
index fc500bb7..890cb209 100644
--- a/karbon/plugins/shadoweffect/shadoweffectplugin.h
+++ b/karbon/plugins/shadoweffect/shadoweffectplugin.h
@@ -33,7 +33,7 @@ class ShadowEffectPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	ShadowEffectPlugin( KarbonView *tqparent, const char* name, const TQStringList & );
+	ShadowEffectPlugin( KarbonView *parent, const char* name, const TQStringList & );
 	virtual ~ShadowEffectPlugin() {}
 
 private slots:
@@ -51,7 +51,7 @@ class VShadowEffectDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VShadowEffectDlg( TQWidget* tqparent = 0L, const char* name = 0L );
+	VShadowEffectDlg( TQWidget* parent = 0L, const char* name = 0L );
 
 	void setAngle( int );
 	void setDistance( int );
diff --git a/karbon/plugins/shadoweffect/vshadowdecorator.cc b/karbon/plugins/shadoweffect/vshadowdecorator.cc
index e6b2f378..b3c00bdd 100644
--- a/karbon/plugins/shadoweffect/vshadowdecorator.cc
+++ b/karbon/plugins/shadoweffect/vshadowdecorator.cc
@@ -26,8 +26,8 @@
 #include <core/vselection.h>
 #include <commands/vtransformcmd.h>
 
-VShadowDecorator::VShadowDecorator( VObject *object, VObject* tqparent, int distance, int angle, float opacity )
-	: VObject( tqparent ), m_object( object ), m_distance( distance ), m_angle( angle ), m_opacity( opacity )
+VShadowDecorator::VShadowDecorator( VObject *object, VObject* parent, int distance, int angle, float opacity )
+	: VObject( parent ), m_object( object ), m_distance( distance ), m_angle( angle ), m_opacity( opacity )
 {
 }
 
diff --git a/karbon/plugins/shadoweffect/vshadowdecorator.h b/karbon/plugins/shadoweffect/vshadowdecorator.h
index 0518baf7..fcaa400c 100644
--- a/karbon/plugins/shadoweffect/vshadowdecorator.h
+++ b/karbon/plugins/shadoweffect/vshadowdecorator.h
@@ -29,7 +29,7 @@
 class KARBONBASE_EXPORT VShadowDecorator : public VObject
 {
 public:
-	VShadowDecorator( VObject* object, VObject* tqparent, int distance = 2, int angle = 0, float opacity = 1.0 );
+	VShadowDecorator( VObject* object, VObject* parent, int distance = 2, int angle = 0, float opacity = 1.0 );
 	VShadowDecorator( const VShadowDecorator& obj );
 
 	virtual ~VShadowDecorator();
diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.cc b/karbon/plugins/whirlpinch/whirlpinchplugin.cc
index 9ad72ed5..ec8e7075 100644
--- a/karbon/plugins/whirlpinch/whirlpinchplugin.cc
+++ b/karbon/plugins/whirlpinch/whirlpinchplugin.cc
@@ -38,7 +38,7 @@
 typedef KGenericFactory<WhirlPinchPlugin, KarbonView> WhirlPinchPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_whirlpinchplugin, WhirlPinchPluginFactory( "karbonwhirlpinchplugin" ) )
 
-WhirlPinchPlugin::WhirlPinchPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(tqparent), name )
+WhirlPinchPlugin::WhirlPinchPlugin( KarbonView *parent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(parent), name )
 {
 	new KAction(
 		i18n( "&Whirl/Pinch..." ), "14_whirl", 0, this,
@@ -53,13 +53,13 @@ WhirlPinchPlugin::WhirlPinchPlugin( KarbonView *tqparent, const char* name, cons
 void
 WhirlPinchPlugin::slotWhirlPinch()
 {
-	KarbonPart *part = ((KarbonView *)tqparent())->part();
+	KarbonPart *part = ((KarbonView *)parent())->part();
 	if( part && m_whirlPinchDlg->exec() )
 		part->addCommand( new VWhirlPinchCmd( &part->document(), m_whirlPinchDlg->angle(), m_whirlPinchDlg->pinch(), m_whirlPinchDlg->radius() ), true );
 }
 
-VWhirlPinchDlg::VWhirlPinchDlg( TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Whirl Pinch" ), Ok | Cancel )
+VWhirlPinchDlg::VWhirlPinchDlg( TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Whirl Pinch" ), Ok | Cancel )
 {
 	// add input fields:
 	TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.h b/karbon/plugins/whirlpinch/whirlpinchplugin.h
index 215f9bcd..bf9d16b4 100644
--- a/karbon/plugins/whirlpinch/whirlpinchplugin.h
+++ b/karbon/plugins/whirlpinch/whirlpinchplugin.h
@@ -32,7 +32,7 @@ class WhirlPinchPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	WhirlPinchPlugin( KarbonView *tqparent, const char* name, const TQStringList & );
+	WhirlPinchPlugin( KarbonView *parent, const char* name, const TQStringList & );
 	virtual ~WhirlPinchPlugin() {}
 
 private slots:
@@ -50,7 +50,7 @@ class VWhirlPinchDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VWhirlPinchDlg( TQWidget* tqparent = 0L, const char* name = 0L );
+	VWhirlPinchDlg( TQWidget* parent = 0L, const char* name = 0L );
 
 	double angle() const;
 	double pinch() const;
diff --git a/karbon/plugins/zoomtool/zoomtoolplugin.cc b/karbon/plugins/zoomtool/zoomtoolplugin.cc
index 5a9a0115..3ad73ee9 100644
--- a/karbon/plugins/zoomtool/zoomtoolplugin.cc
+++ b/karbon/plugins/zoomtool/zoomtoolplugin.cc
@@ -30,18 +30,18 @@
 typedef KGenericFactory<ZoomToolPlugin> ZoomToolPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_zoomtoolplugin, ZoomToolPluginFactory( "karbonzoomtoolplugin" ) )
 
-ZoomToolPlugin::ZoomToolPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-	: KParts::Plugin(tqparent, name)
+ZoomToolPlugin::ZoomToolPlugin(TQObject *parent, const char *name, const TQStringList &)
+	: KParts::Plugin(parent, name)
 {
 	setInstance(ZoomToolPluginFactory::instance());
 
 	kdDebug() << "Zoom tool plugin. Class: "
 		<< className()
 		<< ", Parent: "
-		<< tqparent -> className()
+		<< parent -> className()
 		<< "\n";
 
-	if ( tqparent->inherits("KarbonFactory") )
+	if ( parent->inherits("KarbonFactory") )
 	{
 		KarbonToolRegistry* r = KarbonToolRegistry::instance();
 		r -> add(new KarbonToolFactory<VZoomTool>());
diff --git a/karbon/plugins/zoomtool/zoomtoolplugin.h b/karbon/plugins/zoomtool/zoomtoolplugin.h
index 9501832f..62c7594b 100644
--- a/karbon/plugins/zoomtool/zoomtoolplugin.h
+++ b/karbon/plugins/zoomtool/zoomtoolplugin.h
@@ -33,7 +33,7 @@ class ZoomToolPlugin : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	ZoomToolPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+	ZoomToolPlugin(TQObject *parent, const char *name, const TQStringList &);
 	virtual ~ZoomToolPlugin();
 };
 
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c b/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c
index bbafa393..b9cf9376 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c
@@ -1103,7 +1103,7 @@ xlib_window_is_viewable (Window w)
 	XWindowAttributes wa;
 
 	while (w != 0) {
-		Window tqparent, root, *tqchildren;
+		Window parent, root, *tqchildren;
 		int ntqchildren;
 
 		XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa);
@@ -1111,16 +1111,16 @@ xlib_window_is_viewable (Window w)
 			return 0;
 
 		if (!XQueryTree (gdk_pixbuf_dpy, w, &root,
-				 &tqparent, &tqchildren, &ntqchildren))
+				 &parent, &tqchildren, &ntqchildren))
 			return 0;
 
 		if (ntqchildren > 0)
 			XFree (tqchildren);
 
-		if (tqparent == root)
+		if (parent == root)
 			return 1;
 
-		w = tqparent;
+		w = parent;
 	}
 
 	return 0;
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c b/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c
index be1a839c..f2439138 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c
@@ -31,7 +31,7 @@
 **
  * gdk_pixbuf_xlib_render_threshold_alpha:
  * @pixbuf: A pixbuf.
- * @bitmap: Bitmap where the bilevel tqmask will be painted to.
+ * @bitmap: Bitmap where the bilevel mask will be painted to.
  * @src_x: Source X coordinate.
  * @src_y: source Y coordinate.
  * @dest_x: Destination X coordinate.
@@ -42,7 +42,7 @@
  * other values will be painted as one.
  *
  * Takes the opacity values in a rectangular portion of a pixbuf and thresholds
- * them to produce a bi-level alpha tqmask that can be used as a clipping tqmask for
+ * them to produce a bi-level alpha mask that can be used as a clipping mask for
  * a drawable.
  *
 void
@@ -177,7 +177,7 @@ remove_alpha (GdkPixbuf *pixbuf, int x, int y, int width, int height, int *rowst
  * specified GC.  This is done using XlibRGB, so the specified drawable must
  * have the XlibRGB visual and colormap.  Note that this function will ignore
  * the opacity information for images with an alpha channel; the GC must already
- * have the clipping tqmask set if you want transparent regions to show through.
+ * have the clipping mask set if you want transparent regions to show through.
  *
  * For an explanation of dither offsets, see the XlibRGB documentation.  In
  * brief, the dither offset is important when re-rendering partial regions of an
@@ -255,7 +255,7 @@ gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
  *
  * When used with #GDK_PIXBUF_ALPHA_BILEVEL, this function has to create a bitmap
  * out of the thresholded alpha channel of the image and, it has to set this
- * bitmap as the clipping tqmask for the GC used for drawing.  This can be a
+ * bitmap as the clipping mask for the GC used for drawing.  This can be a
  * significant performance penalty depending on the size and the complexity of
  * the alpha channel of the image.  If performance is crucial, consider handling
  * the alpha channel yourself (possibly by caching it in your application) and
@@ -320,12 +320,12 @@ gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, Drawable drawable,
 
  * @pixbuf: A pixbuf.
  * @pixmap_return: Return value for the created pixmap.
- * @mask_return: Return value for the created tqmask.
+ * @mask_return: Return value for the created mask.
  * @alpha_threshold: Threshold value for opacity values.
  *
- * Creates a pixmap and a tqmask bitmap which are returned in the @pixmap_return
+ * Creates a pixmap and a mask bitmap which are returned in the @pixmap_return
  * and @mask_return arguments, respectively, and renders a pixbuf and its
- * corresponding tresholded alpha tqmask to them.  This is merely a convenience
+ * corresponding tresholded alpha mask to them.  This is merely a convenience
  * function; applications that need to render pixbufs with dither offsets or to
  * given drawables should use gdk_pixbuf_xlib_render_to_drawable_alpha() or
  * gdk_pixbuf_xlib_render_to_drawable(), and
@@ -334,7 +334,7 @@ gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, Drawable drawable,
  * If the pixbuf does not have an alpha channel, then *@mask_return will be set
  * to None.
 void
-gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
+gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
 					Pixmap *pixmap_return,
 					Pixmap *mask_return,
 					int alpha_threshold)
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib.h b/karbon/render/xrgbrender/gdk-pixbuf-xlib.h
index 63961ea7..2b31ed7e 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlib.h
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib.h
@@ -63,7 +63,7 @@ void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
 					       XlibRgbDither dither,
 					       int x_dither, int y_dither);
 
-void gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
+void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
 					     Pixmap *pixmap_return,
 					     Pixmap *mask_return,
 					     int alpha_threshold);
diff --git a/karbon/shapes/vellipse.cc b/karbon/shapes/vellipse.cc
index 15f5ce1c..0b5fd80c 100644
--- a/karbon/shapes/vellipse.cc
+++ b/karbon/shapes/vellipse.cc
@@ -30,14 +30,14 @@
 #include <tqdom.h>
 #include <core/vfill.h>
 
-VEllipse::VEllipse( VObject* tqparent, VState state ) : VPath( tqparent, state )
+VEllipse::VEllipse( VObject* parent, VState state ) : VPath( parent, state )
 {
 }
 
-VEllipse::VEllipse( VObject* tqparent,
+VEllipse::VEllipse( VObject* parent,
 		const KoPoint& topLeft, double width, double height,
 		VEllipseType type, double startAngle, double endAngle )
-	: VPath( tqparent ), m_type( type ), m_startAngle( startAngle ), m_endAngle( endAngle )
+	: VPath( parent ), m_type( type ), m_startAngle( startAngle ), m_endAngle( endAngle )
 {
 	setDrawCenterNode();
 
diff --git a/karbon/shapes/vellipse.h b/karbon/shapes/vellipse.h
index 98f0ec11..5a2346d5 100644
--- a/karbon/shapes/vellipse.h
+++ b/karbon/shapes/vellipse.h
@@ -33,8 +33,8 @@ public:
 		cut,
 		arc
 	};
-	VEllipse( VObject* tqparent, VState state = edit );
-	VEllipse( VObject* tqparent,
+	VEllipse( VObject* parent, VState state = edit );
+	VEllipse( VObject* parent,
 		const KoPoint& topLeft, double width, double height,
 		VEllipseType type = full, double startAngle = 0, double endAngle = 0 );
 
diff --git a/karbon/shapes/vpolygon.cc b/karbon/shapes/vpolygon.cc
index 47f07a68..650b4698 100644
--- a/karbon/shapes/vpolygon.cc
+++ b/karbon/shapes/vpolygon.cc
@@ -30,14 +30,14 @@
 #include <KoXmlNS.h>
 #include <vdocument.h>
 
-VPolygon::VPolygon( VObject* tqparent, VState state ) 
-	: VPath( tqparent, state )
+VPolygon::VPolygon( VObject* parent, VState state ) 
+	: VPath( parent, state )
 {
 }
 
-VPolygon::VPolygon( VObject* tqparent, const TQString &points,
+VPolygon::VPolygon( VObject* parent, const TQString &points,
 		const KoPoint& topLeft, double width, double height )
-	: VPath( tqparent ), m_topLeft( topLeft ), m_width( width), m_height( height ), m_points( points )
+	: VPath( parent ), m_topLeft( topLeft ), m_width( width), m_height( height ), m_points( points )
 {
 	init();
 }
diff --git a/karbon/shapes/vpolygon.h b/karbon/shapes/vpolygon.h
index fcb30850..a483a37a 100644
--- a/karbon/shapes/vpolygon.h
+++ b/karbon/shapes/vpolygon.h
@@ -25,8 +25,8 @@
 class VPolygon : public VPath
 {
 public:
-	VPolygon( VObject* tqparent, VState state = edit );
-	VPolygon( VObject* tqparent, const TQString &points,
+	VPolygon( VObject* parent, VState state = edit );
+	VPolygon( VObject* parent, const TQString &points,
 		const KoPoint& topLeft, double width, double height );
 
 	virtual TQString name() const;
diff --git a/karbon/shapes/vpolyline.cc b/karbon/shapes/vpolyline.cc
index 85faa0f7..d716c325 100644
--- a/karbon/shapes/vpolyline.cc
+++ b/karbon/shapes/vpolyline.cc
@@ -30,18 +30,18 @@
 #include <KoXmlWriter.h>
 #include <KoXmlNS.h>
 
-VPolyline::VPolyline( VObject* tqparent, VState state )
-	: VPath( tqparent, state )
+VPolyline::VPolyline( VObject* parent, VState state )
+	: VPath( parent, state )
 {
 }
 
-/*VPolyline::VPolyline( VObject* tqparent, VState state ) 
-	: VPath( tqparent, state )
+/*VPolyline::VPolyline( VObject* parent, VState state ) 
+	: VPath( parent, state )
 {
 }*/
 
-/*VPolyline::VPolyline( VObject* tqparent, const TQString &points ) 
-	: VPath( tqparent ), m_points( points )
+/*VPolyline::VPolyline( VObject* parent, const TQString &points ) 
+	: VPath( parent ), m_points( points )
 {
 	init();
 }*/
diff --git a/karbon/shapes/vpolyline.h b/karbon/shapes/vpolyline.h
index cc08c87b..ad746c3e 100644
--- a/karbon/shapes/vpolyline.h
+++ b/karbon/shapes/vpolyline.h
@@ -26,9 +26,9 @@
 class VPolyline : public VPath
 {
 public:
-	VPolyline( VObject* tqparent, VState state = edit );
-	//VPolyline( VObject* tqparent, VState state = edit );
-	//VPolyline( VObject* tqparent, const TQString &points  );
+	VPolyline( VObject* parent, VState state = edit );
+	//VPolyline( VObject* parent, VState state = edit );
+	//VPolyline( VObject* parent, const TQString &points  );
 
 	virtual TQString name() const;
 
diff --git a/karbon/shapes/vrectangle.cc b/karbon/shapes/vrectangle.cc
index 01d1d243..bb3512fd 100644
--- a/karbon/shapes/vrectangle.cc
+++ b/karbon/shapes/vrectangle.cc
@@ -30,14 +30,14 @@
 #include <vdocument.h>
 #include "vtransformcmd.h"
 
-VRectangle::VRectangle( VObject* tqparent, VState state )
-	: VPath( tqparent, state )
+VRectangle::VRectangle( VObject* parent, VState state )
+	: VPath( parent, state )
 {
 }
 
-VRectangle::VRectangle( VObject* tqparent,
+VRectangle::VRectangle( VObject* parent,
 		const KoPoint& topLeft, double width, double height, double rx, double ry )
-	: VPath( tqparent ), m_topLeft( topLeft ), m_width( width), m_height( height ), m_rx( rx ), m_ry( ry )
+	: VPath( parent ), m_topLeft( topLeft ), m_width( width), m_height( height ), m_rx( rx ), m_ry( ry )
 {
 	setDrawCenterNode();
 
diff --git a/karbon/shapes/vrectangle.h b/karbon/shapes/vrectangle.h
index 08c4e085..c5604708 100644
--- a/karbon/shapes/vrectangle.h
+++ b/karbon/shapes/vrectangle.h
@@ -26,8 +26,8 @@
 class KARBONBASE_EXPORT VRectangle : public VPath
 {
 public:
-	VRectangle( VObject* tqparent, VState state = edit );
-	VRectangle( VObject* tqparent,
+	VRectangle( VObject* parent, VState state = edit );
+	VRectangle( VObject* parent,
 		const KoPoint& topLeft, double width, double height, double rx = 0.0, double ry = 0.0 );
 
 	virtual TQString name() const;
diff --git a/karbon/shapes/vsinus.cc b/karbon/shapes/vsinus.cc
index 6c546135..362ed800 100644
--- a/karbon/shapes/vsinus.cc
+++ b/karbon/shapes/vsinus.cc
@@ -28,14 +28,14 @@
 #include <tqdom.h>
 #include <vdocument.h>
 
-VSinus::VSinus( VObject* tqparent, VState state )
-	: VPath( tqparent, state )
+VSinus::VSinus( VObject* parent, VState state )
+	: VPath( parent, state )
 {
 }
 
-VSinus::VSinus( VObject* tqparent,
+VSinus::VSinus( VObject* parent,
 		const KoPoint& topLeft, double width, double height, uint periods )
-	: VPath( tqparent ), m_topLeft( topLeft ), m_width( width), m_height( height ), m_periods( periods )
+	: VPath( parent ), m_topLeft( topLeft ), m_width( width), m_height( height ), m_periods( periods )
 {
 	// We want at least 1 period:
 	if( m_periods < 1 )
diff --git a/karbon/shapes/vsinus.h b/karbon/shapes/vsinus.h
index 10b902d8..89510d0f 100644
--- a/karbon/shapes/vsinus.h
+++ b/karbon/shapes/vsinus.h
@@ -26,8 +26,8 @@
 class KARBONBASE_EXPORT VSinus : public VPath
 {
 public:
-	VSinus( VObject* tqparent, VState state = edit );
-	VSinus( VObject* tqparent,
+	VSinus( VObject* parent, VState state = edit );
+	VSinus( VObject* parent,
 		const KoPoint& topLeft, double width, double height, uint periods );
 
 	virtual TQString name() const;
diff --git a/karbon/shapes/vspiral.cc b/karbon/shapes/vspiral.cc
index cad37ccd..0df88485 100644
--- a/karbon/shapes/vspiral.cc
+++ b/karbon/shapes/vspiral.cc
@@ -30,15 +30,15 @@
 #include <KoUnit.h>
 #include <vdocument.h>
 
-VSpiral::VSpiral( VObject* tqparent, VState state )
-	: VPath( tqparent, state )
+VSpiral::VSpiral( VObject* parent, VState state )
+	: VPath( parent, state )
 {
 }
 
-VSpiral::VSpiral( VObject* tqparent,
+VSpiral::VSpiral( VObject* parent,
 		const KoPoint& center, double radius, uint segments, double fade,
 		bool clockwise, double angle, VSpiralType type )
-	: VPath( tqparent ), m_center( center), m_radius( radius ), m_fade( fade ), m_segments( segments ), m_clockwise( clockwise ), m_angle( angle ), m_type( type )
+	: VPath( parent ), m_center( center), m_radius( radius ), m_fade( fade ), m_segments( segments ), m_clockwise( clockwise ), m_angle( angle ), m_type( type )
 {
 	init();
 }
diff --git a/karbon/shapes/vspiral.h b/karbon/shapes/vspiral.h
index fc99436c..9411afc2 100644
--- a/karbon/shapes/vspiral.h
+++ b/karbon/shapes/vspiral.h
@@ -31,8 +31,8 @@ public:
 		round,
 		rectangular
 	};
-	VSpiral( VObject* tqparent, VState state = edit );
-	VSpiral( VObject* tqparent,
+	VSpiral( VObject* parent, VState state = edit );
+	VSpiral( VObject* parent,
 		const KoPoint& center, double radius, uint segments,
 		double fade, bool clockwise, double angle = 0.0, VSpiralType type = round );
 
diff --git a/karbon/shapes/vstar.cc b/karbon/shapes/vstar.cc
index 11f8ef86..260c1664 100644
--- a/karbon/shapes/vstar.cc
+++ b/karbon/shapes/vstar.cc
@@ -30,15 +30,15 @@
 #include <KoUnit.h>
 #include <vdocument.h>
 
-VStar::VStar( VObject* tqparent, VState state )
-	: VPath( tqparent, state )
+VStar::VStar( VObject* parent, VState state )
+	: VPath( parent, state )
 {
 }
 
-VStar::VStar( VObject* tqparent,
+VStar::VStar( VObject* parent,
 		const KoPoint& center, double outerRadius, double innerRadius,
 		uint edges, double angle, uint innerAngle, double roundness, VStarType type )
-	: VPath( tqparent ), m_center( center), m_outerRadius( outerRadius ), m_innerRadius( innerRadius), m_edges( edges ), m_angle( angle ), m_innerAngle( innerAngle ), m_roundness( roundness ), m_type( type )
+	: VPath( parent ), m_center( center), m_outerRadius( outerRadius ), m_innerRadius( innerRadius), m_edges( edges ), m_angle( angle ), m_innerAngle( innerAngle ), m_roundness( roundness ), m_type( type )
 {
 	init();
 }
diff --git a/karbon/shapes/vstar.h b/karbon/shapes/vstar.h
index 9a4096ea..d82cdf9e 100644
--- a/karbon/shapes/vstar.h
+++ b/karbon/shapes/vstar.h
@@ -57,8 +57,8 @@ public:
 		star,
 		gear
 	};
-	VStar( VObject* tqparent, VState state = edit );
-	VStar( VObject* tqparent,
+	VStar( VObject* parent, VState state = edit );
+	VStar( VObject* parent,
 		const KoPoint& center, double outerRadius, double innerRadius,
 		uint edges, double angle = 0.0, uint innerAngle = 0,
 		double roundness = 0.0, VStarType type = star_outline );
diff --git a/karbon/tools/vdefaulttools.cc b/karbon/tools/vdefaulttools.cc
index ecc5e048..3be8a8bd 100644
--- a/karbon/tools/vdefaulttools.cc
+++ b/karbon/tools/vdefaulttools.cc
@@ -47,18 +47,18 @@
 typedef KGenericFactory<VDefaultTools> VDefaultToolsFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_defaulttools, VDefaultToolsFactory( "karbon_defaulttools" ) )
 
-VDefaultTools::VDefaultTools(TQObject *tqparent, const char *name, const TQStringList &)
-	: KParts::Plugin(tqparent, name)
+VDefaultTools::VDefaultTools(TQObject *parent, const char *name, const TQStringList &)
+	: KParts::Plugin(parent, name)
 {
 	setInstance(VDefaultToolsFactory::instance());
 
 	kdDebug() << "VDefaultTools. Class: "
 		<< className()
 		<< ", Parent: "
-		<< tqparent -> className()
+		<< parent -> className()
 		<< "\n";
 
-	if ( tqparent->inherits("KarbonFactory") )
+	if ( parent->inherits("KarbonFactory") )
 	{
 		KarbonToolRegistry* r = KarbonToolRegistry::instance();
 		r->add(new KarbonToolFactory<VSelectTool>());
diff --git a/karbon/tools/vdefaulttools.h b/karbon/tools/vdefaulttools.h
index 0c88eb4a..f237a4e4 100644
--- a/karbon/tools/vdefaulttools.h
+++ b/karbon/tools/vdefaulttools.h
@@ -33,7 +33,7 @@ class VDefaultTools : public KParts::Plugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	VDefaultTools(TQObject *tqparent, const char *name, const TQStringList &);
+	VDefaultTools(TQObject *parent, const char *name, const TQStringList &);
 	virtual ~VDefaultTools();
 };
 
diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc
index 49e80ec8..41936226 100644
--- a/karbon/tools/vellipsetool.cc
+++ b/karbon/tools/vellipsetool.cc
@@ -34,8 +34,8 @@
 #include "vglobal.h"
 
 
-VEllipseOptionsWidget::VEllipseOptionsWidget( KarbonPart *part, TQWidget *tqparent, const char *name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Ellipse" ), Ok | Cancel ), m_part( part )
+VEllipseOptionsWidget::VEllipseOptionsWidget( KarbonPart *part, TQWidget *parent, const char *name )
+	: KDialogBase( parent, name, true, i18n( "Insert Ellipse" ), Ok | Cancel ), m_part( part )
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 	new TQLabel( i18n( "Type:" ), group );
diff --git a/karbon/tools/vellipsetool.h b/karbon/tools/vellipsetool.h
index c07d2e77..859cac96 100644
--- a/karbon/tools/vellipsetool.h
+++ b/karbon/tools/vellipsetool.h
@@ -36,7 +36,7 @@ class VEllipseOptionsWidget : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	VEllipseOptionsWidget( KarbonPart *part, TQWidget *tqparent = 0L, const char *name = 0L );
+	VEllipseOptionsWidget( KarbonPart *part, TQWidget *parent = 0L, const char *name = 0L );
 
 	double width() const;
 	double height() const;
diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc
index d522652c..893c8481 100644
--- a/karbon/tools/vpatterntool.cc
+++ b/karbon/tools/vpatterntool.cc
@@ -45,8 +45,8 @@
 #include <commands/vstrokecmd.h>
 #include <widgets/vstrokefillpreview.h>
 
-VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidget* tqparent )
-	: KDialogBase( tqparent, "", true, i18n( "Choose Pattern" ), Ok | Cancel ), m_pattern( 0 )
+VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidget* parent )
+	: KDialogBase( parent, "", true, i18n( "Choose Pattern" ), Ok | Cancel ), m_pattern( 0 )
 {
 	TQWidget *base = new TQWidget( this );
 	TQVBoxLayout* tqlayout = new TQVBoxLayout( base );
diff --git a/karbon/tools/vpatterntool.h b/karbon/tools/vpatterntool.h
index 8812ce4f..a7153c96 100644
--- a/karbon/tools/vpatterntool.h
+++ b/karbon/tools/vpatterntool.h
@@ -36,7 +36,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool* tool, TQWidget* tqparent = 0L );
+	VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool* tool, TQWidget* parent = 0L );
 	~VPatternWidget();
 
 	VPattern* selectedPattern();
diff --git a/karbon/tools/vpenciltool.cc b/karbon/tools/vpenciltool.cc
index 587182de..9f2759b3 100644
--- a/karbon/tools/vpenciltool.cc
+++ b/karbon/tools/vpenciltool.cc
@@ -51,8 +51,8 @@
 
 #include "vpenciltool.moc"
 
-VPencilOptionsWidget::VPencilOptionsWidget( KarbonView*view, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Pencil Settings" ), Ok | Cancel ), m_view( view )
+VPencilOptionsWidget::VPencilOptionsWidget( KarbonView*view, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Pencil Settings" ), Ok | Cancel ), m_view( view )
 {
 	TQVBox *vbox = new TQVBox( this );
 
diff --git a/karbon/tools/vpenciltool.h b/karbon/tools/vpenciltool.h
index d2bca744..7f962d55 100644
--- a/karbon/tools/vpenciltool.h
+++ b/karbon/tools/vpenciltool.h
@@ -47,7 +47,7 @@ class VPencilOptionsWidget : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		VPencilOptionsWidget( KarbonView*view, TQWidget* tqparent = 0L, const char* name = 0L );
+		VPencilOptionsWidget( KarbonView*view, TQWidget* parent = 0L, const char* name = 0L );
 
 		int currentMode();
 		bool optimize();
diff --git a/karbon/tools/vpolygontool.cc b/karbon/tools/vpolygontool.cc
index 8fd8d740..db1ffb88 100644
--- a/karbon/tools/vpolygontool.cc
+++ b/karbon/tools/vpolygontool.cc
@@ -30,8 +30,8 @@
 #include <shapes/vstar.h>
 #include "vpolygontool.h"
 
-VPolygonTool::VPolygonOptionsWidget::VPolygonOptionsWidget( KarbonView *view, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Polygon" ), Ok | Cancel ), m_view(view)
+VPolygonTool::VPolygonOptionsWidget::VPolygonOptionsWidget( KarbonView *view, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Insert Polygon" ), Ok | Cancel ), m_view(view)
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 
diff --git a/karbon/tools/vpolygontool.h b/karbon/tools/vpolygontool.h
index 227e9d37..052d7e50 100644
--- a/karbon/tools/vpolygontool.h
+++ b/karbon/tools/vpolygontool.h
@@ -48,7 +48,7 @@ private:
 	class VPolygonOptionsWidget : public KDialogBase
 	{
 	public:
-		VPolygonOptionsWidget( KarbonView *view, TQWidget *tqparent = 0L, const char *name = 0L );
+		VPolygonOptionsWidget( KarbonView *view, TQWidget *parent = 0L, const char *name = 0L );
 
 		double radius() const;
 		uint edges() const;
diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cc
index d3668fc4..7d949ac7 100644
--- a/karbon/tools/vrectangletool.cc
+++ b/karbon/tools/vrectangletool.cc
@@ -30,8 +30,8 @@
 #include <KoUnitWidgets.h>
 
 
-VRectangleTool::VRectangleOptionsWidget::VRectangleOptionsWidget( KarbonPart *part, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Rectangle" ), Ok | Cancel ), m_part( part )
+VRectangleTool::VRectangleOptionsWidget::VRectangleOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Insert Rectangle" ), Ok | Cancel ), m_part( part )
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 	// add width/height-input:
diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h
index 2b71e27e..b902b1ab 100644
--- a/karbon/tools/vrectangletool.h
+++ b/karbon/tools/vrectangletool.h
@@ -47,7 +47,7 @@ private:
 	class VRectangleOptionsWidget : public KDialogBase
 	{
 	public:
-		VRectangleOptionsWidget( KarbonPart *part, TQWidget* tqparent = 0L, const char* name = 0L );
+		VRectangleOptionsWidget( KarbonPart *part, TQWidget* parent = 0L, const char* name = 0L );
 
 		double width() const;
 		double height() const;
diff --git a/karbon/tools/vroundrecttool.cc b/karbon/tools/vroundrecttool.cc
index 0e97530f..b7f354cf 100644
--- a/karbon/tools/vroundrecttool.cc
+++ b/karbon/tools/vroundrecttool.cc
@@ -31,8 +31,8 @@
 
 #include <kgenericfactory.h>
 
-VRoundRectTool::VRoundRectOptionsWidget::VRoundRectOptionsWidget( KarbonPart *part, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Round Rect" ), Ok | Cancel ), m_part( part )
+VRoundRectTool::VRoundRectOptionsWidget::VRoundRectOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Insert Round Rect" ), Ok | Cancel ), m_part( part )
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 	new TQLabel( i18n( "object width", "Width:" ), group );
diff --git a/karbon/tools/vroundrecttool.h b/karbon/tools/vroundrecttool.h
index 9b70bf27..59a2fab0 100644
--- a/karbon/tools/vroundrecttool.h
+++ b/karbon/tools/vroundrecttool.h
@@ -51,7 +51,7 @@ private:
 	class VRoundRectOptionsWidget : public KDialogBase
 	{
 	public:
-		VRoundRectOptionsWidget( KarbonPart *part, TQWidget *tqparent = 0L, const char *name = 0L );
+		VRoundRectOptionsWidget( KarbonPart *part, TQWidget *parent = 0L, const char *name = 0L );
 
 		double width() const;
 		double height() const;
diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cc
index 4982141b..f95bc2c5 100644
--- a/karbon/tools/vsinustool.cc
+++ b/karbon/tools/vsinustool.cc
@@ -32,8 +32,8 @@
 #include "KoUnitWidgets.h"
 
 
-VSinusTool::VSinusOptionsWidget::VSinusOptionsWidget( KarbonPart *part, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Sinus" ), Ok | Cancel ), m_part( part )
+VSinusTool::VSinusOptionsWidget::VSinusOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Insert Sinus" ), Ok | Cancel ), m_part( part )
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 
diff --git a/karbon/tools/vsinustool.h b/karbon/tools/vsinustool.h
index 8e2adfc3..71669ebd 100644
--- a/karbon/tools/vsinustool.h
+++ b/karbon/tools/vsinustool.h
@@ -46,7 +46,7 @@ private:
 	class VSinusOptionsWidget : public KDialogBase
 	{
 	public:
-		VSinusOptionsWidget( KarbonPart *part, TQWidget *tqparent = 0L, const char *name = 0L );
+		VSinusOptionsWidget( KarbonPart *part, TQWidget *parent = 0L, const char *name = 0L );
 
 		double width() const;
 		double height() const;
diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cc
index 58401309..304c8637 100644
--- a/karbon/tools/vspiraltool.cc
+++ b/karbon/tools/vspiraltool.cc
@@ -31,8 +31,8 @@
 #include "KoUnitWidgets.h"
 
 
-VSpiralTool::VSpiralOptionsWidget::VSpiralOptionsWidget( KarbonPart *part, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Spiral" ), Ok | Cancel ), m_part( part )
+VSpiralTool::VSpiralOptionsWidget::VSpiralOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Insert Spiral" ), Ok | Cancel ), m_part( part )
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 
diff --git a/karbon/tools/vspiraltool.h b/karbon/tools/vspiraltool.h
index 9a09bd83..5787063d 100644
--- a/karbon/tools/vspiraltool.h
+++ b/karbon/tools/vspiraltool.h
@@ -51,7 +51,7 @@ private:
 	class VSpiralOptionsWidget : public KDialogBase
 	{
 	public:
-		VSpiralOptionsWidget( KarbonPart *part, TQWidget *tqparent = 0L, const char* name = 0L );
+		VSpiralOptionsWidget( KarbonPart *part, TQWidget *parent = 0L, const char* name = 0L );
 
 		double radius() const;
 		uint segments() const;
diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cc
index 6110969a..42c74f4e 100644
--- a/karbon/tools/vstartool.cc
+++ b/karbon/tools/vstartool.cc
@@ -31,8 +31,8 @@
 #include "KoUnitWidgets.h"
 
 
-VStarOptionsWidget::VStarOptionsWidget( KarbonPart *part, TQWidget* tqparent, const char* name )
-	: KDialogBase( tqparent, name, true, i18n( "Insert Star" ), Ok | Cancel ), m_part( part )
+VStarOptionsWidget::VStarOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name )
+	: KDialogBase( parent, name, true, i18n( "Insert Star" ), Ok | Cancel ), m_part( part )
 {
 	TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this );
 	new TQLabel( i18n( "Type:" ), group );
diff --git a/karbon/tools/vstartool.h b/karbon/tools/vstartool.h
index 3ab94916..07d744c0 100644
--- a/karbon/tools/vstartool.h
+++ b/karbon/tools/vstartool.h
@@ -36,7 +36,7 @@ class VStarOptionsWidget : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	VStarOptionsWidget( KarbonPart *part, TQWidget* tqparent = 0L, const char* name = 0L );
+	VStarOptionsWidget( KarbonPart *part, TQWidget* parent = 0L, const char* name = 0L );
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index 67776ac3..a3500160 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -68,8 +68,8 @@ traceShape( VKoPainter* p, int x, int y, int w, int h )
 	p->lineTo( KoPoint( x , y ) );
 }
 
-ShadowPreview::ShadowPreview( ShadowWidget* tqparent )
-		: TQWidget( tqparent ), m_parent( tqparent )
+ShadowPreview::ShadowPreview( ShadowWidget* parent )
+		: TQWidget( parent ), m_parent( parent )
 {
 	setBackgroundMode( TQt::NoBackground );
 	setMinimumSize( 60, 60 );
@@ -201,8 +201,8 @@ ShadowPreview::paintEvent( TQPaintEvent* )
 	painter.drawLine( width() / 2, height() / 2 - 2, width() / 2, height() / 2 + 2 );
 }
 
-ShadowWidget::ShadowWidget( TQWidget* tqparent, const char* name, int angle, int distance, bool translucent )
-		: TQGroupBox( tqparent, name )
+ShadowWidget::ShadowWidget( TQWidget* parent, const char* name, int angle, int distance, bool translucent )
+		: TQGroupBox( parent, name )
 {
 	setTitle( i18n( "Shadow" ) );
 	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
@@ -314,8 +314,8 @@ ShadowWidget::updatePreview()
 	m_translucent->setEnabled( ok );
 }
 
-VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *tqparent )
-	: KDialogBase( tqparent, "", true, i18n( "Text" ), Ok | Cancel ), m_tool( tool )
+VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent )
+	: KDialogBase( parent, "", true, i18n( "Text" ), Ok | Cancel ), m_tool( tool )
 {
 	//tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 	//setFrameStyle( Box | Sunken );
diff --git a/karbon/tools/vtexttool.h b/karbon/tools/vtexttool.h
index ccecb192..cd3c4e87 100644
--- a/karbon/tools/vtexttool.h
+++ b/karbon/tools/vtexttool.h
@@ -51,7 +51,7 @@ class ShadowPreview : public TQWidget
   TQ_OBJECT
 
 public:
-	ShadowPreview( ShadowWidget* tqparent );
+	ShadowPreview( ShadowWidget* parent );
 	~ShadowPreview();
 
 signals:
@@ -72,7 +72,7 @@ class ShadowWidget : public TQGroupBox
   TQ_OBJECT
 
 public:
-	ShadowWidget( TQWidget* tqparent, const char* name, int angle, int distance, bool translucent );
+	ShadowWidget( TQWidget* parent, const char* name, int angle, int distance, bool translucent );
 	~ShadowWidget();
 
 	void setUseShadow( bool use );
@@ -104,7 +104,7 @@ class VTextOptionsWidget : public KDialogBase
   TQ_OBJECT
 
 public:
-	VTextOptionsWidget( VTextTool* tool, TQWidget *tqparent );
+	VTextOptionsWidget( VTextTool* tool, TQWidget *parent );
 	~VTextOptionsWidget();
 
 	void setFont( const TQFont& font );
diff --git a/karbon/visitors/vselectnodes.cc b/karbon/visitors/vselectnodes.cc
index 6d297c96..00f56de3 100644
--- a/karbon/visitors/vselectnodes.cc
+++ b/karbon/visitors/vselectnodes.cc
@@ -101,7 +101,7 @@ VSelectNodes::visitVSubpath( VSubpath& path )
 void
 VSelectNodes::visitVLayer( VLayer& layer )
 {
-	VDocument* doc = (VDocument*)layer.tqparent();
+	VDocument* doc = (VDocument*)layer.parent();
 	if ( ( layer.state() != VObject::deleted ) &&
 	     ( ( doc->selectionMode() == VDocument::AllLayers ) ||
 	       ( doc->selectionMode() == VDocument::VisibleLayers && ( layer.state() == VObject::normal || layer.state() == VObject::normal_locked ) ) ||
@@ -138,7 +138,7 @@ VTestNodes::visitVSubpath( VSubpath& path )
 void
 VTestNodes::visitVLayer( VLayer& layer )
 {
-	VDocument* doc = (VDocument*)layer.tqparent();
+	VDocument* doc = (VDocument*)layer.parent();
 	if ( ( layer.state() != VObject::deleted ) &&
 	     ( ( doc->selectionMode() == VDocument::AllLayers ) ||
 	       ( doc->selectionMode() == VDocument::VisibleLayers && ( layer.state() == VObject::normal || layer.state() == VObject::normal_locked ) ) ||
diff --git a/karbon/visitors/vselectobjects.cc b/karbon/visitors/vselectobjects.cc
index 0a428c43..060eeacb 100644
--- a/karbon/visitors/vselectobjects.cc
+++ b/karbon/visitors/vselectobjects.cc
@@ -205,7 +205,7 @@ VSelectObjects::visitVObject( VObject& object )
 void
 VSelectObjects::visitVLayer( VLayer& layer )
 {
-	VDocument* doc = (VDocument*)layer.tqparent();
+	VDocument* doc = (VDocument*)layer.parent();
 	if ( ( layer.state() != VObject::deleted ) &&
 	     ( ( doc->selectionMode() == VDocument::AllLayers ) ||
 	       ( doc->selectionMode() == VDocument::VisibleLayers && ( layer.state() == VObject::normal || layer.state() == VObject::normal_locked ) ) ||
diff --git a/karbon/vtool.h b/karbon/vtool.h
index 3eabbe76..877dc41b 100644
--- a/karbon/vtool.h
+++ b/karbon/vtool.h
@@ -308,7 +308,7 @@ protected:
 	/** The tool's action object. */
 	KRadioAction *m_action;
 
-	/** Helper function. Returns the tqparent view's toolcontroller. */
+	/** Helper function. Returns the parent view's toolcontroller. */
 	VToolController *toolController() const;
 
 private:
diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cc
index 96db15d8..d96018b9 100644
--- a/karbon/widgets/vcanvas.cc
+++ b/karbon/widgets/vcanvas.cc
@@ -93,8 +93,8 @@ KoPoint VCanvas::snapToGrid( const KoPoint &point )
 }
 
 
-VCanvas::VCanvas( TQWidget *tqparent, KarbonView* view, KarbonPart* part )
-    : TQScrollView( tqparent, "canvas", WStaticContents/*WNorthWestGravity*/ | WResizeNoErase  |
+VCanvas::VCanvas( TQWidget *parent, KarbonView* view, KarbonPart* part )
+    : TQScrollView( parent, "canvas", WStaticContents/*WNorthWestGravity*/ | WResizeNoErase  |
 	  WRepaintNoErase ), m_part( part ), m_view( view )
 {
 	connect(this, TQT_SIGNAL( contentsMoving( int, int ) ), this, TQT_SLOT( slotContentsMoving( int, int ) ) );
diff --git a/karbon/widgets/vcanvas.h b/karbon/widgets/vcanvas.h
index 61d9b606..7fb38e77 100644
--- a/karbon/widgets/vcanvas.h
+++ b/karbon/widgets/vcanvas.h
@@ -36,7 +36,7 @@ class KARBONCOMMON_EXPORT VCanvas : public TQScrollView
 	Q_OBJECT
   TQ_OBJECT
 public:
-	VCanvas( TQWidget *tqparent, KarbonView* view, KarbonPart* part );
+	VCanvas( TQWidget *parent, KarbonView* view, KarbonPart* part );
 	virtual ~VCanvas();
 
 	void repaintAll( const KoRect & );
diff --git a/karbon/widgets/vcolorslider.cc b/karbon/widgets/vcolorslider.cc
index e0c20555..3e2af4f0 100644
--- a/karbon/widgets/vcolorslider.cc
+++ b/karbon/widgets/vcolorslider.cc
@@ -27,16 +27,16 @@
 
 #include "vcolorslider.h"
 
-VColorSlider::VColorSlider( TQWidget* tqparent, const char* name )
-	: TQWidget( tqparent, name )
+VColorSlider::VColorSlider( TQWidget* parent, const char* name )
+	: TQWidget( parent, name )
 {
 	init();
 }
 
 // Label, left color, right color, min, max, value ...
 VColorSlider::VColorSlider( const TQString& label, const TQColor& col1,
-	const TQColor& col2, int min, int max, int value, TQWidget* tqparent, const char* name )
-		: TQWidget( tqparent, name )
+	const TQColor& col2, int min, int max, int value, TQWidget* parent, const char* name )
+		: TQWidget( parent, name )
 {
 	init();
 	setLabel( label );
diff --git a/karbon/widgets/vcolorslider.h b/karbon/widgets/vcolorslider.h
index dc3d659a..80ca21b9 100644
--- a/karbon/widgets/vcolorslider.h
+++ b/karbon/widgets/vcolorslider.h
@@ -40,10 +40,10 @@ public:
 	/**
 	 * Constructs a new color slider.
 	 *
-	 * @param tqparent the tqparent widget
+	 * @param parent the parent widget
 	 * @param name the slider's name
 	 */
-	VColorSlider( TQWidget* tqparent = 0L, const char* name = 0L );
+	VColorSlider( TQWidget* parent = 0L, const char* name = 0L );
 
 	/**
 	 * Constructs a new color slider.
@@ -54,11 +54,11 @@ public:
 	 * @param min the minimum value
 	 * @param max the maximum value
 	 * @param value the actual value
-	 * @param tqparent the tqparent widget
+	 * @param parent the parent widget
 	 * @param name the slider's name
 	 */
 	VColorSlider( const TQString& label, const TQColor& col1, const TQColor& col2,
-		int min, int max, int value, TQWidget* tqparent = 0L, const char* name = 0L );
+		int min, int max, int value, TQWidget* parent = 0L, const char* name = 0L );
 	
 	/** Destroys the color slider */
 	~VColorSlider();
diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc
index b8f955d8..f65cfd74 100644
--- a/karbon/widgets/vgradienttabwidget.cc
+++ b/karbon/widgets/vgradienttabwidget.cc
@@ -100,8 +100,8 @@ void VGradientListItem::paint( TQPainter* painter )
 	painter->flush();
 } // VGradientListItem::paint
 
-VGradientPreview::VGradientPreview( VGradient& gradient, double& opacity, TQWidget* tqparent, const char* name )
-		: TQWidget( tqparent, name ), m_gradient( &gradient ), m_opacity( &opacity )
+VGradientPreview::VGradientPreview( VGradient& gradient, double& opacity, TQWidget* parent, const char* name )
+		: TQWidget( parent, name ), m_gradient( &gradient ), m_opacity( &opacity )
 {
 	setBackgroundMode( TQt::NoBackground );
 	setMinimumSize( 70, 70 );
@@ -167,8 +167,8 @@ void VGradientPreview::paintEvent( TQPaintEvent* )
 	bitBlt( this, 0, 0, &pixmap, 0, 0, width(), height() );
 } // VGradientPreview::paintEvent
 
-VGradientTabWidget::VGradientTabWidget( VGradient& gradient, KarbonResourceServer* server, TQWidget* tqparent, const char* name )
-		: TQTabWidget( tqparent, name ), m_gradient( gradient ), m_resourceServer( server )
+VGradientTabWidget::VGradientTabWidget( VGradient& gradient, KarbonResourceServer* server, TQWidget* parent, const char* name )
+		: TQTabWidget( parent, name ), m_gradient( gradient ), m_resourceServer( server )
 {
 	setupUI();
 	setupConnections();
diff --git a/karbon/widgets/vgradienttabwidget.h b/karbon/widgets/vgradienttabwidget.h
index ba5f771f..f0ac1d37 100644
--- a/karbon/widgets/vgradienttabwidget.h
+++ b/karbon/widgets/vgradienttabwidget.h
@@ -64,7 +64,7 @@ private:
 class VGradientPreview : public TQWidget
 {
 	public:
-		VGradientPreview( VGradient& gradient, double& opacity, TQWidget* tqparent = 0L, const char* name = 0L );
+		VGradientPreview( VGradient& gradient, double& opacity, TQWidget* parent = 0L, const char* name = 0L );
 		~VGradientPreview();
 
 		virtual void paintEvent( TQPaintEvent* );
@@ -85,7 +85,7 @@ class KARBONBASE_EXPORT VGradientTabWidget : public TQTabWidget
 			FILL
 		};
 	
-		VGradientTabWidget( VGradient& gradient, KarbonResourceServer* server, TQWidget* tqparent = 0L, const char* name = 0L );
+		VGradientTabWidget( VGradient& gradient, KarbonResourceServer* server, TQWidget* parent = 0L, const char* name = 0L );
 		~VGradientTabWidget();
 
 		const VGradient& gradient();
diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc
index 49d7f053..f1c55ea1 100644
--- a/karbon/widgets/vgradientwidget.cc
+++ b/karbon/widgets/vgradientwidget.cc
@@ -54,8 +54,8 @@ static unsigned char colorStop_bits[] = {
    0x7c, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xff, 0x01
 };
 
-VGradientWidget::VGradientWidget( VGradient& gradient, TQWidget* tqparent, const char* name )
-		: TQWidget( tqparent, name ), m_gradient( &gradient )
+VGradientWidget::VGradientWidget( VGradient& gradient, TQWidget* parent, const char* name )
+		: TQWidget( parent, name ), m_gradient( &gradient )
 {
 	setBackgroundMode( TQt::NoBackground );
 	setMinimumSize( 105, 35 );
diff --git a/karbon/widgets/vgradientwidget.h b/karbon/widgets/vgradientwidget.h
index 236e98f9..1c02d482 100644
--- a/karbon/widgets/vgradientwidget.h
+++ b/karbon/widgets/vgradientwidget.h
@@ -32,7 +32,7 @@ class KARBONBASE_EXPORT VGradientWidget : public TQWidget
   TQ_OBJECT
 
 public:
-	VGradientWidget( VGradient& gradient, TQWidget* tqparent = 0L, const char* name = 0L );
+	VGradientWidget( VGradient& gradient, TQWidget* parent = 0L, const char* name = 0L );
 	~VGradientWidget();
 
 	virtual void paintEvent( TQPaintEvent* );
diff --git a/karbon/widgets/vreference.cc b/karbon/widgets/vreference.cc
index c7553fe8..f400fc13 100644
--- a/karbon/widgets/vreference.cc
+++ b/karbon/widgets/vreference.cc
@@ -26,7 +26,7 @@
 
 #include "vreference.h"
 
-VReference::VReference( TQWidget *tqparent, const char *name ) : TQFrame ( tqparent, name )
+VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, name )
 {
 	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
 	mButtonGroup = new TQButtonGroup (3,Qt::Vertical, this );
diff --git a/karbon/widgets/vreference.h b/karbon/widgets/vreference.h
index 261b6150..5ff89b48 100644
--- a/karbon/widgets/vreference.h
+++ b/karbon/widgets/vreference.h
@@ -46,7 +46,7 @@ class VReference : public TQFrame
 	Q_OBJECT
   TQ_OBJECT
 public:
-	VReference( TQWidget *tqparent = 0L, const char *name = 0L );
+	VReference( TQWidget *parent = 0L, const char *name = 0L );
 	int referencePoint();
 public slots:
 	virtual void setReferencePoint ( int );
diff --git a/karbon/widgets/vruler.cc b/karbon/widgets/vruler.cc
index 28ed8939..de03eb23 100644
--- a/karbon/widgets/vruler.cc
+++ b/karbon/widgets/vruler.cc
@@ -40,7 +40,7 @@ const char *VRuler::m_nums[] = {
     "XX   XXXXXX XXX     XXX   XXXXXX XXX    XXXX   XXXXX XXXXX   XXXX  XXX"
 };
 
-VRuler::VRuler(Qt::Orientation o, TQWidget *tqparent, const char *name) : super(tqparent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums)
+VRuler::VRuler(Qt::Orientation o, TQWidget *parent, const char *name) : super(parent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums)
 {
     setBackgroundMode(NoBackground);
     setFrameStyle(Box | Sunken);
diff --git a/karbon/widgets/vruler.h b/karbon/widgets/vruler.h
index 47458039..fe538bea 100644
--- a/karbon/widgets/vruler.h
+++ b/karbon/widgets/vruler.h
@@ -36,7 +36,7 @@ class VRuler : public TQFrame {
     typedef TQFrame super;
 
 public:
-    VRuler(Qt::Orientation, TQWidget *tqparent = 0, const char *name = 0);
+    VRuler(Qt::Orientation, TQWidget *parent = 0, const char *name = 0);
     virtual ~VRuler();
 
 public:
diff --git a/karbon/widgets/vsmallpreview.cc b/karbon/widgets/vsmallpreview.cc
index ab1b9261..6e35d921 100644
--- a/karbon/widgets/vsmallpreview.cc
+++ b/karbon/widgets/vsmallpreview.cc
@@ -39,8 +39,8 @@
 
 #define FRAMEWIDTH		40
 
-VSmallPreview::VSmallPreview( TQWidget* tqparent, const char* name )
-	: TQWidget( tqparent, name )
+VSmallPreview::VSmallPreview( TQWidget* parent, const char* name )
+	: TQWidget( parent, name )
 {
 	/* Create widget tqlayout */
 	TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 4 );
diff --git a/karbon/widgets/vsmallpreview.h b/karbon/widgets/vsmallpreview.h
index f264553d..e666ad6a 100644
--- a/karbon/widgets/vsmallpreview.h
+++ b/karbon/widgets/vsmallpreview.h
@@ -36,7 +36,7 @@ class VSmallPreview : public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	VSmallPreview( TQWidget* tqparent = 0L, const char* name = 0L );
+	VSmallPreview( TQWidget* parent = 0L, const char* name = 0L );
 	~VSmallPreview();
 
 	void update( const VStroke &, const VFill & );
diff --git a/karbon/widgets/vstatebutton.cc b/karbon/widgets/vstatebutton.cc
index 197cf0ee..1ea8e27a 100644
--- a/karbon/widgets/vstatebutton.cc
+++ b/karbon/widgets/vstatebutton.cc
@@ -19,8 +19,8 @@
 
 #include "vstatebutton.h"
 
-VStateButton::VStateButton( TQWidget* tqparent, const char* name )
-		: TQPushButton( tqparent, name )
+VStateButton::VStateButton( TQWidget* parent, const char* name )
+		: TQPushButton( parent, name )
 {
 	m_index = 0;
 	m_pixmaps.setAutoDelete( true );
diff --git a/karbon/widgets/vstatebutton.h b/karbon/widgets/vstatebutton.h
index 08e4a1a2..a681dcc0 100644
--- a/karbon/widgets/vstatebutton.h
+++ b/karbon/widgets/vstatebutton.h
@@ -27,7 +27,7 @@
 class VStateButton : public TQPushButton
 {
 public:
-	VStateButton( TQWidget* tqparent = 0L, const char* name = 0L );
+	VStateButton( TQWidget* parent = 0L, const char* name = 0L );
 	~VStateButton();
 
 	void addState( TQPixmap *state ) { m_pixmaps.append( state ); }
diff --git a/karbon/widgets/vstrokefillpreview.cc b/karbon/widgets/vstrokefillpreview.cc
index 93392d9b..473ce4db 100644
--- a/karbon/widgets/vstrokefillpreview.cc
+++ b/karbon/widgets/vstrokefillpreview.cc
@@ -52,8 +52,8 @@
 
 
 VStrokeFillPreview::VStrokeFillPreview(
-	KarbonPart *part, TQWidget* tqparent, const char* name )
-		: TQFrame( tqparent, name ), m_part( part )
+	KarbonPart *part, TQWidget* parent, const char* name )
+		: TQFrame( parent, name ), m_part( part )
 {
 	m_strokeWidget = false;
 	setFocusPolicy( TQ_NoFocus );
diff --git a/karbon/widgets/vstrokefillpreview.h b/karbon/widgets/vstrokefillpreview.h
index 81fdffae..1790c9c9 100644
--- a/karbon/widgets/vstrokefillpreview.h
+++ b/karbon/widgets/vstrokefillpreview.h
@@ -34,7 +34,7 @@ class VStrokeFillPreview : public TQFrame
   TQ_OBJECT
 
 public:
-	VStrokeFillPreview( KarbonPart *part, TQWidget* tqparent = 0L, const char* name = 0L );
+	VStrokeFillPreview( KarbonPart *part, TQWidget* parent = 0L, const char* name = 0L );
 	~VStrokeFillPreview();
 
 	virtual TQSize tqsizeHint() const
diff --git a/karbon/widgets/vtranslate.cc b/karbon/widgets/vtranslate.cc
index 37bfe811..e13da689 100644
--- a/karbon/widgets/vtranslate.cc
+++ b/karbon/widgets/vtranslate.cc
@@ -29,8 +29,8 @@
 
 #include "vtranslate.h"
 
-VTranslate::VTranslate( TQWidget* tqparent, const char* name )
-	: TQWidget( tqparent, name )
+VTranslate::VTranslate( TQWidget* parent, const char* name )
+	: TQWidget( parent, name )
 {
 	setCaption( i18n( "Translate" ) );
 
diff --git a/karbon/widgets/vtranslate.h b/karbon/widgets/vtranslate.h
index 1b019d4b..7f07aadb 100644
--- a/karbon/widgets/vtranslate.h
+++ b/karbon/widgets/vtranslate.h
@@ -35,7 +35,7 @@ class VTranslate : public TQWidget
   TQ_OBJECT
 
 public:
-	VTranslate( TQWidget* tqparent = 0L, const char* name = 0L );
+	VTranslate( TQWidget* parent = 0L, const char* name = 0L );
 	~VTranslate();
 
 public slots:
diff --git a/karbon/widgets/vtypebuttonbox.cc b/karbon/widgets/vtypebuttonbox.cc
index f182341d..84b3ed14 100644
--- a/karbon/widgets/vtypebuttonbox.cc
+++ b/karbon/widgets/vtypebuttonbox.cc
@@ -217,11 +217,11 @@ static const char* const buttonpattern[]={
 #include "vtypebuttonbox.h"
 
 VTypeButtonBox::VTypeButtonBox( KarbonPart *part, 
-								TQWidget* tqparent, const char* name )
-	: TQHButtonGroup( tqparent, name ),
+								TQWidget* parent, const char* name )
+	: TQHButtonGroup( parent, name ),
 	  m_part( part ), m_isStrokeManipulator( false )
 {
-	setMaximumWidth( tqparent->width() - 2 );
+	setMaximumWidth( parent->width() - 2 );
 
 	// The button for no fill
 	TQToolButton* button = new TQToolButton( this );
diff --git a/karbon/widgets/vtypebuttonbox.h b/karbon/widgets/vtypebuttonbox.h
index e033a3e4..4ee0dab3 100644
--- a/karbon/widgets/vtypebuttonbox.h
+++ b/karbon/widgets/vtypebuttonbox.h
@@ -37,7 +37,7 @@ public:
 		pattern  = 3
  	};
 
-	VTypeButtonBox( KarbonPart *part, TQWidget* tqparent = 0L, const char* name = 0L );
+	VTypeButtonBox( KarbonPart *part, TQWidget* parent = 0L, const char* name = 0L );
 	bool isStrokeManipulator() { return m_isStrokeManipulator; }
 
 public slots:
author	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-08-10 22:19:39 +0000
committer	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-08-10 22:19:39 +0000
commit	04766b207afba7961d4d802313e426f5a2fbef63 (patch)
tree	c888ea1027c793e2d0386a7e5a1a0cd077b03cb3 /karbon
parent	b6edfe41c9395f2e20784cbf0e630af6426950a3 (diff)
download	koffice-04766b207afba7961d4d802313e426f5a2fbef63.tar.gz koffice-04766b207afba7961d4d802313e426f5a2fbef63.zip