Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

129 files changed, 1086 insertions, 1086 deletions

diff --git a/lib/kformula/DESIGN b/lib/kformula/DESIGN
index f060b897..fc404921 100644
--- a/lib/kformula/DESIGN
+++ b/lib/kformula/DESIGN
@@ -56,7 +56,7 @@ except SequenceElements if they contains a SequenceElement they merge
 it in the list
 
 They can handle splitting of the sequence to allow "select an put selected item
-between tqparenthesis" i.e. as content child of a delimiterelement) 
+between parenthesis" i.e. as content child of a delimiterelement) 
 
 
 FormulaElement from SequenceElement
@@ -90,7 +90,7 @@ contains one char and no tqchildren at all.
 
 
 Might have its own font and size. But preferes to use a reasonalbe
-font and size that are calculated from its tqparents font and a given
+font and size that are calculated from its parents font and a given
 scheme (see below).
 
 
@@ -353,7 +353,7 @@ turns this on.)
 Fonts and font size
 ###################
 
-Each elements font size is calculated starting from its tqparents font
+Each elements font size is calculated starting from its parents font
 size. It knows how it differs to those.
 
 The font size might also be used to choose the pen width and other
diff --git a/lib/kformula/basicelement.cc b/lib/kformula/basicelement.cc
index bbe6f453..da961df3 100644
--- a/lib/kformula/basicelement.cc
+++ b/lib/kformula/basicelement.cc
@@ -80,11 +80,11 @@ FormulaElement* BasicElement::formula()
  * Returns the element the point is in.
  */
 BasicElement* BasicElement::goToPos( FormulaCursor*, bool&,
-                                     const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                     const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    luPixel x = point.x() - (tqparentOrigin.x() + getX());
+    luPixel x = point.x() - (parentOrigin.x() + getX());
     if ((x >= 0) && (x < getWidth())) {
-        luPixel y = point.y() - (tqparentOrigin.y() + getY());
+        luPixel y = point.y() - (parentOrigin.y() + getY());
         if ((y >= 0) && (y < getHeight())) {
             return this;
         }
diff --git a/lib/kformula/basicelement.h b/lib/kformula/basicelement.h
index d373fc6c..025dfbc6 100644
--- a/lib/kformula/basicelement.h
+++ b/lib/kformula/basicelement.h
@@ -141,7 +141,7 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Returns our position inside the widget.
@@ -158,7 +158,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 							ContextStyle::TextStyle tstyle,
@@ -167,15 +167,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin ) = 0;
+                       const LuPixelPoint& parentOrigin ) = 0;
 
 
     /**
diff --git a/lib/kformula/bracketelement.cc b/lib/kformula/bracketelement.cc
index d95eac78..0a599dc0 100644
--- a/lib/kformula/bracketelement.cc
+++ b/lib/kformula/bracketelement.cc
@@ -59,7 +59,7 @@ SingleContentElement::~SingleContentElement()
 TQChar SingleContentElement::getCharacter() const
 {
     // This is meant to make the SingleContentElement text only.
-    // This "fixes" the tqparenthesis problem (tqparenthesis too large).
+    // This "fixes" the parenthesis problem (parenthesis too large).
     // I'm not sure if we really want this. There should be better ways.
     if ( content->isTextOnly() ) {
         return '\\';
@@ -68,12 +68,12 @@ TQChar SingleContentElement::getCharacter() const
 }
 
 BasicElement* SingleContentElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                             const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                             const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
 
         e = content->goToPos(cursor, handled, point, myPos);
         if (e != 0) {
@@ -252,12 +252,12 @@ void BracketElement::entered( SequenceElement* /*child*/ )
 
 
 BasicElement* BracketElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                       const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                       const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
         e = getContent()->goToPos(cursor, handled, point, myPos);
         if (e != 0) {
             return e;
@@ -281,7 +281,7 @@ BasicElement* BracketElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void BracketElement::calcSizes( const ContextStyle& context,
                                 ContextStyle::TextStyle tstyle,
@@ -361,17 +361,17 @@ void BracketElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void BracketElement::draw( TQPainter& painter, const LuPixelRect& r,
                            const ContextStyle& context,
                            ContextStyle::TextStyle tstyle,
                            ContextStyle::IndexStyle istyle,
                            StyleAttributes& style,
-                           const LuPixelPoint& tqparentOrigin )
+                           const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -394,14 +394,14 @@ void BracketElement::draw( TQPainter& painter, const LuPixelRect& r,
 #if 0
     painter.setBrush( TQt::NoBrush );
     painter.setPen( TQt::red );
-    painter.drawRect( context.tqlayoutUnitToPixelX( myPos.x()+left->getX() ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+left->getY() ),
-                      context.tqlayoutUnitToPixelX( left->getWidth() ),
-                      context.tqlayoutUnitToPixelY( left->getHeight() ) );
-    painter.drawRect( context.tqlayoutUnitToPixelX( myPos.x()+right->getX() ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+right->getY() ),
-                      context.tqlayoutUnitToPixelX( right->getWidth() ),
-                      context.tqlayoutUnitToPixelY( right->getHeight() ) );
+    painter.drawRect( context.layoutUnitToPixelX( myPos.x()+left->getX() ),
+                      context.layoutUnitToPixelY( myPos.y()+left->getY() ),
+                      context.layoutUnitToPixelX( left->getWidth() ),
+                      context.layoutUnitToPixelY( left->getHeight() ) );
+    painter.drawRect( context.layoutUnitToPixelX( myPos.x()+right->getX() ),
+                      context.layoutUnitToPixelY( myPos.y()+right->getY() ),
+                      context.layoutUnitToPixelX( right->getWidth() ),
+                      context.layoutUnitToPixelY( right->getHeight() ) );
 #endif
 }
 
@@ -520,9 +520,9 @@ int BracketElement::readContentFromMathMLDom(TQDomNode& node)
     bool empty = false;
     int nodeCounter = 0;
     if ( m_operator ) {
-        node = node.tqparentNode();
+        node = node.parentNode();
         TQDomNode open = node;
-        TQDomNode tqparent = node.tqparentNode();
+        TQDomNode tqparent = node.parentNode();
         if ( ! operatorType( node, true ) )
             return -1;
         int nodeNum = searchOperator( node );
@@ -563,7 +563,7 @@ int BracketElement::readContentFromMathMLDom(TQDomNode& node)
             next = next.nextSibling();
         if ( ! next.isNull()) {
             TQDomDocument doc = node.ownerDocument();
-            TQDomNode tqparent = node.tqparentNode();
+            TQDomNode tqparent = node.parentNode();
             TQString ns = tqparent.prefix();
             TQDomElement de = doc.createElementNS( ns, "mrow" );
             uint pos = 0;
@@ -850,9 +850,9 @@ void OverlineElement::draw( TQPainter& painter, const LuPixelRect& r,
                             ContextStyle::TextStyle tstyle,
                             ContextStyle::IndexStyle istyle,
                             StyleAttributes& style,
-                            const LuPixelPoint& tqparentOrigin )
+                            const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -868,12 +868,12 @@ void OverlineElement::draw( TQPainter& painter, const LuPixelRect& r,
     //luPixel unit = (content->getHeight() + distY)/ 3;
 
     painter.setPen( TQPen( context.getDefaultColor(),
-                          context.tqlayoutUnitToPixelY( context.getLineWidth( factor ) ) ) );
+                          context.layoutUnitToPixelY( context.getLineWidth( factor ) ) ) );
 
-    painter.drawLine( context.tqlayoutUnitToPixelX( x ),
-                      context.tqlayoutUnitToPixelY( y+distY/3 ),
-                      context.tqlayoutUnitToPixelX( x+content->getWidth() ),
-                      context.tqlayoutUnitToPixelY( y+distY/3 ) );
+    painter.drawLine( context.layoutUnitToPixelX( x ),
+                      context.layoutUnitToPixelY( y+distY/3 ),
+                      context.layoutUnitToPixelX( x+content->getWidth() ),
+                      context.layoutUnitToPixelY( y+distY/3 ) );
 }
 
 
@@ -954,9 +954,9 @@ void UnderlineElement::draw( TQPainter& painter, const LuPixelRect& r,
                              ContextStyle::TextStyle tstyle,
                              ContextStyle::IndexStyle istyle,
                              StyleAttributes& style,
-                             const LuPixelPoint& tqparentOrigin )
+                             const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -972,12 +972,12 @@ void UnderlineElement::draw( TQPainter& painter, const LuPixelRect& r,
 
     double factor = style.sizeFactor();
     painter.setPen( TQPen( context.getDefaultColor(),
-                          context.tqlayoutUnitToPixelY( context.getLineWidth( factor ) ) ) );
+                          context.layoutUnitToPixelY( context.getLineWidth( factor ) ) ) );
 
-    painter.drawLine( context.tqlayoutUnitToPixelX( x ),
-                      context.tqlayoutUnitToPixelY( y+getHeight()-context.getLineWidth( factor ) ),
-                      context.tqlayoutUnitToPixelX( x+content->getWidth() ),
-                      context.tqlayoutUnitToPixelY( y+getHeight()-context.getLineWidth( factor ) ) );
+    painter.drawLine( context.layoutUnitToPixelX( x ),
+                      context.layoutUnitToPixelY( y+getHeight()-context.getLineWidth( factor ) ),
+                      context.layoutUnitToPixelX( x+content->getWidth() ),
+                      context.layoutUnitToPixelY( y+getHeight()-context.getLineWidth( factor ) ) );
 }
 
 
diff --git a/lib/kformula/bracketelement.h b/lib/kformula/bracketelement.h
index 98f515a1..eb0e2613 100644
--- a/lib/kformula/bracketelement.h
+++ b/lib/kformula/bracketelement.h
@@ -59,7 +59,7 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
@@ -196,11 +196,11 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 							ContextStyle::TextStyle tstyle,
@@ -209,15 +209,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-					   const LuPixelPoint& tqparentOrigin );
+					   const LuPixelPoint& parentOrigin );
 
 protected:
 
@@ -322,7 +322,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 						    ContextStyle::TextStyle tstyle,
@@ -331,15 +331,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * @returns the latex representation of the element and
@@ -389,7 +389,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 						    ContextStyle::TextStyle tstyle,
@@ -398,15 +398,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * @returns the latex representation of the element and
diff --git a/lib/kformula/errorelement.cc b/lib/kformula/errorelement.cc
index 0bf80237..c63cf09c 100644
--- a/lib/kformula/errorelement.cc
+++ b/lib/kformula/errorelement.cc
@@ -28,24 +28,24 @@ ErrorElement::ErrorElement( BasicElement* tqparent ) : SequenceElement( tqparent
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void ErrorElement::draw( TQPainter& painter, const LuPixelRect& r,
                         const ContextStyle& context,
                         ContextStyle::TextStyle tstyle,
                         ContextStyle::IndexStyle istyle,
                         StyleAttributes& style,
-                        const LuPixelPoint& tqparentOrigin )
+                        const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
 
-    painter.fillRect( context.tqlayoutUnitToPixelX( myPos.x() ),
-                      context.tqlayoutUnitToPixelY( myPos.y() ),
-                      context.tqlayoutUnitToPixelX( getWidth() ),
-                      context.tqlayoutUnitToPixelY( getHeight() ),
+    painter.fillRect( context.layoutUnitToPixelX( myPos.x() ),
+                      context.layoutUnitToPixelY( myPos.y() ),
+                      context.layoutUnitToPixelX( getWidth() ),
+                      context.layoutUnitToPixelY( getHeight() ),
                       context.getErrorColor() );
-    inherited::draw( painter, r, context, tstyle, istyle, style, tqparentOrigin );
+    inherited::draw( painter, r, context, tstyle, istyle, style, parentOrigin );
 }
     
 KFORMULA_NAMESPACE_END
diff --git a/lib/kformula/errorelement.h b/lib/kformula/errorelement.h
index bc23b5e2..c7d69fed 100644
--- a/lib/kformula/errorelement.h
+++ b/lib/kformula/errorelement.h
@@ -31,15 +31,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
 private:
     virtual TQString getElementName() const { return "merror"; }
diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cc
index 0d1792e0..57088fef 100644
--- a/lib/kformula/fontstyle.cc
+++ b/lib/kformula/fontstyle.cc
@@ -266,17 +266,17 @@ static short cmex_nextchar( short ch )
 bool Artwork::calcCMDelimiterSize( const ContextStyle& context,
                                      uchar c,
                                      luPt fontSize,
-                                     luPt tqparentSize )
+                                     luPt parentSize )
 {
     TQFont f( "cmex10" );
-    f.setPointSizeFloat( context.tqlayoutUnitPtToPt( fontSize ) );
+    f.setPointSizeFloat( context.layoutUnitPtToPt( fontSize ) );
     TQFontMetrics fm( f );
 
     for ( char i=1; c != 0; ++i ) {
         LuPixelRect bound = fm.boundingRect( c );
 
         luPt height = context.ptToLayoutUnitPt( bound.height() );
-        if ( height >= tqparentSize ) {
+        if ( height >= parentSize ) {
             luPt width = context.ptToLayoutUnitPt( fm.width( c ) );
             luPt baseline = context.ptToLayoutUnitPt( -bound.top() );
 
@@ -300,7 +300,7 @@ void Artwork::calcLargest( const ContextStyle& context,
                              uchar c, luPt fontSize )
 {
     TQFont f( "cmex10" );
-    f.setPointSizeFloat( context.tqlayoutUnitPtToPt( fontSize ) );
+    f.setPointSizeFloat( context.layoutUnitPtToPt( fontSize ) );
     TQFontMetrics fm( f );
 
     cmChar = c;
@@ -329,11 +329,11 @@ void Artwork::drawCMDelimiter( TQPainter& painter, const ContextStyle& style,
                                  luPt height )
 {
     TQFont f( "cmex10" );
-    f.setPointSizeFloat( style.tqlayoutUnitToFontSize( height, false ) );
+    f.setPointSizeFloat( style.layoutUnitToFontSize( height, false ) );
 
     painter.setFont( f );
-    painter.drawText( style.tqlayoutUnitToPixelX( x ),
-                      style.tqlayoutUnitToPixelY( y + getBaseline() ),
+    painter.drawText( style.layoutUnitToPixelX( x ),
+                      style.layoutUnitToPixelY( y + getBaseline() ),
                       TQString( TQChar( cmChar ) ) );
 
     // Debug
@@ -342,8 +342,8 @@ void Artwork::drawCMDelimiter( TQPainter& painter, const ContextStyle& style,
     LuPixelRect bound = fm.boundingRect( cmChar );
     painter.setBrush(TQt::NoBrush);
     painter.setPen(TQt::green);
-    painter.drawRect( style.tqlayoutUnitToPixelX( x ),
-                      style.tqlayoutUnitToPixelY( y ),
+    painter.drawRect( style.layoutUnitToPixelX( x ),
+                      style.layoutUnitToPixelY( y ),
                       fm.width( cmChar ),
                       bound.height() );
 #endif
@@ -359,7 +359,7 @@ Artwork::Artwork(SymbolType t)
 void Artwork::calcSizes( const ContextStyle& style,
                            ContextStyle::TextStyle tstyle,
                            double factor,
-                           luPt tqparentSize )
+                           luPt parentSize )
 {
     setBaseline( -1 );
     cmChar = -1;
@@ -367,86 +367,86 @@ void Artwork::calcSizes( const ContextStyle& style,
     switch (getType()) {
     case LeftSquareBracket:
         if ( calcCMDelimiterSize( style, cmex_LeftSquareBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
-        calcRoundBracket( style, leftSquareBracket, tqparentSize, mySize );
+        calcRoundBracket( style, leftSquareBracket, parentSize, mySize );
         break;
     case RightSquareBracket:
         if ( calcCMDelimiterSize( style, cmex_RightSquareBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
-        calcRoundBracket( style, rightSquareBracket, tqparentSize, mySize );
+        calcRoundBracket( style, rightSquareBracket, parentSize, mySize );
         break;
     case LeftLineBracket:
-        calcRoundBracket( style, leftLineBracket, tqparentSize, mySize );
+        calcRoundBracket( style, leftLineBracket, parentSize, mySize );
         setWidth( getWidth()/2 );
         break;
     case RightLineBracket:
-        calcRoundBracket( style, rightLineBracket, tqparentSize, mySize );
+        calcRoundBracket( style, rightLineBracket, parentSize, mySize );
         setWidth( getWidth()/2 );
         break;
     case SlashBracket:
         if ( calcCMDelimiterSize( style, cmex_SlashBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
         calcLargest( style, cmex_SlashBracket, mySize );
         break;
     case BackSlashBracket:
         if ( calcCMDelimiterSize( style, cmex_BackSlashBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
         calcLargest( style, cmex_BackSlashBracket, mySize );
         break;
     case LeftCornerBracket:
         if ( calcCMDelimiterSize( style, cmex_LeftCornerBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
         calcLargest( style, cmex_LeftCornerBracket, mySize );
         break;
     case RightCornerBracket:
         if ( calcCMDelimiterSize( style, cmex_RightCornerBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
         calcLargest( style, cmex_RightCornerBracket, mySize );
         break;
     case LeftRoundBracket:
         if ( calcCMDelimiterSize( style, cmex_LeftRoundBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
-        calcRoundBracket( style, leftRoundBracket, tqparentSize, mySize );
+        calcRoundBracket( style, leftRoundBracket, parentSize, mySize );
         break;
     case RightRoundBracket:
         if ( calcCMDelimiterSize( style, cmex_RightRoundBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
-        calcRoundBracket( style, rightRoundBracket, tqparentSize, mySize );
+        calcRoundBracket( style, rightRoundBracket, parentSize, mySize );
         break;
     case EmptyBracket:
-        setHeight(tqparentSize);
+        setHeight(parentSize);
         //setWidth(style.getEmptyRectWidth());
         setWidth(0);
         break;
     case LeftCurlyBracket:
         if ( calcCMDelimiterSize( style, cmex_LeftCurlyBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
-        calcCurlyBracket( style, leftCurlyBracket, tqparentSize, mySize );
+        calcCurlyBracket( style, leftCurlyBracket, parentSize, mySize );
         break;
     case RightCurlyBracket:
         if ( calcCMDelimiterSize( style, cmex_RightCurlyBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
-        calcCurlyBracket( style, rightCurlyBracket, tqparentSize, mySize );
+        calcCurlyBracket( style, rightCurlyBracket, parentSize, mySize );
         break;
     case Integral:
         calcCharSize( style, style.getBracketFont(), mySize, cmex_Int );
@@ -516,11 +516,11 @@ void Artwork::calcSizes( const ContextStyle& style,
 
 void Artwork::draw(TQPainter& painter, const LuPixelRect& /*r*/,
                    const ContextStyle& context, ContextStyle::TextStyle tstyle,
-                   StyleAttributes& style, const LuPixelPoint& tqparentOrigin)
+                   StyleAttributes& style, const LuPixelPoint& parentOrigin)
 {
     luPt mySize = context.getAdjustedSize( tstyle, style.sizeFactor() );
-    luPixel myX = tqparentOrigin.x() + getX();
-    luPixel myY = tqparentOrigin.y() + getY();
+    luPixel myX = parentOrigin.x() + getX();
+    luPixel myY = parentOrigin.y() + getY();
     /*
     if ( !LuPixelRect( myX, myY, getWidth(), getHeight() ).intersects( r ) )
         return;
@@ -685,10 +685,10 @@ void Artwork::draw(TQPainter& painter, const LuPixelRect& ,
     // debug
 //     painter.setBrush(TQt::NoBrush);
 //     painter.setPen(TQt::green);
-//     painter.drawRect( context.tqlayoutUnitToPixelX( myX ),
-//                       context.tqlayoutUnitToPixelY( myY ),
-//                       context.tqlayoutUnitToPixelX( getWidth() ),
-//                       context.tqlayoutUnitToPixelY( getHeight() ) );
+//     painter.drawRect( context.layoutUnitToPixelX( myX ),
+//                       context.layoutUnitToPixelY( myY ),
+//                       context.layoutUnitToPixelX( getWidth() ),
+//                       context.layoutUnitToPixelY( getHeight() ) );
 }
 
 void Artwork::calcCharSize( const ContextStyle& style, luPt height, TQChar ch )
@@ -708,7 +708,7 @@ void Artwork::drawCharacter( TQPainter& painter, const ContextStyle& style,
 void Artwork::calcCharSize( const ContextStyle& style, TQFont f,
                             luPt height, TQChar c )
 {
-    f.setPointSizeFloat( style.tqlayoutUnitPtToPt( height ) );
+    f.setPointSizeFloat( style.layoutUnitPtToPt( height ) );
     //f.setPointSize( height );
     TQFontMetrics fm(f);
     setWidth( style.ptToLayoutUnitPt( fm.width( c ) ) );
@@ -722,11 +722,11 @@ void Artwork::drawCharacter( TQPainter& painter, const ContextStyle& style,
                              TQFont f,
                              luPixel x, luPixel y, luPt height, uchar c )
 {
-    f.setPointSizeFloat( style.tqlayoutUnitToFontSize( height, false ) );
+    f.setPointSizeFloat( style.layoutUnitToFontSize( height, false ) );
 
     painter.setFont( f );
-    painter.drawText( style.tqlayoutUnitToPixelX( x ),
-                      style.tqlayoutUnitToPixelY( y+getBaseline() ),
+    painter.drawText( style.layoutUnitToPixelX( x ),
+                      style.layoutUnitToPixelY( y+getBaseline() ),
                       TQString( TQChar( c ) ) );
 }
 
@@ -739,7 +739,7 @@ void Artwork::calcRoundBracket( const ContextStyle& style, const TQChar chars[],
     //uchar line = style.symbolTable().character( chars[2] );
 
     TQFont f = style.getBracketFont();
-    f.setPointSizeFloat( style.tqlayoutUnitPtToPt( charHeight ) );
+    f.setPointSizeFloat( style.layoutUnitPtToPt( charHeight ) );
     TQFontMetrics fm( f );
     LuPtRect upperBound = fm.boundingRect( uppercorner );
     LuPtRect lowerBound = fm.boundingRect( lowercorner );
@@ -761,7 +761,7 @@ void Artwork::drawBigRoundBracket( TQPainter& p, const ContextStyle& style, cons
     uchar line = chars[2];
 
     TQFont f = style.getBracketFont();
-    f.setPointSizeFloat( style.tqlayoutUnitToFontSize( charHeight, false ) );
+    f.setPointSizeFloat( style.layoutUnitToFontSize( charHeight, false ) );
     p.setFont(f);
 
     TQFontMetrics fm(f);
@@ -769,14 +769,14 @@ void Artwork::drawBigRoundBracket( TQPainter& p, const ContextStyle& style, cons
     TQRect lowerBound = fm.boundingRect(lowercorner);
     TQRect lineBound = fm.boundingRect(line);
 
-    pixel ptX = style.tqlayoutUnitToPixelX( x );
-    pixel ptY = style.tqlayoutUnitToPixelY( y );
-    pixel height = style.tqlayoutUnitToPixelY( getHeight() );
+    pixel ptX = style.layoutUnitToPixelX( x );
+    pixel ptY = style.layoutUnitToPixelY( y );
+    pixel height = style.layoutUnitToPixelY( getHeight() );
 
 //     p.setPen( TQt::red );
 //     //p.drawRect( ptX, ptY, upperBound.width(), upperBound.height() + lowerBound.height() );
-//     p.drawRect( ptX, ptY, style.tqlayoutUnitToPixelX( getWidth() ),
-//                 style.tqlayoutUnitToPixelY( getHeight() ) );
+//     p.drawRect( ptX, ptY, style.layoutUnitToPixelX( getWidth() ),
+//                 style.layoutUnitToPixelY( getHeight() ) );
 
 //     p.setPen( TQt::black );
     p.drawText( ptX, ptY-upperBound.top(), TQString( TQChar( uppercorner ) ) );
@@ -810,7 +810,7 @@ void Artwork::calcCurlyBracket( const ContextStyle& style, const TQChar chars[],
     uchar middle = chars[3];
 
     TQFont f = style.getBracketFont();
-    f.setPointSizeFloat( style.tqlayoutUnitPtToPt( charHeight ) );
+    f.setPointSizeFloat( style.layoutUnitPtToPt( charHeight ) );
     TQFontMetrics fm( f );
     LuPtRect upperBound = fm.boundingRect( uppercorner );
     LuPtRect lowerBound = fm.boundingRect( lowercorner );
@@ -832,7 +832,7 @@ void Artwork::drawBigCurlyBracket( TQPainter& p, const ContextStyle& style, cons
 {
     //TQFont f = style.getSymbolFont();
     TQFont f = style.getBracketFont();
-    f.setPointSizeFloat( style.tqlayoutUnitToFontSize( charHeight, false ) );
+    f.setPointSizeFloat( style.layoutUnitToFontSize( charHeight, false ) );
     p.setFont(f);
 
     uchar uppercorner = chars[0];
@@ -846,9 +846,9 @@ void Artwork::drawBigCurlyBracket( TQPainter& p, const ContextStyle& style, cons
     TQRect middleBound = fm.boundingRect(middle);
     TQRect lineBound = fm.boundingRect(line);
 
-    pixel ptX = style.tqlayoutUnitToPixelX( x );
-    pixel ptY = style.tqlayoutUnitToPixelY( y );
-    pixel height = style.tqlayoutUnitToPixelY( getHeight() );
+    pixel ptX = style.layoutUnitToPixelX( x );
+    pixel ptY = style.layoutUnitToPixelY( y );
+    pixel height = style.layoutUnitToPixelY( getHeight() );
 
     //p.setPen(TQt::gray);
     //p.drawRect(x, y, upperBound.width() + offset, height);
diff --git a/lib/kformula/fontstyle.h b/lib/kformula/fontstyle.h
index 72db8caf..8132bbb6 100644
--- a/lib/kformula/fontstyle.h
+++ b/lib/kformula/fontstyle.h
@@ -111,7 +111,7 @@ public:
     virtual void calcSizes( const ContextStyle& style,
                             ContextStyle::TextStyle tstyle,
 							double factor,
-                            luPt tqparentSize );
+                            luPt parentSize );
     virtual void calcSizes( const ContextStyle& style,
                             ContextStyle::TextStyle tstyle,
 							double factor );
@@ -120,12 +120,12 @@ public:
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
 					   StyleAttributes& style,
-					   luPt tqparentSize, const LuPixelPoint& origin );
+					   luPt parentSize, const LuPixelPoint& origin );
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     luPixel getWidth() const { return size.width(); }
     luPixel getHeight() const { return size.height(); }
@@ -179,7 +179,7 @@ private:
     SymbolType type;
 
     bool calcCMDelimiterSize( const ContextStyle& context, uchar c,
-                              luPt fontSize, luPt tqparentSize );
+                              luPt fontSize, luPt parentSize );
     void calcLargest( const ContextStyle& context, uchar c, luPt fontSize );
     void drawCMDelimiter( TQPainter& painter, const ContextStyle& style,
                           luPixel x, luPixel y, luPt height );
diff --git a/lib/kformula/formulaelement.cc b/lib/kformula/formulaelement.cc
index 84944150..29ae7cdd 100644
--- a/lib/kformula/formulaelement.cc
+++ b/lib/kformula/formulaelement.cc
@@ -130,9 +130,9 @@ void FormulaElement::draw( TQPainter& painter, const LuPixelRect& r,
                            ContextStyle::TextStyle tstyle,
                            ContextStyle::IndexStyle istyle,
                            StyleAttributes& style,
-                           const LuPixelPoint& tqparentOrigin )
+                           const LuPixelPoint& parentOrigin )
 {
-    inherited::draw( painter, r, context, tstyle, istyle, style, tqparentOrigin );
+    inherited::draw( painter, r, context, tstyle, istyle, style, parentOrigin );
 }
 
 
@@ -279,7 +279,7 @@ void FormulaElement::convertNames( TQDomNode node )
         TQDomNamedNodeMap attr = node.attributes();
         TQDomAttr ch = attr.namedItem( "CHAR" ).toAttr();
         if ( ch.value() == "\\" ) {
-            TQDomNode sequence = node.tqparentNode();
+            TQDomNode sequence = node.parentNode();
             TQDomDocument doc = sequence.ownerDocument();
             TQDomElement nameseq = doc.createElement( "NAMESEQUENCE" );
             sequence.tqreplaceChild( nameseq, node );
diff --git a/lib/kformula/formulaelement.h b/lib/kformula/formulaelement.h
index 831456a7..8f230128 100644
--- a/lib/kformula/formulaelement.h
+++ b/lib/kformula/formulaelement.h
@@ -113,7 +113,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 						    ContextStyle::TextStyle tstyle,
@@ -122,15 +122,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Calculates the formulas sizes and positions.
diff --git a/lib/kformula/fractionelement.cc b/lib/kformula/fractionelement.cc
index a8c1db9c..fb76a11e 100644
--- a/lib/kformula/fractionelement.cc
+++ b/lib/kformula/fractionelement.cc
@@ -81,12 +81,12 @@ void FractionElement::entered( SequenceElement* child )
 
 
 BasicElement* FractionElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                        const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                        const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
         e = numerator->goToPos(cursor, handled, point, myPos);
         if (e != 0) {
             return e;
@@ -121,7 +121,7 @@ BasicElement* FractionElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void FractionElement::calcSizes( const ContextStyle& context, 
                                  ContextStyle::TextStyle tstyle,
@@ -156,17 +156,17 @@ void FractionElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void FractionElement::draw( TQPainter& painter, const LuPixelRect& r,
                             const ContextStyle& context,
                             ContextStyle::TextStyle tstyle,
                             ContextStyle::IndexStyle istyle,
                             StyleAttributes& style,
-                            const LuPixelPoint& tqparentOrigin )
+                            const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -185,11 +185,11 @@ void FractionElement::draw( TQPainter& painter, const LuPixelRect& r,
         double factor = style.sizeFactor();
         double linethickness = lineThickness( context, factor );
         painter.setPen( TQPen( style.color(),
-                              context.tqlayoutUnitToPixelY( linethickness ) ) );
-        painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y() + axis( context, tstyle, factor ) ),
-                          context.tqlayoutUnitToPixelX( myPos.x() + getWidth() ),
-                          context.tqlayoutUnitToPixelY( myPos.y() + axis( context, tstyle, factor ) ) );
+                              context.layoutUnitToPixelY( linethickness ) ) );
+        painter.drawLine( context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y() + axis( context, tstyle, factor ) ),
+                          context.layoutUnitToPixelX( myPos.x() + getWidth() ),
+                          context.layoutUnitToPixelY( myPos.y() + axis( context, tstyle, factor ) ) );
     }
 }
 
diff --git a/lib/kformula/fractionelement.h b/lib/kformula/fractionelement.h
index c578ee5b..18c870fe 100644
--- a/lib/kformula/fractionelement.h
+++ b/lib/kformula/fractionelement.h
@@ -66,11 +66,11 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -79,15 +79,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& cstyle,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
diff --git a/lib/kformula/glyphelement.cc b/lib/kformula/glyphelement.cc
index 381bbcf9..79421f40 100644
--- a/lib/kformula/glyphelement.cc
+++ b/lib/kformula/glyphelement.cc
@@ -69,7 +69,7 @@ bool GlyphElement::readAttributesFromMathMLDom( const TQDomElement& element )
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void GlyphElement::calcSizes( const ContextStyle& context, 
                               ContextStyle::TextStyle tstyle, 
@@ -82,14 +82,14 @@ void GlyphElement::calcSizes( const ContextStyle& context,
 
     if ( m_hasFont ) {
         TQFont font( m_fontFamily );
-        font.setPointSizeFloat( context.tqlayoutUnitPtToPt( mySize ) );
+        font.setPointSizeFloat( context.layoutUnitPtToPt( mySize ) );
         TQFontMetrics fm ( font );
         bound = fm.boundingRect( m_char );
         setWidth( context.ptToLayoutUnitPt( fm.width( m_char ) ) );
     }
     else {
         TQFont font( context.getDefaultFont() );
-        font.setPointSizeFloat( context.tqlayoutUnitPtToPt( mySize ) );
+        font.setPointSizeFloat( context.layoutUnitPtToPt( mySize ) );
         TQFontMetrics fm ( font );
         bound = fm.boundingRect( m_alt );
         setWidth( context.ptToLayoutUnitPt( fm.width( m_alt ) ) );
@@ -106,17 +106,17 @@ void GlyphElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void GlyphElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
                         const ContextStyle& context,
                         ContextStyle::TextStyle tstyle,
                         ContextStyle::IndexStyle /*istyle*/,
                         StyleAttributes& style,
-                        const LuPixelPoint& tqparentOrigin )
+                        const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -131,10 +131,10 @@ void GlyphElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
         setCharFamily( style.charFamily() );
         font = TQFont( m_fontFamily );
         text = m_char;
-        painter.fillRect( context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y() ),
-                          context.tqlayoutUnitToPixelX( getWidth() ),
-                          context.tqlayoutUnitToPixelY( getHeight() ),
+        painter.fillRect( context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y() ),
+                          context.layoutUnitToPixelX( getWidth() ),
+                          context.layoutUnitToPixelY( getHeight() ),
                           style.background() );
     }
     else {
@@ -142,10 +142,10 @@ void GlyphElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
         font = context.getDefaultFont();
         text = m_alt;
     }
-    font.setPointSizeFloat( context.tqlayoutUnitToFontSize( mySize, false ) );
+    font.setPointSizeFloat( context.layoutUnitToFontSize( mySize, false ) );
     painter.setFont( font );
-    painter.drawText( context.tqlayoutUnitToPixelX( myPos.x() ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+getBaseline() ),
+    painter.drawText( context.layoutUnitToPixelX( myPos.x() ),
+                      context.layoutUnitToPixelY( myPos.y()+getBaseline() ),
                       text );
 }
     
diff --git a/lib/kformula/glyphelement.h b/lib/kformula/glyphelement.h
index dd6c6e8c..1d3b6d8d 100644
--- a/lib/kformula/glyphelement.h
+++ b/lib/kformula/glyphelement.h
@@ -31,7 +31,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -40,15 +40,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
 protected:
     virtual bool readAttributesFromMathMLDom( const TQDomElement &element );
diff --git a/lib/kformula/indexelement.cc b/lib/kformula/indexelement.cc
index 5e2ee3e5..a8d3b68a 100644
--- a/lib/kformula/indexelement.cc
+++ b/lib/kformula/indexelement.cc
@@ -227,11 +227,11 @@ void IndexElement::entered( SequenceElement* child )
  * Returns the element the point is in.
  */
 BasicElement* IndexElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                     const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                     const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY());
+        LuPixelPoint myPos(parentOrigin.x()+getX(), parentOrigin.y()+getY());
         e = content->goToPos(cursor, handled, point, myPos);
         if (e != 0) return e;
 
@@ -341,7 +341,7 @@ void IndexElement::setMiddleX(int xOffset, int middleWidth)
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void IndexElement::calcSizes(const ContextStyle& context, 
 							 ContextStyle::TextStyle tstyle,
@@ -446,7 +446,7 @@ void IndexElement::calcSizes(const ContextStyle& context,
     if (content->isTextOnly()) {
         luPt mySize = context.getAdjustedSize( tstyle, factor );
         TQFont font = context.getDefaultFont();
-        font.setPointSizeFloat( context.tqlayoutUnitPtToPt( mySize ) );
+        font.setPointSizeFloat( context.layoutUnitPtToPt( mySize ) );
 
         TQFontMetrics fm(font);
         LuPixelRect bound = fm.boundingRect('x');
@@ -543,17 +543,17 @@ void IndexElement::calcSizes(const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void IndexElement::draw( TQPainter& painter, const LuPixelRect& r,
                          const ContextStyle& context,
                          ContextStyle::TextStyle tstyle,
                          ContextStyle::IndexStyle istyle,
                          StyleAttributes& style,
-                         const LuPixelPoint& tqparentOrigin )
+                         const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -645,7 +645,7 @@ int IndexElement::getFromPos(BasicElement* from)
     else if (from == upperLeft) {
         return upperLeftPos;
     }
-    return tqparentPos;
+    return parentPos;
 }
 
 /**
@@ -680,7 +680,7 @@ void IndexElement::moveLeft(FormulaCursor* cursor, BasicElement* from)
             }
         }
         switch (fromPos) {
-            case tqparentPos:
+            case parentPos:
                 if (hasLowerRight() && linear) {
                     lowerRight->moveLeft(cursor, this);
                     break;
@@ -751,7 +751,7 @@ void IndexElement::moveRight(FormulaCursor* cursor, BasicElement* from)
             }
         }
         switch (fromPos) {
-            case tqparentPos:
+            case parentPos:
                 if (hasUpperLeft() && linear) {
                     upperLeft->moveRight(cursor, this);
                     break;
@@ -1426,7 +1426,7 @@ int IndexElement::readContentFromMathMLDom( TQDomNode& node )
         node = node.nextSibling();
     }
 
-    TQString indexType = node.tqparentNode().toElement().tagName().lower();
+    TQString indexType = node.parentNode().toElement().tagName().lower();
     if ( indexType == "msub" ) {
         lowerRight = new SequenceElement( this );
         int lowerRightNumber = lowerRight->buildMathMLChild( node );
diff --git a/lib/kformula/indexelement.h b/lib/kformula/indexelement.h
index 49b03bc7..b86f0dc4 100644
--- a/lib/kformula/indexelement.h
+++ b/lib/kformula/indexelement.h
@@ -66,7 +66,7 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     // drawing
     //
@@ -77,7 +77,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -86,15 +86,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
diff --git a/lib/kformula/kformulacommand.cc b/lib/kformula/kformulacommand.cc
index 804b66c6..2a5e7ddd 100644
--- a/lib/kformula/kformulacommand.cc
+++ b/lib/kformula/kformulacommand.cc
@@ -534,9 +534,9 @@ void FontCommand::collectChildren()
 }
 
 
-void FontCommand::parseSequences( const TQMap<SequenceElement*, int>& tqparents )
+void FontCommand::parseSequences( const TQMap<SequenceElement*, int>& parents )
 {
-    TQValueList<SequenceElement*> sequences = tqparents.keys();
+    TQValueList<SequenceElement*> sequences = parents.keys();
     for ( TQValueList<SequenceElement*>::iterator i = sequences.begin();
           i != sequences.end();
           ++i ) {
@@ -553,7 +553,7 @@ CharStyleCommand::CharStyleCommand( CharStyle cs, const TQString& name, Containe
 void CharStyleCommand::execute()
 {
     collectChildren();
-    TQMap<SequenceElement*, int> tqparentCollector;
+    TQMap<SequenceElement*, int> parentCollector;
 
     styleList.clear();
     uint count = tqchildrenList().count();
@@ -562,23 +562,23 @@ void CharStyleCommand::execute()
         TextElement* child = tqchildrenList().at( i );
         styleList[i] = child->getCharStyle();
         child->setCharStyle( charStyle );
-        tqparentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
+        parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
     }
-    parseSequences( tqparentCollector );
+    parseSequences( parentCollector );
     testDirty();
 }
 
 void CharStyleCommand::unexecute()
 {
-    TQMap<SequenceElement*, int> tqparentCollector;
+    TQMap<SequenceElement*, int> parentCollector;
     uint count = tqchildrenList().count();
     //styleList.reserve( count );
     for ( uint i=0; i<count; ++i ) {
         TextElement* child = tqchildrenList().at( i );
         child->setCharStyle( styleList[i] );
-        tqparentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
+        parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
     }
-    parseSequences( tqparentCollector );
+    parseSequences( parentCollector );
     testDirty();
 }
 
@@ -592,7 +592,7 @@ void CharFamilyCommand::execute()
 {
     collectChildren();
 
-    TQMap<SequenceElement*, int> tqparentCollector;
+    TQMap<SequenceElement*, int> parentCollector;
 
     familyList.clear();
     uint count = tqchildrenList().count();
@@ -601,23 +601,23 @@ void CharFamilyCommand::execute()
         TextElement* child = tqchildrenList().at( i );
         familyList[i] = child->getCharFamily();
         child->setCharFamily( charFamily );
-        tqparentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
+        parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
     }
-    parseSequences( tqparentCollector );
+    parseSequences( parentCollector );
     testDirty();
 }
 
 void CharFamilyCommand::unexecute()
 {
-    TQMap<SequenceElement*, int> tqparentCollector;
+    TQMap<SequenceElement*, int> parentCollector;
     uint count = tqchildrenList().count();
     //familyList.reserve( count );
     for ( uint i=0; i<count; ++i ) {
         TextElement* child = tqchildrenList().at( i );
         child->setCharFamily( familyList[i] );
-        tqparentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
+        parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
     }
-    parseSequences( tqparentCollector );
+    parseSequences( parentCollector );
     testDirty();
 }
 
diff --git a/lib/kformula/kformulacommand.h b/lib/kformula/kformulacommand.h
index ec014604..8b1d2555 100644
--- a/lib/kformula/kformulacommand.h
+++ b/lib/kformula/kformulacommand.h
@@ -505,7 +505,7 @@ protected:
 
     void collectChildren();
 
-    void parseSequences( const TQMap<SequenceElement*, int>& tqparents );
+    void parseSequences( const TQMap<SequenceElement*, int>& parents );
 
 private:
 
diff --git a/lib/kformula/kformulacontainer.cc b/lib/kformula/kformulacontainer.cc
index a141aa50..774c7e79 100644
--- a/lib/kformula/kformulacontainer.cc
+++ b/lib/kformula/kformulacontainer.cc
@@ -273,10 +273,10 @@ void Container::recalc()
     ContextStyle& context = impl->document->getContextStyle();
     rootElement()->calcSizes( context );
 
-    emit formulaChanged( context.tqlayoutUnitToPixelX( rootElement()->getWidth() ),
-                         context.tqlayoutUnitToPixelY( rootElement()->getHeight() ) );
-    emit formulaChanged( context.tqlayoutUnitPtToPt( context.pixelXToPt( rootElement()->getWidth() ) ),
-                         context.tqlayoutUnitPtToPt( context.pixelYToPt( rootElement()->getHeight() ) ) );
+    emit formulaChanged( context.layoutUnitToPixelX( rootElement()->getWidth() ),
+                         context.layoutUnitToPixelY( rootElement()->getHeight() ) );
+    emit formulaChanged( context.layoutUnitPtToPt( context.pixelXToPt( rootElement()->getWidth() ) ),
+                         context.layoutUnitPtToPt( context.pixelYToPt( rootElement()->getHeight() ) ) );
     emit cursorMoved( activeCursor() );
 }
 
@@ -408,10 +408,10 @@ void Container::execute(KCommand* command)
 TQRect Container::boundingRect() const
 {
     const ContextStyle& context = document()->getContextStyle();
-    return TQRect( context.tqlayoutUnitToPixelX( rootElement()->getX() ),
-                  context.tqlayoutUnitToPixelY( rootElement()->getY() ),
-                  context.tqlayoutUnitToPixelX( rootElement()->getWidth() ),
-                  context.tqlayoutUnitToPixelY( rootElement()->getHeight() ) );
+    return TQRect( context.layoutUnitToPixelX( rootElement()->getX() ),
+                  context.layoutUnitToPixelY( rootElement()->getY() ),
+                  context.layoutUnitToPixelX( rootElement()->getWidth() ),
+                  context.layoutUnitToPixelY( rootElement()->getHeight() ) );
 }
 
 TQRect Container::coveredRect()
@@ -419,14 +419,14 @@ TQRect Container::coveredRect()
     if ( impl->activeCursor != 0 ) {
         const ContextStyle& context = document()->getContextStyle();
         const LuPixelRect& cursorRect = impl->activeCursor->getCursorSize();
-        return TQRect( context.tqlayoutUnitToPixelX( rootElement()->getX() ),
-                      context.tqlayoutUnitToPixelY( rootElement()->getY() ),
-                      context.tqlayoutUnitToPixelX( rootElement()->getWidth() ),
-                      context.tqlayoutUnitToPixelY( rootElement()->getHeight() ) ) |
-            TQRect( context.tqlayoutUnitToPixelX( cursorRect.x() ),
-                   context.tqlayoutUnitToPixelY( cursorRect.y() ),
-                   context.tqlayoutUnitToPixelX( cursorRect.width() ),
-                   context.tqlayoutUnitToPixelY( cursorRect.height() ) );
+        return TQRect( context.layoutUnitToPixelX( rootElement()->getX() ),
+                      context.layoutUnitToPixelY( rootElement()->getY() ),
+                      context.layoutUnitToPixelX( rootElement()->getWidth() ),
+                      context.layoutUnitToPixelY( rootElement()->getHeight() ) ) |
+            TQRect( context.layoutUnitToPixelX( cursorRect.x() ),
+                   context.layoutUnitToPixelY( cursorRect.y() ),
+                   context.layoutUnitToPixelX( cursorRect.width() ),
+                   context.layoutUnitToPixelY( cursorRect.height() ) );
     }
     return boundingRect();
 }
@@ -434,20 +434,20 @@ TQRect Container::coveredRect()
 double Container::width() const
 {
     const ContextStyle& context = document()->getContextStyle();
-    return context.tqlayoutUnitPtToPt( context.pixelXToPt( rootElement()->getWidth() ) );
+    return context.layoutUnitPtToPt( context.pixelXToPt( rootElement()->getWidth() ) );
 }
 
 double Container::height() const
 {
     const ContextStyle& context = document()->getContextStyle();
-    return context.tqlayoutUnitPtToPt( context.pixelYToPt( rootElement()->getHeight() ) );
+    return context.layoutUnitPtToPt( context.pixelYToPt( rootElement()->getHeight() ) );
 }
 
 double Container::baseline() const
 {
     const ContextStyle& context = document()->getContextStyle();
-    //return context.tqlayoutUnitToPixelY( rootElement()->getBaseline() );
-    return context.tqlayoutUnitPtToPt( context.pixelYToPt( rootElement()->getBaseline() ) );
+    //return context.layoutUnitToPixelY( rootElement()->getBaseline() );
+    return context.layoutUnitPtToPt( context.pixelYToPt( rootElement()->getBaseline() ) );
 }
 
 void Container::moveTo( int x, int y )
@@ -601,8 +601,8 @@ TQImage Container::drawImage( int width, int height )
     TQRect rect(impl->rootElement->getX(), impl->rootElement->getY(),
                impl->rootElement->getWidth(), impl->rootElement->getHeight());
 
-    int realWidth = context.tqlayoutUnitToPixelX( impl->rootElement->getWidth() );
-    int realHeight = context.tqlayoutUnitToPixelY( impl->rootElement->getHeight() );
+    int realWidth = context.layoutUnitToPixelX( impl->rootElement->getWidth() );
+    int realHeight = context.layoutUnitToPixelY( impl->rootElement->getHeight() );
 
     double f = TQMAX( static_cast<double>( width )/static_cast<double>( realWidth ),
                      static_cast<double>( height )/static_cast<double>( realHeight ) );
@@ -612,12 +612,12 @@ TQImage Container::drawImage( int width, int height )
 
     kdDebug( DEBUGID ) << "Container::drawImage "
                        << "(" << width << " " << height << ")"
-                       << "(" << context.tqlayoutUnitToPixelX( impl->rootElement->getWidth() )
-                       << " " << context.tqlayoutUnitToPixelY( impl->rootElement->getHeight() ) << ")"
+                       << "(" << context.layoutUnitToPixelX( impl->rootElement->getWidth() )
+                       << " " << context.layoutUnitToPixelY( impl->rootElement->getHeight() ) << ")"
                        << endl;
 
-    TQPixmap pm( context.tqlayoutUnitToPixelX( impl->rootElement->getWidth() ),
-                context.tqlayoutUnitToPixelY( impl->rootElement->getHeight() ) );
+    TQPixmap pm( context.layoutUnitToPixelX( impl->rootElement->getWidth() ),
+                context.layoutUnitToPixelY( impl->rootElement->getHeight() ) );
     pm.fill();
     TQPainter paint(&pm);
     impl->rootElement->draw(paint, rect, context);
diff --git a/lib/kformula/kformuladefs.h b/lib/kformula/kformuladefs.h
index 2e9d8a8b..80879f98 100644
--- a/lib/kformula/kformuladefs.h
+++ b/lib/kformula/kformuladefs.h
@@ -235,7 +235,7 @@ enum IndexPosition {
     lowerMiddlePos,
     upperRightPos,
     lowerRightPos,
-    tqparentPos
+    parentPos
 };
 
 
diff --git a/lib/kformula/kformulamimesource.cc b/lib/kformula/kformulamimesource.cc
index af727959..58a6ad35 100644
--- a/lib/kformula/kformulamimesource.cc
+++ b/lib/kformula/kformulamimesource.cc
@@ -122,8 +122,8 @@ TQByteArray MimeSource::tqencodedData ( const char *format ) const
         TQRect rect(rootElement->getX(), rootElement->getY(),
                    rootElement->getWidth(), rootElement->getHeight());
 
-    	TQPixmap pm( context.tqlayoutUnitToPixelX( rootElement->getWidth() ),
-                    context.tqlayoutUnitToPixelY( rootElement->getHeight() ) );
+    	TQPixmap pm( context.layoutUnitToPixelX( rootElement->getWidth() ),
+                    context.layoutUnitToPixelY( rootElement->getHeight() ) );
 	pm.fill();
 	TQPainter paint(&pm);
         rootElement->draw(paint, rect, context);
diff --git a/lib/kformula/kformulaview.cc b/lib/kformula/kformulaview.cc
index 8099f633..f4385b38 100644
--- a/lib/kformula/kformulaview.cc
+++ b/lib/kformula/kformulaview.cc
@@ -132,7 +132,7 @@ View::~View()
 
 TQPoint View::getCursorPoint() const
 {
-    return contextStyle().tqlayoutUnitToPixel( cursor()->getCursorPoint() );
+    return contextStyle().layoutUnitToPixel( cursor()->getCursorPoint() );
 }
 
 void View::setReadOnly(bool ro)
diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cc
index b8abd22b..38020904 100644
--- a/lib/kformula/matrixelement.cc
+++ b/lib/kformula/matrixelement.cc
@@ -339,12 +339,12 @@ void MatrixElement::entered( SequenceElement* /*child*/ )
 
 
 BasicElement* MatrixElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                      const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                      const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
 
         uint rows = getRows();
         uint columns = getColumns();
@@ -430,7 +430,7 @@ BasicElement* MatrixElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void MatrixElement::calcSizes( const ContextStyle& context,
                                ContextStyle::TextStyle tstyle,
@@ -509,17 +509,17 @@ void MatrixElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void MatrixElement::draw( TQPainter& painter, const LuPixelRect& rect,
                           const ContextStyle& context,
                           ContextStyle::TextStyle tstyle,
                           ContextStyle::IndexStyle istyle,
                           StyleAttributes& style,
-                          const LuPixelPoint& tqparentOrigin )
+                          const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( rect ) )
     //    return;
 
@@ -922,15 +922,15 @@ bool MatrixElement::readAttributesFromMathMLDom( const TQDomElement& element )
             }
         }
     }
-    TQString tqalignmentscopeStr = element.attribute( "tqalignmentscope" ).lower();
-    if ( ! tqalignmentscopeStr.isNull() ) {
-        TQStringList list = TQStringList::split( ' ', tqalignmentscopeStr );
+    TQString alignmentscopeStr = element.attribute( "alignmentscope" ).lower();
+    if ( ! alignmentscopeStr.isNull() ) {
+        TQStringList list = TQStringList::split( ' ', alignmentscopeStr );
         for ( TQStringList::iterator it = list.begin(); it != list.end(); it++ ) {
             if ( *it == "true" ) {
-                m_tqalignmentScope.append( true );
+                m_alignmentScope.append( true );
             }
             else if ( *it == "false" ) {
-                m_tqalignmentScope.append( false );
+                m_alignmentScope.append( false );
             }
         }
     }
@@ -1327,18 +1327,18 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const
     if ( ! columnalign.isNull() ) {
         element.setAttribute( "columnalign", columnalign.stripWhiteSpace() );
     }
-    TQString tqalignmentscope;
-    for ( TQValueList< bool >::const_iterator it = m_tqalignmentScope.begin(); it != m_tqalignmentScope.end(); it++ )
+    TQString alignmentscope;
+    for ( TQValueList< bool >::const_iterator it = m_alignmentScope.begin(); it != m_alignmentScope.end(); it++ )
     {
         if ( *it ) {
-            tqalignmentscope.append( "true " );
+            alignmentscope.append( "true " );
         }
         else {
-            tqalignmentscope.append( "false " );
+            alignmentscope.append( "false " );
         }
     }
-    if ( ! tqalignmentscope.isNull() ) {
-        element.setAttribute( "tqalignmentscope", tqalignmentscope.stripWhiteSpace() );
+    if ( ! alignmentscope.isNull() ) {
+        element.setAttribute( "alignmentscope", alignmentscope.stripWhiteSpace() );
     }
     TQString columnwidth;
     TQValueList< double >::const_iterator lengthIt = m_columnWidth.begin();
@@ -1806,11 +1806,11 @@ public:
     }
 
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
                             ContextStyle::TextStyle tstyle,
@@ -1967,11 +1967,11 @@ MultilineSequenceElement::MultilineSequenceElement( BasicElement* tqparent )
 
 
 BasicElement* MultilineSequenceElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                                 const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                                 const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    //LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-    //                   tqparentOrigin.y() + getY());
-    BasicElement* e = inherited::goToPos(cursor, handled, point, tqparentOrigin);
+    //LuPixelPoint myPos(parentOrigin.x() + getX(),
+    //                   parentOrigin.y() + getY());
+    BasicElement* e = inherited::goToPos(cursor, handled, point, parentOrigin);
 
     if (e == 0) {
         // If the mouse was behind this line put the cursor to the last position.
@@ -2184,12 +2184,12 @@ void MultilineElement::entered( SequenceElement* /*child*/ )
  * Returns the element the point is in.
  */
 BasicElement* MultilineElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                         const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                         const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = inherited::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = inherited::goToPos(cursor, handled, point, parentOrigin);
     if ( e != 0 ) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
 
         uint count = content.count();
         for ( uint i = 0; i < count; ++i ) {
@@ -2400,7 +2400,7 @@ void MultilineElement::calcSizes( const ContextStyle& context,
     double factor = style.sizeFactor();
     luPt mySize = context.getAdjustedSize( tstyle, factor );
     TQFont font = context.getDefaultFont();
-    font.setPointSizeFloat( context.tqlayoutUnitPtToPt( mySize ) );
+    font.setPointSizeFloat( context.layoutUnitPtToPt( mySize ) );
     TQFontMetrics fm( font );
     luPixel leading = context.ptToLayoutUnitPt( fm.leading() );
     luPixel distY = context.ptToPixelY( context.getThinSpace( tstyle, factor ) );
@@ -2458,9 +2458,9 @@ void MultilineElement::draw( TQPainter& painter, const LuPixelRect& r,
                              ContextStyle::TextStyle tstyle,
                              ContextStyle::IndexStyle istyle,
                              StyleAttributes& style,
-                             const LuPixelPoint& tqparentOrigin )
+                             const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x() + getX(), tqparentOrigin.y() + getY() );
+    LuPixelPoint myPos( parentOrigin.x() + getX(), parentOrigin.y() + getY() );
     uint count = content.count();
 
     if ( context.edit() ) {
@@ -2471,10 +2471,10 @@ void MultilineElement::draw( TQPainter& painter, const LuPixelRect& r,
             if ( tabCount < line->tabCount() ) {
                 for ( uint t = tabCount; t < line->tabCount(); ++t ) {
                     BasicElement* marker = line->tab( t );
-                    painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x()+marker->getX() ),
-                                      context.tqlayoutUnitToPixelY( myPos.y() ),
-                                      context.tqlayoutUnitToPixelX( myPos.x()+marker->getX() ),
-                                      context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ) );
+                    painter.drawLine( context.layoutUnitToPixelX( myPos.x()+marker->getX() ),
+                                      context.layoutUnitToPixelY( myPos.y() ),
+                                      context.layoutUnitToPixelX( myPos.x()+marker->getX() ),
+                                      context.layoutUnitToPixelY( myPos.y()+getHeight() ) );
                 }
                 tabCount = line->tabCount();
             }
diff --git a/lib/kformula/matrixelement.h b/lib/kformula/matrixelement.h
index ede10114..04203257 100644
--- a/lib/kformula/matrixelement.h
+++ b/lib/kformula/matrixelement.h
@@ -69,7 +69,7 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     // drawing
     //
@@ -80,7 +80,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -89,15 +89,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
@@ -271,7 +271,7 @@ private:
     VerticalAlign m_align;
     TQValueList< VerticalAlign > m_rowAlign;
     TQValueList< HorizontalAlign > m_columnAlign;
-    TQValueList< bool > m_tqalignmentScope;
+    TQValueList< bool > m_alignmentScope;
     TQValueList< SizeType > m_columnWidthType;
     TQValueList< double > m_columnWidth;
     SizeType m_widthType;
@@ -337,7 +337,7 @@ public:
      * Returns the element the point is in.
      */
     BasicElement* goToPos( FormulaCursor* cursor, bool& handled,
-                           const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                           const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Sets the cursor inside this element to its start position.
@@ -375,7 +375,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -384,15 +384,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
diff --git a/lib/kformula/paddedelement.cc b/lib/kformula/paddedelement.cc
index f79e6789..d84bb064 100644
--- a/lib/kformula/paddedelement.cc
+++ b/lib/kformula/paddedelement.cc
@@ -36,7 +36,7 @@ PaddedElement::PaddedElement( BasicElement* tqparent ) : SequenceElement( tqpare
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void PaddedElement::calcSizes( const ContextStyle& context,
                                ContextStyle::TextStyle tstyle,
diff --git a/lib/kformula/paddedelement.h b/lib/kformula/paddedelement.h
index 6d552837..811f861e 100644
--- a/lib/kformula/paddedelement.h
+++ b/lib/kformula/paddedelement.h
@@ -32,7 +32,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
diff --git a/lib/kformula/phantomelement.cc b/lib/kformula/phantomelement.cc
index 662ec53d..72b564a6 100644
--- a/lib/kformula/phantomelement.cc
+++ b/lib/kformula/phantomelement.cc
@@ -27,8 +27,8 @@ PhantomElement::PhantomElement( BasicElement* tqparent ) : SequenceElement( tqpa
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void PhantomElement::draw( TQPainter&, const LuPixelRect&, const ContextStyle&,
                            ContextStyle::TextStyle, ContextStyle::IndexStyle,
diff --git a/lib/kformula/phantomelement.h b/lib/kformula/phantomelement.h
index 885a9651..cf89d893 100644
--- a/lib/kformula/phantomelement.h
+++ b/lib/kformula/phantomelement.h
@@ -31,15 +31,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
 private:
     virtual TQString getElementName() const { return "mphantom"; }
diff --git a/lib/kformula/rootelement.cc b/lib/kformula/rootelement.cc
index 098d069f..f9331f13 100644
--- a/lib/kformula/rootelement.cc
+++ b/lib/kformula/rootelement.cc
@@ -138,12 +138,12 @@ void RootElement::entered( SequenceElement* child )
 
 
 BasicElement* RootElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                    const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin)
+                                    const LuPixelPoint& point, const LuPixelPoint& parentOrigin)
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
 
         e = content->goToPos(cursor, handled, point, myPos);
         if (e != 0) {
@@ -176,7 +176,7 @@ BasicElement* RootElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void RootElement::calcSizes( const ContextStyle& context,
                              ContextStyle::TextStyle tstyle,
@@ -235,17 +235,17 @@ void RootElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void RootElement::draw( TQPainter& painter, const LuPixelRect& r,
                         const ContextStyle& context,
                         ContextStyle::TextStyle tstyle,
                         ContextStyle::IndexStyle istyle,
                         StyleAttributes& style,
-                        const LuPixelPoint& tqparentOrigin )
+                        const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -265,27 +265,27 @@ void RootElement::draw( TQPainter& painter, const LuPixelRect& r,
     luPixel unit = (content->getHeight() + distY)/ 3;
 
     painter.setPen( TQPen( style.color(),
-                          context.tqlayoutUnitToPixelX( 2*context.getLineWidth( factor ) ) ) );
-    painter.drawLine( context.tqlayoutUnitToPixelX( x+unit/3 ),
-                      context.tqlayoutUnitToPixelY( y+unit+distY/3 ),
-                      context.tqlayoutUnitToPixelX( x+unit/2+unit/3 ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ) );
+                          context.layoutUnitToPixelX( 2*context.getLineWidth( factor ) ) ) );
+    painter.drawLine( context.layoutUnitToPixelX( x+unit/3 ),
+                      context.layoutUnitToPixelY( y+unit+distY/3 ),
+                      context.layoutUnitToPixelX( x+unit/2+unit/3 ),
+                      context.layoutUnitToPixelY( myPos.y()+getHeight() ) );
 
     painter.setPen( TQPen( style.color(),
-                          context.tqlayoutUnitToPixelY( context.getLineWidth( factor ) ) ) );
-
-    painter.drawLine( context.tqlayoutUnitToPixelX( x+unit+unit/3 ),
-                      context.tqlayoutUnitToPixelY( y+distY/3 ),
-                      context.tqlayoutUnitToPixelX( x+unit/2+unit/3 ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ) );
-    painter.drawLine( context.tqlayoutUnitToPixelX( x+unit+unit/3 ),
-                      context.tqlayoutUnitToPixelY( y+distY/3 ),
-                      context.tqlayoutUnitToPixelX( x+unit+unit/3+content->getWidth() ),
-                      context.tqlayoutUnitToPixelY( y+distY/3 ) );
-    painter.drawLine( context.tqlayoutUnitToPixelX( x+unit/3 ),
-                      context.tqlayoutUnitToPixelY( y+unit+distY/2 ),
-                      context.tqlayoutUnitToPixelX( x ),
-                      context.tqlayoutUnitToPixelY( y+unit+unit/2 ) );
+                          context.layoutUnitToPixelY( context.getLineWidth( factor ) ) ) );
+
+    painter.drawLine( context.layoutUnitToPixelX( x+unit+unit/3 ),
+                      context.layoutUnitToPixelY( y+distY/3 ),
+                      context.layoutUnitToPixelX( x+unit/2+unit/3 ),
+                      context.layoutUnitToPixelY( myPos.y()+getHeight() ) );
+    painter.drawLine( context.layoutUnitToPixelX( x+unit+unit/3 ),
+                      context.layoutUnitToPixelY( y+distY/3 ),
+                      context.layoutUnitToPixelX( x+unit+unit/3+content->getWidth() ),
+                      context.layoutUnitToPixelY( y+distY/3 ) );
+    painter.drawLine( context.layoutUnitToPixelX( x+unit/3 ),
+                      context.layoutUnitToPixelY( y+unit+distY/2 ),
+                      context.layoutUnitToPixelX( x ),
+                      context.layoutUnitToPixelY( y+unit+unit/2 ) );
 }
 
 
diff --git a/lib/kformula/rootelement.h b/lib/kformula/rootelement.h
index b836228e..4908a643 100644
--- a/lib/kformula/rootelement.h
+++ b/lib/kformula/rootelement.h
@@ -62,11 +62,11 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -75,15 +75,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& cstyle,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cc
index eb64a13e..46c00817 100644
--- a/lib/kformula/sequenceelement.cc
+++ b/lib/kformula/sequenceelement.cc
@@ -114,12 +114,12 @@ bool SequenceElement::readOnly( const FormulaCursor* ) const
  * Returns the element the point is in.
  */
 BasicElement* SequenceElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                        const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                        const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
 
         uint count = tqchildren.count();
         for (uint i = 0; i < count; i++) {
@@ -174,7 +174,7 @@ bool SequenceElement::isEmpty()
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void SequenceElement::calcSizes( const ContextStyle& context,
 								 ContextStyle::TextStyle tstyle,
@@ -247,17 +247,17 @@ void SequenceElement::setChildrenPositions()
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void SequenceElement::draw( TQPainter& painter, const LuPixelRect& r,
                             const ContextStyle& context,
                             ContextStyle::TextStyle tstyle,
                             ContextStyle::IndexStyle istyle,
                             StyleAttributes& style,
-                            const LuPixelPoint& tqparentOrigin )
+                            const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x() + getX(), tqparentOrigin.y() + getY() );
+    LuPixelPoint myPos( parentOrigin.x() + getX(), parentOrigin.y() + getY() );
     // There might be zero sized elements that still want to be drawn at least
     // in edit mode. (EmptyElement)
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
@@ -292,17 +292,17 @@ void SequenceElement::draw( TQPainter& painter, const LuPixelRect& r,
     }
     // Debug
     //painter.setPen(TQt::green);
-    //painter.drawRect(tqparentOrigin.x() + getX(), tqparentOrigin.y() + getY(),
+    //painter.drawRect(parentOrigin.x() + getX(), parentOrigin.y() + getY(),
     //                 getWidth(), getHeight());
-//     painter.drawLine( context.tqlayoutUnitToPixelX( tqparentOrigin.x() + getX() ),
-//                       context.tqlayoutUnitToPixelY( tqparentOrigin.y() + getY() + axis( context, tstyle ) ),
-//                       context.tqlayoutUnitToPixelX( tqparentOrigin.x() + getX() + getWidth() ),
-//                       context.tqlayoutUnitToPixelY( tqparentOrigin.y() + getY() + axis( context, tstyle ) ) );
+//     painter.drawLine( context.layoutUnitToPixelX( parentOrigin.x() + getX() ),
+//                       context.layoutUnitToPixelY( parentOrigin.y() + getY() + axis( context, tstyle ) ),
+//                       context.layoutUnitToPixelX( parentOrigin.x() + getX() + getWidth() ),
+//                       context.layoutUnitToPixelY( parentOrigin.y() + getY() + axis( context, tstyle ) ) );
 //     painter.setPen(TQt::red);
-//     painter.drawLine( context.tqlayoutUnitToPixelX( tqparentOrigin.x() + getX() ),
-//                       context.tqlayoutUnitToPixelY( tqparentOrigin.y() + getY() + getBaseline() ),
-//                       context.tqlayoutUnitToPixelX( tqparentOrigin.x() + getX() + getWidth() ),
-//                       context.tqlayoutUnitToPixelY( tqparentOrigin.y() + getY() + getBaseline() ) );
+//     painter.drawLine( context.layoutUnitToPixelX( parentOrigin.x() + getX() ),
+//                       context.layoutUnitToPixelY( parentOrigin.y() + getY() + getBaseline() ),
+//                       context.layoutUnitToPixelX( parentOrigin.x() + getX() + getWidth() ),
+//                       context.layoutUnitToPixelY( parentOrigin.y() + getY() + getBaseline() ) );
 }
 
 
@@ -322,11 +322,11 @@ void SequenceElement::drawEmptyRect( TQPainter& painter, const ContextStyle& con
     if ( context.edit() ) {
         painter.setBrush(TQt::NoBrush);
         painter.setPen( TQPen( context.getEmptyColor(),
-                              context.tqlayoutUnitToPixelX( context.getLineWidth( factor ) ) ) );
-        painter.drawRect( context.tqlayoutUnitToPixelX( upperLeft.x() ),
-                          context.tqlayoutUnitToPixelY( upperLeft.y() ),
-                          context.tqlayoutUnitToPixelX( getWidth() ),
-                          context.tqlayoutUnitToPixelY( getHeight() ) );
+                              context.layoutUnitToPixelX( context.getLineWidth( factor ) ) ) );
+        painter.drawRect( context.layoutUnitToPixelX( upperLeft.x() ),
+                          context.layoutUnitToPixelY( upperLeft.y() ),
+                          context.layoutUnitToPixelX( getWidth() ),
+                          context.layoutUnitToPixelY( getHeight() ) );
     }
 }
 
@@ -384,14 +384,14 @@ void SequenceElement::drawCursor( TQPainter& painter, const ContextStyle& contex
     painter.setRasterOp( TQt::XorROP );
     if ( cursor->isSelection() ) {
         const LuPixelRect& r = cursor->cursorSize;
-        painter.fillRect( context.tqlayoutUnitToPixelX( r.x() ),
-                          context.tqlayoutUnitToPixelY( r.y() ),
-                          context.tqlayoutUnitToPixelX( r.width() ),
-                          context.tqlayoutUnitToPixelY( r.height() ),
+        painter.fillRect( context.layoutUnitToPixelX( r.x() ),
+                          context.layoutUnitToPixelY( r.y() ),
+                          context.layoutUnitToPixelX( r.width() ),
+                          context.layoutUnitToPixelY( r.height() ),
                           TQt::white );
     }
     painter.setPen( TQPen( TQt::white,
-                          context.tqlayoutUnitToPixelX( context.getLineWidth( style.sizeFactor() )/2 ) ) );
+                          context.layoutUnitToPixelX( context.getLineWidth( style.sizeFactor() )/2 ) ) );
     const LuPixelPoint& point = cursor->getCursorPoint();
     const LuPixelRect& size = cursor->getCursorSize();
     if ( activeCursor )
@@ -399,20 +399,20 @@ void SequenceElement::drawCursor( TQPainter& painter, const ContextStyle& contex
         int offset = 0;
         if ( cursor->isSelection() && cursor->getPos() > cursor->getMark() )
             offset = -1;
-        painter.drawLine( context.tqlayoutUnitToPixelX( point.x() ) + offset,
-                          context.tqlayoutUnitToPixelY( size.top() ),
-                          context.tqlayoutUnitToPixelX( point.x() ) + offset,
-                          context.tqlayoutUnitToPixelY( size.bottom() )-1 );
-        painter.drawLine( context.tqlayoutUnitToPixelX( point.x() ) + offset + 1,
-                          context.tqlayoutUnitToPixelY( size.top() ),
-                          context.tqlayoutUnitToPixelX( point.x() ) + offset + 1,
-                          context.tqlayoutUnitToPixelY( size.bottom() )-1 );
+        painter.drawLine( context.layoutUnitToPixelX( point.x() ) + offset,
+                          context.layoutUnitToPixelY( size.top() ),
+                          context.layoutUnitToPixelX( point.x() ) + offset,
+                          context.layoutUnitToPixelY( size.bottom() )-1 );
+        painter.drawLine( context.layoutUnitToPixelX( point.x() ) + offset + 1,
+                          context.layoutUnitToPixelY( size.top() ),
+                          context.layoutUnitToPixelX( point.x() ) + offset + 1,
+                          context.layoutUnitToPixelY( size.bottom() )-1 );
     }
     if ( !smallCursor && !cursor->isSelection() )
-        painter.drawLine( context.tqlayoutUnitToPixelX( size.left() ),
-                          context.tqlayoutUnitToPixelY( size.bottom() )-1,
-                          context.tqlayoutUnitToPixelX( size.right() )-1,
-                          context.tqlayoutUnitToPixelY( size.bottom() )-1 );
+        painter.drawLine( context.layoutUnitToPixelX( size.left() ),
+                          context.layoutUnitToPixelY( size.bottom() )-1,
+                          context.layoutUnitToPixelX( size.right() )-1,
+                          context.layoutUnitToPixelY( size.bottom() )-1 );
     // This might be wrong but probably isn't.
     painter.setRasterOp( TQt::CopyROP );
 }
@@ -1629,13 +1629,13 @@ void NameSequence::drawCursor( TQPainter& painter, const ContextStyle& context,
 {
     LuPixelPoint point = widgetPos();
     painter.setPen( TQPen( context.getEmptyColor(),
-                          context.tqlayoutUnitToPixelX( context.getLineWidth( style.sizeFactor() )/2 ) ) );
+                          context.layoutUnitToPixelX( context.getLineWidth( style.sizeFactor() )/2 ) ) );
     luPixel unitX = context.ptToLayoutUnitPixX( 1 );
     luPixel unitY = context.ptToLayoutUnitPixY( 1 );
-    painter.drawRect( context.tqlayoutUnitToPixelX( point.x()-unitX ),
-                      context.tqlayoutUnitToPixelY( point.y()-unitY ),
-                      context.tqlayoutUnitToPixelX( getWidth()+2*unitX ),
-                      context.tqlayoutUnitToPixelY( getHeight()+2*unitY ) );
+    painter.drawRect( context.layoutUnitToPixelX( point.x()-unitX ),
+                      context.layoutUnitToPixelY( point.y()-unitY ),
+                      context.layoutUnitToPixelX( getWidth()+2*unitX ),
+                      context.layoutUnitToPixelY( getHeight()+2*unitY ) );
 
     inherited::drawCursor( painter, context, style, cursor, smallCursor, activeCursor );
 }
diff --git a/lib/kformula/sequenceelement.h b/lib/kformula/sequenceelement.h
index 167c1ae3..ab6828fd 100644
--- a/lib/kformula/sequenceelement.h
+++ b/lib/kformula/sequenceelement.h
@@ -70,7 +70,7 @@ public:
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
                                    const LuPixelPoint& point,
-                                   const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& parentOrigin );
 
     // drawing
     //
@@ -92,7 +92,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -101,15 +101,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
diff --git a/lib/kformula/spaceelement.cc b/lib/kformula/spaceelement.cc
index 7bc21d24..f3f43d1c 100644
--- a/lib/kformula/spaceelement.cc
+++ b/lib/kformula/spaceelement.cc
@@ -99,24 +99,24 @@ void SpaceElement::calcSizes( const ContextStyle& context,
 
     double width = style.getSpace( m_widthType, m_width );
     if ( m_widthType == AbsoluteSize ) {
-        width = m_width / context.tqlayoutUnitPtToPt( context.getBaseSize() );
+        width = m_width / context.layoutUnitPtToPt( context.getBaseSize() );
     }
     else if ( m_widthType == PixelSize ) {
-        width = context.pixelYToPt( m_width ) / context.tqlayoutUnitPtToPt( context.getBaseSize() );
+        width = context.pixelYToPt( m_width ) / context.layoutUnitPtToPt( context.getBaseSize() );
     }
     double height = style.getSpace( m_heightType, m_height );
     if ( m_heightType == AbsoluteSize ) {
-        height = m_height / context.tqlayoutUnitPtToPt( context.getBaseSize() );
+        height = m_height / context.layoutUnitPtToPt( context.getBaseSize() );
     }
     else if ( m_heightType == PixelSize ) {
-        height = context.pixelYToPt( m_height ) / context.tqlayoutUnitPtToPt( context.getBaseSize() );
+        height = context.pixelYToPt( m_height ) / context.layoutUnitPtToPt( context.getBaseSize() );
     }
     double depth = style.getSpace( m_depthType, m_depth );
     if ( m_depthType == AbsoluteSize ) {
-        depth = m_depth / context.tqlayoutUnitPtToPt( context.getBaseSize() );
+        depth = m_depth / context.layoutUnitPtToPt( context.getBaseSize() );
     }
     else if ( m_depthType == PixelSize ) {
-        depth = context.pixelYToPt( m_depth ) / context.tqlayoutUnitPtToPt( context.getBaseSize() );
+        depth = context.pixelYToPt( m_depth ) / context.layoutUnitPtToPt( context.getBaseSize() );
     }
 
     setWidth( hbound.width() * width );
@@ -133,27 +133,27 @@ void SpaceElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
                          ContextStyle::TextStyle /*tstyle*/,
                          ContextStyle::IndexStyle /*istyle*/,
                          StyleAttributes& /*style*/,
-                         const LuPixelPoint& tqparentOrigin )
+                         const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos(tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY());
+    LuPixelPoint myPos(parentOrigin.x()+getX(), parentOrigin.y()+getY());
     // there is such a thing as negative space!
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
     if ( context.edit() ) {
         painter.setPen( context.getEmptyColor() );
-        painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ),
-                          context.tqlayoutUnitToPixelX( myPos.x()+getWidth()-1 ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ) );
-        painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ),
-                          context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight()-getHeight()/5 ) );
-        painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x()+getWidth()-1 ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ),
-                          context.tqlayoutUnitToPixelX( myPos.x()+getWidth()-1 ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight()-getHeight()/5 ) );
+        painter.drawLine( context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight() ),
+                          context.layoutUnitToPixelX( myPos.x()+getWidth()-1 ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight() ) );
+        painter.drawLine( context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight() ),
+                          context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight()-getHeight()/5 ) );
+        painter.drawLine( context.layoutUnitToPixelX( myPos.x()+getWidth()-1 ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight() ),
+                          context.layoutUnitToPixelX( myPos.x()+getWidth()-1 ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight()-getHeight()/5 ) );
     }
 }
 
diff --git a/lib/kformula/spaceelement.h b/lib/kformula/spaceelement.h
index 0f5db35d..856af25e 100644
--- a/lib/kformula/spaceelement.h
+++ b/lib/kformula/spaceelement.h
@@ -78,7 +78,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -87,15 +87,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Moves the cursor away from the given child. The cursor is
diff --git a/lib/kformula/styleelement.cc b/lib/kformula/styleelement.cc
index 1a8f20ae..fc61386c 100644
--- a/lib/kformula/styleelement.cc
+++ b/lib/kformula/styleelement.cc
@@ -193,7 +193,7 @@ void StyleElement::setStyleSize( const ContextStyle& context, StyleAttributes& s
 
     // Get scriptminsize attribute in absolute units, so we don't depend on 
     // context to get the default value
-    double basesize = context.tqlayoutUnitPtToPt( context.getBaseSize() );
+    double basesize = context.layoutUnitPtToPt( context.getBaseSize() );
     double size = style.scriptMinSize();
     switch ( m_scriptMinSizeType ) {
     case AbsoluteSize:
@@ -236,7 +236,7 @@ void StyleElement::setStyleSize( const ContextStyle& context, StyleAttributes& s
 double StyleElement::sizeFactor( const ContextStyle& context, SizeType st, 
                                  double length, double defvalue )
 {
-    double basesize = context.tqlayoutUnitPtToPt( context.getBaseSize() );
+    double basesize = context.layoutUnitPtToPt( context.getBaseSize() );
     switch ( st ) {
     case AbsoluteSize:
         return length / basesize;
diff --git a/lib/kformula/symbolelement.cc b/lib/kformula/symbolelement.cc
index 518fba2f..fb2eb69d 100644
--- a/lib/kformula/symbolelement.cc
+++ b/lib/kformula/symbolelement.cc
@@ -134,12 +134,12 @@ bool SymbolElement::accept( ElementVisitor* visitor )
 
 
 BasicElement* SymbolElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                      const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                      const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
 
         e = content->goToPos(cursor, handled, point, myPos);
         if (e != 0) {
@@ -192,7 +192,7 @@ BasicElement* SymbolElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void SymbolElement::calcSizes( const ContextStyle& context,
                                ContextStyle::TextStyle tstyle,
@@ -212,7 +212,7 @@ void SymbolElement::calcSizes( const ContextStyle& context,
     symbol->calcSizes(context, tstyle, factor, mySize);
     content->calcSizes( context, tstyle, istyle, style );
 
-    //symbol->scale(((double)tqparentSize)/symbol->getHeight()*2);
+    //symbol->scale(((double)parentSize)/symbol->getHeight()*2);
 
     luPixel upperWidth = 0;
     luPixel upperHeight = 0;
@@ -300,17 +300,17 @@ void SymbolElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void SymbolElement::draw( TQPainter& painter, const LuPixelRect& r,
                           const ContextStyle& context,
                           ContextStyle::TextStyle tstyle,
                           ContextStyle::IndexStyle istyle,
                           StyleAttributes& style,
-                          const LuPixelPoint& tqparentOrigin )
+                          const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -330,19 +330,19 @@ void SymbolElement::draw( TQPainter& painter, const LuPixelRect& r,
 #if 0
     painter.setBrush(TQt::NoBrush);
     painter.setPen(TQt::red);
-//     painter.drawRect( context.tqlayoutUnitToPixelX( myPos.x() ),
-//                       context.tqlayoutUnitToPixelY( myPos.y() ),
-//                       context.tqlayoutUnitToPixelX( getWidth() ),
-//                       context.tqlayoutUnitToPixelY( getHeight() ) );
-    painter.drawRect( context.tqlayoutUnitToPixelX( myPos.x()+symbol->getX() ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+symbol->getY() ),
-                      context.tqlayoutUnitToPixelX( symbol->getWidth() ),
-                      context.tqlayoutUnitToPixelY( symbol->getHeight() ) );
+//     painter.drawRect( context.layoutUnitToPixelX( myPos.x() ),
+//                       context.layoutUnitToPixelY( myPos.y() ),
+//                       context.layoutUnitToPixelX( getWidth() ),
+//                       context.layoutUnitToPixelY( getHeight() ) );
+    painter.drawRect( context.layoutUnitToPixelX( myPos.x()+symbol->getX() ),
+                      context.layoutUnitToPixelY( myPos.y()+symbol->getY() ),
+                      context.layoutUnitToPixelX( symbol->getWidth() ),
+                      context.layoutUnitToPixelY( symbol->getHeight() ) );
     painter.setPen(TQt::green);
-    painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x() ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+axis(context, tstyle) ),
-                      context.tqlayoutUnitToPixelX( myPos.x()+getWidth() ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+axis(context, tstyle) ) );
+    painter.drawLine( context.layoutUnitToPixelX( myPos.x() ),
+                      context.layoutUnitToPixelY( myPos.y()+axis(context, tstyle) ),
+                      context.layoutUnitToPixelX( myPos.x()+getWidth() ),
+                      context.layoutUnitToPixelY( myPos.y()+axis(context, tstyle) ) );
 #endif
 }
 
diff --git a/lib/kformula/symbolelement.h b/lib/kformula/symbolelement.h
index 799703a6..877c4493 100644
--- a/lib/kformula/symbolelement.h
+++ b/lib/kformula/symbolelement.h
@@ -54,7 +54,7 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     // drawing
     //
@@ -65,7 +65,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -74,15 +74,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
diff --git a/lib/kformula/textelement.cc b/lib/kformula/textelement.cc
index 24eae2d8..c42a6e2f 100644
--- a/lib/kformula/textelement.cc
+++ b/lib/kformula/textelement.cc
@@ -106,7 +106,7 @@ bool TextElement::isInvisible() const
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void TextElement::calcSizes( const ContextStyle& context, 
                              ContextStyle::TextStyle tstyle, 
@@ -120,7 +120,7 @@ void TextElement::calcSizes( const ContextStyle& context,
     setCharFamily( style.charFamily() );
 
     TQFont font = getFont( context, style );
-    double fontsize = context.tqlayoutUnitPtToPt( mySize );
+    double fontsize = context.layoutUnitPtToPt( mySize );
     double scriptsize = pow( style.scriptSizeMultiplier(), style.scriptLevel() );
     double size = fontsize * scriptsize;
     font.setPointSizeFloat( size < style.scriptMinSize() ? style.scriptMinSize() : size );
@@ -156,21 +156,21 @@ void TextElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
                         const ContextStyle& context,
                         ContextStyle::TextStyle tstyle,
                         ContextStyle::IndexStyle /*istyle*/,
                         StyleAttributes& style,
-                        const LuPixelPoint& tqparentOrigin )
+                        const LuPixelPoint& parentOrigin )
 {
     if ( character == applyFunctionChar || character == invisibleTimes || character == invisibleComma ) {
         return;
     }
 
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -184,7 +184,7 @@ void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
     double factor = style.sizeFactor();
     luPt mySize = context.getAdjustedSize( tstyle, factor );
     TQFont font = getFont( context, style );
-    double fontsize = context.tqlayoutUnitPtToPt( mySize );
+    double fontsize = context.layoutUnitPtToPt( mySize );
     double scriptsize = pow( style.scriptSizeMultiplier(), style.scriptLevel() );
     double size = fontsize * scriptsize;
     font.setPointSizeFloat( size < style.scriptMinSize() ? style.scriptMinSize() : size );
@@ -192,7 +192,7 @@ void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
 
     //kdDebug( DEBUGID ) << "TextElement::draw font=" << font.rawName() << endl;
     //kdDebug( DEBUGID ) << "TextElement::draw size=" << mySize << endl;
-    //kdDebug( DEBUGID ) << "TextElement::draw size=" << context.tqlayoutUnitToFontSize( mySize, false ) << endl;
+    //kdDebug( DEBUGID ) << "TextElement::draw size=" << context.layoutUnitToFontSize( mySize, false ) << endl;
     //kdDebug( DEBUGID ) << "TextElement::draw height: " << getHeight() << endl;
     //kdDebug( DEBUGID ) << "TextElement::draw width: " << getWidth() << endl;
     //kdDebug( DEBUGID ) << endl;
@@ -205,13 +205,13 @@ void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
 //         kdDebug() << "draw text: " << text[0].tqunicode()
 //                   << " " << painter.font().family().latin1()
 //                   << endl;
-        painter.fillRect( context.tqlayoutUnitToPixelX( tqparentOrigin.x() ),
-                          context.tqlayoutUnitToPixelY( tqparentOrigin.y() ),
-                          context.tqlayoutUnitToPixelX( getParent()->getWidth() ),
-                          context.tqlayoutUnitToPixelY( getParent()->getHeight() ),
+        painter.fillRect( context.layoutUnitToPixelX( parentOrigin.x() ),
+                          context.layoutUnitToPixelY( parentOrigin.y() ),
+                          context.layoutUnitToPixelX( getParent()->getWidth() ),
+                          context.layoutUnitToPixelY( getParent()->getHeight() ),
                           style.background() );
-        painter.drawText( context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getBaseline() ),
+        painter.drawText( context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y()+getBaseline() ),
                           text );
     }
     else {
@@ -226,17 +226,17 @@ void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
                 // baseline==0 glyphs without yet another flag.
                 bl = -( getHeight()/2 + context.axisHeight( tstyle, factor ) );
             }
-            painter.drawText( context.tqlayoutUnitToPixelX( myPos.x() ),
-                              context.tqlayoutUnitToPixelY( myPos.y()+bl ),
+            painter.drawText( context.layoutUnitToPixelX( myPos.x() ),
+                              context.layoutUnitToPixelY( myPos.y()+bl ),
                               TQString(ch) );
         }
         else {
             painter.setPen( TQPen( context.getErrorColor(),
-                                  context.tqlayoutUnitToPixelX( context.getLineWidth( factor ) ) ) );
-            painter.drawRect( context.tqlayoutUnitToPixelX( myPos.x() ),
-                              context.tqlayoutUnitToPixelY( myPos.y() ),
-                              context.tqlayoutUnitToPixelX( getWidth() ),
-                              context.tqlayoutUnitToPixelY( getHeight() ) );
+                                  context.layoutUnitToPixelX( context.getLineWidth( factor ) ) ) );
+            painter.drawRect( context.layoutUnitToPixelX( myPos.x() ),
+                              context.layoutUnitToPixelY( myPos.y() ),
+                              context.layoutUnitToPixelX( getWidth() ),
+                              context.layoutUnitToPixelY( getHeight() ) );
         }
 //    }
 
@@ -244,10 +244,10 @@ void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
     //painter.setBrush(TQt::NoBrush);
 //     if ( isSymbol() ) {
 //         painter.setPen( TQt::red );
-//         painter.drawRect( context.tqlayoutUnitToPixelX( myPos.x() ),
-//                           context.tqlayoutUnitToPixelX( myPos.y() ),
-//                           context.tqlayoutUnitToPixelX( getWidth() ),
-//                           context.tqlayoutUnitToPixelX( getHeight() ) );
+//         painter.drawRect( context.layoutUnitToPixelX( myPos.x() ),
+//                           context.layoutUnitToPixelX( myPos.y() ),
+//                           context.layoutUnitToPixelX( getWidth() ),
+//                           context.layoutUnitToPixelX( getHeight() ) );
 //         painter.setPen(TQt::green);
 //         painter.drawLine(myPos.x(), myPos.y()+axis( context, tstyle ),
 //                          myPos.x()+getWidth(), myPos.y()+axis( context, tstyle ));
@@ -527,7 +527,7 @@ void EmptyElement::calcSizes( const ContextStyle& context,
     //kdDebug( DEBUGID ) << "TextElement::calcSizes size=" << mySize << endl;
 
     TQFont font = context.getDefaultFont();
-    font.setPointSizeFloat( context.tqlayoutUnitPtToPt( mySize ) );
+    font.setPointSizeFloat( context.layoutUnitPtToPt( mySize ) );
 
     TQFontMetrics fm( font );
     TQChar ch = 'A';
@@ -542,9 +542,9 @@ void EmptyElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
                          ContextStyle::TextStyle /*tstyle*/,
                          ContextStyle::IndexStyle /*istyle*/,
                          StyleAttributes& /*style*/ ,
-                         const LuPixelPoint& tqparentOrigin )
+                         const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     /*
     if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
         return;
@@ -552,10 +552,10 @@ void EmptyElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
 
     if ( context.edit() ) {
         painter.setPen( context.getHelpColor() );
-        painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y() ),
-                          context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ) );
+        painter.drawLine( context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y() ),
+                          context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight() ) );
     }
 }
 
diff --git a/lib/kformula/textelement.h b/lib/kformula/textelement.h
index 0b97f441..48eb1d43 100644
--- a/lib/kformula/textelement.h
+++ b/lib/kformula/textelement.h
@@ -73,7 +73,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -82,15 +82,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
@@ -244,7 +244,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -253,15 +253,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
 
     /**
diff --git a/lib/kformula/tokenstyleelement.cc b/lib/kformula/tokenstyleelement.cc
index 43731425..3b1e6224 100644
--- a/lib/kformula/tokenstyleelement.cc
+++ b/lib/kformula/tokenstyleelement.cc
@@ -59,20 +59,20 @@ void TokenStyleElement::draw( TQPainter& painter, const LuPixelRect& r,
                          ContextStyle::TextStyle tstyle,
                          ContextStyle::IndexStyle istyle,
                          StyleAttributes& style,
-                         const LuPixelPoint& tqparentOrigin )
+                         const LuPixelPoint& parentOrigin )
 {
     setStyleSize( context, style );
     setStyleVariant( style );
     setStyleColor( style );
     setStyleBackground( style );
     if ( style.background() != TQt::color0 ) {
-        painter.fillRect( context.tqlayoutUnitToPixelX( tqparentOrigin.x() + getX() ),
-                          context.tqlayoutUnitToPixelY( tqparentOrigin.y() + getY() ),
-                          context.tqlayoutUnitToPixelX( getWidth() ),
-                          context.tqlayoutUnitToPixelY( getHeight() ),
+        painter.fillRect( context.layoutUnitToPixelX( parentOrigin.x() + getX() ),
+                          context.layoutUnitToPixelY( parentOrigin.y() + getY() ),
+                          context.layoutUnitToPixelX( getWidth() ),
+                          context.layoutUnitToPixelY( getHeight() ),
                           style.background() );
     }
-    inherited::draw( painter, r, context, tstyle, istyle, style, tqparentOrigin );
+    inherited::draw( painter, r, context, tstyle, istyle, style, parentOrigin );
     resetStyle( style );
 }
 
@@ -550,7 +550,7 @@ void TokenStyleElement::resetStyle( StyleAttributes& style )
 
 double TokenStyleElement::sizeFactor( const ContextStyle& context, double factor )
 {
-    double basesize = context.tqlayoutUnitPtToPt( context.getBaseSize() );
+    double basesize = context.layoutUnitPtToPt( context.getBaseSize() );
     switch ( m_mathSizeType ) {
     case AbsoluteSize:
         return m_mathSize / basesize;
diff --git a/lib/kformula/tokenstyleelement.h b/lib/kformula/tokenstyleelement.h
index db7d14f6..3e601ca8 100644
--- a/lib/kformula/tokenstyleelement.h
+++ b/lib/kformula/tokenstyleelement.h
@@ -48,7 +48,7 @@ public:
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
                        StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
 protected:
     virtual bool readAttributesFromMathMLDom( const TQDomElement &element );
diff --git a/lib/kofficecore/KoChild.h b/lib/kofficecore/KoChild.h
index b79f6802..4734bbd4 100644
--- a/lib/kofficecore/KoChild.h
+++ b/lib/kofficecore/KoChild.h
@@ -158,7 +158,7 @@ public:
 
   /**
    * @return true if the child part is an orthogonal rectangle relative
-   *         to its tqparents coordinate system.
+   *         to its parents coordinate system.
    */
   bool isRectangle() const;
 
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 695599d2..e9d985aa 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -222,7 +222,7 @@ void KoBrowserExtension::print()
         view->print( printer );
 }
 
-KoDocument::KoDocument( TQWidget * tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
+KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
     : KParts::ReadWritePart( tqparent, name )
 {
     if(s_documentList==0L)
@@ -247,7 +247,7 @@ KoDocument::KoDocument( TQWidget * tqparentWidget, const char *widgetName, TQObj
 
     if ( singleViewMode )
     {
-        d->m_wrapperWidget = new KoViewWrapperWidget( tqparentWidget, widgetName );
+        d->m_wrapperWidget = new KoViewWrapperWidget( parentWidget, widgetName );
         setWidget( d->m_wrapperWidget );
         kdDebug(30003) << "creating KoBrowserExtension" << endl;
         (void) new KoBrowserExtension( this ); // ## only if embedded into a browser?
diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h
index 0499ab6c..4051cca6 100644
--- a/lib/kofficecore/KoDocument.h
+++ b/lib/kofficecore/KoDocument.h
@@ -71,7 +71,7 @@ public:
      *  Constructor.
      * The first 4 arguments are the same as the ones passed to KParts::Factory::createPart.
      *
-     * @param tqparentWidget the tqparent widget, in case we create a wrapper widget
+     * @param parentWidget the tqparent widget, in case we create a wrapper widget
      *        (in single view mode).
      *        Usually the first argument passed by KParts::Factory::createPart.
      * @param widgetName name of the widget.
@@ -81,12 +81,12 @@ public:
      *        pass a meaningful name here which matches the pattern [A-Za-z_][A-Za-z_0-9]*.
      * @param singleViewMode determines whether the document may only have one view. In this case
      *        the @p tqparent must be a TQWidget derived class. KoDocument will then create a wrapper widget
-     *        (KoViewWrapperWidget) which is a child of @p tqparentWidget.
+     *        (KoViewWrapperWidget) which is a child of @p parentWidget.
      *        This widget can be retrieved by calling widget().
      *
      * @todo explain what the purpose of widgetName is.
      */
-    KoDocument( TQWidget* tqparentWidget,
+    KoDocument( TQWidget* parentWidget,
                 const char* widgetName,
                 TQObject* tqparent,
                 const char* name,
@@ -459,9 +459,9 @@ public:
      * Initializes an empty document (display the template dialog!).
      * You have to overload this method to initialize all your document variables.
      * @param flags see InitDocFlags
-     * @param tqparentWidget the widget this document belongs with
+     * @param parentWidget the widget this document belongs with
      */
-    virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0) = 0;
+    virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0) = 0;
 
     /**
      * Creates and shows the start up widget.
@@ -798,12 +798,12 @@ public:
     /**
      * Indicates that this document is currently viewed
      * and thus should control the title caption.
-     * Also resets current flag for all tqparents.
+     * Also resets current flag for all parents.
      */
     void setCurrent( bool on = true );
 
     /**
-     * Sets current flag for this document and all its tqparents
+     * Sets current flag for this document and all its parents
      */
     void forceCurrent( bool on );
     bool isCurrent() const;
diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp
index 308493ad..27d4a673 100644
--- a/lib/kofficecore/KoDocumentChild.cpp
+++ b/lib/kofficecore/KoDocumentChild.cpp
@@ -102,7 +102,7 @@ KoDocument *KoDocumentChild::document() const
   return d->m_doc;
 }
 
-KoDocument* KoDocumentChild::tqparentDocument() const
+KoDocument* KoDocumentChild::parentDocument() const
 {
   return d->m_parent;
 }
@@ -349,9 +349,9 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr
 
     // see KoDocument::insertChild for an explanation what's going on
     // now :-)
-    if ( tqparentDocument() )
+    if ( parentDocument() )
     {
-        KoDocument *tqparent = tqparentDocument();
+        KoDocument *tqparent = parentDocument();
 
         if ( tqparent->manager() && tqparent->manager()->parts() )
         {
diff --git a/lib/kofficecore/KoDocumentChild.h b/lib/kofficecore/KoDocumentChild.h
index 228122dc..491f9b2d 100644
--- a/lib/kofficecore/KoDocumentChild.h
+++ b/lib/kofficecore/KoDocumentChild.h
@@ -73,7 +73,7 @@ public:
    *
    * @see KoDocument
    */
-  virtual KoDocument *tqparentDocument() const; // TODO: remove virtual, makes no sense
+  virtual KoDocument *parentDocument() const; // TODO: remove virtual, makes no sense
 
   virtual KoDocument* hitTest( const TQPoint& p, const TQWMatrix& _matrix = TQWMatrix() );
 
diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp
index ecade093..e10e624b 100644
--- a/lib/kofficecore/KoFilterChain.cpp
+++ b/lib/kofficecore/KoFilterChain.cpp
@@ -46,7 +46,7 @@ KoFilterChain::ChainLink::ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr fi
 {
 }
 
-KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const tqparentChainLink )
+KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const parentChainLink )
 {
     if ( !m_filterEntry ) {
         kdError( 30500 ) << "This filter entry is null. Strange stuff going on." << endl;
@@ -60,8 +60,8 @@ KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const Chain
         return KoFilter::CreationError;
     }
 
-    if ( tqparentChainLink )
-        setupCommunication( tqparentChainLink->m_filter );
+    if ( parentChainLink )
+        setupCommunication( parentChainLink->m_filter );
 
     KoFilter::ConversiontqStatus status = m_filter->convert( m_from, m_to );
     delete m_filter;
@@ -81,22 +81,22 @@ int KoFilterChain::ChainLink::lruPartIndex() const
     return -1;
 }
 
-void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const tqparentFilter ) const
+void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentFilter ) const
 {
     // progress information
     TQObject::connect( m_filter, TQT_SIGNAL( sigProgress( int ) ),
                       m_chain->manager(), TQT_SIGNAL( sigProgress( int ) ) );
 
-    if ( !tqparentFilter )
+    if ( !parentFilter )
         return;
 
-    const TQMetaObject* const tqparent = tqparentFilter->tqmetaObject();
+    const TQMetaObject* const tqparent = parentFilter->tqmetaObject();
     const TQMetaObject* const child = m_filter->tqmetaObject();
     if ( !tqparent || !child )
         return;
 
-    setupConnections( tqparentFilter, tqparent->signalNames(), m_filter, child->slotNames() );
-    setupConnections( m_filter, child->signalNames(), tqparentFilter, tqparent->slotNames() );
+    setupConnections( parentFilter, tqparent->signalNames(), m_filter, child->slotNames() );
+    setupConnections( m_filter, child->signalNames(), parentFilter, tqparent->slotNames() );
 }
 
 void KoFilterChain::ChainLink::setupConnections( const KoFilter* sender, const TQStrList& sigs,
@@ -139,15 +139,15 @@ KoFilter::ConversiontqStatus KoFilterChain::invokeChain()
     int count = m_chainLinks.count();
 
     // This is needed due to nasty Microsoft design
-    const ChainLink* tqparentChainLink = 0;
+    const ChainLink* parentChainLink = 0;
     if ( filterManagerParentChain() )
-        tqparentChainLink = filterManagerParentChain()->m_chainLinks.current();
+        parentChainLink = filterManagerParentChain()->m_chainLinks.current();
 
     // No iterator here, as we need m_chainLinks.current() in outputDocument()
     m_chainLinks.first();
     for ( ; count > 1 && m_chainLinks.current() && status == KoFilter::OK;
           m_chainLinks.next(), --count ) {
-        status = m_chainLinks.current()->invokeFilter( tqparentChainLink );
+        status = m_chainLinks.current()->invokeFilter( parentChainLink );
         m_state = Middle;
         manageIO();
     }
@@ -162,7 +162,7 @@ KoFilter::ConversiontqStatus KoFilterChain::invokeChain()
             m_state |= End;
         else
             m_state = End;
-        status = m_chainLinks.current()->invokeFilter( tqparentChainLink );
+        status = m_chainLinks.current()->invokeFilter( parentChainLink );
         manageIO();
     }
 
@@ -373,7 +373,7 @@ int KoFilterChain::filterManagerDirection() const
 
 KoFilterChain* const KoFilterChain::filterManagerParentChain() const
 {
-    return m_manager->tqparentChain();
+    return m_manager->parentChain();
 }
 
 void KoFilterChain::manageIO()
diff --git a/lib/kofficecore/KoFilterChain.h b/lib/kofficecore/KoFilterChain.h
index 2936ae40..7760a217 100644
--- a/lib/kofficecore/KoFilterChain.h
+++ b/lib/kofficecore/KoFilterChain.h
@@ -182,7 +182,7 @@ private:
         ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr filterEntry,
                    const TQCString& from, const TQCString& to );
 
-        KoFilter::ConversiontqStatus invokeFilter( const ChainLink* const tqparentChainLink );
+        KoFilter::ConversiontqStatus invokeFilter( const ChainLink* const parentChainLink );
 
         TQCString from() const { return m_from; }
         TQCString to() const { return m_to; }
@@ -198,7 +198,7 @@ private:
         ChainLink( const ChainLink& rhs );
         ChainLink& operator=( const ChainLink& rhs );
 
-        void setupCommunication( const KoFilter* const tqparentFilter ) const;
+        void setupCommunication( const KoFilter* const parentFilter ) const;
         void setupConnections( const KoFilter* sender, const TQStrList& sigs,
                                const KoFilter* receiver, const TQStrList& sl0ts ) const;
 
diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp
index 46c20c2f..bc4d48bc 100644
--- a/lib/kofficecore/KoFilterManager.cpp
+++ b/lib/kofficecore/KoFilterManager.cpp
@@ -125,8 +125,8 @@ KoFilterManager::KoFilterManager( KoDocument* document ) :
 
 
 KoFilterManager::KoFilterManager( const TQString& url, const TQCString& mimetypeHint,
-                                  KoFilterChain* const tqparentChain ) :
-    m_document( 0 ), m_parentChain( tqparentChain ), m_importUrl( url ), m_importUrlMimetypeHint( mimetypeHint ),
+                                  KoFilterChain* const parentChain ) :
+    m_document( 0 ), m_parentChain( parentChain ), m_importUrl( url ), m_importUrlMimetypeHint( mimetypeHint ),
     m_graph( "" ), d( 0 )
 {
     d = new KoFilterManager::Private;
diff --git a/lib/kofficecore/KoFilterManager.h b/lib/kofficecore/KoFilterManager.h
index 8405f49b..de75bf27 100644
--- a/lib/kofficecore/KoFilterManager.h
+++ b/lib/kofficecore/KoFilterManager.h
@@ -66,11 +66,11 @@ public:
      *        to specify this information only if the automatic detection will
      *        fail because e.g. you saved an embedded stream to a *.tmp file.
      *        Most likely you do not have to care about that.
-     * @param tqparentChain The tqparent filter chain of this filter manager. Used
+     * @param parentChain The tqparent filter chain of this filter manager. Used
      *        to allow embedding for filters. Most likely you do not have to care.
      */
     KoFilterManager( const TQString& url, const TQCString& mimetypeHint = "",
-                     KoFilterChain* const tqparentChain = 0 );
+                     KoFilterChain* const parentChain = 0 );
 
     virtual ~KoFilterManager();
 
@@ -152,7 +152,7 @@ private:
     friend int KoFilterChain::filterManagerDirection() const;
     int direction() const { return static_cast<int>( m_direction ); }
     friend KoFilterChain* const KoFilterChain::filterManagerParentChain() const;
-    KoFilterChain* const tqparentChain() const { return m_parentChain; }
+    KoFilterChain* const parentChain() const { return m_parentChain; }
 
     // Private API
     KoFilterManager( const KoFilterManager& rhs );
diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp
index b6f77b8a..e8722eaa 100644
--- a/lib/kofficecore/KoFrame.cpp
+++ b/lib/kofficecore/KoFrame.cpp
@@ -251,7 +251,7 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
 {
   if ( d->m_mode == 0 )
   {
-      TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+      TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
       move( TQPoint( p.x() + d->m_framePos.x() - d->m_mousePressPos.x(),
 		    p.y() + d->m_framePos.y() - d->m_mousePressPos.y() ) );
       // The other modes change the tqgeometry so they call resizeEvent.
@@ -261,7 +261,7 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
   }
   else if ( d->m_mode == 1 )
   {
-      TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+      TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
       int w = TQMIN( TQMAX( d->m_width + d->m_mousePressPos.x() - p.x(), minimumWidth() ), maximumWidth() );
       int h = TQMIN( TQMAX( d->m_height + d->m_mousePressPos.y() - p.y(), minimumHeight() ), maximumHeight() );
       setGeometry( d->m_framePos.x() - w + d->m_width,
@@ -269,7 +269,7 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
   }
   else if ( d->m_mode == 2 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int w = TQMIN( TQMAX( d->m_width + d->m_mousePressPos.x() - p.x(), minimumWidth() ), maximumWidth() );
     int h = TQMIN( TQMAX( d->m_height - d->m_mousePressPos.y() + p.y(), minimumHeight() ), maximumHeight() );
     setGeometry( d->m_framePos.x() - w + d->m_width,
@@ -277,14 +277,14 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
   }
   else if ( d->m_mode == 3 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int w = TQMIN( TQMAX( d->m_width - d->m_mousePressPos.x() + p.x(), minimumWidth() ), maximumWidth() );
     int h = TQMIN( TQMAX( d->m_height - d->m_mousePressPos.y() + p.y(), minimumHeight() ), maximumHeight() );
     resize( w, h );
   }
   else if ( d->m_mode == 4 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int w = TQMIN( TQMAX( d->m_width - d->m_mousePressPos.x() + p.x(), minimumWidth() ), maximumWidth() );
     int h = TQMIN( TQMAX( d->m_height + d->m_mousePressPos.y() - p.y(), minimumHeight() ), maximumHeight() );
     setGeometry( d->m_framePos.x(),
@@ -292,27 +292,27 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
   }
   else if ( d->m_mode == 5 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int h = TQMIN( TQMAX( d->m_height + d->m_mousePressPos.y() - p.y(), minimumHeight() ), maximumHeight() );
     setGeometry( d->m_framePos.x(),
 		 d->m_framePos.y() - h + d->m_height, d->m_width, h );
   }
   else if ( d->m_mode == 6 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int h = TQMIN( TQMAX( d->m_height - d->m_mousePressPos.y() + p.y(), minimumHeight() ), maximumHeight() );
     resize( d->m_width, h );
   }
   else if ( d->m_mode == 7 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int w = TQMIN( TQMAX( d->m_width + d->m_mousePressPos.x() - p.x(), minimumWidth() ), maximumWidth() );
     setGeometry( d->m_framePos.x() - w + d->m_width,
 		 d->m_framePos.y(), w, d->m_height );
   }
   else if ( d->m_mode == 8 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int w = TQMIN( TQMAX( d->m_width - d->m_mousePressPos.x() + p.x(), minimumWidth() ), maximumWidth() );
     resize( w, d->m_height );
   }
diff --git a/lib/kofficecore/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp
index 0ee2e730..68b8477a 100644
--- a/lib/kofficecore/KoGenStyles.cpp
+++ b/lib/kofficecore/KoGenStyles.cpp
@@ -35,29 +35,29 @@ TQString KoGenStyles::lookup( const KoGenStyle& style, const TQString& name, int
     if ( it == m_styleMap.end() ) {
         // Not found, try if this style is in fact equal to its tqparent (the find above
         // wouldn't have found it, due to m_parentName being set).
-        if ( !style.tqparentName().isEmpty() ) {
+        if ( !style.parentName().isEmpty() ) {
             KoGenStyle testStyle( style );
-            const KoGenStyle* tqparentStyle = this->style( style.tqparentName() ); // ## linear search
-            if( !tqparentStyle ) {
-                kdDebug(30003) << "KoGenStyles::lookup(" << name << "): tqparent style '" << style.tqparentName() << "' not found in collection" << endl;
+            const KoGenStyle* parentStyle = this->style( style.parentName() ); // ## linear search
+            if( !parentStyle ) {
+                kdDebug(30003) << "KoGenStyles::lookup(" << name << "): tqparent style '" << style.parentName() << "' not found in collection" << endl;
             } else {
-                if ( testStyle.m_familyName != tqparentStyle->m_familyName )
+                if ( testStyle.m_familyName != parentStyle->m_familyName )
                 {
-                    kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") tqparent style '" << style.tqparentName() << "' has a different family: " << tqparentStyle->m_familyName << endl;
+                    kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") tqparent style '" << style.parentName() << "' has a different family: " << parentStyle->m_familyName << endl;
                 }
 
-                testStyle.m_parentName = tqparentStyle->m_parentName;
+                testStyle.m_parentName = parentStyle->m_parentName;
                 // Exclude the type from the comparison. It's ok for an auto style
                 // to have a user style as tqparent; they can still be identical
-                testStyle.m_type = tqparentStyle->m_type;
+                testStyle.m_type = parentStyle->m_type;
                 // Also it's ok to not have the display name of the tqparent style
                 // in the auto style
-                TQMap<TQString, TQString>::const_iterator it = tqparentStyle->m_attributes.tqfind( "style:display-name" );
-                if ( it != tqparentStyle->m_attributes.end() )
+                TQMap<TQString, TQString>::const_iterator it = parentStyle->m_attributes.tqfind( "style:display-name" );
+                if ( it != parentStyle->m_attributes.end() )
                     testStyle.addAttribute( "style:display-name", *it );
 
-                if ( *tqparentStyle == testStyle )
-                    return style.tqparentName();
+                if ( *parentStyle == testStyle )
+                    return style.parentName();
             }
         }
 
@@ -173,8 +173,8 @@ static int compareMap( const TQMap<TQString, TQString>& map1, const TQMap<TQStri
 
 
 KoGenStyle::KoGenStyle( int type, const char* familyName,
-                        const TQString& tqparentName )
-    : m_type( type ), m_familyName( familyName ), m_parentName( tqparentName ),
+                        const TQString& parentName )
+    : m_type( type ), m_familyName( familyName ), m_parentName( parentName ),
       m_autoStyleInStylesDotXml( false ), m_defaultStyle( false )
 {
 }
@@ -184,14 +184,14 @@ KoGenStyle::~KoGenStyle()
 }
 
 void KoGenStyle::writeStyleProperties( KoXmlWriter* writer, PropertyType i,
-                                       const char* elementName, const KoGenStyle* tqparentStyle ) const
+                                       const char* elementName, const KoGenStyle* parentStyle ) const
 {
     if ( !m_properties[i].isEmpty() ) {
         writer->startElement( elementName );
         TQMap<TQString, TQString>::const_iterator it = m_properties[i].begin();
         const TQMap<TQString, TQString>::const_iterator end = m_properties[i].end();
         for ( ; it != end; ++it ) {
-            if ( !tqparentStyle || tqparentStyle->property( it.key(), i ) != it.data() )
+            if ( !parentStyle || parentStyle->property( it.key(), i ) != it.data() )
                 writer->addAttribute( it.key().utf8(), it.data().utf8() );
         }
         writer->endElement();
@@ -202,19 +202,19 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
 {
     //kdDebug(30003) << "writing out style " << name << " display-name=" << m_attributes["style:display-name"] << " family=" << m_familyName << endl;
     writer->startElement( elementName );
-    const KoGenStyle* tqparentStyle = 0;
+    const KoGenStyle* parentStyle = 0;
     if ( !m_defaultStyle ) {
         if ( !drawElement )
             writer->addAttribute( "style:name", name );
         else
             writer->addAttribute( "draw:name", name );
         if ( !m_parentName.isEmpty() ) {
-            tqparentStyle = styles.style( m_parentName );
-            if ( tqparentStyle && m_familyName.isEmpty() ) {
+            parentStyle = styles.style( m_parentName );
+            if ( parentStyle && m_familyName.isEmpty() ) {
                 // get family from tqparent style, just in case
                 // Note: this is saving code, don't convert to attributeNS!
                 const_cast<KoGenStyle *>( this )->
-                    m_familyName = tqparentStyle->attribute( "style:family" ).latin1();
+                    m_familyName = parentStyle->attribute( "style:family" ).latin1();
                 //kdDebug(30003) << "Got familyname " << m_familyName << " from tqparent" << endl;
             }
             writer->addAttribute( "style:tqparent-style-name", m_parentName );
@@ -234,9 +234,9 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
 #if 0 // #ifndef NDEBUG
     kdDebug() << "style: " << name << endl;
     printDebug();
-    if ( tqparentStyle ) {
+    if ( parentStyle ) {
         kdDebug() << " tqparent: " << m_parentName << endl;
-        tqparentStyle->printDebug();
+        parentStyle->printDebug();
     }
 #endif
 
@@ -247,8 +247,8 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
     TQMap<TQString, TQString>::const_iterator it = m_attributes.begin();
     for ( ; it != m_attributes.end(); ++it ) {
         bool writeit = true;
-        if ( tqparentStyle && it.key() != "style:family" // always write the family out
-             && tqparentStyle->attribute( it.key() ) == it.data() )
+        if ( parentStyle && it.key() != "style:family" // always write the family out
+             && parentStyle->attribute( it.key() ) == it.data() )
             writeit = false;
         if ( writeit )
             writer->addAttribute( it.key().utf8(), it.data().utf8() );
@@ -261,27 +261,27 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
             writer->startElement( propertiesElementName ); // e.g. paragraph-properties
         it = m_properties[i].begin();
         for ( ; it != m_properties[i].end(); ++it ) {
-            if ( !tqparentStyle || tqparentStyle->property( it.key(), i ) != it.data() )
+            if ( !parentStyle || parentStyle->property( it.key(), i ) != it.data() )
                 writer->addAttribute( it.key().utf8(), it.data().utf8() );
         }
         i = KoGenStyle::ChildElement;
         it = m_properties[i].begin();
         for ( ; it != m_properties[i].end(); ++it ) {
-            if ( !tqparentStyle || tqparentStyle->property( it.key(), i ) != it.data() ) {
+            if ( !parentStyle || parentStyle->property( it.key(), i ) != it.data() ) {
                 writer->addCompleteElement( it.data().utf8() );
             }
         }
         if ( createPropertiesTag )
             writer->endElement();
     }
-    writeStyleProperties( writer, KoGenStyle::GraphicType, "style:graphic-properties", tqparentStyle );
-    writeStyleProperties( writer, KoGenStyle::ParagraphType, "style:paragraph-properties", tqparentStyle );
-    writeStyleProperties( writer, KoGenStyle::TextType, "style:text-properties", tqparentStyle );
+    writeStyleProperties( writer, KoGenStyle::GraphicType, "style:graphic-properties", parentStyle );
+    writeStyleProperties( writer, KoGenStyle::ParagraphType, "style:paragraph-properties", parentStyle );
+    writeStyleProperties( writer, KoGenStyle::TextType, "style:text-properties", parentStyle );
 
     // And now the style maps
     for ( uint i = 0; i < m_maps.count(); ++i ) {
         bool writeit = true;
-        if ( tqparentStyle && compareMap( m_maps[i], tqparentStyle->m_maps[i] ) == 0 )
+        if ( parentStyle && compareMap( m_maps[i], parentStyle->m_maps[i] ) == 0 )
             writeit = false;
         if ( writeit ) {
             writer->startElement( "style:map" );
diff --git a/lib/kofficecore/KoGenStyles.h b/lib/kofficecore/KoGenStyles.h
index 17771c69..ad25609e 100644
--- a/lib/kofficecore/KoGenStyles.h
+++ b/lib/kofficecore/KoGenStyles.h
@@ -216,10 +216,10 @@ public:
      * @param familyName The value for style:family, e.g. text, paragraph, graphic etc.
      * The family is for style:style elements only; number styles and list styles don't have one.
      *
-     * @param tqparentName If set, name of the tqparent style from which this one inherits.
+     * @param parentName If set, name of the tqparent style from which this one inherits.
      */
     explicit KoGenStyle( int type = 0, const char* familyName = 0,
-                         const TQString& tqparentName = TQString() );
+                         const TQString& parentName = TQString() );
     ~KoGenStyle();
 
     /*
@@ -250,7 +250,7 @@ public:
     const char* familyName() const { return m_familyName.data(); }
 
     /// Return the name of style's tqparent, if set
-    TQString tqparentName() const { return m_parentName; }
+    TQString parentName() const { return m_parentName; }
 
     /**
      *  @brief The types of properties
@@ -434,7 +434,7 @@ private:
     }
 
     void writeStyleProperties( KoXmlWriter* writer, PropertyType i,
-                               const char* elementName, const KoGenStyle* tqparentStyle ) const;
+                               const char* elementName, const KoGenStyle* parentStyle ) const;
 
 #ifndef NDEBUG
     void printDebug() const;
diff --git a/lib/kofficecore/KoOasisLoadingContext.cpp b/lib/kofficecore/KoOasisLoadingContext.cpp
index e5082dc8..3db850e4 100644
--- a/lib/kofficecore/KoOasisLoadingContext.cpp
+++ b/lib/kofficecore/KoOasisLoadingContext.cpp
@@ -68,21 +68,21 @@ void KoOasisLoadingContext::addStyles( const TQDomElement* style, const char* fa
 {
     Q_ASSERT( style );
     if ( !style ) return;
-    // this recursive function is necessary as tqparent styles can have tqparents themselves
+    // this recursive function is necessary as tqparent styles can have parents themselves
     if ( style->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) ) {
-        const TQString tqparentStyleName = style->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() );
-        const TQDomElement* tqparentStyle = 0;
+        const TQString parentStyleName = style->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() );
+        const TQDomElement* parentStyle = 0;
         if ( usingStylesAutoStyles ) {
             // When loading something from styles.xml, look into the styles.xml auto styles first
-            tqparentStyle = m_styles.findStyleAutoStyle( tqparentStyleName, family );
+            parentStyle = m_styles.findStyleAutoStyle( parentStyleName, family );
             // and fallback to looking at styles(), which includes the user styles from styles.xml
         }
-        if ( !tqparentStyle )
-            tqparentStyle = m_styles.findStyle( tqparentStyleName, family );
-        if ( tqparentStyle )
-            addStyles( tqparentStyle, family, usingStylesAutoStyles );
+        if ( !parentStyle )
+            parentStyle = m_styles.findStyle( parentStyleName, family );
+        if ( parentStyle )
+            addStyles( parentStyle, family, usingStylesAutoStyles );
         else
-            kdWarning(32500) << "Parent style not found: " << tqparentStyleName << endl;
+            kdWarning(32500) << "Parent style not found: " << parentStyleName << endl;
     }
     else if ( family ) {
         const TQDomElement* def = m_styles.defaultStyle( family );
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index b8c0c098..fd42bcf3 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -224,7 +224,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
     TQString text;
 
     if (w->inherits("TQViewportWidget")) {
-        w = w->tqparentWidget();
+        w = w->parentWidget();
         if (!w) return false;
     }
 
diff --git a/lib/kofficecore/KoStyleStack.cpp b/lib/kofficecore/KoStyleStack.cpp
index 22799209..9920c289 100644
--- a/lib/kofficecore/KoStyleStack.cpp
+++ b/lib/kofficecore/KoStyleStack.cpp
@@ -258,7 +258,7 @@ bool KoStyleStack::isUserStyle( const TQDomElement& e, const TQString& family )
 {
     if ( e.attributeNS( m_styleNSURI, "family", TQString() ) != family )
         return false;
-    const TQDomElement tqparent = e.tqparentNode().toElement();
+    const TQDomElement tqparent = e.parentNode().toElement();
     //kdDebug(30003) << k_funcinfo << "tagName=" << e.tagName() << " tqparent-tagName=" << tqparent.tagName() << endl;
     return tqparent.localName() == "styles" /*&& tqparent.namespaceURI() == KoXmlNS::office*/;
 }
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index cfb508a4..cebd61be 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -361,7 +361,7 @@ void KoView::partActivateEvent( KParts::PartActivateEvent *event )
       emit childDeactivated( child );
     }
     else
-      emit tqinvalidated();
+      emit invalidated();
   }
   else
     emit activated( event->activated() );
@@ -390,7 +390,7 @@ void KoView::partSelectEvent( KParts::PartSelectEvent *event )
       emit childUnselected( child );
     }
     else
-      emit tqinvalidated();
+      emit invalidated();
   }
   else
     emit selected( event->selected() );
@@ -723,20 +723,20 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView )
   m_parentView = _parentView;
   m_child = child;
 
-  m_frame = new KoFrame( tqparentView()->canvas() );
+  m_frame = new KoFrame( parentView()->canvas() );
   KoView *view = child->document()->createView( m_frame );
   view->setXMLGUIBuildDocument( child->document()->viewBuildDocument( view ) );
 
-  view->setPartManager( tqparentView()->partManager() );
+  view->setPartManager( parentView()->partManager() );
 
   // hack? (Werner)
-  view->setZoom( tqparentView()->zoom() * TQMAX(child->xScaling(), child->yScaling()) );
+  view->setZoom( parentView()->zoom() * TQMAX(child->xScaling(), child->yScaling()) );
 
   m_frame->setView( view );
   m_frame->show();
   m_frame->raise();
 
-  tqparentView()->canvasAddChild( this );
+  parentView()->canvasAddChild( this );
 
 
   /*
@@ -764,7 +764,7 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView )
   // also called right after activation.
 
   connect( view, TQT_SIGNAL( activated( bool ) ),
-           tqparentView(), TQT_SLOT( slotChildActivated( bool ) ) );
+           parentView(), TQT_SLOT( slotChildActivated( bool ) ) );
 }
 
 KoViewChild::~KoViewChild()
@@ -782,8 +782,8 @@ void KoViewChild::slotFrameGeometryChanged()
   // Set our tqgeometry from the frame tqgeometry (R2 reversed)
   TQRect geom = m_frame->tqgeometry();
   int b = m_frame->border();
-  TQRect borderRect( geom.x() + b + tqparentView()->canvasXOffset(),
-                    geom.y() + b + tqparentView()->canvasYOffset(),
+  TQRect borderRect( geom.x() + b + parentView()->canvasXOffset(),
+                    geom.y() + b + parentView()->canvasYOffset(),
                     geom.width() - b * 2,
                     geom.height() - b * 2 );
   setGeometry( borderRect );
@@ -791,14 +791,14 @@ void KoViewChild::slotFrameGeometryChanged()
   if(m_child)
   {
     // Set the child tqgeometry from the frame tqgeometry (R1 reversed)
-    TQRect borderLessRect( geom.x() + m_frame->leftBorder() + tqparentView()->canvasXOffset(),
-                          geom.y() + m_frame->topBorder() + tqparentView()->canvasYOffset(),
+    TQRect borderLessRect( geom.x() + m_frame->leftBorder() + parentView()->canvasXOffset(),
+                          geom.y() + m_frame->topBorder() + parentView()->canvasYOffset(),
                           geom.width() - m_frame->leftBorder() - m_frame->rightBorder(),
                           geom.height() - m_frame->topBorder() - m_frame->bottomBorder() );
 
     // We don't want to trigger slotDocGeometryChanged again
     lock();
-    TQRect childGeom = tqparentView()->reverseViewTransformations( borderLessRect );
+    TQRect childGeom = parentView()->reverseViewTransformations( borderLessRect );
     kdDebug() << "KoChild::slotFrameGeometryChanged child tqgeometry "
               << ( tqgeometry() == childGeom ? "already " : "set to " )
               << childGeom << endl;
@@ -813,9 +813,9 @@ void KoViewChild::slotDocGeometryChanged()
       return;
   // Set frame tqgeometry from child tqgeometry (R1)
   // The frame's resizeEvent will call slotFrameGeometryChanged.
-  TQRect geom = tqparentView()->applyViewTransformations( m_child->tqgeometry() );
-  TQRect borderRect( geom.x() - m_frame->leftBorder() - tqparentView()->canvasXOffset(),
-                    geom.y() - m_frame->topBorder() - tqparentView()->canvasYOffset(),
+  TQRect geom = parentView()->applyViewTransformations( m_child->tqgeometry() );
+  TQRect borderRect( geom.x() - m_frame->leftBorder() - parentView()->canvasXOffset(),
+                    geom.y() - m_frame->topBorder() - parentView()->canvasYOffset(),
                     geom.width() + m_frame->leftBorder() + m_frame->rightBorder(),
                     geom.height() + m_frame->topBorder() + m_frame->bottomBorder() );
   kdDebug() << "KoViewChild::slotDocGeometryChanged frame tqgeometry "
diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h
index dcab6745..42d78fb6 100644
--- a/lib/kofficecore/KoView.h
+++ b/lib/kofficecore/KoView.h
@@ -438,7 +438,7 @@ signals:
 
   void regionInvalidated( const TQRegion &region, bool erase );
 
-  void tqinvalidated();
+  void invalidated();
 
 // KDE invents public signals :)
 #undef signals
@@ -479,7 +479,7 @@ public:
   virtual ~KoViewChild();
 
   KoDocumentChild *documentChild() const { return m_child; }
-  KoView *tqparentView() const { return m_parentView; }
+  KoView *parentView() const { return m_parentView; }
   KoFrame *frame() const { return m_frame; }
 
   void setInitialFrameGeometry();
diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp
index 323d0ad6..371b4d29 100644
--- a/lib/kofficecore/KoXmlReader.cpp
+++ b/lib/kofficecore/KoXmlReader.cpp
@@ -305,7 +305,7 @@ KoXmlNodeData::KoXmlNodeData()
   fastLoading = false;
 
   // assume true, it will be set to false by XML parser when this node
-  // aptqparently has tqchildren AND the tqchildren are not loaded
+  // apparently has tqchildren AND the tqchildren are not loaded
   loaded = true;
 }
 
@@ -1107,7 +1107,7 @@ KoXmlDocument KoXmlNode::ownerDocument() const
   return KoXmlDocument( node );
 }
 
-KoXmlNode KoXmlNode::tqparentNode() const
+KoXmlNode KoXmlNode::parentNode() const
 {
   return d->tqparent ? KoXmlNode( d->tqparent ) : KoXmlNode();
 }
@@ -1519,7 +1519,7 @@ TQString* errorMsg, int* errorLine, int* errorColumn )
   reader.setFeature( "http://xml.org/sax/features/namespace-prefixes", !namespaceProcessing );
   reader.setFeature( "http://trolltech.com/xml/features/report-whitespace-only-CharData", false );
 
-  // FIXME this hack is aptqparently private
+  // FIXME this hack is apparently private
   //reader.setUndefEntityInAttrHack(true);
 
   TQXmlInputSource source( device );
diff --git a/lib/kofficecore/KoXmlReader.h b/lib/kofficecore/KoXmlReader.h
index 919e566b..d4505398 100644
--- a/lib/kofficecore/KoXmlReader.h
+++ b/lib/kofficecore/KoXmlReader.h
@@ -101,7 +101,7 @@ public:
   virtual TQString localName() const;
 
   KoXmlDocument ownerDocument() const;
-  KoXmlNode tqparentNode() const;
+  KoXmlNode parentNode() const;
 
   bool hasChildNodes() const;
   KoXmlNode firstChild() const;
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index 39f95948..a45e1334 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -412,8 +412,8 @@ void KKbdAccessExtensions::showIcon()
         TQDockWindow* dockWindow = dynamic_cast<TQDockWindow *>(d->panel);
         p = dockWindow->pos();
         if (dockWindow->area()) {
-            // kdDebug() << "KKbdAccessExtensions::showIcon: pos = " << p << " of window = " << dockWindow->tqparentWidget()->name() << endl;
-            p = dockWindow->tqparentWidget()->mapTo(dockWindow->tqtopLevelWidget(), p);
+            // kdDebug() << "KKbdAccessExtensions::showIcon: pos = " << p << " of window = " << dockWindow->parentWidget()->name() << endl;
+            p = dockWindow->parentWidget()->mapTo(dockWindow->tqtopLevelWidget(), p);
             // kdDebug() << "KKbdAccessExtensions::showIcon: mapTo = " << p << " of window = " << dockWindow->tqtopLevelWidget()->name() << endl;
             // TODO: How to get the handle width?
             if (d->handleNdx == 1) {
diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui
index 056cd852..c29e4a46 100644
--- a/lib/kofficecore/koDetailsPaneBase.ui
+++ b/lib/kofficecore/koDetailsPaneBase.ui
@@ -228,8 +228,8 @@
     <tabstop>m_alwaysUseCheckBox</tabstop>
     <tabstop>m_detailsLabel</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>ktextbrowser.h</includehint>
diff --git a/lib/kofficecore/koDocumentInfoAboutWidget.ui b/lib/kofficecore/koDocumentInfoAboutWidget.ui
index 2581cf07..cf65eb81 100644
--- a/lib/kofficecore/koDocumentInfoAboutWidget.ui
+++ b/lib/kofficecore/koDocumentInfoAboutWidget.ui
@@ -339,8 +339,8 @@
     <tabstop>leDocKeywords</tabstop>
     <tabstop>meDocAbstract</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/lib/kofficecore/koDocumentInfoAuthorWidget.ui b/lib/kofficecore/koDocumentInfoAuthorWidget.ui
index cb3a6ce0..60353b91 100644
--- a/lib/kofficecore/koDocumentInfoAuthorWidget.ui
+++ b/lib/kofficecore/koDocumentInfoAuthorWidget.ui
@@ -289,8 +289,8 @@
     <tabstop>leCountry</tabstop>
     <tabstop>pbLoadKABC</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
index 7edf0a92..2a8a531e 100644
--- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
+++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
@@ -216,8 +216,8 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui
index 1537cada..a85ecb38 100644
--- a/lib/kofficecore/koOpenPaneBase.ui
+++ b/lib/kofficecore/koOpenPaneBase.ui
@@ -135,8 +135,8 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/lib/kofficecore/tests/kogenstylestest.cpp b/lib/kofficecore/tests/kogenstylestest.cpp
index 1068cdc4..ef9150f6 100644
--- a/lib/kofficecore/tests/kogenstylestest.cpp
+++ b/lib/kofficecore/tests/kogenstylestest.cpp
@@ -68,7 +68,7 @@ int testLookup()
     third.addProperty( "style:margin-left", "1.249cm" );
     third.addProperty( "style:page-number", "0" ); // same as tqparent
     third.addProperty( "style:foobar", "3", KoGenStyle::TextType ); // different from tqparent
-    assert( third.tqparentName() == secondName );
+    assert( third.parentName() == secondName );
 
     TQString thirdName = coll.lookup( third, "P" );
     kdDebug() << "The third style got assigned the name " << thirdName << endl;
diff --git a/lib/kofficecore/tests/koxmlreadertest.cpp b/lib/kofficecore/tests/koxmlreadertest.cpp
index aec06fae..5056e416 100644
--- a/lib/kofficecore/tests/koxmlreadertest.cpp
+++ b/lib/kofficecore/tests/koxmlreadertest.cpp
@@ -111,7 +111,7 @@ void testNode()
   CHECK( node1.isElement(), false );
   CHECK( node1.isDocument(), false );
   CHECK( node1.ownerDocument().isNull(), false );
-  CHECK( node1.tqparentNode().isNull(), true );
+  CHECK( node1.parentNode().isNull(), true );
   CHECK( node1.hasChildNodes(), false );
   CHECK( node1.firstChild().isNull(), true );
   CHECK( node1.lastChild().isNull(), true );
@@ -257,8 +257,8 @@ void testElement()
   CHECK( rootElement.isDocument(), false );
   CHECK( rootElement.ownerDocument().isNull(), false );
   CHECK( rootElement.ownerDocument()==doc, true );
-  CHECK( rootElement.tqparentNode().isNull(), false );
-  CHECK( rootElement.tqparentNode().toDocument()==doc, true );
+  CHECK( rootElement.parentNode().isNull(), false );
+  CHECK( rootElement.parentNode().toDocument()==doc, true );
   CHECK( rootElement.hasChildNodes(), true );
   CHECK( rootElement.tagName(), TQString("html") );
   CHECK( rootElement.prefix().isNull(), true );
@@ -272,8 +272,8 @@ void testElement()
   CHECK( bodyElement.isDocument(), false );
   CHECK( bodyElement.ownerDocument().isNull(), false );
   CHECK( bodyElement.ownerDocument()==doc, true );
-  CHECK( bodyElement.tqparentNode().isNull(), false );
-  CHECK( bodyElement.tqparentNode()==rootElement, true );
+  CHECK( bodyElement.parentNode().isNull(), false );
+  CHECK( bodyElement.parentNode()==rootElement, true );
   CHECK( bodyElement.hasChildNodes(), true );
   CHECK( bodyElement.tagName(), TQString("body") );
   CHECK( bodyElement.prefix().isNull(), true );
@@ -307,7 +307,7 @@ void testElement()
   CHECK( testElement.ownerDocument()!=doc, true );
   CHECK( testElement==rootElement, false );
   CHECK( testElement!=rootElement, true );
-  CHECK( testElement.tqparentNode().isNull(), true );
+  CHECK( testElement.parentNode().isNull(), true );
   CHECK( testElement.hasChildNodes(), false );
 
   // check assignment operator
@@ -318,8 +318,8 @@ void testElement()
   CHECK( testElement.isDocument(), false );
   CHECK( testElement==rootElement, true );
   CHECK( testElement!=rootElement, false );
-  CHECK( testElement.tqparentNode().isNull(), false );
-  CHECK( testElement.tqparentNode().toDocument()==doc, true );
+  CHECK( testElement.parentNode().isNull(), false );
+  CHECK( testElement.parentNode().toDocument()==doc, true );
   CHECK( testElement.tagName(), TQString("html") );
   CHECK( testElement.prefix().isNull(), true );
 
@@ -336,7 +336,7 @@ void testElement()
   CHECK( testElement.ownerDocument().isNull(), false );
   CHECK( testElement.ownerDocument()==doc, true );
   CHECK( testElement==bodyElement, true );
-  CHECK( testElement.tqparentNode().isNull(), false );
+  CHECK( testElement.parentNode().isNull(), false );
   CHECK( testElement.tagName(), TQString("body") );
   CHECK( testElement.prefix().isNull(), true );
   CHECK( testElement.hasChildNodes(), true );
@@ -349,7 +349,7 @@ void testElement()
   CHECK( dummyElement.ownerDocument().isNull(), false );
   CHECK( dummyElement.ownerDocument()==doc, true );
   CHECK( dummyElement==rootElement, true );
-  CHECK( dummyElement.tqparentNode().isNull(), false );
+  CHECK( dummyElement.parentNode().isNull(), false );
   CHECK( dummyElement.hasChildNodes(), true );
   CHECK( dummyElement.tagName(), TQString("html") );
   CHECK( dummyElement.prefix().isNull(), true );
@@ -400,8 +400,8 @@ void testAttributes()
   rootElement = doc.documentElement();
   CHECK( rootElement.isNull(), false );
   CHECK( rootElement.isElement(), true );
-  CHECK( rootElement.tqparentNode().isNull(), false );
-  CHECK( rootElement.tqparentNode().toDocument()==doc, true );
+  CHECK( rootElement.parentNode().isNull(), false );
+  CHECK( rootElement.parentNode().toDocument()==doc, true );
   CHECK( rootElement.tagName(), TQString("p") );
   CHECK( rootElement.prefix().isNull(), true );
 
@@ -456,8 +456,8 @@ void testText()
   CHECK( parElement.isDocument(), false );
   CHECK( parElement.ownerDocument().isNull(), false );
   CHECK( parElement.ownerDocument()==doc, true );
-  CHECK( parElement.tqparentNode().isNull(), false );
-  CHECK( parElement.tqparentNode().toDocument()==doc, true );
+  CHECK( parElement.parentNode().isNull(), false );
+  CHECK( parElement.parentNode().toDocument()==doc, true );
   CHECK( parElement.hasChildNodes(), true );
   CHECK( parElement.tagName(), TQString("p") );
   CHECK( parElement.prefix().isNull(), true );
@@ -500,7 +500,7 @@ void testText()
   CHECK( boldElement.isDocument(), false );
   CHECK( boldElement.ownerDocument().isNull(), false );
   CHECK( boldElement.ownerDocument()==doc, true );
-  CHECK( boldElement.tqparentNode().isNull(), false );
+  CHECK( boldElement.parentNode().isNull(), false );
   CHECK( boldElement.hasChildNodes(), true );
   CHECK( boldElement.tagName(), TQString("b") );
   CHECK( boldElement.prefix().isNull(), true );
@@ -545,8 +545,8 @@ void testCDATA()
   CHECK( parElement.isDocument(), false );
   CHECK( parElement.ownerDocument().isNull(), false );
   CHECK( parElement.ownerDocument()==doc, true );
-  CHECK( parElement.tqparentNode().isNull(), false );
-  CHECK( parElement.tqparentNode().toDocument()==doc, true );
+  CHECK( parElement.parentNode().isNull(), false );
+  CHECK( parElement.parentNode().toDocument()==doc, true );
   CHECK( parElement.hasChildNodes(), true );
   CHECK( parElement.tagName(), TQString("p") );
   CHECK( parElement.prefix().isNull(), true );
@@ -616,7 +616,7 @@ void testDocument()
   CHECK( doc.isNull(), false );
   CHECK( doc.isElement(), false );
   CHECK( doc.isDocument(), true );
-  CHECK( doc.tqparentNode().isNull(), true );
+  CHECK( doc.parentNode().isNull(), true );
   CHECK( doc.firstChild().isNull(), true );
   CHECK( doc.lastChild().isNull(), true );
   CHECK( doc.previousSibling().isNull(), true );
@@ -633,7 +633,7 @@ void testDocument()
   CHECK( doc.isNull(), false );
   CHECK( doc.isElement(), false );
   CHECK( doc.isDocument(), true );
-  CHECK( doc.tqparentNode().isNull(), true );
+  CHECK( doc.parentNode().isNull(), true );
   CHECK( doc.firstChild().isNull(), false );
   CHECK( doc.lastChild().isNull(), false );
   CHECK( doc.previousSibling().isNull(), true );
@@ -645,14 +645,14 @@ void testDocument()
   CHECK( rootElement.isNull(), false );
   CHECK( rootElement.isElement(), true );
   CHECK( rootElement.isDocument(), false );
-  CHECK( rootElement.tqparentNode().isNull(), false );
-  CHECK( rootElement.tqparentNode().toDocument()==doc, true );
+  CHECK( rootElement.parentNode().isNull(), false );
+  CHECK( rootElement.parentNode().toDocument()==doc, true );
   rootElement = doc.lastChild().toElement();
   CHECK( rootElement.isNull(), false );
   CHECK( rootElement.isElement(), true );
   CHECK( rootElement.isDocument(), false );
-  CHECK( rootElement.tqparentNode().isNull(), false );
-  CHECK( rootElement.tqparentNode().toDocument()==doc, true );
+  CHECK( rootElement.parentNode().isNull(), false );
+  CHECK( rootElement.parentNode().toDocument()==doc, true );
 
   // clear() converts it into null node
   doc.clear();
@@ -660,7 +660,7 @@ void testDocument()
   CHECK( doc.isNull(), true );
   CHECK( doc.isElement(), false );
   CHECK( doc.isDocument(), true );
-  CHECK( doc.tqparentNode().isNull(), true );
+  CHECK( doc.parentNode().isNull(), true );
   CHECK( doc.firstChild().isNull(), true );
   CHECK( doc.lastChild().isNull(), true );
   CHECK( doc.previousSibling().isNull(), true );
@@ -672,7 +672,7 @@ void testDocument()
   CHECK( doc.isNull(), false );
   CHECK( doc.isElement(), false );
   CHECK( doc.isDocument(), true );
-  CHECK( doc.tqparentNode().isNull(), true );
+  CHECK( doc.parentNode().isNull(), true );
 }
 
 void testNamespace()
@@ -877,7 +877,7 @@ void testUnload()
   earthElement = doc.documentElement().toElement();
   CHECK( earthElement.isNull(), false );
   CHECK( earthElement.isElement(), true );
-  CHECK( earthElement.tqparentNode().isNull(), false );
+  CHECK( earthElement.parentNode().isNull(), false );
   CHECK( earthElement.hasChildNodes(), true );
   CHECK( earthElement.tagName(), TQString("earth") );
   CHECK( earthElement.prefix().isNull(), true );
@@ -941,7 +941,7 @@ void testSimpleXML()
   rootElement = doc.documentElement();
   CHECK( rootElement.isNull(), false );
   CHECK( rootElement.isElement(), true );
-  CHECK( rootElement.tqparentNode().isNull(), false );
+  CHECK( rootElement.parentNode().isNull(), false );
   CHECK( rootElement.hasChildNodes(), true );
   CHECK( rootElement.tagName(), TQString("solarsystem") );
   CHECK( rootElement.prefix().isNull(), true );
@@ -953,9 +953,9 @@ void testSimpleXML()
   CHECK( firstPlanetNode.isElement(), true );
   CHECK( firstPlanetNode.nextSibling().isNull(), false );
   CHECK( firstPlanetNode.previousSibling().isNull(), true );
-  CHECK( firstPlanetNode.tqparentNode().isNull(), false );
-  CHECK( firstPlanetNode.tqparentNode()==rootElement, true );
-  CHECK( firstPlanetNode.tqparentNode()!=rootElement, false );
+  CHECK( firstPlanetNode.parentNode().isNull(), false );
+  CHECK( firstPlanetNode.parentNode()==rootElement, true );
+  CHECK( firstPlanetNode.parentNode()!=rootElement, false );
   CHECK( firstPlanetNode.hasChildNodes(), false );
   CHECK( firstPlanetNode.firstChild().isNull(), true );
   CHECK( firstPlanetNode.lastChild().isNull(), true );
@@ -965,8 +965,8 @@ void testSimpleXML()
   firstPlanetElement = firstPlanetNode.toElement();
   CHECK( firstPlanetElement.isNull(), false );
   CHECK( firstPlanetElement.isElement(), true );
-  CHECK( firstPlanetElement.tqparentNode().isNull(), false );
-  CHECK( firstPlanetElement.tqparentNode()==rootElement, true );
+  CHECK( firstPlanetElement.parentNode().isNull(), false );
+  CHECK( firstPlanetElement.parentNode()==rootElement, true );
   CHECK( firstPlanetElement.hasChildNodes(), false );
   CHECK( firstPlanetElement.firstChild().isNull(), true );
   CHECK( firstPlanetElement.lastChild().isNull(), true );
@@ -982,9 +982,9 @@ void testSimpleXML()
   CHECK( secondPlanetNode.previousSibling().isNull(), false );
   CHECK( secondPlanetNode.previousSibling()==firstPlanetNode, true );
   CHECK( secondPlanetNode.previousSibling()==firstPlanetElement, true );
-  CHECK( secondPlanetNode.tqparentNode().isNull(), false );
-  CHECK( secondPlanetNode.tqparentNode()==rootElement, true );
-  CHECK( secondPlanetNode.tqparentNode()!=rootElement, false );
+  CHECK( secondPlanetNode.parentNode().isNull(), false );
+  CHECK( secondPlanetNode.parentNode()==rootElement, true );
+  CHECK( secondPlanetNode.parentNode()!=rootElement, false );
   CHECK( secondPlanetNode.hasChildNodes(), false );
   CHECK( secondPlanetNode.firstChild().isNull(), true );
   CHECK( secondPlanetNode.lastChild().isNull(), true );
@@ -998,9 +998,9 @@ void testSimpleXML()
   CHECK( secondPlanetElement.previousSibling().isNull(), false );
   CHECK( secondPlanetElement.previousSibling()==firstPlanetNode, true );
   CHECK( secondPlanetElement.previousSibling()==firstPlanetElement, true );
-  CHECK( secondPlanetElement.tqparentNode().isNull(), false );
-  CHECK( secondPlanetElement.tqparentNode()==rootElement, true );
-  CHECK( secondPlanetElement.tqparentNode()!=rootElement, false );
+  CHECK( secondPlanetElement.parentNode().isNull(), false );
+  CHECK( secondPlanetElement.parentNode()==rootElement, true );
+  CHECK( secondPlanetElement.parentNode()!=rootElement, false );
   CHECK( secondPlanetElement.hasChildNodes(), false );
   CHECK( secondPlanetElement.firstChild().isNull(), true );
   CHECK( secondPlanetElement.lastChild().isNull(), true );
@@ -1088,8 +1088,8 @@ void testSimpleOpenDocumentText()
   contentElement = doc.documentElement();
   CHECK( contentElement.isNull(), false );
   CHECK( contentElement.isElement(), true );
-  CHECK( contentElement.tqparentNode().isNull(), false );
-  CHECK( contentElement.tqparentNode().toDocument()==doc, true );
+  CHECK( contentElement.parentNode().isNull(), false );
+  CHECK( contentElement.parentNode().toDocument()==doc, true );
   CHECK( contentElement.firstChild().isNull(), false );
   CHECK( contentElement.lastChild().isNull(), false );
   CHECK( contentElement.previousSibling().isNull(), false );
@@ -1103,8 +1103,8 @@ void testSimpleOpenDocumentText()
   stylesElement = KoXml::namedItemNS( contentElement, officeNS, "automatic-styles" );
   CHECK( stylesElement.isNull(), false );
   CHECK( stylesElement.isElement(), true );
-  CHECK( stylesElement.tqparentNode().isNull(), false );
-  CHECK( stylesElement.tqparentNode()==contentElement, true );
+  CHECK( stylesElement.parentNode().isNull(), false );
+  CHECK( stylesElement.parentNode()==contentElement, true );
   CHECK( stylesElement.firstChild().isNull(), true );
   CHECK( stylesElement.lastChild().isNull(), true );
   CHECK( stylesElement.previousSibling().isNull(), true );
@@ -1116,8 +1116,8 @@ void testSimpleOpenDocumentText()
   styles2Element = contentElement.firstChild().toElement();
   CHECK( styles2Element.isNull(), false );
   CHECK( styles2Element.isElement(), true );
-  CHECK( styles2Element.tqparentNode().isNull(), false );
-  CHECK( styles2Element.tqparentNode()==contentElement, true );
+  CHECK( styles2Element.parentNode().isNull(), false );
+  CHECK( styles2Element.parentNode()==contentElement, true );
   CHECK( styles2Element.firstChild().isNull(), true );
   CHECK( styles2Element.lastChild().isNull(), true );
   CHECK( styles2Element.previousSibling().isNull(), true );
@@ -1129,8 +1129,8 @@ void testSimpleOpenDocumentText()
   bodyElement = KoXml::namedItemNS( contentElement, officeNS, "body" );
   CHECK( bodyElement.isNull(), false );
   CHECK( bodyElement.isElement(), true );
-  CHECK( bodyElement.tqparentNode().isNull(), false );
-  CHECK( bodyElement.tqparentNode()==contentElement, true );
+  CHECK( bodyElement.parentNode().isNull(), false );
+  CHECK( bodyElement.parentNode()==contentElement, true );
   CHECK( bodyElement.firstChild().isNull(), false );
   CHECK( bodyElement.lastChild().isNull(), false );
   CHECK( bodyElement.previousSibling().isNull(), false );
@@ -1142,8 +1142,8 @@ void testSimpleOpenDocumentText()
   body2Element = stylesElement.nextSibling().toElement();
   CHECK( body2Element.isNull(), false );
   CHECK( body2Element.isElement(), true );
-  CHECK( body2Element.tqparentNode().isNull(), false );
-  CHECK( body2Element.tqparentNode()==contentElement, true );
+  CHECK( body2Element.parentNode().isNull(), false );
+  CHECK( body2Element.parentNode()==contentElement, true );
   CHECK( body2Element.firstChild().isNull(), false );
   CHECK( body2Element.lastChild().isNull(), false );
   CHECK( body2Element.previousSibling().isNull(), false );
@@ -1155,8 +1155,8 @@ void testSimpleOpenDocumentText()
   textElement = KoXml::namedItemNS( bodyElement, officeNS, "text" );
   CHECK( textElement.isNull(), false );
   CHECK( textElement.isElement(), true );
-  CHECK( textElement.tqparentNode().isNull(), false );
-  CHECK( textElement.tqparentNode()==bodyElement, true );
+  CHECK( textElement.parentNode().isNull(), false );
+  CHECK( textElement.parentNode()==bodyElement, true );
   CHECK( textElement.firstChild().isNull(), false );
   CHECK( textElement.lastChild().isNull(), false );
   CHECK( textElement.previousSibling().isNull(), true );
@@ -1168,8 +1168,8 @@ void testSimpleOpenDocumentText()
   text2Element = bodyElement.firstChild().toElement();
   CHECK( text2Element.isNull(), false );
   CHECK( text2Element.isElement(), true );
-  CHECK( text2Element.tqparentNode().isNull(), false );
-  CHECK( text2Element.tqparentNode()==bodyElement, true );
+  CHECK( text2Element.parentNode().isNull(), false );
+  CHECK( text2Element.parentNode()==bodyElement, true );
   CHECK( text2Element.firstChild().isNull(), false );
   CHECK( text2Element.lastChild().isNull(), false );
   CHECK( text2Element.previousSibling().isNull(), true );
@@ -1181,8 +1181,8 @@ void testSimpleOpenDocumentText()
   parElement = textElement.firstChild().toElement();
   CHECK( parElement.isNull(), false );
   CHECK( parElement.isElement(), true );
-  CHECK( parElement.tqparentNode().isNull(), false );
-  CHECK( parElement.tqparentNode()==textElement, true );
+  CHECK( parElement.parentNode().isNull(), false );
+  CHECK( parElement.parentNode()==textElement, true );
   CHECK( parElement.firstChild().isNull(), false );
   CHECK( parElement.lastChild().isNull(), false );
   CHECK( parElement.previousSibling().isNull(), true );
@@ -1253,8 +1253,8 @@ void testSimpleOpenDocumentSpreadsheet()
   contentElement = doc.documentElement();
   CHECK( contentElement.isNull(), false );
   CHECK( contentElement.isElement(), true );
-  CHECK( contentElement.tqparentNode().isNull(), false );
-  CHECK( contentElement.tqparentNode().toDocument()==doc, true );
+  CHECK( contentElement.parentNode().isNull(), false );
+  CHECK( contentElement.parentNode().toDocument()==doc, true );
   CHECK( contentElement.firstChild().isNull(), false );
   CHECK( contentElement.lastChild().isNull(), false );
   CHECK( contentElement.previousSibling().isNull(), false );
@@ -1266,8 +1266,8 @@ void testSimpleOpenDocumentSpreadsheet()
   bodyElement = contentElement.firstChild().toElement();
   CHECK( bodyElement.isNull(), false );
   CHECK( bodyElement.isElement(), true );
-  CHECK( bodyElement.tqparentNode().isNull(), false );
-  CHECK( bodyElement.tqparentNode()==contentElement, true );
+  CHECK( bodyElement.parentNode().isNull(), false );
+  CHECK( bodyElement.parentNode()==contentElement, true );
   CHECK( bodyElement.firstChild().isNull(), false );
   CHECK( bodyElement.lastChild().isNull(), false );
   CHECK( bodyElement.previousSibling().isNull(), true );
@@ -1279,8 +1279,8 @@ void testSimpleOpenDocumentSpreadsheet()
   spreadsheetElement = bodyElement.firstChild().toElement();
   CHECK( spreadsheetElement.isNull(), false );
   CHECK( spreadsheetElement.isElement(), true );
-  CHECK( spreadsheetElement.tqparentNode().isNull(), false );
-  CHECK( spreadsheetElement.tqparentNode()==bodyElement, true );
+  CHECK( spreadsheetElement.parentNode().isNull(), false );
+  CHECK( spreadsheetElement.parentNode()==bodyElement, true );
   CHECK( spreadsheetElement.firstChild().isNull(), false );
   CHECK( spreadsheetElement.lastChild().isNull(), false );
   CHECK( spreadsheetElement.previousSibling().isNull(), true );
@@ -1292,8 +1292,8 @@ void testSimpleOpenDocumentSpreadsheet()
   sheet1Element = spreadsheetElement.firstChild().toElement();
   CHECK( sheet1Element.isNull(), false );
   CHECK( sheet1Element.isElement(), true );
-  CHECK( sheet1Element.tqparentNode().isNull(), false );
-  CHECK( sheet1Element.tqparentNode()==spreadsheetElement, true );
+  CHECK( sheet1Element.parentNode().isNull(), false );
+  CHECK( sheet1Element.parentNode()==spreadsheetElement, true );
   CHECK( sheet1Element.firstChild().isNull(), false );
   CHECK( sheet1Element.lastChild().isNull(), false );
   CHECK( sheet1Element.previousSibling().isNull(), true );
@@ -1311,8 +1311,8 @@ void testSimpleOpenDocumentSpreadsheet()
   columnElement = sheet1Element.firstChild().toElement();
   CHECK( columnElement.isNull(), false );
   CHECK( columnElement.isElement(), true );
-  CHECK( columnElement.tqparentNode().isNull(), false );
-  CHECK( columnElement.tqparentNode()==sheet1Element, true );
+  CHECK( columnElement.parentNode().isNull(), false );
+  CHECK( columnElement.parentNode()==sheet1Element, true );
   CHECK( columnElement.firstChild().isNull(), true );
   CHECK( columnElement.lastChild().isNull(), true );
   CHECK( columnElement.previousSibling().isNull(), true );
@@ -1326,8 +1326,8 @@ void testSimpleOpenDocumentSpreadsheet()
   rowElement = columnElement.nextSibling().toElement();
   CHECK( rowElement.isNull(), false );
   CHECK( rowElement.isElement(), true );
-  CHECK( rowElement.tqparentNode().isNull(), false );
-  CHECK( rowElement.tqparentNode()==sheet1Element, true );
+  CHECK( rowElement.parentNode().isNull(), false );
+  CHECK( rowElement.parentNode()==sheet1Element, true );
   CHECK( rowElement.firstChild().isNull(), false );
   CHECK( rowElement.lastChild().isNull(), false );
   CHECK( rowElement.previousSibling().isNull(), false );
@@ -1340,8 +1340,8 @@ void testSimpleOpenDocumentSpreadsheet()
   cellElement = rowElement.firstChild().toElement();
   CHECK( cellElement.isNull(), false );
   CHECK( cellElement.isElement(), true );
-  CHECK( cellElement.tqparentNode().isNull(), false );
-  CHECK( cellElement.tqparentNode()==rowElement, true );
+  CHECK( cellElement.parentNode().isNull(), false );
+  CHECK( cellElement.parentNode()==rowElement, true );
   CHECK( cellElement.firstChild().isNull(), false );
   CHECK( cellElement.lastChild().isNull(), false );
   CHECK( cellElement.previousSibling().isNull(), true );
@@ -1354,8 +1354,8 @@ void testSimpleOpenDocumentSpreadsheet()
   parElement = cellElement.firstChild().toElement();
   CHECK( parElement.isNull(), false );
   CHECK( parElement.isElement(), true );
-  CHECK( parElement.tqparentNode().isNull(), false );
-  CHECK( parElement.tqparentNode()==cellElement, true );
+  CHECK( parElement.parentNode().isNull(), false );
+  CHECK( parElement.parentNode()==cellElement, true );
   CHECK( parElement.firstChild().isNull(), false );
   CHECK( parElement.lastChild().isNull(), false );
   CHECK( parElement.previousSibling().isNull(), true );
@@ -1368,8 +1368,8 @@ void testSimpleOpenDocumentSpreadsheet()
   sheet2Element = sheet1Element.nextSibling().toElement();
   CHECK( sheet2Element.isNull(), false );
   CHECK( sheet2Element.isElement(), true );
-  CHECK( sheet2Element.tqparentNode().isNull(), false );
-  CHECK( sheet2Element.tqparentNode()==spreadsheetElement, true );
+  CHECK( sheet2Element.parentNode().isNull(), false );
+  CHECK( sheet2Element.parentNode()==spreadsheetElement, true );
   CHECK( sheet2Element.firstChild().isNull(), false );
   CHECK( sheet2Element.lastChild().isNull(), false );
   CHECK( sheet2Element.previousSibling().isNull(), false );
@@ -1381,8 +1381,8 @@ void testSimpleOpenDocumentSpreadsheet()
   sheet3Element = sheet2Element.nextSibling().toElement();
   CHECK( sheet3Element.isNull(), false );
   CHECK( sheet3Element.isElement(), true );
-  CHECK( sheet3Element.tqparentNode().isNull(), false );
-  CHECK( sheet3Element.tqparentNode()==spreadsheetElement, true );
+  CHECK( sheet3Element.parentNode().isNull(), false );
+  CHECK( sheet3Element.parentNode()==spreadsheetElement, true );
   CHECK( sheet3Element.firstChild().isNull(), false );
   CHECK( sheet3Element.lastChild().isNull(), false );
   CHECK( sheet3Element.previousSibling().isNull(), false );
@@ -1469,8 +1469,8 @@ void testSimpleOpenDocumentPresentation()
   CHECK( contentElement.isNull(), false );
   
   CHECK( contentElement.isElement(), true );
-  CHECK( contentElement.tqparentNode().isNull(), false );
-  CHECK( contentElement.tqparentNode().toDocument()==doc, true );
+  CHECK( contentElement.parentNode().isNull(), false );
+  CHECK( contentElement.parentNode().toDocument()==doc, true );
   CHECK( contentElement.firstChild().isNull(), false );
   CHECK( contentElement.lastChild().isNull(), false );
   CHECK( contentElement.previousSibling().isNull(), false );
@@ -1485,8 +1485,8 @@ void testSimpleOpenDocumentPresentation()
   scriptsElement = KoXml::namedItemNS( contentElement, officeNS, "scripts" );
   CHECK( scriptsElement.isNull(), false );
   CHECK( scriptsElement.isElement(), true );
-  CHECK( scriptsElement.tqparentNode().isNull(), false );
-  CHECK( scriptsElement.tqparentNode()==contentElement, true );
+  CHECK( scriptsElement.parentNode().isNull(), false );
+  CHECK( scriptsElement.parentNode()==contentElement, true );
   CHECK( scriptsElement.firstChild().isNull(), true );
   CHECK( scriptsElement.lastChild().isNull(), true );
   CHECK( scriptsElement.previousSibling().isNull(), true );
@@ -1498,8 +1498,8 @@ void testSimpleOpenDocumentPresentation()
   stylesElement = KoXml::namedItemNS( contentElement, officeNS, "automatic-styles" );
   CHECK( stylesElement.isNull(), false );
   CHECK( stylesElement.isElement(), true );
-  CHECK( stylesElement.tqparentNode().isNull(), false );
-  CHECK( stylesElement.tqparentNode()==contentElement, true );
+  CHECK( stylesElement.parentNode().isNull(), false );
+  CHECK( stylesElement.parentNode()==contentElement, true );
   CHECK( stylesElement.firstChild().isNull(), true );
   CHECK( stylesElement.lastChild().isNull(), true );
   CHECK( stylesElement.previousSibling().isNull(), false );
@@ -1511,8 +1511,8 @@ void testSimpleOpenDocumentPresentation()
   styles2Element = scriptsElement.nextSibling().toElement();
   CHECK( styles2Element.isNull(), false );
   CHECK( styles2Element.isElement(), true );
-  CHECK( styles2Element.tqparentNode().isNull(), false );
-  CHECK( styles2Element.tqparentNode()==contentElement, true );
+  CHECK( styles2Element.parentNode().isNull(), false );
+  CHECK( styles2Element.parentNode()==contentElement, true );
   CHECK( styles2Element.firstChild().isNull(), true );
   CHECK( styles2Element.lastChild().isNull(), true );
   CHECK( styles2Element.previousSibling().isNull(), false );
@@ -1524,8 +1524,8 @@ void testSimpleOpenDocumentPresentation()
   bodyElement = KoXml::namedItemNS( contentElement, officeNS, "body" );
   CHECK( bodyElement.isNull(), false );
   CHECK( bodyElement.isElement(), true );
-  CHECK( bodyElement.tqparentNode().isNull(), false );
-  CHECK( bodyElement.tqparentNode()==contentElement, true );
+  CHECK( bodyElement.parentNode().isNull(), false );
+  CHECK( bodyElement.parentNode()==contentElement, true );
   CHECK( bodyElement.firstChild().isNull(), false );
   CHECK( bodyElement.lastChild().isNull(), false );
   CHECK( bodyElement.previousSibling().isNull(), false );
@@ -1537,8 +1537,8 @@ void testSimpleOpenDocumentPresentation()
   body2Element = stylesElement.nextSibling().toElement();
   CHECK( body2Element.isNull(), false );
   CHECK( body2Element.isElement(), true );
-  CHECK( body2Element.tqparentNode().isNull(), false );
-  CHECK( body2Element.tqparentNode()==contentElement, true );
+  CHECK( body2Element.parentNode().isNull(), false );
+  CHECK( body2Element.parentNode()==contentElement, true );
   CHECK( body2Element.firstChild().isNull(), false );
   CHECK( body2Element.lastChild().isNull(), false );
   CHECK( body2Element.previousSibling().isNull(), false );
@@ -1550,8 +1550,8 @@ void testSimpleOpenDocumentPresentation()
   presentationElement = KoXml::namedItemNS( bodyElement, officeNS, "presentation" );
   CHECK( presentationElement.isNull(), false );
   CHECK( presentationElement.isElement(), true );
-  CHECK( presentationElement.tqparentNode().isNull(), false );
-  CHECK( presentationElement.tqparentNode()==bodyElement, true );
+  CHECK( presentationElement.parentNode().isNull(), false );
+  CHECK( presentationElement.parentNode()==bodyElement, true );
   CHECK( presentationElement.firstChild().isNull(), false );
   CHECK( presentationElement.lastChild().isNull(), false );
   CHECK( presentationElement.previousSibling().isNull(), true );
@@ -1563,8 +1563,8 @@ void testSimpleOpenDocumentPresentation()
   presentation2Element = bodyElement.firstChild().toElement();
   CHECK( presentation2Element.isNull(), false );
   CHECK( presentation2Element.isElement(), true );
-  CHECK( presentation2Element.tqparentNode().isNull(), false );
-  CHECK( presentation2Element.tqparentNode()==bodyElement, true );
+  CHECK( presentation2Element.parentNode().isNull(), false );
+  CHECK( presentation2Element.parentNode()==bodyElement, true );
   CHECK( presentation2Element.firstChild().isNull(), false );
   CHECK( presentation2Element.lastChild().isNull(), false );
   CHECK( presentation2Element.previousSibling().isNull(), true );
@@ -1576,8 +1576,8 @@ void testSimpleOpenDocumentPresentation()
   titlePageElement = presentationElement.firstChild().toElement();
   CHECK( titlePageElement.isNull(), false );
   CHECK( titlePageElement.isElement(), true );
-  CHECK( titlePageElement.tqparentNode().isNull(), false );
-  CHECK( titlePageElement.tqparentNode()==presentationElement, true );
+  CHECK( titlePageElement.parentNode().isNull(), false );
+  CHECK( titlePageElement.parentNode()==presentationElement, true );
   CHECK( titlePageElement.firstChild().isNull(), false );
   CHECK( titlePageElement.lastChild().isNull(), false );
   CHECK( titlePageElement.previousSibling().isNull(), true );
@@ -1594,8 +1594,8 @@ void testSimpleOpenDocumentPresentation()
   titleFrameElement = titlePageElement.firstChild().toElement();
   CHECK( titleFrameElement.isNull(), false );
   CHECK( titleFrameElement.isElement(), true );
-  CHECK( titleFrameElement.tqparentNode().isNull(), false );
-  CHECK( titleFrameElement.tqparentNode()==titlePageElement, true );
+  CHECK( titleFrameElement.parentNode().isNull(), false );
+  CHECK( titleFrameElement.parentNode()==titlePageElement, true );
   CHECK( titleFrameElement.firstChild().isNull(), false );
   CHECK( titleFrameElement.lastChild().isNull(), false );
   CHECK( titleFrameElement.previousSibling().isNull(), true );
@@ -1616,8 +1616,8 @@ void testSimpleOpenDocumentPresentation()
   titleBoxElement = titleFrameElement.firstChild().toElement();
   CHECK( titleBoxElement.isNull(), false );
   CHECK( titleBoxElement.isElement(), true );
-  CHECK( titleBoxElement.tqparentNode().isNull(), false );
-  CHECK( titleBoxElement.tqparentNode()==titleFrameElement, true );
+  CHECK( titleBoxElement.parentNode().isNull(), false );
+  CHECK( titleBoxElement.parentNode()==titleFrameElement, true );
   CHECK( titleBoxElement.firstChild().isNull(), false );
   CHECK( titleBoxElement.lastChild().isNull(), false );
   CHECK( titleBoxElement.previousSibling().isNull(), true );
@@ -1629,8 +1629,8 @@ void testSimpleOpenDocumentPresentation()
   titleParElement = titleBoxElement.firstChild().toElement();
   CHECK( titleParElement.isNull(), false );
   CHECK( titleParElement.isElement(), true );
-  CHECK( titleParElement.tqparentNode().isNull(), false );
-  CHECK( titleParElement.tqparentNode()==titleBoxElement, true );
+  CHECK( titleParElement.parentNode().isNull(), false );
+  CHECK( titleParElement.parentNode()==titleBoxElement, true );
   CHECK( titleParElement.firstChild().isNull(), false );
   CHECK( titleParElement.lastChild().isNull(), false );
   CHECK( titleParElement.previousSibling().isNull(), true );
@@ -1644,8 +1644,8 @@ void testSimpleOpenDocumentPresentation()
   subtitleFrameElement = titleFrameElement.nextSibling().toElement();
   CHECK( subtitleFrameElement.isNull(), false );
   CHECK( subtitleFrameElement.isElement(), true );
-  CHECK( subtitleFrameElement.tqparentNode().isNull(), false );
-  CHECK( subtitleFrameElement.tqparentNode()==titlePageElement, true );
+  CHECK( subtitleFrameElement.parentNode().isNull(), false );
+  CHECK( subtitleFrameElement.parentNode()==titlePageElement, true );
   CHECK( subtitleFrameElement.firstChild().isNull(), false );
   CHECK( subtitleFrameElement.lastChild().isNull(), false );
   CHECK( subtitleFrameElement.previousSibling().isNull(), false );
@@ -1666,8 +1666,8 @@ void testSimpleOpenDocumentPresentation()
   subtitleBoxElement = subtitleFrameElement.firstChild().toElement();
   CHECK( subtitleBoxElement.isNull(), false );
   CHECK( subtitleBoxElement.isElement(), true );
-  CHECK( subtitleBoxElement.tqparentNode().isNull(), false );
-  CHECK( subtitleBoxElement.tqparentNode()==subtitleFrameElement, true );
+  CHECK( subtitleBoxElement.parentNode().isNull(), false );
+  CHECK( subtitleBoxElement.parentNode()==subtitleFrameElement, true );
   CHECK( subtitleBoxElement.firstChild().isNull(), false );
   CHECK( subtitleBoxElement.lastChild().isNull(), false );
   CHECK( subtitleBoxElement.previousSibling().isNull(), true );
@@ -1679,8 +1679,8 @@ void testSimpleOpenDocumentPresentation()
   subtitleParElement = subtitleBoxElement.firstChild().toElement();
   CHECK( subtitleParElement.isNull(), false );
   CHECK( subtitleParElement.isElement(), true );
-  CHECK( subtitleParElement.tqparentNode().isNull(), false );
-  CHECK( subtitleParElement.tqparentNode()==subtitleBoxElement, true );
+  CHECK( subtitleParElement.parentNode().isNull(), false );
+  CHECK( subtitleParElement.parentNode()==subtitleBoxElement, true );
   CHECK( subtitleParElement.firstChild().isNull(), false );
   CHECK( subtitleParElement.lastChild().isNull(), false );
   CHECK( subtitleParElement.previousSibling().isNull(), true );
@@ -1731,8 +1731,8 @@ void testSimpleOpenDocumentFormula()
   mathElement = doc.documentElement();
   CHECK( mathElement.isNull(), false );
   CHECK( mathElement.isElement(), true );
-  CHECK( mathElement.tqparentNode().isNull(), false );
-  CHECK( mathElement.tqparentNode().toDocument()==doc, true );
+  CHECK( mathElement.parentNode().isNull(), false );
+  CHECK( mathElement.parentNode().toDocument()==doc, true );
   CHECK( mathElement.firstChild().isNull(), false );
   CHECK( mathElement.lastChild().isNull(), false );
   CHECK( mathElement.previousSibling().isNull(), false );
@@ -1744,8 +1744,8 @@ void testSimpleOpenDocumentFormula()
   semanticsElement = KoXml::namedItemNS( mathElement, mathNS, "semantics" );
   CHECK( semanticsElement.isNull(), false );
   CHECK( semanticsElement.isElement(), true );
-  CHECK( semanticsElement.tqparentNode().isNull(), false );
-  CHECK( semanticsElement.tqparentNode().toElement()==mathElement, true );
+  CHECK( semanticsElement.parentNode().isNull(), false );
+  CHECK( semanticsElement.parentNode().toElement()==mathElement, true );
   CHECK( semanticsElement.firstChild().isNull(), false );
   CHECK( semanticsElement.lastChild().isNull(), false );
   CHECK( semanticsElement.previousSibling().isNull(), true );
@@ -1757,8 +1757,8 @@ void testSimpleOpenDocumentFormula()
   semantics2Element = mathElement.firstChild().toElement();
   CHECK( semantics2Element.isNull(), false );
   CHECK( semantics2Element.isElement(), true );
-  CHECK( semantics2Element.tqparentNode().isNull(), false );
-  CHECK( semantics2Element.tqparentNode().toElement()==mathElement, true );
+  CHECK( semantics2Element.parentNode().isNull(), false );
+  CHECK( semantics2Element.parentNode().toElement()==mathElement, true );
   CHECK( semantics2Element.firstChild().isNull(), false );
   CHECK( semantics2Element.lastChild().isNull(), false );
   CHECK( semantics2Element.previousSibling().isNull(), true );
@@ -1770,8 +1770,8 @@ void testSimpleOpenDocumentFormula()
   mrowElement = semanticsElement.firstChild().toElement();
   CHECK( mrowElement.isNull(), false );
   CHECK( mrowElement.isElement(), true );
-  CHECK( mrowElement.tqparentNode().isNull(), false );
-  CHECK( mrowElement.tqparentNode().toElement()==semanticsElement, true );
+  CHECK( mrowElement.parentNode().isNull(), false );
+  CHECK( mrowElement.parentNode().toElement()==semanticsElement, true );
   CHECK( mrowElement.firstChild().isNull(), false );
   CHECK( mrowElement.lastChild().isNull(), false );
   CHECK( mrowElement.previousSibling().isNull(), true );
@@ -1783,8 +1783,8 @@ void testSimpleOpenDocumentFormula()
   miElement = mrowElement.firstChild().toElement();
   CHECK( miElement.isNull(), false );
   CHECK( miElement.isElement(), true );
-  CHECK( miElement.tqparentNode().isNull(), false );
-  CHECK( miElement.tqparentNode().toElement()==mrowElement, true );
+  CHECK( miElement.parentNode().isNull(), false );
+  CHECK( miElement.parentNode().toElement()==mrowElement, true );
   CHECK( miElement.firstChild().isNull(), false );
   CHECK( miElement.lastChild().isNull(), false );
   CHECK( miElement.previousSibling().isNull(), true );
@@ -1796,8 +1796,8 @@ void testSimpleOpenDocumentFormula()
   moElement = miElement.nextSibling().toElement();
   CHECK( moElement.isNull(), false );
   CHECK( moElement.isElement(), true );
-  CHECK( moElement.tqparentNode().isNull(), false );
-  CHECK( moElement.tqparentNode().toElement()==mrowElement, true );
+  CHECK( moElement.parentNode().isNull(), false );
+  CHECK( moElement.parentNode().toElement()==mrowElement, true );
   CHECK( moElement.firstChild().isNull(), false );
   CHECK( moElement.lastChild().isNull(), false );
   CHECK( moElement.previousSibling().isNull(), false );
@@ -1810,8 +1810,8 @@ void testSimpleOpenDocumentFormula()
   msupElement = moElement.nextSibling().toElement();
   CHECK( msupElement.isNull(), false );
   CHECK( msupElement.isElement(), true );
-  CHECK( msupElement.tqparentNode().isNull(), false );
-  CHECK( msupElement.tqparentNode().toElement()==mrowElement, true );
+  CHECK( msupElement.parentNode().isNull(), false );
+  CHECK( msupElement.parentNode().toElement()==mrowElement, true );
   CHECK( msupElement.firstChild().isNull(), false );
   CHECK( msupElement.lastChild().isNull(), false );
   CHECK( msupElement.previousSibling().isNull(), false );
@@ -1823,8 +1823,8 @@ void testSimpleOpenDocumentFormula()
   mcElement = msupElement.firstChild().toElement();
   CHECK( mcElement.isNull(), false );
   CHECK( mcElement.isElement(), true );
-  CHECK( mcElement.tqparentNode().isNull(), false );
-  CHECK( mcElement.tqparentNode().toElement()==msupElement, true );
+  CHECK( mcElement.parentNode().isNull(), false );
+  CHECK( mcElement.parentNode().toElement()==msupElement, true );
   CHECK( mcElement.firstChild().isNull(), false );
   CHECK( mcElement.lastChild().isNull(), false );
   CHECK( mcElement.previousSibling().isNull(), true );
@@ -1838,8 +1838,8 @@ void testSimpleOpenDocumentFormula()
   mnElement = mcElement.nextSibling().toElement();
   CHECK( mnElement.isNull(), false );
   CHECK( mnElement.isElement(), true );
-  CHECK( mnElement.tqparentNode().isNull(), false );
-  CHECK( mnElement.tqparentNode().toElement()==msupElement, true );
+  CHECK( mnElement.parentNode().isNull(), false );
+  CHECK( mnElement.parentNode().toElement()==msupElement, true );
   CHECK( mnElement.firstChild().isNull(), false );
   CHECK( mnElement.lastChild().isNull(), false );
   CHECK( mnElement.previousSibling().isNull(), false );
@@ -1852,8 +1852,8 @@ void testSimpleOpenDocumentFormula()
   annotationElement = semanticsElement.lastChild().toElement();
   CHECK( annotationElement.isNull(), false );
   CHECK( annotationElement.isElement(), true );
-  CHECK( annotationElement.tqparentNode().isNull(), false );
-  CHECK( annotationElement.tqparentNode().toElement()==semanticsElement, true );
+  CHECK( annotationElement.parentNode().isNull(), false );
+  CHECK( annotationElement.parentNode().toElement()==semanticsElement, true );
   CHECK( annotationElement.firstChild().isNull(), false );
   CHECK( annotationElement.lastChild().isNull(), false );
   CHECK( annotationElement.previousSibling().isNull(), false );
@@ -1992,8 +1992,8 @@ void testLargeOpenDocumentSpreadsheet()
     // load everything for this table
     KoXml::load( tableElement, 99 );
 
-    CHECK( tableElement.tqparentNode().isNull(), false );
-    CHECK( tableElement.tqparentNode()==spreadsheetElement, true );
+    CHECK( tableElement.parentNode().isNull(), false );
+    CHECK( tableElement.parentNode()==spreadsheetElement, true );
     CHECK( tableElement.firstChild().isNull(), false );
     CHECK( tableElement.lastChild().isNull(), false );
 
@@ -2004,8 +2004,8 @@ void testLargeOpenDocumentSpreadsheet()
       CHECK( rowElement.isNull(), false );
       CHECK( rowElement.isElement(), true );
       CHECK( rowElement.localName(), TQString("table-row") );
-      CHECK( rowElement.tqparentNode().isNull(), false );
-      CHECK( rowElement.tqparentNode()==tableElement, true );
+      CHECK( rowElement.parentNode().isNull(), false );
+      CHECK( rowElement.parentNode()==tableElement, true );
       CHECK( rowElement.firstChild().isNull(), false );
       CHECK( rowElement.lastChild().isNull(), false );
 
@@ -2019,8 +2019,8 @@ void testLargeOpenDocumentSpreadsheet()
         CHECK( cellElement.text(), TQString("Hello, world") );
         CHECK( cellElement.hasAttributeNS(officeNS,"value-type"), true );
         CHECK( cellElement.attributeNS(officeNS,"value-type",""), TQString("string" ) );
-        CHECK( cellElement.tqparentNode().isNull(), false );
-        CHECK( cellElement.tqparentNode()==rowElement, true );
+        CHECK( cellElement.parentNode().isNull(), false );
+        CHECK( cellElement.parentNode()==rowElement, true );
         CHECK( cellElement.firstChild().isNull(), false );
         CHECK( cellElement.lastChild().isNull(), false );
         cellElement = cellElement.nextSibling().toElement();
diff --git a/lib/kofficeui/KoCommandHistory.h b/lib/kofficeui/KoCommandHistory.h
index 08de0e45..34fd1b50 100644
--- a/lib/kofficeui/KoCommandHistory.h
+++ b/lib/kofficeui/KoCommandHistory.h
@@ -85,7 +85,7 @@ public:
 
     /**
      * Erases all the undo/redo history.
-     * Use this when reloading the data, for instance, since this tqinvalidates
+     * Use this when reloading the data, for instance, since this invalidates
      * all the commands.
      */
     void clear();
diff --git a/lib/kofficeui/KoContextCelp.h b/lib/kofficeui/KoContextCelp.h
index 36c51366..b21eba5b 100644
--- a/lib/kofficeui/KoContextCelp.h
+++ b/lib/kofficeui/KoContextCelp.h
@@ -220,7 +220,7 @@ class KOFFICEUI_EXPORT KoContextHelpAction : public KToggleAction
   TQ_OBJECT
 
 	public:
-		KoContextHelpAction( KActionCollection* tqparentCollection, TQWidget* tqparent = 0 );
+		KoContextHelpAction( KActionCollection* parentCollection, TQWidget* tqparent = 0 );
 		virtual ~KoContextHelpAction();
 
 	public slots:
diff --git a/lib/kofficeui/KoGeneralPropertyUi.ui b/lib/kofficeui/KoGeneralPropertyUi.ui
index c3191b46..688688c2 100644
--- a/lib/kofficeui/KoGeneralPropertyUi.ui
+++ b/lib/kofficeui/KoGeneralPropertyUi.ui
@@ -189,5 +189,5 @@
         <data format="PNG" length="1008">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b749444154388db59541681d551486bf49aef55c4965061b98815a5e20a5790b912c0d66d12c0381361004219bae0a45041111a92d28086a4110eaa68a8bd8b8a97121348b96b810cca6988281111a9c27446720afcc8516efa94e3b2e665e6244832e3c70b8cce5f2cf77cffc734e50d735830882600818060c3004046d1e14759b8f800a7858d7f5a360207cfe8df34f7627ba679d7367f27e7ea27425168bc71fb896ae24bd936eaddf5a5fa6e213e02ef0c00c48af5dbd76364a7837390e9d4a5b98128c0025d608e0f7f6d97b4eefc8389f8617d66f3a0b7c0894a63d395cf48b33d1d390f5bf40ef65f84ab116fcefe00a212f1441b04760ec38882854a0801c866854015e00aeee1203a6ec97273c0ebd57e02b873d1c926dc0daaab271ab400c68a5880989c785d98588a9698fd0ec872302e83120fa33f150ee7226517c95636dc8b73794e52b0e2a08432119174420ef29bd2de5a3b7338ac598f9451069c4dbb0c0a18170608d05147b58c83660a5159d3d1573720e92c482f1a846acad7a56ae3856967ac4719799d316314a53188681606820ec2b0f08dec3f5af1c5a29b3a762e6cf4094286a72dc8ee5fa9725b30b112fbe148211969772b4bfcf7e01100c88b1c682297145447a3b230c1b5291e68aee7ec2e5f74bb24d47b903e75e4b58bfe1c87e50d2d423b2dfdc03627ce5b146c88b120c241d884641519c8bb8fc564ebae99050989a8e60a4a43b19a295926f8356ff20dcd41804814a0947da8fb29370f99d926cb3b157382224472112c08018412b90bf20ef2306b047001392f61455cbda4ddf908e08f1d1905eafe0d2c59c742322cf14ad94b18e853d5734fedd4f5cd23d0e9d8e50f494b555cffc6244b9a34c9d8c4862b874117a5b05e75fced1fb8e380ee94e425e1c50631010657641d04a59b9e2585b2d39f74ac2e4b4a733e979f5cd84380e71fd022a989a0b199bd8e7e3bf23f6500953d3506cc7ac2cf558fe00d66f38bacf846020cf4a5c5f9bdaa2a4df28e96d4b2842ebe37dc275d92fdb7f5f11607e5188e32e2b9fe7a49b4a7abbd79cae203c1232733ae4bbaf95fcbe43ab88a2bf2b5a03f5ae707a27dd4a331997a821110333739ea9e98434f5e4db8d68d2b17427616c02d2390b5502a624fb1e805f8087401dd4754d100416c3ebcf3d2f17a2a4b194aa3270bdb4af17d37633da9b19c139483794bc505cc155e063e047da46ff18700c780ff889bda9f06ff367e033e034f02c303a201ea2e94a11f054bb5ada86c2c151b7d7f73413e02e50ee8ea620080cf038f0442b7a88ff36f37e6bc57f051e04ffd730fd03ef8bd61b5b2ca6900000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/lib/kofficeui/KoPageLayoutColumns.h b/lib/kofficeui/KoPageLayoutColumns.h
index 016eb767..09bad9d5 100644
--- a/lib/kofficeui/KoPageLayoutColumns.h
+++ b/lib/kofficeui/KoPageLayoutColumns.h
@@ -19,8 +19,8 @@
 
 // Description: Page Layout Dialog (sources)
 
-#ifndef kopagetqlayoutcolumns_h
-#define kopagetqlayoutcolumns_h
+#ifndef kopagelayoutcolumns_h
+#define kopagelayoutcolumns_h
 
 #include <KoUnit.h>
 #include <KoPageLayout.h>
diff --git a/lib/kofficeui/KoPageLayoutColumnsBase.ui b/lib/kofficeui/KoPageLayoutColumnsBase.ui
index 780bc792..325fe45e 100644
--- a/lib/kofficeui/KoPageLayoutColumnsBase.ui
+++ b/lib/kofficeui/KoPageLayoutColumnsBase.ui
@@ -95,5 +95,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/lib/kofficeui/KoPageLayoutHeader.h b/lib/kofficeui/KoPageLayoutHeader.h
index f1f9664f..da97f34c 100644
--- a/lib/kofficeui/KoPageLayoutHeader.h
+++ b/lib/kofficeui/KoPageLayoutHeader.h
@@ -16,8 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef kopagetqlayoutheader_h
-#define kopagetqlayoutheader_h
+#ifndef kopagelayoutheader_h
+#define kopagelayoutheader_h
 
 #include <KoUnit.h>
 #include <KoPageLayout.h>
diff --git a/lib/kofficeui/KoPageLayoutHeaderBase.ui b/lib/kofficeui/KoPageLayoutHeaderBase.ui
index 4488c6f4..b3bd7978 100644
--- a/lib/kofficeui/KoPageLayoutHeaderBase.ui
+++ b/lib/kofficeui/KoPageLayoutHeaderBase.ui
@@ -217,5 +217,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/lib/kofficeui/KoPageLayoutSize.h b/lib/kofficeui/KoPageLayoutSize.h
index aa5f23bd..f1f4f358 100644
--- a/lib/kofficeui/KoPageLayoutSize.h
+++ b/lib/kofficeui/KoPageLayoutSize.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef kopagetqlayoutsize_h
-#define kopagetqlayoutsize_h
+#ifndef kopagelayoutsize_h
+#define kopagelayoutsize_h
 
 #include <tqgroupbox.h>
 #include <KoGlobal.h>
diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp
index 002f3ebe..b2e7c94b 100644
--- a/lib/kofficeui/KoTabBar.cpp
+++ b/lib/kofficeui/KoTabBar.cpp
@@ -91,10 +91,10 @@ public:
     bool autoScroll;
 
     // calculate the bounding rectangle for each visible tab
-    void tqlayoutTabs();
+    void layoutTabs();
 
     // reposition scroll buttons
-    void tqlayoutButtons();
+    void layoutButtons();
 
     // find a tab whose bounding rectangle contains the pos
     // return -1 if no such tab is found
@@ -176,7 +176,7 @@ static const char * arrow_right_xpm[] = {
 "          "};
 
 
-void KoTabBarPrivate::tqlayoutTabs()
+void KoTabBarPrivate::layoutTabs()
 {
     tabRects.clear();
 
@@ -308,7 +308,7 @@ void KoTabBarPrivate::drawMoveMarker( TQPainter& painter, int x, int y )
     painter.setBrush( oldBrush );
 }
 
-void KoTabBarPrivate::tqlayoutButtons()
+void KoTabBarPrivate::layoutButtons()
 {
     int bw = tabbar->height();
     int w = tabbar->width();
@@ -375,7 +375,7 @@ KoTabBar::KoTabBar( TQWidget* tqparent, const char* name )
     d->scrollForwardButton = new TQToolButton( this );
     connect( d->scrollForwardButton, TQT_SIGNAL( clicked() ),
       this, TQT_SLOT( scrollForward() ) );
-    d->tqlayoutButtons();
+    d->layoutButtons();
     d->updateButtons();
 }
 
@@ -437,8 +437,8 @@ void KoTabBar::setReverseLayout( bool reverse )
     if( reverse != d->reverseLayout )
     {
         d->reverseLayout = reverse;
-        d->tqlayoutTabs();
-        d->tqlayoutButtons();
+        d->layoutTabs();
+        d->layoutButtons();
         d->updateButtons();
         update();
     }
@@ -505,7 +505,7 @@ void KoTabBar::scrollBack()
     d->firstTab--;
     if( d->firstTab < 1 ) d->firstTab = 1;
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     update();
 }
@@ -519,7 +519,7 @@ void KoTabBar::scrollForward()
     if( d->firstTab > (int)d->tabs.count() )
         d->firstTab = d->tabs.count();
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     update();
 }
@@ -530,7 +530,7 @@ void KoTabBar::scrollFirst()
         return;
 
     d->firstTab = 1;
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     update();
 }
@@ -540,7 +540,7 @@ void KoTabBar::scrollLast()
     if ( !canScrollForward() )
         return;
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
 
     if( !d->reverseLayout )
     {
@@ -561,11 +561,11 @@ void KoTabBar::scrollLast()
             int x = d->tabRects[ d->tabRects.count()-1 ].x();
             if( x > 0 ) break;
             d->firstTab++;
-            d->tqlayoutTabs();
+            d->layoutTabs();
         }
     }
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     update();
 }
@@ -669,7 +669,7 @@ void KoTabBar::paintEvent( TQPaintEvent* )
     if( !d->reverseLayout )
         painter.translate( 5, 0 );
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     
     // draw first all non-active, visible tabs
@@ -717,7 +717,7 @@ void KoTabBar::paintEvent( TQPaintEvent* )
 
 void KoTabBar::resizeEvent( TQResizeEvent* )
 {
-    d->tqlayoutButtons();
+    d->layoutButtons();
     d->updateButtons();
     update();
 }
@@ -751,7 +751,7 @@ void KoTabBar::mousePressEvent( TQMouseEvent* ev )
         return;
     }
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
 
     TQPoint pos = ev->pos();
     if( !d->reverseLayout ) pos = pos - TQPoint( d->offset,0 );
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 566a3722..4b5b1b4d 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -309,8 +309,8 @@ void KoColorPanel::mousePressEvent( TQMouseEvent* e )
 
 void KoColorPanel::mouseReleaseEvent( TQMouseEvent* )
 {
-    if ( isVisible() && tqparentWidget() && tqparentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
-        tqparentWidget()->close();
+    if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+        parentWidget()->close();
     emit colorSelected( mapToColor( m_pressedPos ) );
 }
 
@@ -425,8 +425,8 @@ void KoColorPanel::keyPressEvent( TQKeyEvent* e )
             e->ignore();
     }
     else if ( e->key() == TQt::Key_Return ) {
-        if ( isVisible() && tqparentWidget() && tqparentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
-            tqparentWidget()->close();
+        if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+            parentWidget()->close();
         emit colorSelected( mapToColor( m_focusPosition ) );
     }
     updateFocusPosition( newPos );
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index a0f514e2..2a9b383e 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -246,8 +246,8 @@ int KSelectColorAction::plug( TQWidget* w, int index )
         {
             /* ###### CHECK: We're not allowed to specify the instance in iconSet()
             KInstance *instance;
-            if ( tqparentCollection() )
-                instance = tqparentCollection()->instance();
+            if ( parentCollection() )
+                instance = parentCollection()->instance();
             else
                 instance = KGlobal::instance();
             */
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index e8040496..d3def7c9 100644
--- a/lib/kofficeui/tktoolbarbutton.cpp
+++ b/lib/kofficeui/tktoolbarbutton.cpp
@@ -332,7 +332,7 @@ bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
       case TQEvent::Hide:
         on(false);
         setDown(false);
-        if ( !tqgeometry().tqcontains(tqparentWidget()->mapFromGlobal(TQCursor::pos())) )
+        if ( !tqgeometry().tqcontains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
           leaveEvent(0L);
         return false;
         break;
diff --git a/lib/kopainter/koColorSlider.cc b/lib/kopainter/koColorSlider.cc
index a7674e4b..46f4d249 100644
--- a/lib/kopainter/koColorSlider.cc
+++ b/lib/kopainter/koColorSlider.cc
@@ -211,7 +211,7 @@ void KoSliderWidget::mouseMoveEvent(TQMouseEvent *e)
 {
   if(mDragging)
   {
-    TQWidget *p = tqparentWidget();
+    TQWidget *p = parentWidget();
 
     if(!p)
       return;
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index 880ccc9c..3c0a0940 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -474,9 +474,9 @@ Editor::slotPropertyChanged(Set& set, Property& property)
 		}
 
 /*	if (widget->property() && (TQWidget*)d->currentWidget==widget && d->currentItem->tqparent()) {
-		EditorItem *tqparentItem = static_cast<EditorItem*>(d->currentItem->tqparent());
+		EditorItem *parentItem = static_cast<EditorItem*>(d->currentItem->tqparent());
 		const int thisType = ;
-			&& tqparentItem->property()->type()==Rect) {
+			&& parentItem->property()->type()==Rect) {
 			//changing x or y components of Rect type shouldn't change width or height, respectively
 			if (thisType==Rect_X) {
 				EditorItem *rectWidthItem = static_cast<EditorItem*>(d->currentItem->nextSibling()->nextSibling());
@@ -981,8 +981,8 @@ Editor::handleKeyPress(TQKeyEvent* ev)
 void
 Editor::updateFont()
 {
-	setFont(tqparentWidget()->font());
-	d->baseRowHeight = TQFontMetrics(tqparentWidget()->font()).height() + itemMargin() * 2;
+	setFont(parentWidget()->font());
+	d->baseRowHeight = TQFontMetrics(parentWidget()->font()).height() + itemMargin() * 2;
 	if (!d->currentItem)
 		d->undoButton->resize(d->baseRowHeight, d->baseRowHeight);
 	else {
diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp
index 385ec891..ca6fe6c7 100644
--- a/lib/koproperty/editoritem.cpp
+++ b/lib/koproperty/editoritem.cpp
@@ -176,9 +176,9 @@ class GroupWidgetBase : public TQWidget
 class GroupWidget : public GroupWidgetBase
 {
 	public:
-		GroupWidget(EditorGroupItem *tqparentItem)
-		: GroupWidgetBase(tqparentItem->listView()->viewport())
-		, m_parentItem(tqparentItem)
+		GroupWidget(EditorGroupItem *parentItem)
+		: GroupWidgetBase(parentItem->listView()->viewport())
+		, m_parentItem(parentItem)
 		{
 		}
 
diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp
index b90485bb..c72a060d 100644
--- a/lib/koproperty/editors/spinbox.cpp
+++ b/lib/koproperty/editors/spinbox.cpp
@@ -48,7 +48,7 @@ IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntE
 
 void IntSpinBox::setValue(const TQVariant &value)
 {
-	if (dynamic_cast<IntEdit*>(tqparentWidget()) && dynamic_cast<IntEdit*>(tqparentWidget())->isReadOnly())
+	if (dynamic_cast<IntEdit*>(parentWidget()) && dynamic_cast<IntEdit*>(parentWidget())->isReadOnly())
 		return;
 	if (value.isNull())
 		editor()->clear();
@@ -66,13 +66,13 @@ IntSpinBox::eventFilter(TQObject *o, TQEvent *e)
 			TQKeyEvent* ev = TQT_TQKEYEVENT(e);
 			if((ev->key()==Key_Up || ev->key()==Key_Down) && ev->state() !=ControlButton)
 			{
-				tqparentWidget()->eventFilter(o, e);
+				parentWidget()->eventFilter(o, e);
 				return true;
 			}
 		}
 	}
 	if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->tqparent()) == TQT_BASE_OBJECT(this)) 
-		&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(tqparentWidget())->isReadOnly())
+		&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly())
 	{
 		return true; //avoid value changes for read-only widget
 	}
@@ -199,13 +199,13 @@ DoubleSpinBox::eventFilter(TQObject *o, TQEvent *e)
 			TQKeyEvent* ev = TQT_TQKEYEVENT(e);
 			if((ev->key()==Key_Up || ev->key()==Key_Down) && ev->state()!=ControlButton)
 			{
-				tqparentWidget()->eventFilter(o, e);
+				parentWidget()->eventFilter(o, e);
 				return true;
 			}
 		}
 	}
 	if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->tqparent()) == TQT_BASE_OBJECT(this)) 
-		&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(tqparentWidget())->isReadOnly())
+		&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly())
 	{
 		return true; //avoid value changes for read-only widget
 	}
@@ -216,7 +216,7 @@ DoubleSpinBox::eventFilter(TQObject *o, TQEvent *e)
 
 void DoubleSpinBox::setValue( const TQVariant& value )
 {
-	if (dynamic_cast<DoubleEdit*>(tqparentWidget()) && dynamic_cast<DoubleEdit*>(tqparentWidget())->isReadOnly())
+	if (dynamic_cast<DoubleEdit*>(parentWidget()) && dynamic_cast<DoubleEdit*>(parentWidget())->isReadOnly())
 		return;
 	if (value.isNull())
 		editor()->clear();
diff --git a/lib/koproperty/widget.cpp b/lib/koproperty/widget.cpp
index 1efeb5c0..dd44c2b0 100644
--- a/lib/koproperty/widget.cpp
+++ b/lib/koproperty/widget.cpp
@@ -122,7 +122,7 @@ Widget::eventFilter(TQObject*, TQEvent* e)
 			return true;
 		}
 		else {
-			Editor *list = static_cast<KoProperty::Editor*>(tqparentWidget()->tqparentWidget());
+			Editor *list = static_cast<KoProperty::Editor*>(parentWidget()->parentWidget());
 			if (!list)
 				return false; //for sanity
 			return list->handleKeyPress(ev);
diff --git a/lib/kotext/DESIGN b/lib/kotext/DESIGN
index dcb08ca7..4fd1e479 100644
--- a/lib/kotext/DESIGN
+++ b/lib/kotext/DESIGN
@@ -87,11 +87,11 @@ However font metrics are calculated from the 100%-zoom-level font (e.g. 12pt for
 and _then_ multiplied by 20, instead of loading a 240pt font for that as we did before.
 This is implemented by KoTextFormat::charWidth().
 
-On screen, at 100%, a tqlayoutUnitToFontSize(240,false)=(240/20)*1.0=20.0pt font size will be used.
+On screen, at 100%, a layoutUnitToFontSize(240,false)=(240/20)*1.0=20.0pt font size will be used.
 This does NOT depend on the DPI settings. Qt takes care of pt->pixel conversion for fonts.
 
 When printing... TODO, double-check whether Qt does pt->pixel conversion correctly
-(aptqparently it didn't, in Qt 2).
+(apparently it didn't, in Qt 2).
 
 QFont multiplies by 10 and stores into a 'short'... So for QFont the maximum font size
 is 3276, and in KOffice the maximum font size in points is around 163.
diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp
index d979fc66..bcbdde6b 100644
--- a/lib/kotext/KFontDialog_local.cpp
+++ b/lib/kotext/KFontDialog_local.cpp
@@ -733,11 +733,11 @@ void KFontChooser_local::showXLFDArea(bool show)
 {
   if( show )
   {
-    xlfdEdit->tqparentWidget()->show();
+    xlfdEdit->parentWidget()->show();
   }
   else
   {
-    xlfdEdit->tqparentWidget()->hide();
+    xlfdEdit->parentWidget()->hide();
   }
 }
 
diff --git a/lib/kotext/KoCompletionBase.ui b/lib/kotext/KoCompletionBase.ui
index 97beae8c..12ae9d5d 100644
--- a/lib/kotext/KoCompletionBase.ui
+++ b/lib/kotext/KoCompletionBase.ui
@@ -366,5 +366,5 @@ This option is most important when Automatically add words to completion list is
         <slot>setValue(int)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp
index 41c10239..e3196085 100644
--- a/lib/kotext/KoComplexText.cpp
+++ b/lib/kotext/KoComplexText.cpp
@@ -48,7 +48,7 @@
 
 /* a small helper class used internally to resolve Bidi embedding levels.
    Each line of text caches the embedding level at the start of the line for faster
-   retqlayouting
+   relayouting
 */
 KoBidiContext::KoBidiContext( uchar l, TQChar::Direction e, KoBidiContext *p, bool o )
     : level(l) , override(o), dir(e)
diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp
index 7373ec0e..93f3a21e 100644
--- a/lib/kotext/KoFontDia.cpp
+++ b/lib/kotext/KoFontDia.cpp
@@ -90,12 +90,12 @@ KoFontDia::KoFontDia( const KoTextFormat& initialFormat,
     connect( decorationTab, TQT_SIGNAL( shadowDirectionChanged( int ) ), this, TQT_SLOT( slotShadowDirectionChanged( int ) ) );
 
     //Layout tab
-    tqlayoutTab = new KoLayoutTab( true, this );
-    fontTabWidget->addTab( tqlayoutTab, i18n( "Layout" ) );
-    connect( tqlayoutTab, TQT_SIGNAL( subSuperScriptChanged() ), this, TQT_SLOT( slotSubSuperChanged() ) );;
-    connect( tqlayoutTab, TQT_SIGNAL( offsetChanged( int ) ), this, TQT_SLOT( slotOffsetChanged( int ) ) );
-    connect( tqlayoutTab, TQT_SIGNAL( relativeSizeChanged( double ) ), this, TQT_SLOT( slotRelativeSizeChanged( double ) ) );
-    connect( tqlayoutTab, TQT_SIGNAL( hyphenationChanged( bool ) ), this, TQT_SLOT( slotHyphenationChanged( bool ) ) );
+    layoutTab = new KoLayoutTab( true, this );
+    fontTabWidget->addTab( layoutTab, i18n( "Layout" ) );
+    connect( layoutTab, TQT_SIGNAL( subSuperScriptChanged() ), this, TQT_SLOT( slotSubSuperChanged() ) );;
+    connect( layoutTab, TQT_SIGNAL( offsetChanged( int ) ), this, TQT_SLOT( slotOffsetChanged( int ) ) );
+    connect( layoutTab, TQT_SIGNAL( relativeSizeChanged( double ) ), this, TQT_SLOT( slotRelativeSizeChanged( double ) ) );
+    connect( layoutTab, TQT_SIGNAL( hyphenationChanged( bool ) ), this, TQT_SLOT( slotHyphenationChanged( bool ) ) );
 
     //Language tab
     languageTab = new KoLanguageTab( broker, this );
@@ -123,7 +123,7 @@ void KoFontDia::init()
 KoTextFormat KoFontDia::newFormat() const
 {
     return KoTextFormat( fontTab->getSelection(),
-                         tqlayoutTab->getSubSuperScript(),
+                         layoutTab->getSubSuperScript(),
                          decorationTab->getTextColor(),
                          decorationTab->getBackgroundColor(),
                          highlightingTab->getUnderlineColor(),
@@ -133,10 +133,10 @@ KoTextFormat KoFontDia::newFormat() const
                          highlightingTab->getStrikethroughStyle(),
                          highlightingTab->getCapitalisation(),
                          languageTab->getLanguage(),
-                         tqlayoutTab->getRelativeTextSize(),
-                         tqlayoutTab->getOffsetFromBaseline(),
+                         layoutTab->getRelativeTextSize(),
+                         layoutTab->getOffsetFromBaseline(),
                          highlightingTab->getWordByWord(),
-                         tqlayoutTab->getAutoHyphenation(),
+                         layoutTab->getAutoHyphenation(),
                          decorationTab->getShadowDistanceX(),
                          decorationTab->getShadowDistanceY(),
                          decorationTab->getShadowColor()
@@ -167,8 +167,8 @@ void KoFontDia::slotReset()
     decorationTab->setTextColor( m_initialFormat.color() );
     decorationTab->setBackgroundColor( m_initialFormat.textBackgroundColor() );
     decorationTab->setShadow( m_initialFormat.shadowDistanceX(), m_initialFormat.shadowDistanceY(), m_initialFormat.shadowColor() );
-    tqlayoutTab->setSubSuperScript( m_initialFormat.vAlign(), m_initialFormat.offsetFromBaseLine(), m_initialFormat.relativeTextSize() );
-    tqlayoutTab->setAutoHyphenation( m_initialFormat.hyphenation() );
+    layoutTab->setSubSuperScript( m_initialFormat.vAlign(), m_initialFormat.offsetFromBaseLine(), m_initialFormat.relativeTextSize() );
+    layoutTab->setAutoHyphenation( m_initialFormat.hyphenation() );
     languageTab->setLanguage( m_initialFormat.language() );
 }
 
@@ -276,19 +276,19 @@ void KoFontDia::slotShadowColorChanged( const TQColor & )
 void KoFontDia::slotSubSuperChanged()
 {
     m_changedFlags |= KoTextFormat::VAlign;
-    fontDiaPreview->setSubSuperscript( tqlayoutTab->getSubSuperScript(), tqlayoutTab->getOffsetFromBaseline(), tqlayoutTab->getRelativeTextSize() );
+    fontDiaPreview->setSubSuperscript( layoutTab->getSubSuperScript(), layoutTab->getOffsetFromBaseline(), layoutTab->getRelativeTextSize() );
 }
 
 void KoFontDia::slotOffsetChanged( int offset )
 {
     m_changedFlags |= KoTextFormat::OffsetFromBaseLine;
-    fontDiaPreview->setSubSuperscript( tqlayoutTab->getSubSuperScript(), offset, tqlayoutTab->getRelativeTextSize() );
+    fontDiaPreview->setSubSuperscript( layoutTab->getSubSuperScript(), offset, layoutTab->getRelativeTextSize() );
 }
 
 void KoFontDia::slotRelativeSizeChanged( double relativeSize )
 {
     m_changedFlags |= KoTextFormat::VAlign;
-    fontDiaPreview->setSubSuperscript( tqlayoutTab->getSubSuperScript(), tqlayoutTab->getOffsetFromBaseline(), relativeSize );
+    fontDiaPreview->setSubSuperscript( layoutTab->getSubSuperScript(), layoutTab->getOffsetFromBaseline(), relativeSize );
 }
 
 void KoFontDia::slotHyphenationChanged( bool )
diff --git a/lib/kotext/KoFontDia.h b/lib/kotext/KoFontDia.h
index cd170764..ebd4a93f 100644
--- a/lib/kotext/KoFontDia.h
+++ b/lib/kotext/KoFontDia.h
@@ -91,7 +91,7 @@ private:
     KoFontTab *fontTab;
     KoHighlightingTab *highlightingTab;
     KoDecorationTab *decorationTab;
-    KoLayoutTab *tqlayoutTab;
+    KoLayoutTab *layoutTab;
     KoLanguageTab *languageTab;
     KoFontDiaPreview *fontDiaPreview;
 
diff --git a/lib/kotext/KoLayoutTab.h b/lib/kotext/KoLayoutTab.h
index 6620721d..611e3afa 100644
--- a/lib/kotext/KoLayoutTab.h
+++ b/lib/kotext/KoLayoutTab.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kotqlayouttab_h__
-#define __kotqlayouttab_h__
+#ifndef __kolayouttab_h__
+#define __kolayouttab_h__
 
 #include <kolayouttabbase.h>
 #include <KoTextFormat.h>
diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp
index 71887c2c..b5058f1b 100644
--- a/lib/kotext/KoParagCounter.cpp
+++ b/lib/kotext/KoParagCounter.cpp
@@ -729,7 +729,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph )
 
                 str.append('.'); // hardcoded on purpose (like OO) until anyone complains
 
-                // Find the number of missing tqparents, and add dummy text for them.
+                // Find the number of missing parents, and add dummy text for them.
                 int missingParents = m_depth - level - p->counter()->m_depth;
                 //kdDebug() << "levelText = " << str << " missingParents=" << missingParents << endl;
                 level += missingParents;
@@ -742,7 +742,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph )
                 if ( level < displayLevels ) // no need to calc it if we won't use it
                     p = counter->tqparent( p );
             }
-            else // toplevel tqparents are missing
+            else // toplevel parents are missing
             {
                 // Special case for one-paragraph-documents like preview widgets
                 KoTextDocument* textdoc = paragraph->textDocument();
diff --git a/lib/kotext/KoParagDecorationTab.ui b/lib/kotext/KoParagDecorationTab.ui
index c3892601..4c93c261 100644
--- a/lib/kotext/KoParagDecorationTab.ui
+++ b/lib/kotext/KoParagDecorationTab.ui
@@ -388,7 +388,7 @@ regardless of the style of the preceeding and subsequent paragraphs.&lt;/p&gt;</
         <data format="PNG" length="101">89504e470d0a1a0a0000000d49484452000000140000001408060000008d891d0d0000002c49444154388d63601805b400ffc9a4e90748b571d48594db38ea42ca6d4451cf422543e180895c8da3000e00765a11f509a137610000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp
index 02949bb0..65cc1f2e 100644
--- a/lib/kotext/KoParagDia.cpp
+++ b/lib/kotext/KoParagDia.cpp
@@ -173,7 +173,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp
     connect( spnStart, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( startChanged(int) ) );
     connect( spnDepth, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( depthChanged(int) ) );
     connect( spnDisplayLevels, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( displayLevelsChanged(int) ) );
-    connect( cbAlignment, TQT_SIGNAL( activated (const TQString&) ), this, TQT_SLOT( tqalignmentChanged(const TQString&) ) );
+    connect( cbAlignment, TQT_SIGNAL( activated (const TQString&) ), this, TQT_SLOT( alignmentChanged(const TQString&) ) );
     noSignals = false;
     if ( disableAll )
     {
@@ -192,7 +192,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp
     }
 }
 
-void KoCounterStyleWidget::tqalignmentChanged(const TQString& s)
+void KoCounterStyleWidget::alignmentChanged(const TQString& s)
 {
     int a;
     if(s==i18n("Align Left"))
@@ -206,7 +206,7 @@ void KoCounterStyleWidget::tqalignmentChanged(const TQString& s)
         return;
     }
     m_counter.tqsetAlignment(a);
-    emit sig_tqalignmentChanged(a);
+    emit sig_alignmentChanged(a);
 }
 
 void KoCounterStyleWidget::setCounter( const KoParagCounter& counter )
@@ -866,7 +866,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
     TQString unitName = KoUnit::unitName( m_unit );
     TQGridLayout *mainGrid = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
-    // mainGrid gives equal space to each groupbox, aptqparently
+    // mainGrid gives equal space to each groupbox, apparently
     // I tried setRowStretch but the result is awful (much space between them and not equal!)
     // Any other way (in order to make the 2nd, the one with a single checkbox, a bit
     // smaller than the other 3) ? (DF)
@@ -1639,7 +1639,7 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * tqparent
     connect( m_styleWidget, TQT_SIGNAL( sig_restartChanged(bool) ), this, TQT_SLOT( restartChanged(bool) ) );
     connect( m_styleWidget, TQT_SIGNAL( sig_depthChanged (int) ), this, TQT_SLOT( depthChanged(int) ) );
     connect( m_styleWidget, TQT_SIGNAL( sig_displayLevelsChanged (int) ), this, TQT_SLOT( displayLevelsChanged(int) ) );
-    connect( m_styleWidget, TQT_SIGNAL( sig_tqalignmentChanged (int) ), this, TQT_SLOT( tqalignmentChanged(int) ) );
+    connect( m_styleWidget, TQT_SIGNAL( sig_alignmentChanged (int) ), this, TQT_SLOT( alignmentChanged(int) ) );
     connect( m_styleWidget, TQT_SIGNAL( changeCustomBullet( const TQString & , TQChar ) ), this, TQT_SLOT( slotChangeCustomBullet( const TQString & , TQChar ) ) );
 
     connect( m_styleWidget, TQT_SIGNAL( sig_numTypeChanged( int ) ), this, TQT_SLOT( numTypeChanged(int ) ) );
@@ -2210,19 +2210,19 @@ void KoParagDia::setCurrentPage( int page )
     switch( page )
     {
     case PD_SPACING:
-        showPage( pageIndex( m_indentSpacingWidget->tqparentWidget() ) );
+        showPage( pageIndex( m_indentSpacingWidget->parentWidget() ) );
         break;
     case PD_ALIGN:
-        showPage( pageIndex( m_alignWidget->tqparentWidget() ) );
+        showPage( pageIndex( m_alignWidget->parentWidget() ) );
         break;
     case PD_DECORATION:
-        showPage( pageIndex( m_decorationsWidget->tqparentWidget() ) );
+        showPage( pageIndex( m_decorationsWidget->parentWidget() ) );
         break;
     case PD_NUMBERING:
-        showPage( pageIndex( m_counterWidget->tqparentWidget() ) );
+        showPage( pageIndex( m_counterWidget->parentWidget() ) );
         break;
     case PD_TABS:
-        showPage( pageIndex( m_tabulatorsWidget->tqparentWidget() ) );
+        showPage( pageIndex( m_tabulatorsWidget->parentWidget() ) );
         break;
     default:
         break;
diff --git a/lib/kotext/KoParagDia.h b/lib/kotext/KoParagDia.h
index 1c776af6..6de8115e 100644
--- a/lib/kotext/KoParagDia.h
+++ b/lib/kotext/KoParagDia.h
@@ -302,7 +302,7 @@ signals:
     void sig_suffixChanged(const TQString &);
     void sig_prefixChanged(const TQString &);
     void sig_numTypeChanged( int );
-    void sig_tqalignmentChanged( int );
+    void sig_alignmentChanged( int );
     void changeCustomBullet( const TQString & , TQChar );
     void changeStyle( KoParagCounter::Style );
 protected slots:
@@ -310,7 +310,7 @@ protected slots:
     void restartChanged(bool b) {m_counter.setRestartCounter(b);emit sig_restartChanged(b);}
     void depthChanged(int i) {m_counter.setDepth(i);emit sig_depthChanged(i);}
     void displayLevelsChanged(int i) {m_counter.setDisplayLevels(i);emit sig_displayLevelsChanged(i);}
-    void tqalignmentChanged(const TQString& s);
+    void alignmentChanged(const TQString& s);
     void suffixChanged(const TQString & txt) {m_counter.setSuffix(txt);emit sig_suffixChanged(txt); }
     void prefixChanged(const TQString & txt) {m_counter.setPrefix(txt);emit sig_prefixChanged(txt); }
 
@@ -369,7 +369,7 @@ protected slots:
     void restartChanged(bool b) {m_counter.setRestartCounter(b); }
     void depthChanged(int i) {m_counter.setDepth(i); updatePreview();}
     void displayLevelsChanged(int i) {m_counter.setDisplayLevels(i); updatePreview();}
-    void tqalignmentChanged(int i) {m_counter.tqsetAlignment(i); updatePreview();}
+    void alignmentChanged(int i) {m_counter.tqsetAlignment(i); updatePreview();}
     void slotChangeCustomBullet( const TQString & f, TQChar c);
     void styleChanged (KoParagCounter::Style st );
 
diff --git a/lib/kotext/KoParagLayout.cpp b/lib/kotext/KoParagLayout.cpp
index 8cb9682f..129c4d4a 100644
--- a/lib/kotext/KoParagLayout.cpp
+++ b/lib/kotext/KoParagLayout.cpp
@@ -141,7 +141,7 @@ KoParagLayout::~KoParagLayout()
     delete counter;
 }
 
-void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& tqparentElem, int docVersion )
+void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& parentElem, int docVersion )
 {
     // tqlayout is an input and output parameter
     // It can have been initialized already, e.g. by copying from a style
@@ -152,7 +152,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
     // there is no way to differentiate between "I want no tabs in the parag"
     // and "use default from style".
     KoTabulatorList tabList;
-    TQDomElement element = tqparentElem.firstChild().toElement();
+    TQDomElement element = parentElem.firstChild().toElement();
     for ( ; !element.isNull() ; element = element.nextSibling().toElement() )
     {
         if ( element.tagName() == "TABULATOR" )
@@ -173,7 +173,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
     qHeapSort( tabList );
     tqlayout.setTabList( tabList );
     tqlayout.tqalignment = TQt::AlignAuto;
-    element = tqparentElem.namedItem( "FLOW" ).toElement(); // Flow is what is now called tqalignment internally
+    element = parentElem.namedItem( "FLOW" ).toElement(); // Flow is what is now called tqalignment internally
     if ( !element.isNull() )
     {
         TQString flow = element.attribute( "align" ); // KWord-1.0 DTD
@@ -203,32 +203,32 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
 
     if ( docVersion < 2 )
     {
-        element = tqparentElem.namedItem( "OHEAD" ).toElement(); // used by KWord-0.8
+        element = parentElem.namedItem( "OHEAD" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
             tqlayout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "pt", 0.0 );
 
-        element = tqparentElem.namedItem( "OFOOT" ).toElement(); // used by KWord-0.8
+        element = parentElem.namedItem( "OFOOT" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
             tqlayout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "pt", 0.0 );
 
-        element = tqparentElem.namedItem( "IFIRST" ).toElement(); // used by KWord-0.8
+        element = parentElem.namedItem( "IFIRST" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
             tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "pt", 0.0 );
 
-        element = tqparentElem.namedItem( "ILEFT" ).toElement(); // used by KWord-0.8
+        element = parentElem.namedItem( "ILEFT" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
             tqlayout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "pt", 0.0 );
     }
 
     // KWord-1.0 DTD
-    element = tqparentElem.namedItem( "INDENTS" ).toElement();
+    element = parentElem.namedItem( "INDENTS" ).toElement();
     if ( !element.isNull() )
     {
         tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "first", 0.0 );
         tqlayout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "left", 0.0 );
         tqlayout.margins[TQStyleSheetItem::MarginRight] = getAttribute( element, "right", 0.0 );
     }
-    element = tqparentElem.namedItem( "OFFSETS" ).toElement();
+    element = parentElem.namedItem( "OFFSETS" ).toElement();
     if ( !element.isNull() )
     {
         tqlayout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "before", 0.0 );
@@ -237,7 +237,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
 
     if ( docVersion < 2 )
     {
-        element = tqparentElem.namedItem( "LINESPACE" ).toElement(); // used by KWord-0.8
+        element = parentElem.namedItem( "LINESPACE" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
         {
             tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM;
@@ -245,7 +245,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
         }
     }
 
-    element = tqparentElem.namedItem( "LINESPACING" ).toElement(); // KWord-1.0 DTD
+    element = parentElem.namedItem( "LINESPACING" ).toElement(); // KWord-1.0 DTD
     if ( !element.isNull() )
     {
         //compatibility with koffice 1.1
@@ -307,7 +307,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
     }
 
     int pageBreaking = 0;
-    element = tqparentElem.namedItem( "PAGEBREAKING" ).toElement();
+    element = parentElem.namedItem( "PAGEBREAKING" ).toElement();
     if ( !element.isNull() )
     {
         if ( element.attribute( "linesTogether" ) == "true" )
@@ -319,37 +319,37 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
     }
     if ( docVersion < 2 )
     {
-        element = tqparentElem.namedItem( "HARDBRK" ).toElement(); // KWord-0.8
+        element = parentElem.namedItem( "HARDBRK" ).toElement(); // KWord-0.8
         if ( !element.isNull() )
             pageBreaking |= KoParagLayout::HardFrameBreakBefore;
     }
     tqlayout.pageBreaking = pageBreaking;
 
-    element = tqparentElem.namedItem( "LEFTBORDER" ).toElement();
+    element = parentElem.namedItem( "LEFTBORDER" ).toElement();
     if ( !element.isNull() )
         tqlayout.leftBorder = KoBorder::loadBorder( element );
     else
         tqlayout.leftBorder.setPenWidth(0);
 
-    element = tqparentElem.namedItem( "RIGHTBORDER" ).toElement();
+    element = parentElem.namedItem( "RIGHTBORDER" ).toElement();
     if ( !element.isNull() )
         tqlayout.rightBorder = KoBorder::loadBorder( element );
     else
         tqlayout.rightBorder.setPenWidth(0);
 
-    element = tqparentElem.namedItem( "TOPBORDER" ).toElement();
+    element = parentElem.namedItem( "TOPBORDER" ).toElement();
     if ( !element.isNull() )
         tqlayout.topBorder = KoBorder::loadBorder( element );
     else
         tqlayout.topBorder.setPenWidth(0);
 
-    element = tqparentElem.namedItem( "BOTTOMBORDER" ).toElement();
+    element = parentElem.namedItem( "BOTTOMBORDER" ).toElement();
     if ( !element.isNull() )
         tqlayout.bottomBorder = KoBorder::loadBorder( element );
     else
         tqlayout.bottomBorder.setPenWidth(0);
 
-    element = tqparentElem.namedItem( "COUNTER" ).toElement();
+    element = parentElem.namedItem( "COUNTER" ).toElement();
     if ( !element.isNull() )
     {
         tqlayout.counter = new KoParagCounter;
@@ -357,7 +357,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
     }
 
     // Compatibility with KOffice-1.2
-    element = tqparentElem.namedItem( "SHADOW" ).toElement();
+    element = parentElem.namedItem( "SHADOW" ).toElement();
     if ( !element.isNull() && element.hasAttribute("direction") )
     {
         int shadowDistance = element.attribute("distance").toInt();
@@ -658,19 +658,19 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex
     }
 }
 
-void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignment ) const
+void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int tqalignment ) const
 {
     const KoParagLayout& tqlayout = *this; // code moved from somewhere else;)
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement element = doc.createElement( "NAME" );
-    tqparentElem.appendChild( element );
+    parentElem.appendChild( element );
     if ( tqlayout.style )
         element.setAttribute( "value", tqlayout.style->displayName() );
     //else
     //    kdWarning() << "KoParagLayout::saveParagLayout: style==0!" << endl;
 
     element = doc.createElement( "FLOW" );
-    tqparentElem.appendChild( element );
+    parentElem.appendChild( element );
 
     element.setAttribute( "align", tqalignment==TQt::AlignRight ? "right" :
                           tqalignment==TQt::AlignHCenter ? "center" :
@@ -688,7 +688,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen
          tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 )
     {
         element = doc.createElement( "INDENTS" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 )
             element.setAttribute( "first", tqlayout.margins[TQStyleSheetItem::MarginFirstLine] );
         if ( tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 )
@@ -701,7 +701,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen
          tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 )
     {
         element = doc.createElement( "OFFSETS" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 )
             element.setAttribute( "before", tqlayout.margins[TQStyleSheetItem::MarginTop] );
         if ( tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 )
@@ -710,7 +710,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen
     if ( tqlayout.lineSpacingType != LS_SINGLE )
     {
         element = doc.createElement( "LINESPACING" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if ( tqlayout.lineSpacingType == KoParagLayout::LS_ONEANDHALF )  {
             element.setAttribute( "type", "oneandhalf" );
             element.setAttribute( "value", "oneandhalf" ); //compatibility with koffice 1.2
@@ -747,7 +747,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen
     if ( tqlayout.pageBreaking != 0 )
     {
         element = doc.createElement( "PAGEBREAKING" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if ( tqlayout.pageBreaking & KoParagLayout::KeepLinesTogether )
             element.setAttribute( "linesTogether",  "true" );
         if ( tqlayout.pageBreaking & KoParagLayout::HardFrameBreakBefore )
@@ -759,31 +759,31 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen
     if ( tqlayout.leftBorder.penWidth() > 0 )
     {
         element = doc.createElement( "LEFTBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         tqlayout.leftBorder.save( element );
     }
     if ( tqlayout.rightBorder.penWidth() > 0 )
     {
         element = doc.createElement( "RIGHTBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         tqlayout.rightBorder.save( element );
     }
     if ( tqlayout.topBorder.penWidth() > 0 )
     {
         element = doc.createElement( "TOPBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         tqlayout.topBorder.save( element );
     }
     if ( tqlayout.bottomBorder.penWidth() > 0 )
     {
         element = doc.createElement( "BOTTOMBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         tqlayout.bottomBorder.save( element );
     }
     if ( tqlayout.counter && tqlayout.counter->numbering() != KoParagCounter::NUM_NONE )
     {
         element = doc.createElement( "COUNTER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if ( tqlayout.counter )
             tqlayout.counter->save( element );
     }
@@ -793,7 +793,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen
     for ( ; it != tabList.end() ; it++ )
     {
         element = doc.createElement( "TABULATOR" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "type", (*it).type );
         element.setAttribute( "ptpos", (*it).ptPos );
         element.setAttribute( "filling", (*it).filling );
diff --git a/lib/kotext/KoParagLayout.h b/lib/kotext/KoParagLayout.h
index a60d3934..2c9b9dea 100644
--- a/lib/kotext/KoParagLayout.h
+++ b/lib/kotext/KoParagLayout.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef koparagtqlayout_h
-#define koparagtqlayout_h
+#ifndef koparaglayout_h
+#define koparaglayout_h
 
 #include <KoRuler.h> // for KoTabulatorList
 #include <tqdom.h>
@@ -135,12 +135,12 @@ public:
     /** Save this parag tqlayout to XML.
      * This format is used by KWord for paragraphs, and by KPresenter+KWord for styles.
      */
-    void saveParagLayout( TQDomElement & tqparentElem, int tqalignment ) const;
+    void saveParagLayout( TQDomElement & parentElem, int tqalignment ) const;
 
     /** Load this parag tqlayout from XML.
      * This format is used by KWord for paragraphs, and by KPresenter+KWord for styles.
      */
-    static void loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& tqparentElem, int docVersion = 2 );
+    static void loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& parentElem, int docVersion = 2 );
 
     /// Load this parag tqlayout from Oasis XML
     static void loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContext& context );
diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp
index e3bf15e9..f44bcd59 100644
--- a/lib/kotext/KoParagStyle.cpp
+++ b/lib/kotext/KoParagStyle.cpp
@@ -86,32 +86,32 @@ void KoParagStyle::setFollowingStyle( KoParagStyle *fst )
   m_followingStyle = fst;
 }
 
-void KoParagStyle::saveStyle( TQDomElement & tqparentElem )
+void KoParagStyle::saveStyle( TQDomElement & parentElem )
 {
-    m_paragLayout.saveParagLayout( tqparentElem, m_paragLayout.tqalignment );
+    m_paragLayout.saveParagLayout( parentElem, m_paragLayout.tqalignment );
 
     if ( followingStyle() )
     {
-        TQDomElement element = tqparentElem.ownerDocument().createElement( "FOLLOWING" );
-        tqparentElem.appendChild( element );
+        TQDomElement element = parentElem.ownerDocument().createElement( "FOLLOWING" );
+        parentElem.appendChild( element );
         element.setAttribute( "name", followingStyle()->displayName() );
     }
     // TODO save tqparent style, and inherited flags.
 
-    tqparentElem.setAttribute( "outline", m_bOutline ? "true" : "false" );
+    parentElem.setAttribute( "outline", m_bOutline ? "true" : "false" );
 }
 
-void KoParagStyle::loadStyle( TQDomElement & tqparentElem, int docVersion )
+void KoParagStyle::loadStyle( TQDomElement & parentElem, int docVersion )
 {
     KoParagLayout tqlayout;
-    KoParagLayout::loadParagLayout( tqlayout, tqparentElem, docVersion );
+    KoParagLayout::loadParagLayout( tqlayout, parentElem, docVersion );
 
     // This way, KoTextParag::setParagLayout also sets the style pointer, to this style
     tqlayout.style = this;
     m_paragLayout = tqlayout;
 
     // Load name
-    TQDomElement nameElem = tqparentElem.namedItem("NAME").toElement();
+    TQDomElement nameElem = parentElem.namedItem("NAME").toElement();
     if ( !nameElem.isNull() ) {
         m_name = nameElem.attribute("value");
         m_displayName = i18n( "Style name", m_name.utf8() );
@@ -120,7 +120,7 @@ void KoParagStyle::loadStyle( TQDomElement & tqparentElem, int docVersion )
 
     // The followingStyle stuff has to be done after loading all styles.
 
-    m_bOutline = tqparentElem.attribute( "outline" ) == "true";
+    m_bOutline = parentElem.attribute( "outline" ) == "true";
 }
 
 void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context )
@@ -137,7 +137,7 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context
     m_bOutline = styleElem.hasAttributeNS( KoXmlNS::style, "default-outline-level" );
 
     context.styleStack().save();
-    context.addStyles( &styleElem, "paragraph" ); // Load all tqparents - only because we don't support inheritance.
+    context.addStyles( &styleElem, "paragraph" ); // Load all parents - only because we don't support inheritance.
     KoParagLayout tqlayout;
     KoParagLayout::loadOasisParagLayout( tqlayout, context );
 
@@ -187,9 +187,9 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context
     context.styleStack().restore();
 }
 
-TQString KoParagStyle::saveStyle( KoGenStyles& genStyles, int styleType, const TQString& tqparentStyleName, KoSavingContext& context ) const
+TQString KoParagStyle::saveStyle( KoGenStyles& genStyles, int styleType, const TQString& parentStyleName, KoSavingContext& context ) const
 {
-    KoGenStyle gs( styleType, "paragraph", tqparentStyleName );
+    KoGenStyle gs( styleType, "paragraph", parentStyleName );
 
     gs.addAttribute( "style:display-name", m_displayName );
     if ( m_paragLayout.counter ) {
diff --git a/lib/kotext/KoParagStyle.h b/lib/kotext/KoParagStyle.h
index 46e4f242..190ad345 100644
--- a/lib/kotext/KoParagStyle.h
+++ b/lib/kotext/KoParagStyle.h
@@ -73,18 +73,18 @@ public:
 
     /// Saves the name, tqlayout, the following style and the outline bool. Not the format.
     /// @deprecated  (1.3 format)
-    void saveStyle( TQDomElement & tqparentElem );
+    void saveStyle( TQDomElement & parentElem );
     /// Loads the name, tqlayout and the outline bool. Not the "following style" nor the format.
     /// (1.3 format)
-    void loadStyle( TQDomElement & tqparentElem, int docVersion = 2 );
+    void loadStyle( TQDomElement & parentElem, int docVersion = 2 );
 
     /// Load the style from OASIS
     void loadStyle( TQDomElement & styleElem, KoOasisContext& context );
     /// Save the style to OASIS
     /// Don't use, use the method in KoStyleCollection instead
-    TQString saveStyle( KoGenStyles& genStyles, int styleType, const TQString& tqparentStyleName, KoSavingContext& context ) const;
+    TQString saveStyle( KoGenStyles& genStyles, int styleType, const TQString& parentStyleName, KoSavingContext& context ) const;
 
-    KoParagStyle * tqparentStyle() const {return m_parentStyle;}
+    KoParagStyle * parentStyle() const {return m_parentStyle;}
     void setParentStyle( KoParagStyle *_style){ m_parentStyle = _style;}
 
     int inheritedParagLayoutFlag() const { return m_inheritedParagLayoutFlag; }
diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp
index dc6c6922..157f79a8 100644
--- a/lib/kotext/KoRichText.cpp
+++ b/lib/kotext/KoRichText.cpp
@@ -939,7 +939,7 @@ bool KoTextCursor::removePreviousChar()
     } else if ( string->prev() ) {
 	string = string->prev();
 	string->join( string->next() );
-	string->tqinvalidateCounters();
+	string->invalidateCounters();
 	return TRUE;
     }
     return FALSE;
@@ -965,7 +965,7 @@ bool KoTextCursor::remove()
 	    string = p;
 	    string->tqinvalidate( 0 );
             //// kotext
-            string->tqinvalidateCounters();
+            string->invalidateCounters();
             ////
 	    KoTextParag *s = string;
 	    while ( s ) {
@@ -1242,7 +1242,7 @@ void KoTextString::checkBidi() const
     const KoTextStringChar *start = data.data();
     const KoTextStringChar *end = start + length;
 
-    // determines the properties we need for tqlayouting
+    // determines the properties we need for layouting
 #ifdef USE_QT4
     #warning "KoTextString::checkBidi() for Qt4 partially implemented"
     printf("[WARNING] KoTextString::checkBidi() partially implemented\n\r");
diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp
index 9017d8a1..ef925289 100644
--- a/lib/kotext/KoStyleManager.cpp
+++ b/lib/kotext/KoStyleManager.cpp
@@ -318,7 +318,7 @@ void KoStyleManager::updateGUI() {
         }
     }
 
-    TQString inheritName = m_currentStyle->tqparentStyle() ? m_currentStyle->tqparentStyle()->displayName() : TQString();
+    TQString inheritName = m_currentStyle->parentStyle() ? m_currentStyle->parentStyle()->displayName() : TQString();
     kdDebug(32500) << "KoStyleManager::updateGUI updating combo to " << inheritName << endl;
     for ( int i = 0; i < m_inheritCombo->count(); i++ ) {
         if ( m_inheritCombo->text( i ) == inheritName ) {
@@ -449,7 +449,7 @@ void KoStyleManager::updateInheritStyle( KoParagStyle *s )
         //when we remove style, we must replace inherite style to 0L
         //when tqparent style was removed.
         //##########Laurent change inherited style attribute
-        if ( p->tqparentStyle() == s)
+        if ( p->parentStyle() == s)
             p->setParentStyle(0L);
     }
 
diff --git a/lib/kotext/KoStyleManager.h b/lib/kotext/KoStyleManager.h
index 10dbf8e6..328668fd 100644
--- a/lib/kotext/KoStyleManager.h
+++ b/lib/kotext/KoStyleManager.h
@@ -181,7 +181,7 @@ private:
 Font            simple font dia
 Color           simple color dia
 Spacing and Indents     paragraph spacing dia (KWParagDia)
-tqalignments      KoParagDia tqalignment tab
+alignments      KoParagDia tqalignment tab
 borders         KoParagDia  borders tab
 numbering       KoParagDia  tab numbering
 tabulators      KoParagDia  tab tabs */
diff --git a/lib/kotext/KoTextCommand.cpp b/lib/kotext/KoTextCommand.cpp
index 68f83ad3..fb496836 100644
--- a/lib/kotext/KoTextCommand.cpp
+++ b/lib/kotext/KoTextCommand.cpp
@@ -88,9 +88,9 @@ KoTextCursor * KoTextDeleteCommand::unexecute( KoTextCursor *c )
     // Set any custom item that we had
     m_customItemsMap.insertItems( cursor, text.size() );
 
-    // Now restore the parag tqlayouts (i.e. libkotext specific stuff)
+    // Now restore the parag layouts (i.e. libkotext specific stuff)
     TQValueList<KoParagLayout>::Iterator lit = m_oldParagLayouts.begin();
-    kdDebug(32500) << "KoTextDeleteCommand::unexecute " << m_oldParagLayouts.count() << " parag tqlayouts. First parag=" << s->paragId() << endl;
+    kdDebug(32500) << "KoTextDeleteCommand::unexecute " << m_oldParagLayouts.count() << " parag layouts. First parag=" << s->paragId() << endl;
     Q_ASSERT( id == s->paragId() );
     KoTextParag *p = s;
     while ( p ) {
diff --git a/lib/kotext/KoTextCustomItem.cpp b/lib/kotext/KoTextCustomItem.cpp
index e90eae47..f6eaf7de 100644
--- a/lib/kotext/KoTextCustomItem.cpp
+++ b/lib/kotext/KoTextCustomItem.cpp
@@ -81,16 +81,16 @@ void KoTextCustomItem::draw(TQPainter* p, int _x, int _y, int cx, int cy, int cw
     KoTextStringChar* stringChar = paragraph()->at( charIndex );
 
     // Convert x, y, cx, cy, cw and ch from Layout Units to pixels.
-    int x = zh->tqlayoutUnitToPixelX(_x) /*+ stringChar->pixelxadj*/;
-    int y = zh->tqlayoutUnitToPixelY(_y);
-    cx = zh->tqlayoutUnitToPixelX(cx);
-    cy = zh->tqlayoutUnitToPixelY(cy);
-    cw = zh->tqlayoutUnitToPixelX(_x,cw);
-    ch = zh->tqlayoutUnitToPixelY(_y,ch);
-    int wpix = zh->tqlayoutUnitToPixelX(_x,width);
-    int hpix = zh->tqlayoutUnitToPixelX(_y,height);
+    int x = zh->layoutUnitToPixelX(_x) /*+ stringChar->pixelxadj*/;
+    int y = zh->layoutUnitToPixelY(_y);
+    cx = zh->layoutUnitToPixelX(cx);
+    cy = zh->layoutUnitToPixelY(cy);
+    cw = zh->layoutUnitToPixelX(_x,cw);
+    ch = zh->layoutUnitToPixelY(_y,ch);
+    int wpix = zh->layoutUnitToPixelX(_x,width);
+    int hpix = zh->layoutUnitToPixelX(_y,height);
     //kdDebug(32500)<<"After  x :"<<x<<" y :"<<y<<" cx :"<<cx<<" cy :"<<cy<<" ch :"<<ch<<" cw :"<<cw<<endl;
-    int ascentpix = zh->tqlayoutUnitToPixelY( _y, ascent() );
+    int ascentpix = zh->layoutUnitToPixelY( _y, ascent() );
 
     KoTextFormat * fmt = stringChar->format();
 
diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp
index b637f0a6..b5de2a73 100644
--- a/lib/kotext/KoTextDocument.cpp
+++ b/lib/kotext/KoTextDocument.cpp
@@ -1104,7 +1104,7 @@ KoTextParag *KoTextDocument::drawWYSIWYG( TQPainter *p, int cx, int cy, int cw,
     TQRect pixelRect = parag->pixelRect( zoomHandler );
     if ( isPageBreakEnabled() && parag && cy <= pixelRect.y() && pixelRect.y() > 0 ) {
         TQRect r( 0, 0,
-                 zoomHandler->tqlayoutUnitToPixelX( parag->document()->x() + parag->document()->width() ),
+                 zoomHandler->layoutUnitToPixelX( parag->document()->x() + parag->document()->width() ),
                  pixelRect.y() );
         r &= crect;
         if ( !r.isEmpty() ) {
@@ -1131,7 +1131,7 @@ KoTextParag *KoTextDocument::drawWYSIWYG( TQPainter *p, int cx, int cy, int cw,
             // (as opposed ir.bottom() which is the last pixel of the parag)
 	    if ( ir.y() + ir.height() < nexty ) {
 		TQRect r( 0, ir.y() + ir.height(),
-			 zoomHandler->tqlayoutUnitToPixelX( parag->document()->x() + parag->document()->width() ),
+			 zoomHandler->layoutUnitToPixelX( parag->document()->x() + parag->document()->width() ),
 			 nexty - ( ir.y() + ir.height() ) );
 		r &= crect;
 		if ( !r.isEmpty() )
@@ -1146,7 +1146,7 @@ KoTextParag *KoTextDocument::drawWYSIWYG( TQPainter *p, int cx, int cy, int cw,
 
         if ( !ir.intersects( crect ) ) {
             // Paragraph is not in the crect - but let's check if the area on its right is.
-	    ir.setWidth( zoomHandler->tqlayoutUnitToPixelX( parag->document()->width() ) );
+	    ir.setWidth( zoomHandler->layoutUnitToPixelX( parag->document()->width() ) );
 	    if ( ir.intersects( crect ) && ( drawingFlags & TransparentBackground ) == 0 )
 		p->fillRect( ir.intersect( crect ), cg.brush( TQColorGroup::Base ) );
 	    if ( ir.y() > cy + ch ) {
@@ -1169,9 +1169,9 @@ KoTextParag *KoTextDocument::drawWYSIWYG( TQPainter *p, int cx, int cy, int cw,
 
 floating:
     pixelRect = parag->pixelRect(zoomHandler);
-    int docheight = zoomHandler->tqlayoutUnitToPixelY( parag->document()->height() );
+    int docheight = zoomHandler->layoutUnitToPixelY( parag->document()->height() );
     if ( pixelRect.y() + pixelRect.height() < docheight ) {
-        int docwidth = zoomHandler->tqlayoutUnitToPixelX( parag->document()->width() );
+        int docwidth = zoomHandler->layoutUnitToPixelX( parag->document()->width() );
         if ( ( drawingFlags & TransparentBackground ) == 0 ) {
             p->fillRect( 0, pixelRect.y() + pixelRect.height(),
                          docwidth, docheight - ( pixelRect.y() + pixelRect.height() ),
@@ -1267,7 +1267,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx,
     // Start painting from a given line number.
     if ( parag->lineChanged() > -1 )
     {
-        offsetY = zoomHandler->tqlayoutUnitToPixelY( parag->lineY( parag->lineChanged() ) - parag->topMargin() );
+        offsetY = zoomHandler->layoutUnitToPixelY( parag->lineY( parag->lineChanged() ) - parag->topMargin() );
 #ifdef DEBUG_PAINTING
         kdDebug(32500) << " Repainting from lineChanged=" << parag->lineChanged() << " -> adding " << offsetY << " to rect" << endl;
 #endif
@@ -1384,7 +1384,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx,
     }
 
     if ( needBrush ) {
-        int docright = zoomHandler->tqlayoutUnitToPixelX( parag->document()->x() + parag->document()->width() );
+        int docright = zoomHandler->layoutUnitToPixelX( parag->document()->x() + parag->document()->width() );
 #ifdef DEBUG_PAINTING
 //        kdDebug(32500) << "KoTextDocument::drawParagWYSIWYG my rect is: " << rect << endl;
 #endif
diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp
index 7395a050..5a1570ac 100644
--- a/lib/kotext/KoTextFormat.cpp
+++ b/lib/kotext/KoTextFormat.cpp
@@ -1094,7 +1094,7 @@ float KoTextFormat::screenPointSize( const KoTextZoomHandler* zh ) const
     int pointSizeLU = KoTextZoomHandler::ptToLayoutUnitPt( pointSize() );
     if ( vAlign() != KoTextFormat::AlignNormal )
         pointSizeLU = (int)( pointSizeLU *relativeTextSize() );
-    return zh->tqlayoutUnitToFontSize( pointSizeLU, false /* forPrint */ );
+    return zh->layoutUnitToFontSize( pointSizeLU, false /* forPrint */ );
 }
 
 float KoTextFormat::refPointSize() const
@@ -1145,7 +1145,7 @@ const TQFontMetrics& KoTextFormat::screenFontMetrics( const KoTextZoomHandler* z
 {
     TQFont f = screenFont(zh); // don't move inside the if!
 
-    if ( !d->m_screenFontMetrics ) // not calculated, or tqinvalidated by screenFont above
+    if ( !d->m_screenFontMetrics ) // not calculated, or invalidated by screenFont above
     {
         //kdDebug(32500) << this << " KoTextFormat::screenFontMetrics pointSize=" << pointSize << " d->m_screenFont->pointSizeFloat()=" << d->m_screenFont->pointSizeFloat() << endl;
         d->m_screenFontMetrics = new TQFontMetrics( f );
@@ -1186,7 +1186,7 @@ int KoTextFormat::charWidth( const KoTextZoomHandler* zh, bool applyZoom, const
     if( c->isCustom() ) {
 	 if( c->customItem()->placement() == KoTextCustomItem::PlaceInline ) {
              // customitem width is in LU pixels. Convert to 100%-zoom-pixels (pt2pt==pix2pix)
-             double w = KoTextZoomHandler::tqlayoutUnitPtToPt( c->customItem()->width );
+             double w = KoTextZoomHandler::layoutUnitPtToPt( c->customItem()->width );
              return tqRound( applyZoom ? ( w * zh->zoomFactorX() ) : w );
          }
          else
diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp
index 6696f041..7bdfbc0c 100644
--- a/lib/kotext/KoTextFormatter.cpp
+++ b/lib/kotext/KoTextFormatter.cpp
@@ -94,7 +94,7 @@ TQPair<int, int> KoTextFormatterCore::determineCharWidth()
             Q_ASSERT( ww >= 0 );
             ww = TQMAX(0, ww);
 #ifndef REF_IS_LU
-            pixelww = zh->tqlayoutUnitToPixelX( ww );
+            pixelww = zh->layoutUnitToPixelX( ww );
 #endif
         } else {
             ww = charFormat->charWidthLU( c, parag, i );
@@ -113,7 +113,7 @@ TQPair<int, int> KoTextFormatterCore::determineCharWidth()
         kdDebug(32500) << "nextTab for x=" << x << " returned nx=" << nx << "  (=> ww=" << ww << ")" << endl;
 #endif
 #ifndef REF_IS_LU
-        pixelww = zh->tqlayoutUnitToPixelX( ww );
+        pixelww = zh->layoutUnitToPixelX( ww );
 #endif
     }
     Q_ASSERT( ww >= 0 );
@@ -260,7 +260,7 @@ bool KoTextFormatterCore::format()
     maxAvailableWidth = tqMakePair( 0, 0 );
 
     KoTextZoomHandler *zh = doc->formattingZoomHandler();
-    int pixelx = zh->tqlayoutUnitToPixelX( x );
+    int pixelx = zh->layoutUnitToPixelX( x );
     int lastPixelx = 0;
 
     KoTextStringChar* lastChr = 0;
@@ -445,7 +445,7 @@ bool KoTextFormatterCore::format()
                                                     ww, // ## correct?
                                                     x, initialRMargin, dw, parag );
 
-                    pixelx = zh->tqlayoutUnitToPixelX( x );
+                    pixelx = zh->layoutUnitToPixelX( x );
                     initialHeight = tmph;
                     initialLMargin = x;
                     availableWidth = dw - initialRMargin;
@@ -545,7 +545,7 @@ bool KoTextFormatterCore::format()
                                                     c->width,
                                                     x, initialRMargin, dw, parag );
 
-                    pixelx = zh->tqlayoutUnitToPixelX( x );
+                    pixelx = zh->layoutUnitToPixelX( x );
                     initialHeight = tmph;
                     initialLMargin = x;
                     availableWidth = dw - initialRMargin;
@@ -624,7 +624,7 @@ bool KoTextFormatterCore::format()
 #endif
                     i = (firstChar - &string->at(0));
                     x = newLMargin;
-                    pixelx = zh->tqlayoutUnitToPixelX( x );
+                    pixelx = zh->layoutUnitToPixelX( x );
                     availableWidth = dw - newRMargin;
                     initialLMargin = newLMargin;
                     initialRMargin = newRMargin;
@@ -679,10 +679,10 @@ bool KoTextFormatterCore::format()
         c->x = x;
         // pixelxadj is the adjustement to add to lu2pixel(x), to find pixelx
         // (pixelx would be too expensive to store directly since it would require an int)
-        c->pixelxadj = pixelx - zh->tqlayoutUnitToPixelX( x );
+        c->pixelxadj = pixelx - zh->layoutUnitToPixelX( x );
         //c->pixelwidth = pixelww; // done as pixelx - lastPixelx below
 #ifdef DEBUG_FORMATTER
-        kdDebug(32500) << "LU: x=" << x << " [equiv. to pix=" << zh->tqlayoutUnitToPixelX( x ) << "] ; PIX: x=" << pixelx << "  --> adj=" << c->pixelxadj << endl;
+        kdDebug(32500) << "LU: x=" << x << " [equiv. to pix=" << zh->layoutUnitToPixelX( x ) << "] ; PIX: x=" << pixelx << "  --> adj=" << c->pixelxadj << endl;
 #endif
 
         x += ww;
@@ -692,11 +692,11 @@ bool KoTextFormatterCore::format()
         if ( i < len - 1 )
             tmpWused = TQMAX( tmpWused, x );
         else // trailing space
-            c->pixelwidth = zh->tqlayoutUnitToPixelX( ww ); // was: pixelww;
+            c->pixelwidth = zh->layoutUnitToPixelX( ww ); // was: pixelww;
 
         lastPixelx = pixelx;
 #ifdef REF_IS_LU
-        pixelx = zh->tqlayoutUnitToPixelX( x ); // no accumulating rounding errors anymore
+        pixelx = zh->layoutUnitToPixelX( x ); // no accumulating rounding errors anymore
 #else
         pixelx += pixelww;
 #endif
@@ -706,7 +706,7 @@ bool KoTextFormatterCore::format()
     }
 
     // ### hack. The last char in the paragraph is always invisible, and somehow sometimes has a wrong format. It changes between
-    // tqlayouting and printing. This corrects some tqlayouting errors in BiDi mode due to this.
+    // layouting and printing. This corrects some layouting errors in BiDi mode due to this.
     if ( len > 1 /*&& !c->isAnchor()*/ ) {
         c->format()->removeRef();
         c->setFormat( string->at( len - 2 ).format() );
@@ -787,11 +787,11 @@ void KoTextFormatterCore::moveChar( KoTextStringChar& chr, KoTextZoomHandler *zh
                                     int deltaX, int deltaPixelX )
 {
 #ifndef REF_IS_LU
-    int pixelx = chr.pixelxadj + zh->tqlayoutUnitToPixelX( chr.x );
+    int pixelx = chr.pixelxadj + zh->layoutUnitToPixelX( chr.x );
 #endif
     chr.x += deltaX;
 #ifndef REF_IS_LU
-    chr.pixelxadj = pixelx + deltaPixelX - zh->tqlayoutUnitToPixelX( chr.x );
+    chr.pixelxadj = pixelx + deltaPixelX - zh->layoutUnitToPixelX( chr.x );
 #endif
 }
 
@@ -814,7 +814,7 @@ KoTextParagLineStart *KoTextFormatterCore::koFormatLine(
         if ( align & TQt::AlignHCenter || align & TQt::AlignRight ) {
             if ( align & TQt::AlignHCenter )
                 space /= 2;
-            int toAddPix = zh->tqlayoutUnitToPixelX( space );
+            int toAddPix = zh->layoutUnitToPixelX( space );
             for ( int j = last; j >= start; --j ) {
                 KoTextStringChar &chr = string->at( j );
                 moveChar( chr, zh, space, toAddPix );
@@ -841,12 +841,12 @@ KoTextParagLineStart *KoTextFormatterCore::koFormatLine(
                 if( settings->isStretchable( string, k ) && numSpaces ) {
                     int s = space / numSpaces;
                     toAdd += s;
-                    toAddPix = zh->tqlayoutUnitToPixelX( toAdd );
+                    toAddPix = zh->layoutUnitToPixelX( toAdd );
                     space -= s;
                     numSpaces--;
                     chr.width += s;
 #ifndef REF_IS_LU
-                    chr.pixelwidth += zh->tqlayoutUnitToPixelX( s ); // ### rounding problem, recalculate
+                    chr.pixelwidth += zh->layoutUnitToPixelX( s ); // ### rounding problem, recalculate
 #endif
                 }
             }
@@ -973,7 +973,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine(
         }
     }
 // TODO #ifndef REF_IS_LU or remove
-    int pixelx = zh->tqlayoutUnitToPixelX( x );
+    int pixelx = zh->layoutUnitToPixelX( x );
     int toAdd = 0;
     int toAddPix = 0;
     bool first = TRUE;
@@ -991,11 +991,11 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine(
                 if( numSpaces && !first && settings->isBreakable( text, pos ) ) {
                     int s = space / numSpaces;
                     toAdd += s;
-                    toAddPix = zh->tqlayoutUnitToPixelX( toAdd );
+                    toAddPix = zh->layoutUnitToPixelX( toAdd );
                     space -= s;
                     numSpaces--;
                     chr.width += s;
-                    chr.pixelwidth += zh->tqlayoutUnitToPixelX( s ); // ### rounding problem, recalculate
+                    chr.pixelwidth += zh->layoutUnitToPixelX( s ); // ### rounding problem, recalculate
                 } else if ( first ) {
                     first = FALSE;
                     if ( chr.c == ' ' ) // trailing space
@@ -1006,9 +1006,9 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine(
                     }
                 }
                 chr.x = x + toAdd;
-                chr.pixelxadj = pixelx + toAddPix - zh->tqlayoutUnitToPixelX( chr.x );
+                chr.pixelxadj = pixelx + toAddPix - zh->layoutUnitToPixelX( chr.x );
 #ifdef DEBUG_FORMATTER
-                kdDebug(32500) << "koBidiReorderLine: pos=" << pos << " x(LU)=" << x << " toAdd(LU)=" << toAdd << " -> chr.x=" << chr.x << " pixelx=" << pixelx << "+" << zh->tqlayoutUnitToPixelX( toAdd ) << ", pixelxadj=" << pixelx+zh->tqlayoutUnitToPixelX( toAdd )-zh->tqlayoutUnitToPixelX( chr.x ) << endl;
+                kdDebug(32500) << "koBidiReorderLine: pos=" << pos << " x(LU)=" << x << " toAdd(LU)=" << toAdd << " -> chr.x=" << chr.x << " pixelx=" << pixelx << "+" << zh->layoutUnitToPixelX( toAdd ) << ", pixelxadj=" << pixelx+zh->layoutUnitToPixelX( toAdd )-zh->layoutUnitToPixelX( chr.x ) << endl;
 #endif
                 chr.rightToLeft = TRUE;
                 chr.startOfRun = FALSE;
@@ -1028,7 +1028,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine(
                 if( numSpaces && !first && settings->isBreakable( text, pos ) ) {
                     int s = space / numSpaces;
                     toAdd += s;
-                    toAddPix = zh->tqlayoutUnitToPixelX( toAdd );
+                    toAddPix = zh->layoutUnitToPixelX( toAdd );
                     space -= s;
                     numSpaces--;
                 } else if ( first ) {
@@ -1041,7 +1041,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine(
                     }
                 }
                 chr.x = x + toAdd;
-                chr.pixelxadj = pixelx + toAddPix - zh->tqlayoutUnitToPixelX( chr.x );
+                chr.pixelxadj = pixelx + toAddPix - zh->layoutUnitToPixelX( chr.x );
                 chr.rightToLeft = FALSE;
                 chr.startOfRun = FALSE;
                 int ww = chr.width;
diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp
index f6716b2d..6289482b 100644
--- a/lib/kotext/KoTextObject.cpp
+++ b/lib/kotext/KoTextObject.cpp
@@ -887,7 +887,7 @@ KCommand *KoTextObject::applyStyleCommand( KoTextCursor * cursor, const KoParagS
             c2.setIndex( lastParag->string()->length() );
             undoRedoInfo.clear();
             undoRedoInfo.type = UndoRedoInfo::Invalid; // same trick
-            readFormats( c1, c2 ); // gather char-format info but not paragtqlayouts nor customitems
+            readFormats( c1, c2 ); // gather char-format info but not paraglayouts nor customitems
 
             KoTextDocCommand * cmd = new KoTextFormatCommand( textdoc, firstParag->paragId(), 0,
                                                          lastParag->paragId(), c2.index(),
@@ -2634,7 +2634,7 @@ TQFont KoTextFormatInterface::textFont() const
 {
     TQFont fn( currentFormat()->font() );
     // "unzoom" the font size
-    //fn.setPointSize( static_cast<int>( KoTextZoomHandler::tqlayoutUnitPtToPt( fn.pointSize() ) ) );
+    //fn.setPointSize( static_cast<int>( KoTextZoomHandler::layoutUnitPtToPt( fn.pointSize() ) ) );
     return fn;
 }
 
diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp
index 8f948596..f516b7ca 100644
--- a/lib/kotext/KoTextParag.cpp
+++ b/lib/kotext/KoTextParag.cpp
@@ -254,7 +254,7 @@ void KoTextParag::join( KoTextParag *s )
     delete s;
     tqinvalidate( 0 );
     //// kotext
-    tqinvalidateCounters();
+    invalidateCounters();
     ////
     r.setHeight( oh );
     //needPreProcess = TRUE;
@@ -693,7 +693,7 @@ void KoTextParag::setDirection( TQChar::Direction d )
 	tqinvalidate( 0 );
         //// kotext
         m_layout.direction = d;
-	tqinvalidateCounters(); // #47178
+	invalidateCounters(); // #47178
         ////
     }
 }
@@ -1012,7 +1012,7 @@ void KoTextParag::setNoCounter()
 {
     delete m_layout.counter;
     m_layout.counter = 0L;
-    tqinvalidateCounters();
+    invalidateCounters();
 }
 
 void KoTextParag::setCounter( const KoParagCounter * pCounter )
@@ -1028,7 +1028,7 @@ void KoTextParag::setCounter( const KoParagCounter * pCounter )
         m_layout.counter->setStyle( KoParagCounter::STYLE_NONE ); // no number after the 'prefix'
         m_layout.counter->setPrefix( footNotePrefix );
         m_layout.counter->setSuffix( TQString() );
-        tqinvalidateCounters();
+        invalidateCounters();
     } else {
         if ( pCounter )
             setCounter( *pCounter );
@@ -1052,11 +1052,11 @@ void KoTextParag::setCounter( const KoParagCounter & counter )
         m_layout.counter = new KoParagCounter( counter );
 
         // Invalidate the counters
-        tqinvalidateCounters();
+        invalidateCounters();
     }
 }
 
-void KoTextParag::tqinvalidateCounters()
+void KoTextParag::invalidateCounters()
 {
     // Invalidate this paragraph and all the following ones
     // (Numbering may have changed)
@@ -1065,7 +1065,7 @@ void KoTextParag::tqinvalidateCounters()
         m_layout.counter->tqinvalidate();
     KoTextParag *s = next();
     // #### Possible optimization: since any invalidation propagates down,
-    // it's enough to stop at the first paragraph with an already-tqinvalidated counter, isn't it?
+    // it's enough to stop at the first paragraph with an already-invalidated counter, isn't it?
     // This is only true if nobody else calls counter->tqinvalidate...
     while ( s ) {
         if ( s->m_layout.counter )
@@ -1117,12 +1117,12 @@ void KoTextParag::drawLabel( TQPainter* p, int xLU, int yLU, int /*wLU*/, int /*
     //bool forPrint = ( p->device()->devType() == TQInternal::Printer );
 
     bool rtl = str->isRightToLeft(); // when true, we put suffix+counter+prefix at the RIGHT of the paragraph.
-    int xLeft = zh->tqlayoutUnitToPixelX( xLU - (rtl ? 0 : counterWidthLU) );
-    int y = zh->tqlayoutUnitToPixelY( yLU );
-    //int h = zh->tqlayoutUnitToPixelY( yLU, hLU );
-    int base = zh->tqlayoutUnitToPixelY( yLU, baseLU );
-    int counterWidth = zh->tqlayoutUnitToPixelX( xLU, counterWidthLU );
-    int height = zh->tqlayoutUnitToPixelY( yLU, format->height() );
+    int xLeft = zh->layoutUnitToPixelX( xLU - (rtl ? 0 : counterWidthLU) );
+    int y = zh->layoutUnitToPixelY( yLU );
+    //int h = zh->layoutUnitToPixelY( yLU, hLU );
+    int base = zh->layoutUnitToPixelY( yLU, baseLU );
+    int counterWidth = zh->layoutUnitToPixelX( xLU, counterWidthLU );
+    int height = zh->layoutUnitToPixelY( yLU, format->height() );
 
     TQFont font( format->screenFont( zh ) );
     // Footnote numbers are in superscript (in WP and Word, not in OO)
@@ -1137,11 +1137,11 @@ void KoTextParag::drawLabel( TQPainter* p, int xLU, int yLU, int /*wLU*/, int /*
     // Now draw any bullet that is required over the space left for it.
     if ( m_layout.counter->isBullet() )
     {
-	int xBullet = xLeft + zh->tqlayoutUnitToPixelX( m_layout.counter->bulletX() );
+	int xBullet = xLeft + zh->layoutUnitToPixelX( m_layout.counter->bulletX() );
 
         //kdDebug(32500) << "KoTextParag::drawLabel xLU=" << xLU << " counterWidthLU=" << counterWidthLU << endl;
 	// The width and height of the bullet is the width of one space
-        int width = zh->tqlayoutUnitToPixelX( xLeft, format->width( ' ' ) );
+        int width = zh->layoutUnitToPixelX( xLeft, format->width( ' ' ) );
 
         //kdDebug(32500) << "Pix: xLeft=" << xLeft << " counterWidth=" << counterWidth
         //          << " xBullet=" << xBullet << " width=" << width << endl;
@@ -1387,14 +1387,14 @@ int KoTextParag::calculateLineSpacing( int line, int startChar, int lastChar ) c
 
 TQRect KoTextParag::pixelRect( KoTextZoomHandler *zh ) const
 {
-    TQRect rct( zh->tqlayoutUnitToPixel( rect() ) );
+    TQRect rct( zh->layoutUnitToPixel( rect() ) );
     //kdDebug(32500) << "   pixelRect for parag " << paragId()
     //               << ": rect=" << rect() << " pixelRect=" << rct << endl;
 
     // After division we almost always end up with the top overwriting the bottom of the parag above
     if ( prev() )
     {
-        TQRect prevRect( zh->tqlayoutUnitToPixel( prev()->rect() ) );
+        TQRect prevRect( zh->layoutUnitToPixel( prev()->rect() ) );
         if ( rct.top() < prevRect.bottom() + 1 )
         {
             //kdDebug(32500) << "   pixelRect: rct.top() adjusted to " << prevRect.bottom() + 1 << " (was " << rct.top() << ")" << endl;
@@ -1411,7 +1411,7 @@ void KoTextParag::paint( TQPainter &painter, const TQColorGroup &cg, KoTextCurso
 {
 #ifdef DEBUG_PAINT
     kdDebug(32500) << "KoTextParag::paint =====  id=" << paragId() << " clipx=" << clipx << " clipy=" << clipy << " clipw=" << clipw << " cliph=" << cliph << endl;
-    kdDebug(32500) << " clipw in pix (approx) : " << textDocument()->paintingZoomHandler()->tqlayoutUnitToPixelX( clipw ) << " cliph in pix (approx) : " << textDocument()->paintingZoomHandler()->tqlayoutUnitToPixelX( cliph ) << endl;
+    kdDebug(32500) << " clipw in pix (approx) : " << textDocument()->paintingZoomHandler()->layoutUnitToPixelX( clipw ) << " cliph in pix (approx) : " << textDocument()->paintingZoomHandler()->layoutUnitToPixelX( cliph ) << endl;
 #endif
 
     KoTextZoomHandler * zh = textDocument()->paintingZoomHandler();
@@ -1420,13 +1420,13 @@ void KoTextParag::paint( TQPainter &painter, const TQColorGroup &cg, KoTextCurso
     TQRect paraRect = pixelRect( zh );
 
     // Find left margin size, first line offset and right margin in pixels
-    int leftMarginPix = zh->tqlayoutUnitToPixelX( leftMargin() );
-    int firstLineOffset = zh->tqlayoutUnitToPixelX( firstLineMargin() );
+    int leftMarginPix = zh->layoutUnitToPixelX( leftMargin() );
+    int firstLineOffset = zh->layoutUnitToPixelX( firstLineMargin() );
 
     // The furthest left and right x-coords of the paragraph,
     // including the bullet/counter, but not the borders.
     int leftExtent = TQMIN ( leftMarginPix,  leftMarginPix + firstLineOffset );
-    int rightExtent = paraRect.width() - zh->tqlayoutUnitToPixelX( rightMargin() );
+    int rightExtent = paraRect.width() - zh->layoutUnitToPixelX( rightMargin() );
 
     // Draw the paragraph background color
     if ( backgroundColor().isValid() )
@@ -1470,7 +1470,7 @@ void KoTextParag::paint( TQPainter &painter, const TQColorGroup &cg, KoTextCurso
         TQRect r;
         r.setLeft( leftExtent );
         r.setRight( rightExtent );
-        r.setTop( zh->tqlayoutUnitToPixelY(lineY( 0 )) );
+        r.setTop( zh->layoutUnitToPixelY(lineY( 0 )) );
 
         int lastLine = lines() - 1;
         // We need to start from the pixelRect, to make sure the bottom border is entirely painted.
@@ -1479,13 +1479,13 @@ void KoTextParag::paint( TQPainter &painter, const TQColorGroup &cg, KoTextCurso
         // If we don't have a bottom border, we need go as low as possible ( to touch the next parag's border ).
         // If we have a bottom border, then we rather exclude the linespacing. Looks nicer. OO does that too.
         if ( m_layout.bottomBorder.width() > 0 && drawBottomBorder)
-            paragBottom -= zh->tqlayoutUnitToPixelY( lineSpacing( lastLine ) );
+            paragBottom -= zh->layoutUnitToPixelY( lineSpacing( lastLine ) );
         paragBottom -= KoBorder::zoomWidthY( m_layout.bottomBorder.width(), zh, 0 );
         //kdDebug(32500) << "Parag border: paragBottom=" << paragBottom
         //               << " bottom border width = " << KoBorder::zoomWidthY( m_layout.bottomBorder.width(), zh, 0 ) << endl;
         r.setBottom( paragBottom );
 
-        //kdDebug(32500) << "KoTextParag::paint documentWidth=" << documentWidth() << " LU (" << zh->tqlayoutUnitToPixelX(documentWidth()) << " pixels) bordersRect=" << r << endl;
+        //kdDebug(32500) << "KoTextParag::paint documentWidth=" << documentWidth() << " LU (" << zh->layoutUnitToPixelX(documentWidth()) << " pixels) bordersRect=" << r << endl;
         KoBorder::drawBorders( painter, zh, r,
                                m_layout.leftBorder, m_layout.rightBorder, m_layout.topBorder, m_layout.bottomBorder,
                                0, TQPen(), drawTopBorder, drawBottomBorder );
@@ -1696,19 +1696,19 @@ void KoTextParag::drawParagString( TQPainter &painter, const TQString &str, int
     // Calculate offset (e.g. due to shadow on left or top)
     // Important: don't use the 2-args methods here, offsets are not heights
     // (0 should be 0, not 1) (#63256)
-    int shadowOffsetX_pix = zh->tqlayoutUnitToPixelX( format->offsetX() );
-    int shadowOffsetY_pix = zh->tqlayoutUnitToPixelY( format->offsetY() );
+    int shadowOffsetX_pix = zh->layoutUnitToPixelX( format->offsetX() );
+    int shadowOffsetY_pix = zh->layoutUnitToPixelY( format->offsetY() );
 
     // Calculate startX in pixels
-    int startX_pix = zh->tqlayoutUnitToPixelX( startX ) /* + at( rightToLeft ? start+len-1 : start )->pixelxadj */;
+    int startX_pix = zh->layoutUnitToPixelX( startX ) /* + at( rightToLeft ? start+len-1 : start )->pixelxadj */;
 #ifdef DEBUG_PAINT
     kdDebug(32500) << "KoTextParag::drawParagString startX in pixels : " << startX_pix /*<< " adjustment:" << at( rightToLeft ? start+len-1 : start )->pixelxadj*/ << " bw=" << bw << endl;
 #endif
 
-    int bw_pix = zh->tqlayoutUnitToPixelX( startX, bw );
-    int lastY_pix = zh->tqlayoutUnitToPixelY( lastY );
-    int baseLine_pix = zh->tqlayoutUnitToPixelY( lastY, baseLine ); // 2 args=>+1. Is that correct?
-    int h_pix = zh->tqlayoutUnitToPixelY( lastY, h );
+    int bw_pix = zh->layoutUnitToPixelX( startX, bw );
+    int lastY_pix = zh->layoutUnitToPixelY( lastY );
+    int baseLine_pix = zh->layoutUnitToPixelY( lastY, baseLine ); // 2 args=>+1. Is that correct?
+    int h_pix = zh->layoutUnitToPixelY( lastY, h );
 #ifdef DEBUG_PAINT
     kdDebug(32500) << "KoTextParag::drawParagString h(LU)=" << h << " lastY(LU)=" << lastY
                    << " h(PIX)=" << h_pix << " lastY(PIX)=" << lastY_pix
@@ -1772,7 +1772,7 @@ void KoTextParag::drawParagString( TQPainter &painter, const TQString &str, int
 
     if ( draw_len > 0 )
     {
-        int draw_startX_pix = zh->tqlayoutUnitToPixelX( draw_startX ) /* + at( rightToLeft ? start+draw_len-1 : start )->pixelxadj*/;
+        int draw_startX_pix = zh->layoutUnitToPixelX( draw_startX ) /* + at( rightToLeft ? start+draw_len-1 : start )->pixelxadj*/;
         draw_startX_pix += shadowOffsetX_pix;
         lastY_pix += shadowOffsetY_pix;
 
@@ -2028,11 +2028,11 @@ bool KoTextParag::lineHyphenated( int l ) const
 void KoTextParag::drawCursor( TQPainter &painter, KoTextCursor *cursor, int curx, int cury, int curh, const TQColorGroup &cg )
 {
     KoTextZoomHandler * zh = textDocument()->paintingZoomHandler();
-    int x = zh->tqlayoutUnitToPixelX( curx ) /*+ cursor->parag()->at( cursor->index() )->pixelxadj*/;
-    //kdDebug(32500) << "  drawCursor: LU: [cur]x=" << curx << ", cury=" << cury << " -> PIX: x=" << x << ", y=" << zh->tqlayoutUnitToPixelY( cury ) << endl;
+    int x = zh->layoutUnitToPixelX( curx ) /*+ cursor->parag()->at( cursor->index() )->pixelxadj*/;
+    //kdDebug(32500) << "  drawCursor: LU: [cur]x=" << curx << ", cury=" << cury << " -> PIX: x=" << x << ", y=" << zh->layoutUnitToPixelY( cury ) << endl;
     KoTextParag::drawCursorDefault( painter, cursor, x,
-                            zh->tqlayoutUnitToPixelY( cury ),
-                            zh->tqlayoutUnitToPixelY( cury, curh ), cg );
+                            zh->layoutUnitToPixelY( cury ),
+                            zh->layoutUnitToPixelY( cury, curh ), cg );
 }
 
 // Reimplemented from KoTextParag
@@ -2407,7 +2407,7 @@ void KoTextParag::printRTDebug( int info )
         for ( int i = 0 ; i < s->length() ; ++i )
         {
             KoTextStringChar & ch = s->at(i);
-            int pixelx =  textDocument()->formattingZoomHandler()->tqlayoutUnitToPixelX( ch.x )
+            int pixelx =  textDocument()->formattingZoomHandler()->layoutUnitToPixelX( ch.x )
                           + ch.pixelxadj;
             if ( ch.lineStart )
                 kdDebug(32500) << "LINESTART" << endl;
@@ -2916,11 +2916,11 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context,
     KoGenStyles& mainStyles = context.mainStyles();
 
     // Write paragtqlayout to styles (with tqparent == the parag's style)
-    TQString tqparentStyleName;
+    TQString parentStyleName;
     if ( m_layout.style )
-        tqparentStyleName = m_layout.style->name();
+        parentStyleName = m_layout.style->name();
 
-    KoGenStyle autoStyle( KoGenStyle::STYLE_AUTO, "paragraph", tqparentStyleName );
+    KoGenStyle autoStyle( KoGenStyle::STYLE_AUTO, "paragraph", parentStyleName );
     paragFormat()->save( autoStyle, context );
     m_layout.saveOasis( autoStyle, context, false );
 
@@ -3116,7 +3116,7 @@ void KoTextParag::applyListStyle( KoOasisContext& context, int restartNumbering,
         double spaceBefore = KoUnit::parseValue( listStyleProperties.attributeNS( KoXmlNS::text, "space-before", TQString() ) );
         m_layout.margins[ TQStyleSheetItem::MarginLeft ] += spaceBefore; // added to left-margin, see 15.12 in spec.
     }
-    // need to call tqinvalidateCounters() ? Not during the initial loading at least.
+    // need to call invalidateCounters() ? Not during the initial loading at least.
 }
 
 int KoTextParag::documentWidth() const
@@ -3177,9 +3177,9 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
         //kdDebug() << "startX=" << startX << " bw=" << bw << " w=" << w << endl;
         int x;
         if ( rightToLeft )
-            x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + ch.pixelwidth - 1;
+            x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + ch.pixelwidth - 1;
         else
-            x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + w;
+            x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + w;
         int y = lastY_pix + baseLine_pix;
         //kdDebug() << "KWTextParag::drawFormattingChars drawing CR at " << x << "," << y << endl;
         painter.drawLine( (int)(x - size * 0.2), y - size, (int)(x - size * 0.2), y );
@@ -3189,7 +3189,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
         painter.drawArc( x - size, y - size, size, (int)(size / 2), -90*16, -180*16 );
 #ifdef DEBUG_FORMATTING
         painter.setPen( TQt::blue );
-        painter.drawRect( zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ - 1, lastY_pix, ch.pixelwidth, baseLine_pix );
+        painter.drawRect( zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ - 1, lastY_pix, ch.pixelwidth, baseLine_pix );
         TQPen pen( cg.color( TQColorGroup::Highlight ) );
         painter.setPen( pen );
 #endif
@@ -3206,7 +3206,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
             KoTextStringChar &ch = str->at(i);
 #ifdef DEBUG_FORMATTING
             painter.setPen( (i % 2)? TQt::red: TQt::green );
-            painter.drawRect( zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ - 1, lastY_pix, ch.pixelwidth, baseLine_pix );
+            painter.drawRect( zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ - 1, lastY_pix, ch.pixelwidth, baseLine_pix );
             TQPen pen( cg.color( TQColorGroup::Highlight ) );
             painter.setPen( pen );
 #endif
@@ -3217,10 +3217,10 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
             {
                 // Don't use ch.pixelwidth here. We want a square with
                 // the same size for all spaces, even the justified ones
-                int w = zh->tqlayoutUnitToPixelX( ch.format()->width( ' ' ) );
-                int height = zh->tqlayoutUnitToPixelY( ch.ascent() );
+                int w = zh->layoutUnitToPixelX( ch.format()->width( ' ' ) );
+                int height = zh->layoutUnitToPixelY( ch.ascent() );
                 int size = TQMAX( 2, TQMIN( w/2, height/3 ) ); // Enfore that it's a square, and that it's visible
-                int x = zh->tqlayoutUnitToPixelX( ch.x ); // + ch.pixelxadj;
+                int x = zh->layoutUnitToPixelX( ch.x ); // + ch.pixelxadj;
                 TQRect spcRect( x + (ch.pixelwidth - size) / 2, lastY_pix + baseLine_pix - (height - size) / 2, size, size );
                 if ( ch.c == ' ' )
                     painter.drawRect( spcRect );
@@ -3234,15 +3234,15 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
                   //kdDebug() << "tab x=" << ch.x << " nextch.x=" << nextch.x
                   //          << " nextx=" << nextx << " startX=" << startX << " bw=" << bw << endl;
                   int availWidth = nextx - ch.x - 1;
-                  availWidth=zh->tqlayoutUnitToPixelX(availWidth);*/
+                  availWidth=zh->layoutUnitToPixelX(availWidth);*/
 
                 int availWidth = ch.pixelwidth;
 
                 KoTextFormat* format = ch.format();
-                int x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + availWidth / 2;
+                int x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + availWidth / 2;
                 int charWidth = format->screenFontMetrics( zh ).width( 'W' );
                 int size = TQMIN( availWidth, charWidth ) / 2 ; // actually the half size
-                int y = lastY_pix + baseLine_pix - zh->tqlayoutUnitToPixelY( ch.ascent()/2 );
+                int y = lastY_pix + baseLine_pix - zh->layoutUnitToPixelY( ch.ascent()/2 );
                 int arrowsize = zh->zoomItY( 2 );
                 painter.drawLine( x - size, y, x + size, y );
                 if ( rightToLeft )
@@ -3269,7 +3269,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
                 //kdDebug() << "KWTextParag::drawFormattingChars drawing Line Break at " << x << "," << y << endl;
                 if ( rightToLeft )
                 {
-                    int x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + ch.pixelwidth - 1;
+                    int x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + ch.pixelwidth - 1;
                     painter.drawLine( x - size, y - size, x - size, y );
                     painter.drawLine( x - size, y, (int)(x - size * 0.3), y );
                     // Now the arrow
@@ -3278,7 +3278,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
                 }
                 else
                 {
-                    int x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + w - 1;
+                    int x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + w - 1;
                     painter.drawLine( x, y - size, x, y );
                     painter.drawLine( x, y, (int)(x - size * 0.7), y );
                     // Now the arrow
diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h
index 486a4ae3..4ccc2196 100644
--- a/lib/kotext/KoTextParag.h
+++ b/lib/kotext/KoTextParag.h
@@ -350,7 +350,7 @@ public:
 #endif
 
 protected:
-    void tqinvalidateCounters();
+    void invalidateCounters();
     bool lineHyphenated( int l ) const;
 
     void paintLines( TQPainter &painter, const TQColorGroup &cg, KoTextCursor *cursor, bool drawSelections,
diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp
index 68df4992..cea0fae1 100644
--- a/lib/kotext/KoTextView.cpp
+++ b/lib/kotext/KoTextView.cpp
@@ -328,7 +328,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ
                 }
                 if ( !text.isEmpty() )
                 {
-                    // Bidi support: need to reverse mirrored chars (e.g. tqparenthesis)
+                    // Bidi support: need to reverse mirrored chars (e.g. parenthesis)
                     KoTextParag *p = m_cursor->parag();
                     if ( p && p->string() && p->string()->isRightToLeft() ) {
                         TQChar *c = (TQChar *)text.tqunicode();
diff --git a/lib/kotext/KoTextZoomHandler.cpp b/lib/kotext/KoTextZoomHandler.cpp
index acd2285d..e9fc430f 100644
--- a/lib/kotext/KoTextZoomHandler.cpp
+++ b/lib/kotext/KoTextZoomHandler.cpp
@@ -36,39 +36,39 @@ int KoTextZoomHandler::fontSizeToLayoutUnit( double ptSizeFloat, bool forPrint )
 }
 #endif
 
-double KoTextZoomHandler::tqlayoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const
+double KoTextZoomHandler::layoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const
 {
     // TQt will use TQPaintDevice::x11AppDpiY() to go from pt to pixel for fonts
-    return tqlayoutUnitPtToPt( luSize ) * m_zoomedResolutionY
+    return layoutUnitPtToPt( luSize ) * m_zoomedResolutionY
 #ifdef Q_WS_X11
         / POINT_TO_INCH(TQPaintDevice::x11AppDpiY())
 #endif
         ;
 }
 
-int KoTextZoomHandler::tqlayoutUnitToPixelX( int x, int w ) const
+int KoTextZoomHandler::layoutUnitToPixelX( int x, int w ) const
 {
-    // We call tqlayoutUnitToPixelX on the right value, i.e. x+w-1,
+    // We call layoutUnitToPixelX on the right value, i.e. x+w-1,
     // and then determine the height from the result (i.e. right-left+1).
-    // Calling tqlayoutUnitToPixelX(w) leads to rounding problems.
-    return tqlayoutUnitToPixelY( x + w - 1 ) - tqlayoutUnitToPixelY( x ) + 1;
+    // Calling layoutUnitToPixelX(w) leads to rounding problems.
+    return layoutUnitToPixelY( x + w - 1 ) - layoutUnitToPixelY( x ) + 1;
 }
 
-int KoTextZoomHandler::tqlayoutUnitToPixelY( int y, int h ) const
+int KoTextZoomHandler::layoutUnitToPixelY( int y, int h ) const
 {
-    // We call tqlayoutUnitToPixelY on the bottom value, i.e. y+h-1,
+    // We call layoutUnitToPixelY on the bottom value, i.e. y+h-1,
     // and then determine the height from the result (i.e. bottom-top+1).
-    // Calling tqlayoutUnitToPixelY(h) leads to rounding problems.
-    return tqlayoutUnitToPixelY( y + h - 1 ) - tqlayoutUnitToPixelY( y ) + 1;
+    // Calling layoutUnitToPixelY(h) leads to rounding problems.
+    return layoutUnitToPixelY( y + h - 1 ) - layoutUnitToPixelY( y ) + 1;
 }
 
-int KoTextZoomHandler::tqlayoutUnitToPixelX( int lupix ) const
+int KoTextZoomHandler::layoutUnitToPixelX( int lupix ) const
 {
     return int( static_cast<double>( lupix * m_zoomedResolutionX )
                 / ( static_cast<double>( m_layoutUnitFactor ) * m_resolutionX ) );
 }
 
-int KoTextZoomHandler::tqlayoutUnitToPixelY( int lupix ) const
+int KoTextZoomHandler::layoutUnitToPixelY( int lupix ) const
 {
     // tqRound replaced with a truncation, too many problems (e.g. bottom of parags)
     return int( static_cast<double>( lupix * m_zoomedResolutionY )
diff --git a/lib/kotext/KoTextZoomHandler.h b/lib/kotext/KoTextZoomHandler.h
index 81211086..f8c2ef12 100644
--- a/lib/kotext/KoTextZoomHandler.h
+++ b/lib/kotext/KoTextZoomHandler.h
@@ -23,7 +23,7 @@
 #include <KoZoomHandler.h>
 
 /**
- * This class extends KoZoomHandler to add support for WYSIWYG text tqlayouting.
+ * This class extends KoZoomHandler to add support for WYSIWYG text layouting.
  */
 class KOTEXT_EXPORT KoTextZoomHandler : public KoZoomHandler
 {
@@ -31,7 +31,7 @@ public:
     KoTextZoomHandler() {}
     virtual ~KoTextZoomHandler() {}
 
-    //// Support for WYSIWYG text tqlayouting /////
+    //// Support for WYSIWYG text layouting /////
 
     /** The "[zoomed] view pixel" -> "tqlayout unit pixel" conversions. */
     int pixelToLayoutUnitX( int x ) const;
@@ -44,22 +44,22 @@ public:
                     pixelToLayoutUnit( r.bottomRight() ) ); }
 
     /** The "tqlayout unit pixel" -> "[zoomed] view pixel" conversions. */
-    int tqlayoutUnitToPixelX( int lupix ) const;
-    int tqlayoutUnitToPixelY( int lupix ) const;
+    int layoutUnitToPixelX( int lupix ) const;
+    int layoutUnitToPixelY( int lupix ) const;
 
     /** This variant converts a width, using a reference X position.
      * This prevents rounding problems. */
-    int tqlayoutUnitToPixelX( int x, int w ) const;
+    int layoutUnitToPixelX( int x, int w ) const;
     /** This variant converts a height, using a reference Y position.
      * This prevents rounding problems. */
-    int tqlayoutUnitToPixelY( int y, int h ) const;
+    int layoutUnitToPixelY( int y, int h ) const;
 
-    TQPoint tqlayoutUnitToPixel( const TQPoint &p ) const
-    { return TQPoint( tqlayoutUnitToPixelX( p.x() ),
-                     tqlayoutUnitToPixelY( p.y() ) ); }
-    TQRect tqlayoutUnitToPixel( const TQRect &r ) const
-    { return TQRect( tqlayoutUnitToPixel( r.topLeft() ),
-                    tqlayoutUnitToPixel( r.bottomRight() ) ); }
+    TQPoint layoutUnitToPixel( const TQPoint &p ) const
+    { return TQPoint( layoutUnitToPixelX( p.x() ),
+                     layoutUnitToPixelY( p.y() ) ); }
+    TQRect layoutUnitToPixel( const TQRect &r ) const
+    { return TQRect( layoutUnitToPixel( r.topLeft() ),
+                    layoutUnitToPixel( r.bottomRight() ) ); }
 
     /** Basic pt to pixel and pixel to pt conversions, valid at any zoom level,
         as well as at the Layout Unit level (and mostly useful for Layout Units).
@@ -92,11 +92,11 @@ public:
      * Given the font size for the font in tqlayout units, in pt (use pointSize())
      * this returns the font size to use on screen the current zoom, in pt (use setPointSizeFloat()),
      */
-    double tqlayoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const;
+    double layoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const;
 
     // Note: For converting fontsizes from/to tqlayout units and zoom-independent
     // pt sizes (like the one the user sees, e.g. 12pt),
-    // use ptToLayoutUnit and tqlayoutUnitToPt, not tqlayoutToFontSize.
+    // use ptToLayoutUnit and layoutUnitToPt, not layoutToFontSize.
 
 
     // The conversions below convert between an internal text tqlayout resolution of
@@ -122,11 +122,11 @@ public:
     { return KoRect( ptToLayoutUnitPt( r.topLeft() ),
                      ptToLayoutUnitPt( r.bottomRight() ) ); }
 
-    static double tqlayoutUnitPtToPt( double lupt )
+    static double layoutUnitPtToPt( double lupt )
     { return lupt / static_cast<double>( m_layoutUnitFactor ); }
-    static KoPoint tqlayoutUnitPtToPt( const KoPoint& p )
-    { return KoPoint( tqlayoutUnitPtToPt( p.x() ),
-                      tqlayoutUnitPtToPt( p.y() ) ); }
+    static KoPoint layoutUnitPtToPt( const KoPoint& p )
+    { return KoPoint( layoutUnitPtToPt( p.x() ),
+                      layoutUnitPtToPt( p.y() ) ); }
 
 protected:
     /** This being static ensures that the same value is used by all KoTextZoomHandler instances */
diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index e333eb36..bd03ecf9 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -165,10 +165,10 @@ void KoVariableSettings::loadOasis(const KoOasisSettings&settingsDoc)
     }
 }
 
-void KoVariableSettings::save( TQDomElement &tqparentElem )
+void KoVariableSettings::save( TQDomElement &parentElem )
 {
-     TQDomElement elem = tqparentElem.ownerDocument().createElement( "VARIABLESETTINGS" );
-     tqparentElem.appendChild( elem );
+     TQDomElement elem = parentElem.ownerDocument().createElement( "VARIABLESETTINGS" );
+     parentElem.appendChild( elem );
     if(m_startingPageNumber!=1)
     {
         elem.setAttribute( "startingPageNumber", m_startingPageNumber );
@@ -991,18 +991,18 @@ void KoVariable::drawCustomItemHelper( TQPainter* p, int x, int y, int wpix, int
         // Do like KoTextFormatter: do the tqlayout in tqlayout units.
         xLU += KoTextZoomHandler::ptToLayoutUnitPt( fm.width( ch ) );
         // And then compute the X position in pixels from the tqlayout unit X.
-        x = zh->tqlayoutUnitToPixelX( xLU );
+        x = zh->layoutUnitToPixelX( xLU );
     }
 
     p->restore();
 }
 
-void KoVariable::save( TQDomElement &tqparentElem )
+void KoVariable::save( TQDomElement &parentElem )
 {
     //kdDebug(32500) << "KoVariable::save" << endl;
-    TQDomElement variableElem = tqparentElem.ownerDocument().createElement( "VARIABLE" );
-    tqparentElem.appendChild( variableElem );
-    TQDomElement typeElem = tqparentElem.ownerDocument().createElement( "TYPE" );
+    TQDomElement variableElem = parentElem.ownerDocument().createElement( "VARIABLE" );
+    parentElem.appendChild( variableElem );
+    TQDomElement typeElem = parentElem.ownerDocument().createElement( "TYPE" );
     variableElem.appendChild( typeElem );
     typeElem.setAttribute( "type", static_cast<int>( type() ) );
 
@@ -1490,10 +1490,10 @@ void KoTimeVariable::recalc()
 }
 
 
-void KoTimeVariable::saveVariable( TQDomElement& tqparentElem )
+void KoTimeVariable::saveVariable( TQDomElement& parentElem )
 {
-    TQDomElement elem = tqparentElem.ownerDocument().createElement( "TIME" );
-    tqparentElem.appendChild( elem );
+    TQDomElement elem = parentElem.ownerDocument().createElement( "TIME" );
+    parentElem.appendChild( elem );
 
     TQTime time = m_varValue.toTime();
     time = time.addSecs(-60*m_correctTime);
@@ -1687,10 +1687,10 @@ TQString KoCustomVariable::text(bool realValue)
 
 
 
-void KoCustomVariable::saveVariable( TQDomElement& tqparentElem )
+void KoCustomVariable::saveVariable( TQDomElement& parentElem )
 {
-    TQDomElement elem = tqparentElem.ownerDocument().createElement( "CUSTOM" );
-    tqparentElem.appendChild( elem );
+    TQDomElement elem = parentElem.ownerDocument().createElement( "CUSTOM" );
+    parentElem.appendChild( elem );
     elem.setAttribute( "name", m_varValue.toString() );
     elem.setAttribute( "value", value() );
 }
@@ -1777,10 +1777,10 @@ void KoMailMergeVariable::saveOasis( KoXmlWriter& /*writer*/, KoSavingContext& /
 
 
 
-void KoMailMergeVariable::saveVariable( TQDomElement& tqparentElem )
+void KoMailMergeVariable::saveVariable( TQDomElement& parentElem )
 {
-    TQDomElement elem = tqparentElem.ownerDocument().createElement( "MAILMERGE" );
-    tqparentElem.appendChild( elem );
+    TQDomElement elem = parentElem.ownerDocument().createElement( "MAILMERGE" );
+    parentElem.appendChild( elem );
     elem.setAttribute( "name", m_varValue.toString() );
 }
 
@@ -1837,10 +1837,10 @@ TQString KoPageVariable::fieldCode()
 }
 
 
-void KoPageVariable::saveVariable( TQDomElement& tqparentElem )
+void KoPageVariable::saveVariable( TQDomElement& parentElem )
 {
-    TQDomElement pgNumElem = tqparentElem.ownerDocument().createElement( "PGNUM" );
-    tqparentElem.appendChild( pgNumElem );
+    TQDomElement pgNumElem = parentElem.ownerDocument().createElement( "PGNUM" );
+    parentElem.appendChild( pgNumElem );
     pgNumElem.setAttribute( "subtype", m_subtype );
     if ( m_subtype != VST_CURRENT_SECTION )
         pgNumElem.setAttribute( "value", m_varValue.toInt() );
@@ -2046,11 +2046,11 @@ TQString KoFieldVariable::text(bool realValue)
 } // use a format when they are customizable
 
 
-void KoFieldVariable::saveVariable( TQDomElement& tqparentElem )
+void KoFieldVariable::saveVariable( TQDomElement& parentElem )
 {
     //kdDebug(32500) << "KoFieldVariable::saveVariable" << endl;
-    TQDomElement elem = tqparentElem.ownerDocument().createElement( "FIELD" );
-    tqparentElem.appendChild( elem );
+    TQDomElement elem = parentElem.ownerDocument().createElement( "FIELD" );
+    parentElem.appendChild( elem );
     elem.setAttribute( "subtype", m_subtype );
     elem.setAttribute( "value", m_varValue.toString() );
 }
@@ -2455,10 +2455,10 @@ TQString KoLinkVariable::text(bool realValue)
         return value();
 }
 
-void KoLinkVariable::saveVariable( TQDomElement& tqparentElem )
+void KoLinkVariable::saveVariable( TQDomElement& parentElem )
 {
-    TQDomElement linkElem = tqparentElem.ownerDocument().createElement( "LINK" );
-    tqparentElem.appendChild( linkElem );
+    TQDomElement linkElem = parentElem.ownerDocument().createElement( "LINK" );
+    parentElem.appendChild( linkElem );
     linkElem.setAttribute( "linkName", m_varValue.toString() );
     linkElem.setAttribute( "hrefName", m_url );
 }
@@ -2557,10 +2557,10 @@ void KoNoteVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& /*context*
     writer.endElement();
 }
 
-void KoNoteVariable::saveVariable( TQDomElement& tqparentElem )
+void KoNoteVariable::saveVariable( TQDomElement& parentElem )
 {
-    TQDomElement linkElem = tqparentElem.ownerDocument().createElement( "NOTE" );
-    tqparentElem.appendChild( linkElem );
+    TQDomElement linkElem = parentElem.ownerDocument().createElement( "NOTE" );
+    parentElem.appendChild( linkElem );
     linkElem.setAttribute( "note", m_varValue.toString() );
 }
 
diff --git a/lib/kotext/KoVariable.h b/lib/kotext/KoVariable.h
index e0a5a530..88f17975 100644
--- a/lib/kotext/KoVariable.h
+++ b/lib/kotext/KoVariable.h
@@ -85,7 +85,7 @@ class KOTEXT_EXPORT KoVariableSettings
     bool displayFieldCode() const { return m_displayFieldCode; }
     void setDisplayFieldCode( bool b) { m_displayFieldCode=b; }
 
-    virtual void save( TQDomElement &tqparentElem );
+    virtual void save( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
 
     TQDateTime lastPrintingDate() const;
@@ -413,7 +413,7 @@ public:
     void recalcAndRepaint();
 
     /** Save the variable. Public API, does the common job and then calls saveVariable. */
-    virtual void save( TQDomElement &tqparentElem );
+    virtual void save( TQDomElement &parentElem );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
@@ -438,7 +438,7 @@ public:
 
 protected:
     /** Variable should reimplement this to implement saving. */
-    virtual void saveVariable( TQDomElement &tqparentElem ) = 0;
+    virtual void saveVariable( TQDomElement &parentElem ) = 0;
     virtual int correctValue() const { return 0;}
 
     KoVariableFormat *m_varFormat;
@@ -472,7 +472,7 @@ public:
     virtual void resize();
     void setDate( const TQDate & _date ) { m_varValue = TQVariant(_date); }
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual int correctValue() const { return m_correctDate;}
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
@@ -518,7 +518,7 @@ public:
 
     void setTime( const TQTime & _time ) { m_varValue = TQVariant(_time); }
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual int correctValue() const { return m_correctTime;}
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
@@ -557,7 +557,7 @@ public:
     { return VT_CUSTOM; }
     static TQStringList actionTexts();
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
@@ -598,7 +598,7 @@ public:
     virtual VariableType type() const
     { return VT_FIELD; }
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
@@ -640,7 +640,7 @@ public:
     static TQStringList actionTexts();
     virtual TQString fieldCode();
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
@@ -684,7 +684,7 @@ public:
 
     virtual void recalc() = 0;
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
@@ -705,7 +705,7 @@ public:
     static TQStringList actionTexts();
     virtual TQString fieldCode();
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
@@ -740,7 +740,7 @@ public:
     static TQStringList actionTexts();
     virtual TQString fieldCode();
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
@@ -782,7 +782,7 @@ public:
 
     virtual TQStringList subTypeList();
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
diff --git a/lib/kotext/kodecorationtabbase.ui b/lib/kotext/kodecorationtabbase.ui
index 31e7b464..cd8f17f2 100644
--- a/lib/kotext/kodecorationtabbase.ui
+++ b/lib/kotext/kodecorationtabbase.ui
@@ -341,7 +341,7 @@
         <data format="PNG" length="96">89504e470d0a1a0a0000000d49484452000000140000001408060000008d891d0d0000002749444154388d63601805c31f3022b1ffc309d20c40368381895217a1835103478281a360240000f61e021097bbc8b20000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/lib/kotext/kofonttabbase.ui b/lib/kotext/kofonttabbase.ui
index 32800dd8..fa8b9ba4 100644
--- a/lib/kotext/kofonttabbase.ui
+++ b/lib/kotext/kofonttabbase.ui
@@ -18,7 +18,7 @@
                     </widget>
                 </vbox>
             </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
 	<include location="local" impldecl="in declaration">KFontDialog_local.h</include>
 </includes>
diff --git a/lib/kotext/kohighlightingtabbase.ui b/lib/kotext/kohighlightingtabbase.ui
index 3f0b8512..27be0702 100644
--- a/lib/kotext/kohighlightingtabbase.ui
+++ b/lib/kotext/kohighlightingtabbase.ui
@@ -129,7 +129,7 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/lib/kotext/kolanguagetabbase.ui b/lib/kotext/kolanguagetabbase.ui
index f280097e..a9073584 100644
--- a/lib/kotext/kolanguagetabbase.ui
+++ b/lib/kotext/kolanguagetabbase.ui
@@ -69,7 +69,7 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
 </includehints>
diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui
index 9a8e4a93..471607d4 100644
--- a/lib/kotext/kolayouttabbase.ui
+++ b/lib/kotext/kolayouttabbase.ui
@@ -288,7 +288,7 @@
     <include location="global" impldecl="in declaration">knuminput.h</include>
     <include location="global" impldecl="in declaration">klocale.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/lib/kotext/timedateformatwidget.ui b/lib/kotext/timedateformatwidget.ui
index fbd342cb..830b3bdb 100644
--- a/lib/kotext/timedateformatwidget.ui
+++ b/lib/kotext/timedateformatwidget.ui
@@ -210,7 +210,7 @@
     <slot>comboActivated()</slot>
     <slot>updateLabel()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index 7b9a927d..781f344b 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -57,8 +57,8 @@ namespace Kross { namespace Api {
 class ScriptNewStuff : public KNewStuffSecure
 {
     public:
-        ScriptNewStuff(ScriptGUIClient* scripguiclient, const TQString& type, TQWidget *tqparentWidget = 0)
-            : KNewStuffSecure(type, tqparentWidget)
+        ScriptNewStuff(ScriptGUIClient* scripguiclient, const TQString& type, TQWidget *parentWidget = 0)
+            : KNewStuffSecure(type, parentWidget)
             , m_scripguiclient(scripguiclient) {}
         virtual ~ScriptNewStuff() {}
     private:
@@ -73,11 +73,11 @@ class ListItem : public TQListViewItem
         ScriptActionCollection* m_collection;
         ScriptAction::Ptr m_action;
     public:
-        ListItem(TQListView* tqparentview, ScriptActionCollection* collection)
-            : TQListViewItem(tqparentview), m_collection(collection), m_action(0) {}
+        ListItem(TQListView* parentview, ScriptActionCollection* collection)
+            : TQListViewItem(parentview), m_collection(collection), m_action(0) {}
 
-        ListItem(ListItem* tqparentitem, TQListViewItem* afteritem, ScriptAction::Ptr action)
-            : TQListViewItem(tqparentitem, afteritem), m_collection( tqparentitem->collection() ), m_action(action) {}
+        ListItem(ListItem* parentitem, TQListViewItem* afteritem, ScriptAction::Ptr action)
+            : TQListViewItem(parentitem, afteritem), m_collection( parentitem->collection() ), m_action(action) {}
 
         ScriptAction::Ptr action() const { return m_action; }
         ScriptActionCollection* collection() const { return m_collection; }
@@ -206,12 +206,12 @@ void WdgScriptsManager::addItem(ScriptActionCollection* collection)
         lastitem = addItem(*it, i, lastitem);
 }
 
-TQListViewItem* WdgScriptsManager::addItem(ScriptAction::Ptr action, TQListViewItem* tqparentitem, TQListViewItem* afteritem)
+TQListViewItem* WdgScriptsManager::addItem(ScriptAction::Ptr action, TQListViewItem* parentitem, TQListViewItem* afteritem)
 {
     if(! action)
         return 0;
 
-    ListItem* i = new ListItem(dynamic_cast<ListItem*>(tqparentitem), afteritem, action);
+    ListItem* i = new ListItem(dynamic_cast<ListItem*>(parentitem), afteritem, action);
     i->setText(0, action->text()); // FIXME: i18nise it for ko2.0
     //i->setText(1, action->getDescription()); // FIXME: i18nise it for ko2.0
     //i->setText(2, action->name());
diff --git a/lib/kross/main/wdgscriptsmanager.h b/lib/kross/main/wdgscriptsmanager.h
index b953f862..34976373 100644
--- a/lib/kross/main/wdgscriptsmanager.h
+++ b/lib/kross/main/wdgscriptsmanager.h
@@ -53,7 +53,7 @@ class WdgScriptsManager : public WdgScriptsManagerBase
     private:
         WdgScriptsManagerPrivate* d;
         void addItem(ScriptActionCollection* collection);
-        TQListViewItem* addItem(ScriptAction::Ptr, TQListViewItem* tqparentitem, TQListViewItem* afteritem);
+        TQListViewItem* addItem(ScriptAction::Ptr, TQListViewItem* parentitem, TQListViewItem* afteritem);
 };
 
 }}
diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui
index 22ad3867..379fb2db 100644
--- a/lib/kross/main/wdgscriptsmanagerbase.ui
+++ b/lib/kross/main/wdgscriptsmanagerbase.ui
@@ -233,7 +233,7 @@
         <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>ktoolbar.h</includehint>
diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py
index b8edbe9c..89a07066 100755
--- a/lib/kross/python/scripts/gui.py
+++ b/lib/kross/python/scripts/gui.py
@@ -371,26 +371,26 @@ class Dialog:
 	def close(self):
 		self.dialog.close()
 
-	def addFrame(self, tqparentwidget):
-		return self.dialog.Frame(self.dialog, tqparentwidget.widget)
+	def addFrame(self, parentwidget):
+		return self.dialog.Frame(self.dialog, parentwidget.widget)
 
-	def addLabel(self, tqparentwidget, caption):
-		return self.dialog.Label(self.dialog, tqparentwidget.widget, caption)
+	def addLabel(self, parentwidget, caption):
+		return self.dialog.Label(self.dialog, parentwidget.widget, caption)
 
-	def addCheckBox(self, tqparentwidget, caption, checked = True):
-		return self.dialog.CheckBox(self.dialog, tqparentwidget.widget, caption, checked)
+	def addCheckBox(self, parentwidget, caption, checked = True):
+		return self.dialog.CheckBox(self.dialog, parentwidget.widget, caption, checked)
 
-	def addButton(self, tqparentwidget, caption, commandmethod):
-		return self.dialog.Button(self.dialog, tqparentwidget.widget, caption, commandmethod)
+	def addButton(self, parentwidget, caption, commandmethod):
+		return self.dialog.Button(self.dialog, parentwidget.widget, caption, commandmethod)
 
-	def addEdit(self, tqparentwidget, caption, text):
-		return self.dialog.Edit(self.dialog, tqparentwidget.widget, caption, text)
+	def addEdit(self, parentwidget, caption, text):
+		return self.dialog.Edit(self.dialog, parentwidget.widget, caption, text)
 
-	def addFileChooser(self, tqparentwidget, caption, initialfile = None, filetypes = None):
-		return self.dialog.FileChooser(self.dialog, tqparentwidget.widget, caption, initialfile, filetypes)
+	def addFileChooser(self, parentwidget, caption, initialfile = None, filetypes = None):
+		return self.dialog.FileChooser(self.dialog, parentwidget.widget, caption, initialfile, filetypes)
 
-	def addList(self, tqparentwidget, caption, items):
-		return self.dialog.List(self.dialog, tqparentwidget.widget, caption, items)
+	def addList(self, parentwidget, caption, items):
+		return self.dialog.List(self.dialog, parentwidget.widget, caption, items)
 		
 	def showMessageBox(self, typename, caption, message):
 		return self.dialog.MessageBox(self.dialog, typename, caption, message)
diff --git a/lib/store/KoXmlWriter.cpp b/lib/store/KoXmlWriter.cpp
index 6b2bf039..4260f76f 100644
--- a/lib/store/KoXmlWriter.cpp
+++ b/lib/store/KoXmlWriter.cpp
@@ -105,9 +105,9 @@ void KoXmlWriter::startElement( const char* tagName, bool indentInside )
     Q_ASSERT( tagName != 0 );
 
     // Tell tqparent that it has tqchildren
-    bool tqparentIndent = prepareForChild();
+    bool parentIndent = prepareForChild();
 
-    m_tags.push( Tag( tagName, tqparentIndent && indentInside ) );
+    m_tags.push( Tag( tagName, parentIndent && indentInside ) );
     writeChar( '<' );
     writeCString( tagName );
     //kdDebug() << k_funcinfo << tagName << endl;
diff --git a/lib/store/fix_storage.pl b/lib/store/fix_storage.pl
index ba605616..8b13a397 100644
--- a/lib/store/fix_storage.pl
+++ b/lib/store/fix_storage.pl
@@ -62,9 +62,9 @@ sub dumpTree {
 
 # Finds the files where we have to fix part references (->maindoc.xml)
 sub findCandidates {
-  my($dref, $currentdir, $tqparentdir) = @_;
+  my($dref, $currentdir, $parentdir) = @_;
   my @dir = @{$dref};
-  #print "current: $currentdir, tqparentdir: $tqparentdir\n";
+  #print "current: $currentdir, parentdir: $parentdir\n";
   foreach(@dir) {
     if(ref($_) eq 'ARRAY') {
       #print $_->[0], "   (", $_->[1], ")\n";
@@ -72,8 +72,8 @@ sub findCandidates {
     }
     else {
       if($_ =~ m/maindoc\.xml/) {
-	my $source = $tqparentdir . '/' . $currentdir . "/maindoc.xml";
-	my $dest = $tqparentdir . '/' . $currentdir . ".xml";
+	my $source = $parentdir . '/' . $currentdir . "/maindoc.xml";
+	my $dest = $parentdir . '/' . $currentdir . ".xml";
 	push(@needFixing, [ $source, $dest ]);
       }
     }