From f0de9e167e289ab7dc33e57f077c1f04ec7c68c8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:38:41 -0600 Subject: Remove additional unneeded tq method conversions --- kpresenter/KPrObject.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kpresenter/KPrObject.cpp') diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp index 5a03896a..8bc6089d 100644 --- a/kpresenter/KPrObject.cpp +++ b/kpresenter/KPrObject.cpp @@ -357,7 +357,7 @@ void KPrObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) const transX.setNum( trans.x(), 'g', DBL_DIG ); TQCString transY; transY.setNum( trans.y(), 'g', DBL_DIG ); - TQString str = TQString( "rotate(%1) translate(%2pt %3pt)" ).tqarg( angInRad ).tqarg( transX.data() ).tqarg( transY.data() ); + TQString str = TQString( "rotate(%1) translate(%2pt %3pt)" ).arg( angInRad ).arg( transX.data() ).arg( transY.data() ); xmlWriter.addAttribute( "draw:transform", str ); } else @@ -422,8 +422,8 @@ bool KPrObject::saveOasisObjectStyleShowAnimation( KoXmlWriter &animation, int o { if ( effect != EF_NONE || appearStep != 0 || !a_fileName.isEmpty() ) { - animation.startElement( "presentation:show-tqshape" ); - animation.addAttribute( "draw:tqshape-id", "object" + TQString::number( objectId ) ); + animation.startElement( "presentation:show-shape" ); + animation.addAttribute( "draw:shape-id", "object" + TQString::number( objectId ) ); animation.addAttribute( "koffice:order-id", appearStep ); switch( effect ) @@ -522,8 +522,8 @@ bool KPrObject::saveOasisObjectStyleHideAnimation( KoXmlWriter &animation, int o //FIXME oo doesn't support hide animation object if ( effect3 != EF3_NONE || disappearStep != 0 || !d_fileName.isEmpty()) { - animation.startElement( "presentation:hide-tqshape" ); - animation.addAttribute( "draw:tqshape-id", "object" + TQString::number( objectId ) ); + animation.startElement( "presentation:hide-shape" ); + animation.addAttribute( "draw:shape-id", "object" + TQString::number( objectId ) ); animation.addAttribute( "koffice:order-id", disappearStep ); switch( effect3 ) { @@ -1743,14 +1743,14 @@ bool KPrShadowObject::saveOasisDrawPoints( const KoPointArray &points, KPOasisSa int tmpY = int( ( *it ).y() * 10000 ); // no space allows before first element if ( !listOfPoint.isEmpty() ) - listOfPoint += TQString( " %1,%2" ).tqarg( tmpX ).tqarg( tmpY ); + listOfPoint += TQString( " %1,%2" ).arg( tmpX ).arg( tmpY ); else - listOfPoint = TQString( "%1,%2" ).tqarg( tmpX ).tqarg( tmpY ); + listOfPoint = TQString( "%1,%2" ).arg( tmpX ).arg( tmpY ); maxX = TQMAX( maxX, tmpX ); maxY = TQMAX( maxY, tmpY ); } sc.xmlWriter.addAttribute("draw:points", listOfPoint ); - sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( maxX ).tqarg( maxY ) ); + sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).arg( maxX ).arg( maxY ) ); return true; } -- cgit v1.2.1