1 files changed, 13 insertions, 13 deletions

diff --git a/lib/kformula/indexelement.cc b/lib/kformula/indexelement.cc
index 5e2ee3e58..a8d3b68a3 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 );