Remove additional unneeded tq method conversions

1 files changed, 25 insertions, 25 deletions

diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp
index 7f7a78a3..54f9f97d 100644
--- a/kword/KWTextFrameSet.cpp
+++ b/kword/KWTextFrameSet.cpp
@@ -615,7 +615,7 @@ void KWTextFrameSet::drawFrameContents( KWFrame *theFrame, TQPainter *painter, c
                 var->resize();
                 TQSize newSize( var->width, var->height );
                 if ( oldSize != newSize )
-                    var->paragraph()->tqinvalidate( 0 ); // size has changed -> need reformatting !
+                    var->paragraph()->invalidate( 0 ); // size has changed -> need reformatting !
                 var->paragraph()->setChanged( true );
             }
         }
@@ -826,16 +826,16 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor
 
 void KWTextFrameSet::tqlayout()
 {
-    tqinvalidate();
+    invalidate();
     // Get the thing going though, repainting doesn't call formatMore
     m_textobj->formatMore( 2 );
 }
 
-void KWTextFrameSet::tqinvalidate()
+void KWTextFrameSet::invalidate()
 {
-    //kdDebug() << "KWTextFrameSet::tqinvalidate " << name() << endl;
+    //kdDebug() << "KWTextFrameSet::invalidate " << name() << endl;
     m_textobj->setLastFormattedParag( textDocument()->firstParag() );
-    textDocument()->tqinvalidate(); // lazy tqlayout, real update follows upon next tqrepaint
+    textDocument()->invalidate(); // lazy tqlayout, real update follows upon next repaint
 }
 
 void KWTextFrameSet::slotRepaintChanged()
@@ -2388,7 +2388,7 @@ bool KWTextFrameSet::createNewPageAndNewFrame( KoTextParag* lastFormatted, int /
     Q_ASSERT(frame(0) && frame(0)->frameStack());
     frame(0)->frameStack()->update();
     /// We don't want to start from the beginning every time !
-    ////m_doc->tqinvalidate();
+    ////m_doc->invalidate();
 
     // Reformat the last paragraph. If it's over the two pages, it will need
     // the new page (e.g. for inline frames that need internalToDocument to work)
@@ -2400,7 +2400,7 @@ bool KWTextFrameSet::createNewPageAndNewFrame( KoTextParag* lastFormatted, int /
     if ( lastFormatted )
     {
         m_textobj->setLastFormattedParag( lastFormatted );
-        lastFormatted->tqinvalidate( 0 );
+        lastFormatted->invalidate( 0 );
         //This was a way to format the rest from here (recursively), but it didn't help much ensureCursorVisible()
         //So instead I fixed formatMore to return formatMore(2) itself.
         //m_textobj->formatMore( 2 );
@@ -2487,9 +2487,9 @@ void KWTextFrameSet::frameResized( KWFrame *theFrame, bool invalidateLayout )
     // Warning, can't call tqlayout() (frameChanged calls it)
     // from here, since it calls formatMore() !
     if ( invalidateLayout )
-        m_doc->tqinvalidate(this);
+        m_doc->invalidate(this);
 
-    // Can't tqrepaint directly, we might be in a paint event already
+    // Can't repaint directly, we might be in a paint event already
     m_doc->delayedRepaintAllViews();
 }
 
@@ -2819,13 +2819,13 @@ TQString KWTextFrameSet::toPlainText() const
     return m_textobj->textDocument()->plainText();
 }
 
-void KWTextFrameSet::highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool tqrepaint, KDialogBase* dialog )
+void KWTextFrameSet::highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool repaint, KDialogBase* dialog )
 {
     Q_ASSERT( isVisible() );
     Q_ASSERT( m_textobj->isVisible() );
-    //kdDebug() << "highlighting in " << name() << " parag=" << parag->paragId() << " index=" << index << " tqrepaint=" << tqrepaint << endl;
-    m_textobj->highlightPortion( parag, index, length, tqrepaint );
-    if ( tqrepaint ) {
+    //kdDebug() << "highlighting in " << name() << " parag=" << parag->paragId() << " index=" << index << " repaint=" << repaint << endl;
+    m_textobj->highlightPortion( parag, index, length, repaint );
+    if ( repaint ) {
         // Position the cursor
         canvas->editTextFrameSet( this, parag, index );
         // Ensure text is fully visible
@@ -2843,9 +2843,9 @@ void KWTextFrameSet::highlightPortion( KoTextParag * parag, int index, int lengt
     }
 }
 
-void KWTextFrameSet::removeHighlight( bool tqrepaint )
+void KWTextFrameSet::removeHighlight( bool repaint )
 {
-    m_textobj->removeHighlight( tqrepaint );
+    m_textobj->removeHighlight( repaint );
 }
 
 void KWTextFrameSet::clearUndoRedoInfo()
@@ -2920,7 +2920,7 @@ protected:
     }
 };
 
-void KWTextFrameSet::renumberFootNotes( bool tqrepaint )
+void KWTextFrameSet::renumberFootNotes( bool repaint )
 {
     KWFootNoteVarList lst;
     TQPtrListIterator<KoTextCustomItem> cit( textDocument()->allCustomItems() );
@@ -2986,17 +2986,17 @@ void KWTextFrameSet::renumberFootNotes( bool tqrepaint )
                 if ( var->numberingType()== KWFootNoteVariable::Manual)
                     var->frameSet()->setName( m_doc->generateFramesetName(fsName));
                 else
-                    var->frameSet()->setName( fsName.tqarg( var->text() ) );
+                    var->frameSet()->setName( fsName.arg( var->text() ) );
                 var->frameSet()->setCounterText( var->text() );
             }
             var->resize();
-            var->paragraph()->tqinvalidate(0);
+            var->paragraph()->invalidate(0);
             var->paragraph()->setChanged( true );
             needRepaint = true;
         }
         ++vit;
     }
-    if ( needRepaint && tqrepaint )
+    if ( needRepaint && repaint )
         m_doc->slotRepaintChanged( this );
 }
 
@@ -3048,7 +3048,7 @@ TQByteArray KWTextFrameSet::sortText(SortType type) const
 
 // This is used when loading (KWTextDocument::loadOasisFootnote)
 // and when inserting from the GUI (KWTextFrameSetEdit::insertFootNote),
-// so don't add any 'tqrepaint' or 'recalc' code here
+// so don't add any 'repaint' or 'recalc' code here
 KWFootNoteFrameSet * KWTextFrameSet::insertFootNote( NoteType noteType, KWFootNoteVariable::Numbering numType, const TQString &manualString )
 {
      kdDebug() << "KWTextFrameSetEdit::insertFootNote " << endl;
@@ -3984,9 +3984,9 @@ void KWTextFrameSetEdit::updateUI( bool updateFormat, bool force )
     // Paragraph settings
     KWTextParag * parag = static_cast<KWTextParag *>(cursor()->parag());
 
-    if ( m_paragLayout.tqalignment != parag->resolveAlignment() || force ) {
-        m_paragLayout.tqalignment = parag->resolveAlignment();
-        m_canvas->gui()->getView()->showAlign( m_paragLayout.tqalignment );
+    if ( m_paragLayout.alignment != parag->resolveAlignment() || force ) {
+        m_paragLayout.alignment = parag->resolveAlignment();
+        m_canvas->gui()->getView()->showAlign( m_paragLayout.alignment );
     }
 
     // Counter
@@ -4034,8 +4034,8 @@ void KWTextFrameSetEdit::updateUI( bool updateFormat, bool force )
         m_paragLayout.margins[TQStyleSheetItem::MarginRight] = parag->margin(TQStyleSheetItem::MarginRight);
         if ( m_rtl != parag->string()->isRightToLeft() && parag->counter() )
         {
-            parag->counter()->tqinvalidate();
-            parag->setChanged( true ); // tqrepaint
+            parag->counter()->invalidate();
+            parag->setChanged( true ); // repaint
         }
         m_rtl = parag->string()->isRightToLeft();
         m_canvas->gui()->getView()->showRulerIndent( m_paragLayout.margins[TQStyleSheetItem::MarginLeft], m_paragLayout.margins[TQStyleSheetItem::MarginFirstLine], m_paragLayout.margins[TQStyleSheetItem::MarginRight], m_rtl );