Remove additional unneeded tq method conversions

6 files changed, 184 insertions, 184 deletions

diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc
index 0b89e187..8b9d1e77 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.cc
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc
@@ -156,8 +156,8 @@ TQByteArray PowerPointImport::createStyles()
   TQByteArray stylesData;
   TQBuffer stylesBuffer( stylesData );
 
-  TQString pageWidth = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageWidth() );
-  TQString pageHeight = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageHeight() );
+  TQString pageWidth = TQString("%1pt").arg( d->presentation->masterSlide()->pageWidth() );
+  TQString pageHeight = TQString("%1pt").arg( d->presentation->masterSlide()->pageHeight() );
   
   stylesBuffer.open( IO_WriteOnly );
   stylesWriter = new KoXmlWriter( &stylesBuffer );
@@ -351,11 +351,11 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   xmlWriter->startElement( "draw:ellipse" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
@@ -372,11 +372,11 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
   if( !drawObject ) return;
   if( !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   xmlWriter->startElement( "draw:rect" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
@@ -393,7 +393,7 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
 
      double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle);
      double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); 
-     TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); 
+     TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); 
      xmlWriter->addAttribute( "draw:transform", rot );        
   }
   else 
@@ -409,13 +409,13 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   
      
@@ -435,7 +435,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
 
         double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle);
         double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); 
-        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid+yNew); 
+        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid+yNew); 
         xmlWriter->addAttribute( "draw:transform", rot );        
      }  
      else
@@ -448,7 +448,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
 
         double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle);
         double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); 
-        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); 
+        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); 
         xmlWriter->addAttribute( "draw:transform", rot );                
      } 
      
@@ -464,7 +464,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
  // xmlWriter->addAttribute( "svg:y", yStr );
   
   xmlWriter->addAttribute( "draw:layer", "tqlayout" );
-    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+    xmlWriter->startElement( "draw:enhanced-geometry" );
     xmlWriter->addAttribute( "draw:type", "round-rectangle"); 
       xmlWriter->startElement( "draw:equation" );
       xmlWriter->addAttribute( "draw:formula", "$0 /3" );
@@ -486,21 +486,21 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
       xmlWriter->addAttribute( "draw:formula", "top+?f0 " );
       xmlWriter->addAttribute( "draw:name", "f4" ); 
       xmlWriter->endElement(); // draw:equation 
-    xmlWriter->endElement(); // draw:enhanced-tqgeometry
-  xmlWriter->endElement(); // draw:custom-tqshape
+    xmlWriter->endElement(); // draw:enhanced-geometry
+  xmlWriter->endElement(); // draw:custom-shape
 }
 
 void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -522,7 +522,7 @@ void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->addAttribute( "svg:x", 10 );
     xmlWriter->addAttribute( "svg:y", 5 );
     xmlWriter->endElement();
-    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+    xmlWriter->startElement( "draw:enhanced-geometry" );
     xmlWriter->addAttribute( "draw:type", "diamond");
     xmlWriter->endElement();    
   xmlWriter->addAttribute( "draw:layer", "tqlayout" );
@@ -533,14 +533,14 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   /* draw IsocelesTriangle or RightTriangle */
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -572,7 +572,7 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
     xmlWriter->addAttribute( "svg:y", 5 );
     xmlWriter->endElement();
 
-    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+    xmlWriter->startElement( "draw:enhanced-geometry" );
        
     if  (drawObject->hasProperty("draw:mirror-vertical"))
     { 
@@ -588,14 +588,14 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
      double rotAngle = drawObject->getDoubleProperty("libppt:rotation" );
      double xMid = ( drawObject->left() + 0.5*drawObject->width() ); 
      double yMid = ( drawObject->top() + 0.5*drawObject->height() ); 
-     TQString rot = TQString("rotate (%1) translate (%2cm %3cm)").tqarg(rotAngle).tqarg(xMid).tqarg(yMid); 
+     TQString rot = TQString("rotate (%1) translate (%2cm %3cm)").arg(rotAngle).arg(xMid).arg(yMid); 
      xmlWriter->addAttribute( "draw:transform", rot );   
     }
-    if (drawObject->tqshape() == DrawObject::RightTriangle)
+    if (drawObject->shape() == DrawObject::RightTriangle)
     {
     xmlWriter->addAttribute( "draw:type", "right-triangle");
     }
-    else if (drawObject->tqshape() == DrawObject::IsoscelesTriangle)
+    else if (drawObject->shape() == DrawObject::IsoscelesTriangle)
     {    
     xmlWriter->addAttribute( "draw:type", "isosceles-triangle");
           xmlWriter->startElement( "draw:equation" );
@@ -637,21 +637,21 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
           xmlWriter->endElement();    
     }
    
-    xmlWriter->endElement();    // enhanced-tqgeometry  
-  xmlWriter->endElement(); // custom-tqshape
+    xmlWriter->endElement();    // enhanced-geometry  
+  xmlWriter->endElement(); // custom-shape
 }
 
 void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -675,7 +675,7 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 10 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
         if ( drawObject->hasProperty("draw:mirror-vertical") ) 
         { 
           xmlWriter->addAttribute("draw:mirror-vertical","true");         
@@ -718,21 +718,21 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm
     xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
       xmlWriter->addAttribute("draw:handle-position","$0 bottom");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape  
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape  
 }
 
 void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );  
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -763,7 +763,7 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter
   xmlWriter->addAttribute( "svg:x", 1.25 );
   xmlWriter->addAttribute( "svg:y", 5 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
         if  (drawObject->hasProperty("draw:mirror-vertical"))
         { 
           xmlWriter->addAttribute("draw:mirror-vertical","true");         
@@ -834,21 +834,21 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter
     xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
       xmlWriter->addAttribute("draw:handle-position","$0 top");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape  
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape  
 }
 
 void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-    xmlWriter->startElement( "draw:custom-tqshape" );
+    xmlWriter->startElement( "draw:custom-shape" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
     xmlWriter->addAttribute( "svg:width", widthStr );
     xmlWriter->addAttribute( "svg:height", heightStr );
@@ -871,7 +871,7 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW
   xmlWriter->addAttribute( "svg:x", 10 );
   xmlWriter->addAttribute( "svg:y", 5 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
   xmlWriter->addAttribute( "draw:type", "hexagon" );
           xmlWriter->startElement( "draw:equation" );
           xmlWriter->addAttribute( "draw:formula", "$0 " );
@@ -898,21 +898,21 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
       xmlWriter->addAttribute("draw:handle-position","$0 top");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape
 }
 
 void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -935,7 +935,7 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW
   xmlWriter->addAttribute( "svg:x", 10 );
   xmlWriter->addAttribute( "svg:y", 4.782 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
   xmlWriter->addAttribute( "draw:type", "octagon" );
           xmlWriter->startElement( "draw:equation" );
           xmlWriter->addAttribute( "draw:formula", "left+$0 " );
@@ -978,36 +978,36 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
       xmlWriter->addAttribute("draw:handle-position","$0 top");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape  
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape  
 }
 
 void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
   xmlWriter->addAttribute( "draw:layer", "tqlayout" );
-    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+    xmlWriter->startElement( "draw:enhanced-geometry" );
     
-                if (drawObject->tqshape() == DrawObject::RightArrow)
+                if (drawObject->shape() == DrawObject::RightArrow)
                 xmlWriter->addAttribute( "draw:type", "right-arrow" );
-      else if (drawObject->tqshape() == DrawObject::LeftArrow)
+      else if (drawObject->shape() == DrawObject::LeftArrow)
       xmlWriter->addAttribute( "draw:type", "left-arrow" );
-    else if (drawObject->tqshape() == DrawObject::UpArrow)
+    else if (drawObject->shape() == DrawObject::UpArrow)
       xmlWriter->addAttribute( "draw:type", "up-arrow" );
-    else if (drawObject->tqshape() == DrawObject::DownArrow)
+    else if (drawObject->shape() == DrawObject::DownArrow)
       xmlWriter->addAttribute( "draw:type", "down-arrow" );   
     xmlWriter->startElement( "draw:equation" ); 
                 xmlWriter->addAttribute( "draw:formula","$1");  
@@ -1042,7 +1042,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
     xmlWriter->addAttribute( "draw:name","f7");  
                 xmlWriter->endElement(); // draw:equation
     xmlWriter->startElement( "draw:handle" );
-                if ( drawObject->tqshape() == DrawObject::RightArrow | drawObject->tqshape() == DrawObject::LeftArrow ) 
+                if ( drawObject->shape() == DrawObject::RightArrow | drawObject->shape() == DrawObject::LeftArrow ) 
                 {
       xmlWriter->addAttribute( "draw:handle-range-x-maximum", 21600);  
       xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
@@ -1050,7 +1050,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
       xmlWriter->addAttribute("draw:handle-range-y-maximum",10800);
       xmlWriter->addAttribute("draw:handle-range-y-minimum",0);
     }
-    else if ( drawObject->tqshape() == DrawObject::UpArrow | drawObject->tqshape() == DrawObject::DownArrow )
+    else if ( drawObject->shape() == DrawObject::UpArrow | drawObject->shape() == DrawObject::DownArrow )
                 {
                   xmlWriter->addAttribute( "draw:handle-range-x-maximum", 10800);  
       xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
@@ -1059,19 +1059,19 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
       xmlWriter->addAttribute("draw:handle-range-y-minimum",0);            
     }
                 xmlWriter->endElement(); // draw:handle
-      xmlWriter->endElement(); // draw:enhanced-tqgeometry  
-    xmlWriter->endElement(); // draw:custom-tqshape
+      xmlWriter->endElement(); // draw:enhanced-geometry  
+    xmlWriter->endElement(); // draw:custom-shape
 }
 
 void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter) return;
 
-  TQString x1Str = TQString("%1mm").tqarg( drawObject->left() );
-  TQString y1Str = TQString("%1mm").tqarg( drawObject->top() );
-  TQString x2Str = TQString("%1mm").tqarg( drawObject->left() + drawObject->width() );
-  TQString y2Str = TQString("%1mm").tqarg( drawObject->top() + drawObject->height() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString x1Str = TQString("%1mm").arg( drawObject->left() );
+  TQString y1Str = TQString("%1mm").arg( drawObject->top() );
+  TQString x2Str = TQString("%1mm").arg( drawObject->left() + drawObject->width() );
+  TQString y2Str = TQString("%1mm").arg( drawObject->top() + drawObject->height() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   if ( drawObject->hasProperty("draw:mirror-vertical") )
     { TQString temp = y1Str; 
@@ -1099,13 +1099,13 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
 {
   if( !drawObject ||!xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-    xmlWriter->startElement( "draw:custom-tqshape" );
+    xmlWriter->startElement( "draw:custom-shape" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
     xmlWriter->addAttribute( "svg:width", widthStr );
     xmlWriter->addAttribute( "svg:height", heightStr );
@@ -1136,7 +1136,7 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
   xmlWriter->addAttribute( "svg:x", 8.536 );
   xmlWriter->addAttribute( "svg:y", 1.461 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
   xmlWriter->addAttribute( "draw:type", "smiley" );
           xmlWriter->startElement( "draw:equation" );
           xmlWriter->addAttribute( "draw:formula", "$0-15510 " );
@@ -1156,21 +1156,21 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
     xmlWriter->addAttribute( "draw:handle-range-y-minimum", 15510);
       xmlWriter->addAttribute("draw:handle-position","$0 top");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape
 }
 
 void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-    xmlWriter->startElement( "draw:custom-tqshape" );
+    xmlWriter->startElement( "draw:custom-shape" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
     xmlWriter->addAttribute( "svg:width", widthStr );
     xmlWriter->addAttribute( "svg:height", heightStr );
@@ -1193,22 +1193,22 @@ void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWri
   xmlWriter->addAttribute( "svg:x", 8.553 );
   xmlWriter->addAttribute( "svg:y", 5 );
   xmlWriter->endElement();
-  xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+  xmlWriter->startElement( "draw:enhanced-geometry" );
   xmlWriter->addAttribute( "draw:type", "heart" );
         
-        xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape
+        xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape
 }
 
 void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xmlWriter)
 {
   if( !drawObject ||!xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
     xmlWriter->startElement( "draw:path" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
@@ -1228,63 +1228,63 @@ void PowerPointImport::processDrawingObjectForBody( DrawObject* drawObject, KoXm
   drawingObjectCounter++;
   
    
-  if (drawObject->tqshape() == DrawObject::Ellipse)
+  if (drawObject->shape() == DrawObject::Ellipse)
   { 
     processEllipse (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::Rectangle)
+  else if (drawObject->shape() == DrawObject::Rectangle)
   { 
     processRectangle (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::RoundRectangle)
+  else if (drawObject->shape() == DrawObject::RoundRectangle)
   { 
     processRoundRectangle (drawObject, xmlWriter );
   }
-  else  if (drawObject->tqshape() == DrawObject::Diamond)
+  else  if (drawObject->shape() == DrawObject::Diamond)
   {  
     processDiamond (drawObject, xmlWriter ); 
   } 
-  else  if (drawObject->tqshape() == DrawObject::IsoscelesTriangle |                
-            drawObject->tqshape() == DrawObject::RightTriangle)
+  else  if (drawObject->shape() == DrawObject::IsoscelesTriangle |                
+            drawObject->shape() == DrawObject::RightTriangle)
   {  
     processTriangle (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::Trapezoid)
+  else if (drawObject->shape() == DrawObject::Trapezoid)
   {  
     processTrapezoid (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::Parallelogram)
+  else if (drawObject->shape() == DrawObject::Parallelogram)
   {  
     processParallelogram( drawObject, xmlWriter); 
   }
-  else if (drawObject->tqshape() == DrawObject::Hexagon)
+  else if (drawObject->shape() == DrawObject::Hexagon)
   {  
     processHexagon ( drawObject, xmlWriter );
   }
-  else if (drawObject->tqshape() == DrawObject::Octagon)
+  else if (drawObject->shape() == DrawObject::Octagon)
   {  
     processOctagon ( drawObject, xmlWriter );
   }
-  else if (drawObject->tqshape() == DrawObject::RightArrow | 
-     drawObject->tqshape() == DrawObject::LeftArrow | 
-     drawObject->tqshape() == DrawObject::UpArrow | 
-     drawObject->tqshape() == DrawObject::DownArrow )
+  else if (drawObject->shape() == DrawObject::RightArrow | 
+     drawObject->shape() == DrawObject::LeftArrow | 
+     drawObject->shape() == DrawObject::UpArrow | 
+     drawObject->shape() == DrawObject::DownArrow )
   { 
     processArrow ( drawObject, xmlWriter );
   }
-  else if (drawObject->tqshape() == DrawObject::Line)
+  else if (drawObject->shape() == DrawObject::Line)
   {  
     processLine ( drawObject, xmlWriter );
   }
-  else if (drawObject->tqshape() == DrawObject::Smiley)
+  else if (drawObject->shape() == DrawObject::Smiley)
   { 
     processSmiley (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::Heart)
+  else if (drawObject->shape() == DrawObject::Heart)
   { 
     processHeart (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::FreeLine)
+  else if (drawObject->shape() == DrawObject::FreeLine)
   { 
     processFreeLine (drawObject, xmlWriter ); 
   }
@@ -1317,10 +1317,10 @@ void PowerPointImport::processTextObjectForBody( TextObject* textObject, KoXmlWr
 //  TQString pStr = string( textObject->text() ).string();
   TQString pStr;
  
-  TQString widthStr = TQString("%1mm").tqarg( textObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( textObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( textObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( textObject->top() );
+  TQString widthStr = TQString("%1mm").arg( textObject->width() );
+  TQString heightStr = TQString("%1mm").arg( textObject->height() );
+  TQString xStr = TQString("%1mm").arg( textObject->left() );
+  TQString yStr = TQString("%1mm").arg( textObject->top() );
 
   xmlWriter->startElement( "draw:frame" );
   xmlWriter->addAttribute( "presentation:style-name", "pr1" );
@@ -1381,9 +1381,9 @@ void PowerPointImport::processSlideForBody( unsigned slideNo, Slide* slide, KoXm
 
   TQString nameStr = Libppt::string( slide->title() ).string();
   if( nameStr.isEmpty() )
-    nameStr = TQString("page%1").tqarg(slideNo+1);
+    nameStr = TQString("page%1").arg(slideNo+1);
 
-  TQString styleNameStr = TQString("dp%1").tqarg(slideNo+1);
+  TQString styleNameStr = TQString("dp%1").arg(slideNo+1);
 
   xmlWriter->startElement( "draw:page" );
   xmlWriter->addAttribute( "draw:master-page-name", "Default" );
@@ -1450,7 +1450,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
   if( !drawObject || !xmlWriter) return;
 
   drawingObjectCounter++;
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:name", styleName );
@@ -1490,7 +1490,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
     if( drawObject->hasProperty( "svg:stroke-width" ) )
     {
       double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" );
-      xmlWriter->addAttribute( "svg:stroke-width",TQString("%1mm").tqarg( strokeWidth ) );
+      xmlWriter->addAttribute( "svg:stroke-width",TQString("%1mm").arg( strokeWidth ) );
     }
 
     if( drawObject->hasProperty( "svg:stroke-color" ) )
@@ -1528,14 +1528,14 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
     {      
       double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" );
       double arrowWidth = (drawObject->getDoubleProperty("draw:marker-start-width") * strokeWidth);
-      xmlWriter->addAttribute( "draw:marker-start-width",TQString("%1cm").tqarg( arrowWidth ) );
+      xmlWriter->addAttribute( "draw:marker-start-width",TQString("%1cm").arg( arrowWidth ) );
     }
 
     if( drawObject->hasProperty( "draw:marker-end-width" ) )
     {
       double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" );
       double arrowWidth = (drawObject->getDoubleProperty("draw:marker-end-width") * strokeWidth);
-      xmlWriter->addAttribute( "draw:marker-end-width",TQString("%1cm").tqarg( arrowWidth ) );
+      xmlWriter->addAttribute( "draw:marker-end-width",TQString("%1cm").arg( arrowWidth ) );
     }
 
     
@@ -1569,19 +1569,19 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
     if( drawObject->hasProperty( "draw:shadow-opacity" ) )
     {      
       double opacity = drawObject->getDoubleProperty("draw:shadow-opacity") ;
-      xmlWriter->addAttribute( "draw:shadow-opacity",TQString("%1%").tqarg( opacity ) );
+      xmlWriter->addAttribute( "draw:shadow-opacity",TQString("%1%").arg( opacity ) );
     }
 
     if( drawObject->hasProperty( "draw:shadow-offset-x" ) )
     {      
       double offset = drawObject->getDoubleProperty("draw:shadow-offset-x") ;
-      xmlWriter->addAttribute( "draw:shadow-offset-x",TQString("%1cm").tqarg( offset ) );
+      xmlWriter->addAttribute( "draw:shadow-offset-x",TQString("%1cm").arg( offset ) );
     }
 
     if( drawObject->hasProperty( "draw:shadow-offset-y" ) )
     {      
       double offset = drawObject->getDoubleProperty("draw:shadow-offset-y"); 
-      xmlWriter->addAttribute( "draw:shadow-offset-y",TQString("%1cm").tqarg( offset ) );
+      xmlWriter->addAttribute( "draw:shadow-offset-y",TQString("%1cm").arg( offset ) );
     }
     
    
diff --git a/filters/kpresenter/powerpoint/libppt/objects.cpp b/filters/kpresenter/powerpoint/libppt/objects.cpp
index d0343b43..29870cbd 100644
--- a/filters/kpresenter/powerpoint/libppt/objects.cpp
+++ b/filters/kpresenter/powerpoint/libppt/objects.cpp
@@ -379,7 +379,7 @@ void GroupObject::takeObject( Object* object )
 class DrawObject::Private
 {
 public:
-  unsigned tqshape;
+  unsigned shape;
   bool isVerFlip; 
   bool isHorFlip;
 };
@@ -387,7 +387,7 @@ public:
 DrawObject::DrawObject()
 {
   d = new Private;
-  d->tqshape = None;
+  d->shape = None;
 }
 
 DrawObject::~DrawObject()
@@ -395,14 +395,14 @@ DrawObject::~DrawObject()
   delete d;
 }
 
-unsigned DrawObject::tqshape() const
+unsigned DrawObject::shape() const
 {
-  return d->tqshape;
+  return d->shape;
 }
 
 void DrawObject::setShape( unsigned s )
 {
-  d->tqshape = s;
+  d->shape = s;
 }
 
 bool DrawObject::isVerFlip() const
diff --git a/filters/kpresenter/powerpoint/libppt/objects.h b/filters/kpresenter/powerpoint/libppt/objects.h
index a9160897..823e2a75 100644
--- a/filters/kpresenter/powerpoint/libppt/objects.h
+++ b/filters/kpresenter/powerpoint/libppt/objects.h
@@ -103,7 +103,7 @@ public:
     Body        = 1, 
     Notes       = 2, 
     NotUsed     = 3,
-    Other       = 4,  // text in a tqshape
+    Other       = 4,  // text in a shape
     CenterBody  = 5,  // subtitle in title slide
     CenterTitle = 6,  // title in title slide
     HalfBody    = 7,  // body in two-column slide
@@ -184,7 +184,7 @@ public:
   virtual ~DrawObject();
   virtual bool isDrawing() const { return true; }
    
-  unsigned tqshape() const;
+  unsigned shape() const;
   void setShape( unsigned s );
 
   bool isVerFlip() const;
diff --git a/filters/kpresenter/powerpoint/libppt/pole.cpp b/filters/kpresenter/powerpoint/libppt/pole.cpp
index b905539d..abfa9385 100644
--- a/filters/kpresenter/powerpoint/libppt/pole.cpp
+++ b/filters/kpresenter/powerpoint/libppt/pole.cpp
@@ -115,7 +115,7 @@ class DirTree
     int indexOf( DirEntry* e );
     int parent( unsigned index );
     std::string fullName( unsigned index );
-    std::vector<unsigned> tqchildren( unsigned index );
+    std::vector<unsigned> children( unsigned index );
     void load( unsigned char* buffer, unsigned len );
     void save( unsigned char* buffer );
     unsigned size();
@@ -505,11 +505,11 @@ int DirTree::indexOf( DirEntry* e )
 
 int DirTree::parent( unsigned index )
 {
-  // brute-force, basically we iterate for each entries, find its tqchildren
-  // and check if one of the tqchildren is 'index'
+  // brute-force, basically we iterate for each entries, find its children
+  // and check if one of the children is 'index'
   for( unsigned j=0; j<entryCount(); j++ )
   {
-    std::vector<unsigned> chi = tqchildren( j );
+    std::vector<unsigned> chi = children( j );
     for( unsigned i=0; i<chi.size();i++ )
       if( chi[i] == index )
         return j;
@@ -573,8 +573,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
 
    for( it = names.begin(); it != names.end(); ++it )
    {
-     // find among the tqchildren of index
-     std::vector<unsigned> chi = tqchildren( index );
+     // find among the children of index
+     std::vector<unsigned> chi = children( index );
      unsigned child = 0;
      for( unsigned i = 0; i < chi.size(); i++ )
      {
@@ -589,7 +589,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
      if( child > 0 ) index = child;
      else
      {
-       // not found among tqchildren
+       // not found among children
        if( !create ) return (DirEntry*)0;
        
        // create a new entry
@@ -646,7 +646,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector<unsigned>& result,
   }
 }
 
-std::vector<unsigned> DirTree::tqchildren( unsigned index )
+std::vector<unsigned> DirTree::children( unsigned index )
 {
   std::vector<unsigned> result;
   
@@ -1249,9 +1249,9 @@ std::list<std::string> Storage::entries( const std::string& path )
   if( e  && e->dir )
   {
     unsigned parent = dt->indexOf( e );
-    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
-    for( unsigned i = 0; i < tqchildren.size(); i++ )
-      result.push_back( dt->entry( tqchildren[i] )->name );
+    std::vector<unsigned> children = dt->children( parent );
+    for( unsigned i = 0; i < children.size(); i++ )
+      result.push_back( dt->entry( children[i] )->name );
   }
   
   return result;
diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
index bf3fc51f..af035c69 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
@@ -4105,7 +4105,7 @@ const unsigned int msofbtSpAtom::id = 61450; /* F00A */
 class msofbtSpAtom::Private
 {
 public:
-  unsigned long tqshapeId;
+  unsigned long shapeId;
   unsigned long persistentFlag;
   bool background;
   bool hFlip; 
@@ -4115,7 +4115,7 @@ public:
 msofbtSpAtom ::msofbtSpAtom ()
 {
   d = new Private;
-  d->tqshapeId = 0;
+  d->shapeId = 0;
   d->persistentFlag = 0;
   d->background = false;
   d->hFlip = false; 
@@ -4127,17 +4127,17 @@ msofbtSpAtom ::~msofbtSpAtom ()
   delete d;
 }
 
-unsigned long msofbtSpAtom::tqshapeId() const
+unsigned long msofbtSpAtom::shapeId() const
 {
-  return d->tqshapeId;
+  return d->shapeId;
 }
 
 void msofbtSpAtom::setShapeId( unsigned long id )
 {
-  d->tqshapeId = id;
+  d->shapeId = id;
 }
 
-const char* msofbtSpAtom::tqshapeTypeAsString() const
+const char* msofbtSpAtom::shapeTypeAsString() const
 {
   switch( instance() )
   {
@@ -5821,7 +5821,7 @@ void PPTReader::handleEscherGroupAtom( msofbtSpgrAtom* atom )
 
   // set rect bound of current group
 
-  // this is tqshape for the group, no need to 
+  // this is shape for the group, no need to 
   d->isShapeGroup = true;
 }
 
diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.h b/filters/kpresenter/powerpoint/libppt/powerpoint.h
index 6eec1564..b2a0f649 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.h
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.h
@@ -1901,9 +1901,9 @@ public:
   msofbtSpAtom ();
   ~msofbtSpAtom ();
 
-  unsigned long tqshapeId() const;
+  unsigned long shapeId() const;
   void setShapeId( unsigned long id );
-  const char* tqshapeTypeAsString() const;
+  const char* shapeTypeAsString() const;
   unsigned long persistentFlag() const;
   void setPersistentFlag( unsigned long persistentFlag );
 
@@ -1957,10 +1957,10 @@ public:
    FillSolid,             // Fill with a solid color
    FillPattern,           // Fill with a pattern (bitmap)
    FillTexture,           // A texture (pattern with its own color map)
-   FillPicture,           // Center a picture in the tqshape
+   FillPicture,           // Center a picture in the shape
    FillShade,             // Shade from start to end points
    FillShadeCenter,       // Shade from bounding rectangle to end point
-   FillShadeShape,        // Shade from tqshape outline to end point
+   FillShadeShape,        // Shade from shape outline to end point
    FillShadeScale,        // Similar to msofillShade, but the fillAngle
    FillShadeTitle,        // special type - shade to title ---  for PP 
    FillBackground         // Use the background fill color/pattern
@@ -2385,9 +2385,9 @@ public:
   int ruid() const; // rule ID
   void setRuid( int ruid );
   int align() const;
-  void setAlign( int align );// tqalignment
+  void setAlign( int align );// alignment
   int cProxies() const;
-  void setCProxies( int cProxies );// number of tqshapes governed by rule
+  void setCProxies( int cProxies );// number of shapes governed by rule
     
   void setData( unsigned size, const unsigned char* data );
   const char* name(){ return "msofbtAlignRuleAtom "; }