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

6 files changed, 25 insertions, 25 deletions

diff --git a/karbon/commands/vbooleancmd.h b/karbon/commands/vbooleancmd.h
index 3a3478d3..c782c838 100644
--- a/karbon/commands/vbooleancmd.h
+++ b/karbon/commands/vbooleancmd.h
@@ -37,8 +37,8 @@ public:
 	enum VBooleanType
 	{
 		intersect,
-		tqshape_union,
-		tqshape_xor,
+		shape_union,
+		shape_xor,
 		substract
 	};
 
diff --git a/karbon/commands/vreplacingcmd.cc b/karbon/commands/vreplacingcmd.cc
index 2275dba8..427ecdca 100644
--- a/karbon/commands/vreplacingcmd.cc
+++ b/karbon/commands/vreplacingcmd.cc
@@ -44,7 +44,7 @@ VReplacingCmd::execute()
 	bool successful = false;
 
 
-	// Create new tqshapes if they don't exist yet.
+	// Create new shapes if they don't exist yet.
 	if( !m_newObjects )
 	{
 		m_newObjects = new VSelection();
@@ -65,11 +65,11 @@ VReplacingCmd::execute()
 			{
 				successful = true;
 
-				// Insert new tqshape right before old tqshape.
+				// Insert new shape right before old shape.
 				itr.current()->parent()->insertInfrontOf(
 					newObject, itr.current() );
 
-				// Add new tqshape to list of new objects.
+				// Add new shape to list of new objects.
 				m_newObjects->append( newObject );
 			}
 			// No success.
diff --git a/karbon/commands/vshapecmd.cc b/karbon/commands/vshapecmd.cc
index ae0ad2dc..9a59fcd9 100644
--- a/karbon/commands/vshapecmd.cc
+++ b/karbon/commands/vshapecmd.cc
@@ -25,33 +25,33 @@
 #include "vshapecmd.h"
 
 
-VShapeCmd::VShapeCmd( VDocument* doc, const TQString& name, VPath* tqshape, const TQString& icon )
-	: VCommand( doc, name, icon ), m_tqshape( tqshape )
+VShapeCmd::VShapeCmd( VDocument* doc, const TQString& name, VPath* shape, const TQString& icon )
+	: VCommand( doc, name, icon ), m_shape( shape )
 {
 }
 
 void
 VShapeCmd::execute()
 {
-	if( !m_tqshape )
+	if( !m_shape )
 		return;
 
-	if( m_tqshape->state() == VObject::deleted )
+	if( m_shape->state() == VObject::deleted )
 	{
 		document()->selection()->clear();
-		m_tqshape->setState( VObject::normal );
-		document()->selection()->append( m_tqshape );
+		m_shape->setState( VObject::normal );
+		document()->selection()->append( m_shape );
 	}
 	else
 	{
-		m_tqshape->setState( VObject::normal );
-		m_tqshape->setFill( *( document()->selection()->fill() ) );
-		m_tqshape->setStroke( *( document()->selection()->stroke() ) );
+		m_shape->setState( VObject::normal );
+		m_shape->setFill( *( document()->selection()->fill() ) );
+		m_shape->setStroke( *( document()->selection()->stroke() ) );
 
 		// Add path:
-		document()->append( m_tqshape );
+		document()->append( m_shape );
 		document()->selection()->clear();
-		document()->selection()->append( m_tqshape );
+		document()->selection()->append( m_shape );
 	}
 
 	setSuccess( true );
@@ -60,11 +60,11 @@ VShapeCmd::execute()
 void
 VShapeCmd::unexecute()
 {
-	if( !m_tqshape )
+	if( !m_shape )
 		return;
 
-	document()->selection()->take( *m_tqshape );
-	m_tqshape->setState( VObject::deleted );
+	document()->selection()->take( *m_shape );
+	m_shape->setState( VObject::deleted );
 
 	setSuccess( false );
 }
diff --git a/karbon/commands/vshapecmd.h b/karbon/commands/vshapecmd.h
index 30607fcd..d4742a67 100644
--- a/karbon/commands/vshapecmd.h
+++ b/karbon/commands/vshapecmd.h
@@ -28,13 +28,13 @@ class VPath;
 /*
  * Provides a common base class for creation commands since they all have
  * a similar execute / unexecute behaviour and all build a VPath. Upon
- * execution() the tqshape will be added to the document and selected, upon undoing
+ * execution() the shape will be added to the document and selected, upon undoing
  * it will be set to the deleted state.
  */
 class KARBONCOMMAND_EXPORT VShapeCmd : public VCommand
 {
 public:
-	VShapeCmd( VDocument* doc, const TQString& name, VPath* tqshape, const TQString& icon = "14_polygon" );
+	VShapeCmd( VDocument* doc, const TQString& name, VPath* shape, const TQString& icon = "14_polygon" );
 	virtual ~VShapeCmd() {}
 
 	virtual void execute();
@@ -43,8 +43,8 @@ public:
 	virtual bool changesSelection() const { return true; }
 
 protected:
-	/// Pointer to the created tqshape.
-	VPath *m_tqshape;
+	/// Pointer to the created shape.
+	VPath *m_shape;
 };
 
 #endif
diff --git a/karbon/commands/vtextcmd.h b/karbon/commands/vtextcmd.h
index 708250c8..2fb0a75a 100644
--- a/karbon/commands/vtextcmd.h
+++ b/karbon/commands/vtextcmd.h
@@ -23,7 +23,7 @@
 
 #include <tqfont.h>
 
-#include "vtqshapecmd.h"
+#include "vshapecmd.h"
 
 // create a text-object.
 
diff --git a/karbon/commands/vtransformcmd.cc b/karbon/commands/vtransformcmd.cc
index f0173920..dc1038ab 100644
--- a/karbon/commands/vtransformcmd.cc
+++ b/karbon/commands/vtransformcmd.cc
@@ -484,7 +484,7 @@ VTranslatePointCmd::translatePoints()
 			segment->setPoint( pnts[i], segment->point( pnts[i] ).transform( m_mat ) );
 	}
 
-	// tqinvalidate all changed subpaths
+	// invalidate all changed subpaths
 	VObjectListIterator itr( m_subpaths );
 	for( ; itr.current(); ++itr )
 		itr.current()->invalidateBoundingBox();