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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

22 files changed, 312 insertions, 312 deletions

diff --git a/filters/kpresenter/kword/kprkword.cc b/filters/kpresenter/kword/kprkword.cc
index 8dd96c5f..d40cd608 100644
--- a/filters/kpresenter/kword/kprkword.cc
+++ b/filters/kpresenter/kword/kprkword.cc
@@ -41,7 +41,7 @@ KprKword::KprKword(KoFilter *, const char *, const TQStringList&) :
 // This filter can act as an import filter for KWord and as an export
 // filter for KPresenter (isn't our architecture really nice ? :)
 // This is why we use the file-to-file method, not a TQDomDoc one.
-KoFilter::ConversionStatus KprKword::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus KprKword::convert( const TQCString& from, const TQCString& to )
 {
     if(to!="application/x-kword" || from!="application/x-kpresenter")
         return KoFilter::NotImplemented;
diff --git a/filters/kpresenter/kword/kprkword.h b/filters/kpresenter/kword/kprkword.h
index 30932652..f4141a09 100644
--- a/filters/kpresenter/kword/kprkword.h
+++ b/filters/kpresenter/kword/kprkword.h
@@ -33,7 +33,7 @@ public:
 
     virtual ~KprKword() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 protected:
     void convert();
diff --git a/filters/kpresenter/libimageexport/imageexport.cpp b/filters/kpresenter/libimageexport/imageexport.cpp
index c4ceb243..b87b8635 100644
--- a/filters/kpresenter/libimageexport/imageexport.cpp
+++ b/filters/kpresenter/libimageexport/imageexport.cpp
@@ -42,7 +42,7 @@ ImageExport::~ImageExport()
 }
 
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 ImageExport::convert(const TQCString& from, const TQCString& to)
 {
     KoDocument * document = m_chain->inputDocument();
diff --git a/filters/kpresenter/libimageexport/imageexport.h b/filters/kpresenter/libimageexport/imageexport.h
index 5cb89622..23f45e28 100644
--- a/filters/kpresenter/libimageexport/imageexport.h
+++ b/filters/kpresenter/libimageexport/imageexport.h
@@ -32,7 +32,7 @@ public:
     ImageExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~ImageExport();
 
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
     virtual bool extraImageAttribute() { return true;};
     virtual bool saveImage( TQString fileName) = 0;
     virtual const char* exportFormat() = 0;
diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py
index 97527471..e2e5b50a 100755
--- a/filters/kpresenter/magicpoint/mgp2kpr.py
+++ b/filters/kpresenter/magicpoint/mgp2kpr.py
@@ -56,7 +56,7 @@ class MgpImporter:
     self.__reset()           #init properties
 
   def __reset(self):
-    self.alignment="1"       #text alignment, left
+    self.tqalignment="1"       #text tqalignment, left
     self.vgap=1              #line spacing
 
     #font properties
@@ -167,14 +167,14 @@ class MgpImporter:
   def __setAlign(self,command):
     tokens=string.split(command,' ')
     if (tokens[0]=='leftfill'): #justify
-      self.alignment="8"
+      self.tqalignment="8"
     elif (tokens[0]=='right'):
-      self.alignment="2"
+      self.tqalignment="2"
     elif (tokens[0]=='center'):
-      self.alignment="4"
+      self.tqalignment="4"
     else:
-      self.alignment="1" #left
-    #print self.alignment
+      self.tqalignment="1" #left
+    #print self.tqalignment
 
   def __setBackground(self,parent):
     pageElem=self.document.createElement("PAGE")
@@ -233,7 +233,7 @@ class MgpImporter:
     indent=-1
     
     pElem=self.document.createElement("P")          #paragraph
-    pElem.setAttribute("align", self.alignment) 
+    pElem.setAttribute("align", self.tqalignment) 
 
     elem=self.document.createElement("NAME")        #style name
     elem.setAttribute("value", "Standard")          ###is this needed at all?
@@ -283,7 +283,7 @@ class MgpImporter:
     if (self.fontItalic!=0):
       elem.setAttribute("italic", "1")
     
-    text=self.document.createTextNode(unicode(line, self.charset, 'ignore'))
+    text=self.document.createTextNode(tqunicode(line, self.charset, 'ignore'))
     elem.appendChild(text)
     pElem.appendChild(elem)
     self.textElem.appendChild(pElem)
@@ -377,7 +377,7 @@ class MgpImporter:
             self.__setFontSize(command)
           elif (command.startswith('left') or
                 command.startswith('center') or
-                command.startswith('right')):             #text alignment
+                command.startswith('right')):             #text tqalignment
             self.__setAlign(command)
           elif (command.startswith('charset')):           #charset
             self.__setCharset(command)
diff --git a/filters/kpresenter/ooimpress/ooimpressexport.cc b/filters/kpresenter/ooimpress/ooimpressexport.cc
index 47173cb9..0e4771cf 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressexport.cc
@@ -54,7 +54,7 @@ OoImpressExport::~OoImpressExport()
     delete m_storeinp;
 }
 
-KoFilter::ConversionStatus OoImpressExport::convert( const TQCString & from,
+KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from,
                                                      const TQCString & to )
 {
     kdDebug(30518) << "Entering Ooimpress Export filter: " << from << " - " << to << endl;
@@ -66,10 +66,10 @@ KoFilter::ConversionStatus OoImpressExport::convert( const TQCString & from,
     }
 
     // read in the KPresenter file
-    KoFilter::ConversionStatus preStatus = openFile();
+    KoFilter::ConversiontqStatus pretqStatus = openFile();
 
-    if ( preStatus != KoFilter::OK )
-        return preStatus;
+    if ( pretqStatus != KoFilter::OK )
+        return pretqStatus;
 
     TQDomImplementation impl;
     TQDomDocument meta( impl.createDocumentType( "office:document-meta",
@@ -178,7 +178,7 @@ KoFilter::ConversionStatus OoImpressExport::convert( const TQCString & from,
     return KoFilter::OK;
 }
 
-KoFilter::ConversionStatus OoImpressExport::openFile()
+KoFilter::ConversiontqStatus OoImpressExport::openFile()
 {
     m_storeinp = KoStore::createStore( m_chain->inputFile(), KoStore::Read );
 
@@ -558,7 +558,7 @@ void OoImpressExport::createHelpLine( TQDomNode &helpline )
                 TQString str( "P%1,%2" );
                 int tmpX = ( int ) ( KoUnit::toMM( helplines.attribute("posX").toDouble()  )*100 );
                 int tmpY = ( int ) ( KoUnit::toMM( helplines.attribute("posY").toDouble() )*100 );
-                m_helpLine+=str.arg( TQString::number( tmpX ) ).arg( TQString::number( tmpY ) );
+                m_helpLine+=str.tqarg( TQString::number( tmpX ) ).tqarg( TQString::number( tmpY ) );
             }
         }
     }
@@ -758,7 +758,7 @@ void OoImpressExport::appendNote( TQDomDocument & doc, TQDomElement & source, TQ
     TQDomElement noteTextBox = doc.createElement( "draw:text-box" );
 
     //TODO : add draw:text-box size :
-    //<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="layout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm">
+    //<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="tqlayout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm">
 
     TQStringList text = TQStringList::split( "\n", noteText );
     for ( TQStringList::Iterator it = text.begin(); it != text.end(); ++it ) {
@@ -780,7 +780,7 @@ void OoImpressExport::appendTextbox( TQDomDocument & doc, TQDomElement & source,
     TQString gs = m_styleFactory.createGraphicStyle( source );
     textbox.setAttribute( "draw:style-name", gs );
 
-    // set the geometry
+    // set the tqgeometry
     set2DGeometry( source, textbox );
 
     // parse every paragraph
@@ -876,7 +876,7 @@ void OoImpressExport::appendPicture( TQDomDocument & doc, TQDomElement & source,
     image.setAttribute( "draw:style-name", gs );
     TQDomElement key = source.namedItem( "KEY" ).toElement();
 
-    TQString pictureName = TQString( "Picture/Picture%1" ).arg( m_pictureIndex );
+    TQString pictureName = TQString( "Picture/Picture%1" ).tqarg( m_pictureIndex );
 
     image.setAttribute( "xlink:type", "simple" );
     image.setAttribute( "xlink:show", "embed" );
@@ -909,7 +909,7 @@ void OoImpressExport::appendPicture( TQDomDocument & doc, TQDomElement & source,
     }
     image.setAttribute( "xlink:href", "#" + pictureName );
 
-// set the geometry
+// set the tqgeometry
     set2DGeometry( source, image );
     target.appendChild( image );
 
@@ -927,7 +927,7 @@ void OoImpressExport::appendLine( TQDomDocument & doc, TQDomElement & source, TQ
     TQString gs = m_styleFactory.createGraphicStyle( source );
     line.setAttribute( "draw:style-name", gs );
 
-    // set the geometry
+    // set the tqgeometry
     setLineGeometry( source, line );
 
     target.appendChild( line );
@@ -941,7 +941,7 @@ void OoImpressExport::appendRectangle( TQDomDocument & doc, TQDomElement & sourc
     TQString gs = m_styleFactory.createGraphicStyle( source );
     rectangle.setAttribute( "draw:style-name", gs );
 
-    // set the geometry
+    // set the tqgeometry
     set2DGeometry( source, rectangle );
 
     target.appendChild( rectangle );
@@ -955,7 +955,7 @@ void OoImpressExport::appendPolyline( TQDomDocument & doc, TQDomElement & source
     TQString gs = m_styleFactory.createGraphicStyle( source );
     polyline.setAttribute( "draw:style-name", gs );
 
-    // set the geometry
+    // set the tqgeometry
     set2DGeometry( source, polyline, false, true /*multipoint*/ );
 
     target.appendChild( polyline );
@@ -974,7 +974,7 @@ void OoImpressExport::appendEllipse( TQDomDocument & doc, TQDomElement & source,
     TQString gs = m_styleFactory.createGraphicStyle( source );
     ellipse.setAttribute( "draw:style-name", gs );
 
-    // set the geometry
+    // set the tqgeometry
     set2DGeometry( source, ellipse, pieObject );
 
     target.appendChild( ellipse );
@@ -998,7 +998,7 @@ void OoImpressExport::set2DGeometry( TQDomElement & source, TQDomElement & targe
 
     target.setAttribute( "draw:id",  TQString::number( m_objectIndex ) );
     target.setAttribute( "svg:x", StyleFactory::toCM( orig.attribute( "x" ) ) );
-    target.setAttribute( "svg:y", TQString( "%1cm" ).arg( KoUnit::toCM( y ) ) );
+    target.setAttribute( "svg:y", TQString( "%1cm" ).tqarg( KoUnit::toCM( y ) ) );
     target.setAttribute( "svg:width", StyleFactory::toCM( size.attribute( "width" ) ) );
     target.setAttribute( "svg:height", StyleFactory::toCM( size.attribute( "height" ) ) );
     TQString nameStr = name.attribute("objectName");
@@ -1073,16 +1073,16 @@ void OoImpressExport::set2DGeometry( TQDomElement & source, TQDomElement & targe
                     if( elemPoint.hasAttribute( "point_y" ) )
                         tmpY = ( int ) ( KoUnit::toMM(elemPoint.attribute( "point_y" ).toDouble() )*100 );
                     if ( !listOfPoint.isEmpty() )
-                        listOfPoint += TQString( " %1,%2" ).arg( tmpX ).arg( tmpY );
+                        listOfPoint += TQString( " %1,%2" ).tqarg( tmpX ).tqarg( tmpY );
                     else
-                        listOfPoint = TQString( "%1,%2" ).arg( tmpX ).arg( tmpY );
+                        listOfPoint = TQString( "%1,%2" ).tqarg( tmpX ).tqarg( tmpY );
                     maxX = TQMAX( maxX, tmpX );
                     maxY = TQMAX( maxY, tmpY );
                 }
                 elemPoint = elemPoint.nextSibling().toElement();
             }
             target.setAttribute( "draw:points", listOfPoint );
-            target.setAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).arg( maxX ).arg( maxY ) );
+            target.setAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( maxX ).tqarg( maxY ) );
         }
     }
 }
@@ -1093,7 +1093,7 @@ TQString OoImpressExport::rotateValue( double val )
     if ( val!=0.0 )
     {
         double value = -1 * ( ( double )val* M_PI )/180.0;
-        str=TQString( "rotate (%1)" ).arg( value );
+        str=TQString( "rotate (%1)" ).tqarg( value );
     }
     return str;
 }
@@ -1125,29 +1125,29 @@ void OoImpressExport::setLineGeometry( TQDomElement & source, TQDomElement & tar
 
     target.setAttribute( "draw:id",  TQString::number( m_objectIndex ) );
     TQString xpos1 = StyleFactory::toCM( orig.attribute( "x" ) );
-    TQString xpos2 = TQString( "%1cm" ).arg( KoUnit::toCM( x2 ) );
+    TQString xpos2 = TQString( "%1cm" ).tqarg( KoUnit::toCM( x2 ) );
 
     if ( type == 0 )
     {
-        target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y2/2.0 ) ) );
-        target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2/2.0 ) ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2/2.0 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2/2.0 ) ) );
     }
     else if ( type == 1 )
     {
-        target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) );
-        target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) );
-        xpos1 = TQString( "%1cm" ).arg( KoUnit::toCM( x1/2.0 ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) );
+        xpos1 = TQString( "%1cm" ).tqarg( KoUnit::toCM( x1/2.0 ) );
         xpos2 = xpos1;
     }
     else if ( type == 3 ) // from left bottom to right top
     {
-        target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) );
-        target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) );
     }
     else // from left top to right bottom
     {
-        target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) );
-        target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) );
     }
     target.setAttribute( "svg:x1", xpos1 );
     target.setAttribute( "svg:x2", xpos2 );
diff --git a/filters/kpresenter/ooimpress/ooimpressexport.h b/filters/kpresenter/ooimpress/ooimpressexport.h
index dec5ec4c..ac369192 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.h
+++ b/filters/kpresenter/ooimpress/ooimpressexport.h
@@ -37,11 +37,11 @@ public:
     OoImpressExport( KoFilter * parent, const char * name, const TQStringList & );
     virtual ~OoImpressExport();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString & from,
+    virtual KoFilter::ConversiontqStatus convert( const TQCString & from,
                                                 const TQCString & to );
 
 private:
-    KoFilter::ConversionStatus openFile();
+    KoFilter::ConversiontqStatus openFile();
 
     void exportBody( TQDomDocument & doccontent, TQDomElement & body );
     void createDocumentMeta( TQDomDocument & docmeta );
diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc
index 77e1f38c..1dab566d 100644
--- a/filters/kpresenter/ooimpress/ooimpressimport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressimport.cc
@@ -67,7 +67,7 @@ OoImpressImport::~OoImpressImport()
     m_animations.clear();
 }
 
-KoFilter::ConversionStatus OoImpressImport::convert( TQCString const & from, TQCString const & to )
+KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, TQCString const & to )
 {
     kdDebug(30518) << "Entering Ooimpress Import filter: " << from << " - " << to << endl;
 
@@ -87,13 +87,13 @@ KoFilter::ConversionStatus OoImpressImport::convert( TQCString const & from, TQC
         return KoFilter::FileNotFound;
     }
 
-    KoFilter::ConversionStatus preStatus = openFile();
+    KoFilter::ConversiontqStatus pretqStatus = openFile();
 
-    if ( preStatus != KoFilter::OK )
+    if ( pretqStatus != KoFilter::OK )
     {
         m_zip->close();
         delete m_zip;
-        return preStatus;
+        return pretqStatus;
     }
 
     TQDomDocument docinfo;
@@ -129,9 +129,9 @@ KoFilter::ConversionStatus OoImpressImport::convert( TQCString const & from, TQC
 }
 
 // Very related to OoWriterImport::openFile()
-KoFilter::ConversionStatus OoImpressImport::openFile()
+KoFilter::ConversiontqStatus OoImpressImport::openFile()
 {
-    KoFilter::ConversionStatus status = loadAndParse( "content.xml", m_content );
+    KoFilter::ConversiontqStatus status = loadAndParse( "content.xml", m_content );
     if ( status != KoFilter::OK )
     {
         kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl;
@@ -150,7 +150,7 @@ KoFilter::ConversionStatus OoImpressImport::openFile()
     return KoFilter::OK;
 }
 
-KoFilter::ConversionStatus OoImpressImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
+KoFilter::ConversiontqStatus OoImpressImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
 {
     return OoUtils::loadAndParse( filename, doc, m_zip);
 }
@@ -1154,7 +1154,7 @@ void OoImpressImport::appendImage( TQDomDocument& doc, TQDomElement& e, TQDomEle
 
     // create a key for the picture
     TQTime time = TQTime::currentTime();
-    TQDate date = TQDate::currentDate();
+    TQDate date = TQDate::tqcurrentDate();
 
     TQDomElement image = doc.createElement( "KEY" );
     image.setAttribute( "msec", time.msec() );
@@ -1214,7 +1214,7 @@ void OoImpressImport::appendBackgroundImage( TQDomDocument& doc, TQDomElement& e
 
     // create a key for the picture
     TQTime time = TQTime::currentTime();
-    TQDate date = TQDate::currentDate();
+    TQDate date = TQDate::tqcurrentDate();
 
     TQDomElement image = doc.createElement( "BACKPICTUREKEY" );
     image.setAttribute( "msec", time.msec() );
@@ -1498,15 +1498,15 @@ TQDomElement OoImpressImport::parseTextBox( TQDomDocument& doc, const TQDomEleme
     TQDomElement textObjectElement = doc.createElement( "TEXTOBJ" );
     appendTextObjectMargin( doc, textObjectElement );
 
-    // vertical alignment
+    // vertical tqalignment
     if ( m_styleStack.hasAttributeNS( ooNS::draw, "textarea-vertical-align" ) )
     {
-        TQString alignment = m_styleStack.attributeNS( ooNS::draw, "textarea-vertical-align" );
-        if ( alignment == "top" )
+        TQString tqalignment = m_styleStack.attributeNS( ooNS::draw, "textarea-vertical-align" );
+        if ( tqalignment == "top" )
             textObjectElement.setAttribute( "verticalAlign", "top" );
-        else if ( alignment == "middle" )
+        else if ( tqalignment == "middle" )
             textObjectElement.setAttribute( "verticalAlign", "center" );
-        else if ( alignment == "bottom" )
+        else if ( tqalignment == "bottom" )
             textObjectElement.setAttribute( "verticalAlign", "bottom" );
 
         textObjectElement.setAttribute("verticalValue", 0.0);
@@ -1663,7 +1663,7 @@ TQDomElement OoImpressImport::parseParagraph( TQDomDocument& doc, const TQDomEle
         p.appendChild(nameElem);
     }
 
-    // Paragraph alignment
+    // Paragraph tqalignment
     if ( m_styleStack.hasAttributeNS( ooNS::fo, "text-align" ) )
     {
         TQString align = m_styleStack.attributeNS( ooNS::fo, "text-align" );
@@ -2046,7 +2046,7 @@ TQString OoImpressImport::storeImage( const TQDomElement& object )
     KArchiveFile* file = (KArchiveFile*) m_zip->directory()->entry( url );
 
     TQString extension = url.mid( url.find( '.' ) );
-    TQString fileName = TQString( "picture%1" ).arg( m_numPicture++ ) + extension;
+    TQString fileName = TQString( "picture%1" ).tqarg( m_numPicture++ ) + extension;
     KoStoreDevice* out = m_chain->storageFile( "pictures/" + fileName, KoStore::Write );
 
     if ( file && out )
@@ -2072,7 +2072,7 @@ TQString OoImpressImport::storeSound(const TQDomElement & object, TQDomElement &
         return TQString();
 
     TQString extension = url.mid( url.find( '.' ) );
-    TQString fileName = TQString( "sound%1" ).arg( m_numSound++ ) + extension;
+    TQString fileName = TQString( "sound%1" ).tqarg( m_numSound++ ) + extension;
     fileName = "sounds/" + fileName;
     KoStoreDevice* out = m_chain->storageFile( fileName, KoStore::Write );
 
@@ -2161,7 +2161,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD
         bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true");
 
         if (!dt.isValid()) {
-            dt = TQDateTime::currentDateTime(); // OOo docs say so :)
+            dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :)
             fixed = false;
         }
 
@@ -2196,7 +2196,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD
         bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true");
 
         if (!dt.isValid()) {
-            dt = TQDateTime::currentDateTime(); // OOo docs say so :)
+            dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :)
             fixed = false;
         }
 
@@ -2314,9 +2314,9 @@ void OoImpressImport::createPresentationAnimation(const TQDomElement& element)
     {
         const TQString localName = e.localName();
         const TQString ns = e.namespaceURI();
-        if ( ns == ooNS::presentation && localName == "show-shape" && e.hasAttributeNS( ooNS::draw, "shape-id" ) )
+        if ( ns == ooNS::presentation && localName == "show-tqshape" && e.hasAttributeNS( ooNS::draw, "tqshape-id" ) )
         {
-            TQString name = e.attributeNS( ooNS::draw, "shape-id", TQString() );
+            TQString name = e.attributeNS( ooNS::draw, "tqshape-id", TQString() );
             //kdDebug(30518)<<" insert animation style : name :"<<name<<endl;
             animationList *lst = new animationList;
             TQDomElement* ep = new TQDomElement( e );
@@ -2342,8 +2342,8 @@ TQDomElement OoImpressImport::findAnimationByObjectID(const TQString & id,  int
     {
         TQDomElement e = node.toElement();
         order = animation->order;
-        kdDebug(30518)<<"e.tagName() :"<<e.tagName()<<" e.attribute(draw:shape-id) :"<<e.attributeNS( ooNS::draw, "shape-id", TQString())<<endl;
-        if (e.tagName()=="presentation:show-shape" && e.attributeNS( ooNS::draw, "shape-id", TQString())==id)
+        kdDebug(30518)<<"e.tagName() :"<<e.tagName()<<" e.attribute(draw:tqshape-id) :"<<e.attributeNS( ooNS::draw, "tqshape-id", TQString())<<endl;
+        if (e.tagName()=="presentation:show-tqshape" && e.attributeNS( ooNS::draw, "tqshape-id", TQString())==id)
                 return e;
     }
 
diff --git a/filters/kpresenter/ooimpress/ooimpressimport.h b/filters/kpresenter/ooimpress/ooimpressimport.h
index b187d189..596ca703 100644
--- a/filters/kpresenter/ooimpress/ooimpressimport.h
+++ b/filters/kpresenter/ooimpress/ooimpressimport.h
@@ -46,7 +46,7 @@ public:
     OoImpressImport( KoFilter * parent, const char * name, const TQStringList & );
     virtual ~OoImpressImport();
 
-    virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to );
+    virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
 
 private:
     void createDocumentInfo( TQDomDocument &docinfo );
@@ -96,8 +96,8 @@ private:
     bool parseSettings( TQDomDocument &doc, TQDomElement &helpLineElement, TQDomElement &attributeElement );
     void parseHelpLine( TQDomDocument &doc,TQDomElement &helpLineElement, const TQString &text );
 
-    KoFilter::ConversionStatus openFile();
-    KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
+    KoFilter::ConversiontqStatus openFile();
+    KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
 
     int m_numPicture;
     int m_numSound;
diff --git a/filters/kpresenter/ooimpress/status.html b/filters/kpresenter/ooimpress/status.html
index 8c34c4d1..f64a38b0 100644
--- a/filters/kpresenter/ooimpress/status.html
+++ b/filters/kpresenter/ooimpress/status.html
@@ -61,7 +61,7 @@
       - Rounding (for rectangles)<br>
       - Shadow<br>
       - Text margins<br>
-      -Qt::Vertical alignment for text<br>
+      -Qt::Vertical tqalignment for text<br>
       - Text style (underline, sub/super script, bold, italic, strikeout, background color)<br>
       - Paragraph style (line spacing, offset before/after paragraph, indent first/right/left, borders)<br>
       - Presentation settings<br>
@@ -168,7 +168,7 @@
       - Settings element (snap line drawing)<br>
 	  - Export Transparency<br>
 	  - Export Group Object<br>
-	  -Qt::Vertical alignment for text<br>
+	  -Qt::Vertical tqalignment for text<br>
 	  - Text margins<br>
 	  - Export title/keyword/subject<br>
       - Custom Slide Show<br>
diff --git a/filters/kpresenter/ooimpress/stylefactory.cc b/filters/kpresenter/ooimpress/stylefactory.cc
index e50b652e..a25ba52a 100644
--- a/filters/kpresenter/ooimpress/stylefactory.cc
+++ b/filters/kpresenter/ooimpress/stylefactory.cc
@@ -362,7 +362,7 @@ void StrokeDashStyle::toXML( TQDomDocument & doc, TQDomElement & e ) const
 
 GradientStyle::GradientStyle( TQDomElement & gradient, int index )
 {
-    m_name = TQString( "Gradient %1" ).arg( index );
+    m_name = TQString( "Gradient %1" ).tqarg( index );
     m_start_intensity = "100%";
     m_end_intensity = "100%";
     m_border = "0%";
@@ -393,8 +393,8 @@ GradientStyle::GradientStyle( TQDomElement & gradient, int index )
             {
                 int cx = bGradient.attribute( "xfactor" ).toInt();
                 int cy = bGradient.attribute( "yfactor" ).toInt();
-                m_cx = TQString( "%1%" ).arg( cx / 4 + 50 );
-                m_cy = TQString( "%1%" ).arg( cy / 4 + 50 );
+                m_cx = TQString( "%1%" ).tqarg( cx / 4 + 50 );
+                m_cy = TQString( "%1%" ).tqarg( cy / 4 + 50 );
             }
         }
 
@@ -419,8 +419,8 @@ GradientStyle::GradientStyle( TQDomElement & gradient, int index )
             {
                 int cx = gradient.attribute( "xfactor" ).toInt();
                 int cy = gradient.attribute( "yfactor" ).toInt();
-                m_cx = TQString( "%1%" ).arg( cx / 4 + 50 );
-                m_cy = TQString( "%1%" ).arg( cy / 4 + 50 );
+                m_cx = TQString( "%1%" ).tqarg( cx / 4 + 50 );
+                m_cy = TQString( "%1%" ).tqarg( cy / 4 + 50 );
             }
         }
 
@@ -615,8 +615,8 @@ PageMasterStyle::PageMasterStyle( TQDomElement & e, const uint index )
     TQDomNode borders = e.namedItem( "PAPERBORDERS" );
     TQDomElement b = borders.toElement();
 
-    m_name = TQString( "PM%1" ).arg( index );
-    m_style = TQString( "Default%1" ).arg( index );
+    m_name = TQString( "PM%1" ).tqarg( index );
+    m_style = TQString( "Default%1" ).tqarg( index );
     m_margin_top = StyleFactory::toCM( b.attribute( "ptTop" ) );
     m_margin_bottom = StyleFactory::toCM( b.attribute( "ptBottom" ) );
     m_margin_left = StyleFactory::toCM( b.attribute( "ptLeft" ) );
@@ -675,7 +675,7 @@ PageStyle::PageStyle( StyleFactory * styleFactory, TQDomElement & e, const uint
     	m_bg_objects_visible = "true";
     }
     
-    m_name = TQString( "dp%1" ).arg( index );
+    m_name = TQString( "dp%1" ).tqarg( index );
 
     // check if this is an empty page tag
     if ( !e.hasChildNodes() )
@@ -718,7 +718,7 @@ PageStyle::PageStyle( StyleFactory * styleFactory, TQDomElement & e, const uint
 
         //ISO8601 chapter 5.5.3.2
         //TQDate doesn't encode it as this format.
-        m_page_duration = TQString( "PT%1H%2M%3S" ).arg( hours ).arg( ms ).arg( sec );
+        m_page_duration = TQString( "PT%1H%2M%3S" ).tqarg( hours ).tqarg( ms ).tqarg( sec );
     }
 
     TQDomElement pageEffect = e.namedItem( "PGEFFECT" ).toElement();
@@ -899,11 +899,11 @@ bool PageStyle::operator==( const PageStyle & pageStyle ) const
 
 TextStyle::TextStyle( TQDomElement & e, const uint index )
 {
-    m_name = TQString( "T%1" ).arg( index );
+    m_name = TQString( "T%1" ).tqarg( index );
     if ( e.hasAttribute( "family" ) )
         m_font_family = e.attribute( "family" );
     if ( e.hasAttribute( "pointSize" ) )
-        m_font_size = TQString( "%1pt" ).arg( e.attribute( "pointSize" ) );
+        m_font_size = TQString( "%1pt" ).tqarg( e.attribute( "pointSize" ) );
     if ( e.hasAttribute( "color" ) )
         m_color = e.attribute( "color" );
     if ( e.hasAttribute( "bold" ) && e.attribute( "bold" ) == "1" )
@@ -1017,25 +1017,25 @@ GraphicStyle::GraphicStyle( StyleFactory * styleFactory, TQDomElement & e, const
         }
         if ( textObjectElement.hasAttribute( "bleftpt" ) )
         {
-            m_textMarginLeft = TQString( "%1pt" ).arg( textObjectElement.attribute( "bleftpt" ) );
+            m_textMarginLeft = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "bleftpt" ) );
         }
         if ( textObjectElement.hasAttribute( "bbottompt" ) )
         {
-            m_textMarginBottom = TQString( "%1pt" ).arg( textObjectElement.attribute( "bbottompt" ) );
+            m_textMarginBottom = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "bbottompt" ) );
         }
         if ( textObjectElement.hasAttribute( "btoppt" ) )
         {
-            m_textMarginTop = TQString( "%1pt" ).arg( textObjectElement.attribute( "btoppt" ) );
+            m_textMarginTop = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "btoppt" ) );
         }
         if ( textObjectElement.hasAttribute( "brightpt" ) )
         {
-            m_textMarginRight = TQString( "%1pt" ).arg( textObjectElement.attribute( "brightpt" ) );
+            m_textMarginRight = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "brightpt" ) );
         }
 
     }
-    kdDebug(30518)<<" alignment :"<<m_textAlignment<<endl;
+    kdDebug(30518)<<" tqalignment :"<<m_textAlignment<<endl;
 
-    m_name = TQString( "gr%1" ).arg( index );
+    m_name = TQString( "gr%1" ).tqarg( index );
     if ( !pen.isNull() )
     {
         TQDomElement p = pen.toElement();
@@ -1352,7 +1352,7 @@ ParagraphStyle::ParagraphStyle( TQDomElement & e, const uint index )
     TQDomNode lineSpacing = e.namedItem( "LINESPACING" );
     TQDomNode counter = e.namedItem( "COUNTER" );
 
-    m_name = TQString( "P%1" ).arg( index );
+    m_name = TQString( "P%1" ).tqarg( index );
     if ( e.hasAttribute( "align" ) )
     {
         int align = e.attribute( "align" ).toInt();
@@ -1376,7 +1376,7 @@ ParagraphStyle::ParagraphStyle( TQDomElement & e, const uint index )
     if ( !shadow.isNull() )
     {
         TQDomElement s = shadow.toElement();
-        TQString distance = TQString( "%1pt" ).arg( s.attribute( "distance" ) );
+        TQString distance = TQString( "%1pt" ).tqarg( s.attribute( "distance" ) );
         m_text_shadow = distance + " " + distance;
     }
 
@@ -1416,7 +1416,7 @@ ParagraphStyle::ParagraphStyle( TQDomElement & e, const uint index )
         else if ( type == "double" )
             m_line_height = "200%";
         else if ( type == "multiple" )
-            m_line_height = TQString( "%1%" ).arg( l.attribute( "spacingvalue" ).toInt() * 100 );
+            m_line_height = TQString( "%1%" ).tqarg( l.attribute( "spacingvalue" ).toInt() * 100 );
         else if ( type == "custom" )
             m_line_spacing = StyleFactory::toCM( l.attribute( "spacingvalue" ) );
         else if ( type == "atleast" )
@@ -1503,7 +1503,7 @@ TQString ParagraphStyle::parseBorder( TQDomElement e )
                   e.attribute( "green" ).toInt(),
                   e.attribute( "blue" ).toInt() );
 
-    return TQString( "%1 %2 %3" ).arg( width ).arg( style ).arg( color.name() );
+    return TQString( "%1 %2 %3" ).tqarg( width ).tqarg( style ).tqarg( color.name() );
 }
 
 ListStyle::ListStyle( TQDomElement & e, const uint index )
@@ -1513,7 +1513,7 @@ ListStyle::ListStyle( TQDomElement & e, const uint index )
     m_color = "#000000";
     m_font_size = "100%";
 
-    m_name = TQString( "L%1" ).arg( index );
+    m_name = TQString( "L%1" ).tqarg( index );
 
     if ( e.hasAttribute( "type" ) )
     {
@@ -1598,9 +1598,9 @@ void ListStyle::toXML( TQDomDocument & doc, TQDomElement & e ) const
         if ( level > 1 )
         {
             properties.setAttribute( "text:min-label-width",
-                                     TQString( "%1cm" ).arg( m_min_label_width ) );
+                                     TQString( "%1cm" ).tqarg( m_min_label_width ) );
             properties.setAttribute( "text:space-before",
-                                     TQString( "%1cm" ).arg( m_min_label_width * ( level - 1 ) ) );
+                                     TQString( "%1cm" ).tqarg( m_min_label_width * ( level - 1 ) ) );
         }
 
         if ( !m_color.isNull() )
diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc
index 31d2b4a1..4f41aac7 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.cc
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc
@@ -30,7 +30,7 @@
 #include <tqcstring.h>
 #include <tqfile.h>
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -80,7 +80,7 @@ PowerPointImport::~PowerPointImport()
   delete d;
 }
 
-KoFilter::ConversionStatus PowerPointImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus PowerPointImport::convert( const TQCString& from, const TQCString& to )
 {
   if ( from != "application/mspowerpoint" )
     return KoFilter::NotImplemented; 
@@ -156,8 +156,8 @@ TQByteArray PowerPointImport::createStyles()
   TQByteArray stylesData;
   TQBuffer stylesBuffer( stylesData );
 
-  TQString pageWidth = TQString("%1pt").arg( d->presentation->masterSlide()->pageWidth() );
-  TQString pageHeight = TQString("%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 @@ TQByteArray 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 @@ TQByteArray 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 @@ TQByteArray 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();
@@ -351,11 +351,11 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW
 {
   if( !drawObject || !xmlWriter ) return;
 
-  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 );
+  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;
 
-  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 );
+  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); 
-     TQString rot = TQString("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;
 
-  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 );
+  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); 
-        TQString rot = TQString("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); 
-        TQString rot = TQString("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;
 
-  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 );
+  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;
 
-  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 );
+  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() ); 
-     TQString rot = TQString("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;
 
-  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 );
+  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;
 
-  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 );
+  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;
 
-  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 );
+  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;
 
-  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 );
+  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;
 
-  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 );
+  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,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-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;
 
-  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 );
+  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") )
     { TQString temp = y1Str; 
@@ -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;
 
-  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 );
+  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;
 
-  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 );
+  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;
 
-  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 );
+  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 ); 
   }
@@ -1317,14 +1317,14 @@ void PowerPointImport::processTextObjectForBody( TextObject* textObject, KoXmlWr
 //  TQString pStr = string( textObject->text() ).string();
   TQString pStr;
  
-  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() );
+  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 );
@@ -1381,15 +1381,15 @@ void PowerPointImport::processSlideForBody( unsigned slideNo, Slide* slide, KoXm
 
   TQString nameStr = Libppt::string( slide->title() ).string();
   if( nameStr.isEmpty() )
-    nameStr = TQString("page%1").arg(slideNo+1);
+    nameStr = TQString("page%1").tqarg(slideNo+1);
 
-  TQString styleNameStr = TQString("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 )
@@ -1450,7 +1450,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
   if( !drawObject || !xmlWriter) return;
 
   drawingObjectCounter++;
-  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
+  TQString styleName = TQString("gr%1").tqarg( 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").arg( strokeWidth ) );
+      xmlWriter->addAttribute( "svg:stroke-width",TQString("%1mm").tqarg( 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").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",TQString("%1cm").arg( arrowWidth ) );
+      xmlWriter->addAttribute( "draw:marker-end-width",TQString("%1cm").tqarg( 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%").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",TQString("%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",TQString("%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 6b75cfb3..ca3e7365 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.h
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.h
@@ -39,7 +39,7 @@ Q_OBJECT
 public:
   PowerPointImport ( TQObject *parent, const char* name, const TQStringList& );
   virtual ~PowerPointImport();
-  virtual KoFilter::ConversionStatus convert( const TQCString& from, 
+  virtual KoFilter::ConversiontqStatus convert( const TQCString& from, 
         const TQCString& to );
 
 private:
diff --git a/filters/kpresenter/powerpoint/libppt/objects.cpp b/filters/kpresenter/powerpoint/libppt/objects.cpp
index 29870cbd..d0343b43 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 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..b905539d 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
@@ -115,7 +115,7 @@ class DirTree
     int indexOf( DirEntry* e );
     int parent( 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();
@@ -505,11 +505,11 @@ int DirTree::indexOf( DirEntry* e )
 
 int DirTree::parent( 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;
@@ -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,7 +589,7 @@ 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
@@ -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;
   
@@ -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> children = dt->children( parent );
-    for( unsigned i = 0; i < children.size(); i++ )
-      result.push_back( dt->entry( children[i] )->name );
+    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
+    for( unsigned i = 0; i < tqchildren.size(); i++ )
+      result.push_back( dt->entry( tqchildren[i] )->name );
   }
   
   return result;
diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
index af035c69..bf3fc51f 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 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() )
   {
@@ -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 b2a0f649..6eec1564 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.h
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.h
@@ -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
@@ -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 "; }
diff --git a/filters/kpresenter/powerpoint/libppt/ustring.cpp b/filters/kpresenter/powerpoint/libppt/ustring.cpp
index b0a44e56..23b61d30 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;
 
@@ -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 52a43afe..c0e34cf4 100644
--- a/filters/kpresenter/powerpoint/libppt/ustring.h
+++ b/filters/kpresenter/powerpoint/libppt/ustring.h
@@ -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.
      */
diff --git a/filters/kpresenter/svg/svgexport.cc b/filters/kpresenter/svg/svgexport.cc
index 9eae5cd8..990d12cd 100644
--- a/filters/kpresenter/svg/svgexport.cc
+++ b/filters/kpresenter/svg/svgexport.cc
@@ -48,7 +48,7 @@ SvgExport::~SvgExport()
 }
 
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 SvgExport::convert(const TQCString& from, const TQCString& to)
 {
     KoDocument * document = m_chain->inputDocument();
diff --git a/filters/kpresenter/svg/svgexport.h b/filters/kpresenter/svg/svgexport.h
index 17e3d79f..eafdd792 100644
--- a/filters/kpresenter/svg/svgexport.h
+++ b/filters/kpresenter/svg/svgexport.h
@@ -32,7 +32,7 @@ public:
     SvgExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~SvgExport();
 
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // __SVGEXPORT_H__