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, 37 insertions, 37 deletions

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