Rename incorrect instances of tqrepaint[...] to repaint[...]

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1240369 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

17 files changed, 147 insertions, 147 deletions

diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp
index 2e147e6c..1551026c 100644
--- a/kword/KWCanvas.cpp
+++ b/kword/KWCanvas.cpp
@@ -183,24 +183,24 @@ KWCanvas::~KWCanvas()
     m_frameViewManager = 0;
 }
 
-void KWCanvas::tqrepaintChanged( KWFrameSet * fs, bool resetChanged )
+void KWCanvas::repaintChanged( KWFrameSet * fs, bool resetChanged )
 {
     assert(fs); // the new code can't support fs being 0L here. Mail me if it happens (DF)
-    //kdDebug(32002) << "KWCanvas::tqrepaintChanged this=" << this << " fs=" << fs << endl;
+    //kdDebug(32002) << "KWCanvas::repaintChanged this=" << this << " fs=" << fs << endl;
     TQPainter p( viewport() );
     p.translate( -contentsX(), -contentsY() );
     p.setBrushOrigin( -contentsX(), -contentsY() );
     TQRect crect( contentsX(), contentsY(), visibleWidth(), visibleHeight() );
     drawFrameSet( fs, &p, crect, true, resetChanged, m_viewMode );
-    // ###### This tqrepaints the whole grid every time. Ouch.
+    // ###### This repaints the whole grid every time. Ouch.
     // We should return a TQRegion from drawFrameSet.... Tricky.
     if ( m_doc->showGrid() )
       drawGrid( p, crect );
 }
 
-void KWCanvas::tqrepaintAll( bool erase /* = false */ )
+void KWCanvas::repaintAll( bool erase /* = false */ )
 {
-    //kdDebug(32002) << "KWCanvas::tqrepaintAll erase=" << erase << endl;
+    //kdDebug(32002) << "KWCanvas::repaintAll erase=" << erase << endl;
     viewport()->tqrepaint( erase );
 }
 
@@ -403,7 +403,7 @@ void KWCanvas::mpCreatePixmap( const TQPoint& normalPoint, bool noGrid  )
         }
         emit docStructChanged(Pictures);
         if ( !m_doc->showGrid() && m_doc->snapToGrid() )
-          tqrepaintContents( FALSE ); //draw the grid over the whole canvas
+          repaintContents( FALSE ); //draw the grid over the whole canvas
     }
 }
 
@@ -812,7 +812,7 @@ void KWCanvas::contentsMouseMoveEvent( TQMouseEvent *e )
                         m_currentTable->resizeColumn( m_rowColResized, docPoint.x() );
                     // Repaint only the changed rects (oldRect U newRect)
                     TQRect newRect( m_viewMode->normalToView( m_doc->zoomRect( m_currentTable->boundingRect() ) ) );
-                    tqrepaintContents( TQRegion(oldRect).unite(newRect).boundingRect(), FALSE );
+                    repaintContents( TQRegion(oldRect).unite(newRect).boundingRect(), FALSE );
                 }
                 else if (m_interactionPolicy) {
                     m_interactionPolicy->handleMouseMove(e->state(),
@@ -893,7 +893,7 @@ void KWCanvas::mrEditFrame() {
         delete(m_interactionPolicy);
         m_interactionPolicy = 0;
         if ( !m_doc->showGrid() && m_doc->snapToGrid() )
-            tqrepaintContents();
+            repaintContents();
     }
     m_mousePressed = false;
 }
@@ -932,7 +932,7 @@ void KWCanvas::mrCreateText()
             emit currentFrameSetEditChanged();
     }
     setMouseMode( MM_EDIT );
-    m_doc->tqrepaintAllViews();
+    m_doc->repaintAllViews();
     emit docStructChanged(TextFrames);
     emit currentFrameSetEditChanged();
 }
@@ -1033,7 +1033,7 @@ void KWCanvas::mrCreateTable()
         }
         m_doc->updateAllFrames();
         m_doc->tqlayout();
-        tqrepaintAll();
+        repaintAll();
 
     }
     setMouseMode( MM_EDIT );
@@ -1127,7 +1127,7 @@ void KWCanvas::contentsMouseReleaseEvent( TQMouseEvent * e )
         }
 
         if ( old_mouseMove != MM_EDIT && !m_doc->showGrid() && m_doc->snapToGrid() )
-          tqrepaintContents( FALSE ); //draw the grid over the whole canvas
+          repaintContents( FALSE ); //draw the grid over the whole canvas
         m_mousePressed = false;
     }
 }
@@ -1192,7 +1192,7 @@ void KWCanvas::setFrameBackgroundColor( const TQBrush &_backColor )
     {
         KWFrameBackGroundColorCommand *cmd=new KWFrameBackGroundColorCommand(i18n("Change Frame Background Color"),frameindexList,oldColor,_backColor);
         m_doc->addCommand(cmd);
-        m_doc->tqrepaintAllViews();
+        m_doc->repaintAllViews();
     }
     else
     {
@@ -1370,7 +1370,7 @@ void KWCanvas::terminateCurrentEdit()
     delete m_currentFrameSetEdit;
     m_currentFrameSetEdit = 0L;
     emit currentFrameSetEditChanged();
-    tqrepaintAll();
+    repaintAll();
 }
 
 void KWCanvas::terminateEditing( KWFrameSet *fs )
@@ -1404,7 +1404,7 @@ void KWCanvas::setMouseMode( MouseMode newMouseMode )
 
         m_mouseMode = newMouseMode;
         if ( !m_doc->showGrid() && m_doc->snapToGrid() )
-          tqrepaintContents( FALSE ); //draw the grid over the whole canvas
+          repaintContents( FALSE ); //draw the grid over the whole canvas
     }
     else
         m_mouseMode = newMouseMode;
@@ -1837,7 +1837,7 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e )
                         KoPoint docPoint = m_doc->unzoomPoint( normalPoint );
                         viewport()->setCursor( m_frameViewManager->mouseCursor( docPoint, keyev->stateAfter() ) );
                         if ( !m_doc->showGrid() && m_doc->snapToGrid() )
-                            tqrepaintContents();
+                            repaintContents();
                     }
                 }
                 else if ( keyev->key() == Key_Insert && keyev->state() == 0 ) {
@@ -2254,11 +2254,11 @@ void FrameResizePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint
             TQRect newRect( frame->outerRect(m_viewMode) );
             TQRect frameRect( m_viewMode->normalToView( newRect ) );
             // Repaint only the changed rects (oldRect U newRect)
-            m_tqrepaintRegion += TQRegion(oldRect).unite(frameRect).boundingRect();
+            m_repaintRegion += TQRegion(oldRect).unite(frameRect).boundingRect();
         }
 
-        TQRegion tqrepaintRegion() {
-            return m_tqrepaintRegion;
+        TQRegion repaintRegion() {
+            return m_repaintRegion;
         }
 
       private:
@@ -2271,7 +2271,7 @@ void FrameResizePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint
       private: // vars
         KoPoint m_from, m_to;
         KWViewMode *m_viewMode;
-        TQRegion m_tqrepaintRegion;
+        TQRegion m_repaintRegion;
         double m_diffX, m_diffY;
     };
 
@@ -2280,9 +2280,9 @@ void FrameResizePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint
         converter.update(m_frames[i], m_frameResize[i].oldRect);
 
     if ( !m_parent->kWordDocument()->showGrid() && m_parent->kWordDocument()->snapToGrid() )
-      m_parent->tqrepaintContents( false ); //draw the grid over the whole canvas
+      m_parent->repaintContents( false ); //draw the grid over the whole canvas
     else
-      m_parent->tqrepaintContents( converter.tqrepaintRegion().boundingRect(), false );
+      m_parent->repaintContents( converter.repaintRegion().boundingRect(), false );
     m_parent->gui()->getView()->updateFrameStatusBarItem();
 }
 
@@ -2373,7 +2373,7 @@ void FrameMovePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint &
 
     TQPtrList<KWTableFrameSet> tablesMoved;
     tablesMoved.setAutoDelete( FALSE );
-    TQRegion tqrepaintRegion;
+    TQRegion repaintRegion;
     KoPoint _move=m_boundingRect.topLeft() - oldBoundingRect.topLeft();
 
     TQValueListIterator<KWFrame*> framesIterator = m_frames.begin();
@@ -2394,7 +2394,7 @@ void FrameMovePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint &
 
             TQRect frameRect( m_parent->viewMode()->normalToView( newRect ) );
             // Repaint only the changed rects (oldRect U newRect)
-            tqrepaintRegion += TQRegion(oldRect).unite(frameRect).boundingRect();
+            repaintRegion += TQRegion(oldRect).unite(frameRect).boundingRect();
         }
     }
 
@@ -2410,15 +2410,15 @@ void FrameMovePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint &
                 TQRect newRect( frame->outerRect(m_parent->viewMode()) );
                 TQRect frameRect( m_parent->viewMode()->normalToView( newRect ) );
                 // Repaing only the changed rects (oldRect U newRect)
-                tqrepaintRegion += TQRegion(oldRect).unite(frameRect).boundingRect();
+                repaintRegion += TQRegion(oldRect).unite(frameRect).boundingRect();
             }
         }
     }
 
     if ( !m_parent->kWordDocument()->showGrid() && m_parent->kWordDocument()->snapToGrid() )
-      m_parent->tqrepaintContents( false ); //draw the grid over the whole canvas
+      m_parent->repaintContents( false ); //draw the grid over the whole canvas
     else
-      m_parent->tqrepaintContents( tqrepaintRegion.boundingRect(), false );
+      m_parent->repaintContents( repaintRegion.boundingRect(), false );
     m_parent->gui()->getView()->updateFrameStatusBarItem();
 }
 
diff --git a/kword/KWCanvas.h b/kword/KWCanvas.h
index 223161f6..f7fffbbd 100644
--- a/kword/KWCanvas.h
+++ b/kword/KWCanvas.h
@@ -74,13 +74,13 @@ public:
     void switchViewMode( const TQString& newViewMode );
     KWViewMode *viewMode() const { return m_viewMode; }
 
-    void tqrepaintAll( bool erase = false );
+    void repaintAll( bool erase = false );
     /**
      * Only tqrepaint the frameset @p fs.
      * @p resetChanged should only be true for the last view
      * (see KWFrameSet::drawContents)
      */
-    void tqrepaintChanged( KWFrameSet * fs, bool resetChanged );
+    void repaintChanged( KWFrameSet * fs, bool resetChanged );
 
     /** We need to tqrepaint if the window is resized. */
     void viewportResizeEvent( TQResizeEvent * );
@@ -230,7 +230,7 @@ protected:
     /**
      * The main drawing method.
      * @param painter guess
-     * @param crect the area to be tqrepainted, in contents coordinates
+     * @param crect the area to be repainted, in contents coordinates
      * @param viewMode the view mode to be used (usually m_viewMode, except when printing)
      */
     void drawDocument( TQPainter *painter, const TQRect &crect, KWViewMode* viewMode );
diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp
index 810856ef..e1f0f52b 100644
--- a/kword/KWCommand.cpp
+++ b/kword/KWCommand.cpp
@@ -446,7 +446,7 @@ void KWFrameBorderCommand::execute()
 
     if ( doc )
     {
-        doc->tqrepaintAllViews();
+        doc->repaintAllViews();
     }
 }
 
@@ -501,7 +501,7 @@ void KWFrameBorderCommand::unexecute()
     if ( doc )
     {
         //update frames
-        doc->tqrepaintAllViews();
+        doc->repaintAllViews();
     }
 }
 
@@ -536,7 +536,7 @@ void KWFrameBackGroundColorCommand::execute()
     }
     //update frame
     if ( doc )
-        doc->tqrepaintAllViews();
+        doc->repaintAllViews();
 }
 
 void KWFrameBackGroundColorCommand::unexecute()
@@ -557,15 +557,15 @@ void KWFrameBackGroundColorCommand::unexecute()
 
     //update frames
     if ( doc )
-        doc->tqrepaintAllViews();
+        doc->repaintAllViews();
 }
 
-KWFrameStyleCommand::KWFrameStyleCommand( const TQString &name, KWFrame *_frame, KWFrameStyle *_fs, bool _tqrepaintViews ) :
+KWFrameStyleCommand::KWFrameStyleCommand( const TQString &name, KWFrame *_frame, KWFrameStyle *_fs, bool _repaintViews ) :
     KNamedCommand( name )
 {
     m_frame = _frame;
     m_fs = _fs;
-    tqrepaintViews = _tqrepaintViews;
+    repaintViews = _repaintViews;
 
     m_oldValues = new KWFrameStyle( "Old", m_frame );
 }
@@ -590,20 +590,20 @@ void KWFrameStyleCommand::applyFrameStyle( KWFrameStyle * _sty )
     m_frame->setBottomBorder( _sty->bottomBorder() );
 
     m_frame->frameBordersChanged();
-    if ( tqrepaintViews )
-        m_frame->frameSet()->kWordDocument()->tqrepaintAllViews();
+    if ( repaintViews )
+        m_frame->frameSet()->kWordDocument()->repaintAllViews();
 }
 
 
-KWTableStyleCommand::KWTableStyleCommand( const TQString &name, KWFrame *_frame, KWTableStyle *_ts, bool _tqrepaintViews ) :
+KWTableStyleCommand::KWTableStyleCommand( const TQString &name, KWFrame *_frame, KWTableStyle *_ts, bool _repaintViews ) :
     KNamedCommand( name )
 {
     m_frame = _frame;
     m_ts = _ts;
-    tqrepaintViews = _tqrepaintViews;
+    repaintViews = _repaintViews;
 
     // No need for i18n because it will never be displayed.
-    m_fsc = new KWFrameStyleCommand( "Apply Framestyle to Frame", m_frame, m_ts->frameStyle(), tqrepaintViews );
+    m_fsc = new KWFrameStyleCommand( "Apply Framestyle to Frame", m_frame, m_ts->frameStyle(), repaintViews );
     m_sc = 0L;
 }
 
@@ -627,8 +627,8 @@ void KWTableStyleCommand::execute()
     }
 
     m_frame->frameBordersChanged();
-    if ( tqrepaintViews )
-        m_frame->frameSet()->kWordDocument()->tqrepaintAllViews();
+    if ( repaintViews )
+        m_frame->frameSet()->kWordDocument()->repaintAllViews();
 
 }
 
@@ -640,8 +640,8 @@ void KWTableStyleCommand::unexecute()
         m_sc->unexecute();
 
     m_frame->frameBordersChanged();
-    if ( tqrepaintViews )
-        m_frame->frameSet()->kWordDocument()->tqrepaintAllViews();
+    if ( repaintViews )
+        m_frame->frameSet()->kWordDocument()->repaintAllViews();
 }
 
 KWTableTemplateCommand::KWTableTemplateCommand( const TQString &name, KWTableFrameSet *_table, KWTableTemplate *_tt ) :
@@ -702,13 +702,13 @@ KWTableTemplateCommand::~KWTableTemplateCommand()
 void KWTableTemplateCommand::execute()
 {
     m_tableCommands->execute();
-    m_table->kWordDocument()->tqrepaintAllViews();
+    m_table->kWordDocument()->repaintAllViews();
 }
 
 void KWTableTemplateCommand::unexecute()
 {
     m_tableCommands->unexecute();
-    m_table->kWordDocument()->tqrepaintAllViews();
+    m_table->kWordDocument()->repaintAllViews();
 }
 
 
@@ -934,7 +934,7 @@ void KWFrameMoveCommand::execute()
             doc->tqlayout();
 
         doc->updateRulerFrameStartEnd();
-        doc->tqrepaintAllViews();
+        doc->repaintAllViews();
     }
 }
 
@@ -961,7 +961,7 @@ void KWFrameMoveCommand::unexecute()
         if ( needRetqlayout )
             doc->tqlayout();
         doc->updateRulerFrameStartEnd();
-        doc->tqrepaintAllViews();
+        doc->repaintAllViews();
     }
 }
 
@@ -996,7 +996,7 @@ void KWFramePropertiesCommand::execute()
         doc->frameChanged( frame );
         doc->updateAllFrames();
         doc->tqlayout();
-        doc->tqrepaintAllViews();
+        doc->repaintAllViews();
         doc->updateRulerFrameStartEnd();
     }
 }
@@ -1017,7 +1017,7 @@ void KWFramePropertiesCommand::unexecute()
         doc->frameChanged( frame );
         doc->updateAllFrames();
         doc->tqlayout();
-        doc->tqrepaintAllViews();
+        doc->repaintAllViews();
         doc->updateRulerFrameStartEnd();
     }
 }
@@ -1180,7 +1180,7 @@ void KWUngroupTableCommand::execute()
     doc->refreshDocStructure(refresh);
 
     doc->updateAllFrames();
-    doc->tqrepaintAllViews();
+    doc->repaintAllViews();
 }
 
 void KWUngroupTableCommand::unexecute()
@@ -1206,7 +1206,7 @@ void KWUngroupTableCommand::unexecute()
 
 
     doc->updateAllFrames();
-    doc->tqrepaintAllViews();
+    doc->repaintAllViews();
 }
 
 
@@ -1227,7 +1227,7 @@ void KWDeleteTableCommand::execute()
     doc->updateAllFrames();
     m_pTable->updateFrames(); // not in the doc list anymore, so the above call didn't do it!
     doc->tqlayout();
-    doc->tqrepaintAllViews();
+    doc->repaintAllViews();
     doc->updateRulerFrameStartEnd();
 
 }
@@ -1241,7 +1241,7 @@ void KWDeleteTableCommand::unexecute()
     doc->refreshDocStructure((int)Tables);
     doc->updateAllFrames();
     doc->tqlayout();
-    doc->tqrepaintAllViews();
+    doc->repaintAllViews();
     doc->updateRulerFrameStartEnd();
 }
 
@@ -1285,7 +1285,7 @@ void KWInsertColumnCommand::execute()
     Q_ASSERT(m_pTable->boundingRect().right() <= m_maxRight);
     doc->updateAllFrames();
     doc->tqlayout();
-    doc->tqrepaintAllViews();
+    doc->repaintAllViews();
 }
 
 void KWInsertColumnCommand::unexecute()
@@ -1301,7 +1301,7 @@ void KWInsertColumnCommand::unexecute()
     }
     doc->updateAllFrames();
     doc->tqlayout();
-    doc->tqrepaintAllViews();
+    doc->repaintAllViews();
 }
 
 
@@ -1333,7 +1333,7 @@ void KWInsertRowCommand::execute()
     }
     doc->updateAllFrames();
     doc->tqlayout();
-    doc->tqrepaintAllViews();
+    doc->repaintAllViews();
 }
 
 void KWInsertRowCommand::unexecute()
@@ -1382,7 +1382,7 @@ void KWRemoveRowCommand::unexecute()
     m_pTable->reInsertRow(*m_rr);
     doc->updateAllFrames();
     doc->tqlayout();
-    doc->tqrepaintAllViews();
+    doc->repaintAllViews();
 }
 
 KWRemoveColumnCommand::KWRemoveColumnCommand( const TQString &name, KWTableFrameSet * _table, int _col ):
@@ -1417,7 +1417,7 @@ void KWRemoveColumnCommand::unexecute()
     m_pTable->reInsertColumn(*m_rc);
     doc->updateAllFrames();
     doc->tqlayout();
-    doc->tqrepaintAllViews();
+    doc->repaintAllViews();
 }
 
 
@@ -2027,7 +2027,7 @@ void KWChangeFootNoteLineSeparatorParametersCommand::changeLineSeparatorParamete
     m_doc->setFootNoteSeparatorLineLength( _length);
     m_doc->setFootNoteSeparatorLineWidth(_width );
     m_doc->setFootNoteSeparatorLineType( _type );
-    m_doc->tqrepaintAllViews();
+    m_doc->repaintAllViews();
 }
 
 
@@ -2062,14 +2062,14 @@ void KWResizeColumnCommand::execute()
 {
   m_table->resizeColumn(m_col, m_newSize);
   m_table->kWordDocument()->tqlayout();
-  m_table->kWordDocument()->tqrepaintAllViews();
+  m_table->kWordDocument()->repaintAllViews();
 }
 
 void KWResizeColumnCommand::unexecute()
 {
   m_table->resizeColumn(m_col, m_oldSize);
   m_table->kWordDocument()->tqlayout();
-  m_table->kWordDocument()->tqrepaintAllViews();
+  m_table->kWordDocument()->repaintAllViews();
 }
 
 KWResizeRowCommand::KWResizeRowCommand( KWTableFrameSet *table, int row, double oldSize, double newSize ):
@@ -2084,11 +2084,11 @@ KWResizeRowCommand::KWResizeRowCommand( KWTableFrameSet *table, int row, double
 void KWResizeRowCommand::execute()
 {
   m_table->resizeRow( m_row, m_newSize );
-  m_table->kWordDocument()->tqrepaintAllViews();
+  m_table->kWordDocument()->repaintAllViews();
 }
 
 void KWResizeRowCommand::unexecute()
 {
   m_table->resizeRow( m_row, m_oldSize );
-  m_table->kWordDocument()->tqrepaintAllViews();
+  m_table->kWordDocument()->repaintAllViews();
 }
diff --git a/kword/KWCommand.h b/kword/KWCommand.h
index a3272104..7c905fb3 100644
--- a/kword/KWCommand.h
+++ b/kword/KWCommand.h
@@ -152,7 +152,7 @@ protected:
 class KWFrameStyleCommand : public KNamedCommand
 {
 public:
-    KWFrameStyleCommand( const TQString &name, KWFrame *_frame, KWFrameStyle *_fs, bool _tqrepaintViews = true );
+    KWFrameStyleCommand( const TQString &name, KWFrame *_frame, KWFrameStyle *_fs, bool _repaintViews = true );
     ~ KWFrameStyleCommand() { if (m_oldValues) delete m_oldValues; }
 
     void execute();
@@ -163,7 +163,7 @@ protected:
     KWFrame *m_frame ;
     KWFrameStyle * m_fs;
     KWFrameStyle * m_oldValues;
-    bool tqrepaintViews;
+    bool repaintViews;
 };
 
 
@@ -173,7 +173,7 @@ protected:
 class KWTableStyleCommand : public KNamedCommand
 {
 public:
-    KWTableStyleCommand( const TQString &name, KWFrame *_frame, KWTableStyle *_ts, bool _tqrepaintViews = true );
+    KWTableStyleCommand( const TQString &name, KWFrame *_frame, KWTableStyle *_ts, bool _repaintViews = true );
     ~ KWTableStyleCommand();
 
     void execute();
@@ -184,7 +184,7 @@ protected:
     KWTableStyle * m_ts;
     KWFrameStyleCommand * m_fsc;
     KCommand * m_sc;
-    bool tqrepaintViews;
+    bool repaintViews;
 };
 
 /**
diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp
index e7f2f8f2..7decd25d 100644
--- a/kword/KWConfig.cpp
+++ b/kword/KWConfig.cpp
@@ -446,7 +446,7 @@ void ConfigureInterfacePage::apply()
     // It's already been set in the document, see unitChanged
     config->writeEntry( "Units", KoUnit::unitName( unit ) );
     if ( updateView )
-        doc->tqrepaintAllViews(false);
+        doc->repaintAllViews(false);
 }
 
 void ConfigureInterfacePage::setUnit( KoUnit::Unit unit )
@@ -656,7 +656,7 @@ KCommand *ConfigureMiscPage::apply()
     if ( needRepaint )
     {
         doc->tqlayout();
-        doc->tqrepaintAllViews();
+        doc->repaintAllViews();
     }
     return macroCmd;
 }
diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp
index 19d87a05..138cf92a 100644
--- a/kword/KWDocument.cpp
+++ b/kword/KWDocument.cpp
@@ -201,7 +201,7 @@ KWDocument::KWDocument(TQWidget *tqparentWidget, const char *widname, TQObject*
     m_viewFormattingBreak = true;
 
     m_viewFrameBorders = true;
-    m_tqrepaintAllViewsPending = false;
+    m_repaintAllViewsPending = false;
     m_recalcFramesPending = -1;
     m_bShowDocStruct = true;
     m_bShowRuler = true;
@@ -488,7 +488,7 @@ void KWDocument::newZoomAndResolution( bool updateViews, bool forPrint )
     if ( updateViews )
     {
         emit newContentsSize();
-        tqrepaintAllViews( true );
+        repaintAllViews( true );
     }
 }
 
@@ -2437,7 +2437,7 @@ bool KWDocument::completeLoading( KoStore *store )
     fixZOrders();
 
     emit newContentsSize();
-    tqrepaintAllViews( true );     // in case any view exists already
+    repaintAllViews( true );     // in case any view exists already
     reactivateBgSpellChecking();
     connect( documentInfo(), TQT_SIGNAL( sigDocumentInfoModifed()),this,TQT_SLOT(slotDocumentInfoModifed() ) );
 
@@ -2716,7 +2716,7 @@ void KWDocument::completePasting()
     TQPtrListIterator<KWFrameSet> fit = framesetsIterator();
     for ( ; fit.current() ; ++fit )
         fit.current()->finalize();
-    tqrepaintAllViews();
+    repaintAllViews();
     delete m_pasteFramesetsMap;
     m_pasteFramesetsMap = 0L;
 }
@@ -2726,7 +2726,7 @@ void KWDocument::completeOasisPasting()
     TQPtrListIterator<KWFrameSet> fit = framesetsIterator();
     for ( ; fit.current() ; ++fit )
         fit.current()->finalize();
-    tqrepaintAllViews();
+    repaintAllViews();
 }
 
 void KWDocument::insertEmbedded( KoStore *store, TQDomElement topElem, KMacroCommand * macroCmd, double offset )
@@ -3894,15 +3894,15 @@ KWPartFrameSet* KWDocument::insertObject( const KoRect& rect, KoDocumentEntry& e
 
 
 void KWDocument::delayedRepaintAllViews() {
-    if (!m_tqrepaintAllViewsPending) {
+    if (!m_repaintAllViewsPending) {
         TQTimer::singleShot( 0, this, TQT_SLOT( slotRepaintAllViews() ) );
-        m_tqrepaintAllViewsPending=true;
+        m_repaintAllViewsPending=true;
     }
 }
 
 void KWDocument::slotRepaintAllViews() {
-    m_tqrepaintAllViewsPending=false;
-    tqrepaintAllViews( false );
+    m_repaintAllViewsPending=false;
+    repaintAllViews( false );
 }
 
 void KWDocument::delayedRecalcFrames( int fromPage ) {
@@ -3922,13 +3922,13 @@ void KWDocument::slotRecalcFrames() {
         recalcFrames( from );
 }
 
-void KWDocument::tqrepaintAllViewsExcept( KWView *view, bool erase )
+void KWDocument::repaintAllViewsExcept( KWView *view, bool erase )
 {
-    //kdDebug(32001) << "KWDocument::tqrepaintAllViewsExcept" << endl;
+    //kdDebug(32001) << "KWDocument::repaintAllViewsExcept" << endl;
     for( TQValueList<KWView *>::Iterator it = m_lstViews.begin(); it != m_lstViews.end(); ++it ) {
         KWView* viewPtr = *it;
         if ( viewPtr != view /*&& viewPtr->getGUI() && viewPtr->getGUI()->canvasWidget()*/ ) {
-            viewPtr->getGUI()->canvasWidget()->tqrepaintAll( erase );
+            viewPtr->getGUI()->canvasWidget()->repaintAll( erase );
         }
     }
 }
@@ -3966,11 +3966,11 @@ void KWDocument::updateAllTableStyleLists()
         (*it)->updateTableStyleList();
 }
 
-void KWDocument::tqrepaintAllViews( bool erase )
+void KWDocument::repaintAllViews( bool erase )
 {
-    //kdDebug(32001) << "KWDocument::tqrepaintAllViews" << endl;
+    //kdDebug(32001) << "KWDocument::repaintAllViews" << endl;
     for( TQValueList<KWView *>::Iterator it = m_lstViews.begin(); it != m_lstViews.end(); ++it )
-        (*it)->getGUI()->canvasWidget()->tqrepaintAll( erase );
+        (*it)->getGUI()->canvasWidget()->repaintAll( erase );
 }
 
 TQPtrList<KWFrame> KWDocument::framesToCopyOnNewPage( int afterPageNum ) const {
@@ -4087,7 +4087,7 @@ void KWDocument::afterInsertPage( int pageNum )
     recalcVariables( VT_PGNUM );
     emit numPagesChanged();
     if ( m_viewModeType == "ModePreview" )
-        tqrepaintAllViews();
+        repaintAllViews();
 }
 
 bool KWDocument::canRemovePage( int num )
@@ -4156,7 +4156,7 @@ void KWDocument::afterRemovePages()
 {
     //### IMHO recalcFrames should take care of updateAllFrames (it already does it partially).
     recalcFrames();
-    // Do this before recalcVariables (which tqrepaints). The removed frames must be removed from the frame caches.
+    // Do this before recalcVariables (which repaints). The removed frames must be removed from the frame caches.
     // We don't call updateAllFrames() directly, because it still calls
     // updateFramesOnTopOrBelow, which is useless (and slow) here.
     TQPtrListIterator<KWFrameSet> fit = framesetsIterator();
@@ -4167,7 +4167,7 @@ void KWDocument::afterRemovePages()
     if ( !m_bGeneratingPreview )
         emit newContentsSize();
     if ( m_viewModeType == "ModePreview" )
-        tqrepaintAllViews();
+        repaintAllViews();
 }
 
 bool KWDocument::tryRemovingPages()
@@ -4328,7 +4328,7 @@ void KWDocument::updateAllFrames( int flags )
 }
 
 // Tell this method when a frame is moved / resized / created / deleted
-// and everything will be update / tqrepainted accordingly
+// and everything will be update / repainted accordingly
 void KWDocument::frameChanged( KWFrame * frame )
 {
     if(! m_framesChangedHandler) {
@@ -4366,7 +4366,7 @@ void KWDocument::setHeaderVisible( bool h )
     updateAllFrames();
     tqlayout();
     setModified(true);
-    tqrepaintAllViews( true );
+    repaintAllViews( true );
 }
 
 void KWDocument::setFooterVisible( bool f )
@@ -4376,7 +4376,7 @@ void KWDocument::setFooterVisible( bool f )
     updateAllFrames();
     tqlayout();
     setModified(true);
-    tqrepaintAllViews( true );
+    repaintAllViews( true );
 }
 
 bool KWDocument::hasEndNotes() const
@@ -4600,7 +4600,7 @@ void KWDocument::slotRepaintChanged( KWFrameSet * frameset )
     // This has to be a loop instead of a signal, so that we can
     // send "true" for the last view (see KWFrameSet::drawContents)
     for( TQValueList<KWView *>::Iterator it = m_lstViews.begin(); it != m_lstViews.end(); ++it ) {
-        (*it)->getGUI()->canvasWidget()->tqrepaintChanged( frameset, it == m_lstViews.fromLast() );
+        (*it)->getGUI()->canvasWidget()->repaintChanged( frameset, it == m_lstViews.fromLast() );
     }
 }
 
@@ -4827,7 +4827,7 @@ void KWDocument::reactivateBgSpellChecking()
     for ( frm=textFramesets.first(); frm != 0; frm=textFramesets.next() ){
         frm->textObject()->setNeedSpellCheck(true);
     }
-    tqrepaintAllViews();
+    repaintAllViews();
     startBackgroundSpellCheck();
 }
 
@@ -5085,7 +5085,7 @@ void KWDocument::setTabStopValue ( double tabStop )
         frm->textDocument()->setTabStops( ptToLayoutUnitPixX( tabStop ));
         frm->tqlayout();
     }
-    tqrepaintAllViews();
+    repaintAllViews();
 }
 
 void KWDocument::setGlobalHyphenation( bool hyphen )
@@ -5126,7 +5126,7 @@ void KWDocument::switchViewMode( const TQString& newViewModeType )
     updateAllFrames();
     tqlayout();
 
-    tqrepaintAllViews( true );
+    repaintAllViews( true );
     for( TQValueList<KWView *>::Iterator it = m_lstViews.begin(); it != m_lstViews.end(); ++it )
         (*it)->getGUI()->canvasWidget()->ensureCursorVisible();
 }
@@ -5475,8 +5475,8 @@ void KWDocument::FramesChangedHandler::execute() {
     // If frame with text flowing around it -> re-tqlayout all frames
     if ( m_needLayout)
         m_parent->tqlayout();
-    //m_parent->tqrepaintAllViewsExcept( 0 );
-    m_parent->tqrepaintAllViews();
+    //m_parent->repaintAllViewsExcept( 0 );
+    m_parent->repaintAllViews();
     m_parent->updateRulerFrameStartEnd();
 }
 
diff --git a/kword/KWDocument.h b/kword/KWDocument.h
index 2d4e5abf..029930d8 100644
--- a/kword/KWDocument.h
+++ b/kword/KWDocument.h
@@ -260,11 +260,11 @@ public:
 
     unsigned int numColumns() const { return m_pageColumns.columns; }
 
-    void tqrepaintAllViews( bool erase = false );
+    void repaintAllViews( bool erase = false );
     /** Update all views of this document, area can be cleared before redrawing with the
      * erase flag. (false implied). All views EXCEPT the argument view are updated ( give 0L for all )
      */
-    void tqrepaintAllViewsExcept( KWView *view, bool erase = false );
+    void repaintAllViewsExcept( KWView *view, bool erase = false );
 
 
     /**
@@ -290,7 +290,7 @@ public:
 
     /**
      * Tell this method when a frame is moved / resized / created / deleted
-     * and everything will be update / tqrepainted accordingly.
+     * and everything will be update / repainted accordingly.
      */
     void frameChanged( KWFrame * frame );
     void framesChanged( const TQPtrList<KWFrame> & frames, KWView * view = 0L );
@@ -944,7 +944,7 @@ private:
     bool m_hasTOC;
     bool m_bShowStatusBar;
     bool m_pgUpDownMovesCaret;
-    bool m_tqrepaintAllViewsPending;
+    bool m_repaintAllViewsPending;
     bool m_bAllowAutoFormat;
     bool m_bShowScrollBar;
     bool m_cursorInProtectectedArea;
diff --git a/kword/KWFormulaFrameSet.cpp b/kword/KWFormulaFrameSet.cpp
index 970b0de0..5c21daa3 100644
--- a/kword/KWFormulaFrameSet.cpp
+++ b/kword/KWFormulaFrameSet.cpp
@@ -221,7 +221,7 @@ void KWFormulaFrameSet::slotFormulaChanged( double width, double height )
     updateFrames();
     kWordDocument()->tqlayout();
     if ( ( oldWidth != width ) || ( oldHeight != height ) ) {
-        kWordDocument()->tqrepaintAllViews( false );
+        kWordDocument()->repaintAllViews( false );
         kWordDocument()->updateRulerFrameStartEnd();
     }
 
@@ -391,7 +391,7 @@ KWFormulaFrameSetEdit::~KWFormulaFrameSetEdit()
     formulaView = 0;
     formulaFrameSet()->getFormula()->startEvaluation();
     formulaFrameSet()->setChanged();
-    m_canvas->tqrepaintChanged( formulaFrameSet(), true );
+    m_canvas->repaintChanged( formulaFrameSet(), true );
     delete dcop;
 }
 
@@ -507,7 +507,7 @@ void KWFormulaFrameSetEdit::cursorChanged( bool visible, bool /*selecting*/ )
         }
     }
     formulaFrameSet()->setChanged();
-    m_canvas->tqrepaintChanged( formulaFrameSet(), true );
+    m_canvas->repaintChanged( formulaFrameSet(), true );
 }
 
 void KWFormulaFrameSetEdit::slotLeaveFormula( KFormula::Container*,
diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp
index cdc46ec8..d33d9118 100644
--- a/kword/KWFrameDia.cpp
+++ b/kword/KWFrameDia.cpp
@@ -2331,7 +2331,7 @@ void KWFrameDia::updateFrames()
 {
     m_doc->updateAllFrames();
     m_doc->tqlayout();
-    m_doc->tqrepaintAllViews();
+    m_doc->repaintAllViews();
 }
 
 void KWFrameDia::slotApply()
diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp
index 0e72f168..d07a55e2 100644
--- a/kword/KWFrameSet.cpp
+++ b/kword/KWFrameSet.cpp
@@ -49,10 +49,10 @@ KWFrameSet::KWFrameSet( KWDocument *doc )
       m_protectSize( false ),
       m_anchorTextFs( 0L ), m_dcop( 0L ), m_pageManager( 0 )
 {
-    // Send our "tqrepaintChanged" signals to the document.
+    // Send our "repaintChanged" signals to the document.
     setName("KWFrameSet");
     if(m_doc) {
-        connect( this, TQT_SIGNAL( tqrepaintChanged( KWFrameSet * ) ),
+        connect( this, TQT_SIGNAL( repaintChanged( KWFrameSet * ) ),
              doc, TQT_SLOT( slotRepaintChanged( KWFrameSet * ) ) );
         m_pageManager = doc->pageManager();
     }
@@ -370,7 +370,7 @@ void KWFrameSet::setFixed()
     for ( ; frameIt.current(); ++frameIt )
         frameIt.current()->setZOrder( m_doc->maxZOrder( frameIt.current()->pageNumber(m_doc) ) + 1 );
 
-    m_doc->tqrepaintAllViews();
+    m_doc->repaintAllViews();
     m_doc->updateRulerFrameStartEnd();
 }
 
@@ -399,7 +399,7 @@ void KWFrameSet::createAnchors( KoTextParag * parag, int index, bool placeHolder
     }
     parag->setChanged( true );
     if ( tqrepaint )
-        emit tqrepaintChanged( m_anchorTextFs );
+        emit repaintChanged( m_anchorTextFs );
 }
 
 void KWFrameSet::deleteAnchor( KWAnchor * anchor )
@@ -437,7 +437,7 @@ void KWFrameSet::deleteAnchors()
         KWAnchor * anchor = findAnchor( frameNum );
         deleteAnchor( anchor );
     }
-    emit tqrepaintChanged( textfs );
+    emit repaintChanged( textfs );
 }
 
 void KWFrameSet::moveFloatingFrame( int frameNum, const KoPoint &position )
diff --git a/kword/KWFrameSet.h b/kword/KWFrameSet.h
index d4c1bae9..be9337c0 100644
--- a/kword/KWFrameSet.h
+++ b/kword/KWFrameSet.h
@@ -190,7 +190,7 @@ public:
      * @param crect The rectangle (in scrollview "contents coordinates", i.e. "view coords")
      * to be painted
      * @param cg The colorgroup from which to get the colors
-     * @param onlyChanged If true, only redraw what has changed (see KWCanvas::tqrepaintChanged)
+     * @param onlyChanged If true, only redraw what has changed (see KWCanvas::repaintChanged)
      * @param resetChanged If true, set the changed flag to false after drawing.
      * @param edit If set, this frameset is being edited, so a cursor is needed.
      * @param viewMode For coordinate conversion, always set.
@@ -224,7 +224,7 @@ public:
      * @param cg The colorgroup from which to get the colors
      * @param edit If set, this frameset is being edited, so a cursor is needed.
      * @param viewMode For coordinate conversion, always set.
-     * @param crect rectangle to be tqrepainted, in view coordinates. Includes padding.
+     * @param crect rectangle to be repainted, in view coordinates. Includes padding.
      */
     void drawFrameAndBorders( KWFrame *frame,
                               TQPainter *painter, const TQRect &crect,
@@ -246,16 +246,16 @@ public:
     /**
      * Draw a particular frame of this frameset.
      * This is called by drawContents and is what framesets must reimplement.
-     * @param fcrect rectangle to be tqrepainted, in the _frame_'s coordinate system, in pixels.
+     * @param fcrect rectangle to be repainted, in the _frame_'s coordinate system, in pixels.
      * Doesn't include padding.
      *
-     * @param crect rectangle to be tqrepainted, in view coordinates. Includes padding.
+     * @param crect rectangle to be repainted, in view coordinates. Includes padding.
      * Default implementation does double-buffering and calls drawFrameContents.
      * @param frame the frame to draw
      * @param painter the painter to draw to
      * @param settingsFrame The frame from which we take the settings (usually @p frame, but not with Copy behaviour)
      * @param cg The colorgroup from which to get the colors
-     * @param onlyChanged If true, only redraw what has changed (see KWCanvas::tqrepaintChanged)
+     * @param onlyChanged If true, only redraw what has changed (see KWCanvas::repaintChanged)
      * @param resetChanged If true, set the changed flag to false after drawing.
      * @param edit If set, this frameset is being edited, so a cursor is needed.
      * @param viewMode For coordinate conversion, always set.
@@ -273,12 +273,12 @@ public:
      * You MUST reimplement one or the other, or you'll get infinite recursion ;)
      *
      * In this method, the painter has been translated to the frame's coordinate system
-     * @param fcrect rectangle to be tqrepainted, in the _frame_'s coordinate system, in pixels.
+     * @param fcrect rectangle to be repainted, in the _frame_'s coordinate system, in pixels.
      * Doesn't include padding.
      * @param frame the frame to draw
      * @param painter the painter to draw to
      * @param cg The colorgroup from which to get the colors
-     * @param onlyChanged If true, only redraw what has changed (see KWCanvas::tqrepaintChanged)
+     * @param onlyChanged If true, only redraw what has changed (see KWCanvas::repaintChanged)
      * @param resetChanged If true, set the changed flag to false after drawing.
      * @param edit If set, this frameset is being edited, so a cursor is needed.
      * @param viewMode For coordinate conversion, always set.
@@ -457,7 +457,7 @@ signals:
     /// Emitted when something has changed in this frameset,
     /// so that all views tqrepaint it. KWDocument connects to it,
     /// and KWCanvas connects to KWDocument.
-    void tqrepaintChanged( KWFrameSet * frameset );
+    void repaintChanged( KWFrameSet * frameset );
 
     void sigFrameAdded(KWFrame*);
     void sigFrameRemoved(KWFrame*);
diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp
index 9aa65e63..afb07d2a 100644
--- a/kword/KWPartFrameSet.cpp
+++ b/kword/KWPartFrameSet.cpp
@@ -109,7 +109,7 @@ void KWPartFrameSet::drawFrameContents( KWFrame* frame, TQPainter * painter, con
         KoTextZoomHandler* zh = kWordDocument();
 
         // We have to define better the merning of the rect that we pass. Does it include zooming ? (yes I think)
-        // Does it define the area to be tqrepainted only? (no, that's the painter clip rect)
+        // Does it define the area to be repainted only? (no, that's the painter clip rect)
         // So it defines the whole area covered by the embedded document, in pixels.
         TQRect rframe( 0, 0,
                       zh->zoomItX( frame->innerWidth() ),
diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp
index e7f557b1..1fc51fd8 100644
--- a/kword/KWTableFrameSet.cpp
+++ b/kword/KWTableFrameSet.cpp
@@ -155,7 +155,7 @@ void KWTableFrameSet::createAnchors( KoTextParag * parag, int index, bool placeH
     kdDebug(32004) << "KWTableFrameSet::createAnchors setting anchor" << endl;
     parag->setChanged( true );
     if ( tqrepaint )
-        emit tqrepaintChanged( m_anchorTextFs );
+        emit repaintChanged( m_anchorTextFs );
 }
 
 void KWTableFrameSet::deleteAnchors()
@@ -1294,7 +1294,7 @@ KCommand *KWTableFrameSet::joinCells(unsigned int colBegin,unsigned int rowBegin
     validate();
 
     m_doc->updateAllFrames(); // TODO: only fs->updateFrames() & m_doc->updateFramesOnTopOrBelow(pageNum)
-    m_doc->tqrepaintAllViews();
+    m_doc->repaintAllViews();
     return new KWJoinCellCommand( i18n("Join Cells"), this,colBegin,rowBegin, colEnd,rowEnd,listFrameSet,listCopyFrame);
 }
 
diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp
index 26b4da07..f976dd78 100644
--- a/kword/KWTextFrameSet.cpp
+++ b/kword/KWTextFrameSet.cpp
@@ -166,7 +166,7 @@ void KWTextFrameSet::init()
     //         TQT_SLOT( slotChapterParagraphFormatted( KoTextParag * ) ) );
     connect( m_textobj, TQT_SIGNAL( newCommand( KCommand * ) ),
              TQT_SLOT( slotNewCommand( KCommand * ) ) );
-    connect( m_textobj, TQT_SIGNAL( tqrepaintChanged( KoTextObject* ) ),
+    connect( m_textobj, TQT_SIGNAL( repaintChanged( KoTextObject* ) ),
              TQT_SLOT( slotRepaintChanged() ) );
     connect( m_textobj, TQT_SIGNAL( paragraphDeleted( KoTextParag*) ),
              TQT_SLOT( slotParagraphDeleted(KoTextParag*) ));
@@ -827,7 +827,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor
 void KWTextFrameSet::tqlayout()
 {
     tqinvalidate();
-    // Get the thing going though, tqrepainting doesn't call formatMore
+    // Get the thing going though, repainting doesn't call formatMore
     m_textobj->formatMore( 2 );
 }
 
@@ -840,7 +840,7 @@ void KWTextFrameSet::tqinvalidate()
 
 void KWTextFrameSet::slotRepaintChanged()
 {
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
 }
 
 int KWTextFrameSet::paragraphs()
@@ -2610,7 +2610,7 @@ KCommand * KWTextFrameSet::setPageBreakingCommand( KoTextCursor * cursor, int pa
     }
 
     m_textobj->formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     KoTextObject::UndoRedoInfo & undoRedoInfo = m_textobj->undoRedoInfoStruct();
     undoRedoInfo.newParagLayout.pageBreaking = pageBreaking;
     KoTextParagCommand *cmd = new KoTextParagCommand(
@@ -2650,7 +2650,7 @@ KCommand * KWTextFrameSet::pasteOasis( KoTextCursor * cursor, const TQByteArray
     //m_textobj->formatMore( 2 );
     ensureFormatted( cursor->parag() );
 
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     m_textobj->emitEnsureCursorVisible();
     m_textobj->emitUpdateUI( true );
     m_textobj->emitShowCursor();
@@ -2676,7 +2676,7 @@ void KWTextFrameSet::insertTOC( KoTextCursor * cursor )
 
     m_textobj->setLastFormattedParag( textDocument()->firstParag() );
     m_textobj->formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     m_textobj->emitEnsureCursorVisible();
     m_textobj->emitUpdateUI( true );
     m_textobj->emitShowCursor();
@@ -2713,7 +2713,7 @@ void KWTextFrameSet::insertFrameBreak( KoTextCursor *cursor )
 
     m_textobj->setLastFormattedParag( cursor->parag() );
     m_textobj->formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     m_textobj->emitEnsureCursorVisible();
     m_textobj->emitUpdateUI( true );
     m_textobj->emitShowCursor();
@@ -2800,7 +2800,7 @@ KCommand * KWTextFrameSet::deleteAnchoredFrame( KWAnchor * anchor )
     textDocument()->setSelectionEnd( KoTextDocument::Temp, &c );
     KCommand *cmd = m_textobj->removeSelectedTextCommand( &c, KoTextDocument::Temp );
 
-    m_doc->tqrepaintAllViews();
+    m_doc->repaintAllViews();
     return cmd;
 }
 
@@ -3396,7 +3396,7 @@ bool KWTextFrameSetEdit::enterCustomItem( KoTextCustomItem* customItem, bool fro
                 // A FormulaFrameSetEdit looks a little different from
                 // a FormulaFrameSet. (Colors)
                 static_cast<KWFormulaFrameSet*>( frameSet )->setChanged();
-                canvas->tqrepaintChanged( frameSet, true );
+                canvas->repaintChanged( frameSet, true );
             }
             return true;
         }
diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index 751869eb..2651e6ad 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -1927,7 +1927,7 @@ void KWView::print( KPrinter &prt )
 
     m_gui->canvasWidget()->setUpdatesEnabled(true);
     m_gui->canvasWidget()->viewport()->setCursor( ibeamCursor );
-    m_doc->tqrepaintAllViews();
+    m_doc->repaintAllViews();
 
     if ( displayFieldCode )
     {
@@ -2630,7 +2630,7 @@ void KWView::adjustZOrderOfSelectedFrames(MoveFrameType moveType) {
         // we also need other framesets to notice the new frames on top.
         m_doc->updateAllFrames();
         m_doc->tqlayout();
-        m_doc->tqrepaintAllViews();
+        m_doc->repaintAllViews();
     }
 
     if(lowestZOrder != 10000 && m_doc->processingType() == KWDocument::WP) {
@@ -2916,7 +2916,7 @@ void KWView::editMailMergeDataBase()
     KWMailMergeEditor *dia = new KWMailMergeEditor( this, m_doc->mailMergeDataBase() );
     dia->exec();
     // Don't know if we really need this so it's commented out (SL)
-    // m_gui->canvasWidget()->tqrepaintAll( FALSE );
+    // m_gui->canvasWidget()->repaintAll( FALSE );
     delete dia;
 #endif
 }
@@ -3111,13 +3111,13 @@ void KWView::slotViewFormattingChars()
 {
     m_doc->setViewFormattingChars(m_actionViewFormattingChars->isChecked());
     m_doc->tqlayout(); // Due to the different formatting when this option is activated
-    m_doc->tqrepaintAllViews();
+    m_doc->repaintAllViews();
 }
 
 void KWView::slotViewFrameBorders()
 {
     setViewFrameBorders(m_actionViewFrameBorders->isChecked());
-    m_gui->canvasWidget()->tqrepaintAll();
+    m_gui->canvasWidget()->repaintAll();
 }
 
 void KWView::viewHeader()
@@ -4127,7 +4127,7 @@ void KWView::insertFormula( TQMimeSource* source )
 
         m_gui->canvasWidget()->editFrameSet( frameset );
         frameset->setChanged();
-        m_gui->canvasWidget()->tqrepaintChanged( frameset, true );
+        m_gui->canvasWidget()->repaintChanged( frameset, true );
     }
 }
 
@@ -4585,7 +4585,7 @@ void KWView::frameStyleSelected( KWFrameStyle *sty )
         globalCmd->execute();
     }
 
-    m_gui->canvasWidget()->tqrepaintAll();
+    m_gui->canvasWidget()->repaintAll();
     m_gui->canvasWidget()->setFocus(); // the combo keeps focus...*/
 
     // Adjust GUI
@@ -4655,7 +4655,7 @@ void KWView::tableStyleSelected( KWTableStyle *sty )
         globalCmd->execute();
     }
 
-    m_gui->canvasWidget()->tqrepaintAll();
+    m_gui->canvasWidget()->repaintAll();
     m_gui->canvasWidget()->setFocus(); // the combo keeps focus...*/
 
     // Adjust GUI
@@ -5479,7 +5479,7 @@ void KWView::slotPageLayoutChanged( const KoPageLayout& tqlayout )
     // above method, or any other way of changing the page tqlayout happens,
     // the rulers are updated in all views.
     viewMode()->setPageLayout( m_gui->getHorzRuler(), m_gui->getVertRuler(), tqlayout );
-    m_gui->canvasWidget()->tqrepaintAll();
+    m_gui->canvasWidget()->repaintAll();
 }
 
 void KWView::newFirstIndent( double firstIndent )
@@ -5955,7 +5955,7 @@ void KWView::frameSelectedChanged()
         showSpacing( spacing );
     }
 
-    m_gui->canvasWidget()->tqrepaintAll(false);
+    m_gui->canvasWidget()->repaintAll(false);
 }
 
 
@@ -6315,7 +6315,7 @@ void KWView::viewGrid()
     m_doc->setShowGrid( m_actionViewShowGrid->isChecked() );
     m_doc->setModified( true );
     m_doc->updateGridButton();
-    m_doc->tqrepaintAllViews(false);
+    m_doc->repaintAllViews(false);
 }
 
 void KWView::viewSnapToGrid()
diff --git a/kword/KWViewMode.cpp b/kword/KWViewMode.cpp
index 6967e968..02130dc0 100644
--- a/kword/KWViewMode.cpp
+++ b/kword/KWViewMode.cpp
@@ -280,10 +280,10 @@ void KWViewModeNormal::drawPageBorders( TQPainter * painter, const TQRect & crec
     if ( crect.bottom() > topOfPage )
     {
         TQRect bottomArea( 0, topOfPage, crect.right() + 1, crect.bottom() - topOfPage + 1 );
-        TQRect tqrepaintRect = bottomArea.intersect( crect );
-        if ( !tqrepaintRect.isEmpty() )
+        TQRect repaintRect = bottomArea.intersect( crect );
+        if ( !repaintRect.isEmpty() )
         {
-            painter->fillRect( tqrepaintRect,
+            painter->fillRect( repaintRect,
                     TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) );
             // Draw a shadow
             drawBottomShadow( painter, crect, pageRect, s_shadowOffset );
diff --git a/kword/KWordDocIface.cpp b/kword/KWordDocIface.cpp
index 40736b4e..e3b68fa9 100644
--- a/kword/KWordDocIface.cpp
+++ b/kword/KWordDocIface.cpp
@@ -524,7 +524,7 @@ int KWordDocIface::footNoteSeparatorLineLength() const
 void KWordDocIface::setFootNoteSeparatorLineLength( int _length)
 {
     doc->setFootNoteSeparatorLineLength( _length );
-    doc->tqrepaintAllViews();
+    doc->repaintAllViews();
 }
 
 void KWordDocIface::setFootNoteSeparatorLinePosition( const TQString &pos)
@@ -537,7 +537,7 @@ void KWordDocIface::setFootNoteSeparatorLinePosition( const TQString &pos)
     else if ( pos.lower()=="right")
         tmp=SLP_RIGHT;
     doc->setFootNoteSeparatorLinePosition( tmp);
-    doc->tqrepaintAllViews();
+    doc->repaintAllViews();
 }
 
 TQString KWordDocIface::footNoteSeparatorLinePosition()const
@@ -563,7 +563,7 @@ double KWordDocIface::footNoteSeparatorLineWidth() const
 void KWordDocIface::setFootNoteSeparatorLineWidth( double _width)
 {
     doc->setFootNoteSeparatorLineWidth( _width );
-    doc->tqrepaintAllViews();
+    doc->repaintAllViews();
 }
 
 void KWordDocIface::deleteBookMark(const TQString &_name)