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

4 files changed, 16 insertions, 16 deletions

diff --git a/filters/karbon/svg/svgexport.cc b/filters/karbon/svg/svgexport.cc
index 2e661039..a5ed9b40 100644
--- a/filters/karbon/svg/svgexport.cc
+++ b/filters/karbon/svg/svgexport.cc
@@ -67,7 +67,7 @@ SvgExport::SvgExport( KoFilter*, const char*, const TQStringList& )
 	m_gc.setAutoDelete( true );
 }
 
-KoFilter::ConversiontqStatus
+KoFilter::ConversionStatus
 SvgExport::convert( const TQCString& from, const TQCString& to )
 {
 	if ( to != "image/svg+xml" || from != "application/x-karbon" )
@@ -171,7 +171,7 @@ TQString
 SvgExport::getID( VObject *obj )
 {
 	if( obj && !obj->name().isEmpty() )
-		return TQString( " id=\"%1\"" ).tqarg( obj->name() );
+		return TQString( " id=\"%1\"" ).arg( obj->name() );
 	return TQString();
 }
 
@@ -490,9 +490,9 @@ SvgExport::visitVText( VText& text )
 		*m_body << " font-weight=\"bold\"";
 	if( text.font().italic() )
 		*m_body << " font-style=\"italic\"";
-	if( text.tqalignment() == VText::Center )
+	if( text.alignment() == VText::Center )
 		*m_body << " text-anchor=\"middle\"";
-	else if( text.tqalignment() == VText::Right )
+	else if( text.alignment() == VText::Right )
 		*m_body << " text-anchor=\"end\"";
 
 	*m_body << ">" << endl;
diff --git a/filters/karbon/svg/svgexport.h b/filters/karbon/svg/svgexport.h
index 6bfe5d98..c79d1fde 100644
--- a/filters/karbon/svg/svgexport.h
+++ b/filters/karbon/svg/svgexport.h
@@ -52,7 +52,7 @@ public:
 	SvgExport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~SvgExport() {}
 
-	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+	virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 
 private:
 	virtual void visitVPath( VPath& composite );
diff --git a/filters/karbon/svg/svgimport.cc b/filters/karbon/svg/svgimport.cc
index 5a5e90aa..9d323d3d 100644
--- a/filters/karbon/svg/svgimport.cc
+++ b/filters/karbon/svg/svgimport.cc
@@ -54,7 +54,7 @@ SvgImport::~SvgImport()
 {
 }
 
-KoFilter::ConversiontqStatus SvgImport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversionStatus SvgImport::convert(const TQCString& from, const TQCString& to)
 {
 	// check for proper conversion
 	if( to != "application/x-karbon" || from != "image/svg+xml" )
@@ -138,7 +138,7 @@ void SvgImport::convert()
 	m_outerRect = m_document.boundingBox();
 
 	// undo y-mirroring
-	//m_debug->append(TQString("%1\tUndo Y-mirroring.").tqarg(m_time.elapsed()));
+	//m_debug->append(TQString("%1\tUndo Y-mirroring.").arg(m_time.elapsed()));
 	if( !docElem.attribute( "viewBox" ).isEmpty() )
 	{
 		// allow for viewbox def with ',' or whitespace
@@ -692,17 +692,17 @@ void SvgImport::parsePA( VObject *obj, SvgGraphicsContext *gc, const TQString &c
 					//kdDebug() << "!!!!!!bbox y : " << bbox.y() << endl;
 					//kdDebug() << gc->fill.gradient().origin().x() << endl;
 					//kdDebug() << gc->fill.gradient().vector().x() << endl;
-					double offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().x() ), true, false, bbox );
-					double offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().y() ), false, true, bbox );
+					double offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().x() ), true, false, bbox );
+					double offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().y() ), false, true, bbox );
 					gc->fill.gradient().setOrigin( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					if(gc->fill.gradient().type() == VGradient::radial)
 					{
-						offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
-						offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
+						offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
+						offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
 						gc->fill.gradient().setFocalPoint( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					}
-					offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().x() ), true, false, bbox );
-					offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().y() ), false, true, bbox );
+					offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().x() ), true, false, bbox );
+					offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().y() ), false, true, bbox );
 					gc->fill.gradient().setVector( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					//kdDebug() << offsety << endl;
 					//kdDebug() << gc->fill.gradient().origin().x() << endl;
@@ -1263,9 +1263,9 @@ void SvgImport::createText( VGroup *grp, const TQDomElement &b )
 			text->setName( b.attribute("id") );
 
 		if( anchor == "middle" )
-			text->tqsetAlignment( VText::Center );
+			text->setAlignment( VText::Center );
 		else if( anchor == "end" )
-			text->tqsetAlignment( VText::Right );
+			text->setAlignment( VText::Right );
 		
 		if( offset > 0.0 )
 			text->setOffset( offset );
diff --git a/filters/karbon/svg/svgimport.h b/filters/karbon/svg/svgimport.h
index e4e3f56a..636077a1 100644
--- a/filters/karbon/svg/svgimport.h
+++ b/filters/karbon/svg/svgimport.h
@@ -45,7 +45,7 @@ public:
 	SvgImport(KoFilter *parent, const char *name, const TQStringList&);
 	virtual ~SvgImport();
 
-	virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+	virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
 
 protected:
 	class GradientHelper