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

diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp
index f976dd78..58d5af9a 100644
--- a/kword/KWTextFrameSet.cpp
+++ b/kword/KWTextFrameSet.cpp
@@ -227,7 +227,7 @@ KWFrame * KWTextFrameSet::documentToInternal( const KoPoint &dPoint, TQPoint &iP
 #ifdef DEBUG_DTI
     kdDebug() << "KWTextFrameSet::documentToInternal dPoint:" << dPoint.x() << "," << dPoint.y() << endl;
 #endif
-    if ( !m_doc->tqlayoutViewMode()->hasFrames() ) { // text viewmode
+    if ( !m_doc->layoutViewMode()->hasFrames() ) { // text viewmode
         iPoint = TQPoint( m_doc->ptToLayoutUnitPixX( dPoint.x() ),
                          m_doc->ptToLayoutUnitPixY( dPoint.y() ) );
         return m_frames.getFirst();
@@ -382,8 +382,8 @@ KWFrame * KWTextFrameSet::internalToDocumentWithHint( const TQPoint &iPoint, KoP
 #ifdef DEBUG_ITD
     kdDebug() << "KWTextFrameSet::internalToDocumentWithHint hintDPoint: " << hintDPoint.x() << "," << hintDPoint.y() << endl;
 #endif
-    if ( !m_doc->tqlayoutViewMode()->hasFrames() ) { // text viewmode
-        dPoint = m_doc->tqlayoutUnitPtToPt( m_doc->pixelToPt( iPoint ) );
+    if ( !m_doc->layoutViewMode()->hasFrames() ) { // text viewmode
+        dPoint = m_doc->layoutUnitPtToPt( m_doc->pixelToPt( iPoint ) );
         return m_frames.getFirst();
     }
     KWFrame *lastFrame = 0L;
@@ -421,7 +421,7 @@ KWFrame * KWTextFrameSet::internalToDocumentWithHint( const TQPoint &iPoint, KoP
     kdDebug(32002) << "KWTextFrameSet::internalToDocumentWithHint " << iPoint.x() << "," << iPoint.y()
                    << " not in any frame of " << (void*)this << endl;
 #endif
-    dPoint = m_doc->tqlayoutUnitPtToPt( m_doc->pixelToPt( iPoint ) ); // bah
+    dPoint = m_doc->layoutUnitPtToPt( m_doc->pixelToPt( iPoint ) ); // bah
     return 0L;
 }
 
@@ -429,7 +429,7 @@ KWFrame * KWTextFrameSet::internalToDocumentWithHint( const TQPoint &iPoint, KoP
 KoPoint KWTextFrameSet::internalToDocumentKnowingFrame( const KoPoint &relPoint, KWFrame* theFrame ) const
 {
     // It's ok to have theFrame == 0 in the text viewmode, but not in other modes
-    if ( m_doc->tqlayoutViewMode()->hasFrames() )
+    if ( m_doc->layoutViewMode()->hasFrames() )
         Q_ASSERT( theFrame );
     if ( theFrame )
         return KoPoint( relPoint.x() + theFrame->innerRect().x(),
@@ -441,7 +441,7 @@ KoPoint KWTextFrameSet::internalToDocumentKnowingFrame( const KoPoint &relPoint,
 KoPoint KWTextFrameSet::internalToDocumentKnowingFrame( const TQPoint &iPoint, KWFrame* theFrame ) const
 {
     // Convert LU to relative coordinates (pt), then call the real internalToDocumentKnowingFrame().
-    return internalToDocumentKnowingFrame( m_doc->tqlayoutUnitPtToPt( m_doc->pixelToPt( iPoint ) ), theFrame );
+    return internalToDocumentKnowingFrame( m_doc->layoutUnitPtToPt( m_doc->pixelToPt( iPoint ) ), theFrame );
 }
 
 TQPoint KWTextFrameSet::moveToPage( int currentPgNum, short int direction ) const
@@ -646,11 +646,11 @@ void KWTextFrameSet::drawFrameContents( KWFrame *theFrame, TQPainter *painter, c
         // Finding the "last parag of the frame" is a bit tricky.
         // It's usually the one before lastFormatted, except if it's actually lastParag :}  [see KoTextDocument::draw]
         KoTextParag * lastDrawn = lastFormatted->prev();
-        if ( lastFormatted == textDocument()->lastParag() && ( !lastDrawn || m_doc->tqlayoutUnitToPixelY( lastDrawn->rect().bottom() ) < r.bottom() ) )
+        if ( lastFormatted == textDocument()->lastParag() && ( !lastDrawn || m_doc->layoutUnitToPixelY( lastDrawn->rect().bottom() ) < r.bottom() ) )
             lastDrawn = lastFormatted;
 
         //kdDebug(32002) << "KWTextFrameSet::drawFrame drawn. onlyChanged=" << onlyChanged << " resetChanged=" << resetChanged << " lastDrawn=" << lastDrawn->paragId() << " lastDrawn's bottom:" << lastDrawn->rect().bottom() << " r.bottom=" << r.bottom() << endl;
-        if ( lastDrawn && m_doc->tqlayoutUnitToPixelY( lastDrawn->rect().bottom() ) > r.bottom() )
+        if ( lastDrawn && m_doc->layoutUnitToPixelY( lastDrawn->rect().bottom() ) > r.bottom() )
         {
             //kdDebug(32002) << "KWTextFrameSet::drawFrame setting lastDrawn " << lastDrawn->paragId() << " to changed" << endl;
             lastDrawn->setChanged( true );
@@ -697,7 +697,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor
     TQPoint topLeft = parag->rect().topLeft();         // in TQRT coords
     int lineY;
     // Cursor height, in pixels
-    int cursorHeight = m_doc->tqlayoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) );
+    int cursorHeight = m_doc->layoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) );
     TQPoint iPoint( topLeft.x() + cursor->x(),
                    topLeft.y() + lineY );
 
@@ -721,7 +721,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor
         kdDebug() << " vPoint(view, pixels)=" << vPoint.x() << "," << vPoint.y() << endl;
 #endif
         // from now on, iPoint will be in pixels
-        iPoint = m_doc->tqlayoutUnitToPixel( iPoint );
+        iPoint = m_doc->layoutUnitToPixel( iPoint );
         //int xadj = parag->at( cursor->index() )->pixelxadj;
 #ifdef DEBUG_CURSOR
         //kdDebug() << "     iPoint in pixels : " << iPoint.x() << "," << iPoint.y() << "     will add xadj=" << xadj << endl;
@@ -974,7 +974,7 @@ void KWTextFrameSet::getMargins( int yp, int h, int reqMinWidth,
 #ifdef DEBUG_MARGINS
     kdDebugBody(32002) << "  getMargins: looking for frames between " << yp << " and " << yp+h << " (internal coords)" << endl;
 #endif
-    if ( m_doc->tqlayoutViewMode()->shouldAdjustMargins() )
+    if ( m_doc->layoutViewMode()->shouldAdjustMargins() )
     {
         // Principle: for every frame on top at this height, we'll move from and to
         // towards each other. The text flows between 'from' and 'to'
@@ -1193,7 +1193,7 @@ int KWTextFrameSet::formatVertically( KoTextParag * _parag, const TQRect& paragR
 {
     // WARNING: in this whole method parag can be 0. See adjustFlow()
     KWTextParag *parag = static_cast<KWTextParag *>( _parag );
-    if ( !m_doc->tqlayoutViewMode()->shouldFormatVertically() )
+    if ( !m_doc->layoutViewMode()->shouldFormatVertically() )
     {
         return 0;
     }
@@ -1528,7 +1528,7 @@ KWFrame * KWTextFrameSet::internalToDocument( const KoPoint &relPoint, KoPoint &
 #ifdef DEBUG_ITD
     kdDebug() << name() << " ITD called for relPoint=" << relPoint.x() << "," << relPoint.y() << endl;
 #endif
-    if ( !m_doc->tqlayoutViewMode()->hasFrames() ) { // text viewmode
+    if ( !m_doc->layoutViewMode()->hasFrames() ) { // text viewmode
         dPoint = relPoint;
         return m_frames.getFirst();
     }
@@ -1653,7 +1653,7 @@ KWFrame * KWTextFrameSet::internalToDocument( const KoPoint &relPoint, KoPoint &
 // same but with iPoint in LU
 KWFrame * KWTextFrameSet::internalToDocument( const TQPoint &iPoint, KoPoint &dPoint ) const
 {
-    KoPoint relPoint = m_doc->tqlayoutUnitPtToPt( m_doc->pixelToPt( iPoint ) );
+    KoPoint relPoint = m_doc->layoutUnitPtToPt( m_doc->pixelToPt( iPoint ) );
     return internalToDocument( relPoint, dPoint );
 }
 
@@ -1676,13 +1676,13 @@ void KWTextFrameSet::printDebug()
 }
 #endif
 
-TQDomElement KWTextFrameSet::saveInternal( TQDomElement &tqparentElem, bool saveFrames, bool saveAnchorsFramesets )
+TQDomElement KWTextFrameSet::saveInternal( TQDomElement &parentElem, bool saveFrames, bool saveAnchorsFramesets )
 {
     if ( m_frames.isEmpty() ) // Deleted frameset -> don't save
         return TQDomElement();
 
-    TQDomElement framesetElem = tqparentElem.ownerDocument().createElement( "FRAMESET" );
-    tqparentElem.appendChild( framesetElem );
+    TQDomElement framesetElem = parentElem.ownerDocument().createElement( "FRAMESET" );
+    parentElem.appendChild( framesetElem );
 
     if ( m_groupmanager ) {
         framesetElem.setAttribute( "grpMgr", m_groupmanager->name() );
@@ -2010,7 +2010,7 @@ bool KWTextFrameSet::slotAfterFormattingNeedMoreSpace( int bottom, KoTextParag *
                 // The Y position doesn't matter much, recalcFrames will reposition the frame
                 // But the point of this code is set the correct height for the frame.
                 double maxFooterSize = footerHeaderSizeMax( theFrame );
-                double diffPt = m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+                double diffPt = m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
                 wantedPosition = theFrame->top() - diffPt;
 #ifdef DEBUG_FORMAT_MORE
                 kdDebug() << "  diffPt=" << diffPt << " -> wantedPosition=" << wantedPosition << endl;
@@ -2038,7 +2038,7 @@ bool KWTextFrameSet::slotAfterFormattingNeedMoreSpace( int bottom, KoTextParag *
             }
             // Other frames are resized by the bottom
 
-            wantedPosition = m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) ) + theFrame->bottom();
+            wantedPosition = m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) ) + theFrame->bottom();
             KWPage *page = m_doc->pageManager()->page( theFrame );
             double pageBottom;
             if(page)
@@ -2086,7 +2086,7 @@ bool KWTextFrameSet::slotAfterFormattingNeedMoreSpace( int bottom, KoTextParag *
                       // The Y position doesn't matter much, recalcFrames will reposition the frame
                       // But the point of this code is set the correct height for the frame.
                       double maxFooterSize = footerHeaderSizeMax( theFrame );
-                      double diffPt = m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+                      double diffPt = m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
                       wantedPosition = theFrame->top() - diffPt;
                       if ( wantedPosition < 0 )
                       {
@@ -2183,7 +2183,7 @@ void KWTextFrameSet::slotAfterFormattingTooMuchSpace( int bottom )
 #endif
     if ( theFrame->frameSet()->isAFooter() || theFrame->frameSet()->isFootEndNote() )
     {
-        double wantedPosition = theFrame->top() + m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+        double wantedPosition = theFrame->top() + m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
         Q_ASSERT( wantedPosition < theFrame->bottom() );
         if ( wantedPosition != theFrame->top() )
         {
@@ -2199,7 +2199,7 @@ void KWTextFrameSet::slotAfterFormattingTooMuchSpace( int bottom )
     }
     else // header or other frame: resize bottom
     {
-        double wantedPosition = theFrame->bottom() - m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+        double wantedPosition = theFrame->bottom() - m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
 #ifdef DEBUG_FORMAT_MORE
         kdDebug() << "slotAfterFormatting wantedPosition=" << wantedPosition << " top+minheight=" << theFrame->top() + s_minFrameHeight << endl;
 #endif
@@ -2231,7 +2231,7 @@ void KWTextFrameSet::slotAfterFormattingTooMuchSpace( int bottom )
                     else if ( table->anchorFrameset()->isAFooter() ||  table->anchorFrameset()->isFootEndNote() )
                     {
                       theFrame = table->anchorFrameset()->frameIterator().getLast();
-                      double wantedPosition = theFrame->top() + m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+                      double wantedPosition = theFrame->top() + m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
                       Q_ASSERT( wantedPosition < theFrame->bottom() );
                       if ( wantedPosition != theFrame->top() )
                       {
@@ -2459,9 +2459,9 @@ double KWTextFrameSet::footerHeaderSizeMax( KWFrame *theFrame )
     return tmp;
 }
 
-void KWTextFrameSet::frameResized( KWFrame *theFrame, bool tqinvalidateLayout )
+void KWTextFrameSet::frameResized( KWFrame *theFrame, bool invalidateLayout )
 {
-    kdDebug(32002) << "KWTextFrameSet::frameResized " << theFrame << " " << *theFrame << " tqinvalidateLayout=" << tqinvalidateLayout << endl;
+    kdDebug(32002) << "KWTextFrameSet::frameResized " << theFrame << " " << *theFrame << " invalidateLayout=" << invalidateLayout << endl;
     if ( theFrame->height() < 0 )
         return; // safety!
 
@@ -2486,7 +2486,7 @@ void KWTextFrameSet::frameResized( KWFrame *theFrame, bool tqinvalidateLayout )
     // m_doc->frameChanged( theFrame );
     // Warning, can't call tqlayout() (frameChanged calls it)
     // from here, since it calls formatMore() !
-    if ( tqinvalidateLayout )
+    if ( invalidateLayout )
         m_doc->tqinvalidate(this);
 
     // Can't tqrepaint directly, we might be in a paint event already
@@ -3361,9 +3361,9 @@ void KWTextFrameSetEdit::ensureCursorVisible()
     }
     TQPoint cursorPos = textFrameSet()->kWordDocument()->zoomPoint( pt );
     cursorPos = m_canvas->viewMode()->normalToView( cursorPos );
-    areaLeft = textFrameSet()->kWordDocument()->tqlayoutUnitToPixelX( areaLeft ) + 1;
-    areaRight = textFrameSet()->kWordDocument()->tqlayoutUnitToPixelX( areaRight ) + 1;
-    cursorHeight = textFrameSet()->kWordDocument()->tqlayoutUnitToPixelY( cursorHeight );
+    areaLeft = textFrameSet()->kWordDocument()->layoutUnitToPixelX( areaLeft ) + 1;
+    areaRight = textFrameSet()->kWordDocument()->layoutUnitToPixelX( areaRight ) + 1;
+    cursorHeight = textFrameSet()->kWordDocument()->layoutUnitToPixelY( cursorHeight );
     //kdDebug() << "KWTextFrameSetEdit::ensureCursorVisible pt=" << pt << " cursorPos=" << cursorPos
     //          << " areaLeft=" << areaLeft << " areaRight=" << areaRight << " y=" << y << endl;
     m_canvas->ensureVisible( cursorPos.x() - areaLeft, cursorPos.y() + cursorHeight / 2, areaLeft + areaRight, cursorHeight / 2 + 2 );
@@ -3653,7 +3653,7 @@ void KWTextFrameSetEdit::dropEvent( TQDropEvent * e, const TQPoint & nPoint, con
                 if ( cmd )
                     macroCmd->addCommand(cmd);
                 //retqlayout textframeset after a dnd otherwise autoextend
-                //frameset is not re-tqlayouted
+                //frameset is not re-layouted
                 textFrameSet()->tqlayout();
                 frameSet()->kWordDocument()->addCommand( macroCmd );
             }