Remove additional unneeded tq method conversions

138 files changed, 863 insertions, 863 deletions

diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc
index 2194831a..5bce37b2 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.cc
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cc
@@ -202,7 +202,7 @@ namespace {
             rawdata.resize(len);
             memcpy(rawdata.data(), imgAttr -> value, len);
             
-            KisAnnotation* annotation = new KisAnnotation( TQString("chalk_attribute:%1").tqarg(TQString(imgAttr -> key)), "", rawdata );
+            KisAnnotation* annotation = new KisAnnotation( TQString("chalk_attribute:%1").arg(TQString(imgAttr -> key)), "", rawdata );
             Q_CHECK_PTR(annotation);
 
             image -> addAnnotation(annotation);
@@ -258,7 +258,7 @@ namespace {
                 memcpy(rawdata.data(), attr -> value, len);
 
                 annotation = new KisAnnotation(
-                    TQString("chalk_attribute:%1").tqarg(TQString(attr -> key)), "", rawdata);
+                    TQString("chalk_attribute:%1").arg(TQString(attr -> key)), "", rawdata);
                 Q_CHECK_PTR(annotation);
 
                 image -> addAnnotation(annotation);
diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc
index 5fa8e78a..c9772d9a 100644
--- a/filters/chalk/jpeg/kis_jpeg_converter.cc
+++ b/filters/chalk/jpeg/kis_jpeg_converter.cc
@@ -73,7 +73,7 @@ namespace {
         {
             return JCS_CMYK;
         }
-        KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ;
+        KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ;
         return JCS_UNKNOWN;
     }
 
diff --git a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
index 40a6c32a..8222cd77 100644
--- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
+++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
@@ -34,7 +34,7 @@
                     <property name="text">
                         <string>Quality:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                 </widget>
@@ -101,7 +101,7 @@
                                     <property name="text">
                                         <string>Best</string>
                                     </property>
-                                    <property name="tqalignment">
+                                    <property name="alignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                 </widget>
diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc
index dd16dd0e..880a52c6 100644
--- a/filters/chalk/magick/kis_image_magick_converter.cc
+++ b/filters/chalk/magick/kis_image_magick_converter.cc
@@ -206,7 +206,7 @@ namespace {
                 memcpy(rawdata.data(), attr -> value, len);
 
                 annotation = new KisAnnotation(
-                    TQString("chalk_attribute:%1").tqarg(TQString(attr -> key)), "", rawdata);
+                    TQString("chalk_attribute:%1").arg(TQString(attr -> key)), "", rawdata);
                 Q_CHECK_PTR(annotation);
 
                 image -> addAnnotation(annotation);
diff --git a/filters/chalk/pdf/kis_pdf_import.cpp b/filters/chalk/pdf/kis_pdf_import.cpp
index be3af8ad..ed504f67 100644
--- a/filters/chalk/pdf/kis_pdf_import.cpp
+++ b/filters/chalk/pdf/kis_pdf_import.cpp
@@ -141,7 +141,7 @@ KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQ
     TQValueList<int> pages = wdg->pages();
     for(TQValueList<int>::const_iterator it = pages.begin(); it != pages.end(); ++it)
     {
-        KisPaintLayer* layer = new KisPaintLayer(img, TQString(i18n("Page %1")).tqarg( TQString::number(*it) + 1), TQ_UINT8_MAX);
+        KisPaintLayer* layer = new KisPaintLayer(img, TQString(i18n("Page %1")).arg( TQString::number(*it) + 1), TQ_UINT8_MAX);
         layer->paintDevice()->convertFromTQImage( pdoc->getPage( *it )->renderToImage(wdg->intHorizontal->value(), wdg->intVertical->value() ), "");
         img->addLayer(layer, img->rootLayer(), 0);
     }
diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc
index d3cce618..d5c4a080 100644
--- a/filters/chalk/png/kis_png_converter.cc
+++ b/filters/chalk/png/kis_png_converter.cc
@@ -62,7 +62,7 @@ namespace {
             return alpha ? PNG_COLOR_TYPE_RGB_ALPHA : PNG_COLOR_TYPE_RGB;
         }
 
-        KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ;
+        KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ;
         return -1;
 
     }
diff --git a/filters/chalk/png/kis_wdg_options_png.ui b/filters/chalk/png/kis_wdg_options_png.ui
index a635c293..dcb733b8 100644
--- a/filters/chalk/png/kis_wdg_options_png.ui
+++ b/filters/chalk/png/kis_wdg_options_png.ui
@@ -37,7 +37,7 @@
                     <property name="text">
                         <string>Compress:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="toolTip" stdset="0">
@@ -113,7 +113,7 @@
                                     <property name="text">
                                         <string>Small</string>
                                     </property>
-                                    <property name="tqalignment">
+                                    <property name="alignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="whatsThis" stdset="0">
diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp
index a5b86364..4ec8f028 100644
--- a/filters/chalk/raw/kis_raw_import.cpp
+++ b/filters/chalk/raw/kis_raw_import.cpp
@@ -458,7 +458,7 @@ void KisRawImport::slotReceivedStdout(KProcess *, char *buffer, int buflen)
     //kdDebug(41008) << "stdout received " << buflen << " bytes on stdout.\n";
     //kdDebug(41008) << TQString::fromAscii(buffer, buflen) << "\n";
     int oldSize = m_data->size();
-    m_data->tqresize(oldSize + buflen, TQGArray::SpeedOptim);
+    m_data->resize(oldSize + buflen, TQGArray::SpeedOptim);
     memcpy(m_data->data() + oldSize, buffer, buflen);
 }
 
diff --git a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
index 681e66b7..da399a53 100644
--- a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
+++ b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
@@ -63,7 +63,7 @@ namespace {
             return true;
         }
 
-        KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ;
+        KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ;
         return false;
 
     }
diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui
index b86d88ab..f1854d43 100644
--- a/filters/chalk/tiff/kis_wdg_options_tiff.ui
+++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui
@@ -283,7 +283,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                 <property name="text">
                                     <string>Quality:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -350,7 +350,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                                 <property name="text">
                                                     <string>Best</string>
                                                 </property>
-                                                <property name="tqalignment">
+                                                <property name="alignment">
                                                     <set>AlignVCenter|AlignRight</set>
                                                 </property>
                                             </widget>
@@ -405,7 +405,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                 <property name="text">
                                     <string>Compress:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                                 <property name="toolTip" stdset="0">
@@ -481,7 +481,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                                 <property name="text">
                                                     <string>Small</string>
                                                 </property>
-                                                <property name="tqalignment">
+                                                <property name="alignment">
                                                     <set>AlignVCenter|AlignRight</set>
                                                 </property>
                                                 <property name="whatsThis" stdset="0">
@@ -608,7 +608,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                 <property name="text">
                                     <string>Compress:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                                 <property name="toolTip" stdset="0">
@@ -684,7 +684,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                                 <property name="text">
                                                     <string>Small</string>
                                                 </property>
-                                                <property name="tqalignment">
+                                                <property name="alignment">
                                                     <set>AlignVCenter|AlignRight</set>
                                                 </property>
                                                 <property name="whatsThis" stdset="0">
diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cc
index 90d61755..3209e181 100644
--- a/filters/chalk/xcf/xcf/xcf-load.cc
+++ b/filters/chalk/xcf/xcf/xcf-load.cc
@@ -173,7 +173,7 @@ xcf_load_image (XcfInfo * info)
         /* add the layer to the image if its not the floating selection */
         if (layer != info->floating_sel)
             gimp_image_add_layer (gimage, layer,
-                                  gimp_container_num_tqchildren (gimage->layers));
+                                  gimp_container_num_children (gimage->layers));
 
         /* restore the saved position so we'll be ready to
          *  read the next offset.
@@ -1494,7 +1494,7 @@ xcf_load_old_path (XcfInfo * info, KisImage * gimage)
         GIMP_ITEM (vectors)->tattoo = tattoo;
 
     gimp_image_add_vectors (gimage, vectors,
-                            gimp_container_num_tqchildren (gimage->vectors));
+                            gimp_container_num_children (gimage->vectors));
 
     return TRUE;
 }
@@ -1674,7 +1674,7 @@ xcf_load_vector (XcfInfo * info, KisImage * gimage)
     }
 
     gimp_image_add_vectors (gimage, vectors,
-                            gimp_container_num_tqchildren (gimage->vectors));
+                            gimp_container_num_children (gimage->vectors));
 
     return TRUE;
 }
diff --git a/filters/chalk/xcf/xcf/xcf-save.cc b/filters/chalk/xcf/xcf/xcf-save.cc
index 3544baf4..a0dbb9b5 100644
--- a/filters/chalk/xcf/xcf/xcf-save.cc
+++ b/filters/chalk/xcf/xcf/xcf-save.cc
@@ -289,8 +289,8 @@ xcf_save_image (XcfInfo   *info,
     xcf_write_int32_print_error (info, (TQ_INT32 *) &gimage->base_type, 1);
 
     /* determine the number of layers and channels in the image */
-    nlayers   = (TQ_UINT32) gimp_container_num_tqchildren (gimage->layers);
-    nchannels = (TQ_UINT32) gimp_container_num_tqchildren (gimage->channels);
+    nlayers   = (TQ_UINT32) gimp_container_num_children (gimage->layers);
+    nchannels = (TQ_UINT32) gimp_container_num_children (gimage->channels);
 
     /* check and see if we have to save out the selection */
     have_selection = gimp_channel_bounds (gimp_image_get_mask (gimage),
@@ -442,7 +442,7 @@ xcf_save_image_props (XcfInfo   *info,
     if (unit < _gimp_unit_get_number_of_built_in_units (gimage->gimp))
         xcf_check_error (xcf_save_prop (info, gimage, PROP_UNIT, error, unit));
 
-    if (gimp_container_num_tqchildren (gimage->vectors) > 0)
+    if (gimp_container_num_children (gimage->vectors) > 0)
     {
         if (gimp_vectors_compat_is_compatible (gimage))
             xcf_check_error (xcf_save_prop (info, gimage, PROP_PATHS, error));
@@ -1581,7 +1581,7 @@ xcf_save_old_paths (XcfInfo    *info,
      * then each path:-
      */
 
-    num_paths = gimp_container_num_tqchildren (gimage->vectors);
+    num_paths = gimp_container_num_children (gimage->vectors);
 
     active_vectors = gimp_image_get_active_vectors (gimage);
 
@@ -1696,7 +1696,7 @@ xcf_save_vectors (XcfInfo    *info,
         active_index = gimp_container_get_child_index (gimage->vectors,
                                                        GIMP_OBJECT (active_vectors));
 
-    num_paths = gimp_container_num_tqchildren (gimage->vectors);
+    num_paths = gimp_container_num_children (gimage->vectors);
 
     xcf_write_int32_check_error (info, &version,      1);
     xcf_write_int32_check_error (info, &active_index, 1);
diff --git a/filters/karbon/applixgraphics/applixgraphicimport.cc b/filters/karbon/applixgraphics/applixgraphicimport.cc
index a17f94da..82debb58 100644
--- a/filters/karbon/applixgraphics/applixgraphicimport.cc
+++ b/filters/karbon/applixgraphics/applixgraphicimport.cc
@@ -189,10 +189,10 @@ KoFilter::ConversionStatus APPLIXGRAPHICImport::convert( const TQCString& from,
       TQMessageBox::critical (0L, "Applixgraphics header problem",
                                   TQString ("The Applixgraphics header is not correct. "
                                            "May be it is not an applixgraphics file! <BR>"
-                                           "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()),
+                                           "This is the header line I did read:<BR><B>%1</B>").arg(mystr.latin1()),
 				    "Comma");
 
-      // i18n( "What is the separator used in this file ? First line is \n%1" ).tqarg(firstLine),
+      // i18n( "What is the separator used in this file ? First line is \n%1" ).arg(firstLine),
       return KoFilter::StupidError;
     }
 
diff --git a/filters/karbon/eps/epsimport.cc b/filters/karbon/eps/epsimport.cc
index 32a0845c..77a650bb 100644
--- a/filters/karbon/eps/epsimport.cc
+++ b/filters/karbon/eps/epsimport.cc
@@ -93,7 +93,7 @@ EpsImport::convert( const TQCString& from, const TQCString& to )
 
 	// sed filter
 	TQString sedFilter = TQString ("sed -e \"s/%%BoundingBox: 0 0 612 792/%%BoundingBox: %1 %2 %3 %4/g\"").
-            tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury);
+            arg(llx).arg(lly).arg(urx).arg(ury);
 
 	// Build ghostscript call to convert ps/eps -> ai:
 	TQString command(
diff --git a/filters/karbon/msod/msod.cc b/filters/karbon/msod/msod.cc
index 3e79e3ab..8c4c2795 100644
--- a/filters/karbon/msod/msod.cc
+++ b/filters/karbon/msod/msod.cc
@@ -39,18 +39,18 @@ Msod::Msod(
     m_dpi = dpi;
     m_images.setAutoDelete(true);
     m_opt = new Options(*this);
-    m_tqshape.data = 0L;
-    m_tqshape.length = 0;
+    m_shape.data = 0L;
+    m_shape.length = 0;
 }
 
 Msod::~Msod()
 {
-    delete [] m_tqshape.data;
+    delete [] m_shape.data;
     delete m_opt;
 }
 
 void Msod::drawShape(
-    unsigned tqshapeType,
+    unsigned shapeType,
     TQ_UINT32 bytes,
     TQDataStream &operands)
 {
@@ -262,25 +262,25 @@ void Msod::drawShape(
     };
     struct
     {
-        TQ_UINT32 spid;                  // The tqshape id
+        TQ_UINT32 spid;                  // The shape id
         union
         {
             TQ_UINT32 info;
             struct
             {
-                TQ_UINT32 fGroup : 1;    // This tqshape is a group tqshape
-                TQ_UINT32 fChild : 1;    // Not a top-level tqshape
-                TQ_UINT32 fPatriarch : 1; // This is the topmost group tqshape.
+                TQ_UINT32 fGroup : 1;    // This shape is a group shape
+                TQ_UINT32 fChild : 1;    // Not a top-level shape
+                TQ_UINT32 fPatriarch : 1; // This is the topmost group shape.
                                         // Exactly one of these per drawing.
                 TQ_UINT32 fDeleted : 1;  // The shape.has been deleted
-                TQ_UINT32 fOleShape : 1; // The tqshape is an OLE object
+                TQ_UINT32 fOleShape : 1; // The shape is an OLE object
                 TQ_UINT32 fHaveMaster : 1; // Shape has a hspMaster property
                 TQ_UINT32 fFlipH : 1;    // Shape is flipped horizontally
                 TQ_UINT32 fFlipV : 1;    // Shape is flipped vertically
-                TQ_UINT32 fConnector : 1; // Connector type of tqshape
+                TQ_UINT32 fConnector : 1; // Connector type of shape
                 TQ_UINT32 fHaveAnchor : 1; // Shape has an anchor of some kind
-                TQ_UINT32 fBackground : 1; // Background tqshape
-                TQ_UINT32 fHaveSpt : 1;  // Shape has a tqshape type property
+                TQ_UINT32 fBackground : 1; // Background shape
+                TQ_UINT32 fHaveSpt : 1;  // Shape has a shape type property
                 TQ_UINT32 reserved : 20; // Not yet used
             } fields;
         } grfPersistent;
@@ -291,12 +291,12 @@ void Msod::drawShape(
     operands >> data.spid;
     operands >> data.grfPersistent.info;
     bytes -= 8;
-	kdDebug(s_area) << "tqshape-id: " << data.spid << " type: " << funcTab[tqshapeType] << " (" << tqshapeType << ")" <<
+	kdDebug(s_area) << "shape-id: " << data.spid << " type: " << funcTab[shapeType] << " (" << shapeType << ")" <<
         (data.grfPersistent.fields.fGroup ? " group" : "") <<
         (data.grfPersistent.fields.fChild ? " child" : "") <<
         (data.grfPersistent.fields.fPatriarch ? " patriarch" : "") <<
         (data.grfPersistent.fields.fDeleted ? " deleted" : "") <<
-        (data.grfPersistent.fields.fOleShape ? " oletqshape" : "") <<
+        (data.grfPersistent.fields.fOleShape ? " oleshape" : "") <<
         (data.grfPersistent.fields.fHaveMaster ? " master" : "") <<
         (data.grfPersistent.fields.fFlipH ? " flipv" : "") <<
         (data.grfPersistent.fields.fConnector ? " connector" : "") <<
@@ -309,9 +309,9 @@ void Msod::drawShape(
     if ((!m_isRequiredDrawing) && (m_requestedShapeId != data.spid))
         return;
 
-    // An active tqshape! Let's draw it...
+    // An active shape! Let's draw it...
 
-    switch (tqshapeType)
+    switch (shapeType)
     {
     case 0:
         if (m_opt->m_pVertices)
@@ -493,7 +493,7 @@ TQSize Msod::normaliseSize(
 }
 
 bool Msod::parse(
-    unsigned tqshapeId,
+    unsigned shapeId,
     const TQString &file,
     const char *delayStream)
 {
@@ -505,19 +505,19 @@ bool Msod::parse(
         return false;
     }
     TQDataStream stream(&in);
-    bool result = parse(tqshapeId, stream, in.size(), delayStream);
+    bool result = parse(shapeId, stream, in.size(), delayStream);
     in.close();
     return result;
 }
 
 bool Msod::parse(
-    unsigned tqshapeId,
+    unsigned shapeId,
     TQDataStream &stream,
     unsigned size,
     const char *delayStream)
 {
     stream.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt !
-    m_requestedShapeId = tqshapeId;
+    m_requestedShapeId = shapeId;
     m_isRequiredDrawing = false;
     m_delayStream = delayStream;
 
@@ -854,8 +854,8 @@ void Msod::opDg(Header &, TQ_UINT32, TQDataStream &operands)
 {
     struct
     {
-        TQ_UINT32 csp;        // The number of tqshapes in this drawing.
-        TQ_UINT32 spidCur;    // The last tqshape ID given to an SP in this DG.
+        TQ_UINT32 csp;        // The number of shapes in this drawing.
+        TQ_UINT32 spidCur;    // The last shape ID given to an SP in this DG.
     } data;
 
     operands >> data.csp >> data.spidCur;
@@ -878,10 +878,10 @@ void Msod::opDgg(Header &, TQ_UINT32, TQDataStream &operands)
 {
     struct
     {
-        TQ_UINT32 spidMax;    // The current maximum tqshape ID.
+        TQ_UINT32 spidMax;    // The current maximum shape ID.
         TQ_UINT32 cidcl;      // The number of ID clusters (FIDCLs).
-        TQ_UINT32 cspSaved;   // The total number of tqshapes saved.
-                        // (including deleted tqshapes, if undo
+        TQ_UINT32 cspSaved;   // The total number of shapes saved.
+                        // (including deleted shapes, if undo
                         // information was saved).
         TQ_UINT32 cdgSaved;   // The total number of drawings saved.
     } data;
@@ -896,7 +896,7 @@ void Msod::opDgg(Header &, TQ_UINT32, TQDataStream &operands)
     unsigned i;
 
     operands >> data.spidMax >> data.cidcl >> data.cspSaved >> data.cdgSaved;
-    kdDebug(s_area) << data.cspSaved << " tqshapes in " <<
+    kdDebug(s_area) << data.cspSaved << " shapes in " <<
         data.cidcl - 1 << " clusters in " <<
         data.cdgSaved << " drawings" << endl;
     for (i = 0; i < data.cidcl - 1; i++)
@@ -943,31 +943,31 @@ void Msod::opSolvercontainer(Header &, TQ_UINT32 bytes, TQDataStream &operands)
 
 void Msod::opSp(Header &op, TQ_UINT32 bytes, TQDataStream &operands)
 {
-    // We want to defer the act of drawing a tqshape until we have seen any options
+    // We want to defer the act of drawing a shape until we have seen any options
     // that may affect it. Thus, we merely store the data away, and let opSpContainer
     // do all the ahrd work.
 
-    m_tqshape.type = op.opcode.fields.inst;
-    m_tqshape.length = bytes;
-    m_tqshape.data = new char [bytes];
-    operands.readRawBytes(m_tqshape.data, bytes);
+    m_shape.type = op.opcode.fields.inst;
+    m_shape.length = bytes;
+    m_shape.data = new char [bytes];
+    operands.readRawBytes(m_shape.data, bytes);
 }
 
 void Msod::opSpcontainer(Header &, TQ_UINT32 bytes, TQDataStream &operands)
 {
     walk(bytes, operands);
 
-    // Having gathered all the information for this tqshape, we can now draw it.
+    // Having gathered all the information for this shape, we can now draw it.
 
     TQByteArray  a;
 
-    a.setRawData(m_tqshape.data, m_tqshape.length);
+    a.setRawData(m_shape.data, m_shape.length);
     TQDataStream s(a, IO_ReadOnly);
     s.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt !
-    drawShape(m_tqshape.type, m_tqshape.length, s);
-    a.resetRawData(m_tqshape.data, m_tqshape.length);
-    delete [] m_tqshape.data;
-    m_tqshape.data = 0L;
+    drawShape(m_shape.type, m_shape.length, s);
+    a.resetRawData(m_shape.data, m_shape.length);
+    delete [] m_shape.data;
+    m_shape.data = 0L;
 }
 
 void Msod::opSpgr(Header &, TQ_UINT32, TQDataStream &operands)
@@ -1097,7 +1097,7 @@ void Msod::Options::initialise()
     m_geoTop = 0;
     m_geoRight = 21600;
     m_geoBottom = 21600;
-    m_tqshapePath = 1;
+    m_shapePath = 1;
     delete m_pVertices;
     m_pVertices = 0L;
     m_fShadowOK = true;
@@ -1233,7 +1233,7 @@ void Msod::Options::walk(TQ_UINT32 bytes, TQDataStream &operands)
             m_geoBottom = op.value;
             break;
         case 324:
-            m_tqshapePath = op.value;
+            m_shapePath = op.value;
             break;
         case 383:
             m_fShadowOK = (op.value & 0x0020) != 0;
diff --git a/filters/karbon/msod/msod.h b/filters/karbon/msod/msod.h
index f53146bf..3db6fc2f 100644
--- a/filters/karbon/msod/msod.h
+++ b/filters/karbon/msod/msod.h
@@ -44,15 +44,15 @@ public:
         unsigned dpi);
     virtual ~Msod();
 
-    // Called to parse the given file. We extract a drawing by tqshapeId.
+    // Called to parse the given file. We extract a drawing by shapeId.
     // If the drawing is not found, the return value will be false.
 
     bool parse(
-        unsigned tqshapeId,
+        unsigned shapeId,
         const TQString &file,
         const char *delayStream = 0L);
     bool parse(
-        unsigned tqshapeId,
+        unsigned shapeId,
         TQDataStream &stream,
         unsigned size,
         const char *delayStream = 0L);
@@ -114,14 +114,14 @@ private:
         unsigned type;
         char *data;
         unsigned length;
-    } m_tqshape;
+    } m_shape;
 
     TQPoint normalisePoint(
         TQDataStream &operands);
     TQSize normaliseSize(
         TQDataStream &operands);
     void drawShape(
-        unsigned tqshapeType,
+        unsigned shapeType,
         TQ_UINT32 bytes,
         TQDataStream &operands);
 
@@ -244,7 +244,7 @@ private:
         TQ_UINT32 m_geoTop;
         TQ_UINT32 m_geoRight;
         TQ_UINT32 m_geoBottom;
-        TQ_UINT32 m_tqshapePath;
+        TQ_UINT32 m_shapePath;
         TQPointArray *m_pVertices;
         bool m_fShadowOK;
         bool m_f3DOK;
diff --git a/filters/karbon/msod/msodimport.cc b/filters/karbon/msod/msodimport.cc
index c3ee7b2a..e25889c0 100644
--- a/filters/karbon/msod/msodimport.cc
+++ b/filters/karbon/msod/msodimport.cc
@@ -51,13 +51,13 @@ KoFilter::ConversionStatus MSODImport::convert( const TQCString& from, const TQC
     if (to != "application/x-karbon" || from != "image/x-msod")
         return KoFilter::NotImplemented;
 
-    // Get configuration data: the tqshape id, and any delay stream that we were given.
-    unsigned tqshapeId;
-    emit commSignalShapeID( tqshapeId );
+    // Get configuration data: the shape id, and any delay stream that we were given.
+    unsigned shapeId;
+    emit commSignalShapeID( shapeId );
     const char *delayStream = 0L;
     emit commSignalDelayStream( delayStream );
     kdDebug( s_area ) << "##################################################################" << endl;
-    kdDebug( s_area ) << "tqshape id: " << tqshapeId << endl;
+    kdDebug( s_area ) << "shape id: " << shapeId << endl;
     kdDebug( s_area ) << "delay stream: " << delayStream << endl;
     kdDebug( s_area ) << "##################################################################" << endl;
 /*
@@ -68,9 +68,9 @@ KoFilter::ConversionStatus MSODImport::convert( const TQCString& from, const TQC
     kdDebug(s_area) << "MSODImport::filter: config: " << config << endl;
     for (i = 0; i < args.count(); i++)
     {
-        if (args[i].startsWith("tqshape-id="))
+        if (args[i].startsWith("shape-id="))
         {
-            tqshapeId = args[i].mid(9).toUInt();
+            shapeId = args[i].mid(9).toUInt();
         }
         else
         if (args[i].startsWith("delay-stream="))
@@ -91,7 +91,7 @@ KoFilter::ConversionStatus MSODImport::convert( const TQCString& from, const TQC
     m_text += "<DOC mime=\"application/x-karbon\" syntaxVersion=\"0.1\" editor=\"WMF import filter\">\n";
     m_text += "  <LAYER name=\"Layer\" visible=\"1\">\n";
 
-    if (!parse(tqshapeId, m_chain->inputFile(), delayStream))
+    if (!parse(shapeId, m_chain->inputFile(), delayStream))
         return KoFilter::WrongFormat;
 
     // close doc
diff --git a/filters/karbon/msod/msodimport.h b/filters/karbon/msod/msodimport.h
index 9c721882..9264b7d5 100644
--- a/filters/karbon/msod/msodimport.h
+++ b/filters/karbon/msod/msodimport.h
@@ -68,7 +68,7 @@ protected:
 signals:
     // Communication signals to the parent filters
     void commSignalDelayStream( const char* delay );
-    void commSignalShapeID( unsigned int& tqshapeID );
+    void commSignalShapeID( unsigned int& shapeID );
 
 private:
     virtual void savePartContents( TQIODevice* file );
diff --git a/filters/karbon/svg/svgexport.cc b/filters/karbon/svg/svgexport.cc
index 07381db8..a5ed9b40 100644
--- a/filters/karbon/svg/svgexport.cc
+++ b/filters/karbon/svg/svgexport.cc
@@ -171,7 +171,7 @@ TQString
 SvgExport::getID( VObject *obj )
 {
 	if( obj && !obj->name().isEmpty() )
-		return TQString( " id=\"%1\"" ).tqarg( obj->name() );
+		return TQString( " id=\"%1\"" ).arg( obj->name() );
 	return TQString();
 }
 
@@ -490,9 +490,9 @@ SvgExport::visitVText( VText& text )
 		*m_body << " font-weight=\"bold\"";
 	if( text.font().italic() )
 		*m_body << " font-style=\"italic\"";
-	if( text.tqalignment() == VText::Center )
+	if( text.alignment() == VText::Center )
 		*m_body << " text-anchor=\"middle\"";
-	else if( text.tqalignment() == VText::Right )
+	else if( text.alignment() == VText::Right )
 		*m_body << " text-anchor=\"end\"";
 
 	*m_body << ">" << endl;
diff --git a/filters/karbon/svg/svgimport.cc b/filters/karbon/svg/svgimport.cc
index 580512dc..9d323d3d 100644
--- a/filters/karbon/svg/svgimport.cc
+++ b/filters/karbon/svg/svgimport.cc
@@ -138,7 +138,7 @@ void SvgImport::convert()
 	m_outerRect = m_document.boundingBox();
 
 	// undo y-mirroring
-	//m_debug->append(TQString("%1\tUndo Y-mirroring.").tqarg(m_time.elapsed()));
+	//m_debug->append(TQString("%1\tUndo Y-mirroring.").arg(m_time.elapsed()));
 	if( !docElem.attribute( "viewBox" ).isEmpty() )
 	{
 		// allow for viewbox def with ',' or whitespace
@@ -692,17 +692,17 @@ void SvgImport::parsePA( VObject *obj, SvgGraphicsContext *gc, const TQString &c
 					//kdDebug() << "!!!!!!bbox y : " << bbox.y() << endl;
 					//kdDebug() << gc->fill.gradient().origin().x() << endl;
 					//kdDebug() << gc->fill.gradient().vector().x() << endl;
-					double offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().x() ), true, false, bbox );
-					double offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().y() ), false, true, bbox );
+					double offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().x() ), true, false, bbox );
+					double offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().y() ), false, true, bbox );
 					gc->fill.gradient().setOrigin( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					if(gc->fill.gradient().type() == VGradient::radial)
 					{
-						offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
-						offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
+						offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
+						offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
 						gc->fill.gradient().setFocalPoint( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					}
-					offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().x() ), true, false, bbox );
-					offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().y() ), false, true, bbox );
+					offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().x() ), true, false, bbox );
+					offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().y() ), false, true, bbox );
 					gc->fill.gradient().setVector( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					//kdDebug() << offsety << endl;
 					//kdDebug() << gc->fill.gradient().origin().x() << endl;
diff --git a/filters/karbon/xaml/xamlexport.cc b/filters/karbon/xaml/xamlexport.cc
index 636268b7..e1599a8c 100644
--- a/filters/karbon/xaml/xamlexport.cc
+++ b/filters/karbon/xaml/xamlexport.cc
@@ -161,7 +161,7 @@ TQString
 XAMLExport::getID( VObject *obj )
 {
 	if( obj && !obj->name().isEmpty() )
-		return TQString( " Name=\"%1\"" ).tqarg( obj->name() );
+		return TQString( " Name=\"%1\"" ).arg( obj->name() );
 	return TQString();
 }
 
diff --git a/filters/karbon/xaml/xamlimport.cc b/filters/karbon/xaml/xamlimport.cc
index cbe8ddbb..002001e2 100644
--- a/filters/karbon/xaml/xamlimport.cc
+++ b/filters/karbon/xaml/xamlimport.cc
@@ -24,9 +24,9 @@
 #include <kdebug.h>
 #include <KoUnit.h>
 #include <KoGlobal.h>
-#include <tqshapes/vellipse.h>
-#include <tqshapes/vrectangle.h>
-#include <tqshapes/vpolygon.h>
+#include <shapes/vellipse.h>
+#include <shapes/vrectangle.h>
+#include <shapes/vpolygon.h>
 #include <commands/vtransformcmd.h>
 #include <core/vsegment.h>
 #include <core/vtext.h>
@@ -466,14 +466,14 @@ XAMLImport::parsePA( VObject *obj, XAMLGraphicsContext *gc, const TQString &comm
 				//kdDebug() << "!!!!!!bbox y : " << bbox.y() << endl;
 				//kdDebug() << gc->fill.gradient().origin().x() << endl;
 				//kdDebug() << gc->fill.gradient().vector().x() << endl;
-				double offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().x() ), true, false, bbox );
-				double offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().y() ), false, true, bbox );
+				double offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().x() ), true, false, bbox );
+				double offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().y() ), false, true, bbox );
 				gc->fill.gradient().setOrigin( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
-				offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
-				offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
+				offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
+				offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
 				gc->fill.gradient().setFocalPoint( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
-				offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().x() ), true, false, bbox );
-				offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().y() ), false, true, bbox );
+				offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().x() ), true, false, bbox );
+				offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().y() ), false, true, bbox );
 				gc->fill.gradient().setVector( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 				//kdDebug() << offsety << endl;
 				//kdDebug() << gc->fill.gradient().origin().x() << endl;
diff --git a/filters/karbon/xcf/xcfexport.cc b/filters/karbon/xcf/xcfexport.cc
index 8de11197..215c4f01 100644
--- a/filters/karbon/xcf/xcfexport.cc
+++ b/filters/karbon/xcf/xcfexport.cc
@@ -128,10 +128,10 @@ XcfExport::visitVDocument( VDocument& document )
 
 
 	// Save current offset.
-	current = m_stream->tqdevice()->at();
+	current = m_stream->device()->at();
 
 	// Leave space for layer and channel offsets.
-	m_stream->tqdevice()->at(
+	m_stream->device()->at(
 		// current position + (number layers + number channels + 2) * 4.
 		current + ( document.layers().count() + 3 + 2 ) * 4 );
 
@@ -142,7 +142,7 @@ XcfExport::visitVDocument( VDocument& document )
 	for( ; itr.current(); ++itr )
 	{
 		// Save start offset.
-		start = m_stream->tqdevice()->at();
+		start = m_stream->device()->at();
 
 
 		// Write layer.
@@ -150,31 +150,31 @@ XcfExport::visitVDocument( VDocument& document )
 
 
 		// Save end offset.
-		end = m_stream->tqdevice()->at();
+		end = m_stream->device()->at();
 
 		// Return to current offset.
-		m_stream->tqdevice()->at( current );
+		m_stream->device()->at( current );
 
 		// Save layer offset.
 		*m_stream << start;
 
 		// Increment offset.
-		current = m_stream->tqdevice()->at();
+		current = m_stream->device()->at();
 
 		// Return to end offset.
-		m_stream->tqdevice()->at( end );
+		m_stream->device()->at( end );
 	}
 
 
 	// Return to current offset.
-	m_stream->tqdevice()->at( current );
+	m_stream->device()->at( current );
 
 	// Append a zero offset to indicate end of layer offsets.
 	*m_stream << static_cast<TQ_UINT32>( 0 );
 
 
 	// Return to end offset.
-	m_stream->tqdevice()->at( end );
+	m_stream->device()->at( end );
 
 	// Append a zero offset to indicate end of channel offsets.
 	*m_stream << static_cast<TQ_UINT32>( 0 );
@@ -279,13 +279,13 @@ XcfExport::visitVLayer( VLayer& layer )
 	TQIODevice::Offset end = 0;
 
 	// Save current offset.
-	current = m_stream->tqdevice()->at();
+	current = m_stream->device()->at();
 
 	// Leave space for hierarchy offsets.
-	m_stream->tqdevice()->at( current + 8 );
+	m_stream->device()->at( current + 8 );
 
 	// Save start offset.
-	start = m_stream->tqdevice()->at();
+	start = m_stream->device()->at();
 
 
 	// Write hierarchy.
@@ -293,10 +293,10 @@ XcfExport::visitVLayer( VLayer& layer )
 
 
 	// Save end offset.
-	end = m_stream->tqdevice()->at();
+	end = m_stream->device()->at();
 
 	// Return to current offset.
-	m_stream->tqdevice()->at( current );
+	m_stream->device()->at( current );
 
 	// Save hierarchy offset.
 	*m_stream << start;
@@ -333,15 +333,15 @@ XcfExport::writeHierarchy()
 	int height = m_height;
 
 	// Save current offset.
-	current = m_stream->tqdevice()->at();
+	current = m_stream->device()->at();
 
 	// Leave space for level offsets.
-	m_stream->tqdevice()->at( current + ( levels + 1 ) * 4 );
+	m_stream->device()->at( current + ( levels + 1 ) * 4 );
 
 	for( int i = 0; i < levels; ++i )
 	{
 		// Save start offset.
-		start = m_stream->tqdevice()->at();
+		start = m_stream->device()->at();
 
 		if( i == 0 )
 		{
@@ -360,23 +360,23 @@ XcfExport::writeHierarchy()
 		}
 
 		// Save end offset.
-		end = m_stream->tqdevice()->at();
+		end = m_stream->device()->at();
 
 		// Return to current offset.
-		m_stream->tqdevice()->at( current );
+		m_stream->device()->at( current );
 
 		// Save level offset.
 		*m_stream << start;
 
 		// Increment offset.
-		current = m_stream->tqdevice()->at();
+		current = m_stream->device()->at();
 
 		// Return to end offset.
-		m_stream->tqdevice()->at( end );
+		m_stream->device()->at( end );
 	}
 
 	// Return to current offset.
-	m_stream->tqdevice()->at( current );
+	m_stream->device()->at( current );
 
 	// Append a zero offset to indicate end of level offsets.
 	*m_stream << static_cast<TQ_UINT32>( 0 );
@@ -398,15 +398,15 @@ XcfExport::writeLevel()
 	int tiles = rows * cols;
 
 	// Save current offset.
-	current = m_stream->tqdevice()->at();
+	current = m_stream->device()->at();
 
 	// Leave space for tile offsets.
-	m_stream->tqdevice()->at( current + ( tiles + 1 ) * 4 );
+	m_stream->device()->at( current + ( tiles + 1 ) * 4 );
 
 	for( int i = 0; i < tiles; ++i )
 	{
 		// Save start offset.
-		start = m_stream->tqdevice()->at();
+		start = m_stream->device()->at();
 
 
 		// TODO: Save tile.
@@ -425,19 +425,19 @@ XcfExport::writeLevel()
 
 
 		// Save end offset.
-		end = m_stream->tqdevice()->at();
+		end = m_stream->device()->at();
 
 		// Return to current offset.
-		m_stream->tqdevice()->at( current );
+		m_stream->device()->at( current );
 
 		// Save tile offset.
 		*m_stream << start;
 
 		// Increment offset.
-		current = m_stream->tqdevice()->at();
+		current = m_stream->device()->at();
 
 		// Return to end offset.
-		m_stream->tqdevice()->at( end );
+		m_stream->device()->at( end );
 	}
 }
 
diff --git a/filters/kformula/mathml/mathmlimport.cc b/filters/kformula/mathml/mathmlimport.cc
index 6e1eeebb..eb882e0b 100644
--- a/filters/kformula/mathml/mathmlimport.cc
+++ b/filters/kformula/mathml/mathmlimport.cc
@@ -68,7 +68,7 @@ KoFilter::ConversionStatus MathMLImport::convert( const TQCString& from, const T
     const TQString filename( m_chain->inputFile() );
     TQFile f( filename );
     if ( !f.open( IO_ReadOnly ) ) {
-        KMessageBox::error( 0, i18n( "Failed to open input file: %1" ).tqarg( filename ), i18n( "MathML Import Error" ) );
+        KMessageBox::error( 0, i18n( "Failed to open input file: %1" ).arg( filename ), i18n( "MathML Import Error" ) );
         delete wrapper;
         return KoFilter::FileNotFound;
     }
@@ -84,7 +84,7 @@ KoFilter::ConversionStatus MathMLImport::convert( const TQCString& from, const T
             << " In line: " << errorLine << ", column: " << errorColumn << endl
             << " Error message: " << errorMsg << endl;
         KMessageBox::error( 0, i18n( "Parsing error in MathML file %4 at line %1, column %2\nError message: %3" )
-                              .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( "TQXml", errorMsg.utf8() ).tqarg( filename ) ), i18n( "MathML Import Error" ) );
+                              .arg( errorLine ).arg( errorColumn ).arg( i18n ( "TQXml", errorMsg.utf8() ).arg( filename ) ), i18n( "MathML Import Error" ) );
         return KoFilter::WrongFormat;
     }
     f.close();
diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py
index e2e5b50a..c0609de6 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.tqalignment="1"       #text tqalignment, left
+    self.alignment="1"       #text alignment, 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.tqalignment="8"
+      self.alignment="8"
     elif (tokens[0]=='right'):
-      self.tqalignment="2"
+      self.alignment="2"
     elif (tokens[0]=='center'):
-      self.tqalignment="4"
+      self.alignment="4"
     else:
-      self.tqalignment="1" #left
-    #print self.tqalignment
+      self.alignment="1" #left
+    #print self.alignment
 
   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.tqalignment) 
+    pElem.setAttribute("align", self.alignment) 
 
     elem=self.document.createElement("NAME")        #style name
     elem.setAttribute("value", "Standard")          ###is this needed at all?
@@ -377,7 +377,7 @@ class MgpImporter:
             self.__setFontSize(command)
           elif (command.startswith('left') or
                 command.startswith('center') or
-                command.startswith('right')):             #text tqalignment
+                command.startswith('right')):             #text alignment
             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 be986d92..55a3e265 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressexport.cc
@@ -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.tqarg( TQString::number( tmpX ) ).tqarg( TQString::number( tmpY ) );
+                m_helpLine+=str.arg( TQString::number( tmpX ) ).arg( TQString::number( tmpY ) );
             }
         }
     }
@@ -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 tqgeometry
+    // set the geometry
     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" ).tqarg( m_pictureIndex );
+    TQString pictureName = TQString( "Picture/Picture%1" ).arg( 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 tqgeometry
+// set the geometry
     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 tqgeometry
+    // set the geometry
     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 tqgeometry
+    // set the geometry
     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 tqgeometry
+    // set the geometry
     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 tqgeometry
+    // set the geometry
     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" ).tqarg( KoUnit::toCM( y ) ) );
+    target.setAttribute( "svg:y", TQString( "%1cm" ).arg( 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" ).tqarg( tmpX ).tqarg( tmpY );
+                        listOfPoint += TQString( " %1,%2" ).arg( tmpX ).arg( tmpY );
                     else
-                        listOfPoint = TQString( "%1,%2" ).tqarg( tmpX ).tqarg( tmpY );
+                        listOfPoint = TQString( "%1,%2" ).arg( tmpX ).arg( tmpY );
                     maxX = TQMAX( maxX, tmpX );
                     maxY = TQMAX( maxY, tmpY );
                 }
                 elemPoint = elemPoint.nextSibling().toElement();
             }
             target.setAttribute( "draw:points", listOfPoint );
-            target.setAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( maxX ).tqarg( maxY ) );
+            target.setAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).arg( maxX ).arg( 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)" ).tqarg( value );
+        str=TQString( "rotate (%1)" ).arg( 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" ).tqarg( KoUnit::toCM( x2 ) );
+    TQString xpos2 = TQString( "%1cm" ).arg( KoUnit::toCM( x2 ) );
 
     if ( type == 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 ) ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y2/2.0 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2/2.0 ) ) );
     }
     else if ( type == 1 )
     {
-        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 ) );
+        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 ) );
         xpos2 = xpos1;
     }
     else if ( type == 3 ) // from left bottom to right top
     {
-        target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) );
-        target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) );
     }
     else // from left top to right bottom
     {
-        target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) );
-        target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) );
     }
     target.setAttribute( "svg:x1", xpos1 );
     target.setAttribute( "svg:x2", xpos2 );
diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc
index f7322342..77e1f38c 100644
--- a/filters/kpresenter/ooimpress/ooimpressimport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressimport.cc
@@ -1498,15 +1498,15 @@ TQDomElement OoImpressImport::parseTextBox( TQDomDocument& doc, const TQDomEleme
     TQDomElement textObjectElement = doc.createElement( "TEXTOBJ" );
     appendTextObjectMargin( doc, textObjectElement );
 
-    // vertical tqalignment
+    // vertical alignment
     if ( m_styleStack.hasAttributeNS( ooNS::draw, "textarea-vertical-align" ) )
     {
-        TQString tqalignment = m_styleStack.attributeNS( ooNS::draw, "textarea-vertical-align" );
-        if ( tqalignment == "top" )
+        TQString alignment = m_styleStack.attributeNS( ooNS::draw, "textarea-vertical-align" );
+        if ( alignment == "top" )
             textObjectElement.setAttribute( "verticalAlign", "top" );
-        else if ( tqalignment == "middle" )
+        else if ( alignment == "middle" )
             textObjectElement.setAttribute( "verticalAlign", "center" );
-        else if ( tqalignment == "bottom" )
+        else if ( alignment == "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 tqalignment
+    // Paragraph alignment
     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" ).tqarg( m_numPicture++ ) + extension;
+    TQString fileName = TQString( "picture%1" ).arg( 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" ).tqarg( m_numSound++ ) + extension;
+    TQString fileName = TQString( "sound%1" ).arg( m_numSound++ ) + extension;
     fileName = "sounds/" + fileName;
     KoStoreDevice* out = m_chain->storageFile( fileName, KoStore::Write );
 
@@ -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-tqshape" && e.hasAttributeNS( ooNS::draw, "tqshape-id" ) )
+        if ( ns == ooNS::presentation && localName == "show-shape" && e.hasAttributeNS( ooNS::draw, "shape-id" ) )
         {
-            TQString name = e.attributeNS( ooNS::draw, "tqshape-id", TQString() );
+            TQString name = e.attributeNS( ooNS::draw, "shape-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:tqshape-id) :"<<e.attributeNS( ooNS::draw, "tqshape-id", TQString())<<endl;
-        if (e.tagName()=="presentation:show-tqshape" && e.attributeNS( ooNS::draw, "tqshape-id", TQString())==id)
+        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)
                 return e;
     }
 
diff --git a/filters/kpresenter/ooimpress/status.html b/filters/kpresenter/ooimpress/status.html
index f64a38b0..8c34c4d1 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 tqalignment for text<br>
+      -Qt::Vertical alignment 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 tqalignment for text<br>
+	  -Qt::Vertical alignment 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 a25ba52a..e50b652e 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" ).tqarg( index );
+    m_name = TQString( "Gradient %1" ).arg( 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%" ).tqarg( cx / 4 + 50 );
-                m_cy = TQString( "%1%" ).tqarg( cy / 4 + 50 );
+                m_cx = TQString( "%1%" ).arg( cx / 4 + 50 );
+                m_cy = TQString( "%1%" ).arg( 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%" ).tqarg( cx / 4 + 50 );
-                m_cy = TQString( "%1%" ).tqarg( cy / 4 + 50 );
+                m_cx = TQString( "%1%" ).arg( cx / 4 + 50 );
+                m_cy = TQString( "%1%" ).arg( 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" ).tqarg( index );
-    m_style = TQString( "Default%1" ).tqarg( index );
+    m_name = TQString( "PM%1" ).arg( index );
+    m_style = TQString( "Default%1" ).arg( 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" ).tqarg( index );
+    m_name = TQString( "dp%1" ).arg( 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" ).tqarg( hours ).tqarg( ms ).tqarg( sec );
+        m_page_duration = TQString( "PT%1H%2M%3S" ).arg( hours ).arg( ms ).arg( 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" ).tqarg( index );
+    m_name = TQString( "T%1" ).arg( index );
     if ( e.hasAttribute( "family" ) )
         m_font_family = e.attribute( "family" );
     if ( e.hasAttribute( "pointSize" ) )
-        m_font_size = TQString( "%1pt" ).tqarg( e.attribute( "pointSize" ) );
+        m_font_size = TQString( "%1pt" ).arg( 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" ).tqarg( textObjectElement.attribute( "bleftpt" ) );
+            m_textMarginLeft = TQString( "%1pt" ).arg( textObjectElement.attribute( "bleftpt" ) );
         }
         if ( textObjectElement.hasAttribute( "bbottompt" ) )
         {
-            m_textMarginBottom = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "bbottompt" ) );
+            m_textMarginBottom = TQString( "%1pt" ).arg( textObjectElement.attribute( "bbottompt" ) );
         }
         if ( textObjectElement.hasAttribute( "btoppt" ) )
         {
-            m_textMarginTop = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "btoppt" ) );
+            m_textMarginTop = TQString( "%1pt" ).arg( textObjectElement.attribute( "btoppt" ) );
         }
         if ( textObjectElement.hasAttribute( "brightpt" ) )
         {
-            m_textMarginRight = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "brightpt" ) );
+            m_textMarginRight = TQString( "%1pt" ).arg( textObjectElement.attribute( "brightpt" ) );
         }
 
     }
-    kdDebug(30518)<<" tqalignment :"<<m_textAlignment<<endl;
+    kdDebug(30518)<<" alignment :"<<m_textAlignment<<endl;
 
-    m_name = TQString( "gr%1" ).tqarg( index );
+    m_name = TQString( "gr%1" ).arg( 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" ).tqarg( index );
+    m_name = TQString( "P%1" ).arg( 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" ).tqarg( s.attribute( "distance" ) );
+        TQString distance = TQString( "%1pt" ).arg( 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%" ).tqarg( l.attribute( "spacingvalue" ).toInt() * 100 );
+            m_line_height = TQString( "%1%" ).arg( 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" ).tqarg( width ).tqarg( style ).tqarg( color.name() );
+    return TQString( "%1 %2 %3" ).arg( width ).arg( style ).arg( 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" ).tqarg( index );
+    m_name = TQString( "L%1" ).arg( 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" ).tqarg( m_min_label_width ) );
+                                     TQString( "%1cm" ).arg( m_min_label_width ) );
             properties.setAttribute( "text:space-before",
-                                     TQString( "%1cm" ).tqarg( m_min_label_width * ( level - 1 ) ) );
+                                     TQString( "%1cm" ).arg( 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 0b89e187..8b9d1e77 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.cc
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc
@@ -156,8 +156,8 @@ TQByteArray PowerPointImport::createStyles()
   TQByteArray stylesData;
   TQBuffer stylesBuffer( stylesData );
 
-  TQString pageWidth = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageWidth() );
-  TQString pageHeight = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageHeight() );
+  TQString pageWidth = TQString("%1pt").arg( d->presentation->masterSlide()->pageWidth() );
+  TQString pageHeight = TQString("%1pt").arg( d->presentation->masterSlide()->pageHeight() );
   
   stylesBuffer.open( IO_WriteOnly );
   stylesWriter = new KoXmlWriter( &stylesBuffer );
@@ -351,11 +351,11 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   xmlWriter->startElement( "draw:ellipse" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
@@ -372,11 +372,11 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
   if( !drawObject ) return;
   if( !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   xmlWriter->startElement( "draw:rect" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
@@ -393,7 +393,7 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
 
      double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle);
      double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); 
-     TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); 
+     TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); 
      xmlWriter->addAttribute( "draw:transform", rot );        
   }
   else 
@@ -409,13 +409,13 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   
      
@@ -435,7 +435,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
 
         double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle);
         double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); 
-        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid+yNew); 
+        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid+yNew); 
         xmlWriter->addAttribute( "draw:transform", rot );        
      }  
      else
@@ -448,7 +448,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
 
         double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle);
         double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); 
-        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); 
+        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); 
         xmlWriter->addAttribute( "draw:transform", rot );                
      } 
      
@@ -464,7 +464,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
  // xmlWriter->addAttribute( "svg:y", yStr );
   
   xmlWriter->addAttribute( "draw:layer", "tqlayout" );
-    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+    xmlWriter->startElement( "draw:enhanced-geometry" );
     xmlWriter->addAttribute( "draw:type", "round-rectangle"); 
       xmlWriter->startElement( "draw:equation" );
       xmlWriter->addAttribute( "draw:formula", "$0 /3" );
@@ -486,21 +486,21 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
       xmlWriter->addAttribute( "draw:formula", "top+?f0 " );
       xmlWriter->addAttribute( "draw:name", "f4" ); 
       xmlWriter->endElement(); // draw:equation 
-    xmlWriter->endElement(); // draw:enhanced-tqgeometry
-  xmlWriter->endElement(); // draw:custom-tqshape
+    xmlWriter->endElement(); // draw:enhanced-geometry
+  xmlWriter->endElement(); // draw:custom-shape
 }
 
 void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -522,7 +522,7 @@ void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->addAttribute( "svg:x", 10 );
     xmlWriter->addAttribute( "svg:y", 5 );
     xmlWriter->endElement();
-    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+    xmlWriter->startElement( "draw:enhanced-geometry" );
     xmlWriter->addAttribute( "draw:type", "diamond");
     xmlWriter->endElement();    
   xmlWriter->addAttribute( "draw:layer", "tqlayout" );
@@ -533,14 +533,14 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   /* draw IsocelesTriangle or RightTriangle */
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -572,7 +572,7 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
     xmlWriter->addAttribute( "svg:y", 5 );
     xmlWriter->endElement();
 
-    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+    xmlWriter->startElement( "draw:enhanced-geometry" );
        
     if  (drawObject->hasProperty("draw:mirror-vertical"))
     { 
@@ -588,14 +588,14 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
      double rotAngle = drawObject->getDoubleProperty("libppt:rotation" );
      double xMid = ( drawObject->left() + 0.5*drawObject->width() ); 
      double yMid = ( drawObject->top() + 0.5*drawObject->height() ); 
-     TQString rot = TQString("rotate (%1) translate (%2cm %3cm)").tqarg(rotAngle).tqarg(xMid).tqarg(yMid); 
+     TQString rot = TQString("rotate (%1) translate (%2cm %3cm)").arg(rotAngle).arg(xMid).arg(yMid); 
      xmlWriter->addAttribute( "draw:transform", rot );   
     }
-    if (drawObject->tqshape() == DrawObject::RightTriangle)
+    if (drawObject->shape() == DrawObject::RightTriangle)
     {
     xmlWriter->addAttribute( "draw:type", "right-triangle");
     }
-    else if (drawObject->tqshape() == DrawObject::IsoscelesTriangle)
+    else if (drawObject->shape() == DrawObject::IsoscelesTriangle)
     {    
     xmlWriter->addAttribute( "draw:type", "isosceles-triangle");
           xmlWriter->startElement( "draw:equation" );
@@ -637,21 +637,21 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
           xmlWriter->endElement();    
     }
    
-    xmlWriter->endElement();    // enhanced-tqgeometry  
-  xmlWriter->endElement(); // custom-tqshape
+    xmlWriter->endElement();    // enhanced-geometry  
+  xmlWriter->endElement(); // custom-shape
 }
 
 void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -675,7 +675,7 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 10 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
         if ( drawObject->hasProperty("draw:mirror-vertical") ) 
         { 
           xmlWriter->addAttribute("draw:mirror-vertical","true");         
@@ -718,21 +718,21 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm
     xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
       xmlWriter->addAttribute("draw:handle-position","$0 bottom");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape  
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape  
 }
 
 void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );  
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -763,7 +763,7 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter
   xmlWriter->addAttribute( "svg:x", 1.25 );
   xmlWriter->addAttribute( "svg:y", 5 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
         if  (drawObject->hasProperty("draw:mirror-vertical"))
         { 
           xmlWriter->addAttribute("draw:mirror-vertical","true");         
@@ -834,21 +834,21 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter
     xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
       xmlWriter->addAttribute("draw:handle-position","$0 top");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape  
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape  
 }
 
 void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-    xmlWriter->startElement( "draw:custom-tqshape" );
+    xmlWriter->startElement( "draw:custom-shape" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
     xmlWriter->addAttribute( "svg:width", widthStr );
     xmlWriter->addAttribute( "svg:height", heightStr );
@@ -871,7 +871,7 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW
   xmlWriter->addAttribute( "svg:x", 10 );
   xmlWriter->addAttribute( "svg:y", 5 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
   xmlWriter->addAttribute( "draw:type", "hexagon" );
           xmlWriter->startElement( "draw:equation" );
           xmlWriter->addAttribute( "draw:formula", "$0 " );
@@ -898,21 +898,21 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
       xmlWriter->addAttribute("draw:handle-position","$0 top");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape
 }
 
 void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -935,7 +935,7 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW
   xmlWriter->addAttribute( "svg:x", 10 );
   xmlWriter->addAttribute( "svg:y", 4.782 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
   xmlWriter->addAttribute( "draw:type", "octagon" );
           xmlWriter->startElement( "draw:equation" );
           xmlWriter->addAttribute( "draw:formula", "left+$0 " );
@@ -978,36 +978,36 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
       xmlWriter->addAttribute("draw:handle-position","$0 top");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape  
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape  
 }
 
 void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
   xmlWriter->addAttribute( "draw:layer", "tqlayout" );
-    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+    xmlWriter->startElement( "draw:enhanced-geometry" );
     
-                if (drawObject->tqshape() == DrawObject::RightArrow)
+                if (drawObject->shape() == DrawObject::RightArrow)
                 xmlWriter->addAttribute( "draw:type", "right-arrow" );
-      else if (drawObject->tqshape() == DrawObject::LeftArrow)
+      else if (drawObject->shape() == DrawObject::LeftArrow)
       xmlWriter->addAttribute( "draw:type", "left-arrow" );
-    else if (drawObject->tqshape() == DrawObject::UpArrow)
+    else if (drawObject->shape() == DrawObject::UpArrow)
       xmlWriter->addAttribute( "draw:type", "up-arrow" );
-    else if (drawObject->tqshape() == DrawObject::DownArrow)
+    else if (drawObject->shape() == DrawObject::DownArrow)
       xmlWriter->addAttribute( "draw:type", "down-arrow" );   
     xmlWriter->startElement( "draw:equation" ); 
                 xmlWriter->addAttribute( "draw:formula","$1");  
@@ -1042,7 +1042,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
     xmlWriter->addAttribute( "draw:name","f7");  
                 xmlWriter->endElement(); // draw:equation
     xmlWriter->startElement( "draw:handle" );
-                if ( drawObject->tqshape() == DrawObject::RightArrow | drawObject->tqshape() == DrawObject::LeftArrow ) 
+                if ( drawObject->shape() == DrawObject::RightArrow | drawObject->shape() == DrawObject::LeftArrow ) 
                 {
       xmlWriter->addAttribute( "draw:handle-range-x-maximum", 21600);  
       xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
@@ -1050,7 +1050,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
       xmlWriter->addAttribute("draw:handle-range-y-maximum",10800);
       xmlWriter->addAttribute("draw:handle-range-y-minimum",0);
     }
-    else if ( drawObject->tqshape() == DrawObject::UpArrow | drawObject->tqshape() == DrawObject::DownArrow )
+    else if ( drawObject->shape() == DrawObject::UpArrow | drawObject->shape() == DrawObject::DownArrow )
                 {
                   xmlWriter->addAttribute( "draw:handle-range-x-maximum", 10800);  
       xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
@@ -1059,19 +1059,19 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
       xmlWriter->addAttribute("draw:handle-range-y-minimum",0);            
     }
                 xmlWriter->endElement(); // draw:handle
-      xmlWriter->endElement(); // draw:enhanced-tqgeometry  
-    xmlWriter->endElement(); // draw:custom-tqshape
+      xmlWriter->endElement(); // draw:enhanced-geometry  
+    xmlWriter->endElement(); // draw:custom-shape
 }
 
 void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter) return;
 
-  TQString x1Str = TQString("%1mm").tqarg( drawObject->left() );
-  TQString y1Str = TQString("%1mm").tqarg( drawObject->top() );
-  TQString x2Str = TQString("%1mm").tqarg( drawObject->left() + drawObject->width() );
-  TQString y2Str = TQString("%1mm").tqarg( drawObject->top() + drawObject->height() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString x1Str = TQString("%1mm").arg( drawObject->left() );
+  TQString y1Str = TQString("%1mm").arg( drawObject->top() );
+  TQString x2Str = TQString("%1mm").arg( drawObject->left() + drawObject->width() );
+  TQString y2Str = TQString("%1mm").arg( drawObject->top() + drawObject->height() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   if ( drawObject->hasProperty("draw:mirror-vertical") )
     { TQString temp = y1Str; 
@@ -1099,13 +1099,13 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
 {
   if( !drawObject ||!xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-    xmlWriter->startElement( "draw:custom-tqshape" );
+    xmlWriter->startElement( "draw:custom-shape" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
     xmlWriter->addAttribute( "svg:width", widthStr );
     xmlWriter->addAttribute( "svg:height", heightStr );
@@ -1136,7 +1136,7 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
   xmlWriter->addAttribute( "svg:x", 8.536 );
   xmlWriter->addAttribute( "svg:y", 1.461 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
   xmlWriter->addAttribute( "draw:type", "smiley" );
           xmlWriter->startElement( "draw:equation" );
           xmlWriter->addAttribute( "draw:formula", "$0-15510 " );
@@ -1156,21 +1156,21 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
     xmlWriter->addAttribute( "draw:handle-range-y-minimum", 15510);
       xmlWriter->addAttribute("draw:handle-position","$0 top");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape
 }
 
 void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-    xmlWriter->startElement( "draw:custom-tqshape" );
+    xmlWriter->startElement( "draw:custom-shape" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
     xmlWriter->addAttribute( "svg:width", widthStr );
     xmlWriter->addAttribute( "svg:height", heightStr );
@@ -1193,22 +1193,22 @@ void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWri
   xmlWriter->addAttribute( "svg:x", 8.553 );
   xmlWriter->addAttribute( "svg:y", 5 );
   xmlWriter->endElement();
-  xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+  xmlWriter->startElement( "draw:enhanced-geometry" );
   xmlWriter->addAttribute( "draw:type", "heart" );
         
-        xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape
+        xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape
 }
 
 void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xmlWriter)
 {
   if( !drawObject ||!xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
     xmlWriter->startElement( "draw:path" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
@@ -1228,63 +1228,63 @@ void PowerPointImport::processDrawingObjectForBody( DrawObject* drawObject, KoXm
   drawingObjectCounter++;
   
    
-  if (drawObject->tqshape() == DrawObject::Ellipse)
+  if (drawObject->shape() == DrawObject::Ellipse)
   { 
     processEllipse (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::Rectangle)
+  else if (drawObject->shape() == DrawObject::Rectangle)
   { 
     processRectangle (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::RoundRectangle)
+  else if (drawObject->shape() == DrawObject::RoundRectangle)
   { 
     processRoundRectangle (drawObject, xmlWriter );
   }
-  else  if (drawObject->tqshape() == DrawObject::Diamond)
+  else  if (drawObject->shape() == DrawObject::Diamond)
   {  
     processDiamond (drawObject, xmlWriter ); 
   } 
-  else  if (drawObject->tqshape() == DrawObject::IsoscelesTriangle |                
-            drawObject->tqshape() == DrawObject::RightTriangle)
+  else  if (drawObject->shape() == DrawObject::IsoscelesTriangle |                
+            drawObject->shape() == DrawObject::RightTriangle)
   {  
     processTriangle (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::Trapezoid)
+  else if (drawObject->shape() == DrawObject::Trapezoid)
   {  
     processTrapezoid (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::Parallelogram)
+  else if (drawObject->shape() == DrawObject::Parallelogram)
   {  
     processParallelogram( drawObject, xmlWriter); 
   }
-  else if (drawObject->tqshape() == DrawObject::Hexagon)
+  else if (drawObject->shape() == DrawObject::Hexagon)
   {  
     processHexagon ( drawObject, xmlWriter );
   }
-  else if (drawObject->tqshape() == DrawObject::Octagon)
+  else if (drawObject->shape() == DrawObject::Octagon)
   {  
     processOctagon ( drawObject, xmlWriter );
   }
-  else if (drawObject->tqshape() == DrawObject::RightArrow | 
-     drawObject->tqshape() == DrawObject::LeftArrow | 
-     drawObject->tqshape() == DrawObject::UpArrow | 
-     drawObject->tqshape() == DrawObject::DownArrow )
+  else if (drawObject->shape() == DrawObject::RightArrow | 
+     drawObject->shape() == DrawObject::LeftArrow | 
+     drawObject->shape() == DrawObject::UpArrow | 
+     drawObject->shape() == DrawObject::DownArrow )
   { 
     processArrow ( drawObject, xmlWriter );
   }
-  else if (drawObject->tqshape() == DrawObject::Line)
+  else if (drawObject->shape() == DrawObject::Line)
   {  
     processLine ( drawObject, xmlWriter );
   }
-  else if (drawObject->tqshape() == DrawObject::Smiley)
+  else if (drawObject->shape() == DrawObject::Smiley)
   { 
     processSmiley (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::Heart)
+  else if (drawObject->shape() == DrawObject::Heart)
   { 
     processHeart (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::FreeLine)
+  else if (drawObject->shape() == DrawObject::FreeLine)
   { 
     processFreeLine (drawObject, xmlWriter ); 
   }
@@ -1317,10 +1317,10 @@ void PowerPointImport::processTextObjectForBody( TextObject* textObject, KoXmlWr
 //  TQString pStr = string( textObject->text() ).string();
   TQString pStr;
  
-  TQString widthStr = TQString("%1mm").tqarg( textObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( textObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( textObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( textObject->top() );
+  TQString widthStr = TQString("%1mm").arg( textObject->width() );
+  TQString heightStr = TQString("%1mm").arg( textObject->height() );
+  TQString xStr = TQString("%1mm").arg( textObject->left() );
+  TQString yStr = TQString("%1mm").arg( textObject->top() );
 
   xmlWriter->startElement( "draw:frame" );
   xmlWriter->addAttribute( "presentation:style-name", "pr1" );
@@ -1381,9 +1381,9 @@ void PowerPointImport::processSlideForBody( unsigned slideNo, Slide* slide, KoXm
 
   TQString nameStr = Libppt::string( slide->title() ).string();
   if( nameStr.isEmpty() )
-    nameStr = TQString("page%1").tqarg(slideNo+1);
+    nameStr = TQString("page%1").arg(slideNo+1);
 
-  TQString styleNameStr = TQString("dp%1").tqarg(slideNo+1);
+  TQString styleNameStr = TQString("dp%1").arg(slideNo+1);
 
   xmlWriter->startElement( "draw:page" );
   xmlWriter->addAttribute( "draw:master-page-name", "Default" );
@@ -1450,7 +1450,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
   if( !drawObject || !xmlWriter) return;
 
   drawingObjectCounter++;
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:name", styleName );
@@ -1490,7 +1490,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
     if( drawObject->hasProperty( "svg:stroke-width" ) )
     {
       double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" );
-      xmlWriter->addAttribute( "svg:stroke-width",TQString("%1mm").tqarg( strokeWidth ) );
+      xmlWriter->addAttribute( "svg:stroke-width",TQString("%1mm").arg( strokeWidth ) );
     }
 
     if( drawObject->hasProperty( "svg:stroke-color" ) )
@@ -1528,14 +1528,14 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
     {      
       double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" );
       double arrowWidth = (drawObject->getDoubleProperty("draw:marker-start-width") * strokeWidth);
-      xmlWriter->addAttribute( "draw:marker-start-width",TQString("%1cm").tqarg( arrowWidth ) );
+      xmlWriter->addAttribute( "draw:marker-start-width",TQString("%1cm").arg( arrowWidth ) );
     }
 
     if( drawObject->hasProperty( "draw:marker-end-width" ) )
     {
       double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" );
       double arrowWidth = (drawObject->getDoubleProperty("draw:marker-end-width") * strokeWidth);
-      xmlWriter->addAttribute( "draw:marker-end-width",TQString("%1cm").tqarg( arrowWidth ) );
+      xmlWriter->addAttribute( "draw:marker-end-width",TQString("%1cm").arg( arrowWidth ) );
     }
 
     
@@ -1569,19 +1569,19 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
     if( drawObject->hasProperty( "draw:shadow-opacity" ) )
     {      
       double opacity = drawObject->getDoubleProperty("draw:shadow-opacity") ;
-      xmlWriter->addAttribute( "draw:shadow-opacity",TQString("%1%").tqarg( opacity ) );
+      xmlWriter->addAttribute( "draw:shadow-opacity",TQString("%1%").arg( opacity ) );
     }
 
     if( drawObject->hasProperty( "draw:shadow-offset-x" ) )
     {      
       double offset = drawObject->getDoubleProperty("draw:shadow-offset-x") ;
-      xmlWriter->addAttribute( "draw:shadow-offset-x",TQString("%1cm").tqarg( offset ) );
+      xmlWriter->addAttribute( "draw:shadow-offset-x",TQString("%1cm").arg( offset ) );
     }
 
     if( drawObject->hasProperty( "draw:shadow-offset-y" ) )
     {      
       double offset = drawObject->getDoubleProperty("draw:shadow-offset-y"); 
-      xmlWriter->addAttribute( "draw:shadow-offset-y",TQString("%1cm").tqarg( offset ) );
+      xmlWriter->addAttribute( "draw:shadow-offset-y",TQString("%1cm").arg( offset ) );
     }
     
    
diff --git a/filters/kpresenter/powerpoint/libppt/objects.cpp b/filters/kpresenter/powerpoint/libppt/objects.cpp
index d0343b43..29870cbd 100644
--- a/filters/kpresenter/powerpoint/libppt/objects.cpp
+++ b/filters/kpresenter/powerpoint/libppt/objects.cpp
@@ -379,7 +379,7 @@ void GroupObject::takeObject( Object* object )
 class DrawObject::Private
 {
 public:
-  unsigned tqshape;
+  unsigned shape;
   bool isVerFlip; 
   bool isHorFlip;
 };
@@ -387,7 +387,7 @@ public:
 DrawObject::DrawObject()
 {
   d = new Private;
-  d->tqshape = None;
+  d->shape = None;
 }
 
 DrawObject::~DrawObject()
@@ -395,14 +395,14 @@ DrawObject::~DrawObject()
   delete d;
 }
 
-unsigned DrawObject::tqshape() const
+unsigned DrawObject::shape() const
 {
-  return d->tqshape;
+  return d->shape;
 }
 
 void DrawObject::setShape( unsigned s )
 {
-  d->tqshape = s;
+  d->shape = s;
 }
 
 bool DrawObject::isVerFlip() const
diff --git a/filters/kpresenter/powerpoint/libppt/objects.h b/filters/kpresenter/powerpoint/libppt/objects.h
index a9160897..823e2a75 100644
--- a/filters/kpresenter/powerpoint/libppt/objects.h
+++ b/filters/kpresenter/powerpoint/libppt/objects.h
@@ -103,7 +103,7 @@ public:
     Body        = 1, 
     Notes       = 2, 
     NotUsed     = 3,
-    Other       = 4,  // text in a tqshape
+    Other       = 4,  // text in a shape
     CenterBody  = 5,  // subtitle in title slide
     CenterTitle = 6,  // title in title slide
     HalfBody    = 7,  // body in two-column slide
@@ -184,7 +184,7 @@ public:
   virtual ~DrawObject();
   virtual bool isDrawing() const { return true; }
    
-  unsigned tqshape() const;
+  unsigned shape() const;
   void setShape( unsigned s );
 
   bool isVerFlip() const;
diff --git a/filters/kpresenter/powerpoint/libppt/pole.cpp b/filters/kpresenter/powerpoint/libppt/pole.cpp
index b905539d..abfa9385 100644
--- a/filters/kpresenter/powerpoint/libppt/pole.cpp
+++ b/filters/kpresenter/powerpoint/libppt/pole.cpp
@@ -115,7 +115,7 @@ class DirTree
     int indexOf( DirEntry* e );
     int parent( unsigned index );
     std::string fullName( unsigned index );
-    std::vector<unsigned> tqchildren( unsigned index );
+    std::vector<unsigned> children( unsigned index );
     void load( unsigned char* buffer, unsigned len );
     void save( unsigned char* buffer );
     unsigned size();
@@ -505,11 +505,11 @@ int DirTree::indexOf( DirEntry* e )
 
 int DirTree::parent( unsigned index )
 {
-  // brute-force, basically we iterate for each entries, find its tqchildren
-  // and check if one of the tqchildren is 'index'
+  // brute-force, basically we iterate for each entries, find its children
+  // and check if one of the children is 'index'
   for( unsigned j=0; j<entryCount(); j++ )
   {
-    std::vector<unsigned> chi = tqchildren( j );
+    std::vector<unsigned> chi = children( j );
     for( unsigned i=0; i<chi.size();i++ )
       if( chi[i] == index )
         return j;
@@ -573,8 +573,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
 
    for( it = names.begin(); it != names.end(); ++it )
    {
-     // find among the tqchildren of index
-     std::vector<unsigned> chi = tqchildren( index );
+     // find among the children of index
+     std::vector<unsigned> chi = children( index );
      unsigned child = 0;
      for( unsigned i = 0; i < chi.size(); i++ )
      {
@@ -589,7 +589,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
      if( child > 0 ) index = child;
      else
      {
-       // not found among tqchildren
+       // not found among children
        if( !create ) return (DirEntry*)0;
        
        // create a new entry
@@ -646,7 +646,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector<unsigned>& result,
   }
 }
 
-std::vector<unsigned> DirTree::tqchildren( unsigned index )
+std::vector<unsigned> DirTree::children( unsigned index )
 {
   std::vector<unsigned> result;
   
@@ -1249,9 +1249,9 @@ std::list<std::string> Storage::entries( const std::string& path )
   if( e  && e->dir )
   {
     unsigned parent = dt->indexOf( e );
-    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
-    for( unsigned i = 0; i < tqchildren.size(); i++ )
-      result.push_back( dt->entry( tqchildren[i] )->name );
+    std::vector<unsigned> children = dt->children( parent );
+    for( unsigned i = 0; i < children.size(); i++ )
+      result.push_back( dt->entry( children[i] )->name );
   }
   
   return result;
diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
index bf3fc51f..af035c69 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
@@ -4105,7 +4105,7 @@ const unsigned int msofbtSpAtom::id = 61450; /* F00A */
 class msofbtSpAtom::Private
 {
 public:
-  unsigned long tqshapeId;
+  unsigned long shapeId;
   unsigned long persistentFlag;
   bool background;
   bool hFlip; 
@@ -4115,7 +4115,7 @@ public:
 msofbtSpAtom ::msofbtSpAtom ()
 {
   d = new Private;
-  d->tqshapeId = 0;
+  d->shapeId = 0;
   d->persistentFlag = 0;
   d->background = false;
   d->hFlip = false; 
@@ -4127,17 +4127,17 @@ msofbtSpAtom ::~msofbtSpAtom ()
   delete d;
 }
 
-unsigned long msofbtSpAtom::tqshapeId() const
+unsigned long msofbtSpAtom::shapeId() const
 {
-  return d->tqshapeId;
+  return d->shapeId;
 }
 
 void msofbtSpAtom::setShapeId( unsigned long id )
 {
-  d->tqshapeId = id;
+  d->shapeId = id;
 }
 
-const char* msofbtSpAtom::tqshapeTypeAsString() const
+const char* msofbtSpAtom::shapeTypeAsString() const
 {
   switch( instance() )
   {
@@ -5821,7 +5821,7 @@ void PPTReader::handleEscherGroupAtom( msofbtSpgrAtom* atom )
 
   // set rect bound of current group
 
-  // this is tqshape for the group, no need to 
+  // this is shape for the group, no need to 
   d->isShapeGroup = true;
 }
 
diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.h b/filters/kpresenter/powerpoint/libppt/powerpoint.h
index 6eec1564..b2a0f649 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.h
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.h
@@ -1901,9 +1901,9 @@ public:
   msofbtSpAtom ();
   ~msofbtSpAtom ();
 
-  unsigned long tqshapeId() const;
+  unsigned long shapeId() const;
   void setShapeId( unsigned long id );
-  const char* tqshapeTypeAsString() const;
+  const char* shapeTypeAsString() const;
   unsigned long persistentFlag() const;
   void setPersistentFlag( unsigned long persistentFlag );
 
@@ -1957,10 +1957,10 @@ public:
    FillSolid,             // Fill with a solid color
    FillPattern,           // Fill with a pattern (bitmap)
    FillTexture,           // A texture (pattern with its own color map)
-   FillPicture,           // Center a picture in the tqshape
+   FillPicture,           // Center a picture in the shape
    FillShade,             // Shade from start to end points
    FillShadeCenter,       // Shade from bounding rectangle to end point
-   FillShadeShape,        // Shade from tqshape outline to end point
+   FillShadeShape,        // Shade from shape outline to end point
    FillShadeScale,        // Similar to msofillShade, but the fillAngle
    FillShadeTitle,        // special type - shade to title ---  for PP 
    FillBackground         // Use the background fill color/pattern
@@ -2385,9 +2385,9 @@ public:
   int ruid() const; // rule ID
   void setRuid( int ruid );
   int align() const;
-  void setAlign( int align );// tqalignment
+  void setAlign( int align );// alignment
   int cProxies() const;
-  void setCProxies( int cProxies );// number of tqshapes governed by rule
+  void setCProxies( int cProxies );// number of shapes governed by rule
     
   void setData( unsigned size, const unsigned char* data );
   const char* name(){ return "msofbtAlignRuleAtom "; }
diff --git a/filters/kspread/applixspread/applixspreadimport.cc b/filters/kspread/applixspread/applixspreadimport.cc
index 2f15eeed..5b88d11c 100644
--- a/filters/kspread/applixspread/applixspreadimport.cc
+++ b/filters/kspread/applixspread/applixspreadimport.cc
@@ -390,7 +390,7 @@ KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, c
               //kdDebug()<< "   Type (%2d)   >%s< ",
               //    nn, (*it).latin1() );
             nn++;
-            // Grep horizontal tqalignment
+            // Grep horizontal alignment
             if      ( (*it) == "1")
             {
                 kdDebug()<< " = left align\n";
@@ -407,7 +407,7 @@ KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, c
               align = 2; // center
 	    }
 
-            // Grep verticale tqalignment
+            // Grep verticale alignment
             else if ( (*it) == "VT")
             {
                 kdDebug()<<" = top valign\n";
@@ -1268,7 +1268,7 @@ APPLIXSPREADImport::readHeader (TQTextStream &stream)
       TQMessageBox::critical (0L, "Applix spreadsheet header problem",
               TQString ("The Applix Spreadsheet header is not correct. "
                        "May be it is not an applix spreadsheet file! <BR>"
-                       "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()),
+                       "This is the header line I did read:<BR><B>%1</B>").arg(mystr.latin1()),
 			"Okay");
 
 
diff --git a/filters/kspread/applixspread/status.html b/filters/kspread/applixspread/status.html
index 968bf333..c944ef5c 100644
--- a/filters/kspread/applixspread/status.html
+++ b/filters/kspread/applixspread/status.html
@@ -53,7 +53,7 @@
        - tests the headline of the document<br>
        - converts &lt;, &gt;, &amp;, to &amp;lt; &amp;gt; &amp;amp;<br>
        - converts all applix special characters<br>
-       - converts fontsize, fontcolor, horizontal and vertical tqalignment, bold, italic, underline<br>
+       - converts fontsize, fontcolor, horizontal and vertical alignment, bold, italic, underline<br>
        - eats long text strings (more than one row in inputfile)<br>
        - converts different tables inside of one document<br>
        - cellformat: background color, brushstyles, brushcolor<br>
@@ -352,43 +352,43 @@
 
 
          <spacer size="20"><U>6.1.1. Part 1 - Alignment format</U><BR>
-         <spacer size="30">This is the tqalignment format for vertical, horizontal tqalignment<BR>
+         <spacer size="30">This is the alignment format for vertical, horizontal alignment<BR>
          <spacer size="30">
          <TABLE CELLPADDING="0" BORDER="0">
           <TR>
            <TD>6.1.1.1&nbsp;&nbsp;</TD>
            <TD><B>1</B></TD>
-           <TD>horizontal tqalignment</TD>
+           <TD>horizontal alignment</TD>
            <TD>left</TD>
           </TR>
           <TR>
            <TD>6.1.1.2&nbsp;&nbsp;</TD>
            <TD><B>2</B></TD>
-           <TD>horizontal tqalignment</TD>
+           <TD>horizontal alignment</TD>
            <TD>right</TD>
           </TR>
           <TR>
            <TD>6.1.1.3&nbsp;&nbsp;</TD>
            <TD><B>3</B></TD>
-           <TD>horizontal tqalignment</TD>
+           <TD>horizontal alignment</TD>
            <TD>center</TD>
           </TR>
           <TR>
            <TD>6.1.1.4&nbsp;&nbsp;</TD>
            <TD><B>VT</B></TD>
-           <TD>vertical tqalignment</TD>
+           <TD>vertical alignment</TD>
            <TD>top</TD>
           </TR>
           <TR>
            <TD>6.1.1.5&nbsp;&nbsp;</TD>
            <TD><B>VC</B></TD>
-           <TD>vertical tqalignment</TD>
+           <TD>vertical alignment</TD>
            <TD>center</TD>
           </TR>
           <TR>
            <TD>6.1.1.5&nbsp;&nbsp;</TD>
            <TD><B>VB</B></TD>
-           <TD>vertical tqalignment</TD>
+           <TD>vertical alignment</TD>
            <TD>bottom</TD>
           </TR>
           <TR>
@@ -402,7 +402,7 @@
 
 
          <spacer size="20"><U>6.1.2. Part 2 - Text format</U><BR>
-         <spacer size="30">This is the tqalignment format for the text<BR>
+         <spacer size="30">This is the alignment format for the text<BR>
          <spacer size="30">
          <TABLE CELLPADDING="0" BORDER="0">
           <TR>
@@ -441,7 +441,7 @@
         
 
          <spacer size="20"><U>6.1.3. Part 3 - Cell format</U><BR>
-         <spacer size="30">This is the tqalignment format for the text<BR>
+         <spacer size="30">This is the alignment format for the text<BR>
          <spacer size="30">
          <TABLE CELLPADDING="0" BORDER="0">
           <TR>
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp
index 95f4727c..0464b782 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -60,14 +60,14 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*
     kapp->restoreOverrideCursor();
     
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
     encodings += KGlobal::charsets()->descriptiveEncodingNames();
     // Add a few non-standard encodings, which might be useful for text files
     const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
-    encodings << description.tqarg("Apple Roman"); // Apple
-    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
-    encodings << description.tqarg("CP 1258"); // Windows
+    encodings << description.arg("Apple Roman"); // Apple
+    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
+    encodings << description.arg("CP 1258"); // Windows
     m_dialog->comboBoxEncoding->insertStringList(encodings);
 
     m_formatList << i18n( "Text" );
@@ -613,7 +613,7 @@ TQTextCodec* CSVDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp
index a4ef1347..285565e7 100644
--- a/filters/kspread/csv/csvexportdialog.cpp
+++ b/filters/kspread/csv/csvexportdialog.cpp
@@ -57,14 +57,14 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent )
   kapp->restoreOverrideCursor();
 
   TQStringList encodings;
-  encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-  encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
+  encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+  encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
   encodings += KGlobal::charsets()->descriptiveEncodingNames();
   // Add a few non-standard encodings, which might be useful for text files
   const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
-  encodings << description.tqarg("Apple Roman"); // Apple
-  encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
-  encodings << description.tqarg("CP 1258"); // Windows
+  encodings << description.arg("Apple Roman"); // Apple
+  encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
+  encodings << description.arg("CP 1258"); // Windows
 
   m_dialog->comboBoxEncoding->insertStringList(encodings);
 
@@ -306,7 +306,7 @@ TQTextCodec* CSVExportDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kspread/csv/dialogui.ui b/filters/kspread/csv/dialogui.ui
index 5e709007..6f7633ec 100644
--- a/filters/kspread/csv/dialogui.ui
+++ b/filters/kspread/csv/dialogui.ui
@@ -379,7 +379,7 @@
                                 <property name="textFormat">
                                     <enum>AutoText</enum>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignCenter</set>
                                 </property>
                             </widget>
@@ -428,7 +428,7 @@
                                 <property name="textFormat">
                                     <enum>AutoText</enum>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignCenter</set>
                                 </property>
                             </widget>
diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui
index a60c3d65..d02f6712 100644
--- a/filters/kspread/csv/exportdialogui.ui
+++ b/filters/kspread/csv/exportdialogui.ui
@@ -254,7 +254,7 @@
                                 <property name="text">
                                     <string>&lt;SHEETNAME&gt; gets replaced by the name of the next sheet.</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
diff --git a/filters/kspread/dbase/dbase.cpp b/filters/kspread/dbase/dbase.cpp
index acc1e27d..2c8ba3b8 100644
--- a/filters/kspread/dbase/dbase.cpp
+++ b/filters/kspread/dbase/dbase.cpp
@@ -165,7 +165,7 @@ bool DBase::load( const TQString& filename )
   }
 
   // set the index to the first record
-  m_stream.tqdevice()->at( m_headerLength );
+  m_stream.device()->at( m_headerLength );
 
   return true;
 }
@@ -184,7 +184,7 @@ TQStringList DBase::readRecord( unsigned recno )
 
   // seek to where the record is
   unsigned filepos = m_headerLength + recno * m_recordLength;
-  m_stream.tqdevice()->at( filepos );
+  m_stream.device()->at( filepos );
 
   // first char == '*' means the record is deleted
   // so we just skip it
diff --git a/filters/kspread/excel/import/excelimport.cc b/filters/kspread/excel/import/excelimport.cc
index e705a933..19f5888b 100644
--- a/filters/kspread/excel/import/excelimport.cc
+++ b/filters/kspread/excel/import/excelimport.cc
@@ -348,7 +348,7 @@ void ExcelImport::Private::processSheetForBody( Sheet* sheet, KoXmlWriter* xmlWr
   xmlWriter->addAttribute( "table:name", string( sheet->name() ).string() );
   xmlWriter->addAttribute( "table:print", "false" );
   xmlWriter->addAttribute( "table:protected", "false" );
-  xmlWriter->addAttribute( "table:style-name", TQString("ta%1").tqarg(sheetFormatIndex));
+  xmlWriter->addAttribute( "table:style-name", TQString("ta%1").arg(sheetFormatIndex));
   sheetFormatIndex++;
   
   unsigned ci = 0;
@@ -397,7 +397,7 @@ void ExcelImport::Private::processSheetForStyle( Sheet* sheet, KoXmlWriter* xmlW
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:family", "table" );  
   xmlWriter->addAttribute( "style:master-page-name", "Default" );  
-  xmlWriter->addAttribute( "style:name", TQString("ta%1").tqarg(sheetFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("ta%1").arg(sheetFormatIndex) );  
   sheetFormatIndex++;
   
   xmlWriter->startElement( "style:table-properties" );
@@ -450,7 +450,7 @@ void ExcelImport::Private::processColumnForBody( Column* column, int repeat, KoX
   xmlWriter->addAttribute( "table:default-style-name", "Default" );  
   xmlWriter->addAttribute( "table:visibility", column->visible() ? "visible" : "collapse" );  
   if(repeat > 1) xmlWriter->addAttribute( "table:number-columns-repeated", repeat );  
-  xmlWriter->addAttribute( "table:style-name", TQString("co%1").tqarg(columnFormatIndex) );  
+  xmlWriter->addAttribute( "table:style-name", TQString("co%1").arg(columnFormatIndex) );  
   columnFormatIndex++;
 
   xmlWriter->endElement();  // table:table-column
@@ -463,12 +463,12 @@ void ExcelImport::Private::processColumnForStyle( Column* column, int /*repeat*/
   
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:family", "table-column" );  
-  xmlWriter->addAttribute( "style:name", TQString("co%1").tqarg(columnFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("co%1").arg(columnFormatIndex) );  
   columnFormatIndex++;
   
   xmlWriter->startElement( "style:table-column-properties" );
   xmlWriter->addAttribute( "fo:break-before", "auto" );
-  xmlWriter->addAttribute( "style:column-width", TQString("%1in").tqarg(column->width()/27) );
+  xmlWriter->addAttribute( "style:column-width", TQString("%1in").arg(column->width()/27) );
   xmlWriter->endElement();  // style:table-column-properties
   
   xmlWriter->endElement();  // style:style
@@ -494,7 +494,7 @@ void ExcelImport::Private::processRowForBody( Row* row, int /*repeat*/, KoXmlWri
   
   xmlWriter->startElement( "table:table-row" );
   xmlWriter->addAttribute( "table:visibility", row->visible() ? "visible" : "collapse" );  
-  xmlWriter->addAttribute( "table:style-name", TQString("ro%1").tqarg(rowFormatIndex) );  
+  xmlWriter->addAttribute( "table:style-name", TQString("ro%1").arg(rowFormatIndex) );  
   rowFormatIndex++;
   
   for( int i = 0; i <= lastCol; i++ )
@@ -530,12 +530,12 @@ void ExcelImport::Private::processRowForStyle( Row* row, int repeat, KoXmlWriter
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:family", "table-row" );  
   if(repeat > 1) xmlWriter->addAttribute( "table:number-rows-repeated", repeat );  
-  xmlWriter->addAttribute( "style:name", TQString("ro%1").tqarg(rowFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("ro%1").arg(rowFormatIndex) );  
   rowFormatIndex++;
   
   xmlWriter->startElement( "style:table-row-properties" );
   xmlWriter->addAttribute( "fo:break-before", "auto" );
-  xmlWriter->addAttribute( "style:row-height", TQString("%1pt").tqarg(row->height()) );
+  xmlWriter->addAttribute( "style:row-height", TQString("%1pt").arg(row->height()) );
   xmlWriter->endElement();  // style:table-row-properties
   
   xmlWriter->endElement();  // style:style
@@ -703,7 +703,7 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit
     const UString& valueFormat = format.valueFormat();
     if( !valueFormat.isEmpty() )
     {
-      refName = TQString("N%1").tqarg(cell->formatIndex());
+      refName = TQString("N%1").arg(cell->formatIndex());
       TQString numformat = string( valueFormat ).string();
       processValueFormat( numformat, refName, xmlWriter );
     }
@@ -717,7 +717,7 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit
     // now the real table-cell  
     xmlWriter->startElement( "style:style" );
     xmlWriter->addAttribute( "style:family", "table-cell" );  
-    xmlWriter->addAttribute( "style:name", TQString("ce%1").tqarg( cell->formatIndex() ) );  
+    xmlWriter->addAttribute( "style:name", TQString("ce%1").arg( cell->formatIndex() ) );  
     if( !refName.isEmpty() )
       xmlWriter->addAttribute( "style:data-style-name", refName );  
     
@@ -759,7 +759,7 @@ void ExcelImport::Private::processFormat( const Format* format, KoXmlWriter* xml
   if( !xmlWriter ) return;
   
   const FormatFont& font = format->font();
-  const FormatAlignment& align = format->tqalignment();
+  const FormatAlignment& align = format->alignment();
   const FormatBackground& back = format->background();
   const FormatBorders& borders = format->borders();
   
@@ -792,7 +792,7 @@ void ExcelImport::Private::processFormat( const Format* format, KoXmlWriter* xml
     if( !font.fontFamily().isEmpty() )
       xmlWriter->addAttribute( "style:font-name", string(font.fontFamily()).string() );
       
-    xmlWriter->addAttribute( "fo:font-size", TQString("%1pt").tqarg(font.fontSize()) );  
+    xmlWriter->addAttribute( "fo:font-size", TQString("%1pt").arg(font.fontSize()) );  
     
     xmlWriter->addAttribute( "fo:color", convertColor( font.color() ) );
     
diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp
index 651b7f2c..6985a434 100644
--- a/filters/kspread/excel/sidewinder/excel.cpp
+++ b/filters/kspread/excel/sidewinder/excel.cpp
@@ -5113,31 +5113,31 @@ bool ExcelReader::load( Workbook* workbook, const char* filename )
       
     format.setFont( convertFont( xf.fontIndex() ) );
     
-    FormatAlignment tqalignment;
+    FormatAlignment alignment;
     switch( xf.horizontalAlignment() )
     {
       case XFRecord::Left:     
-        tqalignment.setAlignX( Format::Left ); break;
+        alignment.setAlignX( Format::Left ); break;
       case XFRecord::Right:    
-        tqalignment.setAlignX( Format::Right ); break;
+        alignment.setAlignX( Format::Right ); break;
       case XFRecord::Centered: 
-        tqalignment.setAlignX( Format::Center ); break;
+        alignment.setAlignX( Format::Center ); break;
       default: break;
       // FIXME still unsupported: Repeat, Justified, Filled, Distributed
     };
     switch( xf.verticalAlignment() )
     {
       case XFRecord::Top:
-        tqalignment.setAlignY( Format::Top ); break;
+        alignment.setAlignY( Format::Top ); break;
       case XFRecord::VCentered:
-        tqalignment.setAlignY( Format::Middle ); break;
+        alignment.setAlignY( Format::Middle ); break;
       case XFRecord::Bottom:
-        tqalignment.setAlignY( Format::Bottom ); break;
+        alignment.setAlignY( Format::Bottom ); break;
       default: break;
       // FIXME still unsupported: Justified, Distributed
     }
-    tqalignment.setWrap( xf.textWrap() );
-    format.setAlignment( tqalignment );
+    alignment.setWrap( xf.textWrap() );
+    format.setAlignment( alignment );
   
     FormatBorders borders;
       
@@ -5929,31 +5929,31 @@ Format ExcelReader::convertFormat( unsigned xfIndex )
     
   format.setFont( convertFont( xf.fontIndex() ) );
   
-  FormatAlignment tqalignment;
+  FormatAlignment alignment;
   switch( xf.horizontalAlignment() )
   {
     case XFRecord::Left:     
-      tqalignment.setAlignX( Format::Left ); break;
+      alignment.setAlignX( Format::Left ); break;
     case XFRecord::Right:    
-      tqalignment.setAlignX( Format::Right ); break;
+      alignment.setAlignX( Format::Right ); break;
     case XFRecord::Centered: 
-      tqalignment.setAlignX( Format::Center ); break;
+      alignment.setAlignX( Format::Center ); break;
     default: break;
     // FIXME still unsupported: Repeat, Justified, Filled, Distributed
   };
   switch( xf.verticalAlignment() )
   {
     case XFRecord::Top:
-      tqalignment.setAlignY( Format::Top ); break;
+      alignment.setAlignY( Format::Top ); break;
     case XFRecord::VCentered:
-      tqalignment.setAlignY( Format::Middle ); break;
+      alignment.setAlignY( Format::Middle ); break;
     case XFRecord::Bottom:
-      tqalignment.setAlignY( Format::Bottom ); break;
+      alignment.setAlignY( Format::Bottom ); break;
     default: break;
     // FIXME still unsupported: Justified, Distributed
   }
-  tqalignment.setWrap( xf.textWrap() );
-  format.setAlignment( tqalignment );
+  alignment.setWrap( xf.textWrap() );
+  format.setAlignment( alignment );
 
   FormatBorders borders;
     
diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h
index 8cbdfd53..c05d223b 100644
--- a/filters/kspread/excel/sidewinder/excel.h
+++ b/filters/kspread/excel/sidewinder/excel.h
@@ -2805,17 +2805,17 @@ public:
     Distributed };
   
   /**
-   * Gets the horizontal tqalignment, e.g Left.
+   * Gets the horizontal alignment, e.g Left.
    */
   unsigned horizontalAlignment() const;
   
   /**
-   * Sets the horizontal tqalignment, e.g Left.
+   * Sets the horizontal alignment, e.g Left.
    */
   void setHorizontalAlignment( unsigned ha );
   
   /**
-   * Returns human-readable string representation of the horizontal tqalignment.
+   * Returns human-readable string representation of the horizontal alignment.
      For example, XFRecord::Left will return "Left".
    */
   const char* horizontalAlignmentAsString() const; 
@@ -2828,21 +2828,21 @@ public:
     VDistributed = 4 };
   
   /**
-   * Gets the vertical tqalignment, e.g Bottom.
+   * Gets the vertical alignment, e.g Bottom.
    *
    * \sa setVerticalAlignment
    */
   unsigned verticalAlignment() const;
   
   /**
-   * Sets the vertical tqalignment, e.g Top.
+   * Sets the vertical alignment, e.g Top.
    *
    * \sa verticalAlignment
    */
   void setVerticalAlignment( unsigned va );
   
   /**
-   * Returns human-readable string representation of the vertical tqalignment.
+   * Returns human-readable string representation of the vertical alignment.
      For example, XFRecord::Top will return "Top".
    */
   const char* verticalAlignmentAsString() const; 
diff --git a/filters/kspread/excel/sidewinder/format.cpp b/filters/kspread/excel/sidewinder/format.cpp
index b54f2a4c..8ce69f24 100644
--- a/filters/kspread/excel/sidewinder/format.cpp
+++ b/filters/kspread/excel/sidewinder/format.cpp
@@ -271,7 +271,7 @@ FormatAlignment& FormatAlignment::operator=( const FormatAlignment& align )
   return assign( align );
 }
 
-// assign from another tqalignment
+// assign from another alignment
 FormatAlignment& FormatAlignment::assign( const FormatAlignment& align )
 {
   d->null          = align.isNull();
@@ -398,7 +398,7 @@ FormatBackground& FormatBackground::operator=( const FormatBackground& backgroun
   return assign( background );
 }
 
-// assign from another tqalignment
+// assign from another alignment
 FormatBackground& FormatBackground::assign( const FormatBackground& background )
 {
   d->null         = background.isNull();
@@ -498,7 +498,7 @@ FormatBorders& FormatBorders::operator=( const FormatBorders& border )
   return assign( border );
 }
 
-// assign from another tqalignment
+// assign from another alignment
 FormatBorders& FormatBorders::assign( const FormatBorders& border )
 {
   d->null         = border.isNull();
@@ -581,7 +581,7 @@ class Format::Private
 {
 public:
   FormatFont font;
-  FormatAlignment tqalignment;
+  FormatAlignment alignment;
   FormatBorders borders;
   FormatBackground background;
   UString valueFormat;
@@ -617,7 +617,7 @@ Format& Format::operator=( const Format& f )
 Format& Format::assign( const Format& f )
 {
   d->font = f.font();
-  d->tqalignment = f.tqalignment();
+  d->alignment = f.alignment();
   d->borders = f.borders();
   d->valueFormat = f.valueFormat();
   d->background = f.background();
@@ -626,7 +626,7 @@ Format& Format::assign( const Format& f )
 
 bool Format::isNull() const
 {
-  return d->font.isNull() && d->tqalignment.isNull() && d->borders.isNull();
+  return d->font.isNull() && d->alignment.isNull() && d->borders.isNull();
 }
 
 FormatFont& Format::font() const
@@ -639,14 +639,14 @@ void Format::setFont( const FormatFont& font )
   d->font = font;
 }
 
-FormatAlignment& Format::tqalignment() const
+FormatAlignment& Format::alignment() const
 {
-  return d->tqalignment;
+  return d->alignment;
 }
 
-void Format::setAlignment( const FormatAlignment& tqalignment )
+void Format::setAlignment( const FormatAlignment& alignment )
 {
-  d->tqalignment = tqalignment;
+  d->alignment = alignment;
 }
 
 FormatBorders& Format::borders() const
@@ -682,8 +682,8 @@ void Format::setValueFormat( const UString& valueFormat )
 // merge f into current format
 Format& Format::apply( const Format& f )
 {
-  if( !f.tqalignment().isNull() )
-    tqalignment() = f.tqalignment();
+  if( !f.alignment().isNull() )
+    alignment() = f.alignment();
   if( !f.font().isNull() )
     font() = f.font();
   if( !f.borders().isNull() )
@@ -700,7 +700,7 @@ bool Format::operator==(const Format& format) const
 {
 	return 
     d->font == format.d->font &&
-    d->tqalignment == format.d->tqalignment &&
+    d->alignment == format.d->alignment &&
     d->borders == format.d->borders &&
     d->background == format.d->background &&
     d->valueFormat == format.d->valueFormat;
@@ -710,7 +710,7 @@ bool Format::operator!=(const Format& format) const
 {
 	return 
     d->font != format.d->font ||
-    d->tqalignment != format.d->tqalignment ||
+    d->alignment != format.d->alignment ||
     d->borders != format.d->borders ||
     d->background != format.d->background ||
     d->valueFormat != format.d->valueFormat;
diff --git a/filters/kspread/excel/sidewinder/format.h b/filters/kspread/excel/sidewinder/format.h
index 1177b1bb..acb566a5 100644
--- a/filters/kspread/excel/sidewinder/format.h
+++ b/filters/kspread/excel/sidewinder/format.h
@@ -266,9 +266,9 @@ private:
 
 
 /**
- * Defines tqalignment information for cell format.
+ * Defines alignment information for cell format.
  *
- * Class FormatAlignment defines the horizontal and vertical tqalignment
+ * Class FormatAlignment defines the horizontal and vertical alignment
  * for the text inside a cell.
  * 
  */
@@ -278,37 +278,37 @@ class FormatAlignment
 public:
 
   /**
-   * Creates a default tqalignment information.
+   * Creates a default alignment information.
    */
   FormatAlignment();
   
   /**
-   * Destroys the tqalignment information
+   * Destroys the alignment information
    */
   ~FormatAlignment();
   
   /**
-   * Creates a copy of tqalignment information.
+   * Creates a copy of alignment information.
    */
   FormatAlignment( const FormatAlignment& );
   
   /**
-   * Assigns from another tqalignment information.
+   * Assigns from another alignment information.
    */
   FormatAlignment& operator=( const FormatAlignment& );
   
   /**
-   * Assigns from another tqalignment information.
+   * Assigns from another alignment information.
    */
   FormatAlignment& assign( const FormatAlignment& );
   
   /**
-   * Returns true if it is a default tqalignment information.
+   * Returns true if it is a default alignment information.
    */
   bool isNull() const;
   
   /**
-   * Returns horizontal tqalignment. Possible values are
+   * Returns horizontal alignment. Possible values are
    * Format::Left, Format::Right and Format::Center.
    *
    * \sa setAlignX
@@ -316,14 +316,14 @@ public:
   unsigned alignX() const;
   
   /**
-   * Sets the horizontal tqalignment.
+   * Sets the horizontal alignment.
    *
    * \sa alignX
    */
   void setAlignX( unsigned xa );
   
   /**
-   * Returns horizontal tqalignment. Possible values are
+   * Returns horizontal alignment. Possible values are
    * Format::Top, Format::Middle and Format::Bottom.
    *
    * \sa setAlignY
@@ -331,7 +331,7 @@ public:
   unsigned alignY() const;
   
   /**
-   * Sets the horizontal tqalignment.
+   * Sets the horizontal alignment.
    *
    * \sa alignY
    */
@@ -380,12 +380,12 @@ public:
    void setRotationAngle( unsigned r );
        
   /**
-   * Returns true if this tqalignment is equal to f; otherwise returns false.
+   * Returns true if this alignment is equal to f; otherwise returns false.
    */
   bool operator==(const FormatAlignment& f) const;
 
   /**
-   * Returns true if this tqalignment is not equal to f; otherwise returns false.
+   * Returns true if this alignment is not equal to f; otherwise returns false.
    */
   bool operator!=(const FormatAlignment& f) const;
 
@@ -683,14 +683,14 @@ public:
   void setFont( const FormatFont& font );
   
   /** 
-   * Returns a constant reference to the tqalignment information of this format.
+   * Returns a constant reference to the alignment information of this format.
    */
-  FormatAlignment& tqalignment() const;
+  FormatAlignment& alignment() const;
   
   /** 
-   * Sets new tqalignment information for this format.
+   * Sets new alignment information for this format.
    */
-  void setAlignment( const FormatAlignment& tqalignment );
+  void setAlignment( const FormatAlignment& alignment );
   
   /** 
    * Returns a reference to the borders information of this format.
diff --git a/filters/kspread/excel/sidewinder/pole.cpp b/filters/kspread/excel/sidewinder/pole.cpp
index 38fe8cb5..6f12ae13 100644
--- a/filters/kspread/excel/sidewinder/pole.cpp
+++ b/filters/kspread/excel/sidewinder/pole.cpp
@@ -116,7 +116,7 @@ class DirTree
     int indexOf( DirEntry* e );
     int parent( unsigned index );
     std::string fullName( unsigned index );
-    std::vector<unsigned> tqchildren( unsigned index );
+    std::vector<unsigned> children( unsigned index );
     void load( unsigned char* buffer, unsigned len );
     void save( unsigned char* buffer );
     unsigned size();
@@ -509,11 +509,11 @@ int DirTree::indexOf( DirEntry* e )
 
 int DirTree::parent( unsigned index )
 {
-  // brute-force, basically we iterate for each entries, find its tqchildren
-  // and check if one of the tqchildren is 'index'
+  // brute-force, basically we iterate for each entries, find its children
+  // and check if one of the children is 'index'
   for( unsigned j=0; j<entryCount(); j++ )
   {
-    std::vector<unsigned> chi = tqchildren( j );
+    std::vector<unsigned> chi = children( j );
     for( unsigned i=0; i<chi.size();i++ )
       if( chi[i] == index )
         return j;
@@ -577,8 +577,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
 
    for( it = names.begin(); it != names.end(); ++it )
    {
-     // find among the tqchildren of index
-     std::vector<unsigned> chi = tqchildren( index );
+     // find among the children of index
+     std::vector<unsigned> chi = children( index );
      unsigned child = 0;
      for( unsigned i = 0; i < chi.size(); i++ )
      {
@@ -593,7 +593,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
      if( child > 0 ) index = child;
      else
      {
-       // not found among tqchildren
+       // not found among children
        if( !create ) return (DirEntry*)0;
 
        // create a new entry
@@ -650,7 +650,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector<unsigned>& result,
   }
 }
 
-std::vector<unsigned> DirTree::tqchildren( unsigned index )
+std::vector<unsigned> DirTree::children( unsigned index )
 {
   std::vector<unsigned> result;
 
@@ -1286,9 +1286,9 @@ std::list<std::string> Storage::entries( const std::string& path )
   if( e  && e->dir )
   {
     unsigned parent = dt->indexOf( e );
-    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
-    for( unsigned i = 0; i < tqchildren.size(); i++ )
-      result.push_back( dt->entry( tqchildren[i] )->name );
+    std::vector<unsigned> children = dt->children( parent );
+    for( unsigned i = 0; i < children.size(); i++ )
+      result.push_back( dt->entry( children[i] )->name );
   }
 
   return result;
diff --git a/filters/kspread/gnumeric/gnumeric.xsd b/filters/kspread/gnumeric/gnumeric.xsd
index 04949083..7150f7e4 100644
--- a/filters/kspread/gnumeric/gnumeric.xsd
+++ b/filters/kspread/gnumeric/gnumeric.xsd
@@ -427,8 +427,8 @@
                 </xsd:complexType>
             </xsd:element>
         </xsd:sequence>
-        <xsd:attribute name="HAlign"       type="gmr:horizontal_tqalignment"/>
-        <xsd:attribute name="VAlign"       type="gmr:vertical_tqalignment"  />
+        <xsd:attribute name="HAlign"       type="gmr:horizontal_alignment"/>
+        <xsd:attribute name="VAlign"       type="gmr:vertical_alignment"  />
         <xsd:attribute name="WrapText"     type="xsd:boolean"          	  />
         <xsd:attribute name="ShrinkToFit"  type="xsd:integer"          	  />	<!-- should be bool, but some files have odd truth values -->
         <xsd:attribute name="Rotation"	   type="xsd:integer"		  use="optional"/>
@@ -492,7 +492,7 @@
         </xsd:restriction>
     </xsd:simpleType>
 
-    <xsd:simpleType name="horizontal_tqalignment">
+    <xsd:simpleType name="horizontal_alignment">
         <xsd:restriction base="xsd:integer">
             <!-- this is a bit map as follows:
                   1 = GENERAL
@@ -508,7 +508,7 @@
         </xsd:restriction>
     </xsd:simpleType>
 
-    <xsd:simpleType name="vertical_tqalignment">
+    <xsd:simpleType name="vertical_alignment">
         <xsd:restriction base="xsd:integer">
             <!-- this is a bit map as follows:
                  1 = TOP
@@ -644,7 +644,7 @@
                     <xsd:attribute name="FillColor"        type="gmr:color"               use="required"/>
                     <xsd:attribute name="Type"             type="gmr:objectfilled"        use="required"/>
                     <xsd:attribute name="Width"            type="xsd:positiveInteger" use="required"/>
-                    <!-- the arrow tqshape attributes are only used if the type is
+                    <!-- the arrow shape attributes are only used if the type is
                          arrow (type="gmr:2")
                     -->
                     <xsd:attribute name="ArrowShapeA"      type="xsd:double"          use="optional"/>
diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc
index b5666916..b0709ede 100644
--- a/filters/kspread/gnumeric/gnumericexport.cc
+++ b/filters/kspread/gnumeric/gnumericexport.cc
@@ -1443,7 +1443,7 @@ KoFilter::ConversionStatus GNUMERICExport::convert( const TQCString& from, const
                         //<gmr:CellComment Author="" Text="cvbcvbxcvb&#10;cb&#10;xc&#10;vbxcv&#10;" ObjectBound="A1" ObjectOffset="0 0 0 0" ObjectAnchorType="17 16 17 16" Direction="17"/>
                         cellComment = gnumeric_doc.createElement("gmr:CellComment");
                         cellComment.setAttribute( "Text", cell->format()->comment( currentcolumn, currentrow ) );
-                        TQString sCell=TQString( "%1%2" ).tqarg( Cell::columnName(currentcolumn ) ).tqarg( currentrow );
+                        TQString sCell=TQString( "%1%2" ).arg( Cell::columnName(currentcolumn ) ).arg( currentrow );
 
                         cellComment.setAttribute("ObjectBound", sCell );
                         objects.appendChild(cellComment);
diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc
index 72dd6875..8a0df7d0 100644
--- a/filters/kspread/html/exportdialog.cc
+++ b/filters/kspread/html/exportdialog.cc
@@ -44,7 +44,7 @@ ExportDialog::ExportDialog( TQWidget *parent, const char *name )
            m_mainwidget->mSheets, TQT_SLOT( clearSelection() ) );
 
   m_mainwidget->mEncodingBox->insertItem( i18n( "Recommended: UTF-8" ) );
-  m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).tqarg( KGlobal::locale()->codecForEncoding()->name() ) );
+  m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).arg( KGlobal::locale()->codecForEncoding()->name() ) );
 
   m_mainwidget->mCustomURL->setMode( KFile::ExistingOnly );
 
diff --git a/filters/kspread/html/htmlexport.cc b/filters/kspread/html/htmlexport.cc
index b81d8e22..f680207e 100644
--- a/filters/kspread/html/htmlexport.cc
+++ b/filters/kspread/html/htmlexport.cc
@@ -186,7 +186,7 @@ void HTMLExport::openPage( Sheet *sheet, KoDocument *document, TQString &str )
   str += "<html>\n";
   str += "<head>\n";
   str += "<meta http-equiv=\"Content-Type\" ";
-  str += TQString("content=\"text/html; charset=%1\">\n").tqarg( m_dialog->encoding()->mimeName() );
+  str += TQString("content=\"text/html; charset=%1\">\n").arg( m_dialog->encoding()->mimeName() );
   str += "<meta name=\"Generator\" ";
   str += "content=\"KSpread HTML Export Filter Version = ";
   str += KOFFICE_VERSION_STRING;
@@ -202,7 +202,7 @@ void HTMLExport::openPage( Sheet *sheet, KoDocument *document, TQString &str )
 
   str += "<title>" + title + "</title>\n";
   str += "</head>\n";
-  str += TQString("<body bgcolor=\"#FFFFFF\" dir=\"%1\">\n").tqarg(
+  str += TQString("<body bgcolor=\"#FFFFFF\" dir=\"%1\">\n").arg(
       sheet->isRightToLeft()?"rtl":"ltr");
 
   str += "<a name=\"__top\">\n";
@@ -234,8 +234,8 @@ void HTMLExport::convertSheet( Sheet *sheet, TQString &str, int iMaxUsedRow, int
     int step=iMaxRow > 50 ? iMaxRow/50 : 1;
     int i=1;
 
-    str += "<" + html_table_tag + html_table_options.tqarg( m_dialog->useBorders() ? "1" : "0" ).tqarg( m_dialog->pixelsBetweenCells() ) +
-           TQString("dir=\"%1\">\n").tqarg(sheet->isRightToLeft()?"rtl":"ltr");
+    str += "<" + html_table_tag + html_table_options.arg( m_dialog->useBorders() ? "1" : "0" ).arg( m_dialog->pixelsBetweenCells() ) +
+           TQString("dir=\"%1\">\n").arg(sheet->isRightToLeft()?"rtl":"ltr");
 
     unsigned int nonempty_cells_prev=0;
 
@@ -297,7 +297,7 @@ void HTMLExport::convertSheet( Sheet *sheet, TQString &str, int iMaxUsedRow, int
 #endif
             line += "  <" + html_cell_tag + html_cell_options;
 	    if (text.isRightToLeft() != sheet->isRightToLeft())
-                line += TQString(" dir=\"%1\" ").tqarg(text.isRightToLeft()?"rtl":"ltr");
+                line += TQString(" dir=\"%1\" ").arg(text.isRightToLeft()?"rtl":"ltr");
             if (bgcolor.isValid() && bgcolor.name()!="#ffffff") // change color only for non-white cells
                 line += " bgcolor=\"" + bgcolor.name() + "\"";
 
diff --git a/filters/kspread/latex/export/fileheader.cc b/filters/kspread/latex/export/fileheader.cc
index 8ee9eee0..07b1fbe4 100644
--- a/filters/kspread/latex/export/fileheader.cc
+++ b/filters/kspread/latex/export/fileheader.cc
@@ -79,7 +79,7 @@ void FileHeader::analysePaper(const TQDomNode balise)
 	analysePaperParam(balise);
 
 	//setTokenCurrent(balise_initiale->pContent);
-	// Analyse tqchildren markups --> PAPERBORDERS
+	// Analyse children markups --> PAPERBORDERS
 	TQDomNode fils = getChild(balise, "PAPERSBORDERS");
 	_leftBorder = getAttr(fils, "left").toInt();
 	_rightBorder = getAttr(fils, "right").toInt();
@@ -282,7 +282,7 @@ void FileHeader::generatePackage(TQTextStream &out)
 	if(Config::instance()->mustUseUnicode())
 		out << "\\usepackage{omega}" << endl;
 	if(getFormat() == TF_A4)
-		out << "\\usepackage[a4paper]{tqgeometry}" << endl;
+		out << "\\usepackage[a4paper]{geometry}" << endl;
 	if(hasFooter() || hasHeader())
 		out << "\\usepackage{fancyhdr}" << endl;
 	if(hasColor())
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
index a7f03f60..7713a9dc 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
@@ -69,7 +69,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare
 	TQString value;
 	while(i < 10)
 	{
-		/*value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
+		/*value = _config->readPathEntry( TQString("Recent%1").arg(i) );
 		kdDebug(30522) << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
diff --git a/filters/kspread/latex/export/map.cc b/filters/kspread/latex/export/map.cc
index a2256d5e..886f6c11 100644
--- a/filters/kspread/latex/export/map.cc
+++ b/filters/kspread/latex/export/map.cc
@@ -46,7 +46,7 @@ void Map::analyse(const TQDomNode balise)
 	/* Analyse of the parameters */
 	kdDebug(30522) << "ANALYSE A MAP" << endl;
 
-	/* Analyse of the tqchildren markups */
+	/* Analyse of the children markups */
 	for(int index = 0; index < getNbChild(balise); index++)
 	{
 		// Only tables
diff --git a/filters/kspread/latex/export/xmlparser.cc b/filters/kspread/latex/export/xmlparser.cc
index 6b85f243..fb2c8e1f 100644
--- a/filters/kspread/latex/export/xmlparser.cc
+++ b/filters/kspread/latex/export/xmlparser.cc
@@ -89,18 +89,18 @@ bool XmlParser::isChild(TQDomNode balise, TQString name)
 TQDomNode XmlParser::getChild(TQDomNode balise, TQString name, int index)
 {
 	if(balise.isElement()) {
-		TQDomNodeList tqchildren = balise.toElement().elementsByTagName(name);
-		if ( tqchildren.count() )
-			return tqchildren.item(index);
+		TQDomNodeList children = balise.toElement().elementsByTagName(name);
+		if ( children.count() )
+			return children.item(index);
 	}
 	return TQDomNode();
 }
 
 TQDomNode XmlParser::getChild(TQDomNode balise, int index)
 {
-	TQDomNodeList tqchildren = balise.childNodes();
-	if ( tqchildren.count() )
-		return tqchildren.item(index);
+	TQDomNodeList children = balise.childNodes();
+	if ( children.count() )
+		return children.item(index);
 	return TQDomNode();
 }
 
diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc
index 828d817a..ce1a55ad 100644
--- a/filters/kspread/opencalc/opencalcexport.cc
+++ b/filters/kspread/opencalc/opencalcexport.cc
@@ -844,7 +844,7 @@ void OpenCalcExport::exportDefaultCellStyle( TQDomDocument & doc, TQDomElement &
 
   TQDomElement style = doc.createElement( "style:properties" );
   style.setAttribute( "style:font-name", font.family() );
-  style.setAttribute( "fo:font-size", TQString( "%1pt" ).tqarg( font.pointSize() ) );
+  style.setAttribute( "fo:font-size", TQString( "%1pt" ).arg( font.pointSize() ) );
   style.setAttribute( "style:decimal-places", TQString::number( locale->fracDigits() ) );
   style.setAttribute( "fo:language", language );
   style.setAttribute( "fo:country", country );
@@ -881,8 +881,8 @@ void OpenCalcExport::exportPageAutoStyles( TQDomDocument & doc, TQDomElement & a
     height = sheet->print()->paperHeight() / 10;
   }
 
-  TQString sWidth  = TQString( "%1cm" ).tqarg( width  );
-  TQString sHeight = TQString( "%1cm" ).tqarg( height );
+  TQString sWidth  = TQString( "%1cm" ).arg( width  );
+  TQString sHeight = TQString( "%1cm" ).arg( height );
 
   TQDomElement pageMaster = doc.createElement( "style:page-master" );
   pageMaster.setAttribute( "style:name", "pm1" );
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index 0fbe52e0..8e0327c9 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -1387,7 +1387,7 @@ void OpenCalcImport::loadOasisMasterLayoutPage( Sheet * table,KoStyleStack &styl
             kdDebug(30518)<<" table-centering unknown :"<<str<<endl;
 #endif
     }
-    format = TQString( "%1x%2" ).tqarg( width ).tqarg( height );
+    format = TQString( "%1x%2" ).arg( width ).arg( height );
     kdDebug(30518)<<" format : "<<format<<endl;
     table->print()->setPaperLayout( left, top, right, bottom, format, orientation );
 
@@ -2289,7 +2289,7 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles )
       if ( d > 1.0 )
       {
         TQString message( i18n("This document was created with OpenOffice.org version '%1'. This filter was written for version 1.0. Reading this file could cause strange behavior, crashes or incorrect display of the data. Do you want to continue converting the document?") );
-        message.tqarg( content.attributeNS( ooNS::office, "version", TQString() ) );
+        message.arg( content.attributeNS( ooNS::office, "version", TQString() ) );
         if ( KMessageBox::warningYesNo( 0, message, i18n( "Unsupported document version" ) ) == KMessageBox::No )
           return false;
       }
diff --git a/filters/kspread/opencalc/opencalcstyleexport.cc b/filters/kspread/opencalc/opencalcstyleexport.cc
index f075713a..9585ae13 100644
--- a/filters/kspread/opencalc/opencalcstyleexport.cc
+++ b/filters/kspread/opencalc/opencalcstyleexport.cc
@@ -111,7 +111,7 @@ TQString OpenCalcStyles::cellStyle( CellStyle const & cs )
 
   m_cellStyles.append( t );
 
-  t->name = TQString( "ce%1" ).tqarg( m_cellStyles.count() );
+  t->name = TQString( "ce%1" ).arg( m_cellStyles.count() );
 
   return t->name;
 }
@@ -132,7 +132,7 @@ TQString OpenCalcStyles::columnStyle( ColumnStyle const & cs )
 
   m_columnStyles.append( t );
 
-  t->name = TQString( "co%1" ).tqarg( m_columnStyles.count() );
+  t->name = TQString( "co%1" ).arg( m_columnStyles.count() );
 
   return t->name;
 }
@@ -158,7 +158,7 @@ TQString OpenCalcStyles::rowStyle( RowStyle const & rs )
 
   m_rowStyles.append( t );
 
-  t->name = TQString( "ro%1" ).tqarg( m_rowStyles.count() );
+  t->name = TQString( "ro%1" ).arg( m_rowStyles.count() );
 
   return t->name;
 }
@@ -179,14 +179,14 @@ TQString OpenCalcStyles::sheetStyle( SheetStyle const & ts )
 
   m_sheetStyles.append( t );
 
-  t->name = TQString( "ta%1" ).tqarg( m_sheetStyles.count() );
+  t->name = TQString( "ta%1" ).arg( m_sheetStyles.count() );
 
   return t->name;
 }
 
 TQString convertPenToString( TQPen const & pen )
 {
-  TQString s( TQString( "%1cm solid " ).tqarg( pen.width() * 0.035 ) );
+  TQString s( TQString( "%1cm solid " ).arg( pen.width() * 0.035 ) );
   s += pen.color().name();
 
   return s;
@@ -212,7 +212,7 @@ void OpenCalcStyles::addCellStyles( TQDomDocument & doc, TQDomElement & autoStyl
         if ( t->font.bold() != m_defaultFont.bold() )
             prop.setAttribute( "fo:font-weight", ( t->font.bold() ? "bold" : "light" ) );
 
-        prop.setAttribute( "fo:font-size", TQString( "%1pt" ).tqarg( t->font.pointSize() ) );
+        prop.setAttribute( "fo:font-size", TQString( "%1pt" ).arg( t->font.pointSize() ) );
 
         if ( t->font.underline() != m_defaultFont.underline() )
         {
@@ -250,7 +250,7 @@ void OpenCalcStyles::addCellStyles( TQDomDocument & doc, TQDomElement & autoStyl
 
         if ( t->indent > 0.0 )
         {
-            prop.setAttribute( "fo:margin-left", TQString( "%1pt" ).tqarg( t->indent ) );
+            prop.setAttribute( "fo:margin-left", TQString( "%1pt" ).arg( t->indent ) );
             if ( t->alignX == Format::Undefined )
                 prop.setAttribute( "fo:text-align", "start" );
         }
@@ -323,7 +323,7 @@ void OpenCalcStyles::addColumnStyles( TQDomDocument & doc, TQDomElement & autoSt
     TQDomElement prop = doc.createElement( "style:properties" );
     if ( t->breakB != ::Style::none )
       prop.setAttribute( "fo:break-before", ( t->breakB == ::Style::automatic ? "auto" : "page" ) );
-    prop.setAttribute( "style:column-width", TQString( "%1cm" ).tqarg( t->size ) );
+    prop.setAttribute( "style:column-width", TQString( "%1cm" ).arg( t->size ) );
 
     ts.appendChild( prop );
     autoStyles.appendChild( ts );
@@ -346,7 +346,7 @@ void OpenCalcStyles::addRowStyles( TQDomDocument & doc, TQDomElement & autoStyle
     ts.setAttribute( "style:family", "table-row" );
 
     TQDomElement prop = doc.createElement( "style:properties" );
-    prop.setAttribute( "style:row-height", TQString( "%1cm" ).tqarg( t->size ) );
+    prop.setAttribute( "style:row-height", TQString( "%1cm" ).arg( t->size ) );
     if ( t->breakB != ::Style::none )
       prop.setAttribute( "fo:break-before", ( t->breakB == ::Style::automatic ? "auto" : "page" ) );
 
diff --git a/filters/kspread/opencalc/status.html b/filters/kspread/opencalc/status.html
index dfaed8a4..2bd1fc05 100644
--- a/filters/kspread/opencalc/status.html
+++ b/filters/kspread/opencalc/status.html
@@ -139,7 +139,7 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
     Page sizes, header and footer (including variable converting)<br>    
     Font (sizes, attributes, color)<br>    
     Background color<br>
-    Text tqalignment, angle, vertical text, text wrap and indents<br>
+    Text alignment, angle, vertical text, text wrap and indents<br>
     Merged Cells<br>
     DontPrint flag<br>
     Comments<br>
@@ -172,7 +172,7 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
  Jan 18, 2003 - page tqlayout, header, footer<br>
  Jan 19, 2003 - Added support for fonts, text color, background color, formula 
 conversion<br>
- Jan 19, 2003 - text tqalignment, indents, comments, NoPrint, Merged Cells<br>
+ Jan 19, 2003 - text alignment, indents, comments, NoPrint, Merged Cells<br>
  Jan 19, 2003 - angle, vertical text, text wrap<br>
  Jan 19, 2003 - named area, hidden columns and rows<br>
  Jan 20, 2003 - cell borders<br>
diff --git a/filters/kword/abiword/ImportField.cc b/filters/kword/abiword/ImportField.cc
index dfba826d..5e875ecd 100644
--- a/filters/kword/abiword/ImportField.cc
+++ b/filters/kword/abiword/ImportField.cc
@@ -26,7 +26,7 @@
 
 TQString getFootnoteFramesetName(const TQString& id)
 {
-    return i18n("Frameset name","Footnote %1").tqarg(id);
+    return i18n("Frameset name","Footnote %1").arg(id);
 }
 
 static void InsertTimeVariable(TQDomDocument& mainDocument,
diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cc
index 4f84a8e4..5a08cf0d 100644
--- a/filters/kword/abiword/ImportStyle.cc
+++ b/filters/kword/abiword/ImportStyle.cc
@@ -121,7 +121,7 @@ void StyleDataMap::defineDefaultStyles(void)
     defineNewStyle("Block Text",-1,"margin-left: 1in; margin-right: 1in; margin-bottom: 6pt");
     TQFontInfo fixedInfo(KGlobalSettings::fixedFont());
     TQString strPlainText=TQString("font-family: %1")
-        .tqarg(fixedInfo.family()); // TODO: should be "Courier New"
+        .arg(fixedInfo.family()); // TODO: should be "Courier New"
     kdDebug(30506) << "Plain Text: " << strPlainText << endl;
     defineNewStyle("Plain Text",-1,strPlainText);
     // TODO: all list and numbered types
diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc
index cac51013..d4a9819f 100644
--- a/filters/kword/abiword/abiwordexport.cc
+++ b/filters/kword/abiword/abiwordexport.cc
@@ -723,24 +723,24 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
 {
     TQString props;
 
-    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
+    if (force || (layoutOrigin.alignment!=tqlayout.alignment))
     {
-        // Check if the current tqalignment is a valid one for AbiWord.
-        if ((tqlayout.tqalignment == "left") || (tqlayout.tqalignment == "right")
-            || (tqlayout.tqalignment == "center")  || (tqlayout.tqalignment == "justify"))
+        // Check if the current alignment is a valid one for AbiWord.
+        if ((tqlayout.alignment == "left") || (tqlayout.alignment == "right")
+            || (tqlayout.alignment == "center")  || (tqlayout.alignment == "justify"))
         {
             props += "text-align:";
-            props += tqlayout.tqalignment;
+            props += tqlayout.alignment;
             props += "; ";
         }
-        else if (tqlayout.tqalignment == "auto")
+        else if (tqlayout.alignment == "auto")
         {
-            // We assume a left tqalignment as AbiWord is not really bi-di (and this filter even less.)
+            // We assume a left alignment as AbiWord is not really bi-di (and this filter even less.)
             props += "text-align:left; ";
         }
         else
         {
-            kdWarning(30506) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
+            kdWarning(30506) << "Unknown alignment: " << tqlayout.alignment << endl;
         }
     }
 
@@ -792,13 +792,13 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
     if ((tqlayout.indentLeft>=0.0)
         && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
-        props += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft);
+        props += TQString("margin-left:%1pt; ").arg(tqlayout.indentLeft);
     }
 
     if ((tqlayout.indentRight>=0.0)
         && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
-        props += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight);
+        props += TQString("margin-right:%1pt; ").arg(tqlayout.indentRight);
     }
 
     if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
@@ -811,13 +811,13 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
     if ((tqlayout.marginBottom>=0.0)
         && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
-       props += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom);
+       props += TQString("margin-bottom:%1pt; ").arg(tqlayout.marginBottom);
     }
 
     if ((tqlayout.marginTop>=0.0)
         && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
-       props += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop);
+       props += TQString("margin-top:%1pt; ").arg(tqlayout.marginTop);
     }
 
     if (force
@@ -1041,7 +1041,7 @@ bool AbiWordWorker::doFullPaperFormat(const int format,
             }
             else
             {   // We prefer to use inches, as to limit rounding errors (page size is in points!)
-                outputText += TQString("pagetype=\"Custom\" width=\"%1\" height=\"%2\" units=\"inch\" ").tqarg(width/72.0).tqarg(height/72.0);
+                outputText += TQString("pagetype=\"Custom\" width=\"%1\" height=\"%2\" units=\"inch\" ").arg(width/72.0).arg(height/72.0);
             }
             break;
         }
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc
index 2de6d457..b21c6609 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cc
@@ -527,7 +527,7 @@ bool StructureParser::StartElementImage(StackItem* stackItem, StackItem* stackCu
         kdDebug(30506) << "Image: " << strDataId << endl;
     }
 
-    TQString strPictureFrameName(i18n("Frameset name","Picture %1").tqarg(++m_pictureFrameNumber));
+    TQString strPictureFrameName(i18n("Frameset name","Picture %1").arg(++m_pictureFrameNumber));
 
     // Create the frame set of the image
 
@@ -1127,7 +1127,7 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu
     // ### TODO: in case of automatic column widths, we have not any width given by AbiWord
 
     const uint tableNumber(++m_tableGroupNumber);
-    const TQString tableName(i18n("Table %1").tqarg(tableNumber));
+    const TQString tableName(i18n("Table %1").arg(tableNumber));
 
     TQDomElement elementText=stackCurrent->stackElementText;
     TQDomElement paragraphElementOut=mainDocument.createElement("PARAGRAPH");
@@ -1211,7 +1211,7 @@ bool StructureParser::StartElementCell(StackItem* stackItem, StackItem* stackCur
     }
 
     const TQString frameName(i18n("Frameset name","Table %3, row %1, column %2")
-        .tqarg(row).tqarg(col).tqarg(stackCurrent->strTemp2)); // As the stack could be wrong, be careful and use the string as last!
+        .arg(row).arg(col).arg(stackCurrent->strTemp2)); // As the stack could be wrong, be careful and use the string as last!
 
     // We need to create a frameset for the cell
     TQDomElement framesetElement(mainDocument.createElement("FRAMESET"));
@@ -1638,8 +1638,8 @@ bool StructureParser::fatalError (const TQXmlParseException& exception)
         << " col " << exception.columnNumber() << " message: " << exception.message() << endl;
     m_fatalerror=true;
     KMessageBox::error(NULL, i18n("An error has occurred while parsing the AbiWord file.\nAt line: %1, column %2\nError message: %3")
-        .tqarg(exception.lineNumber()).tqarg(exception.columnNumber())
-        .tqarg( i18n( "TQXml", exception.message().utf8() ) ),
+        .arg(exception.lineNumber()).arg(exception.columnNumber())
+        .arg( i18n( "TQXml", exception.message().utf8() ) ),
         i18n("AbiWord Import Filter"),0);
     return false; // Stop parsing now, we do not need further errors.
 }
@@ -1825,7 +1825,7 @@ KoFilter::ConversionStatus ABIWORDImport::convert( const TQCString& from, const
         if (!handler.wasFatalError())
         {
             // As the parsing was stopped for something else than a fatal error, we have not yet get an error message. (Can it really happen?)
-            KMessageBox::error(NULL, i18n("An error occurred during the load of the AbiWord file: %1").tqarg(from.data()),
+            KMessageBox::error(NULL, i18n("An error occurred during the load of the AbiWord file: %1").arg(from.data()),
                 i18n("AbiWord Import Filter"),0);
         }
         return KoFilter::ParsingError;
diff --git a/filters/kword/amipro/FileFormat.txt b/filters/kword/amipro/FileFormat.txt
index f795b56c..f628f595 100644
--- a/filters/kword/amipro/FileFormat.txt
+++ b/filters/kword/amipro/FileFormat.txt
@@ -43,9 +43,9 @@ Note: Word underline is just like underline, except that
 spaces between words are not underlined.
 
 Paragraph align is also encoded using tag, here it the list:
-  <+@> left tqalignment
-  <+A> right tqalignment
-  <+B> center tqalignment
+  <+@> left alignment
+  <+A> right alignment
+  <+B> center alignment
   <+C> justified
 
 Linespacing is encoded using tag:
@@ -81,7 +81,7 @@ example below:
          0          font color (see below)
          16385      formatting flag (see below)
      [algn]
-         4          tqalignment flag (see below)
+         4          alignment flag (see below)
          1
          216        indent, 216/20 = 10.8 pt 
          144        first line indent, 144/20 = 7.2 pt
diff --git a/filters/kword/amipro/amiproparser.cpp b/filters/kword/amipro/amiproparser.cpp
index fdae97e6..8d2bed03 100644
--- a/filters/kword/amipro/amiproparser.cpp
+++ b/filters/kword/amipro/amiproparser.cpp
@@ -344,7 +344,7 @@ bool AmiProParser::parseStyle( const TQStringList& lines )
   style.word_underline = flag & 8;
   style.double_underline = flag & 64;
 
-  // tqalignment
+  // alignment
   if( lines[7].stripWhiteSpace() != "[algn]" ) return true;
   unsigned align_flag = lines[8].stripWhiteSpace().toUInt();
   if( align_flag & 1 ) style.align = TQt::AlignLeft;
diff --git a/filters/kword/applixword/applixwordimport.cc b/filters/kword/applixword/applixwordimport.cc
index 8c805111..89bf5541 100644
--- a/filters/kword/applixword/applixwordimport.cc
+++ b/filters/kword/applixword/applixwordimport.cc
@@ -780,10 +780,10 @@ APPLIXWORDImport::readHeader (TQTextStream &stream, TQFile &in)
       TQMessageBox::critical (0L, "Applixword header problem",
                                   TQString ("The Applixword header is not correct. "
                                            "May be it is not an applixword file! <BR>"
-                                           "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()),
+                                           "This is the header line I did read:<BR><B>%1</B>").arg(mystr.latin1()),
 				    "Okay");
 
-      // i18n( "What is the separator used in this file ? First line is \n%1" ).tqarg(firstLine),
+      // i18n( "What is the separator used in this file ? First line is \n%1" ).arg(firstLine),
       return false;
     }
     else return true;
diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc
index 138618b2..d5e581e3 100644
--- a/filters/kword/ascii/ExportDialog.cc
+++ b/filters/kword/ascii/ExportDialog.cc
@@ -41,14 +41,14 @@ AsciiExportDialog :: AsciiExportDialog(TQWidget* parent)
     kapp->restoreOverrideCursor();
 
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
     encodings += KGlobal::charsets()->descriptiveEncodingNames();
     // Add a few non-standard encodings, which might be useful for text files
     const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
-    encodings << description.tqarg("Apple Roman"); // Apple 
-    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
-    encodings << description.tqarg("CP 1258"); // Windows
+    encodings << description.arg("Apple Roman"); // Apple 
+    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
+    encodings << description.arg("CP 1258"); // Windows
 
     m_dialog->comboBoxEncoding->insertStringList(encodings);
 
@@ -85,7 +85,7 @@ TQTextCodec* AsciiExportDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc
index adb345b1..318dae0b 100644
--- a/filters/kword/ascii/ImportDialog.cc
+++ b/filters/kword/ascii/ImportDialog.cc
@@ -41,14 +41,14 @@ AsciiImportDialog :: AsciiImportDialog(TQWidget* parent)
     kapp->restoreOverrideCursor();
 
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
     encodings += KGlobal::charsets()->descriptiveEncodingNames();
     // Add a few non-standard encodings, which might be useful for text files
     const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
-    encodings << description.tqarg("Apple Roman"); // Apple 
-    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
-    encodings << description.tqarg("CP 1258"); // Windows
+    encodings << description.arg("Apple Roman"); // Apple 
+    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
+    encodings << description.arg("CP 1258"); // Windows
 
     m_dialog->comboBoxEncoding->insertStringList(encodings);
 
@@ -84,7 +84,7 @@ TQTextCodec* AsciiImportDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc
index 7040e9f1..450c938f 100644
--- a/filters/kword/ascii/asciiimport.cc
+++ b/filters/kword/ascii/asciiimport.cc
@@ -310,9 +310,9 @@ void ASCIIImport::oldWayConvert(TQTextStream& stream, TQDomDocument& mainDocumen
             }
 
             const int length = strLine.length();
-            if (strLine.tqat(length-1) == '-')
+            if (strLine.at(length-1) == '-')
                 // replace the hard hyphen - at line end by a soft hyphen
-                strLine.tqat(length-1)=TQChar(173);
+                strLine.at(length-1)=TQChar(173);
             else
                 strLine += ' '; // add space to end of line
 
diff --git a/filters/kword/hancomword/pole.cpp b/filters/kword/hancomword/pole.cpp
index f712f0e1..261ef526 100644
--- a/filters/kword/hancomword/pole.cpp
+++ b/filters/kword/hancomword/pole.cpp
@@ -117,7 +117,7 @@ class DirTree
     int indexOf( DirEntry* e );
     int parent( unsigned index );
     std::string fullName( unsigned index );
-    std::vector<unsigned> tqchildren( unsigned index );
+    std::vector<unsigned> children( unsigned index );
     void load( unsigned char* buffer, unsigned len );
     void save( unsigned char* buffer );
     unsigned size();
@@ -507,11 +507,11 @@ int DirTree::indexOf( DirEntry* e )
 
 int DirTree::parent( unsigned index )
 {
-  // brute-force, basically we iterate for each entries, find its tqchildren
-  // and check if one of the tqchildren is 'index'
+  // brute-force, basically we iterate for each entries, find its children
+  // and check if one of the children is 'index'
   for( unsigned j=0; j<entryCount(); j++ )
   {
-    std::vector<unsigned> chi = tqchildren( j );
+    std::vector<unsigned> chi = children( j );
     for( unsigned i=0; i<chi.size();i++ )
       if( chi[i] == index )
         return j;
@@ -575,8 +575,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
 
    for( it = names.begin(); it != names.end(); ++it )
    {
-     // find among the tqchildren of index
-     std::vector<unsigned> chi = tqchildren( index );
+     // find among the children of index
+     std::vector<unsigned> chi = children( index );
      unsigned child = 0;
      for( unsigned i = 0; i < chi.size(); i++ )
      {
@@ -591,7 +591,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
      if( child > 0 ) index = child;
      else
      {
-       // not found among tqchildren
+       // not found among children
        if( !create ) return (DirEntry*)0;
        
        // create a new entry
@@ -648,7 +648,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector<unsigned>& result,
   }
 }
 
-std::vector<unsigned> DirTree::tqchildren( unsigned index )
+std::vector<unsigned> DirTree::children( unsigned index )
 {
   std::vector<unsigned> result;
   
@@ -1249,9 +1249,9 @@ std::list<std::string> Storage::entries( const std::string& path )
   if( e  && e->dir )
   {
     unsigned parent = dt->indexOf( e );
-    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
-    for( unsigned i = 0; i < tqchildren.size(); i++ )
-      result.push_back( dt->entry( tqchildren[i] )->name );
+    std::vector<unsigned> children = dt->children( parent );
+    for( unsigned i = 0; i < children.size(); i++ )
+      result.push_back( dt->entry( children[i] )->name );
   }
   
   return result;
diff --git a/filters/kword/html/export/ExportBasic.cc b/filters/kword/html/export/ExportBasic.cc
index 13864d7a..b0290371 100644
--- a/filters/kword/html/export/ExportBasic.cc
+++ b/filters/kword/html/export/ExportBasic.cc
@@ -312,20 +312,20 @@ void HtmlBasicWorker::openParagraph(const TQString& strTag,
 {
     *m_streamOut << '<' << strTag;
 
-    if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right")
-        || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify"))
+    if ( (tqlayout.alignment=="left") || (tqlayout.alignment== "right")
+        || (tqlayout.alignment=="center") || (tqlayout.alignment=="justify"))
     {
-        *m_streamOut << " align=\"" << tqlayout.tqalignment << "\"";
+        *m_streamOut << " align=\"" << tqlayout.alignment << "\"";
         if ( (direction == TQChar::DirRLE) || (direction == TQChar::DirRLO) )
           *m_streamOut << " dir=\"rtl\"";
     }
-    else if ( tqlayout.tqalignment=="auto")
+    else if ( tqlayout.alignment=="auto")
     {
         // Do nothing, the user-agent should be more intelligent than us.
     }
     else
     {
-        kdWarning(30503) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
+        kdWarning(30503) << "Unknown alignment: " << tqlayout.alignment << endl;
     }
 
     *m_streamOut << ">";
diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc
index 49abcf79..52d56fbf 100644
--- a/filters/kword/html/export/ExportCss.cc
+++ b/filters/kword/html/export/ExportCss.cc
@@ -313,50 +313,50 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
 {
     TQString strLayout;
 
-    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
+    if (force || (layoutOrigin.alignment!=tqlayout.alignment))
     {
-        if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right")
-            || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify"))
+        if ( (tqlayout.alignment=="left") || (tqlayout.alignment== "right")
+            || (tqlayout.alignment=="center") || (tqlayout.alignment=="justify"))
         {
-            strLayout += TQString("text-align:%1; ").tqarg(tqlayout.tqalignment);
+            strLayout += TQString("text-align:%1; ").arg(tqlayout.alignment);
         }
-        else if ( tqlayout.tqalignment=="auto")
+        else if ( tqlayout.alignment=="auto")
         {
             // Do nothing, the user-agent should be more intelligent than us.
         }
         else
         {
-            kdWarning(30503) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
+            kdWarning(30503) << "Unknown alignment: " << tqlayout.alignment << endl;
         }
     }
 
     if ((tqlayout.indentLeft>=0.0)
         && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
-            strLayout += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft);
+            strLayout += TQString("margin-left:%1pt; ").arg(tqlayout.indentLeft);
     }
 
     if ((tqlayout.indentRight>=0.0)
         && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
-        strLayout += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight);
+        strLayout += TQString("margin-right:%1pt; ").arg(tqlayout.indentRight);
     }
 
     if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
     {
-        strLayout += TQString("text-indent:%1pt; ").tqarg(tqlayout.indentFirst);
+        strLayout += TQString("text-indent:%1pt; ").arg(tqlayout.indentFirst);
     }
 
     if ((tqlayout.marginBottom>=0.0)
         && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
-       strLayout += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom);
+       strLayout += TQString("margin-bottom:%1pt; ").arg(tqlayout.marginBottom);
     }
 
     if ((tqlayout.marginTop>=0.0)
         && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
-       strLayout += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop);
+       strLayout += TQString("margin-top:%1pt; ").arg(tqlayout.marginTop);
     }
 
     if (force
@@ -509,8 +509,8 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
         else
         {
             strLayout += "text-shadow:";
-            strLayout+=TQString("%1 %2pt %3pt; ").tqarg(tqlayout.shadowColor.name())
-                .tqarg(xDistance,0,'f',0).tqarg(yDistance,0,'f',0);
+            strLayout+=TQString("%1 %2pt %3pt; ").arg(tqlayout.shadowColor.name())
+                .arg(xDistance,0,'f',0).arg(yDistance,0,'f',0);
                 // We do not want any scientific notation or any decimal
         }
     }
@@ -557,7 +557,7 @@ void HtmlCssWorker::openParagraph(const TQString& strTag,
     {
         *m_streamOut << "<sup>"; //Superscript
     }
-    if ( tqlayout.tqalignment == "center" ) *m_streamOut << "<center>";
+    if ( tqlayout.alignment == "center" ) *m_streamOut << "<center>";
 }
 
 void HtmlCssWorker::closeParagraph(const TQString& strTag,
@@ -572,7 +572,7 @@ void HtmlCssWorker::closeParagraph(const TQString& strTag,
         *m_streamOut << "</sub>"; //Subscript
     }
 
-    if ( tqlayout.tqalignment == "center" ) *m_streamOut << "</center>";
+    if ( tqlayout.alignment == "center" ) *m_streamOut << "</center>";
     *m_streamOut << "</" << strTag << ">\n";
 }
 
diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc
index 20c7069b..ff81c956 100644
--- a/filters/kword/html/export/ExportDialog.cc
+++ b/filters/kword/html/export/ExportDialog.cc
@@ -46,8 +46,8 @@ HtmlExportDialog :: HtmlExportDialog(TQWidget* parent)
 
     TQStringList encodingList;
 
-    encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-    encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
+    encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+    encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
     encodingList += KGlobal::charsets()->descriptiveEncodingNames();
 
     m_dialog->comboBoxEncoding->insertStringList( encodingList );
@@ -106,7 +106,7 @@ TQTextCodec* HtmlExportDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30503) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc
index aa1b1817..441048b4 100644
--- a/filters/kword/html/export/ExportFilter.cc
+++ b/filters/kword/html/export/ExportFilter.cc
@@ -456,7 +456,7 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
         if ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
             && (tqlayout.counter.depth<6) )
         {
-            strTag=TQString("h%1").tqarg(tqlayout.counter.depth + 1); // H1 ... H6
+            strTag=TQString("h%1").arg(tqlayout.counter.depth + 1); // H1 ... H6
         }
         else
         {
diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp
index 6e134e38..482c90a5 100644
--- a/filters/kword/html/import/khtmlreader.cpp
+++ b/filters/kword/html/import/khtmlreader.cpp
@@ -178,7 +178,7 @@ void KHTMLReader::parseNode(DOM::Node node)
 	if (!t.isNull()) 
         {
 	   _writer->addText(state()->paragraph,t.data().string(),1,state()->in_pre_mode);
-	   return; // no tqchildren anymore...
+	   return; // no children anymore...
 	}
 
 	// is this really needed ? it can't do harm anyway.
@@ -321,7 +321,7 @@ void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout)
 		_writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","0");
 		_writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
 		int currdepth=(_writer->getLayoutAttribute(state()->paragraph,"COUNTER","depth")).toInt();
-		_writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1));
+		_writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(currdepth+1));
 	}
 }
 
@@ -520,11 +520,11 @@ void KHTMLReader::parseStyle(DOM::Element e)
      // debugging code.
      kdDebug(30503) << "e.style()" << endl;
      for (unsigned int i=0;i<s1.length();i++) {
-        kdDebug(30503) << TQString("%1: %2").tqarg(s1.item(i).string()).tqarg(s1.getPropertyValue(s1.item(i)).string()) << endl;
+        kdDebug(30503) << TQString("%1: %2").arg(s1.item(i).string()).arg(s1.getPropertyValue(s1.item(i)).string()) << endl;
      }
      kdDebug(30503) << "override style" << endl;
      for (unsigned int i=0;i<s2.length();i++) {
-        kdDebug(30503) << TQString("%1: %2").tqarg(s2.item(i).string()).tqarg(s2.getPropertyValue(s2.item(i)).string()) << endl;
+        kdDebug(30503) << TQString("%1: %2").arg(s2.item(i).string()).arg(s2.getPropertyValue(s2.item(i)).string()) << endl;
      }
 */
 }
@@ -628,7 +628,7 @@ bool KHTMLReader::parse_pre(DOM::Element e)
 		_writer->addText(state()->paragraph,htmlelement.innerHTML().string(),1);
 	startNewParagraph();
 	//popState();
-	return false; // tqchildren are already handled.
+	return false; // children are already handled.
 #else
 	pushNewState();
 	state()->in_pre_mode=true;
@@ -640,7 +640,7 @@ bool KHTMLReader::parse_pre(DOM::Element e)
 	}
 	popState();
         _writer->formatAttribute(state()->paragraph,"FONT","name",face);
-	return false; // tqchildren are already handled.
+	return false; // children are already handled.
 #endif
 }
 
@@ -668,11 +668,11 @@ bool KHTMLReader::parse_font(DOM::Element e)
 
   _writer->formatAttribute(state()->paragraph,"FONT","name",face);
   if ((isize>=0) && (isize != 12))
-    _writer->formatAttribute(state()->paragraph,"SIZE","value",TQString("%1").tqarg(isize));
+    _writer->formatAttribute(state()->paragraph,"SIZE","value",TQString("%1").arg(isize));
 
-  _writer->formatAttribute(state()->paragraph,"COLOR","red",TQString("%1").tqarg(color.red()));
-  _writer->formatAttribute(state()->paragraph,"COLOR","green",TQString("%1").tqarg(color.green()));
-  _writer->formatAttribute(state()->paragraph,"COLOR","blue",TQString("%1").tqarg(color.blue()));
+  _writer->formatAttribute(state()->paragraph,"COLOR","red",TQString("%1").arg(color.red()));
+  _writer->formatAttribute(state()->paragraph,"COLOR","green",TQString("%1").arg(color.green()));
+  _writer->formatAttribute(state()->paragraph,"COLOR","blue",TQString("%1").arg(color.blue()));
   return true;
 }
 
@@ -684,7 +684,7 @@ bool KHTMLReader::parse_ul(DOM::Element e)
   _list_depth++;
   if (e.firstChild().nodeName().string().lower() == "#text")  // e.g. <ul>this is indented<li>first listitem</li></ul>
   {
-    _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
+    _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(_list_depth-1)); // indent
     startNewLayout();
   }
   for (DOM::Node items=e.firstChild();!items.isNull();items=items.nextSibling()) 
@@ -706,7 +706,7 @@ bool KHTMLReader::parse_ul(DOM::Element e)
 	_writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","");
         _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
       }
-      _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
+      _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(_list_depth-1)); // indent
     }
     parseNode(items);
   }
diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp
index 56568be9..3223ef42 100644
--- a/filters/kword/html/import/kwdwriter.cpp
+++ b/filters/kword/html/import/kwdwriter.cpp
@@ -173,9 +173,9 @@ TQDomElement KWDWriter::createTableCell(int tableno, int nrow,
 	TQDomElement parent=docroot().elementsByTagName("FRAMESETS").item(0).toElement();
 
 	TQDomElement fs=addFrameSet(parent,1,0,
-			TQString("Table %1 - %2,%3").tqarg(tableno).tqarg(nrow).tqarg(ncol),
+			TQString("Table %1 - %2,%3").arg(tableno).arg(nrow).arg(ncol),
 			1);
-	fs.setAttribute("grpMgr",TQString("Table %1").tqarg(tableno));
+	fs.setAttribute("grpMgr",TQString("Table %1").arg(tableno));
 	fs.setAttribute("row",nrow);
 	fs.setAttribute("col",ncol);
 	fs.setAttribute("cols",colspan); // FIXME do colspan in finishTable
@@ -189,9 +189,9 @@ TQDomElement KWDWriter::fetchTableCell(int tableno, int rowno, int colno) {
 	TQDomNodeList e=docroot().elementsByTagName("FRAMESET");
 	for (unsigned int i=0;i<e.count();i++) {
 	     TQDomElement k=e.item(i).toElement();
-	     if (k.attribute("grpMgr") == TQString("Table %1").tqarg(tableno))
-		     if (k.attribute("row") == TQString("%1").tqarg(rowno))
-		     	if (k.attribute("col") == TQString("%1").tqarg(colno))
+	     if (k.attribute("grpMgr") == TQString("Table %1").arg(tableno))
+		     if (k.attribute("row") == TQString("%1").arg(rowno))
+		     	if (k.attribute("col") == TQString("%1").arg(colno))
 		     		return k;
 	}
 	TQDomElement dummy;
@@ -207,7 +207,7 @@ void KWDWriter::finishTable(int tableno) {
 
 
 void KWDWriter::createHR(TQDomElement paragraph, int width) {
-	layoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").tqarg(width));
+	layoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").arg(width));
 }
 
 void KWDWriter::finishTable(int tableno,TQRect rect) {
@@ -227,7 +227,7 @@ void KWDWriter::finishTable(int tableno,TQRect rect) {
 	// first, see how big the table is (cols & rows)
 	for (unsigned i=0;i<nl.count();i++) {
 	    TQDomElement k=nl.item(i).toElement();
-	    	if (k.attribute("grpMgr") == TQString("Table %1").tqarg(tableno)) {
+	    	if (k.attribute("grpMgr") == TQString("Table %1").arg(tableno)) {
 	    	  ncols=MAX(ncols,k.attribute("col").toInt()+1);
 	    	  nrows=MAX(nrows,k.attribute("row").toInt()+1);	    	
 	    	}
@@ -251,7 +251,7 @@ void KWDWriter::finishTable(int tableno,TQRect rect) {
 	      TQDomElement e=fetchTableCell(tableno,currow,curcol);
 	      if (e.isNull()) {
 	              // a missing cell !
-	              kdDebug(30503) << TQString("creating %1 %2").tqarg(currow).tqarg(curcol).latin1() << endl;
+	              kdDebug(30503) << TQString("creating %1 %2").arg(currow).arg(curcol).latin1() << endl;
 	              createTableCell(tableno,currow,curcol,1,
 		      			TQRect(x+step_x*curcol,y+step_y*currow,step_x,step_y)
 				);
@@ -460,8 +460,8 @@ void KWDWriter::addText(TQDomElement paragraph, TQString text, int format_id, bo
 	TQDomElement lastformat=currentFormat(paragraph,true);
 	if (lastformat.attribute("id").isEmpty()) // keep old id value, e.g. for LINK URL
 		lastformat.setAttribute("id",format_id);
-	lastformat.setAttribute("pos",TQString("%1").tqarg(oldLength));
-	lastformat.setAttribute("len",TQString("%1").tqarg(newLength));
+	lastformat.setAttribute("pos",TQString("%1").arg(oldLength));
+	lastformat.setAttribute("len",TQString("%1").arg(newLength));
 }
 
 TQString KWDWriter::getText(TQDomElement paragraph) {
diff --git a/filters/kword/kword1.3/import/kword13formatone.h b/filters/kword/kword1.3/import/kword13formatone.h
index e4cc7f38..682ef887 100644
--- a/filters/kword/kword1.3/import/kword13formatone.h
+++ b/filters/kword/kword1.3/import/kword13formatone.h
@@ -29,8 +29,8 @@ class TQTextStream;
 #include "kword13format.h"
 
 /**
- * Contains the data of the \<FORMAT id="1"\> tqchildren
- * also the grand-tqchildren of \<STYLE\> and \<LAYOUT\>
+ * Contains the data of the \<FORMAT id="1"\> children
+ * also the grand-children of \<STYLE\> and \<LAYOUT\>
  */
 class KWord13FormatOneData
 {
@@ -75,7 +75,7 @@ public:
     virtual KWord13FormatOneData* getFormatOneData(void);
 public:
     int m_length; ///< Length of format
-    KWord13FormatOneData m_formatOne; ///< Data of tqchildren of \<FORMAT id="1"\>
+    KWord13FormatOneData m_formatOne; ///< Data of children of \<FORMAT id="1"\>
 };
 
 #endif // KWORD_1_3_FORMAT_ONE
diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp
index 82812412..47eed1e7 100644
--- a/filters/kword/kword1.3/import/kword13import.cpp
+++ b/filters/kword/kword1.3/import/kword13import.cpp
@@ -59,7 +59,7 @@ bool KWord13Import::parseInfo( TQIODevice* io, KWord13Document& kwordDocument )
         return false;
     }
     TQDomElement docElement( doc.documentElement() );
-    // In documentinfo.xml, the text data is in the grand-tqchildren of the document element
+    // In documentinfo.xml, the text data is in the grand-children of the document element
     for ( TQDomNode node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() )
     {
         kdDebug(30520) << "Child " << node.nodeName() << endl;
diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
index 00b899f9..6c7ec01f 100644
--- a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
+++ b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
@@ -425,7 +425,7 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayou
         case T_RIGHT:
             tabsWriter.addAttribute( "style:type", "right" );
             break;
-        case T_DEC_PNT:  // "tqalignment on decimal point"
+        case T_DEC_PNT:  // "alignment on decimal point"
             tabsWriter.addAttribute( "style:type", "char" );
             tabsWriter.addAttribute( "style:char", TQString( (*it).alignChar ) );
             break;
diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp
index e3958b45..cbe650dc 100644
--- a/filters/kword/kword1.3/import/kword13parser.cpp
+++ b/filters/kword/kword1.3/import/kword13parser.cpp
@@ -625,13 +625,13 @@ bool KWord13Parser::startElement( const TQString&, const TQString&, const TQStri
     }
     else if ( name == "FRAMESTYLE" )
     {
-        // ### TODO, but some of the <STYLE> tqchildren are also tqchildren of <FRAMESTYLE>, so we have to set it to "ignore"
+        // ### TODO, but some of the <STYLE> children are also children of <FRAMESTYLE>, so we have to set it to "ignore"
         stackItem->elementType = KWord13TypeIgnore;
         success = true;
     }
     else if ( name == "PICTURES" || name == "PIXMAPS" || name == "CLIPARTS" )
     {
-        // We just need a separate "type" for the <KEY> tqchildren
+        // We just need a separate "type" for the <KEY> children
         stackItem->elementType = KWord13TypePicturesPlural;
         success = true;
     }
@@ -795,7 +795,7 @@ bool KWord13Parser :: characters ( const TQString & ch )
             const uint length = ch.length();
             for ( uint i = 0; i < length; ++i )
             {
-                const ushort uni = ch.tqat(i).tqunicode();
+                const ushort uni = ch.at(i).tqunicode();
                 if ( uni >= 32 )
                     continue; // Normal character
                 else if ( uni == 9 || uni == 10 || uni == 13)
diff --git a/filters/kword/kword1.3/import/kword13parser.h b/filters/kword/kword1.3/import/kword13parser.h
index 7dc81d42..21b25f20 100644
--- a/filters/kword/kword1.3/import/kword13parser.h
+++ b/filters/kword/kword1.3/import/kword13parser.h
@@ -92,9 +92,9 @@ protected: //TQXml
     virtual bool error(const TQXmlParseException& exception);
     virtual bool fatalError(const TQXmlParseException& exception);
 protected:
-    /// Process tqchildren of \<FORMAT id="1"\>
+    /// Process children of \<FORMAT id="1"\>
     bool startElementFormatOneProperty( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem);
-    /// Process tqchildren of \<LAYOUT\> (with exceptions)
+    /// Process children of \<LAYOUT\> (with exceptions)
     bool startElementLayoutProperty( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem);
     /// Process \<NAME\>
     bool startElementName( const TQString&, const TQXmlAttributes& attributes, KWord13StackItem *stackItem );
@@ -108,7 +108,7 @@ protected:
     bool startElementFrame( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem );
     /// Process \<FRAMESET\>
     bool startElementFrameset( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem );
-    /// Process opening tag of some elements that are tqchildren of \<DOC\> and which only define document properties
+    /// Process opening tag of some elements that are children of \<DOC\> and which only define document properties
     bool startElementDocumentAttributes( const TQString& name, const TQXmlAttributes& attributes,
         KWord13StackItem *stackItem, const KWord13StackItemType& allowedParentType, const KWord13StackItemType& newType );
     /// Process \<KEY\>
diff --git a/filters/kword/latex/export/fileheader.cc b/filters/kword/latex/export/fileheader.cc
index 96b4be4e..8da25a16 100644
--- a/filters/kword/latex/export/fileheader.cc
+++ b/filters/kword/latex/export/fileheader.cc
@@ -78,7 +78,7 @@ void FileHeader::analysePaper(const TQDomNode balise)
 	analysePaperParam(balise);
 
 	//setTokenCurrent(balise_initiale->pContent);
-	// Analyse tqchildren markups --> PAPERBORDERS
+	// Analyse children markups --> PAPERBORDERS
 	TQDomNode fils = getChild(balise, "PAPERSBORDERS");
 	_leftBorder = getAttr(fils, "left").toInt();
 	_rightBorder = getAttr(fils, "right").toInt();
@@ -287,7 +287,7 @@ void FileHeader::generatePackage(TQTextStream &out)
 	if(Config::instance()->mustUseUnicode())
 		out << "\\usepackage{omega}" << endl;
 	if(getFormat() == TF_A4)
-		out << "\\usepackage[a4paper]{tqgeometry}" << endl;
+		out << "\\usepackage[a4paper]{geometry}" << endl;
 	if(hasFooter() || hasHeader())
 		out << "\\usepackage{fancyhdr}" << endl;
 	if(hasColor())
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc
index 079b38d3..28bb48bf 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cc
+++ b/filters/kword/latex/export/kwordlatexexportdia.cc
@@ -71,7 +71,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent,
 	TQString value;
 	while(i < 10)
 	{
-		/*value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
+		/*value = _config->readPathEntry( TQString("Recent%1").arg(i) );
 		kdDebug(30522) << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
diff --git a/filters/kword/latex/export/layout.cc b/filters/kword/latex/export/layout.cc
index f75ac651..74cee48b 100644
--- a/filters/kword/latex/export/layout.cc
+++ b/filters/kword/latex/export/layout.cc
@@ -59,7 +59,7 @@ void Layout::analyseLayout(const TQDomNode balise)
 	/* No parameters for this markup */
 	kdDebug(30522) << "ANALYSE OF THE BEGINING OF A LAYOUT" << endl;
 	
-	/* Analyse tqchildren markups */
+	/* Analyse children markups */
 	for(int index= 0; index < getNbChild(balise); index++)
 	{
 		if(getChildName(balise, index).compare("NAME")== 0)
diff --git a/filters/kword/latex/export/para.cc b/filters/kword/latex/export/para.cc
index 6003a075..4264d9c6 100644
--- a/filters/kword/latex/export/para.cc
+++ b/filters/kword/latex/export/para.cc
@@ -23,7 +23,7 @@
 #include <kdebug.h>		/* for kdDebug() stream */
 #include "para.h"
 #include "textFrame.h"		/* father class.        */
-#include "format.h"		/* tqchildren classes.    */
+#include "format.h"		/* children classes.    */
 //#include "picturezone.h"
 #include "fileheader.h"
 #include "textzone.h"
@@ -132,7 +132,7 @@ void Para::analyse(const TQDomNode balise)
 
 	kdDebug(30522) << "**** PARAGRAPH ****" << endl;
 
-	/* Analyse of the tqchildren markups */
+	/* Analyse of the children markups */
 	for(int index = 0; index < getNbChild(balise); index++)
 	{
 		if(getChildName(balise, index).compare("TEXT")== 0)
diff --git a/filters/kword/latex/export/para.h b/filters/kword/latex/export/para.h
index 75c41b3a..7d1c0af1 100644
--- a/filters/kword/latex/export/para.h
+++ b/filters/kword/latex/export/para.h
@@ -26,7 +26,7 @@
 #include <tqptrstack.h>		/* historic list */
 #include <tqptrlist.h>		/* for list of format */
 
-/*#include "listeformat.h"*/	/* tqchildren class contents the zone (italic, footnote,
+/*#include "listeformat.h"*/	/* children class contents the zone (italic, footnote,
 				   variable. */
 #include "layout.h"		/* set of informations about the paragraph style. */
 #include "element.h"		/* to use the father class. */
diff --git a/filters/kword/latex/export/xmlparser.cc b/filters/kword/latex/export/xmlparser.cc
index 9c4c07e4..9d83bedb 100644
--- a/filters/kword/latex/export/xmlparser.cc
+++ b/filters/kword/latex/export/xmlparser.cc
@@ -104,18 +104,18 @@ bool XmlParser::isChild(TQDomNode balise, TQString name)
 TQDomNode XmlParser::getChild(TQDomNode balise, TQString name, int index)
 {
 	if(balise.isElement()) {
-		TQDomNodeList tqchildren = balise.toElement().elementsByTagName(name);
-		if ( tqchildren.count() )
-			return tqchildren.item(index);
+		TQDomNodeList children = balise.toElement().elementsByTagName(name);
+		if ( children.count() )
+			return children.item(index);
 	}
 	return TQDomNode();
 }
 
 TQDomNode XmlParser::getChild(TQDomNode balise, int index)
 {
-	TQDomNodeList tqchildren = balise.childNodes();
-	if ( tqchildren.count() )
-		return tqchildren.item(index);
+	TQDomNodeList children = balise.childNodes();
+	if ( children.count() )
+		return children.item(index);
 	return TQDomNode();
 }
 
diff --git a/filters/kword/latex/import/parser/env.cc b/filters/kword/latex/import/parser/env.cc
index e25e95ab..14abad37 100644
--- a/filters/kword/latex/import/parser/env.cc
+++ b/filters/kword/latex/import/parser/env.cc
@@ -47,10 +47,10 @@ Env::~Env()
 {
 }
 
-void Env::setChildren(TQPtrList<Element>* tqchildren)
+void Env::setChildren(TQPtrList<Element>* children)
 {
-	if(tqchildren != NULL)
-		_tqchildren = *tqchildren;
+	if(children != NULL)
+		_children = *children;
 }
 
 void Env::print(int tab)
@@ -58,7 +58,7 @@ void Env::print(int tab)
 	cout << "ENV " << getName().latin1() << "{" << endl;
 	
 	Element* elt;
-	for ( elt = _tqchildren.first(); elt; elt = _tqchildren.next() )
+	for ( elt = _children.first(); elt; elt = _children.next() )
 	{
 		elt->print(tab);
 	}
diff --git a/filters/kword/latex/import/parser/env.h b/filters/kword/latex/import/parser/env.h
index cef56b29..191c0dd6 100644
--- a/filters/kword/latex/import/parser/env.h
+++ b/filters/kword/latex/import/parser/env.h
@@ -27,7 +27,7 @@
 
 class Env: public Element
 {
-	TQPtrList<Element> _tqchildren;
+	TQPtrList<Element> _children;
 	TQString _name;
 
 	public:
diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc
index b627ebd2..149e9b9d 100644
--- a/filters/kword/libexport/KWEFKWordLeader.cc
+++ b/filters/kword/libexport/KWEFKWordLeader.cc
@@ -1280,7 +1280,7 @@ static bool ParseFile ( TQIODevice* subFile, TQDomDocument& doc)
             << "  Message: " << errorMsg << endl;
         // ### TODO: the error is in which sub-file?
         KMessageBox::error( 0L, i18n("An error has occurred while parsing the KWord file.\nAt line: %1, column %2\nError message: %3")
-            .tqarg( errorLine ).tqarg( errorColumn ).tqarg(i18n( "TQXml", errorMsg.utf8() ) ),
+            .arg( errorLine ).arg( errorColumn ).arg(i18n( "TQXml", errorMsg.utf8() ) ),
             i18n("KWord Export Filter Library"), 0 );
         return false;
     }
diff --git a/filters/kword/libexport/KWEFStructures.h b/filters/kword/libexport/KWEFStructures.h
index dbee22d0..fe302965 100644
--- a/filters/kword/libexport/KWEFStructures.h
+++ b/filters/kword/libexport/KWEFStructures.h
@@ -428,7 +428,7 @@ public:
 
     TQString     styleName;
     TQString     styleFollowing;
-    TQString     tqalignment;      ///< left, right, center, justify
+    TQString     alignment;      ///< left, right, center, justify
     CounterData counter;
     FormatData  formatData;
     double      indentFirst;    ///< indentation correction of first line (can be negative!)
diff --git a/filters/kword/libexport/KWEFUtil.cc b/filters/kword/libexport/KWEFUtil.cc
index 56e2b669..65a99977 100644
--- a/filters/kword/libexport/KWEFUtil.cc
+++ b/filters/kword/libexport/KWEFUtil.cc
@@ -78,7 +78,7 @@ TQString KWEFUtil::EscapeSgmlText(const TQTextCodec* codec,
                 {
                     if (!codec->canEncode(ch))
                     {
-                        strReturn+=TQString("&#%1;").tqarg(ch.tqunicode());
+                        strReturn+=TQString("&#%1;").arg(ch.tqunicode());
                         break;
                     }
                 }
diff --git a/filters/kword/libexport/ProcessDocument.cc b/filters/kword/libexport/ProcessDocument.cc
index ed5a7bfc..c6c0cb41 100644
--- a/filters/kword/libexport/ProcessDocument.cc
+++ b/filters/kword/libexport/ProcessDocument.cc
@@ -438,7 +438,7 @@ static void ProcessNoteTag (TQDomNode myNode, void *tagData, KWEFKWordLeader *le
     variable->setGenericData( "note", note );
 }
 
-// ### TODO: some files have not a <VARIABLE> tag but its supposed tqchildren are directly tqchildren of <FORMAT id="4">
+// ### TODO: some files have not a <VARIABLE> tag but its supposed children are directly children of <FORMAT id="4">
 static void ProcessVariableTag (TQDomNode myNode, void* tagData, KWEFKWordLeader* leader)
 {
     VariableData *variable = (VariableData *) tagData;
@@ -948,7 +948,7 @@ static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *l
     {
         if ( oldAlign.isEmpty() )
         {
-            tqlayout->tqalignment = "left"; // KWord 0.8 did not support right-to-left
+            tqlayout->alignment = "left"; // KWord 0.8 did not support right-to-left
         }
         else
         {
@@ -956,19 +956,19 @@ static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *l
             if ( ( align < 0 ) || ( align > 3) )
             {
                 kdWarning(30508) << "KWord 0.8 flow unknown: " << oldAlign << endl;
-                tqlayout->tqalignment = "left"; // Unknown, so assume left
+                tqlayout->alignment = "left"; // Unknown, so assume left
             }
             else
             {
                 const char* flows[]={"left", "right", "center", "justify" };
-                tqlayout->tqalignment = flows[ align ];
+                tqlayout->alignment = flows[ align ];
             }
         }
-        kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << tqlayout->tqalignment << endl;
+        kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << tqlayout->alignment << endl;
     }
     else
     {
-        tqlayout->tqalignment = normalAlign;
+        tqlayout->alignment = normalAlign;
     }
 
 }
diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp
index 6bd895b9..595c026c 100644
--- a/filters/kword/msword/conversion.cpp
+++ b/filters/kword/msword/conversion.cpp
@@ -246,7 +246,7 @@ int Conversion::ditheringToGray( int ipat, bool* ok )
     }
 }
 
-TQString Conversion::tqalignment( int jc ) {
+TQString Conversion::alignment( int jc ) {
     TQString value( "left" );
     if ( jc == 1 )
         value = "center";
diff --git a/filters/kword/msword/conversion.h b/filters/kword/msword/conversion.h
index fd30c69f..f8610415 100644
--- a/filters/kword/msword/conversion.h
+++ b/filters/kword/msword/conversion.h
@@ -57,8 +57,8 @@ namespace Conversion
     // Hackery for gray levels
     int ditheringToGray( int ipat, bool* ok );
 
-    // Convert tqalignment code to string
-    TQString tqalignment( int jc );
+    // Convert alignment code to string
+    TQString alignment( int jc );
 
     // Convert linespacing struct to string
     TQString lineSpacing( const wvWare::Word97::LSPD& lspd );
diff --git a/filters/kword/msword/document.cpp b/filters/kword/msword/document.cpp
index 5044f023..ab70c79a 100644
--- a/filters/kword/msword/document.cpp
+++ b/filters/kword/msword/document.cpp
@@ -328,10 +328,10 @@ void Document::footnoteStart()
     framesetElement.setAttribute( "frameInfo", 7 /* footnote/endnote */ );
     if ( type == wvWare::FootnoteData::Endnote )
         // Keep name in sync with KWordTextHandler::footnoteFound
-        framesetElement.setAttribute("name", i18n("Endnote %1").tqarg( ++m_endNoteNumber ) );
+        framesetElement.setAttribute("name", i18n("Endnote %1").arg( ++m_endNoteNumber ) );
     else
         // Keep name in sync with KWordTextHandler::footnoteFound
-        framesetElement.setAttribute("name", i18n("Footnote %1").tqarg( ++m_footNoteNumber ) );
+        framesetElement.setAttribute("name", i18n("Footnote %1").arg( ++m_footNoteNumber ) );
     m_framesetsElement.appendChild(framesetElement);
 
     createInitialFrame( framesetElement, 29, 798, 567, 567+41, true, NoFollowup );
@@ -352,7 +352,7 @@ void Document::slotTableCellStart( int row, int column, int rowSpan, int columnS
     framesetElement.setAttribute( "frameType", 1 /* text */ );
     framesetElement.setAttribute( "frameInfo", 0 /* normal text */ );
     framesetElement.setAttribute( "grpMgr", tableName );
-    TQString name = i18n("Table_Name Cell row,column", "%1 Cell %2,%3").tqarg(tableName).tqarg(row).tqarg(column);
+    TQString name = i18n("Table_Name Cell row,column", "%1 Cell %2,%3").arg(tableName).arg(row).arg(column);
     framesetElement.setAttribute( "name", name );
     framesetElement.setAttribute( "row", row );
     framesetElement.setAttribute( "col", column );
diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp
index 10c3abb9..ba359cd2 100644
--- a/filters/kword/msword/texthandler.cpp
+++ b/filters/kword/msword/texthandler.cpp
@@ -123,10 +123,10 @@ void KWordTextHandler::footnoteFound( wvWare::FootnoteData::Type type,
     footnoteElem.setAttribute( "numberingtype", autoNumbered ? "auto" : "manual" );
     if ( type == wvWare::FootnoteData::Endnote )
         // Keep name in sync with Document::startFootnote
-        footnoteElem.setAttribute( "frameset", i18n("Endnote %1").tqarg( ++m_endNoteNumber ) );
+        footnoteElem.setAttribute( "frameset", i18n("Endnote %1").arg( ++m_endNoteNumber ) );
     else
         // Keep name in sync with Document::startFootnote
-        footnoteElem.setAttribute( "frameset", i18n("Footnote %1").tqarg( ++m_footNoteNumber ) );
+        footnoteElem.setAttribute( "frameset", i18n("Footnote %1").arg( ++m_footNoteNumber ) );
     varElem.appendChild( footnoteElem );
 
     // Remember to parse the footnote text later
@@ -160,7 +160,7 @@ void KWordTextHandler::tableRowFound( const wvWare::TableRowFunctor& functor, wv
         paragraphStart( 0L );
         static int s_tableNumber = 0;
         m_currentTable = new KWord::Table();
-        m_currentTable->name = i18n("Table %1").tqarg( ++s_tableNumber );
+        m_currentTable->name = i18n("Table %1").arg( ++s_tableNumber );
         insertAnchor( m_currentTable->name );
     }
 
@@ -181,7 +181,7 @@ void KWordTextHandler::pictureFound( const wvWare::PictureFunctor& pictureFuncto
     TQString pictureName = "pictures/picture";
     pictureName += TQString::number( s_pictureNumber ); // filenames start at 0
     // looks better to the user if frame names start at 1
-    TQString frameName = i18n("Picture %1").tqarg( ++s_pictureNumber );
+    TQString frameName = i18n("Picture %1").arg( ++s_pictureNumber );
     insertAnchor( frameName );
 
     switch ( picf->mfp.mm ) {
@@ -464,7 +464,7 @@ void KWordTextHandler::writeFormat( TQDomElement& parentElement, const wvWare::W
             int dist = fontSize > 20 ? 2 : 1;
             if (chp->fImprint) // ## no real support for imprint, we use a topleft shadow
                 dist = -dist;
-            css = TQString::fromLatin1("#bebebe %1pt %1pt").tqarg(dist).tqarg(dist);
+            css = TQString::fromLatin1("#bebebe %1pt %1pt").arg(dist).arg(dist);
         }
         shadowElem.setAttribute( "text-shadow", css );
         format.appendChild( shadowElem );
@@ -574,10 +574,10 @@ void KWordTextHandler::writeOutParagraph( const TQString& styleName, const TQStr
 void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style )
 {
     const wvWare::Word97::PAP& pap = paragraphProperties.pap();
-    // Always write out the tqalignment, it's required
+    // Always write out the alignment, it's required
     TQDomElement flowElement = mainDocument().createElement("FLOW");
-    TQString tqalignment = Conversion::tqalignment( pap.jc );
-    flowElement.setAttribute( "align", tqalignment );
+    TQString alignment = Conversion::alignment( pap.jc );
+    flowElement.setAttribute( "align", alignment );
     parentElement.appendChild( flowElement );
 
     //kdDebug(30513) << k_funcinfo << " dxaLeft1=" << pap.dxaLeft1 << " dxaLeft=" << pap.dxaLeft << " dxaRight=" << pap.dxaRight << " dyaBefore=" << pap.dyaBefore << " dyaAfter=" << pap.dyaAfter << " lspd=" << pap.lspd.dyaLine << "/" << pap.lspd.fMultLinespace << endl;
@@ -810,7 +810,7 @@ void KWordTextHandler::writeCounter( TQDomElement& parentElement, const wvWare::
              ( numberingType == 0 &&m_previousEnumLSID != 0 && m_previousEnumLSID != listInfo->lsid() ) )
             counterElement.setAttribute( "restart", "true" );
 
-        // listInfo->tqalignment() is not supported in KWord
+        // listInfo->alignment() is not supported in KWord
         // listInfo->isLegal() hmm
         // listInfo->notRestarted() [by higher level of lists] not supported
         // listInfo->followingchar() ignored, it's always a space in KWord currently
diff --git a/filters/kword/msword/texthandler.h b/filters/kword/msword/texthandler.h
index ebea5202..c75cfd4e 100644
--- a/filters/kword/msword/texthandler.h
+++ b/filters/kword/msword/texthandler.h
@@ -88,7 +88,7 @@ public:
     // Returns that element into pChildElement if set (in that case even an empty FORMAT can be appended)
     void writeFormat( TQDomElement& parentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement );
 
-    // Write the _contents_ (tqchildren) of a <LAYOUT> or <STYLE> tag, from the given parag props
+    // Write the _contents_ (children) of a <LAYOUT> or <STYLE> tag, from the given parag props
     void writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style );
 
     // Communication with Document, without having to know about Document
diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc
index e6d211b9..088a669e 100644
--- a/filters/kword/mswrite/mswriteexport.cc
+++ b/filters/kword/mswrite/mswriteexport.cc
@@ -1446,19 +1446,19 @@ public:
 		paraProp.setIsText (true);
 
 		// Alignment
-		if (!tqlayout.tqalignment.isEmpty ())
+		if (!tqlayout.alignment.isEmpty ())
 		{
-			if (tqlayout.tqalignment == "left")
+			if (tqlayout.alignment == "left")
 				// quite useless since MSWrite::Alignment::Left is the default anyway
 				paraProp.setAlignment (MSWrite::Alignment::Left);
-			else if (tqlayout.tqalignment == "right")
+			else if (tqlayout.alignment == "right")
 				paraProp.setAlignment (MSWrite::Alignment::Right);
-			else if (tqlayout.tqalignment == "center")
+			else if (tqlayout.alignment == "center")
 				paraProp.setAlignment (MSWrite::Alignment::Center);
-			else if (tqlayout.tqalignment == "justify")
+			else if (tqlayout.alignment == "justify")
 				paraProp.setAlignment (MSWrite::Alignment::Justify);
 			else
-				kdWarning (30509) << "Unknown Alignment: " << tqlayout.tqalignment << endl;
+				kdWarning (30509) << "Unknown Alignment: " << tqlayout.alignment << endl;
 		}
 
 		// Indentation
diff --git a/filters/kword/mswrite/status.html b/filters/kword/mswrite/status.html
index 6ede1caf..5a8bddd1 100644
--- a/filters/kword/mswrite/status.html
+++ b/filters/kword/mswrite/status.html
@@ -51,7 +51,7 @@
 		<td><b>Imports almost everything except OLE from MS WinWrite (3.0 &amp; 3.1) documents</b> <br>
 			- Character formatting (fonts, bold, italic, underline, superscript, subscript, &quot;(page)&quot; numbering) <br>
 			- Optional/Soft Hyphenation <br>
-			- Paragraph formatting (tqalignment, linespacing, indentation, tabulation) <br>
+			- Paragraph formatting (alignment, linespacing, indentation, tabulation) <br>
 			- Paragraphs with multiple newlines <br>
 			- Pagebreaking (at the start or end of the line and on the next line) <br>
 			- Images (Standard WMFs, monochrome BMPs, position from left margin) <br>
@@ -126,7 +126,7 @@
 		<br>
 
 		<b> Version 0.1 (7 Oct 2001): Initial release </b> <br>
-		- the underlying code to read in the format is there but the filter can only do plain text with tqalignment
+		- the underlying code to read in the format is there but the filter can only do plain text with alignment
 		<br>
 	</td>
     </tr>
diff --git a/filters/kword/mswrite/structures_generated.cpp b/filters/kword/mswrite/structures_generated.cpp
index 6b6e5575..c443f252 100644
--- a/filters/kword/mswrite/structures_generated.cpp
+++ b/filters/kword/mswrite/structures_generated.cpp
@@ -1166,7 +1166,7 @@ namespace MSWrite
 		
 		// --- set defaults in raw array (needed because it's a useThisMuch structure) ---
 		WriteByte ((Byte) (60), m_data + 1);// magic0_60_or_61
-		m_data [2] = 0;						// tqalignment
+		m_data [2] = 0;						// alignment
 		WriteWord ((Word) (30), m_data + 3);// magic30
 		memset (m_data + 5, 0, 6);			// rightIndent, leftIndent, leftIndentFirstLine
 		WriteWord ((Word) (240), m_data + 11);// lineSpacing
@@ -1176,7 +1176,7 @@ namespace MSWrite
 		// --- set defaults for variables --
 		m_numDataBytes = (Byte) (0);
 		m_magic0_60_or_61 = (Byte) (60);
-		m_tqalignment = (Byte) (0);
+		m_alignment = (Byte) (0);
 		m_magic30 = (Word) (30);
 		m_rightIndent = (Word) (0);
 		m_leftIndent = (Word) (0);
@@ -1210,7 +1210,7 @@ namespace MSWrite
 		
 		m_numDataBytes = rhs.m_numDataBytes;
 		m_magic0_60_or_61 = rhs.m_magic0_60_or_61;
-		m_tqalignment = rhs.m_tqalignment;
+		m_alignment = rhs.m_alignment;
 		m_magic30 = rhs.m_magic30;
 		m_rightIndent = rhs.m_rightIndent;
 		m_leftIndent = rhs.m_leftIndent;
@@ -1235,7 +1235,7 @@ namespace MSWrite
 	
 		if (!Verify (Error::InvalidFormat, m_numDataBytes >= 1 && m_numDataBytes <= s_size - sizeof (Byte), DWord (m_numDataBytes))) return false;
 		if (!Verify (Error::Warn, m_magic0_60_or_61 == 0 || m_magic0_60_or_61 == 60 || m_magic0_60_or_61 == 61, DWord (m_magic0_60_or_61))) return false;
-		// m_tqalignment will not be checked
+		// m_alignment will not be checked
 		if (!Verify (Error::Warn, m_magic30 == 30, DWord (m_magic30))) return false;
 		// m_rightIndent will not be checked
 		// m_leftIndent will not be checked
@@ -1275,8 +1275,8 @@ namespace MSWrite
 		
 		ReadByte (m_magic0_60_or_61, m_data + 1);
 		signalHaveSetData (m_magic0_60_or_61 == Byte (60), 0/*offset*/ + 8/*size*/);
-		ReadByte (m_tqalignment, m_data + 2);
-		signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/);
+		ReadByte (m_alignment, m_data + 2);
+		signalHaveSetData (m_alignment == Byte (0), 8/*offset*/ + 8/*size*/);
 		ReadWord (m_magic30, m_data + 3);
 		signalHaveSetData (m_magic30 == Word (30), 16/*offset*/ + 16/*size*/);
 		ReadWord (m_rightIndent, m_data + 5);
@@ -1323,7 +1323,7 @@ namespace MSWrite
 		
 		WriteByte (m_numDataBytes, m_data + 0);
 		WriteByte (m_magic0_60_or_61, m_data + 1);
-		WriteByte (m_tqalignment, m_data + 2);
+		WriteByte (m_alignment, m_data + 2);
 		WriteWord (m_magic30, m_data + 3);
 		WriteWord (m_rightIndent, m_data + 5);
 		WriteWord (m_leftIndent, m_data + 7);
diff --git a/filters/kword/mswrite/structures_generated.h b/filters/kword/mswrite/structures_generated.h
index bc068758..28f7cc4e 100644
--- a/filters/kword/mswrite/structures_generated.h
+++ b/filters/kword/mswrite/structures_generated.h
@@ -701,7 +701,7 @@ namespace MSWrite
 		
 		Byte m_numDataBytes;					// number of bytes that follow
 		Byte m_magic0_60_or_61;				// =0? =60? =61? 60 is the most common
-		Byte m_tqalignment;
+		Byte m_alignment;
 		Word m_magic30;						// =30?
 		Word m_rightIndent;					// indent from right margin + right margin (if in header/footer)
 		Word m_leftIndent;					// indent from left margin + left margin (if in header/footer)
@@ -758,8 +758,8 @@ namespace MSWrite
 		// get and set functions
 		//
 		
-		Byte getAlignment (void) const	{	return m_tqalignment;	}
-		void setAlignment (const Byte val)	{	m_tqalignment = val;	signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/);	}
+		Byte getAlignment (void) const	{	return m_alignment;	}
+		void setAlignment (const Byte val)	{	m_alignment = val;	signalHaveSetData (m_alignment == Byte (0), 8/*offset*/ + 8/*size*/);	}
 		
 		Word getRightIndent (void) const	{	return m_rightIndent;	}
 		void setRightIndent (const Word val)	{	m_rightIndent = val;	signalHaveSetData (m_rightIndent == Word (0), 32/*offset*/ + 16/*size*/);	}
diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc
index 9287169f..5e2d3e42 100644
--- a/filters/kword/oowriter/ExportFilter.cc
+++ b/filters/kword/oowriter/ExportFilter.cc
@@ -1206,9 +1206,9 @@ bool OOWriterWorker::makeTable( const FrameAnchor& anchor, const AnchorType anch
     // Be careful that while being similar the following 5 strings have different purposes
     const TQString automaticTableStyle ( makeAutomaticStyleName( "Table", m_tableNumber ) ); // It also increases m_tableNumber
     const TQString tableName( TQString( "Table" ) + TQString::number( m_tableNumber ) ); // m_tableNumber was already increased
-    const TQString translatedName( i18n( "Object name", "Table %1").tqarg( m_tableNumber ) );
+    const TQString translatedName( i18n( "Object name", "Table %1").arg( m_tableNumber ) );
     const TQString automaticFrameStyle ( makeAutomaticStyleName( "TableFrame", m_textBoxNumber ) ); // It also increases m_textBoxNumber
-    const TQString translatedFrameName( i18n( "Object name", "Table Frame %1").tqarg( m_textBoxNumber ) );
+    const TQString translatedFrameName( i18n( "Object name", "Table Frame %1").arg( m_textBoxNumber ) );
 
     kdDebug(30518) << "Processing table " << anchor.key.toString() << " => " << tableName << endl;
 
@@ -1736,31 +1736,31 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     styleKey += tqlayout.styleName;
     styleKey += ',';
 
-    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
+    if (force || (layoutOrigin.alignment!=tqlayout.alignment))
     {
         // NOTE: OO 1.0.x uses start and end like left and right (section 3.11.4)
         // Unfortunately in XSL-FO's text-align, they are really supposed to be the start and the end.
-        if (tqlayout.tqalignment == "left")
+        if (tqlayout.alignment == "left")
         {
             props += "fo:text-align=\"start\" ";
             styleKey += 'L';
         }
-        else if (tqlayout.tqalignment == "right")
+        else if (tqlayout.alignment == "right")
         {
             props += "fo:text-align=\"end\" ";
             styleKey += 'R';
         }
-        else if (tqlayout.tqalignment == "center")
+        else if (tqlayout.alignment == "center")
         {
             props += "fo:text-align=\"center\" ";
             styleKey += 'C';
         }
-        else if (tqlayout.tqalignment == "justify")
+        else if (tqlayout.alignment == "justify")
         {
             props += "fo:text-align=\"justify\" ";
             styleKey += 'J';
         }
-        else if (tqlayout.tqalignment == "auto")
+        else if (tqlayout.alignment == "auto")
         {
             props += "fo:text-align=\"start\" ";
 #ifndef STRICT_OOWRITER_VERSION_1
@@ -1770,7 +1770,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
         }
         else
         {
-            kdWarning(30518) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
+            kdWarning(30518) << "Unknown alignment: " << tqlayout.alignment << endl;
         }
     }
 
@@ -1779,7 +1779,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     if ((tqlayout.indentLeft>=0.0)
         && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
-        props += TQString("fo:margin-left=\"%1pt\" ").tqarg(tqlayout.indentLeft);
+        props += TQString("fo:margin-left=\"%1pt\" ").arg(tqlayout.indentLeft);
         styleKey += TQString::number(tqlayout.indentLeft);
     }
 
@@ -1788,7 +1788,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     if ((tqlayout.indentRight>=0.0)
         && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
-        props += TQString("fo:margin-right=\"%1pt\" ").tqarg(tqlayout.indentRight);
+        props += TQString("fo:margin-right=\"%1pt\" ").arg(tqlayout.indentRight);
         styleKey += TQString::number(tqlayout.indentRight);
     }
 
@@ -1807,7 +1807,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     if ((tqlayout.marginBottom>=0.0)
         && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
-       props += TQString("fo:margin-bottom=\"%1pt\" ").tqarg(tqlayout.marginBottom);
+       props += TQString("fo:margin-bottom=\"%1pt\" ").arg(tqlayout.marginBottom);
        styleKey += TQString::number(tqlayout.marginBottom);
     }
 
@@ -1816,7 +1816,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     if ((tqlayout.marginTop>=0.0)
         && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
-       props += TQString("fo:margin-top=\"%1pt\" ").tqarg(tqlayout.marginTop);
+       props += TQString("fo:margin-top=\"%1pt\" ").arg(tqlayout.marginTop);
        styleKey += TQString::number(tqlayout.marginTop);
     }
 
diff --git a/filters/kword/oowriter/conversion.cc b/filters/kword/oowriter/conversion.cc
index 2401508c..22d9fed5 100644
--- a/filters/kword/oowriter/conversion.cc
+++ b/filters/kword/oowriter/conversion.cc
@@ -10,7 +10,7 @@ TQString Conversion::importAlignment( const TQString& align )
         return "left";
     if ( align == "end" )
         return "right";
-    kdWarning(30518) << "Conversion::importAlignment unknown tqalignment " << align << endl;
+    kdWarning(30518) << "Conversion::importAlignment unknown alignment " << align << endl;
     return "auto";
 }
 
@@ -22,7 +22,7 @@ TQString Conversion::exportAlignment( const TQString& align )
         return "start";
     if ( align == "right" )
         return "end";
-    kdWarning(30518) << "Conversion::exportAlignment unknown tqalignment " << align << endl;
+    kdWarning(30518) << "Conversion::exportAlignment unknown alignment " << align << endl;
     return "auto";
 }
 
diff --git a/filters/kword/oowriter/conversion.h b/filters/kword/oowriter/conversion.h
index d9388268..ee6b41f6 100644
--- a/filters/kword/oowriter/conversion.h
+++ b/filters/kword/oowriter/conversion.h
@@ -32,7 +32,7 @@
 
 namespace Conversion
 {
-    // Convert paragraph tqalignment value
+    // Convert paragraph alignment value
     TQString importAlignment( const TQString& );
     TQString exportAlignment( const TQString& );
 
diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc
index 87e41f49..3f267beb 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cc
@@ -596,7 +596,7 @@ bool OoWriterImport::createStyleMap( const TQDomDocument & styles, TQDomDocument
       if ( d > 1.0 )
       {
         TQString message( i18n("This document was created with OpenOffice.org version '%1'. This filter was written for version 1.0. Reading this file could cause strange behavior, crashes or incorrect display of the data. Do you want to continue converting the document?") );
-        message = message.tqarg( docElement.attributeNS( ooNS::office, "version", TQString() ) );
+        message = message.arg( docElement.attributeNS( ooNS::office, "version", TQString() ) );
         if ( KMessageBox::warningYesNo( 0, message, i18n( "Unsupported document version" ) ) == KMessageBox::No )
           return false;
       }
@@ -992,11 +992,11 @@ void OoWriterImport::parseList( TQDomDocument& doc, const TQDomElement& list, TQ
 
 static int numberOfParagraphs( const TQDomElement& frameset )
 {
-    const TQDomNodeList tqchildren = frameset.childNodes();
+    const TQDomNodeList children = frameset.childNodes();
     const TQString paragStr = "PARAGRAPH";
     int paragCount = 0;
-    for ( unsigned int i = 0 ; i < tqchildren.length() ; ++i ) {
-        if ( tqchildren.item( i ).toElement().tagName() == paragStr )
+    for ( unsigned int i = 0 ; i < children.length() ; ++i ) {
+        if ( children.item( i ).toElement().tagName() == paragStr )
             ++paragCount;
     }
     return paragCount;
@@ -1458,7 +1458,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& layoutElemen
 {
     Q_ASSERT( layoutElement.ownerDocument() == doc );
 
-    // Always write out the tqalignment, it's required
+    // Always write out the alignment, it's required
     TQDomElement flowElement = doc.createElement("FLOW");
 
     /* This was only an intermediate OASIS decision. The final decision is:
@@ -1563,7 +1563,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& layoutElemen
     style:background-image
     line numbering
     punctuation wrap, 3.10.36
-    vertical tqalignment - a bit like offsetfrombaseline (but not for subscript/superscript, in general)
+    vertical alignment - a bit like offsetfrombaseline (but not for subscript/superscript, in general)
   Michael said those are in fact parag properties:
     style:text-autospace, 3.10.32 - not implemented in kotext
     style:line-break, 3.10.37 - apparently that's for some Asian languages
@@ -2303,7 +2303,7 @@ void OoWriterImport::parseInsideOfTable( TQDomDocument &doc, const TQDomElement&
         if ( localName == "table-cell" ) // OOo SPEC 4.8.1 p267
         {
             const TQString frameName(i18n("Frameset name","Table %3, row %1, column %2")
-                .tqarg(row).tqarg(column).tqarg(tableName)); // The table name could have a % sequence, so use the table name as last!
+                .arg(row).arg(column).arg(tableName)); // The table name could have a % sequence, so use the table name as last!
             kdDebug(30518) << "Trying to create " << frameName << endl;
 
             // We need to create a frameset for the cell
diff --git a/filters/kword/palmdoc/palmdb.cpp b/filters/kword/palmdoc/palmdb.cpp
index 89af187c..7c2ea412 100644
--- a/filters/kword/palmdoc/palmdb.cpp
+++ b/filters/kword/palmdoc/palmdb.cpp
@@ -184,9 +184,9 @@ bool PalmDB::load( const char* filename )
       if( recsize[r] >= 0 )
         {
           data->resize( recsize[r] );
-          stream.tqdevice()->at( recpos[r] );
+          stream.device()->at( recpos[r] );
           for( int q = 0; q < recsize[r]; q++ )
-            { TQ_UINT8 c; stream >> c; data->tqat(q) = c; }
+            { TQ_UINT8 c; stream >> c; data->at(q) = c; }
         }
     records.append( data );
   }
diff --git a/filters/kword/pdf/FilterDevice.cpp b/filters/kword/pdf/FilterDevice.cpp
index 5182f188..8a08c95c 100644
--- a/filters/kword/pdf/FilterDevice.cpp
+++ b/filters/kword/pdf/FilterDevice.cpp
@@ -196,7 +196,7 @@ void Device::addImage()
     }
 
     // add image
-    TQString name = TQString("pictures/picture%1.png").tqarg(_data.imageIndex());
+    TQString name = TQString("pictures/picture%1.png").arg(_data.imageIndex());
     TQDomElement frameset = _data.pictureFrameset(_currentImage.rect);
     current()->pictures.append(frameset);
     TQDomElement picture = _data.createElement("PICTURE");
@@ -253,7 +253,7 @@ void Device::computeGeometry(GfxState *state, Image &image)
 uint Device::initImage(GfxState *state, int width, int height,
                        bool withMask)
 {
-    // get image tqgeometry
+    // get image geometry
     Image image;
     image.mask = withMask;
     computeGeometry(state, image);
diff --git a/filters/kword/pdf/FilterPage.cpp b/filters/kword/pdf/FilterPage.cpp
index 5391cb24..1ba81776 100644
--- a/filters/kword/pdf/FilterPage.cpp
+++ b/filters/kword/pdf/FilterPage.cpp
@@ -245,9 +245,9 @@ void Page::initParagraph(Paragraph &par) const
             if ( res==-1 ) {
                 tab.pos = dx;
                 if (tabRightAligned) {
-                    tab.tqalignment = Tabulator::Right;
+                    tab.alignment = Tabulator::Right;
                     kdDebug(30516) << "tabulated text right aligned.." << endl;
-                } else tab.tqalignment = Tabulator::Left;
+                } else tab.alignment = Tabulator::Left;
                 par.tabs.push_back(tab);
             }
         }
@@ -262,7 +262,7 @@ void Page::initParagraph(Paragraph &par) const
         else par.leftIndent = kMin(par.leftIndent, left);
     }
 
-    // compute tqalignment
+    // compute alignment
     for (it = par.lines().begin(); it!=par.lines().end(); ++it) {
         double left = (*it)->blocks->xMin;
         double right = block(*it, -1)->xMax;
@@ -287,7 +287,7 @@ void Page::initParagraph(Paragraph &par) const
         }
     }
 
-    // finalize tqalignment
+    // finalize alignment
     if (rightAligned) par.align = (leftAligned ? AlignBlock : AlignRight);
     else if (centered) par.align = AlignCenter;
 }
diff --git a/filters/kword/pdf/data.cpp b/filters/kword/pdf/data.cpp
index a6abf929..3c7caae4 100644
--- a/filters/kword/pdf/data.cpp
+++ b/filters/kword/pdf/data.cpp
@@ -117,7 +117,7 @@ TQDomElement Data::createFrameset(FramesetType type, const TQString &n)
     TQString name = n;
     if ( name.isNull() )
         name = (text ? i18n("Text Frameset %1")
-                : i18n("Picture %1")).tqarg(index);
+                : i18n("Picture %1")).arg(index);
     frameset.setAttribute("name", name);
     frameset.setAttribute("frameInfo", 0);
 
@@ -154,7 +154,7 @@ void Data::initPage(const TQValueVector<DRect> &rects,
 //        kdDebug(30516) << "page #" << pageIndex << " rect #" << i
 //                       << ": " << rects[i].toString() << endl;
         if ( !rects[i].isValid() ) continue;
-        TQString name = i18n(TEXT_FRAMESET_NAMES[i]).tqarg(pageIndex);
+        TQString name = i18n(TEXT_FRAMESET_NAMES[i]).arg(pageIndex);
         _textFramesets[i] = createFrameset(Text, name);
         _framesets.appendChild(_textFramesets[i]);
         TQDomElement frame = createFrame(Text, rects[i], true);
diff --git a/filters/kword/pdf/dialog.cpp b/filters/kword/pdf/dialog.cpp
index 29e0eabc..d1a51fb4 100644
--- a/filters/kword/pdf/dialog.cpp
+++ b/filters/kword/pdf/dialog.cpp
@@ -128,7 +128,7 @@ Dialog::Dialog(uint nbPages, bool isEncrypted, TQWidget *widget)
     gbox->setInsideSpacing(KDialogBase::spacingHint());
     top->addWidget(gbox);
     _group = new TQButtonGroup;
-    _allButton = new TQRadioButton(i18n("All (%1 pages)").tqarg(nbPages), gbox);
+    _allButton = new TQRadioButton(i18n("All (%1 pages)").arg(nbPages), gbox);
     _allButton->setChecked(true);
     _group->insert(_allButton);
     TQHBox *hbox = new TQHBox(gbox);
@@ -147,7 +147,7 @@ Dialog::Dialog(uint nbPages, bool isEncrypted, TQWidget *widget)
     _smart->setChecked(true);
     TQWhatsThis::add(_smart,
                     i18n("Removes returns and hyphens at end of line. "
-                         "Also tries to compute the paragraph tqalignment. "
+                         "Also tries to compute the paragraph alignment. "
                          "Note that the tqlayout of some pages can "
                          "get messed up."));
     top->addWidget(_smart);
@@ -181,7 +181,7 @@ Options Dialog::options() const
 {
     Options o;
     o.range = SelectionRange( (_allButton->isChecked() ?
-                             TQString("1-%1").tqarg(_nbPages) : _range->text()) );
+                             TQString("1-%1").arg(_nbPages) : _range->text()) );
     o.ownerPassword = _owner->text();
     o.userPassword = _user->text();
     o.importImages = _images->isChecked();
diff --git a/filters/kword/pdf/fstring.cpp b/filters/kword/pdf/fstring.cpp
index 1dd953aa..c8ecabcb 100644
--- a/filters/kword/pdf/fstring.cpp
+++ b/filters/kword/pdf/fstring.cpp
@@ -32,10 +32,10 @@ namespace PDFImport {
 TQDomElement Tabulator::createElement(Data &data) const
 {
     TQDomElement element = data.createElement("TABULATOR");
-    element.setAttribute("type", tqalignment);
+    element.setAttribute("type", alignment);
     element.setAttribute("ptpos", pos);
     element.setAttribute("filling", filling);
-    if ( tqalignment==Character )
+    if ( alignment==Character )
         element.setAttribute("alignchar", TQString(alignmentChar));
     return element;
 }
diff --git a/filters/kword/pdf/fstring.h b/filters/kword/pdf/fstring.h
index 6e4d0b6a..644c9398 100644
--- a/filters/kword/pdf/fstring.h
+++ b/filters/kword/pdf/fstring.h
@@ -39,13 +39,13 @@ public:
     enum Alignment { Left = 0, Center, Right, Character };
     enum Filling { Blank = 0, Dots, Line, Dash, DashDot, DashDotDot };
 
-    Tabulator() : tqalignment(Left) {}
+    Tabulator() : alignment(Left) {}
 
     TQDomElement createElement(Data &data) const;
 
 public:
     double    pos;
-    Alignment tqalignment;
+    Alignment alignment;
     Filling   filling;
     TQChar     alignmentChar;
 };
diff --git a/filters/kword/pdf/misc.cpp b/filters/kword/pdf/misc.cpp
index 0ffc9dba..3cd0e1bf 100644
--- a/filters/kword/pdf/misc.cpp
+++ b/filters/kword/pdf/misc.cpp
@@ -70,8 +70,8 @@ void DRect::unite(const DRect &r)
 TQString DRect::toString() const
 {
     if ( !isValid() ) return "invalid rect";
-    return TQString("left=%1 right=%2 top=%3 bottom=%4").tqarg(_left).tqarg(_right)
-        .tqarg(_top).tqarg(_bottom);
+    return TQString("left=%1 right=%2 top=%3 bottom=%4").arg(_left).arg(_right)
+        .arg(_top).arg(_bottom);
 }
 
 bool DPath::isRectangle() const
@@ -211,7 +211,7 @@ void Font::init(const TQString &n)
                 _data->family = FAMILY_DATA[Symbol];
             else { // with TQt
                 TQFontDatabase fdb;
-                TQStringList list = fdb.tqfamilies();
+                TQStringList list = fdb.families();
                 list = list.grep(name, false);
                 if ( !list.isEmpty() ) {
                     _data->family = list[0];
diff --git a/filters/kword/pdf/pdfimport.cpp b/filters/kword/pdf/pdfimport.cpp
index e2aa72e8..dfc56703 100644
--- a/filters/kword/pdf/pdfimport.cpp
+++ b/filters/kword/pdf/pdfimport.cpp
@@ -111,7 +111,7 @@ KoFilter::ConversionStatus PdfImport::convert(const TQCString& from,
         for (it.toFirst(); it.current()!=it.end(); it.next()) {
             TQString s = (first ? i18n("First pass: page #%1...")
                          : i18n("Second pass: page #%1..."));
-            pd.setLabel( s.tqarg(it.current()) );
+            pd.setLabel( s.arg(it.current()) );
             tqApp->processEvents();
             if (pd.wasCancelled()) return KoFilter::UserCancelled;
             kdDebug(30516) << "-- " << "pass #" << k
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc b/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc
index d0bda665..e456310b 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc
@@ -54,8 +54,8 @@ static XrmOptionDescRec xOpts[] = {
   {"-fg",            "*Foreground",      XrmoptionSepArg,  NULL},
   {"-background",    "*Background",      XrmoptionSepArg,  NULL},
   {"-bg",            "*Background",      XrmoptionSepArg,  NULL},
-  {"-tqgeometry",      ".tqgeometry",        XrmoptionSepArg,  NULL},
-  {"-g",             ".tqgeometry",        XrmoptionSepArg,  NULL},
+  {"-geometry",      ".geometry",        XrmoptionSepArg,  NULL},
+  {"-g",             ".geometry",        XrmoptionSepArg,  NULL},
   {"-font",          "*.fontList",       XrmoptionSepArg,  NULL},
   {"-fn",            "*.fontList",       XrmoptionSepArg,  NULL},
   {"-title",         ".title",           XrmoptionSepArg,  NULL},
@@ -69,7 +69,7 @@ static XrmOptionDescRec xOpts[] = {
 #define nXOpts (sizeof(xOpts) / sizeof(XrmOptionDescRec))
 
 struct XPDFAppResources {
-  String tqgeometry;
+  String geometry;
   String title;
   Bool installCmap;
   int rgbCubeSize;
@@ -85,7 +85,7 @@ static Bool defReverseVideo = False;
 static Bool defViKeys = False;
 
 static XtResource xResources[] = {
-  { "geometry",     "Geometry",     XtRString, sizeof(String), XtOffsetOf(XPDFAppResources, tqgeometry),     XtRString, (XtPointer)NULL             },
+  { "geometry",     "Geometry",     XtRString, sizeof(String), XtOffsetOf(XPDFAppResources, geometry),     XtRString, (XtPointer)NULL             },
   { "title",        "Title",        XtRString, sizeof(String), XtOffsetOf(XPDFAppResources, title),        XtRString, (XtPointer)NULL             },
   { "installCmap",  "InstallCmap",  XtRBool,   sizeof(Bool),   XtOffsetOf(XPDFAppResources, installCmap),  XtRBool,   (XtPointer)&defInstallCmap  },
   { "rgbCubeSize",  "RgbCubeSize",  XtRInt,    sizeof(int),    XtOffsetOf(XPDFAppResources, rgbCubeSize),  XtRInt,    (XtPointer)&defRGBCubeSize  },
@@ -156,7 +156,7 @@ void XPDFApp::getResources() {
   
   XtGetApplicationResources(appShell, &resources, xResources, nXResources,
 			    NULL, 0);
-  tqgeometry = resources.tqgeometry ? new GString(resources.tqgeometry)
+  geometry = resources.geometry ? new GString(resources.geometry)
                                 : (GString *)NULL;
   title = resources.title ? new GString(resources.title) : (GString *)NULL;
   installCmap = (GBool)resources.installCmap;
@@ -180,8 +180,8 @@ void XPDFApp::getResources() {
 
 XPDFApp::~XPDFApp() {
   deleteGList(viewers, XPDFViewer);
-  if (tqgeometry) {
-    delete tqgeometry;
+  if (geometry) {
+    delete geometry;
   }
   if (title) {
     delete title;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFApp.h b/filters/kword/pdf/xpdf/xpdf/XPDFApp.h
index 46aa28dc..4875456e 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFApp.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFApp.h
@@ -58,7 +58,7 @@ public:
   void remoteQuit();
 
   //----- resource/option values
-  GString *getGeometry() { return tqgeometry; }
+  GString *getGeometry() { return geometry; }
   GString *getTitle() { return title; }
   GBool getInstallCmap() { return installCmap; }
   int getRGBCubeSize() { return rgbCubeSize; }
@@ -90,7 +90,7 @@ private:
   Widget remoteWin;
 
   //----- resource/option values
-  GString *tqgeometry;
+  GString *geometry;
   GString *title;
   GBool installCmap;
   int rgbCubeSize;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
index 290861b9..69a173af 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
@@ -16,7 +16,7 @@
 
 struct _XPDFTreeEntry {
   Widget widget;
-  XPDFTreeEntry *tqchildren;
+  XPDFTreeEntry *children;
   XPDFTreeEntry *next;
 };
 
@@ -158,7 +158,7 @@ externaldef(xpdftreeclassrec) XPDFTreeClassRec xpdfTreeClassRec = {
     XtVersion,					// version
     NULL,					// callback_private
     defaultTranslations,			// tm_table
-    &queryGeometry,				// query_tqgeometry
+    &queryGeometry,				// query_geometry
     NULL,					// display_accelerator
     NULL					// extension
   },
@@ -259,8 +259,8 @@ static void destroy(Widget widget) {
 }
 
 static void destroySubtree(XPDFTreeEntry *e) {
-  if (e->tqchildren) {
-    destroySubtree(e->tqchildren);
+  if (e->children) {
+    destroySubtree(e->children);
   }
   if (e->next) {
     destroySubtree(e->next);
@@ -301,11 +301,11 @@ static void redisplaySubtree(XPDFTreeWidget w, XPDFTreeEntry *e,
   c = XPDFTreeCPart(e->widget);
   x = e->widget->core.x;
   y = e->widget->core.y + e->widget->core.height / 2;
-  if (e->tqchildren) {
+  if (e->children) {
     if (c->entryExpanded) {
       drawExpandedIcon(w, x - 8, y);
       y2 = y; // make gcc happy
-      for (child = e->tqchildren; child; child = child->next) {
+      for (child = e->children; child; child = child->next) {
 	y2 = child->widget->core.y + child->widget->core.height / 2;
 	XDrawLine(XtDisplay((Widget)w), XtWindow((Widget)w), w->tree.dottedGC,
 		  x - 8, y2, x + 6, y2);
@@ -393,7 +393,7 @@ static void setValuesAlmost(Widget oldWidget, Widget newWidget,
 			    XtWidgetGeometry *reply) {
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(newWidget);
 
-  // our parent rejected a tqgeometry request, so accept the compromise
+  // our parent rejected a geometry request, so accept the compromise
   // and retqlayout
   if (!reply->request_mode) {
     if (cls->treeClass.tqlayout) {
@@ -454,7 +454,7 @@ static XtGeometryResult geometryManager(Widget widget,
     return XtGeometryNo;
   }
 
-  // save the current tqgeometry
+  // save the current geometry
   curWidth = w->core.width;
   curHeight = w->core.height;
   curBW = w->core.border_width;
@@ -480,7 +480,7 @@ static XtGeometryResult geometryManager(Widget widget,
     calcSize((Widget)w, widget, &parentReq.width, &reply->height);
   }
 
-  // send tqgeometry request to our parent
+  // send geometry request to our parent
   parentReq.request_mode = CWWidth | CWHeight;
   if (request->request_mode & XtCWQueryOnly) {
     parentReq.request_mode |= XtCWQueryOnly;
@@ -491,7 +491,7 @@ static XtGeometryResult geometryManager(Widget widget,
   }
 
   if (result == XtGeometryNo || (request->request_mode & XtCWQueryOnly)) {
-    // restore the original tqgeometry
+    // restore the original geometry
     w->core.width = curWidth;
     w->core.height = curHeight;
     w->core.border_width = curBW;
@@ -552,10 +552,10 @@ static void initConstraint(Widget requestWidget, Widget newWidget,
   c = XPDFTreeCPart(newWidget);
   c->e = (XPDFTreeEntry *)gmalloc(sizeof(XPDFTreeEntry));
   c->e->widget = newWidget;
-  c->e->tqchildren = NULL;
+  c->e->children = NULL;
   c->e->next = NULL;
   if (c->entryParent) {
-    insertChildOnList(c->e, &XPDFTreeCPart(c->entryParent)->e->tqchildren);
+    insertChildOnList(c->e, &XPDFTreeCPart(c->entryParent)->e->children);
   } else {
     insertChildOnList(c->e, &w->tree.root);
   }
@@ -573,11 +573,11 @@ static void deleteSubtree(Widget widget) {
   if (!c->e) {
     return;
   }
-  while (c->e->tqchildren) {
-    deleteSubtree(c->e->tqchildren->widget);
+  while (c->e->children) {
+    deleteSubtree(c->e->children->widget);
   }
   if (c->entryParent) {
-    deleteChildFromList(c->e, &XPDFTreeCPart(c->entryParent)->e->tqchildren);
+    deleteChildFromList(c->e, &XPDFTreeCPart(c->entryParent)->e->children);
   } else {
     deleteChildFromList(c->e, &w->tree.root);
   }
@@ -603,12 +603,12 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget,
   if (nc->entryParent != oc->entryParent ||
       nc->entryPosition != oc->entryPosition) {
     if (oc->entryParent) {
-      deleteChildFromList(oc->e, &XPDFTreeCPart(oc->entryParent)->e->tqchildren);
+      deleteChildFromList(oc->e, &XPDFTreeCPart(oc->entryParent)->e->children);
     } else {
       deleteChildFromList(oc->e, &w->tree.root);
     }
     if (nc->entryParent) {
-      insertChildOnList(nc->e, &XPDFTreeCPart(nc->entryParent)->e->tqchildren);
+      insertChildOnList(nc->e, &XPDFTreeCPart(nc->entryParent)->e->children);
     } else {
       insertChildOnList(nc->e, &w->tree.root);
     }
@@ -745,9 +745,9 @@ static int layoutSubtree(XPDFTreeWidget w, Widget instigator,
     }
   }
 
-  // place this entry's tqchildren
+  // place this entry's children
   x += xpdfTreeIndent;
-  for (child = e->tqchildren; child; child = child->next) {
+  for (child = e->children; child; child = child->next) {
     y = layoutSubtree(w, instigator, child, x, y,
 		      visible && (!c || c->entryExpanded));
   }
@@ -820,9 +820,9 @@ static void calcSubtreeSize(XPDFTreeWidget w, Widget instigator,
     h1 = 0;
   }
 
-  // if this entry is expanded, get size of all of its tqchildren
+  // if this entry is expanded, get size of all of its children
   if (c->entryExpanded) {
-    for (child = e->tqchildren; child; child = child->next) {
+    for (child = e->children; child; child = child->next) {
       calcSubtreeSize(w, instigator, child, &w2, &h2);
       w2 += xpdfTreeIndent;
       if (w2 > w1) {
@@ -907,13 +907,13 @@ static Boolean findPositionInSubtree(XPDFTreeWidget w, int x, int y,
     return True;
   } else if (x >= child->core.x - 16 && x < child->core.x - 4 &&
 	     y >= y1 - 6 && y < y1 + 6 &&
-	     (*e)->tqchildren) {
+	     (*e)->children) {
     *onExpandIcon = True;
     return True;
   }
   c = XPDFTreeCPart(child);
   if (!c || c->entryExpanded) {
-    for (e2 = (*e)->tqchildren; e2; e2 = e2->next) {
+    for (e2 = (*e)->children; e2; e2 = e2->next) {
       *e = e2;
       if (findPositionInSubtree(w, x, y, e, onExpandIcon)) {
 	return True;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
index de691914..a8c8f8f0 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
@@ -501,9 +501,9 @@ void XPDFViewer::initWindow() {
   XtSetArg(args[n], XmNdeleteResponse, XmDO_NOTHING); ++n;
   if (app->getFullScreen()) {
     XtSetArg(args[n], XmNmwmDecorations, 0); ++n;
-    XtSetArg(args[n], XmNtqgeometry, "+0+0"); ++n;
+    XtSetArg(args[n], XmNgeometry, "+0+0"); ++n;
   } else if (app->getGeometry()) {
-    XtSetArg(args[n], XmNtqgeometry, app->getGeometry()->getCString()); ++n;
+    XtSetArg(args[n], XmNgeometry, app->getGeometry()->getCString()); ++n;
   }
   win = XtCreatePopupShell("win", topLevelShellWidgetClass,
 			   app->getAppShell(), args, n);
@@ -633,7 +633,7 @@ void XPDFViewer::initWindow() {
   XtSetArg(args[n], XmNbottomAttachment, XmATTACH_FORM); ++n;
   s = XmStringCreateLocalized(" of 00000");
   XtSetArg(args[n], XmNlabelString, s); ++n;
-  XtSetArg(args[n], XmNtqalignment, XmALIGNMENT_BEGINNING); ++n;
+  XtSetArg(args[n], XmNalignment, XmALIGNMENT_BEGINNING); ++n;
   XtSetArg(args[n], XmNrecomputeSize, False); ++n;
   pageCountLabel = XmCreateLabel(toolBar, "pageCountLabel", args, n);
   XmStringFree(s);
@@ -751,7 +751,7 @@ void XPDFViewer::initWindow() {
   s = XmStringCreateLocalized("");
   XtSetArg(args[n], XmNlabelString, s); ++n;
   XtSetArg(args[n], XmNrecomputeSize, True); ++n;
-  XtSetArg(args[n], XmNtqalignment, XmALIGNMENT_BEGINNING); ++n;
+  XtSetArg(args[n], XmNalignment, XmALIGNMENT_BEGINNING); ++n;
   linkLabel = XmCreateLabel(toolBar, "linkLabel", args, n);
   XmStringFree(s);
   XtManageChild(linkLabel);
diff --git a/filters/kword/pdf/xpdf/xpdf/xpdf.cc b/filters/kword/pdf/xpdf/xpdf/xpdf.cc
index d4103df2..ef47fb6e 100644
--- a/filters/kword/pdf/xpdf/xpdf/xpdf.cc
+++ b/filters/kword/pdf/xpdf/xpdf/xpdf.cc
@@ -44,9 +44,9 @@ static GBool printHelp = gFalse;
 
 static ArgDesc argDesc[] = {
   {"-g",          argStringDummy, NULL,           0,
-   "initial window tqgeometry"},
-  {"-tqgeometry",   argStringDummy, NULL,           0,
-   "initial window tqgeometry"},
+   "initial window geometry"},
+  {"-geometry",   argStringDummy, NULL,           0,
+   "initial window geometry"},
   {"-title",      argStringDummy, NULL,           0,
    "window title"},
   {"-cmap",       argFlagDummy,   NULL,           0,
diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc
index 6fefe85e..12719f4a 100644
--- a/filters/kword/rtf/export/ExportFilter.cc
+++ b/filters/kword/rtf/export/ExportFilter.cc
@@ -264,7 +264,7 @@ TQString RTFWorker::makeImage(const FrameAnchor& anchor)
 
             // throw away WMF metaheader (22 bytes)
             for( uint i=0; i<image.size()-22; i++)
-                image.tqat(i) = image.tqat(i+22); // As we use uint, we need at()  ( [] uses int only .)
+                image.at(i) = image.at(i+22); // As we use uint, we need at()  ( [] uses int only .)
             image.resize( image.size()-22 );
         }
     }
@@ -1464,24 +1464,24 @@ TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin,
     TQString strLayout;
 
 
-    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
+    if (force || (layoutOrigin.alignment!=tqlayout.alignment))
     {
-        if (tqlayout.tqalignment=="left")
+        if (tqlayout.alignment=="left")
             strLayout += "\\ql";
-        else if (tqlayout.tqalignment== "right")
+        else if (tqlayout.alignment== "right")
             strLayout += "\\qr";
-        else if (tqlayout.tqalignment=="center")
+        else if (tqlayout.alignment=="center")
             strLayout += "\\qc";
-        else if (tqlayout.tqalignment=="justify")
+        else if (tqlayout.alignment=="justify")
             strLayout += "\\qj";
-        else if ( tqlayout.tqalignment=="auto")
+        else if ( tqlayout.alignment=="auto")
         {
             // ### TODO: what for BIDI?
             //strLayout += "\\ql";
         }
         else
         {
-            kdWarning(30515) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
+            kdWarning(30515) << "Unknown alignment: " << tqlayout.alignment << endl;
         }
     }
 
@@ -1556,14 +1556,14 @@ TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin,
            strLayout += "\\sl480\\slmult1"; // double linespace
 
         else if ( tqlayout.lineSpacingType==LayoutData::LS_ATLEAST  )
-           strLayout += TQString("\\sl%1\\slmult0").tqarg(int(tqlayout.lineSpacing)*20);
+           strLayout += TQString("\\sl%1\\slmult0").arg(int(tqlayout.lineSpacing)*20);
 
         else if ( tqlayout.lineSpacingType==LayoutData::LS_MULTIPLE  )
-           strLayout += TQString("\\sl%1\\slmult1").tqarg( int(tqlayout.lineSpacing)*240 );
+           strLayout += TQString("\\sl%1\\slmult1").arg( int(tqlayout.lineSpacing)*240 );
 
         else if ( tqlayout.lineSpacingType==LayoutData::LS_CUSTOM )
            // "Custom" in KWord is like "Exactly" in MS Word
-           strLayout += TQString("\\sl-%1\\slmult0").tqarg(int(tqlayout.lineSpacing)*20);
+           strLayout += TQString("\\sl-%1\\slmult0").arg(int(tqlayout.lineSpacing)*20);
 
         else
             kdWarning(30515) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp
index 5bfadbcb..465a7478 100644
--- a/filters/kword/rtf/import/rtfimport.cpp
+++ b/filters/kword/rtf/import/rtfimport.cpp
@@ -202,11 +202,11 @@ static RTFProperty propertyTable[] =
 	PROP(	0L,		"plain",	setPlainFormatting,	0L, 0 ),
 	PROP(	"@pict",	"pmmetafile",	setPictureType,	        0L, RTFPicture::WMF ),
 	PROP(	"@pict",	"pngblip",	setPictureType,	        0L, RTFPicture::PNG ),
-	MEMBER(	0L,		"qc",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Centered ),
-	MEMBER(	0L,		"qj",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Justified ),
-	MEMBER(	0L,		"ql",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Left ),
+	MEMBER(	0L,		"qc",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Centered ),
+	MEMBER(	0L,		"qj",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Justified ),
+	MEMBER(	0L,		"ql",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Left ),
 	PROP(	0L,		"qmspace",	insertSymbol,		0L, 0x2004 ),
-	MEMBER(	0L,		"qr",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Right ),
+	MEMBER(	0L,		"qr",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Right ),
 	PROP(	0L,		"rdblquote",	insertSymbol,		0L, 0x201d ),
 	MEMBER(	"@colortbl",	"red",		setNumericProperty,	red, 0 ),
 	MEMBER(	0L,		"ri",		setNumericProperty,	state.tqlayout.rightIndent, 0 ),
@@ -237,9 +237,9 @@ static RTFProperty propertyTable[] =
 	MEMBER(	0L,		"tqr",		setEnumProperty,	state.tqlayout.tab.type, RTFTab::FlushRight ),
 	MEMBER(	0L,		"trleft",	setNumericProperty,	state.tableRow.left, 0 ),
 	MEMBER(	0L,		"trowd",	setTableRowDefaults,	state.tableRow, 0 ),
-	MEMBER(	0L,		"trqc",		setEnumProperty,	state.tableRow.tqalignment, RTFLayout::Centered ),
-	MEMBER(	0L,		"trql",		setEnumProperty,	state.tableRow.tqalignment, RTFLayout::Left ),
-	MEMBER(	0L,		"trqr",		setEnumProperty,	state.tableRow.tqalignment, RTFLayout::Right ),
+	MEMBER(	0L,		"trqc",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Centered ),
+	MEMBER(	0L,		"trql",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Left ),
+	MEMBER(	0L,		"trqr",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Right ),
 	MEMBER(	0L,		"trrh",		setNumericProperty,	state.tableRow.height, 0 ),
 	PROP(	0L,		"tx",		insertTabDef,		0L, 0 ),
 	MEMBER(	0L,		"u",		insertUnicodeSymbol,	state.format.uc, 0 ),
@@ -384,7 +384,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
             if ( !m_batch )
             {
                 force = ( KMessageBox::warningYesNo( 0L,
-                    i18n("The RTF (Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ),
+                    i18n("The RTF (Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ),
                     i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes );
             }
             if ( !force )
@@ -403,7 +403,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
             if ( !m_batch )
             {
                 force = ( KMessageBox::warningYesNo( 0L,
-                    i18n("The PWD (PocketWord's Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ),
+                    i18n("The PWD (PocketWord's Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ),
                     i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes );
             }
             if ( !force )
@@ -422,7 +422,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
             if ( !m_batch )
             {
                 force = ( KMessageBox::warningYesNo( 0L,
-                    i18n("The URTF (\"Unicode Rich Text Format\") document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ),
+                    i18n("The URTF (\"Unicode Rich Text Format\") document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ),
                     i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes );
             }
             if ( !force )
@@ -439,7 +439,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
         if ( !m_batch )
         {
             KMessageBox::error( 0L,
-                i18n("The RTF document cannot be loaded, as it has an unexpected first keyword: \\%1.").tqarg( token.text ),
+                i18n("The RTF document cannot be loaded, as it has an unexpected first keyword: \\%1.").arg( token.text ),
                 i18n("KWord's RTF Import Filter"), 0 );
         }
         return KoFilter::WrongFormat;
@@ -793,7 +793,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
 
     for (TQMap<TQString,int>::ConstIterator it=debugUnknownKeywords.begin();
         it!=debugUnknownKeywords.end();it++)
-        kdDebug(30515) << "Unknown keyword: " << TQString( "%1" ).tqarg( it.data(), 4 )  << " * " << it.key() << endl;
+        kdDebug(30515) << "Unknown keyword: " << TQString( "%1" ).arg( it.data(), 4 )  << " * " << it.key() << endl;
 
     return KoFilter::OK;
 }
@@ -1029,7 +1029,7 @@ void RTFImport::setParagraphDefaults( RTFProperty * )
     tqlayout.spaceBetween	= 0;
     tqlayout.spaceBetweenMultiple = false;
     tqlayout.style	= 0;
-    tqlayout.tqalignment	= RTFLayout::Left;
+    tqlayout.alignment	= RTFLayout::Left;
     tqlayout.border	= 0L;
     tqlayout.inTable	= false;
     tqlayout.keep		= false;
@@ -1054,7 +1054,7 @@ void RTFImport::setTableRowDefaults( RTFProperty * )
 
     tableRow.height	= 0;
     tableRow.left	= 0;
-    tableRow.tqalignment	= RTFLayout::Left;
+    tableRow.alignment	= RTFLayout::Left;
     tableRow.cells.clear();
     tableCell.bgcolor	= -1;
 
@@ -1130,12 +1130,12 @@ void RTFImport::insertTableRow( RTFProperty * )
 	{
 	    char buf[64];
 	    sprintf( buf, "Table %d", textState->table );
-	    RTFLayout::Alignment align = row.tqalignment;
+	    RTFLayout::Alignment align = row.alignment;
 
 	    // Store the current state on the stack
 	    stateStack.push( state );
 	    resetState();
-	    state.tqlayout.tqalignment = align;	// table tqalignment
+	    state.tqlayout.alignment = align;	// table alignment
 
 	    // Add anchor for new table (default tqlayout)
 	    addAnchor( buf );
@@ -2055,7 +2055,7 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma
     int vertAlign0 = ~vertAlign;
     int fontSize0  = ~fontSize;
 
-    // Adjust vertical tqalignment and font size if (\dn, \up) are used
+    // Adjust vertical alignment and font size if (\dn, \up) are used
     if (format.fmt.vertAlign == RTFFormat::Normal && format.fmt.baseline)
     {
 	if (format.fmt.baseline < 0)
@@ -2263,12 +2263,12 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma
 
 void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout &tqlayout, bool frameBreak )
 {
-    // Style name and tqalignment
+    // Style name and alignment
     node.addNode( "NAME" );
       node.setAttribute( "value", CheckAndEscapeXmlText(name) );
     node.closeNode( "NAME" );
     node.addNode( "FLOW" );
-      node.setAttribute( "align", alignN[tqlayout.tqalignment] );
+      node.setAttribute( "align", alignN[tqlayout.alignment] );
     node.closeNode( "FLOW" );
 
     // Indents
diff --git a/filters/kword/rtf/import/rtfimport.h b/filters/kword/rtf/import/rtfimport.h
index 2003b508..bdf6f940 100644
--- a/filters/kword/rtf/import/rtfimport.h
+++ b/filters/kword/rtf/import/rtfimport.h
@@ -124,7 +124,7 @@ struct RTFLayout
     RTFTab tab;
     RTFBorder borders[4];
     RTFBorder *border;
-    Alignment tqalignment;
+    Alignment alignment;
     int style;
     int firstIndent, leftIndent, rightIndent;
     int spaceBefore, spaceAfter;
@@ -198,7 +198,7 @@ struct RTFTableRow
 {
     TQValueList<RTFTableCell> cells;
     TQStringList frameSets;
-    RTFLayout::Alignment tqalignment;
+    RTFLayout::Alignment alignment;
     int height;
     int left;
 };
diff --git a/filters/kword/rtf/status.html b/filters/kword/rtf/status.html
index 27239e52..4642bf83 100644
--- a/filters/kword/rtf/status.html
+++ b/filters/kword/rtf/status.html
@@ -52,14 +52,14 @@
        - Document information (author, title, comments, company).<br>
        - Page size and margins.<br>
        - Headers and footers (with margins).<br>
-       - Tables (including non-rectangular), horizontal tqalignment.<br>
+       - Tables (including non-rectangular), horizontal alignment.<br>
        - Table cell background color and borders (style, color, width).<br>
        - Embedded pictures (JPEG/PNG/BMP) and clipart (EMF/WMF).<br>
        - Word 97-2000 picture support.<br>
        - Style sheet.<br>
        - Character formatting (size, color, bold, italic, underline, strikeout, subscript, superscript...).<br>
        - Font mapping (using TQFont/TQFontInfo).<br>
-       - Paragraph tqlayout (horizontal tqalignment, indents, space before/after, frame break).<br>
+       - Paragraph tqlayout (horizontal alignment, indents, space before/after, frame break).<br>
        - Paragraph borders (style, color, width).<br>
        - Tabulators, automatic tabulator for hanging indent.<br>
        - Unicode and codepages support.<br>
@@ -76,7 +76,7 @@
        - Fix line spacing.<br>
        - Columns.<br>
        - Improve list handling.<br>
-       - Shaps, especially picture that are in tqshapes<br>
+       - Shaps, especially picture that are in shapes<br>
      </td>
     </tr>
 
@@ -85,7 +85,7 @@
      <td>
        15 July 2001: First useful version (rewritten for TQDom).<br>
        18 July 2001: Fixed function <code>finishTable()</code> (some tables crashed KWord).<br>
-       23 July 2001: Added table tqalignment, background color and cell borders.<br>
+       23 July 2001: Added table alignment, background color and cell borders.<br>
        31 August 2001: Faster version, uses read buffers and optimized XML output.<br>
        2 October 2001: Clipart import fixed (requires libwmf).<br>
        23 July 2002: Added field and hyperlink support, fixed embedded pictures.<br>
diff --git a/filters/kword/starwriter/pole.cpp b/filters/kword/starwriter/pole.cpp
index d9751e15..9323cdbc 100644
--- a/filters/kword/starwriter/pole.cpp
+++ b/filters/kword/starwriter/pole.cpp
@@ -36,7 +36,7 @@ class Entry
     unsigned long size;
     unsigned start;
     bool dir;
-    std::vector<Entry*> tqchildren;
+    std::vector<Entry*> children;
     Entry();
     ~Entry();
   private:
@@ -257,9 +257,9 @@ Entry::Entry()
 
 Entry::~Entry()
 { 
-  for( unsigned i=0; i<tqchildren.size(); i++ )
+  for( unsigned i=0; i<children.size(); i++ )
   {
-    Entry* entry = tqchildren[ i ];
+    Entry* entry = children[ i ];
     delete entry;
   }
 }
@@ -657,7 +657,7 @@ Entry* StorageIO::buildTree( Entry* parent, int index, const unsigned char* dire
 
   // append as another child
   entry->parent = parent;
-  if( parent ) parent->tqchildren.push_back( entry );
+  if( parent ) parent->children.push_back( entry );
 
   // check previous
   int prev  = readU32( dirent + 0x44+p );
@@ -725,9 +725,9 @@ Entry* StorageIO::entry( const std::string& name )
      std::string entryname = *it;
      Entry *child = (Entry*) 0L;
      if( entry->dir )
-       for( unsigned j=0; j < entry->tqchildren.size(); j++ )
-         if( entry->tqchildren[j]->name == entryname )
-           child = entry->tqchildren[j];
+       for( unsigned j=0; j < entry->children.size(); j++ )
+         if( entry->children[j]->name == entryname )
+           child = entry->children[j];
      if( !child ) return (Entry*) 0L;
       entry = child;
    }
@@ -912,10 +912,10 @@ std::list<std::string> Storage::listDirectory()
   // sentinel: do nothing if not a directory
   if( !io->current_dir->dir ) return entries;
 
-  // find all tqchildren belongs to this directory
-  for( unsigned i = 0; i<io->current_dir->tqchildren.size(); i++ )
+  // find all children belongs to this directory
+  for( unsigned i = 0; i<io->current_dir->children.size(); i++ )
   {
-    Entry* e = io->current_dir->tqchildren[i];
+    Entry* e = io->current_dir->children[i];
     if( e ) entries.push_back( e->name );
   }
 
@@ -930,9 +930,9 @@ bool Storage::enterDirectory( const std::string& directory )
   if( !io->current_dir ) return false;
 
   // look for the specified sub-dir
-  for( unsigned i = 0; i<io->current_dir->tqchildren.size(); i++ )
+  for( unsigned i = 0; i<io->current_dir->children.size(); i++ )
   {
-    Entry* e = io->current_dir->tqchildren[i];
+    Entry* e = io->current_dir->children[i];
     if( e ) if( e->name == directory ) 
       if ( e->dir )
       {
diff --git a/filters/kword/starwriter/starwriterimport.cc b/filters/kword/starwriter/starwriterimport.cc
index 104e08f9..43dc1b62 100644
--- a/filters/kword/starwriter/starwriterimport.cc
+++ b/filters/kword/starwriter/starwriterimport.cc
@@ -345,7 +345,7 @@ bool StarWriterImport::parseTable(TQByteArray n)
     TQ_UINT8 row, column;
 
     // Set table name
-    tableName = TQString("Table %1").tqarg(tablesNumber);
+    tableName = TQString("Table %1").arg(tablesNumber);
     tablesNumber++;
 
     // Skip useless sections and retrieve the right point
@@ -381,8 +381,8 @@ bool StarWriterImport::parseTable(TQByteArray n)
             text = convertToKWordString(s);
 
             // FIXME: check this stuff
-            TQString frameName = TQString("%1 Cell %2,%3").tqarg(tableName).tqarg(row).tqarg(column);
-            tableText.append(TQString(" <FRAMESET name=\"%1\" frameType=\"1\" frameInfo=\"0\" removable=\"0\" visible=\"1\" grpMgr=\"%2\" row=\"%3\" col=\"%4\" rows=\"1\" cols=\"1\" protectSize=\"0\">\n").tqarg(frameName).tqarg(tableName).tqarg(row).tqarg(column));
+            TQString frameName = TQString("%1 Cell %2,%3").arg(tableName).arg(row).arg(column);
+            tableText.append(TQString(" <FRAMESET name=\"%1\" frameType=\"1\" frameInfo=\"0\" removable=\"0\" visible=\"1\" grpMgr=\"%2\" row=\"%3\" col=\"%4\" rows=\"1\" cols=\"1\" protectSize=\"0\">\n").arg(frameName).arg(tableName).arg(row).arg(column));
             tableText.append(" <FRAME runaround=\"1\" copy=\"0\" newFrameBehavior=\"1\" runaroundSide=\"biggest\" autoCreateNewFrame=\"0\" bleftpt=\"2.8\" brightpt=\"2.8\" btoppt=\"2.8\" bbottompt=\"2.8\" runaroundGap=\"2.8\" />\n");
             tableText.append("  <PARAGRAPH>\n");
             tableText.append("   <TEXT xml:space=\"preserve\">" + text + "</TEXT>\n");
@@ -408,7 +408,7 @@ bool StarWriterImport::parseTable(TQByteArray n)
     bodyStuff.append("   <TEXT xml:space=\"preserve\">#</TEXT>\n");
     bodyStuff.append("   <FORMATS>\n");
     bodyStuff.append("    <FORMAT id=\"6\" pos=\"0\" len=\"1\">\n");
-    bodyStuff.append(TQString("    <ANCHOR type=\"frameset\" instance=\"%1\" />\n").tqarg(tableName));
+    bodyStuff.append(TQString("    <ANCHOR type=\"frameset\" instance=\"%1\" />\n").arg(tableName));
     bodyStuff.append("    </FORMAT>\n");
     bodyStuff.append("   </FORMATS>\n");
     bodyStuff.append("  </PARAGRAPH>\n");
diff --git a/filters/kword/wml/wmlexport.cc b/filters/kword/wml/wmlexport.cc
index 10837ba1..f18a3a7b 100644
--- a/filters/kword/wml/wmlexport.cc
+++ b/filters/kword/wml/wmlexport.cc
@@ -131,7 +131,7 @@ bool WMLWorker::doFullParagraph(const TQString& paraText,
   }
 
   // sentinel check
-  TQString align = tqlayout.tqalignment.lower();
+  TQString align = tqlayout.alignment.lower();
   if( ( align!="left" ) && ( align!="right" ) && ( align!="center" ) )
     align = "left"; 
 
diff --git a/filters/kword/wordperfect/export/wp5.cc b/filters/kword/wordperfect/export/wp5.cc
index bffdecf1..b3bb7d17 100644
--- a/filters/kword/wordperfect/export/wp5.cc
+++ b/filters/kword/wordperfect/export/wp5.cc
@@ -125,7 +125,7 @@ bool WPFiveWorker::doOpenDocument(void)
   for( int i=0; i<14; i++ ) output << index_header[i];
 
   // document area starts, mark it for the header fields
-  document_area_ptr = output.tqdevice()->at();
+  document_area_ptr = output.device()->at();
 
   return true;
 }
diff --git a/filters/kword/wordperfect/export/wp6.cc b/filters/kword/wordperfect/export/wp6.cc
index 21c59606..9db2f1e1 100644
--- a/filters/kword/wordperfect/export/wp6.cc
+++ b/filters/kword/wordperfect/export/wp6.cc
@@ -125,7 +125,7 @@ bool WPSixWorker::doOpenDocument(void)
   for( int i=0; i<14; i++ ) output << index_header[i];
 
   // document area starts, mark it for the header fields
-  document_area_ptr = output.tqdevice()->at();
+  document_area_ptr = output.device()->at();
 
   return true;
 }
@@ -157,12 +157,12 @@ static TQCString WPSixEscape( const TQString& text )
 bool WPSixWorker::doFullParagraph(const TQString& paraText, 
   const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
 {
-  // handle paragraph tqalignment/justification (default to left)
+  // handle paragraph alignment/justification (default to left)
   unsigned char wp_align[] = { 0xd3, 5, 12, 0, 0, 1, 0, 0, 2, 12, 0, 0xd3 };
-  if( tqlayout.tqalignment == "left" ) wp_align[7] = 0;
-  if( tqlayout.tqalignment == "justify" ) wp_align[7] = 1;
-  if( tqlayout.tqalignment == "center" ) wp_align[7] = 2;
-  if( tqlayout.tqalignment == "right" ) wp_align[7] = 3;
+  if( tqlayout.alignment == "left" ) wp_align[7] = 0;
+  if( tqlayout.alignment == "justify" ) wp_align[7] = 1;
+  if( tqlayout.alignment == "center" ) wp_align[7] = 2;
+  if( tqlayout.alignment == "right" ) wp_align[7] = 3;
   output.writeRawBytes( (const char*)wp_align, 12 );
 
   ValueListFormatData::ConstIterator it;
diff --git a/filters/liboofilter/ooutils.cc b/filters/liboofilter/ooutils.cc
index cac0783f..9c65ddd9 100644
--- a/filters/liboofilter/ooutils.cc
+++ b/filters/liboofilter/ooutils.cc
@@ -227,7 +227,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack&
         else if ( type == "char" ) {
             TQString delimiterChar = tabStop.attributeNS( ooNS::style, "char", TQString() ); // single character
             elem.setAttribute( "alignchar", delimiterChar );
-            kOfficeType = 3; // "tqalignment on decimal point"
+            kOfficeType = 3; // "alignment on decimal point"
         }
 
         elem.setAttribute( "type", kOfficeType );
diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc
index fafefdbd..0f052e13 100644
--- a/filters/olefilters/olefilter.cc
+++ b/filters/olefilters/olefilter.cc
@@ -118,9 +118,9 @@ void OLEFilter::commSlotDelayStream( const char* delay )
     emit internalCommDelayStream( delay );
 }
 
-void OLEFilter::commSlotShapeID( unsigned int& tqshapeID )
+void OLEFilter::commSlotShapeID( unsigned int& shapeID )
 {
-    emit internalCommShapeID( tqshapeID );
+    emit internalCommShapeID( shapeID );
 }
 
 void OLEFilter::slotSavePart(
@@ -234,7 +234,7 @@ void OLEFilter::slotSavePic(
     else
     {
         // It's not here, so let's generate one.
-        storageId = TQString( "pictures/picture%1.%2" ).tqarg( numPic++ ).tqarg( extension );
+        storageId = TQString( "pictures/picture%1.%2" ).arg( numPic++ ).arg( extension );
         imageMap.insert(nameIN, storageId);
         KoStoreDevice* pic = m_chain->storageFile( storageId, KoStore::Write );
         if(!pic)
diff --git a/filters/olefilters/olefilter.h b/filters/olefilters/olefilter.h
index f8c6203d..2759ea50 100644
--- a/filters/olefilters/olefilter.h
+++ b/filters/olefilters/olefilter.h
@@ -43,7 +43,7 @@ public:
 
 public slots:
     void commSlotDelayStream( const char* delay );
-    void commSlotShapeID( unsigned int& tqshapeID );
+    void commSlotShapeID( unsigned int& shapeID );
 
 protected slots:
     // This slot saves the document informations to the KOffice tar storage.
@@ -100,7 +100,7 @@ protected slots:
 
 signals:
     // Forwarding signals for inter-filter communication
-    void internalCommShapeID( unsigned int& tqshapeID );
+    void internalCommShapeID( unsigned int& shapeID );
     void internalCommDelayStream( const char* delay );
 
 private:
diff --git a/filters/olefilters/powerpoint97/powerpoint.cc b/filters/olefilters/powerpoint97/powerpoint.cc
index b53acfc5..bb85f84d 100644
--- a/filters/olefilters/powerpoint97/powerpoint.cc
+++ b/filters/olefilters/powerpoint97/powerpoint.cc
@@ -819,7 +819,7 @@ void Powerpoint::opSlidePersistAtom(
     struct
     {
         TQ_UINT32 psrReference;   // Logical reference to the slide persist object.
-        TQ_UINT32 flags;          // If bit 3 set then slide contains tqshapes other than placeholders.
+        TQ_UINT32 flags;          // If bit 3 set then slide contains shapes other than placeholders.
         TQ_INT32 numberTexts;    // Number of placeholder texts stored with the persist object.
         TQ_INT32 slideId;        // Unique slide identifier, used for OLE link monikers for example.
         TQ_UINT32 reserved;
@@ -1056,7 +1056,7 @@ void Powerpoint::opTextHeaderAtom(
                             // 1 Body
                             // 2 Notes
                             // 3 Not Used
-                            // 4 Other (Text in a tqshape)
+                            // 4 Other (Text in a shape)
                             // 5 Center body (subtitle in title slide)
                             // 6 Center title (title in title slide)
                             // 7 Half body (body in two-column slide)
diff --git a/filters/olefilters/powerpoint97/pptSlide.h b/filters/olefilters/powerpoint97/pptSlide.h
index 026e2ef1..78e9cb0a 100644
--- a/filters/olefilters/powerpoint97/pptSlide.h
+++ b/filters/olefilters/powerpoint97/pptSlide.h
@@ -34,7 +34,7 @@ DESCRIPTION
 #define BODY_TEXT 			1	//body
 #define NOTES_TEXT 		2	//notes
 #define NOTUSED_TEXT 		3	//not used
-#define OTHER_TEXT 		4	//other(test in tqshape)
+#define OTHER_TEXT 		4	//other(test in shape)
 #define CENTER_BODY_TEXT 	5	//center body(subtitle in title slide)
 #define CENTER_TITLE_TEXT 	6	//center title(title in title slide)
 #define HALF_BODY_TEXT 	7	//half body(body in two-column slide)
diff --git a/filters/olefilters/powerpoint97/pptxml.cc b/filters/olefilters/powerpoint97/pptxml.cc
index 96a03567..270cc30f 100644
--- a/filters/olefilters/powerpoint97/pptxml.cc
+++ b/filters/olefilters/powerpoint97/pptxml.cc
@@ -143,7 +143,7 @@ void PptXml::gotDrawing(
     ourKey = "vectorGraphic" + TQString::number(id) + "." + type;
     if (type == "msod")
     {
-        filterArgs = "tqshape-id=";
+        filterArgs = "shape-id=";
         filterArgs += TQString::number(id);
         filterArgs += ";delay-stream=";
         filterArgs += TQString::number(0);
diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc
index 8d36f43b..aade6891 100644
--- a/filters/xsltfilter/export/xsltexportdia.cc
+++ b/filters/xsltfilter/export/xsltexportdia.cc
@@ -64,7 +64,7 @@ XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidge
 	TQString value;
 	while(i < 10)
 	{
-		value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
+		value = _config->readPathEntry( TQString("Recent%1").arg(i) );
 		kdDebug() << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
@@ -227,9 +227,9 @@ void XSLTExportDia::okSlot()
 		{
 			kdDebug() << "save : " << _recentList.first() << endl;
 #if KDE_IS_VERSION(3,1,3)
-			_config->writePathEntry( TQString("Recent%1").tqarg(i), _recentList.first());
+			_config->writePathEntry( TQString("Recent%1").arg(i), _recentList.first());
 #else
-			_config->writeEntry( TQString("Recent%1").tqarg(i), _recentList.first());
+			_config->writeEntry( TQString("Recent%1").arg(i), _recentList.first());
 #endif
 			_recentList.pop_front();
 			i = i + 1;
diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc
index 2e278bf2..c3fb4b97 100644
--- a/filters/xsltfilter/import/xsltimportdia.cc
+++ b/filters/xsltfilter/import/xsltimportdia.cc
@@ -59,7 +59,7 @@ XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* pa
 	TQString value;
 	while(i < 10)
 	{
-		value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
+		value = _config->readPathEntry( TQString("Recent%1").arg(i) );
 		kdDebug() << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
@@ -226,9 +226,9 @@ void XSLTImportDia::okSlot()
 		{
 			kdDebug() << "save : " << _recentList.first() << endl;
 #if KDE_IS_VERSION(3,1,3)
-			_config->writePathEntry( TQString("Recent%1").tqarg(i), _recentList.first());
+			_config->writePathEntry( TQString("Recent%1").arg(i), _recentList.first());
 #else
-			_config->writeEntry( TQString("Recent%1").tqarg(i), _recentList.first());
+			_config->writeEntry( TQString("Recent%1").arg(i), _recentList.first());
 #endif
 			_recentList.pop_front();
 			i = i + 1;