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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

6 files changed, 83 insertions, 83 deletions

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() )