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

1 files changed, 28 insertions, 28 deletions

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 ) );
 }