TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

9 files changed, 360 insertions, 359 deletions

diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc
index 761e4f0d..6afdc659 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.cc
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc
@@ -26,11 +26,11 @@
 #include <powerpointimport.h>
 #include <powerpointimport.moc>
 
-#include <qbuffer.h>
-#include <qcstring.h>
-#include <qfile.h>
-#include <qstring.h>
-#include <qtextstream.h>
+#include <tqbuffer.h>
+#include <tqcstring.h>
+#include <tqfile.h>
+#include <tqstring.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -52,9 +52,9 @@ K_EXPORT_COMPONENT_FACTORY( libpowerpointimport,
 
 namespace Libppt {
 
-inline QConstString string( const Libppt::UString& str ) 
+inline TQConstString string( const Libppt::UString& str ) 
 {
-   return QConstString( reinterpret_cast<const QChar*>( str.data() ), str.length() );
+   return TQConstString( reinterpret_cast<const TQChar*>( str.data() ), str.length() );
 }
 
 }
@@ -62,14 +62,14 @@ inline QConstString string( const Libppt::UString& str )
 class PowerPointImport::Private
 {
 public:
-  QString inputFile;
-  QString outputFile;
+  TQString inputFile;
+  TQString outputFile;
 
   Presentation *presentation;  
 };
 
 
-PowerPointImport::PowerPointImport ( QObject*, const char*, const QStringList& )
+PowerPointImport::PowerPointImport ( TQObject*, const char*, const TQStringList& )
     : KoFilter()
 {
   d = new Private;
@@ -80,7 +80,7 @@ PowerPointImport::~PowerPointImport()
   delete d;
 }
 
-KoFilter::ConversionStatus PowerPointImport::convert( const QCString& from, const QCString& to )
+KoFilter::ConversiontqStatus PowerPointImport::convert( const TQCString& from, const TQCString& to )
 {
   if ( from != "application/mspowerpoint" )
     return KoFilter::NotImplemented; 
@@ -143,21 +143,21 @@ KoFilter::ConversionStatus PowerPointImport::convert( const QCString& from, cons
   // we are done!
   delete d->presentation;
   delete storeout;
-  d->inputFile = QString::null;
-  d->outputFile = QString::null;
+  d->inputFile = TQString();
+  d->outputFile = TQString();
   d->presentation = 0;
 
   return KoFilter::OK;
 }
 
-QByteArray PowerPointImport::createStyles()
+TQByteArray PowerPointImport::createStyles()
 {
   KoXmlWriter* stylesWriter;
-  QByteArray stylesData;
-  QBuffer stylesBuffer( stylesData );
+  TQByteArray stylesData;
+  TQBuffer stylesBuffer( stylesData );
 
-  QString pageWidth = QString("%1pt").arg( d->presentation->masterSlide()->pageWidth() );
-  QString pageHeight = QString("%1pt").arg( d->presentation->masterSlide()->pageHeight() );
+  TQString pageWidth = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageWidth() );
+  TQString pageHeight = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageHeight() );
   
   stylesBuffer.open( IO_WriteOnly );
   stylesWriter = new KoXmlWriter( &stylesBuffer );
@@ -178,10 +178,10 @@ QByteArray PowerPointImport::createStyles()
 
   // office:automatic-styles
   stylesWriter->startElement( "office:automatic-styles" );
-  stylesWriter->startElement( "style:page-layout" );
+  stylesWriter->startElement( "style:page-tqlayout" );
   stylesWriter->addAttribute( "style:name","pm1" );
   stylesWriter->addAttribute( "style:page-usage","all" );
-  stylesWriter->startElement( "style:page-layout-properties" );
+  stylesWriter->startElement( "style:page-tqlayout-properties" );
   stylesWriter->addAttribute( "fo:margin-bottom","0pt" ); 
   stylesWriter->addAttribute( "fo:margin-left","0pt" );   
   stylesWriter->addAttribute( "fo:margin-right","0pt" );  
@@ -189,8 +189,8 @@ QByteArray PowerPointImport::createStyles()
   stylesWriter->addAttribute( "fo:page-height", pageHeight );
   stylesWriter->addAttribute( "fo:page-width", pageWidth );
   stylesWriter->addAttribute( "style:print-orientation","landscape" );
-  stylesWriter->endElement(); // style:page-layout-properties
-  stylesWriter->endElement(); // style:page-layout
+  stylesWriter->endElement(); // style:page-tqlayout-properties
+  stylesWriter->endElement(); // style:page-tqlayout
 
   stylesWriter->startElement( "style:style" );
   stylesWriter->addAttribute( "style:name","dp1" );
@@ -237,7 +237,7 @@ QByteArray PowerPointImport::createStyles()
   stylesWriter->startElement( "office:master-styles" );
   stylesWriter->startElement( "style:master-page" );
   stylesWriter->addAttribute( "style:name", "Standard" );
-  stylesWriter->addAttribute( "style:page-layout-name", "pm1" );
+  stylesWriter->addAttribute( "style:page-tqlayout-name", "pm1" );
   stylesWriter->addAttribute( "draw:style-name", "dp1" );
   stylesWriter->endElement();
   stylesWriter->endElement();
@@ -247,7 +247,7 @@ QByteArray PowerPointImport::createStyles()
   delete stylesWriter;
 
   // for troubleshooting only !!
-  QString dbg;
+  TQString dbg;
   for( unsigned i=0; i<stylesData.size(); i++ )
     dbg.append( stylesData[i] );
   qDebug("\nstyles.xml:\n%s\n", dbg.latin1() );
@@ -256,11 +256,11 @@ QByteArray PowerPointImport::createStyles()
 }
 
 
-QByteArray PowerPointImport::createContent()
+TQByteArray PowerPointImport::createContent()
 {
   KoXmlWriter* contentWriter;
-  QByteArray contentData;
-  QBuffer contentBuffer( contentData );
+  TQByteArray contentData;
+  TQBuffer contentBuffer( contentData );
 
   contentBuffer.open( IO_WriteOnly );
   contentWriter = new KoXmlWriter( &contentBuffer );
@@ -308,7 +308,7 @@ QByteArray PowerPointImport::createContent()
   delete contentWriter;
 
   // for troubleshooting only !!
-  QString dbg;
+  TQString dbg;
   for( unsigned i=0; i<contentData.size(); i++ )
     dbg.append( contentData[i] );
   qDebug("\ncontent.xml:\n%s\n", dbg.latin1() );
@@ -316,11 +316,11 @@ QByteArray PowerPointImport::createContent()
   return contentData;
 }
 
-QByteArray PowerPointImport::createManifest()
+TQByteArray PowerPointImport::createManifest()
 {
   KoXmlWriter* manifestWriter;
-  QByteArray manifestData;
-  QBuffer manifestBuffer( manifestData );
+  TQByteArray manifestData;
+  TQBuffer manifestBuffer( manifestData );
 
   manifestBuffer.open( IO_WriteOnly );
   manifestWriter = new KoXmlWriter( &manifestBuffer );
@@ -339,7 +339,7 @@ QByteArray PowerPointImport::createManifest()
   delete manifestWriter;
 
   // for troubleshooting only !!
-  QString dbg;
+  TQString dbg;
   for( unsigned i=0; i<manifestData.size(); i++ )
     dbg.append( manifestData[i] );
   qDebug("\nmanifest.xml:\n%s\n", dbg.latin1() );
@@ -351,11 +351,11 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW
 {
   if( !drawObject || !xmlWriter ) return;
 
-  QString widthStr = QString("%1mm").arg( drawObject->width() );
-  QString heightStr = QString("%1mm").arg( drawObject->height() );
-  QString xStr = QString("%1mm").arg( drawObject->left() );
-  QString yStr = QString("%1mm").arg( drawObject->top() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
   xmlWriter->startElement( "draw:ellipse" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
@@ -363,7 +363,7 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->endElement(); // draw:ellipse
 }
 
@@ -372,11 +372,11 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
   if( !drawObject ) return;
   if( !xmlWriter ) return;
 
-  QString widthStr = QString("%1mm").arg( drawObject->width() );
-  QString heightStr = QString("%1mm").arg( drawObject->height() );
-  QString xStr = QString("%1mm").arg( drawObject->left() );
-  QString yStr = QString("%1mm").arg( drawObject->top() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
   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); 
-     QString rot = QString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); 
+     TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); 
      xmlWriter->addAttribute( "draw:transform", rot );        
   }
   else 
@@ -401,7 +401,7 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
   }
-  xmlWriter->addAttribute( "draw:layer", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->endElement(); // draw:rect
 }
 
@@ -409,13 +409,13 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
 {
   if( !drawObject || !xmlWriter ) return;
 
-  QString widthStr = QString("%1mm").arg( drawObject->width() );
-  QString heightStr = QString("%1mm").arg( drawObject->height() );
-  QString xStr = QString("%1mm").arg( drawObject->left() );
-  QString yStr = QString("%1mm").arg( drawObject->top() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   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); 
-        QString rot = QString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid+yNew); 
+        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(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); 
-        QString rot = QString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); 
+        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); 
         xmlWriter->addAttribute( "draw:transform", rot );                
      } 
      
@@ -463,8 +463,8 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
  // xmlWriter->addAttribute( "svg:x", xStr );
  // xmlWriter->addAttribute( "svg:y", yStr );
   
-  xmlWriter->addAttribute( "draw:layer", "layout" );
-    xmlWriter->startElement( "draw:enhanced-geometry" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
     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-geometry
-  xmlWriter->endElement(); // draw:custom-shape
+    xmlWriter->endElement(); // draw:enhanced-tqgeometry
+  xmlWriter->endElement(); // draw:custom-tqshape
 }
 
 void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  QString widthStr = QString("%1mm").arg( drawObject->width() );
-  QString heightStr = QString("%1mm").arg( drawObject->height() );
-  QString xStr = QString("%1mm").arg( drawObject->left() );
-  QString yStr = QString("%1mm").arg( drawObject->top() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -522,10 +522,10 @@ void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->addAttribute( "svg:x", 10 );
     xmlWriter->addAttribute( "svg:y", 5 );
     xmlWriter->endElement();
-    xmlWriter->startElement( "draw:enhanced-geometry" );
+    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
     xmlWriter->addAttribute( "draw:type", "diamond");
     xmlWriter->endElement();    
-  xmlWriter->addAttribute( "draw:layer", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->endElement(); 
 }
 
@@ -533,20 +533,20 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
 {
   if( !drawObject || !xmlWriter ) return;
 
-  QString widthStr = QString("%1mm").arg( drawObject->width() );
-  QString heightStr = QString("%1mm").arg( drawObject->height() );
-  QString xStr = QString("%1mm").arg( drawObject->left() );
-  QString yStr = QString("%1mm").arg( drawObject->top() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
   /* draw IsocelesTriangle or RightTriangle */
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   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", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
     xmlWriter->startElement( "draw:glue-point" );
     xmlWriter->addAttribute( "svg:x", 5 );
     xmlWriter->addAttribute( "svg:y", 0 );
@@ -572,7 +572,7 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
     xmlWriter->addAttribute( "svg:y", 5 );
     xmlWriter->endElement();
 
-    xmlWriter->startElement( "draw:enhanced-geometry" );
+    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
        
     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() ); 
-     QString rot = QString("rotate (%1) translate (%2cm %3cm)").arg(rotAngle).arg(xMid).arg(yMid); 
+     TQString rot = TQString("rotate (%1) translate (%2cm %3cm)").tqarg(rotAngle).tqarg(xMid).tqarg(yMid); 
      xmlWriter->addAttribute( "draw:transform", rot );   
     }
-    if (drawObject->shape() == DrawObject::RightTriangle)
+    if (drawObject->tqshape() == DrawObject::RightTriangle)
     {
     xmlWriter->addAttribute( "draw:type", "right-triangle");
     }
-    else if (drawObject->shape() == DrawObject::IsoscelesTriangle)
+    else if (drawObject->tqshape() == DrawObject::IsoscelesTriangle)
     {    
     xmlWriter->addAttribute( "draw:type", "isosceles-triangle");
           xmlWriter->startElement( "draw:equation" );
@@ -637,27 +637,27 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
           xmlWriter->endElement();    
     }
    
-    xmlWriter->endElement();    // enhanced-geometry  
-  xmlWriter->endElement(); // custom-shape
+    xmlWriter->endElement();    // enhanced-tqgeometry  
+  xmlWriter->endElement(); // custom-tqshape
 }
 
 void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  QString widthStr = QString("%1mm").arg( drawObject->width() );
-  QString heightStr = QString("%1mm").arg( drawObject->height() );
-  QString xStr = QString("%1mm").arg( drawObject->left() );
-  QString yStr = QString("%1mm").arg( drawObject->top() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   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", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   
         xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
@@ -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-geometry" );
+        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
         if ( drawObject->hasProperty("draw:mirror-vertical") ) 
         { 
           xmlWriter->addAttribute("draw:mirror-vertical","true");         
@@ -718,27 +718,27 @@ 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-geometry
-    xmlWriter->endElement(); // custom-shape  
+  xmlWriter->endElement(); // enhanced-tqgeometry
+    xmlWriter->endElement(); // custom-tqshape  
 }
 
 void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  QString widthStr = QString("%1mm").arg( drawObject->width() );
-  QString heightStr = QString("%1mm").arg( drawObject->height() );
-  QString xStr = QString("%1mm").arg( drawObject->left() );
-  QString yStr = QString("%1mm").arg( drawObject->top() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   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", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
         xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 6.25 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -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-geometry" );
+        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
         if  (drawObject->hasProperty("draw:mirror-vertical"))
         { 
           xmlWriter->addAttribute("draw:mirror-vertical","true");         
@@ -834,27 +834,27 @@ 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-geometry
-    xmlWriter->endElement(); // custom-shape  
+  xmlWriter->endElement(); // enhanced-tqgeometry
+    xmlWriter->endElement(); // custom-tqshape  
 }
 
 void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  QString widthStr = QString("%1mm").arg( drawObject->width() );
-  QString heightStr = QString("%1mm").arg( drawObject->height() );
-  QString xStr = QString("%1mm").arg( drawObject->left() );
-  QString yStr = QString("%1mm").arg( drawObject->top() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
-    xmlWriter->startElement( "draw:custom-shape" );
+    xmlWriter->startElement( "draw:custom-tqshape" );
     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", "layout" );
+    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -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-geometry" );
+        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
   xmlWriter->addAttribute( "draw:type", "hexagon" );
           xmlWriter->startElement( "draw:equation" );
           xmlWriter->addAttribute( "draw:formula", "$0 " );
@@ -898,27 +898,27 @@ 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-geometry
-    xmlWriter->endElement(); // custom-shape
+  xmlWriter->endElement(); // enhanced-tqgeometry
+    xmlWriter->endElement(); // custom-tqshape
 }
 
 void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  QString widthStr = QString("%1mm").arg( drawObject->width() );
-  QString heightStr = QString("%1mm").arg( drawObject->height() );
-  QString xStr = QString("%1mm").arg( drawObject->left() );
-  QString yStr = QString("%1mm").arg( drawObject->top() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   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", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -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-geometry" );
+        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
   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-geometry
-    xmlWriter->endElement(); // custom-shape  
+  xmlWriter->endElement(); // enhanced-tqgeometry
+    xmlWriter->endElement(); // custom-tqshape  
 }
 
 void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  QString widthStr = QString("%1mm").arg( drawObject->width() );
-  QString heightStr = QString("%1mm").arg( drawObject->height() );
-  QString xStr = QString("%1mm").arg( drawObject->left() );
-  QString yStr = QString("%1mm").arg( drawObject->top() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   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", "layout" );
-    xmlWriter->startElement( "draw:enhanced-geometry" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
     
-                if (drawObject->shape() == DrawObject::RightArrow)
+                if (drawObject->tqshape() == DrawObject::RightArrow)
                 xmlWriter->addAttribute( "draw:type", "right-arrow" );
-      else if (drawObject->shape() == DrawObject::LeftArrow)
+      else if (drawObject->tqshape() == DrawObject::LeftArrow)
       xmlWriter->addAttribute( "draw:type", "left-arrow" );
-    else if (drawObject->shape() == DrawObject::UpArrow)
+    else if (drawObject->tqshape() == DrawObject::UpArrow)
       xmlWriter->addAttribute( "draw:type", "up-arrow" );
-    else if (drawObject->shape() == DrawObject::DownArrow)
+    else if (drawObject->tqshape() == 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->shape() == DrawObject::RightArrow | drawObject->shape() == DrawObject::LeftArrow ) 
+                if ( drawObject->tqshape() == DrawObject::RightArrow | drawObject->tqshape() == 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->shape() == DrawObject::UpArrow | drawObject->shape() == DrawObject::DownArrow )
+    else if ( drawObject->tqshape() == DrawObject::UpArrow | drawObject->tqshape() == DrawObject::DownArrow )
                 {
                   xmlWriter->addAttribute( "draw:handle-range-x-maximum", 10800);  
       xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
@@ -1059,27 +1059,27 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
       xmlWriter->addAttribute("draw:handle-range-y-minimum",0);            
     }
                 xmlWriter->endElement(); // draw:handle
-      xmlWriter->endElement(); // draw:enhanced-geometry  
-    xmlWriter->endElement(); // draw:custom-shape
+      xmlWriter->endElement(); // draw:enhanced-tqgeometry  
+    xmlWriter->endElement(); // draw:custom-tqshape
 }
 
 void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter) return;
 
-  QString x1Str = QString("%1mm").arg( drawObject->left() );
-  QString y1Str = QString("%1mm").arg( drawObject->top() );
-  QString x2Str = QString("%1mm").arg( drawObject->left() + drawObject->width() );
-  QString y2Str = QString("%1mm").arg( drawObject->top() + drawObject->height() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
   if ( drawObject->hasProperty("draw:mirror-vertical") )
-    { QString temp = y1Str; 
+    { TQString temp = y1Str; 
       y1Str = y2Str;
       y2Str = temp;
     }
   if ( drawObject->hasProperty("draw:mirror-horizontal") )
-    { QString temp = x1Str;  
+    { TQString temp = x1Str;  
       x1Str = x2Str; 
       x2Str = temp;
     }
@@ -1090,7 +1090,7 @@ void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWrit
   xmlWriter->addAttribute( "svg:y2", y2Str );
   xmlWriter->addAttribute( "svg:x1", x1Str );
   xmlWriter->addAttribute( "svg:x2", x2Str );
-  xmlWriter->addAttribute( "draw:layer", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
  
  xmlWriter->endElement(); 
 }
@@ -1099,19 +1099,19 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
 {
   if( !drawObject ||!xmlWriter ) return;
 
-  QString widthStr = QString("%1mm").arg( drawObject->width() );
-  QString heightStr = QString("%1mm").arg( drawObject->height() );
-  QString xStr = QString("%1mm").arg( drawObject->left() );
-  QString yStr = QString("%1mm").arg( drawObject->top() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
-    xmlWriter->startElement( "draw:custom-shape" );
+    xmlWriter->startElement( "draw:custom-tqshape" );
     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", "layout" );
+    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -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-geometry" );
+        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
   xmlWriter->addAttribute( "draw:type", "smiley" );
           xmlWriter->startElement( "draw:equation" );
           xmlWriter->addAttribute( "draw:formula", "$0-15510 " );
@@ -1156,27 +1156,27 @@ 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-geometry
-    xmlWriter->endElement(); // custom-shape
+  xmlWriter->endElement(); // enhanced-tqgeometry
+    xmlWriter->endElement(); // custom-tqshape
 }
 
 void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  QString widthStr = QString("%1mm").arg( drawObject->width() );
-  QString heightStr = QString("%1mm").arg( drawObject->height() );
-  QString xStr = QString("%1mm").arg( drawObject->left() );
-  QString yStr = QString("%1mm").arg( drawObject->top() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
-    xmlWriter->startElement( "draw:custom-shape" );
+    xmlWriter->startElement( "draw:custom-tqshape" );
     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", "layout" );
+    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 1 );
@@ -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-geometry" );
+  xmlWriter->startElement( "draw:enhanced-tqgeometry" );
   xmlWriter->addAttribute( "draw:type", "heart" );
         
-        xmlWriter->endElement(); // enhanced-geometry
-    xmlWriter->endElement(); // custom-shape
+        xmlWriter->endElement(); // enhanced-tqgeometry
+    xmlWriter->endElement(); // custom-tqshape
 }
 
 void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xmlWriter)
 {
   if( !drawObject ||!xmlWriter ) return;
 
-  QString widthStr = QString("%1mm").arg( drawObject->width() );
-  QString heightStr = QString("%1mm").arg( drawObject->height() );
-  QString xStr = QString("%1mm").arg( drawObject->left() );
-  QString yStr = QString("%1mm").arg( drawObject->top() );
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  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 );
 
     xmlWriter->startElement( "draw:path" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
@@ -1216,7 +1216,7 @@ void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xml
     xmlWriter->addAttribute( "svg:height", heightStr );
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
-    xmlWriter->addAttribute( "draw:layer", "layout" );  
+    xmlWriter->addAttribute( "draw:layer", "tqlayout" );  
     xmlWriter->endElement(); // path
 }
 
@@ -1228,63 +1228,63 @@ void PowerPointImport::processDrawingObjectForBody( DrawObject* drawObject, KoXm
   drawingObjectCounter++;
   
    
-  if (drawObject->shape() == DrawObject::Ellipse)
+  if (drawObject->tqshape() == DrawObject::Ellipse)
   { 
     processEllipse (drawObject, xmlWriter ); 
   }
-  else if (drawObject->shape() == DrawObject::Rectangle)
+  else if (drawObject->tqshape() == DrawObject::Rectangle)
   { 
     processRectangle (drawObject, xmlWriter ); 
   }
-  else if (drawObject->shape() == DrawObject::RoundRectangle)
+  else if (drawObject->tqshape() == DrawObject::RoundRectangle)
   { 
     processRoundRectangle (drawObject, xmlWriter );
   }
-  else  if (drawObject->shape() == DrawObject::Diamond)
+  else  if (drawObject->tqshape() == DrawObject::Diamond)
   {  
     processDiamond (drawObject, xmlWriter ); 
   } 
-  else  if (drawObject->shape() == DrawObject::IsoscelesTriangle |                
-            drawObject->shape() == DrawObject::RightTriangle)
+  else  if (drawObject->tqshape() == DrawObject::IsoscelesTriangle |                
+            drawObject->tqshape() == DrawObject::RightTriangle)
   {  
     processTriangle (drawObject, xmlWriter ); 
   }
-  else if (drawObject->shape() == DrawObject::Trapezoid)
+  else if (drawObject->tqshape() == DrawObject::Trapezoid)
   {  
     processTrapezoid (drawObject, xmlWriter ); 
   }
-  else if (drawObject->shape() == DrawObject::Parallelogram)
+  else if (drawObject->tqshape() == DrawObject::Parallelogram)
   {  
     processParallelogram( drawObject, xmlWriter); 
   }
-  else if (drawObject->shape() == DrawObject::Hexagon)
+  else if (drawObject->tqshape() == DrawObject::Hexagon)
   {  
     processHexagon ( drawObject, xmlWriter );
   }
-  else if (drawObject->shape() == DrawObject::Octagon)
+  else if (drawObject->tqshape() == DrawObject::Octagon)
   {  
     processOctagon ( drawObject, xmlWriter );
   }
-  else if (drawObject->shape() == DrawObject::RightArrow | 
-     drawObject->shape() == DrawObject::LeftArrow | 
-     drawObject->shape() == DrawObject::UpArrow | 
-     drawObject->shape() == DrawObject::DownArrow )
+  else if (drawObject->tqshape() == DrawObject::RightArrow | 
+     drawObject->tqshape() == DrawObject::LeftArrow | 
+     drawObject->tqshape() == DrawObject::UpArrow | 
+     drawObject->tqshape() == DrawObject::DownArrow )
   { 
     processArrow ( drawObject, xmlWriter );
   }
-  else if (drawObject->shape() == DrawObject::Line)
+  else if (drawObject->tqshape() == DrawObject::Line)
   {  
     processLine ( drawObject, xmlWriter );
   }
-  else if (drawObject->shape() == DrawObject::Smiley)
+  else if (drawObject->tqshape() == DrawObject::Smiley)
   { 
     processSmiley (drawObject, xmlWriter ); 
   }
-  else if (drawObject->shape() == DrawObject::Heart)
+  else if (drawObject->tqshape() == DrawObject::Heart)
   { 
     processHeart (drawObject, xmlWriter ); 
   }
-  else if (drawObject->shape() == DrawObject::FreeLine)
+  else if (drawObject->tqshape() == DrawObject::FreeLine)
   { 
     processFreeLine (drawObject, xmlWriter ); 
   }
@@ -1311,20 +1311,20 @@ void PowerPointImport::processTextObjectForBody( TextObject* textObject, KoXmlWr
 {
   if( !textObject || !xmlWriter ) return;
 
-  QString classStr = "subtitle";
+  TQString classStr = "subtitle";
   if( textObject->type() == TextObject::Title )
     classStr = "title";
-//  QString pStr = string( textObject->text() ).string();
-  QString pStr;
+//  TQString pStr = string( textObject->text() ).string();
+  TQString pStr;
  
-  QString widthStr = QString("%1mm").arg( textObject->width() );
-  QString heightStr = QString("%1mm").arg( textObject->height() );
-  QString xStr = QString("%1mm").arg( textObject->left() );
-  QString yStr = QString("%1mm").arg( textObject->top() );
+  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() );
 
   xmlWriter->startElement( "draw:frame" );
   xmlWriter->addAttribute( "presentation:style-name", "pr1" );
-  xmlWriter->addAttribute( "draw:layer", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
@@ -1379,17 +1379,17 @@ void PowerPointImport::processSlideForBody( unsigned slideNo, Slide* slide, KoXm
 {
   if( !slide || !xmlWriter ) return;
 
-  QString nameStr = Libppt::string( slide->title() ).string();
+  TQString nameStr = Libppt::string( slide->title() ).string();
   if( nameStr.isEmpty() )
-    nameStr = QString("page%1").arg(slideNo+1);
+    nameStr = TQString("page%1").tqarg(slideNo+1);
 
-  QString styleNameStr = QString("dp%1").arg(slideNo+1);
+  TQString styleNameStr = TQString("dp%1").tqarg(slideNo+1);
 
   xmlWriter->startElement( "draw:page" );
   xmlWriter->addAttribute( "draw:master-page-name", "Default" );
   xmlWriter->addAttribute( "draw:name", nameStr );
   xmlWriter->addAttribute( "draw:style-name", styleNameStr );
-  xmlWriter->addAttribute( "presentation:presentation-page-layout-name", "AL1T0");
+  xmlWriter->addAttribute( "presentation:presentation-page-tqlayout-name", "AL1T0");
 
   GroupObject* root = slide->rootObject();
   if( root )
@@ -1439,9 +1439,9 @@ void PowerPointImport::processGroupObjectForStyle( GroupObject* groupObject, KoX
   if( !groupObject ||!xmlWriter ) return;
 }
 
-QString hexname( const Color &c )
+TQString hexname( const Color &c )
 {
-  QColor qc( c.red, c.green, c.blue );
+  TQColor qc( c.red, c.green, c.blue );
   return qc.name();
 }
 
@@ -1450,12 +1450,12 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
   if( !drawObject || !xmlWriter) return;
 
   drawingObjectCounter++;
-  QString styleName = QString("gr%1").arg( drawingObjectCounter );
+  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
 
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:name", styleName );
   xmlWriter->addAttribute( "style:family", "graphic" );
-  xmlWriter->addAttribute( "style:parent-style-name", "standard" );
+  xmlWriter->addAttribute( "style:tqparent-style-name", "standard" );
 
     xmlWriter->startElement( "style:graphic-properties" );
 /*
@@ -1463,7 +1463,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
      { 
        xmlWriter->addAttribute( "draw:stroke", "dash" );
        std::string s = drawObject->getStrProperty("draw:stroke-dash");
-       QString ss( s.c_str() );  
+       TQString ss( s.c_str() );  
        xmlWriter->addAttribute( "draw:stroke-dash", ss );  
      } else xmlWriter->addAttribute( "draw:stroke", "dash" );
 */
@@ -1477,7 +1477,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
               {
                 xmlWriter->addAttribute( "draw:stroke", "dash" );
                 std::string s = drawObject->getStrProperty("draw:stroke-dash");
-                QString ss( s.c_str() );  
+                TQString ss( s.c_str() );  
                 xmlWriter->addAttribute( "draw:stroke-dash", ss );  
                 qDebug("=============stroke dash===================");
 // qDebug("test %g\n",angka);
@@ -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",QString("%1mm").arg( strokeWidth ) );
+      xmlWriter->addAttribute( "svg:stroke-width",TQString("%1mm").tqarg( strokeWidth ) );
     }
 
     if( drawObject->hasProperty( "svg:stroke-color" ) )
@@ -1502,25 +1502,25 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
     if( drawObject->hasProperty( "draw:marker-start" ) )
     {
       std::string s = drawObject->getStrProperty("draw:marker-start");
-      QString ss( s.c_str() );
+      TQString ss( s.c_str() );
       xmlWriter->addAttribute( "draw:marker-start", ss ); 
     }
     if( drawObject->hasProperty( "draw:marker-end" ) )
     {
       std::string s = drawObject->getStrProperty("draw:marker-end");
-      QString ss( s.c_str() );
+      TQString ss( s.c_str() );
       xmlWriter->addAttribute( "draw:marker-end", ss);
     }
 /*   if( drawObject->hasProperty( "draw:marker-start-length" ) )
     {
       std::string s = drawObject->getStrProperty("draw:marker-start-length");
-      QString ss( s.c_str() );
+      TQString ss( s.c_str() );
       xmlWriter->addAttribute("draw:marker-start-length", ss );
     }
     if( drawObject->hasProperty( "draw:marker-end-length" ) )
     {
       std::string s = drawObject->getStrProperty("draw:marker-end-length");
-      QString ss( s.c_str() );
+      TQString ss( s.c_str() );
       xmlWriter->addAttribute( "draw:marker-end-length", ss);
     }   */
 
@@ -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",QString("%1cm").arg( arrowWidth ) );
+      xmlWriter->addAttribute( "draw:marker-start-width",TQString("%1cm").tqarg( 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",QString("%1cm").arg( arrowWidth ) );
+      xmlWriter->addAttribute( "draw:marker-end-width",TQString("%1cm").tqarg( arrowWidth ) );
     }
 
     
@@ -1543,7 +1543,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
     if( drawObject->hasProperty( "draw:fill" ) )
     { 
       std::string s = drawObject->getStrProperty("draw:fill");
-      QString ss( s.c_str() );
+      TQString ss( s.c_str() );
       xmlWriter->addAttribute( "draw:fill", ss);
     }
 
@@ -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",QString("%1%").arg( opacity ) );
+      xmlWriter->addAttribute( "draw:shadow-opacity",TQString("%1%").tqarg( opacity ) );
     }
 
     if( drawObject->hasProperty( "draw:shadow-offset-x" ) )
     {      
       double offset = drawObject->getDoubleProperty("draw:shadow-offset-x") ;
-      xmlWriter->addAttribute( "draw:shadow-offset-x",QString("%1cm").arg( offset ) );
+      xmlWriter->addAttribute( "draw:shadow-offset-x",TQString("%1cm").tqarg( offset ) );
     }
 
     if( drawObject->hasProperty( "draw:shadow-offset-y" ) )
     {      
       double offset = drawObject->getDoubleProperty("draw:shadow-offset-y"); 
-      xmlWriter->addAttribute( "draw:shadow-offset-y",QString("%1cm").arg( offset ) );
+      xmlWriter->addAttribute( "draw:shadow-offset-y",TQString("%1cm").tqarg( offset ) );
     }
     
    
diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.h b/filters/kpresenter/powerpoint/import/powerpointimport.h
index 6c6774ab..5c3a73bc 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.h
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.h
@@ -23,7 +23,7 @@
 #include <KoFilter.h>
 #include <KoStore.h>
 
-#include <qcstring.h>
+#include <tqcstring.h>
 
 #include "libppt.h"
 
@@ -34,20 +34,21 @@ class KoXmlWriter;
 class PowerPointImport : public KoFilter 
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-  PowerPointImport ( QObject *parent, const char* name, const QStringList& );
+  PowerPointImport ( TQObject *tqparent, const char* name, const TQStringList& );
   virtual ~PowerPointImport();
-  virtual KoFilter::ConversionStatus convert( const QCString& from, 
-        const QCString& to );
+  virtual KoFilter::ConversiontqStatus convert( const TQCString& from, 
+        const TQCString& to );
 
 private:
   class Private;
   Private* d;
 
-  QByteArray createManifest();
-  QByteArray createStyles();
-  QByteArray createContent();
+  TQByteArray createManifest();
+  TQByteArray createStyles();
+  TQByteArray createContent();
 
   int drawingObjectCounter;
 
diff --git a/filters/kpresenter/powerpoint/libppt/objects.cpp b/filters/kpresenter/powerpoint/libppt/objects.cpp
index 29870cbd..82359d15 100644
--- a/filters/kpresenter/powerpoint/libppt/objects.cpp
+++ b/filters/kpresenter/powerpoint/libppt/objects.cpp
@@ -139,7 +139,7 @@ void Object::setBackground( bool bg )
 bool Object::hasProperty( std::string name )
 {
   std::map<std::string,PropertyValue>::const_iterator i;
-  i = d->properties.find( name );
+  i = d->properties.tqfind( name );
   if( i ==  d->properties.end() )
     return false;
   else
@@ -379,7 +379,7 @@ void GroupObject::takeObject( Object* object )
 class DrawObject::Private
 {
 public:
-  unsigned shape;
+  unsigned tqshape;
   bool isVerFlip; 
   bool isHorFlip;
 };
@@ -387,7 +387,7 @@ public:
 DrawObject::DrawObject()
 {
   d = new Private;
-  d->shape = None;
+  d->tqshape = None;
 }
 
 DrawObject::~DrawObject()
@@ -395,14 +395,14 @@ DrawObject::~DrawObject()
   delete d;
 }
 
-unsigned DrawObject::shape() const
+unsigned DrawObject::tqshape() const
 {
-  return d->shape;
+  return d->tqshape;
 }
 
 void DrawObject::setShape( unsigned s )
 {
-  d->shape = s;
+  d->tqshape = s;
 }
 
 bool DrawObject::isVerFlip() const
diff --git a/filters/kpresenter/powerpoint/libppt/objects.h b/filters/kpresenter/powerpoint/libppt/objects.h
index 823e2a75..a9160897 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 shape
+    Other       = 4,  // text in a tqshape
     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 shape() const;
+  unsigned tqshape() 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 2a78b79f..daab8ff9 100644
--- a/filters/kpresenter/powerpoint/libppt/pole.cpp
+++ b/filters/kpresenter/powerpoint/libppt/pole.cpp
@@ -94,7 +94,7 @@ class DirEntry
 {
   public:
     bool valid;            // false if invalid (should be skipped)
-    std::string name;      // the name, not in unicode anymore 
+    std::string name;      // the name, not in tqunicode anymore 
     bool dir;              // true if directory   
     unsigned long size;    // size (not valid if directory)
     unsigned long start;   // starting block
@@ -113,9 +113,9 @@ class DirTree
     DirEntry* entry( unsigned index );
     DirEntry* entry( const std::string& name, bool create=false );
     int indexOf( DirEntry* e );
-    int parent( unsigned index );
+    int tqparent( unsigned index );
     std::string fullName( unsigned index );
-    std::vector<unsigned> children( unsigned index );
+    std::vector<unsigned> tqchildren( unsigned index );
     void load( unsigned char* buffer, unsigned len );
     void save( unsigned char* buffer );
     unsigned size();
@@ -503,13 +503,13 @@ int DirTree::indexOf( DirEntry* e )
   return -1;
 }
 
-int DirTree::parent( unsigned index )
+int DirTree::tqparent( unsigned index )
 {
-  // brute-force, basically we iterate for each entries, find its children
-  // and check if one of the children is 'index'
+  // brute-force, basically we iterate for each entries, find its tqchildren
+  // and check if one of the tqchildren is 'index'
   for( unsigned j=0; j<entryCount(); j++ )
   {
-    std::vector<unsigned> chi = children( j );
+    std::vector<unsigned> chi = tqchildren( j );
     for( unsigned i=0; i<chi.size();i++ )
       if( chi[i] == index )
         return j;
@@ -525,7 +525,7 @@ std::string DirTree::fullName( unsigned index )
 
   std::string result = entry( index )->name;
   result.insert( 0,  "/" );
-  int p = parent( index );
+  int p = tqparent( index );
   DirEntry * _entry = 0;
   while( p > 0 )
   {
@@ -573,8 +573,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
 
    for( it = names.begin(); it != names.end(); ++it )
    {
-     // find among the children of index
-     std::vector<unsigned> chi = children( index );
+     // find among the tqchildren of index
+     std::vector<unsigned> chi = tqchildren( index );
      unsigned child = 0;
      for( unsigned i = 0; i < chi.size(); i++ )
      {
@@ -589,11 +589,11 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
      if( child > 0 ) index = child;
      else
      {
-       // not found among children
+       // not found among tqchildren
        if( !create ) return (DirEntry*)0;
        
        // create a new entry
-       unsigned parent = index;
+       unsigned tqparent = index;
        entries.push_back( DirEntry() );
        index = entryCount()-1;
        DirEntry* e = entry( index );
@@ -604,8 +604,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
        e->start = 0;
        e->child = End;
        e->prev = End;
-       e->next = entry(parent)->child;
-       entry(parent)->child = index;
+       e->next = entry(tqparent)->child;
+       entry(tqparent)->child = index;
      }
    }
 
@@ -646,7 +646,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector<unsigned>& result,
   }
 }
 
-std::vector<unsigned> DirTree::children( unsigned index )
+std::vector<unsigned> DirTree::tqchildren( unsigned index )
 {
   std::vector<unsigned> result;
   
@@ -1102,7 +1102,7 @@ StreamIO::StreamIO( StorageIO* s, DirEntry* e)
   updateCache();
 }
 
-// FIXME tell parent we're gone
+// FIXME tell tqparent we're gone
 StreamIO::~StreamIO()
 {
   delete[] cache_data;  
@@ -1248,10 +1248,10 @@ std::list<std::string> Storage::entries( const std::string& path )
   DirEntry* e = dt->entry( path, false );
   if( e  && e->dir )
   {
-    unsigned parent = dt->indexOf( e );
-    std::vector<unsigned> children = dt->children( parent );
-    for( unsigned i = 0; i < children.size(); i++ )
-      result.push_back( dt->entry( children[i] )->name );
+    unsigned tqparent = dt->indexOf( e );
+    std::vector<unsigned> tqchildren = dt->tqchildren( tqparent );
+    for( unsigned i = 0; i < tqchildren.size(); i++ )
+      result.push_back( dt->entry( tqchildren[i] )->name );
   }
   
   return result;
@@ -1270,7 +1270,7 @@ Stream::Stream( Storage* storage, const std::string& name )
   io = storage->io->streamIO( name );
 }
 
-// FIXME tell parent we're gone
+// FIXME tell tqparent we're gone
 Stream::~Stream()
 {
   delete io;
diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
index af035c69..eceb3411 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
@@ -394,12 +394,12 @@ Record* Record::create( unsigned type )
 return record;
 }
 
-void Record::setParent( Record* parent )
+void Record::setParent( Record* tqparent )
 {
-  record_parent = parent;
+  record_parent = tqparent;
 }
 
-const Record* Record::parent() const
+const Record* Record::tqparent() const
 {
   return record_parent;
 }
@@ -3088,10 +3088,10 @@ void StyleTextPropAtom::setData( unsigned /*size*/, const unsigned char* data, u
       atomData.charCount = charCount;
       atomData.depth = readU16(data+k); 
       k += 2; 
-      unsigned mask = readU32(data+6); 
+      unsigned tqmask = readU32(data+6); 
       k += 4;        
 
-      if ( mask & 0xF )
+      if ( tqmask & 0xF )
       { 
         int bulletFlag = readU16(data+k);
         k += 2;
@@ -3100,99 +3100,99 @@ void StyleTextPropAtom::setData( unsigned /*size*/, const unsigned char* data, u
         atomData.bulletHardColor = ( bulletFlag & 4 ) ? 1 : 0;  
       }    
 
-      if ( mask & 0x0080 )
+      if ( tqmask & 0x0080 )
       {
         atomData.bulletChar = readU16(data+k);
         k += 2; 
       } 
       
-      if ( mask & 0x0010 )
+      if ( tqmask & 0x0010 )
       { 
         atomData.bulletFont = readU16(data+k);
         k += 2; 
       }
 
-      if ( mask & 0x0040 )
+      if ( tqmask & 0x0040 )
       {
         atomData.bulletHeight = readU16(data+k);
         k += 2; 
       }
 
-      if ( mask & 0x0020 )
+      if ( tqmask & 0x0020 )
       { 
         atomData.bulletColor = readU32(data+k);
         k += 4; 
       }
 
-      if ( mask & 0x0F00 )
+      if ( tqmask & 0x0F00 )
       { 
-        if ( mask & 0x800 )
+        if ( tqmask & 0x800 )
         {
           unsigned dummy = readU16(data+k);
           atomData.align = ( dummy & 3 );
           k += 2;
         }                                             
-        if ( mask & 0x400 )
+        if ( tqmask & 0x400 )
         {
           /*unsigned dummy =*/ readU16(data+k);
           k += 2;
         }
-        if ( mask & 0x200 )
+        if ( tqmask & 0x200 )
         {
           /*unsigned dummy =*/ readU16(data+k);
           k += 2;
         }      
-        if ( mask & 0x100 )
+        if ( tqmask & 0x100 )
         {
           /*unsigned dummy =*/ readU16(data+k);
           k += 2;
         }      
       }
 
-      if ( mask & 0x1000 ) 
+      if ( tqmask & 0x1000 ) 
       { 
         atomData.lineFeed = readU16(data+k);
         k += 2; 
       }    
  
-      if ( mask & 0x2000 ) 
+      if ( tqmask & 0x2000 ) 
       {
         atomData.upperDist = readU16(data+k);
         k += 2; 
       }   
 
-      if ( mask & 0x4000 ) 
+      if ( tqmask & 0x4000 ) 
       {
         atomData.lowerDist = readU16(data+k);
         k += 2; 
       }  
 
-      if ( mask & 0x8000 ) 
+      if ( tqmask & 0x8000 ) 
       {
         /*unsigned dummy =*/ readU16(data+k);
         k += 2; 
       }   
       
-      if ( mask & 0x10000 ) 
+      if ( tqmask & 0x10000 ) 
       {
         /*unsigned dummy =*/ readU16(data+k);
         k += 2; 
       }   
 
-      if ( mask & 0xe0000 )
+      if ( tqmask & 0xe0000 )
       {
         unsigned dummy = readU16(data+k);
-        if ( mask & 0x20000 )
+        if ( tqmask & 0x20000 )
           atomData.asianLB1 = dummy & 1;
-        if ( mask & 0x40000 )
+        if ( tqmask & 0x40000 )
           atomData.asianLB2 = (dummy >> 1) & 1;
-        if ( mask & 0x80000 )
+        if ( tqmask & 0x80000 )
           atomData.asianLB3 = (dummy >> 2) & 1;
 
         k += 2; 
       }    
 
-      if ( mask & 0x200000 ) 
+      if ( tqmask & 0x200000 ) 
       {
         atomData.biDi = readU16(data+k);
         k += 2;       
@@ -3537,15 +3537,15 @@ const unsigned int SlideAtom::id = 1007;
 class SlideAtom::Private
 {
 public:
-  int layoutGeom;
-  int layoutPlaceholderId1; 
-  int layoutPlaceholderId2; 
-  int layoutPlaceholderId3; 
-  int layoutPlaceholderId4; 
-  int layoutPlaceholderId5; 
-  int layoutPlaceholderId6; 
-  int layoutPlaceholderId7; 
-  int layoutPlaceholderId8; 
+  int tqlayoutGeom;
+  int tqlayoutPlaceholderId1; 
+  int tqlayoutPlaceholderId2; 
+  int tqlayoutPlaceholderId3; 
+  int tqlayoutPlaceholderId4; 
+  int tqlayoutPlaceholderId5; 
+  int tqlayoutPlaceholderId6; 
+  int tqlayoutPlaceholderId7; 
+  int tqlayoutPlaceholderId8; 
   int masterId; 
   int notesId;
   int flags; 
@@ -3554,15 +3554,15 @@ public:
 SlideAtom::SlideAtom()
 {
   d = new Private;
-  d->layoutGeom = 0;
-  d->layoutPlaceholderId1 = 0; 
-  d->layoutPlaceholderId2 = 0; 
-  d->layoutPlaceholderId3 = 0; 
-  d->layoutPlaceholderId4 = 0; 
-  d->layoutPlaceholderId5 = 0; 
-  d->layoutPlaceholderId6 = 0; 
-  d->layoutPlaceholderId7 = 0; 
-  d->layoutPlaceholderId8 = 0;       
+  d->tqlayoutGeom = 0;
+  d->tqlayoutPlaceholderId1 = 0; 
+  d->tqlayoutPlaceholderId2 = 0; 
+  d->tqlayoutPlaceholderId3 = 0; 
+  d->tqlayoutPlaceholderId4 = 0; 
+  d->tqlayoutPlaceholderId5 = 0; 
+  d->tqlayoutPlaceholderId6 = 0; 
+  d->tqlayoutPlaceholderId7 = 0; 
+  d->tqlayoutPlaceholderId8 = 0;       
   d->masterId = 0;
   d->notesId = 0;
   d->flags = 0;
@@ -3573,39 +3573,39 @@ SlideAtom::~SlideAtom()
   delete d;
 }
 
-int SlideAtom::layoutGeom() const
+int SlideAtom::tqlayoutGeom() const
 {
-  return d->layoutGeom;
+  return d->tqlayoutGeom;
 }
 
-void SlideAtom::setLayoutGeom(int layoutGeom )
+void SlideAtom::setLayoutGeom(int tqlayoutGeom )
 {
-  d->layoutGeom = layoutGeom;
+  d->tqlayoutGeom = tqlayoutGeom;
 }
 
 
-int SlideAtom::layoutPlaceholderId() const
+int SlideAtom::tqlayoutPlaceholderId() const
 {
-   return d->layoutPlaceholderId1;
-   return d->layoutPlaceholderId2;
-   return d->layoutPlaceholderId3;
-   return d->layoutPlaceholderId4;
-   return d->layoutPlaceholderId5;
-   return d->layoutPlaceholderId6;
-   return d->layoutPlaceholderId7;
-   return d->layoutPlaceholderId8;
+   return d->tqlayoutPlaceholderId1;
+   return d->tqlayoutPlaceholderId2;
+   return d->tqlayoutPlaceholderId3;
+   return d->tqlayoutPlaceholderId4;
+   return d->tqlayoutPlaceholderId5;
+   return d->tqlayoutPlaceholderId6;
+   return d->tqlayoutPlaceholderId7;
+   return d->tqlayoutPlaceholderId8;
 }
 
-void SlideAtom::setLayoutPlaceholderId(int layoutPlaceholderId1, int layoutPlaceholderId2,int layoutPlaceholderId3,int layoutPlaceholderId4,int layoutPlaceholderId5,int layoutPlaceholderId6,int layoutPlaceholderId7,int layoutPlaceholderId8)
+void SlideAtom::setLayoutPlaceholderId(int tqlayoutPlaceholderId1, int tqlayoutPlaceholderId2,int tqlayoutPlaceholderId3,int tqlayoutPlaceholderId4,int tqlayoutPlaceholderId5,int tqlayoutPlaceholderId6,int tqlayoutPlaceholderId7,int tqlayoutPlaceholderId8)
 {
-     d->layoutPlaceholderId1 = layoutPlaceholderId1;
-     d->layoutPlaceholderId2 = layoutPlaceholderId2;
-     d->layoutPlaceholderId3 = layoutPlaceholderId3;
-     d->layoutPlaceholderId4 = layoutPlaceholderId4;
-     d->layoutPlaceholderId5 = layoutPlaceholderId5;
-     d->layoutPlaceholderId6 = layoutPlaceholderId6;
-     d->layoutPlaceholderId7 = layoutPlaceholderId7;
-     d->layoutPlaceholderId8 = layoutPlaceholderId8;
+     d->tqlayoutPlaceholderId1 = tqlayoutPlaceholderId1;
+     d->tqlayoutPlaceholderId2 = tqlayoutPlaceholderId2;
+     d->tqlayoutPlaceholderId3 = tqlayoutPlaceholderId3;
+     d->tqlayoutPlaceholderId4 = tqlayoutPlaceholderId4;
+     d->tqlayoutPlaceholderId5 = tqlayoutPlaceholderId5;
+     d->tqlayoutPlaceholderId6 = tqlayoutPlaceholderId6;
+     d->tqlayoutPlaceholderId7 = tqlayoutPlaceholderId7;
+     d->tqlayoutPlaceholderId8 = tqlayoutPlaceholderId8;
 }
 
 int SlideAtom::masterId() const
@@ -3650,16 +3650,16 @@ void SlideAtom::setData( unsigned , const unsigned char* data )
 void SlideAtom::dump( std::ostream& out ) const
 {
   out << "SlideAtom" << std::endl;
-  out << "layoutGeom " << layoutGeom() << std::endl;
-  // out << "layoutPlaceholderId " << layoutPlaceholderId() <<std::endl;
-  out << "layoutPlaceholderId1 " << d->layoutPlaceholderId1 <<std::endl;
-  out << "layoutPlaceholderId2 " << d->layoutPlaceholderId2 <<std::endl;
-  out << "layoutPlaceholderId3 " << d->layoutPlaceholderId3 <<std::endl;
-  out << "layoutPlaceholderId4 " << d->layoutPlaceholderId4 <<std::endl;
-  out << "layoutPlaceholderId5 " << d->layoutPlaceholderId5 <<std::endl;
-  out << "layoutPlaceholderId6 " << d->layoutPlaceholderId6 <<std::endl;
-  out << "layoutPlaceholderId7 " << d->layoutPlaceholderId7 <<std::endl;
-  out << "layoutPlaceholderId8 " << d->layoutPlaceholderId8 <<std::endl;
+  out << "tqlayoutGeom " << tqlayoutGeom() << std::endl;
+  // out << "tqlayoutPlaceholderId " << tqlayoutPlaceholderId() <<std::endl;
+  out << "tqlayoutPlaceholderId1 " << d->tqlayoutPlaceholderId1 <<std::endl;
+  out << "tqlayoutPlaceholderId2 " << d->tqlayoutPlaceholderId2 <<std::endl;
+  out << "tqlayoutPlaceholderId3 " << d->tqlayoutPlaceholderId3 <<std::endl;
+  out << "tqlayoutPlaceholderId4 " << d->tqlayoutPlaceholderId4 <<std::endl;
+  out << "tqlayoutPlaceholderId5 " << d->tqlayoutPlaceholderId5 <<std::endl;
+  out << "tqlayoutPlaceholderId6 " << d->tqlayoutPlaceholderId6 <<std::endl;
+  out << "tqlayoutPlaceholderId7 " << d->tqlayoutPlaceholderId7 <<std::endl;
+  out << "tqlayoutPlaceholderId8 " << d->tqlayoutPlaceholderId8 <<std::endl;
   out << "masterId " << masterId() << std::endl;
   out << "notesId " << notesId() << std::endl;
   out << "flags " << flags() << std::endl;
@@ -4105,7 +4105,7 @@ const unsigned int msofbtSpAtom::id = 61450; /* F00A */
 class msofbtSpAtom::Private
 {
 public:
-  unsigned long shapeId;
+  unsigned long tqshapeId;
   unsigned long persistentFlag;
   bool background;
   bool hFlip; 
@@ -4115,7 +4115,7 @@ public:
 msofbtSpAtom ::msofbtSpAtom ()
 {
   d = new Private;
-  d->shapeId = 0;
+  d->tqshapeId = 0;
   d->persistentFlag = 0;
   d->background = false;
   d->hFlip = false; 
@@ -4127,17 +4127,17 @@ msofbtSpAtom ::~msofbtSpAtom ()
   delete d;
 }
 
-unsigned long msofbtSpAtom::shapeId() const
+unsigned long msofbtSpAtom::tqshapeId() const
 {
-  return d->shapeId;
+  return d->tqshapeId;
 }
 
 void msofbtSpAtom::setShapeId( unsigned long id )
 {
-  d->shapeId = id;
+  d->tqshapeId = id;
 }
 
-const char* msofbtSpAtom::shapeTypeAsString() const
+const char* msofbtSpAtom::tqshapeTypeAsString() const
 {
   switch( instance() )
   {
@@ -5453,7 +5453,7 @@ int PPTReader::indexPersistence( unsigned long ofs )
   return 0;
 }
 
-void PPTReader::loadRecord( Record* parent )
+void PPTReader::loadRecord( Record* tqparent )
 {
   // FIXME
   unsigned char buffer[65536];
@@ -5472,7 +5472,7 @@ void PPTReader::loadRecord( Record* parent )
   Record* record = Record::create( type );
   if( record )
   {
-    record->setParent( parent );
+    record->setParent( tqparent );
     record->setPosition( pos );
     record->setInstance( instance );
 
@@ -5821,7 +5821,7 @@ void PPTReader::handleEscherGroupAtom( msofbtSpgrAtom* atom )
 
   // set rect bound of current group
 
-  // this is shape for the group, no need to 
+  // this is tqshape 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 49950817..ea293ae5 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.h
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.h
@@ -63,9 +63,9 @@ public:
    */
   virtual bool isContainer() const { return false; }
   
-  void setParent( Record* parent );
+  void setParent( Record* tqparent );
   
-  const Record* parent() const;
+  const Record* tqparent() const;
 
   /**
     Sets the data for this record.
@@ -1262,12 +1262,12 @@ public:
   SlideAtom();
   ~SlideAtom();
 
-  int layoutGeom() const; 
-  void setLayoutGeom( int layoutGeom );
+  int tqlayoutGeom() const; 
+  void setLayoutGeom( int tqlayoutGeom );
  // see OEPlaceHolderAtom 
-  int layoutPlaceholderId() const; 
- // void setLayoutPlaceholderId(int layoutPlaceholderId);
-  void setLayoutPlaceholderId(int layoutPlaceholderId1, int layoutPlaceholderId2,int layoutPlaceholderId3,int layoutPlaceholderId4,int layoutPlaceholderId5,int layoutPlaceholderId6,int layoutPlaceholderId7,int layoutPlaceholderId8); 
+  int tqlayoutPlaceholderId() const; 
+ // void setLayoutPlaceholderId(int tqlayoutPlaceholderId);
+  void setLayoutPlaceholderId(int tqlayoutPlaceholderId1, int tqlayoutPlaceholderId2,int tqlayoutPlaceholderId3,int tqlayoutPlaceholderId4,int tqlayoutPlaceholderId5,int tqlayoutPlaceholderId6,int tqlayoutPlaceholderId7,int tqlayoutPlaceholderId8); 
   int masterId() const; 
   void setMasterId( int masterId );
   int notesId() const; 
@@ -1901,9 +1901,9 @@ public:
   msofbtSpAtom ();
   ~msofbtSpAtom ();
 
-  unsigned long shapeId() const;
+  unsigned long tqshapeId() const;
   void setShapeId( unsigned long id );
-  const char* shapeTypeAsString() const;
+  const char* tqshapeTypeAsString() 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 shape
+   FillPicture,           // Center a picture in the tqshape
    FillShade,             // Shade from start to end points
    FillShadeCenter,       // Shade from bounding rectangle to end point
-   FillShadeShape,        // Shade from shape outline to end point
+   FillShadeShape,        // Shade from tqshape 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
@@ -2095,8 +2095,8 @@ public:
     NotesBody,
     CenteredTitle,
     Subtitle,
-    VerticalTextTitle,
-    VerticalTextBody,
+   Qt::VerticalTextTitle,
+   Qt::VerticalTextBody,
     NotesSlideImage,
     Object,
     Graph,
@@ -2385,9 +2385,9 @@ public:
   int ruid() const; // rule ID
   void setRuid( int ruid );
   int align() const;
-  void setAlign( int align );// alignment
+  void setAlign( int align );// tqalignment
   int cProxies() const;
-  void setCProxies( int cProxies );// number of shapes governed by rule
+  void setCProxies( int cProxies );// number of tqshapes governed by rule
     
   void setData( unsigned size, const unsigned char* data );
   const char* name(){ return "msofbtAlignRuleAtom "; }
@@ -2497,7 +2497,7 @@ protected:
   void loadDocument();
   int indexPersistence( unsigned long offset );
 
-  void loadRecord( Record* parent );
+  void loadRecord( Record* tqparent );
   void handleRecord( Record* record, int type );
   void handleContainer( Container* container, int type, unsigned size );
 
diff --git a/filters/kpresenter/powerpoint/libppt/ustring.cpp b/filters/kpresenter/powerpoint/libppt/ustring.cpp
index b0a44e56..b574d7de 100644
--- a/filters/kpresenter/powerpoint/libppt/ustring.cpp
+++ b/filters/kpresenter/powerpoint/libppt/ustring.cpp
@@ -216,13 +216,13 @@ UString UString::null;
 static char *statBuffer = 0L;
 
 UChar::UChar(const UCharReference &c)
-    : uc( c.unicode() )
+    : uc( c.tqunicode() )
 {
 }
 
 UChar UChar::toLower() const
 {
-  // ### properly support unicode tolower
+  // ### properly support tqunicode tolower
   if (uc >= 256 || islower(uc))
     return *this;
 
@@ -526,7 +526,7 @@ unsigned long UString::toULong(bool *ok) const
   return static_cast<unsigned long>(d);
 }
 
-int UString::find(const UString &f, int pos) const
+int UString::tqfind(const UString &f, int pos) const
 {
   if (isNull())
     return -1;
@@ -644,7 +644,7 @@ bool Libppt::operator<(const UString& s1, const UString& s2)
     l++;
   }
   if (l < lmin)
-    return (c1->unicode() < c2->unicode());
+    return (c1->tqunicode() < c2->tqunicode());
 
   return (l1 < l2);
 }
diff --git a/filters/kpresenter/powerpoint/libppt/ustring.h b/filters/kpresenter/powerpoint/libppt/ustring.h
index dfadbc7d..087aff50 100644
--- a/filters/kpresenter/powerpoint/libppt/ustring.h
+++ b/filters/kpresenter/powerpoint/libppt/ustring.h
@@ -40,8 +40,8 @@ namespace Libppt {
    * @short Unicode character.
    *
    * UChar represents a 16 bit Unicode character. It's internal data
-   * representation is compatible to XChar2b and QChar. It's therefore
-   * possible to exchange data with X and Qt with shallow copies.
+   * representation is compatible to XChar2b and TQChar. It's therefore
+   * possible to exchange data with X and TQt with shallow copies.
    */
   struct UChar {
     /**
@@ -71,7 +71,7 @@ namespace Libppt {
     /**
      * @return the 16 bit Unicode value of the character
      */
-    unsigned short unicode() const { return uc; }
+    unsigned short tqunicode() const { return uc; }
   public:
     /**
      * @return The character converted to lower case.
@@ -128,7 +128,7 @@ namespace Libppt {
     /**
      * @return Unicode value.
      */
-    unsigned short unicode() const { return ref().unicode(); }
+    unsigned short tqunicode() const { return ref().tqunicode(); }
     /**
      * @return Lower byte.
      */
@@ -334,7 +334,7 @@ namespace Libppt {
      * @return Position of first occurence of f starting at position pos.
      * -1 if the search was not successful.
      */
-    int find(const UString &f, int pos = 0) const;
+    int tqfind(const UString &f, int pos = 0) const;
     /**
      * @return Position of first occurence of f searching backwards from
      * position pos.