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

2 files changed, 16 insertions, 16 deletions

diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cc
index ef90c93d..90320d7e 100644
--- a/filters/karbon/oodraw/oodrawimport.cc
+++ b/filters/karbon/oodraw/oodrawimport.cc
@@ -229,7 +229,7 @@ KoFilter::ConversiontqStatus OoDrawImport::loadAndParse(const TQString& filename
 }
 
 void
-OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
+OoDrawImport::parseGroup( VGroup *parent, const TQDomElement& parentobject )
 {
 	// parse all objects
 	for( TQDomNode object = parentobject.firstChild(); !object.isNull(); object = object.nextSibling() )
@@ -243,7 +243,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 		if( name == "g" ) // polyline
 		{
 			storeObjectStyles( o );
-			VGroup *group = new VGroup( tqparent );
+			VGroup *group = new VGroup( parent );
 			appendPen( *group );
 			appendBrush( *group );
 			obj = group;
@@ -257,7 +257,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 			double w = KoUnit::parseValue( o.attributeNS( ooNS::svg, "width", TQString() ) );
 			double h = KoUnit::parseValue( o.attributeNS( ooNS::svg, "height", TQString() ) );
 			int corner = static_cast<int>( KoUnit::parseValue( o.attributeNS( ooNS::draw, "corner-radius", TQString() ) ) );
-			VRectangle *rect = new VRectangle( tqparent, KoPoint( x, y ), w, h, corner );
+			VRectangle *rect = new VRectangle( parent, KoPoint( x, y ), w, h, corner );
 			appendPen( *rect );
 			appendBrush( *rect );
 			obj = rect;
@@ -282,7 +282,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 				else if( kind == "arc" )
 					type = VEllipse::arc;
 			}
-			VEllipse *ellipse = new VEllipse( tqparent, KoPoint( x, y ), w, h, type, start, end );
+			VEllipse *ellipse = new VEllipse( parent, KoPoint( x, y ), w, h, type, start, end );
 			appendPen( *ellipse );
 			// arc has no brush
 			if( kind != "arc" )
@@ -292,7 +292,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 		else if( name == "line" ) // line
 		{
 			storeObjectStyles( o );
-			VPath *line = new VPath( tqparent );
+			VPath *line = new VPath( parent );
 			double x1 = KoUnit::parseValue( o.attributeNS( ooNS::svg, "x1", TQString() ) );
 			double y1 = ymirror( KoUnit::parseValue( o.attributeNS( ooNS::svg, "y1", TQString() ) ) );
 			double x2 = KoUnit::parseValue( o.attributeNS( ooNS::svg, "x2", TQString() ) );
@@ -306,7 +306,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 		else if( name == "polyline" ) // polyline
 		{
 			storeObjectStyles( o );
-			VPath *polyline = new VPath( tqparent );
+			VPath *polyline = new VPath( parent );
 			appendPoints( *polyline, o);
 			appendPen( *polyline );
 			appendBrush( *polyline );
@@ -315,9 +315,9 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 		else if( name == "polygon" ) // polygon
 		{
 			storeObjectStyles( o );
-			//VPolygon *polygon = new VPolygon( tqparent );
+			//VPolygon *polygon = new VPolygon( parent );
 			//polygon->load( o );
-			VPath *polygon = new VPath( tqparent );
+			VPath *polygon = new VPath( parent );
 			appendPoints( *polygon, o );
 			appendPen( *polygon );
 			appendBrush( *polygon );
@@ -326,7 +326,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 		else if( name == "path" ) // path
 		{
 			storeObjectStyles( o );
-			VPath *path = new VPath( tqparent );
+			VPath *path = new VPath( parent );
 			path->loadSvgPath( o.attributeNS( ooNS::svg, "d", TQString() ) );
 			KoRect rect = parseViewBox( o );
 			double x = KoUnit::parseValue( o.attributeNS( ooNS::svg, "x", TQString() ) );
@@ -353,8 +353,8 @@ appendImage( doc, e, pictureElement, o );
 			kdDebug() << "Unsupported object '" << name << "'" << endl;
 			continue;
 		}
-		if( tqparent && obj )
-			tqparent->append( obj );
+		if( parent && obj )
+			parent->append( obj );
 		else if( obj )
 			m_document.append( obj );
 	}
@@ -636,9 +636,9 @@ OoDrawImport::fillStyleStack( const TQDomElement& object )
 void
 OoDrawImport::addStyles( const TQDomElement* style )
 {
-    // this function is necessary as tqparent styles can have parents themself
-    if( style->hasAttributeNS( ooNS::style, "tqparent-style-name" ) )
-        addStyles( m_styles[style->attributeNS( ooNS::style, "tqparent-style-name", TQString() )] );
+    // this function is necessary as parent styles can have parents themself
+    if( style->hasAttributeNS( ooNS::style, "parent-style-name" ) )
+        addStyles( m_styles[style->attributeNS( ooNS::style, "parent-style-name", TQString() )] );
 
     m_styleStack.push( *style );
 }
diff --git a/filters/karbon/oodraw/oodrawimport.h b/filters/karbon/oodraw/oodrawimport.h
index ea29b276..2b395f48 100644
--- a/filters/karbon/oodraw/oodrawimport.h
+++ b/filters/karbon/oodraw/oodrawimport.h
@@ -40,7 +40,7 @@ class OoDrawImport : public KoFilter
     Q_OBJECT
   TQ_OBJECT
 public:
-    OoDrawImport( KoFilter *tqparent, const char *name, const TQStringList & );
+    OoDrawImport( KoFilter *parent, const char *name, const TQStringList & );
     virtual ~OoDrawImport();
 
     virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
@@ -58,7 +58,7 @@ private:
 	void appendBrush( VObject &obj );
 	void appendPoints(VPath &path, const TQDomElement& object);
 	void convert();
-	void parseGroup( VGroup *tqparent, const TQDomElement& object );
+	void parseGroup( VGroup *parent, const TQDomElement& object );
 	void parseColor( VColor &color, const TQString &s );
 	double ymirror( double y );
 	KoRect parseViewBox( const TQDomElement& object );