Rename obsolete tq methods to standard names

1 files changed, 8 insertions, 8 deletions

diff --git a/kword/KWFrameLayout.cpp b/kword/KWFrameLayout.cpp
index 685f81e6..8db6227a 100644
--- a/kword/KWFrameLayout.cpp
+++ b/kword/KWFrameLayout.cpp
@@ -38,7 +38,7 @@ KWFrameLayout::HeaderFooterFrameset::HeaderFooterFrameset( KWTextFrameSet* fs, i
     if ( fs->frameCount() > 0 )
         m_height = fs->frame(0)->height();
     else
-        m_height = 20; // whatever. The text tqlayout will resize it.
+        m_height = 20; // whatever. The text layout will resize it.
     Q_ASSERT( m_height > 0 );
 }
 
@@ -129,13 +129,13 @@ int KWFrameLayout::HeaderFooterFrameset::frameNumberForPage( int page ) const
 
 /////
 
-void KWFrameLayout::tqlayout( KWFrameSet* mainTextFrameSet, int numColumns,
+void KWFrameLayout::layout( KWFrameSet* mainTextFrameSet, int numColumns,
                             int fromPage, int toPage, uint flags )
 {
-    //kdDebug(32002) << "KWFrameLayout::tqlayout " << kdBacktrace() << endl;
+    //kdDebug(32002) << "KWFrameLayout::layout " << kdBacktrace() << endl;
     // Just debug stuff
 #ifdef DEBUG_FRAMELAYOUT
-    kdDebug(32002) << "KWFrameLayout::tqlayout " << fromPage << " to " << toPage << endl;
+    kdDebug(32002) << "KWFrameLayout::layout " << fromPage << " to " << toPage << endl;
     Q_ASSERT( toPage >= fromPage );
     TQPtrListIterator<HeaderFooterFrameset> itdbg( m_headersFooters );
     for ( ; itdbg.current() ; ++itdbg )
@@ -493,8 +493,8 @@ void KWFrameLayout::tqlayout( KWFrameSet* mainTextFrameSet, int numColumns,
 
         // Not right now, this could be called during formatting...
         //m_doc->invalidate();
-        // ### This means the tqlayout will be done during painting. Not good.
-        // What about mainTextFrameSet->invalidate() or even tqlayout()?
+        // ### This means the layout will be done during painting. Not good.
+        // What about mainTextFrameSet->invalidate() or even layout()?
         //TQTimer::singleShot( 0, m_doc, TQT_SLOT( invalidate() ) );
 
         // Invalidate main textframeset only, and from top of page only.
@@ -549,8 +549,8 @@ void KWFrameLayout::resizeOrCreateHeaderFooter( KWTextFrameSet* headerFooter, ui
     m_framesetsToUpdate.insert( headerFooter, true );
 }
 
-// Called at beginning and end of the tqlayout for a given page,
-// to determine if the main-text-frame tqlayout really changed or not.
+// Called at beginning and end of the layout for a given page,
+// to determine if the main-text-frame layout really changed or not.
 // Testing in resizeMainTextFrame doesn't work, we call it several times,
 // once for each footnote, so it can't detect the "no change" case.
 KoRect KWFrameLayout::firstColumnRect( KWFrameSet* mainTextFrameSet, int pageNum, int numColumns ) const