diff options
Diffstat (limited to 'kword/KWFrameSet.cpp')
-rw-r--r-- | kword/KWFrameSet.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp index d07a55e2..b8b9f8d0 100644 --- a/kword/KWFrameSet.cpp +++ b/kword/KWFrameSet.cpp @@ -475,7 +475,7 @@ KoRect KWFrameSet::floatingFrameRect( int frameNum ) int x = anchor->x() + paragRect.x(); // in LU int y = anchor->y() + paragRect.y(); // in LU - KoPoint topLeft( m_doc->tqlayoutUnitToPixelX( x ), m_doc->tqlayoutUnitToPixelY( y ) ); + KoPoint topLeft( m_doc->layoutUnitToPixelX( x ), m_doc->layoutUnitToPixelY( y ) ); return KoRect( topLeft, frame->outerKoRect().size() ); } @@ -603,8 +603,8 @@ bool KWFrameSet::isPaintedBy( KWFrameSet* fs ) const return true; if ( isFloating() ) { - KWFrameSet* tqparentFs = anchorFrameset(); - if ( tqparentFs && tqparentFs->isPaintedBy( fs ) ) + KWFrameSet* parentFs = anchorFrameset(); + if ( parentFs && parentFs->isPaintedBy( fs ) ) return true; } if ( groupmanager() ) @@ -865,25 +865,25 @@ void KWFrameSet::drawFrameContents( KWFrame *, TQPainter *, const TQRect &, kdWarning() << "Default implementation of drawFrameContents called for " << className() << " " << this << " " << name() << kdBacktrace(); } -void KWFrameSet::saveCommon( TQDomElement &tqparentElem, bool saveFrames ) +void KWFrameSet::saveCommon( TQDomElement &parentElem, bool saveFrames ) { if ( m_frames.isEmpty() ) // Deleted frameset -> don't save return; // Save all the common attributes for framesets. - tqparentElem.setAttribute( "frameType", static_cast<int>( type() ) ); - tqparentElem.setAttribute( "frameInfo", static_cast<int>( m_info ) ); - tqparentElem.setAttribute( "name", m_name ); - tqparentElem.setAttribute( "visible", static_cast<int>( m_visible ) ); - tqparentElem.setAttribute( "protectSize", static_cast<int>( m_protectSize ) ); + parentElem.setAttribute( "frameType", static_cast<int>( type() ) ); + parentElem.setAttribute( "frameInfo", static_cast<int>( m_info ) ); + parentElem.setAttribute( "name", m_name ); + parentElem.setAttribute( "visible", static_cast<int>( m_visible ) ); + parentElem.setAttribute( "protectSize", static_cast<int>( m_protectSize ) ); if ( saveFrames ) { TQPtrListIterator<KWFrame> frameIt = frameIterator(); for ( ; frameIt.current(); ++frameIt ) { KWFrame *frame = frameIt.current(); - TQDomElement frameElem = tqparentElem.ownerDocument().createElement( "FRAME" ); - tqparentElem.appendChild( frameElem ); + TQDomElement frameElem = parentElem.ownerDocument().createElement( "FRAME" ); + parentElem.appendChild( frameElem ); frame->save( frameElem ); @@ -1157,7 +1157,7 @@ void KWFrameSet::setNewFrameBehavior( KWFrame::NewFrameBehavior nfb ) { // ## this should pass the viewmode as argument, probably. bool KWFrameSet::isFrameAtPos( const KWFrame* frame, const TQPoint& point, bool borderOfFrameOnly) const { - TQRect outerRect( frame->outerRect( m_doc->tqlayoutViewMode() ) ); + TQRect outerRect( frame->outerRect( m_doc->layoutViewMode() ) ); // Give the user a bit of margin for clicking on it :) const int margin = 2; outerRect.rLeft() -= margin; |