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

104 files changed, 623 insertions, 623 deletions

diff --git a/chalk/colorspaces/wetsticky/ws/canvas.c b/chalk/colorspaces/wetsticky/ws/canvas.c
index 77cfa17dc..d69402948 100644
--- a/chalk/colorspaces/wetsticky/ws/canvas.c
+++ b/chalk/colorspaces/wetsticky/ws/canvas.c
@@ -35,14 +35,14 @@ CELL canvas[CANVAS_WIDTH][CANVAS_HEIGHT];
     and are removed by the next_cell_for_tqrepaint() function.  The
     pointer to the current tail of the list is updated by side-effect. */
 
-static POINT need_tqrepainting[REDRAW_LIMIT];
+static POINT need_repainting[REDRAW_LIMIT];
 static int   next_free = 0;
 static int   next_to_tqrepaint = 0;
 
 /* *********************************************************************** */
 
-int number_of_tqrepaints_needed()
-/*  Returns the number of cells that need to be tqrepainted. */
+int number_of_repaints_needed()
+/*  Returns the number of cells that need to be repainted. */
 
 {
    return (next_free);
@@ -53,7 +53,7 @@ int number_of_tqrepaints_needed()
 void need_to_tqrepaint(point)
 /*  The cell at this location needs to be redrawn since it has
     been altered.   Scan the list to see if it is already
-    scheduled for a tqrepainting operation and only add it if
+    scheduled for a repainting operation and only add it if
     it is not there.   */
 
 POINT point;
@@ -70,27 +70,27 @@ POINT point;
    /* Check whether this point is already on the list. */
 
    for (k=0; k < next_free; k++) {
-      if ((need_tqrepainting[k].x == point.x) &&
-          (need_tqrepainting[k].y == point.y)) break;
+      if ((need_repainting[k].x == point.x) &&
+          (need_repainting[k].y == point.y)) break;
    }
 
    if (k < next_free) return; /* Already in the list. */
 
    /*  Add this new cell address to the end of the list. */
 
-   need_tqrepainting[next_free].x = point.x;
-   need_tqrepainting[next_free].y = point.y;
+   need_repainting[next_free].x = point.x;
+   need_repainting[next_free].y = point.y;
    next_free++;
 }
 
 /* *********************************************************************** */
 
 void next_cell_for_tqrepaint(cell, locus)
-/*  This routine returns the next cell to be tqrepainted, together with its
+/*  This routine returns the next cell to be repainted, together with its
     location on the canvas.  This is determined by taking the next point 
-    from the need_tqrepainting list and accessing its cell.  If the list is 
+    from the need_repainting list and accessing its cell.  If the list is 
     empty then return NIL. 
-    Note that the tqrepainting operation will clear out the list before
+    Note that the repainting operation will clear out the list before
     any other new positions are added.  */ 
 
    CELL_PTR *cell;
@@ -103,9 +103,9 @@ void next_cell_for_tqrepaint(cell, locus)
       return;
    }
 
-   *(cell) = get_cell(need_tqrepainting[next_to_tqrepaint]);
-   locus->x = need_tqrepainting[next_to_tqrepaint].x;
-   locus->y = need_tqrepainting[next_to_tqrepaint].y;
+   *(cell) = get_cell(need_repainting[next_to_tqrepaint]);
+   locus->x = need_repainting[next_to_tqrepaint].x;
+   locus->y = need_repainting[next_to_tqrepaint].y;
    next_to_tqrepaint++;
 }
 
diff --git a/chalk/colorspaces/wetsticky/ws/canvas.h b/chalk/colorspaces/wetsticky/ws/canvas.h
index c2f2bcbf6..57453e7b8 100644
--- a/chalk/colorspaces/wetsticky/ws/canvas.h
+++ b/chalk/colorspaces/wetsticky/ws/canvas.h
@@ -19,11 +19,11 @@ Wet and Sticky is free software; you can redistribute it and/or modify it under
 */
 
 
-extern int number_of_tqrepaints_needed();
-/*  Returns the number of cells needing to tqrepainted.  */
+extern int number_of_repaints_needed();
+/*  Returns the number of cells needing to repainted.  */
 
 extern void need_to_tqrepaint (/* POINT */);
-/*  Requests that the cell at the given point be tqrepainted
+/*  Requests that the cell at the given point be repainted
     at the next update as it has been modified.  */
 
 extern void next_cell_for_tqrepaint (/* *CELL_PTR, POINT_PTR  */);
diff --git a/chalk/colorspaces/wetsticky/ws/engine.c b/chalk/colorspaces/wetsticky/ws/engine.c
index 2fb4917e3..b3855bda5 100644
--- a/chalk/colorspaces/wetsticky/ws/engine.c
+++ b/chalk/colorspaces/wetsticky/ws/engine.c
@@ -122,7 +122,7 @@ void donate_paint(source, srcLocus, amount, dest, destLocus)
    to the destination cell.  The destination cell must mix this 
    new paint with its existing paint to yield a new paint.
    This routine is also responsible for recording which cells
-   have been updated and so need tqrepainting.
+   have been updated and so need repainting.
    
    A special case is recognised where the destination has not yet
    had any paint applied.  This causes the donated paint to become
diff --git a/chalk/colorspaces/wetsticky/ws/engine3.c b/chalk/colorspaces/wetsticky/ws/engine3.c
index 9fd274cdd..fceb0c055 100644
--- a/chalk/colorspaces/wetsticky/ws/engine3.c
+++ b/chalk/colorspaces/wetsticky/ws/engine3.c
@@ -122,7 +122,7 @@ void donate_paint(source, srcLocus, amount, dest, destLocus)
    to the destination cell.  The destination cell must mix this 
    new paint with its existing paint to yield a new paint.
    This routine is also responsible for recording which cells
-   have been updated and so need tqrepainting.
+   have been updated and so need repainting.
    
    A special case is recognised where the destination has not yet
    had any paint applied.  This causes the donated paint to become
diff --git a/chalk/ui/imageviewer.cc b/chalk/ui/imageviewer.cc
index b6d94ed9e..cfe6905db 100644
--- a/chalk/ui/imageviewer.cc
+++ b/chalk/ui/imageviewer.cc
@@ -45,7 +45,7 @@ void ImageViewer::setImage(TQImage & image)
     m_image = TQPixmap(image);
     m_label->setPixmap(m_image);
     resizeContents( m_image.width(), m_image.height() );
-    tqrepaintContents(false);
+    repaintContents(false);
 }
 
 void ImageViewer::contentsMousePressEvent(TQMouseEvent *event)
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index a146ddcb1..61966928e 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -2236,7 +2236,7 @@ void KisView::paintToolOverlay(const TQRegion& region)
         gc.setClipRegion(region);
         gc.setClipping(true);
 
-        // Prevent endless loop if the tool needs to have the canvas tqrepainted
+        // Prevent endless loop if the tool needs to have the canvas repainted
         m_toolIsPainting = true;
         m_toolManager->currentTool()->paint(gc, region.boundingRect());
         m_toolIsPainting = false;
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 976ec84d5..886b27e4c 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -1316,7 +1316,7 @@ void LayerItem::setSelected( bool selected )
 LayerItem *LayerList::firstChild() const { return static_cast<LayerItem*>( super::firstChild() ); }
 LayerItem *LayerList::lastChild() const { return static_cast<LayerItem*>( super::lastChild() ); }
 LayerList *LayerItem::listView() const { return static_cast<LayerList*>( super::listView() ); }
-void LayerItem::update() const { listView()->tqrepaintItem( this ); }
+void LayerItem::update() const { listView()->repaintItem( this ); }
 LayerItem *LayerItem::firstChild() const { return static_cast<LayerItem*>( super::firstChild() ); }
 LayerItem *LayerItem::nextSibling() const { return static_cast<LayerItem*>( super::nextSibling() ); }
 LayerItem *LayerItem::tqparent() const { return static_cast<LayerItem*>( super::tqparent() ); }
diff --git a/karbon/commands/vcommand.cc b/karbon/commands/vcommand.cc
index 97da53b56..da08d94f4 100644
--- a/karbon/commands/vcommand.cc
+++ b/karbon/commands/vcommand.cc
@@ -137,7 +137,7 @@ VCommandHistory::undo()
 
 	updateActions();
 
-	m_part->tqrepaintAllViews();
+	m_part->repaintAllViews();
 }
 
 void
@@ -170,7 +170,7 @@ VCommandHistory::redo()
 
 	updateActions();
 
-	m_part->tqrepaintAllViews();
+	m_part->repaintAllViews();
 }
 
 void
@@ -186,7 +186,7 @@ VCommandHistory::undo( VCommand* command )
 
 	updateActions();
 
-	m_part->tqrepaintAllViews();
+	m_part->repaintAllViews();
 }
 
 void
@@ -202,7 +202,7 @@ VCommandHistory::redo( VCommand* command )
 
 	updateActions();
 
-	m_part->tqrepaintAllViews();
+	m_part->repaintAllViews();
 }
 
 void
@@ -231,7 +231,7 @@ VCommandHistory::undoAllTo( VCommand* command )
 	emit commandExecuted();
 	updateActions();
 
-	m_part->tqrepaintAllViews();
+	m_part->repaintAllViews();
 }
 
 void
@@ -260,7 +260,7 @@ VCommandHistory::redoAllTo( VCommand* command )
 	emit commandExecuted();
 	updateActions();
 
-	m_part->tqrepaintAllViews();
+	m_part->repaintAllViews();
 }
 
 void
diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc
index bbe6d629a..ba86b3131 100644
--- a/karbon/dialogs/vconfiguredlg.cc
+++ b/karbon/dialogs/vconfiguredlg.cc
@@ -361,7 +361,7 @@ void VConfigGridPage::apply()
 	gd.isShow = m_gridChBox->isChecked();
 	gd.isSnap = m_snapChBox->isChecked();
 	gd.color = m_gridColorBtn->color();
-	m_view->tqrepaintAll();
+	m_view->repaintAll();
 }
 
 void VConfigGridPage::slotDefault()
diff --git a/karbon/dockers/vcolordocker.cc b/karbon/dockers/vcolordocker.cc
index b574bec0b..0babda008 100644
--- a/karbon/dockers/vcolordocker.cc
+++ b/karbon/dockers/vcolordocker.cc
@@ -139,7 +139,7 @@ void VColorDocker::updateFgColor(const TQColor &c)
 		if( VOldObjectList == VNewObjectList )
 		{
 			m_strokeCmd->changeStroke(v);
-			m_part->tqrepaintAllViews();
+			m_part->repaintAllViews();
 		}
 		else
 		{
@@ -187,7 +187,7 @@ void VColorDocker::updateBgColor(const TQColor &c)
 		if( VOldObjectList == VNewObjectList )
 		{
 			m_fillCmd->changeFill(VFill(v));
-			m_part->tqrepaintAllViews();
+			m_part->repaintAllViews();
 		}
 		else
 		{
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index b63ae9aea..84ed52000 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -680,7 +680,7 @@ VLayersTab::itemClicked( TQListViewItem* item, const TQPoint &, int col )
 
 				updateChildItems( layerItem );
 
-				m_view->part()->tqrepaintAllViews();
+				m_view->part()->repaintAllViews();
 			}
 		}
 		else
@@ -708,7 +708,7 @@ VLayersTab::itemClicked( TQListViewItem* item, const TQPoint &, int col )
 				if( dynamic_cast<VGroup*>( objectItem->object() ) )
 					updateChildItems( objectItem );
 
-				m_view->part()->tqrepaintAllViews();
+				m_view->part()->repaintAllViews();
 			}
 		}
 	}
@@ -745,7 +745,7 @@ VLayersTab::selectionChangedFromList()
 	}
 	
 	m_view->selectionChanged();
-	m_view->part()->tqrepaintAllViews();
+	m_view->part()->repaintAllViews();
 }
 
 void
@@ -926,7 +926,7 @@ VLayersTab::deleteItem()
 	if( cmd ) 
 	{
 		updatePreviews();
-		m_view->part()->tqrepaintAllViews();
+		m_view->part()->repaintAllViews();
 	}
 } // VLayersTab::deleteItem
 
@@ -1297,9 +1297,9 @@ VHistoryTab::commandExecuted( VCommand* command )
 	}
 	if ( found )
 	{
-		m_history->tqrepaintItem( item );
+		m_history->repaintItem( item );
 		if ( item->tqparent() )
-			m_history->tqrepaintItem( item->tqparent() );
+			m_history->repaintItem( item->tqparent() );
 		m_history->ensureItemVisible( item );
 	}
 } // VHistoryTab::commandExecuted
diff --git a/karbon/dockers/vtransformdocker.cc b/karbon/dockers/vtransformdocker.cc
index 1616b47eb..76c91de6d 100644
--- a/karbon/dockers/vtransformdocker.cc
+++ b/karbon/dockers/vtransformdocker.cc
@@ -172,7 +172,7 @@ VTransformDocker::translate()
 		VTranslateCmd *cmd = new VTranslateCmd( &m_view->part()->document(), newX-rect.x(), newY-rect.y(), false );
 		m_view->part()->addCommand( cmd );
 	}
-	m_part->tqrepaintAllViews( true );
+	m_part->repaintAllViews( true );
 }
 
 void
@@ -190,7 +190,7 @@ VTransformDocker::scale()
 		VScaleCmd *cmd = new VScaleCmd( &m_view->part()->document(), rect.topLeft(), newW/rect.width(), newH/rect.height(), false );
 		m_view->part()->addCommand( cmd );
 	}
-	m_part->tqrepaintAllViews( true );
+	m_part->repaintAllViews( true );
 }
 
 void 
@@ -219,7 +219,7 @@ VTransformDocker::shearX()
 		shear /= double(rect.width()*0.5);
 		VShearCmd *cmd = new VShearCmd( &m_view->part()->document(), rect.center(), shear, 0 );
 		m_view->part()->addCommand( cmd );
-		m_part->tqrepaintAllViews( true );
+		m_part->repaintAllViews( true );
 		disconnect( m_shearX, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearX() ) );
 		m_shearX->changeValue(0.0);
 		connect( m_shearX, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearX() ) );
@@ -237,7 +237,7 @@ VTransformDocker::shearY()
 		shear /= double(rect.height()*0.5);
 		VShearCmd *cmd = new VShearCmd( &m_view->part()->document(), rect.center(), 0, shear );
 		m_view->part()->addCommand( cmd );
-		m_part->tqrepaintAllViews( true );
+		m_part->repaintAllViews( true );
 		disconnect( m_shearY, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearY() ) );
 		m_shearY->changeValue(0.0);
 		connect( m_shearY, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearY() ) );
@@ -254,7 +254,7 @@ VTransformDocker::rotate()
 		KoPoint center = m_view->part()->document().selection()->boundingBox().center();
 		VRotateCmd *cmd = new VRotateCmd(  &m_view->part()->document(), center, angle );
 		m_view->part()->addCommand( cmd );
-		m_part->tqrepaintAllViews( true );
+		m_part->repaintAllViews( true );
 		disconnect( m_rotate, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( rotate() ) );
 		m_rotate->setValue(0.0);
 		connect( m_rotate, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( rotate() ) );
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc
index 88c06de3d..90f101179 100644
--- a/karbon/karbon_part.cc
+++ b/karbon/karbon_part.cc
@@ -508,7 +508,7 @@ KarbonPart::addCommand( VCommand* cmd, bool tqrepaint )
 	setModified( true );
 
 	if( tqrepaint )
-		tqrepaintAllViews();
+		repaintAllViews();
 }
 
 void
@@ -530,21 +530,21 @@ KarbonPart::clearHistory()
 }
 
 void
-KarbonPart::tqrepaintAllViews( bool tqrepaint )
+KarbonPart::repaintAllViews( bool tqrepaint )
 {
 	TQPtrListIterator<KoView> itr( views() );
 
 	for( ; itr.current() ; ++itr )
-		static_cast<KarbonView*>( itr.current() )->canvasWidget()->tqrepaintAll( tqrepaint );
+		static_cast<KarbonView*>( itr.current() )->canvasWidget()->repaintAll( tqrepaint );
 }
 
 void
-KarbonPart::tqrepaintAllViews( const KoRect &rect )
+KarbonPart::repaintAllViews( const KoRect &rect )
 {
 	TQPtrListIterator<KoView> itr( views() );
 
 	for( ; itr.current() ; ++itr )
-		static_cast<KarbonView*>( itr.current() )->canvasWidget()->tqrepaintAll( rect );
+		static_cast<KarbonView*>( itr.current() )->canvasWidget()->repaintAll( rect );
 }
 
 void
diff --git a/karbon/karbon_part.h b/karbon/karbon_part.h
index f83e09ac1..85e9902fa 100644
--- a/karbon/karbon_part.h
+++ b/karbon/karbon_part.h
@@ -108,8 +108,8 @@ public:
 
 public slots:
 	/// tqrepaint all views attached to this koDocument
-	void tqrepaintAllViews( bool tqrepaint = true );
-	void tqrepaintAllViews( const KoRect& );
+	void repaintAllViews( bool tqrepaint = true );
+	void repaintAllViews( const KoRect& );
 	void slotDocumentRestored();
 	void slotCommandExecuted( VCommand * );
 	void slotUnitChanged( KoUnit::Unit unit );
diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc
index db540aa02..83db0edca 100644
--- a/karbon/karbon_view.cc
+++ b/karbon/karbon_view.cc
@@ -469,7 +469,7 @@ KarbonView::fileImportGraphic()
 			unlink( TQFile::encodeName( importedFile ) );
 	}
 	delete dialog;
-	part()->tqrepaintAllViews();
+	part()->repaintAllViews();
 }
 
 void
@@ -515,7 +515,7 @@ KarbonView::editPaste()
 										&objects, copyOffset ),
 						true );
 
-	part()->tqrepaintAllViews();
+	part()->repaintAllViews();
 	selectionChanged();
 }
 
@@ -525,7 +525,7 @@ KarbonView::editSelectAll()
 	part()->document().selection()->append();
 
 	if( part()->document().selection()->objects().count() > 0 )
-		part()->tqrepaintAllViews();
+		part()->repaintAllViews();
 
 	selectionChanged();
 }
@@ -536,7 +536,7 @@ KarbonView::editDeselectAll()
 	if( part()->document().selection()->objects().count() > 0 )
 	{
 		part()->document().selection()->clear();
-		part()->tqrepaintAllViews();
+		part()->repaintAllViews();
 	}
 
 	selectionChanged();
@@ -695,7 +695,7 @@ KarbonView::selectionDuplicate()
 										&objects, copyOffset ),
 						true );
 
-	part()->tqrepaintAllViews();
+	part()->repaintAllViews();
 	selectionChanged();
 }
 
@@ -750,7 +750,7 @@ KarbonView::slotActiveToolChanged( VTool *tool )
 {
 	toolController()->setCurrentTool( tool );
 
-	m_canvas->tqrepaintAll();
+	m_canvas->repaintAll();
 }
 
 void
@@ -763,7 +763,7 @@ KarbonView::viewModeChanged()
 	else
 		m_painterFactory->setPainter( TQT_TQPAINTDEVICE(canvasWidget()->pixmap()), width(), height() );
 
-	m_canvas->tqrepaintAll();
+	m_canvas->repaintAll();
 }
 
 void
@@ -868,7 +868,7 @@ KarbonView::zoomChanged( const KoPoint &p )
 	painter->setZoomFactor( zoomFactor );
 
 	m_canvas->setViewport( centerX, centerY );
-	m_canvas->tqrepaintAll();
+	m_canvas->repaintAll();
 	m_canvas->viewport()->setUpdatesEnabled( true );
 
 
@@ -1237,7 +1237,7 @@ void
 KarbonView::togglePageMargins(bool b)
 {
 	((KToggleAction*)actionCollection()->action("view_show_margins"))->setChecked(b);
-	m_canvas->tqrepaintAll();
+	m_canvas->repaintAll();
 }
 
 void
@@ -1319,7 +1319,7 @@ KarbonView::pageLayout()
 		m_vertRuler->setUnit( unit );
 		m_canvas->resizeContents( int( ( part()->pageLayout().ptWidth + 300 ) * zoom() ),
 								  int( ( part()->pageLayout().ptHeight + 460 ) * zoom() ) );
-		part()->tqrepaintAllViews();
+		part()->repaintAllViews();
 
 		emit pageLayoutChanged();
 	}
@@ -1438,15 +1438,15 @@ KarbonView::setCursor( const TQCursor &c )
 }
 
 void
-KarbonView::tqrepaintAll( const KoRect &r )
+KarbonView::repaintAll( const KoRect &r )
 {
-	m_canvas->tqrepaintAll( r );
+	m_canvas->repaintAll( r );
 }
 
 void
-KarbonView::tqrepaintAll( bool tqrepaint )
+KarbonView::repaintAll( bool tqrepaint )
 {
-	m_canvas->tqrepaintAll( tqrepaint );
+	m_canvas->repaintAll( tqrepaint );
 }
 void
 KarbonView::setPos( const KoPoint& p )
diff --git a/karbon/karbon_view.h b/karbon/karbon_view.h
index 5b572a85f..3e232d5f0 100644
--- a/karbon/karbon_view.h
+++ b/karbon/karbon_view.h
@@ -113,8 +113,8 @@ public:
 
 	void setCursor( const TQCursor & );
 
-	void tqrepaintAll( const KoRect & );
-	void tqrepaintAll( bool = true );
+	void repaintAll( const KoRect & );
+	void repaintAll( bool = true );
 
 	void setPos( const KoPoint& p );
 
diff --git a/karbon/karbon_view_iface.cc b/karbon/karbon_view_iface.cc
index a1eabe05e..5d919f8ff 100644
--- a/karbon/karbon_view_iface.cc
+++ b/karbon/karbon_view_iface.cc
@@ -145,6 +145,6 @@ void KarbonViewIface::pathWhirlPinch()
 
 void KarbonViewIface::tqrepaint()
 {
-	m_view->canvasWidget()->tqrepaintAll();
+	m_view->canvasWidget()->repaintAll();
 }
 
diff --git a/karbon/tools/vgradienttool.cc b/karbon/tools/vgradienttool.cc
index 9c7274eaf..7254e835a 100644
--- a/karbon/tools/vgradienttool.cc
+++ b/karbon/tools/vgradienttool.cc
@@ -78,7 +78,7 @@ VGradientTool::activate()
 			connect( preview, TQT_SIGNAL( fillSelected() ), this, TQT_SLOT( targetChanged() ) );
 			connect( preview, TQT_SIGNAL( strokeSelected() ), this, TQT_SLOT( targetChanged() ) );
 		}
-		view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+		view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 	}
 }
 
@@ -97,7 +97,7 @@ VGradientTool::deactivate()
 			disconnect( preview, TQT_SIGNAL( fillSelected() ), this, TQT_SLOT( targetChanged() ) );
 			disconnect( preview, TQT_SIGNAL( strokeSelected() ), this, TQT_SLOT( targetChanged() ) );
 		}
-		view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+		view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 	}
 }
 
@@ -511,7 +511,7 @@ VGradientTool::keyReleased( TQt::Key key )
 	}
 
 	if( view() )
-		view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+		view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 
 	return true;
 }
@@ -520,7 +520,7 @@ void
 VGradientTool::targetChanged()
 {
 	if( view() ) 
-		view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+		view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 }
 
 #include "vgradienttool.moc"
diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc
index 01dfc4607..1856672f7 100644
--- a/karbon/tools/vpatterntool.cc
+++ b/karbon/tools/vpatterntool.cc
@@ -153,7 +153,7 @@ VPatternTool::activate()
 			connect( preview, TQT_SIGNAL( fillSelected() ), this, TQT_SLOT( targetChanged() ) );
 			connect( preview, TQT_SIGNAL( strokeSelected() ), this, TQT_SLOT( targetChanged() ) );
 		}
-		view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+		view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 	}
 }
 
@@ -172,7 +172,7 @@ VPatternTool::deactivate()
 			disconnect( preview, TQT_SIGNAL( fillSelected() ), this, TQT_SLOT( targetChanged() ) );
 			disconnect( preview, TQT_SIGNAL( strokeSelected() ), this, TQT_SLOT( targetChanged() ) );
 		}
-		view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+		view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 	}
 }
 
@@ -494,7 +494,7 @@ VPatternTool::keyReleased( TQt::Key key )
 	}
 
 	if( view() )
-		view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+		view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 
 	return true;
 }
@@ -503,7 +503,7 @@ void
 VPatternTool::targetChanged()
 {
 	if( view() ) 
-		view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+		view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 }
 
 #include "vpatterntool.moc"
diff --git a/karbon/tools/vrotatetool.cc b/karbon/tools/vrotatetool.cc
index cc0a8c73d..5f39a293c 100644
--- a/karbon/tools/vrotatetool.cc
+++ b/karbon/tools/vrotatetool.cc
@@ -117,7 +117,7 @@ VRotateTool::cancel()
 	if ( isDragging() )
 	{
 		draw();
-		view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+		view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 	}
 }
 
diff --git a/karbon/tools/vselectnodestool.cc b/karbon/tools/vselectnodestool.cc
index 4d1511ce9..747357dec 100644
--- a/karbon/tools/vselectnodestool.cc
+++ b/karbon/tools/vselectnodestool.cc
@@ -63,7 +63,7 @@ VSelectNodesTool::activate()
 		view()->part()->document().selection()->setSelectObjects( false );
 		// deselect all nodes
 		view()->part()->document().selection()->selectNodes( false );
-		view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+		view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 	}
 	VTool::activate();
 }
@@ -141,7 +141,7 @@ VSelectNodesTool::mouseButtonPress()
 	recalc();
 
 	view()->part()->document().selection()->setState( VObject::edit );
-	view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+	view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 	view()->part()->document().selection()->setState( VObject::selected );
 
 	VSelection* selection = view()->part()->document().selection();
@@ -228,7 +228,7 @@ VSelectNodesTool::rightMouseButtonPress()
 	recalc();
 
 	view()->part()->document().selection()->setState( VObject::edit );
-	view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+	view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 	view()->part()->document().selection()->setState( VObject::selected );
 
 	draw();
@@ -259,7 +259,7 @@ VSelectNodesTool::keyReleased( TQt::Key key )
 	}
 
 	if( view() )
-		view()->tqrepaintAll( selection->boundingBox() );
+		view()->repaintAll( selection->boundingBox() );
 
 	return true;
 }
@@ -280,7 +280,7 @@ VSelectNodesTool::mouseButtonRelease()
 		selection->append( selrect.normalize(), false, true );
 
 	view()->selectionChanged();
-	view()->part()->tqrepaintAllViews();
+	view()->part()->repaintAllViews();
 	m_state = normal;
 }
 
@@ -297,7 +297,7 @@ VSelectNodesTool::rightMouseButtonRelease()
 	selection->take( selrect.normalize(), false, false );
 
 	view()->selectionChanged();
-	view()->part()->tqrepaintAllViews();
+	view()->part()->repaintAllViews();
 	m_state = normal;
 }
 
@@ -368,7 +368,7 @@ VSelectNodesTool::mouseDragRelease()
 				false, false );
 		}
 		view()->selectionChanged();
-		view()->part()->tqrepaintAllViews();
+		view()->part()->repaintAllViews();
 		m_state = normal;
 	}
 }
@@ -381,7 +381,7 @@ VSelectNodesTool::cancel()
 	{
 		draw();
 		m_state = normal;
-		view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+		view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 	}
 }
 
diff --git a/karbon/tools/vselecttool.cc b/karbon/tools/vselecttool.cc
index 0609d7725..751c0ebed 100644
--- a/karbon/tools/vselecttool.cc
+++ b/karbon/tools/vselecttool.cc
@@ -91,7 +91,7 @@ VSelectTool::activate()
 	view()->part()->document().selection()->setSelectObjects();
 	view()->part()->document().selection()->setState( VObject::selected );
 	view()->part()->document().selection()->selectNodes();
-	view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+	view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 	updateStatusBar();
 }
 
@@ -190,7 +190,7 @@ VSelectTool::mouseButtonPress()
 
 	// undraw selection bounding box
 	view()->part()->document().selection()->setState( VObject::edit );
-	view()->tqrepaintAll( rect );
+	view()->repaintAll( rect );
 	view()->part()->document().selection()->setState( VObject::selected );
 
 	draw();
@@ -208,7 +208,7 @@ VSelectTool::rightMouseButtonPress()
 
 	// undraw selection bounding box
 	view()->part()->document().selection()->setState( VObject::edit );
-	view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+	view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 	view()->part()->document().selection()->setState( VObject::selected );
 
 	draw();
@@ -238,7 +238,7 @@ VSelectTool::rightMouseButtonRelease()
 		if( selector.visit( view()->part()->document() ) )
 			view()->part()->document().selection()->take( *newSelection.last() );
 
-		view()->part()->tqrepaintAllViews( view()->part()->document().selection()->boundingBox() );
+		view()->part()->repaintAllViews( view()->part()->document().selection()->boundingBox() );
 		view()->selectionChanged();
 
 		updateStatusBar();
@@ -300,7 +300,7 @@ VSelectTool::mouseButtonRelease()
 			view()->part()->document().selection()->append( newSelection.last() );
 	}
 
-	view()->part()->tqrepaintAllViews( view()->part()->document().selection()->boundingBox() );
+	view()->part()->repaintAllViews( view()->part()->document().selection()->boundingBox() );
 	view()->selectionChanged();
 
 	updateStatusBar();
@@ -322,7 +322,7 @@ VSelectTool::mouseDragRelease()
 			view()->part()->document().selection()->append( selRect );
 		else
 			view()->part()->document().selection()->take( selRect );
-		view()->part()->tqrepaintAllViews( selRect );
+		view()->part()->repaintAllViews( selRect );
 	}
 	else if( m_state == moving )
 	{
@@ -399,7 +399,7 @@ VSelectTool::keyReleased( TQt::Key key )
 	}
 
 	if( view() )
-		view()->tqrepaintAll( selection->boundingBox() );
+		view()->repaintAll( selection->boundingBox() );
 
 	return true;
 }
@@ -476,7 +476,7 @@ VSelectTool::cancel()
 	{
 		draw();
 		m_state = normal;
-		view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+		view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 	}
 }
 
diff --git a/karbon/tools/vsheartool.cc b/karbon/tools/vsheartool.cc
index 59315cd8a..19e111610 100644
--- a/karbon/tools/vsheartool.cc
+++ b/karbon/tools/vsheartool.cc
@@ -136,7 +136,7 @@ VShearTool::cancel()
 	if ( isDragging() )
 	{
 		draw();
-		view()->tqrepaintAll( view()->part()->document().selection()->boundingBox() );
+		view()->repaintAll( view()->part()->document().selection()->boundingBox() );
 	}
 }
 
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index ace6c8ce4..fda8e9feb 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -657,7 +657,7 @@ void
 VTextTool::drawEditedText()
 {
 	if( m_editedText ) 
-		view()->tqrepaintAll( m_editedText->boundingBox() );
+		view()->repaintAll( m_editedText->boundingBox() );
 }
 
 void
@@ -795,10 +795,10 @@ VTextTool::textChanged()
 	{
 		// hide the original text if we are changing it
 		m_text->setState( VObject::hidden );
-		view()->tqrepaintAll( m_text->boundingBox() );
+		view()->repaintAll( m_text->boundingBox() );
 	}
 	else
-		view()->tqrepaintAll( m_editedText->boundingBox() );
+		view()->repaintAll( m_editedText->boundingBox() );
 
 	m_editedText->setText( m_optionsWidget->text() );
 	m_editedText->setFont( m_optionsWidget->font() );
@@ -853,7 +853,7 @@ VTextTool::accept()
 	}
 
 	view()->part()->addCommand( cmd, true );
-	view()->part()->tqrepaintAllViews();
+	view()->part()->repaintAllViews();
 	m_creating = false;
 }
 
@@ -864,7 +864,7 @@ VTextTool::cancel()
 	{
 		// show original text if we canceled changing it
 		m_text->setState( VObject::selected );
-		view()->tqrepaintAll( m_text->boundingBox() );
+		view()->repaintAll( m_text->boundingBox() );
 	}
 	else
 		drawPathCreation();
@@ -881,7 +881,7 @@ VTextTool::editBasePath()
 
 	view()->part()->document().selection()->clear();
 	view()->part()->document().selection()->append( &m_editedText->basePath() );
-	view()->part()->tqrepaintAllViews();
+	view()->part()->repaintAllViews();
 }
 
 void
diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cc
index 28b272ae3..96db15d85 100644
--- a/karbon/widgets/vcanvas.cc
+++ b/karbon/widgets/vcanvas.cc
@@ -152,7 +152,7 @@ VCanvas::eventFilter( TQObject* object, TQEvent* event )
 }
 
 
-// This causes a tqrepaint normally, so just overwriting it omits the tqrepainting
+// This causes a tqrepaint normally, so just overwriting it omits the repainting
 void
 VCanvas::focusInEvent( TQFocusEvent * )
 {
@@ -328,14 +328,14 @@ VCanvas::drawDocument( TQPainter* /*painter*/, const KoRect&, bool drawVObjects
 }
 
 void
-VCanvas::tqrepaintAll( bool drawVObjects )
+VCanvas::repaintAll( bool drawVObjects )
 {
 	drawDocument( 0, KoRect( 0, 0, width(), height() ), drawVObjects );
 }
 
-/// tqrepaints just a rect area (no scrolling)
+/// repaints just a rect area (no scrolling)
 void
-VCanvas::tqrepaintAll( const KoRect &r )
+VCanvas::repaintAll( const KoRect &r )
 {
 	drawDocument( 0, r );
 }
diff --git a/karbon/widgets/vcanvas.h b/karbon/widgets/vcanvas.h
index 09dc07d3e..61d9b6065 100644
--- a/karbon/widgets/vcanvas.h
+++ b/karbon/widgets/vcanvas.h
@@ -39,8 +39,8 @@ public:
 	VCanvas( TQWidget *tqparent, KarbonView* view, KarbonPart* part );
 	virtual ~VCanvas();
 
-	void tqrepaintAll( const KoRect & );
-	void tqrepaintAll( bool drawVObjects = true );
+	void repaintAll( const KoRect & );
+	void repaintAll( bool drawVObjects = true );
 
 	TQPixmap *pixmap() { return m_pixmap; }
 
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index 98bd0782a..478c478f1 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -69,7 +69,7 @@
   In order to set up a Gantt view, create an object of this class, and
   populate it with a number of \a KDGanttViewItem objects.
 
-  If you experience problems with the tqrepainting of the content of the
+  If you experience problems with the repainting of the content of the
   Gantt View after scrolling, call \a setRepaintMode().
 */
 
@@ -296,7 +296,7 @@ void KDGanttView::show()
 }
 /*!
   Closes the widget.
-  The closing is rejected, if a tqrepainting is currently being done.
+  The closing is rejected, if a repainting is currently being done.
   \param alsoDelete if true, the widget is deleted
   \return true, if the widget was closed
 */
@@ -532,12 +532,12 @@ void KDGanttView::slotMouseButtonPressed ( int button, TQListViewItem * item,
 
 
 /*!
-  Specifies whether the content should be tqrepainted after scrolling or
+  Specifies whether the content should be repainted after scrolling or
   not.
 
-  \param mode If No, there is no tqrepainting after scrolling. This is
+  \param mode If No, there is no repainting after scrolling. This is
                  the fastest mode.
-              If Medium, there is extra tqrepainting after releasing the
+              If Medium, there is extra repainting after releasing the
                  scrollbar. This provides fast scrolling with updated content
                  after scrolling. Recommended, when tqrepaint problems occur.
                  This is the default value after startup.
@@ -986,7 +986,7 @@ TQSize KDGanttView::drawContents( TQPainter* p,
     }
     if ( drawTimeLine ) {
       p->translate( myCanvasView->frameWidth(), 0);
-      myTimeHeader->tqrepaintMe( 0, myTimeHeader->width(), p );
+      myTimeHeader->repaintMe( 0, myTimeHeader->width(), p );
       p->translate( -myCanvasView->frameWidth(), thY);
       myCanvasView->drawToPainter( p );
       if ( drawListView )
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index c07e1e6f4..e38b09373 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -1436,7 +1436,7 @@ void KDTimeHeaderWidget::setShowMinorTicks( bool show )
     flagShowMinorTicks = show;
     if (show)
         setShowMajorTicks(false );
-    //tqrepaintMe();
+    //repaintMe();
     updateTimeTable();
 }
 
@@ -1873,7 +1873,7 @@ int KDTimeHeaderWidget::autoScaleMinorTickCount()
 }
 
 
-void KDTimeHeaderWidget::tqrepaintMe(int left,int paintwid, TQPainter* painter)
+void KDTimeHeaderWidget::repaintMe(int left,int paintwid, TQPainter* painter)
 {
     if (flagDoNotRecomputeAfterChange) return;
     TQColorGroup qcg =TQColorGroup( white, black,white, darkGray,black,gray,gray) ;
@@ -2383,7 +2383,7 @@ void KDTimeHeaderWidget::centerDateTime( const TQDateTime& center )
 
 void KDTimeHeaderWidget::paintEvent(TQPaintEvent *p)
 {
-    tqrepaintMe(p->rect().x(),p->rect().width());
+    repaintMe(p->rect().x(),p->rect().width());
 }
 
 
@@ -2534,7 +2534,7 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
                 myGanttView->myCanvasView->horizontalScrollBar()->lineStep();
 
         }
-        tqrepaintMe(-x(),tqparentWidget()->width());
+        repaintMe(-x(),tqparentWidget()->width());
         if ( val > -1 ) {
             if ( val > myGanttView->myCanvasView->horizontalScrollBar()->maxValue() ) {
                 val = myGanttView->myCanvasView->horizontalScrollBar()->maxValue();
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index c9f37d43a..f2b6cadcf 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -170,7 +170,7 @@ public:
       return ccList;
     }
    TQColor weekdayColor[8];
-   void tqrepaintMe(int left, int wid, TQPainter *p = 0);
+   void repaintMe(int left, int wid, TQPainter *p = 0);
 
    void centerDateTime( const TQDateTime& center );
 
diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
index 2c7d2f015..a79374cdd 100644
--- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
@@ -536,7 +536,7 @@ KFormDesignerKDevPart::~KFormDesignerKDevPart()
 //////  FormWidgetBase : helper widget to draw rects on top of widgets
 
 //tqrepaint all tqchildren widgets
-static void tqrepaintAll(TQWidget *w)
+static void repaintAll(TQWidget *w)
 {
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
@@ -588,7 +588,7 @@ FormWidgetBase::drawRect(const TQRect& r, int type)
 void
 FormWidgetBase::initRect()
 {
-	tqrepaintAll(this);
+	repaintAll(this);
 	buffer.resize( width(), height() );
 	buffer = TQPixmap::grabWindow( winId() );
 	prev_rect = TQRect();
@@ -609,7 +609,7 @@ FormWidgetBase::clearRect()
 		clearWFlags( WPaintUnclipped );
 	p.end();
 
-	tqrepaintAll(this);
+	repaintAll(this);
 }
 
 void
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index bc4815940..0e1745dcd 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -559,7 +559,7 @@ KFormDesignerPart::setRedoEnabled(bool enabled, const TQString &text)
 //////  FormWidgetBase : helper widget to draw rects on top of widgets
 
 //tqrepaint all tqchildren widgets
-static void tqrepaintAll(TQWidget *w)
+static void repaintAll(TQWidget *w)
 {
 	w->tqrepaint();
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
@@ -612,7 +612,7 @@ FormWidgetBase::drawRect(const TQRect& r, int type)
 void
 FormWidgetBase::initBuffer()
 {
-	tqrepaintAll(this);
+	repaintAll(this);
 	buffer.resize( width(), height() );
 	buffer = TQPixmap::grabWindow( winId() );
 	prev_rect = TQRect();
@@ -633,7 +633,7 @@ FormWidgetBase::clearForm()
 		clearWFlags( WPaintUnclipped );
 	p.end();
 
-	tqrepaintAll(this);
+	repaintAll(this);
 }
 
 void
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 9a14a0c92..189d515f3 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -1219,7 +1219,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 
 	m_scrollView->tqrepaint();
 	m_scrollView->viewport()->tqrepaint();
-	m_scrollView->tqrepaintContents();
+	m_scrollView->repaintContents();
 	m_scrollView->updateContents();
 	m_scrollView->clipper()->tqrepaint();
 	m_scrollView->refreshContentsSize();
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 12210430a..8c9534d2b 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -126,7 +126,7 @@ KexiDBForm::~KexiDBForm()
 KexiDataAwareObjectInterface* KexiDBForm::dataAwareObject() const { return d->dataAwareObject; }
 
 //tqrepaint all tqchildren widgets
-static void tqrepaintAll(TQWidget *w)
+static void repaintAll(TQWidget *w)
 {
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
@@ -182,7 +182,7 @@ KexiDBForm::drawRects(const TQValueList<TQRect> &list, int type)
 void
 KexiDBForm::initBuffer()
 {
-	tqrepaintAll(this);
+	repaintAll(this);
 	d->buffer.resize( width(), height() );
 	d->buffer = TQPixmap::grabWindow( winId() );
 	d->prev_rect = TQRect();
@@ -203,7 +203,7 @@ KexiDBForm::clearForm()
 		clearWFlags( WPaintUnclipped );
 	p.end();
 
-	tqrepaintAll(this);
+	repaintAll(this);
 }
 
 void
diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp
index db946141d..af539e3de 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.cpp
+++ b/kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -454,7 +454,7 @@ void KexiDBLabel::updatePixmap() {
 	d->internalLabel->setFixedSize( size() );
 	d->internalLabel->setPalette( palette() );
 	d->internalLabel->tqsetAlignment( tqalignment() );
-//	d->shadowPixmap = KPixmap(); //parallel tqrepaints won't hurt us cause incomplete pixmap
+//	d->shadowPixmap = KPixmap(); //parallel repaints won't hurt us cause incomplete pixmap
 	KPixmap shadowPixmap = d->internalLabel->getShadowPixmap();
 	if (shadowPixmap.isNull())
 		return;
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index b7bcb80e8..bc3efc620 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -1250,7 +1250,7 @@ void KexiCSVImportDialog::delimiterChanged(const TQString& delimiter)
 	Q_UNUSED(delimiter);
 	m_columnsAdjusted = false;
 	m_detectDelimiter = false; //selected by hand: do not detect in the future
-	//delayed, otherwise combobox won't be tqrepainted
+	//delayed, otherwise combobox won't be repainted
 	fillTableLater();
 }
 
@@ -1264,7 +1264,7 @@ void KexiCSVImportDialog::textquoteSelected(int)
 
 	kexipluginsdbg << "KexiCSVImportDialog::textquoteSelected(): " << m_textquote << endl;
 
-	//delayed, otherwise combobox won't be tqrepainted
+	//delayed, otherwise combobox won't be repainted
 	fillTableLater();
 }
 
diff --git a/kexi/plugins/reports/kexireportform.cpp b/kexi/plugins/reports/kexireportform.cpp
index f77b41a55..11c49c84b 100644
--- a/kexi/plugins/reports/kexireportform.cpp
+++ b/kexi/plugins/reports/kexireportform.cpp
@@ -41,7 +41,7 @@ KexiReportForm::~KexiReportForm()
 }
 
 //tqrepaint all tqchildren widgets
-static void tqrepaintAll(TQWidget *w)
+static void repaintAll(TQWidget *w)
 {
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
@@ -93,7 +93,7 @@ KexiReportForm::drawRects(const TQValueList<TQRect> &list, int type)
 void
 KexiReportForm::initBuffer()
 {
-	tqrepaintAll(this);
+	repaintAll(this);
 	buffer.resize( width(), height() );
 	buffer = TQPixmap::grabWindow( winId() );
 	prev_rect = TQRect();
@@ -114,7 +114,7 @@ KexiReportForm::clearForm()
 		clearWFlags( WPaintUnclipped );
 	p.end();
 
-	tqrepaintAll(this);
+	repaintAll(this);
 }
 
 void
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index cbaf0e0cc..46c7ade9a 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -440,7 +440,7 @@ KexiBrowser::slotContextMenu(KListView* /*list*/, TQListViewItem *item, const TQ
 			m_newObjectAction->setText(i18n("&Create Object..."));
 		m_newObjectAction->setIconSet( SmallIconSet(bit->info()->itemIcon()) );*/
 		m_list->setCurrentItem(item);
-		m_list->tqrepaintItem(item);
+		m_list->repaintItem(item);
 	}
 	if (pm)
 		pm->exec(pos);
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index 569d61f81..64d036818 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -175,7 +175,7 @@ KexiScrollView::refreshContentsSize()
 		if (change) {
 	tqrepaint();
 	viewport()->tqrepaint();
-	tqrepaintContents();
+	repaintContents();
 	updateContents(0, 0, 2000,2000);
 	clipper()->tqrepaint();
 
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 0d19981a1..4352c2604 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -328,7 +328,7 @@ void KexiBlobTableEdit::handlePasteAction()
 	}
 	signalEditRequested();
 	//emit acceptRequested();
-	tqrepaintRelatedCell();
+	repaintRelatedCell();
 }
 
 void KexiBlobTableEdit::clear()
@@ -336,7 +336,7 @@ void KexiBlobTableEdit::clear()
 	setValueInternal( TQByteArray(), true );
 	signalEditRequested();
 	//emit acceptRequested();
-	tqrepaintRelatedCell();
+	repaintRelatedCell();
 }
 
 void KexiBlobTableEdit::handleShowPropertiesAction()
diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp
index e85d0c73e..a9220ea81 100644
--- a/kexi/widget/tableview/kexibooltableedit.cpp
+++ b/kexi/widget/tableview/kexibooltableedit.cpp
@@ -144,7 +144,7 @@ void KexiBoolTableEdit::handleAction(const TQString& actionName)
 				? TQVariant(0, false)/*0 instead of NULL - handle case when null is not allowed*/
 				: TQVariant();
 		}
-		tqrepaintRelatedCell();
+		repaintRelatedCell();
 	}
 	else if (actionName=="edit_cut") {
 		emit editRequested();
@@ -153,7 +153,7 @@ void KexiBoolTableEdit::handleAction(const TQString& actionName)
 			? TQVariant(0, false)/*0 instead of NULL - handle case when null is not allowed*/
 			: TQVariant();
 		handleCopyAction(m_origValue, TQVariant());
-		tqrepaintRelatedCell();
+		repaintRelatedCell();
 	}
 }
 
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp
index 5c90eb060..95ed31c0c 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.cpp
+++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp
@@ -1339,10 +1339,10 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
 	cancelRowEdit();
 //	acceptRowEdit();
 //	m_verticalHeader->clear();
-	const bool tqrepaintLater = tqrepaint && m_spreadSheetMode;
+	const bool repaintLater = tqrepaint && m_spreadSheetMode;
 	const int oldRows = rows();
 
-	bool res = m_data->deleteAllRows(tqrepaint && !tqrepaintLater);
+	bool res = m_data->deleteAllRows(tqrepaint && !repaintLater);
 
 	if (res) {
 		if (m_spreadSheetMode) {
@@ -1352,7 +1352,7 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
 			}
 		}
 	}
-	if (tqrepaintLater)
+	if (repaintLater)
 		m_data->reload();
 
 //	d->clearVariables();
@@ -1547,7 +1547,7 @@ bool KexiDataAwareObjectInterface::deleteItem(KexiTableItem *item)/*, bool moveC
 			//d->pCurrentItem = m_data->current();
 	}
 
-//	tqrepaintAfterDelete();
+//	repaintAfterDelete();
 	if (m_spreadSheetMode) { //append empty row for spreadsheet mode
 		m_data->append(m_data->createItem());//new KexiTableItem(m_data->columns.count()));
 		if (m_verticalHeader)
diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp
index 6a9008f1c..fd4870fbd 100644
--- a/kexi/widget/tableview/kexitableedit.cpp
+++ b/kexi/widget/tableview/kexitableedit.cpp
@@ -213,7 +213,7 @@ int KexiTableEdit::widthForValue( TQVariant &val, const TQFontMetrics &fm )
 	return fm.width( val.toString() );
 }
 
-void KexiTableEdit::tqrepaintRelatedCell()
+void KexiTableEdit::repaintRelatedCell()
 {
 	if (dynamic_cast<KexiDataAwareObjectInterface*>(m_scrollView))
 		dynamic_cast<KexiDataAwareObjectInterface*>(m_scrollView)->updateCurrentCell();
diff --git a/kexi/widget/tableview/kexitableedit.h b/kexi/widget/tableview/kexitableedit.h
index d8ac7c86a..1d9378b0c 100644
--- a/kexi/widget/tableview/kexitableedit.h
+++ b/kexi/widget/tableview/kexitableedit.h
@@ -190,7 +190,7 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI
 
 		/*! Allows to force redrawing the related cell by the editor itself. Usable when the editor is not 
 		 displayed by a TQWidget but rather by table view cell itself, for example KexiBlobTableEdit. */
-		void tqrepaintRelatedCell();
+		void repaintRelatedCell();
 
 		KexiTableViewColumn *m_column;
 		int m_leftMargin;
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 229f909c5..799a1a8bf 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -1159,7 +1159,7 @@ void KexiTableView::contentsMouseMoveEvent( TQMouseEvent *e )
 			d->highlightedRow = row;
 			updateRow(oldRow);
 			updateRow(d->highlightedRow);
-			//currently selected (not necessary highlighted) row needs to be tqrepainted
+			//currently selected (not necessary highlighted) row needs to be repainted
 			updateRow(m_curRow);
 			m_verticalHeader->setHighlightedRow(d->highlightedRow);
 		}
@@ -1813,7 +1813,7 @@ void KexiTableView::slotColumnWidthChanged( int, int, int )
 	viewport()->setUpdatesEnabled(true);
 	if (contentsWidth() < w) {
 		updateContents(contentsX(), 0, viewport()->width(), contentsHeight());
-//		tqrepaintContents( s.width(), 0, w - s.width() + 1, contentsHeight(), true );
+//		repaintContents( s.width(), 0, w - s.width() + 1, contentsHeight(), true );
 	} 
 	else {
 	//	updateContents( columnPos(col), 0, contentsWidth(), contentsHeight() );
@@ -2581,7 +2581,7 @@ void KexiTableView::setHighlightedRow(int row)
 	if (m_curRow>=0 && (previouslyHighlightedRow==-1 || previouslyHighlightedRow==m_curRow)
 		&& d->highlightedRow!=m_curRow && !d->appearance.persistentSelections)
 	{
-		//currently selected row needs to be tqrepainted
+		//currently selected row needs to be repainted
 		updateRow(m_curRow);
 	}
 }
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index f06fce101..6c03215bd 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -627,7 +627,7 @@ protected:
 		KexiTableItem *item, KexiTableViewColumn *tvcol) const;
 
 //	//! Called to tqrepaint contents after a row is deleted.
-//	void tqrepaintAfterDelete();
+//	void repaintAfterDelete();
 
 	KexiTableViewPrivate *d;
 
diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp
index 0b78a70c5..96fee8cbf 100644
--- a/kivio/kiviopart/kivio_canvas.cpp
+++ b/kivio/kiviopart/kivio_canvas.cpp
@@ -1018,7 +1018,7 @@ KoPoint KivioCanvas::snapToGuides(const KoPoint& point, bool &snappedX, bool &sn
       snappedX = true;
     }
 
-    m_guides.tqrepaintSnapping(p, status);
+    m_guides.repaintSnapping(p, status);
   }
 
   return p;
diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp
index 435962401..a1597f85e 100644
--- a/kivio/plugins/kivioconnectortool/tool_connector.cpp
+++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp
@@ -138,7 +138,7 @@ void ConnectorTool::setActivated(bool a)
         polyconnector = 0;
       }
 
-      view()->canvasWidget()->guideLines().tqrepaintAfterSnapping();
+      view()->canvasWidget()->guideLines().repaintAfterSnapping();
     }
 
     m_pStencil = 0;
@@ -345,7 +345,7 @@ void ConnectorTool::endRubberBanding(TQMouseEvent *)
   connector(view()->canvasWidget()->rect());
   m_pStencil = 0;
   m_mode = stmNone;
-  view()->canvasWidget()->guideLines().tqrepaintAfterSnapping();
+  view()->canvasWidget()->guideLines().repaintAfterSnapping();
 
   if(!m_permanent) {
     view()->pluginManager()->activateDefaultTool();
diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp
index 898a35083..b201f4d42 100644
--- a/kivio/plugins/kivioselecttool/tool_select.cpp
+++ b/kivio/plugins/kivioselecttool/tool_select.cpp
@@ -994,7 +994,7 @@ void SelectTool::mouseRelease(const TQPoint &pos)
 
   m_mode = stmNone;
 
-  view()->canvasWidget()->guideLines().tqrepaintAfterSnapping();
+  view()->canvasWidget()->guideLines().repaintAfterSnapping();
   view()->doc()->updateView(view()->activePage());
 }
 
@@ -1254,7 +1254,7 @@ void SelectTool::keyPress(TQKeyEvent* e)
   }
   
   endDragging(TQPoint());
-  canvas->guideLines().tqrepaintAfterSnapping();
+  canvas->guideLines().repaintAfterSnapping();
   canvas->setFocus();
 }
 
diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cc
index 6117a941d..5b25c3a4f 100644
--- a/kplato/kptdatetable.cc
+++ b/kplato/kptdatetable.cc
@@ -379,7 +379,7 @@ void DateTable::contentsMousePressEvent(TQMouseEvent *e) {
         updateSelectedCells();
         m_selectedWeekdays.clear();
         m_selectedDates.clear();
-        tqrepaintContents(false);
+        repaintContents(false);
         emit selectionCleared();
         return;
     }
@@ -388,7 +388,7 @@ void DateTable::contentsMousePressEvent(TQMouseEvent *e) {
         m_selectedWeekdays.clear();
         m_selectedDates.clear();
         updateSelectedCells();
-        tqrepaintContents(false);
+        repaintContents(false);
         return;
     }
     if (row==0 && col>0) { // the user clicked on weekdays
@@ -429,7 +429,7 @@ void DateTable::contentsMousePressEvent(TQMouseEvent *e) {
             m_selectedWeekdays.toggleClear(day);
         }
         updateSelectedCells();
-        tqrepaintContents(false);
+        repaintContents(false);
         if (m_enabled) {
             //kdDebug()<<k_funcinfo<<"emit weekdaySelected("<<day<<")"<<endl;
             emit weekdaySelected(day); // day= 1..7
@@ -478,7 +478,7 @@ void DateTable::contentsMousePressEvent(TQMouseEvent *e) {
             //kdDebug()<<k_funcinfo<<"toggleClear date: "<<date.toString()<<" state="<<m_selectedDates.state(date)<<endl;
         }
     }
-    tqrepaintContents(false);
+    repaintContents(false);
 }
 
 bool DateTable::contentsMousePressEvent_internal(TQMouseEvent *e) {
@@ -520,7 +520,7 @@ bool DateTable::selectDate(const TQDate& date_) {
     }
     numDaysPrevMonth=temp.daysInMonth();
     if(changed) {
-        tqrepaintContents(false);
+        repaintContents(false);
     }
     if (m_enabled)
         emit(dateChanged(date));
@@ -563,7 +563,7 @@ bool DateTable::setDate(const TQDate& date_, bool tqrepaint) {
     }*/
     numDaysPrevMonth=temp.daysInMonth();
     if(changed && tqrepaint) {
-        tqrepaintContents(false);
+        repaintContents(false);
     }
     if (m_enabled)
       emit(dateChanged(date));
@@ -645,7 +645,7 @@ void DateTable::setMarkedWeekdays(const IntMap days) {
     m_markedWeekdays.clear();
     m_markedWeekdays = days;
     updateMarkedCells();
-    tqrepaintContents(false);
+    repaintContents(false);
 }
 
 bool DateTable::weekdayMarked(int day) {
@@ -678,13 +678,13 @@ void DateTable::clear() {
     clearSelection();
     m_markedDates.clear();
     m_markedWeekdays.clear();
-    tqrepaintContents(false);
+    repaintContents(false);
 }
 
 void DateTable::clearSelection() {
     m_selectedDates.clear();
     m_selectedWeekdays.clear();
-    tqrepaintContents(false);
+    repaintContents(false);
 }
 
  void DateTable::setEnabled(bool yes) {
@@ -709,7 +709,7 @@ void DateTable::markSelected(int state) {
         }
     }
     updateSelectedCells();
-    tqrepaintContents(false);
+    repaintContents(false);
 }
 
 DateInternalWeekSelector::DateInternalWeekSelector
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index 134e08512..9e8d18158 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -295,7 +295,7 @@ void KPrCanvas::paintEvent( TQPaintEvent* paintEvent )
             bufPainter.translate( -diffx(), -diffy() );
             bufPainter.setBrushOrigin( -diffx(), -diffy() );
 
-            TQRect crect( paintEvent->rect() ); // the rectangle that needs to be tqrepainted, in widget coordinates
+            TQRect crect( paintEvent->rect() ); // the rectangle that needs to be repainted, in widget coordinates
             bufPainter.setClipRect( crect );
 
             //kdDebug(33001) << "KPrCanvas::paintEvent " << DEBUGRECT( crect ) << ", " << size() << endl;
@@ -846,7 +846,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e )
                     recalcAutoGuides();
                     if ( m_view->kPresenterDoc()->showGuideLines() && !m_disableSnapping )
                     {
-                        m_gl.tqrepaintSnapping( objectRect( false ) );
+                        m_gl.repaintSnapping( objectRect( false ) );
                     }
                 }
                 else
@@ -1042,7 +1042,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e )
 
             endDrawCubicBezierCurve();
 
-            m_gl.tqrepaintAfterSnapping();
+            m_gl.repaintAfterSnapping();
 
             return;
         }
@@ -1215,7 +1215,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e )
                     m_view->kPresenterDoc()->addCommand( cmd );
             } else
             {
-                m_activePage->tqrepaintObj();
+                m_activePage->repaintObj();
             }
             m_isMoving = false;
         }
@@ -1374,7 +1374,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e )
     default: break;
     }
 
-    m_gl.tqrepaintAfterSnapping();
+    m_gl.repaintAfterSnapping();
 
     emit objectSelectedChanged();
 
@@ -2110,7 +2110,7 @@ void KPrCanvas::keyPressEvent( TQKeyEvent *e )
                     m_disableSnapping = e->key() == TQt::Key_Shift;
                     if ( !oldChangeSnap && m_disableSnapping )
                     {
-                        m_gl.tqrepaintAfterSnapping();
+                        m_gl.repaintAfterSnapping();
                     }
                     // undo snapping for move by mouse
                     if ( e->state() & Qt::LeftButton && m_isMoving )
@@ -4638,7 +4638,7 @@ void KPrCanvas::moveObjectsByKey( int x, int y )
         // redraw guidelines (intentionally always)
         KoRect movedRect( rect );
         movedRect.moveBy( move.x(), move.y() );
-        m_gl.tqrepaintSnapping( movedRect );
+        m_gl.repaintSnapping( movedRect );
     }
 
     if ( move != KoPoint( 0, 0 ) )
@@ -4727,7 +4727,7 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged )
     if ( snapToGuideLines )
     {
         // redraw guidelines (intentionally always)
-        m_gl.tqrepaintSnapping( movedRect );
+        m_gl.repaintSnapping( movedRect );
     }
 
     if ( move != KoPoint( 0, 0 ) )
@@ -4931,7 +4931,7 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k
             {
                 sp.setY( rect.bottom() );
             }
-            m_gl.tqrepaintSnapping( sp, snaptqStatus );
+            m_gl.repaintSnapping( sp, snaptqStatus );
         }
 
         _tqrepaint( oldBoundingRect );
@@ -5544,7 +5544,7 @@ void KPrCanvas::tqlayout()
     }
 }
 
-KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool tqrepaintSnapping )
+KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool repaintSnapping )
 {
     KoPoint sp( pos );
     KPrDocument * doc( m_view->kPresenterDoc() );
@@ -5582,9 +5582,9 @@ KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool tqrepaintSnapping )
         sp.setY( pageRect.bottom() );
 
     // redraw guidelines (intentionally always)
-    if ( tqrepaintSnapping && snapToGuideLines )
+    if ( repaintSnapping && snapToGuideLines )
     {
-        m_gl.tqrepaintSnapping( sp, KoGuides::SNAP_BOTH );
+        m_gl.repaintSnapping( sp, KoGuides::SNAP_BOTH );
     }
 
     return sp;
diff --git a/kpresenter/KPrCanvas.h b/kpresenter/KPrCanvas.h
index 9ab7de162..c7c67c023 100644
--- a/kpresenter/KPrCanvas.h
+++ b/kpresenter/KPrCanvas.h
@@ -438,7 +438,7 @@ protected:
 
     // functions for displaying
     /**
-     * This method is used for tqrepainting the canvas.
+     * This method is used for repainting the canvas.
      */
     virtual void paintEvent( TQPaintEvent* );
 
@@ -690,13 +690,13 @@ private:
      * If so it returns the position it has snapped to.
      *
      * @param pos the point which should be snapped
-     * @param tqrepaintSnapping true if the guides should be tqrepainted.
-     * @param tqrepaintSnapping false when the guides should not be tqrepainted.
+     * @param repaintSnapping true if the guides should be repainted.
+     * @param repaintSnapping false when the guides should not be repainted.
      *        You have to call tqrepaint by yourself.
      *
      * @return the position of the snapped point
      */
-    KoPoint snapPoint( KoPoint &pos, bool tqrepaintSnapping = true );
+    KoPoint snapPoint( KoPoint &pos, bool repaintSnapping = true );
 
     /**
      * @brief Find the next grid in distance
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index e6498bc3f..a5cf24fe9 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -351,7 +351,7 @@ KPrConfigureColorBackground::KPrConfigureColorBackground( KPrView* _view, TQWidg
 void KPrConfigureColorBackground::apply()
 {
     KPrDocument * doc = m_pView->kPresenterDoc();
-    bool tqrepaintNeeded = false;
+    bool repaintNeeded = false;
     TQColor _col = bgColor->color();
     if( oldBgColor != _col ) {
         config->setGroup( "KPresenter Color" );
@@ -359,7 +359,7 @@ void KPrConfigureColorBackground::apply()
         doc->setTxtBackCol( _col );
         doc->replaceObjs();
         oldBgColor=_col;
-        tqrepaintNeeded = true;
+        repaintNeeded = true;
     }
     _col = gridColor->color();
     if( oldGridColor != _col ) {
@@ -368,9 +368,9 @@ void KPrConfigureColorBackground::apply()
         doc->tqrepaint( false );
         doc->setGridColor( _col );
         oldGridColor=_col;
-        tqrepaintNeeded = true;
+        repaintNeeded = true;
     }
-    if (tqrepaintNeeded)
+    if (repaintNeeded)
         doc->tqrepaint( false );
 }
 
diff --git a/kpresenter/KPrEffectHandler.cpp b/kpresenter/KPrEffectHandler.cpp
index ddc96d91d..a63ad1d25 100644
--- a/kpresenter/KPrEffectHandler.cpp
+++ b/kpresenter/KPrEffectHandler.cpp
@@ -129,7 +129,7 @@ bool KPrEffectHandler::doEffect()
 
                 if ( doAppearEffectStep( object ) )
                 {
-                    m_removeRects.append( m_tqrepaintRects.getLast() );
+                    m_removeRects.append( m_repaintRects.getLast() );
                     if ( appearObject != m_appearEffectObjects.getLast() )
                     {
                         next = false;
@@ -172,7 +172,7 @@ bool KPrEffectHandler::doEffect()
         ++m_effectStep;
         TQRect *r;
 #if 0 // used for debugging effects
-        TQPtrListIterator<TQRect> it_debug(m_tqrepaintRects);
+        TQPtrListIterator<TQRect> it_debug(m_repaintRects);
         while( ( r = it_debug.current() ) != 0 )
         {
             ++it_debug;
@@ -194,7 +194,7 @@ bool KPrEffectHandler::doEffect()
         sleep( 1 );
 #endif
 
-        TQPtrListIterator<TQRect> it_r(m_tqrepaintRects);
+        TQPtrListIterator<TQRect> it_r(m_repaintRects);
 #if 1
         while( ( r = it_r.current() ) != 0 )
         {
@@ -213,7 +213,7 @@ bool KPrEffectHandler::doEffect()
         bitBlt( m_dst, 0, 0, &m_paint);
 #endif
 
-        m_lastRepaintRects = m_tqrepaintRects;
+        m_lastRepaintRects = m_repaintRects;
         TQPtrListIterator<TQRect> it3(m_removeRects);
         while( ( r = it3.current() ) != 0 )
         {
@@ -221,7 +221,7 @@ bool KPrEffectHandler::doEffect()
             m_lastRepaintRects.remove( r );
         }
 
-        m_tqrepaintRects.clear();
+        m_repaintRects.clear();
 
         m_paint = *m_src;
 
@@ -251,7 +251,7 @@ void KPrEffectHandler::finish()
             bool next = true;
 
             TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-            m_tqrepaintRects.append( new TQRect( objectRect ) );
+            m_repaintRects.append( new TQRect( objectRect ) );
 
             if ( appearObject != m_appearEffectObjects.getLast() )
             {
@@ -397,7 +397,7 @@ bool KPrEffectHandler::doDisappearEffectStep( KPrObject *object )
 bool KPrEffectHandler::appearNone( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    m_tqrepaintRects.append( new TQRect( objectRect ) );
+    m_repaintRects.append( new TQRect( objectRect ) );
     drawObject( object, 0, 0, &m_paint );
     return true;
 }
@@ -406,9 +406,9 @@ bool KPrEffectHandler::appearNone( KPrObject *object )
 bool KPrEffectHandler::appearComeLeft( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int ox = objectRect.x();
-    int xdiff = tqrepaintRect.x() - ox;
+    int xdiff = repaintRect.x() - ox;
 
     bool positionReached = false;
     int x = m_effectStep * m_stepWidth - objectRect.width();
@@ -417,8 +417,8 @@ bool KPrEffectHandler::appearComeLeft( KPrObject *object )
         x = ox;
         positionReached = true;
     }
-    tqrepaintRect.moveLeft( x + xdiff );
-    m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+    repaintRect.moveLeft( x + xdiff );
+    m_repaintRects.append( new TQRect( repaintRect ) );
 
     //kdDebug(33001) << "KPrEffectHandler appearComeLeft x = " << x << " " << positionReached << endl;
     drawObject( object, x - ox, 0, &m_paint );
@@ -430,9 +430,9 @@ bool KPrEffectHandler::appearComeLeft( KPrObject *object )
 bool KPrEffectHandler::appearComeTop( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int oy = objectRect.y();
-    int ydiff = tqrepaintRect.y() - oy;
+    int ydiff = repaintRect.y() - oy;
 
     bool positionReached = false;
     int y = m_effectStep * m_stepHeight - objectRect.height();
@@ -441,8 +441,8 @@ bool KPrEffectHandler::appearComeTop( KPrObject *object )
         y = oy;
         positionReached = true;
     }
-    tqrepaintRect.moveTop( y + ydiff );
-    m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+    repaintRect.moveTop( y + ydiff );
+    m_repaintRects.append( new TQRect( repaintRect ) );
 
     //kdDebug(33001) << "KPrEffectHandler appearComeTop y = " << y << " " << positionReached << endl;
     drawObject( object, 0, y - oy, &m_paint );
@@ -454,9 +454,9 @@ bool KPrEffectHandler::appearComeTop( KPrObject *object )
 bool KPrEffectHandler::appearComeRight( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int ox = objectRect.x();
-    int xdiff = tqrepaintRect.x() - ox;
+    int xdiff = repaintRect.x() - ox;
 
     bool positionReached = false;
     int x = m_src->width() - m_effectStep * m_stepWidth;
@@ -465,8 +465,8 @@ bool KPrEffectHandler::appearComeRight( KPrObject *object )
         x = ox;
         positionReached = true;
     }
-    tqrepaintRect.moveLeft( x + xdiff );
-    m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+    repaintRect.moveLeft( x + xdiff );
+    m_repaintRects.append( new TQRect( repaintRect ) );
 
     //kdDebug(33001) << "KPrEffectHandler appearComeRight x = " << x << " " << positionReached << endl;
     drawObject( object, x - ox, 0, &m_paint );
@@ -478,9 +478,9 @@ bool KPrEffectHandler::appearComeRight( KPrObject *object )
 bool KPrEffectHandler::appearComeBottom( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int oy = objectRect.y();
-    int ydiff = tqrepaintRect.y() - oy;
+    int ydiff = repaintRect.y() - oy;
 
     bool positionReached = false;
     int y = m_src->height() - m_effectStep * m_stepHeight;
@@ -489,8 +489,8 @@ bool KPrEffectHandler::appearComeBottom( KPrObject *object )
         y = oy;
         positionReached = true;
     }
-    tqrepaintRect.moveTop( y + ydiff );
-    m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+    repaintRect.moveTop( y + ydiff );
+    m_repaintRects.append( new TQRect( repaintRect ) );
 
     //kdDebug(33001) << "KPrEffectHandler appearComeBottom y = " << y << " " << positionReached << endl;
     drawObject( object, 0, y - oy, &m_paint );
@@ -502,11 +502,11 @@ bool KPrEffectHandler::appearComeBottom( KPrObject *object )
 bool KPrEffectHandler::appearComeLeftTop( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int ox = objectRect.x();
     int oy = objectRect.y();
-    int xdiff = tqrepaintRect.x() - ox;
-    int ydiff = tqrepaintRect.y() - oy;
+    int xdiff = repaintRect.x() - ox;
+    int ydiff = repaintRect.y() - oy;
 
     bool positionReached = false;
     int x = m_effectStep * m_stepWidth - objectRect.width();
@@ -521,9 +521,9 @@ bool KPrEffectHandler::appearComeLeftTop( KPrObject *object )
     if ( x == ox && y == oy )
         positionReached = true;
 
-    tqrepaintRect.moveLeft( x + xdiff );
-    tqrepaintRect.moveTop( y + ydiff );
-    m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+    repaintRect.moveLeft( x + xdiff );
+    repaintRect.moveTop( y + ydiff );
+    m_repaintRects.append( new TQRect( repaintRect ) );
 
     //kdDebug(33001) << "KPrEffectHandler appearComeLeftTop x = " << x << ",y = " << y << " " <<  positionReached << endl;
     drawObject( object, x - ox, y - oy, &m_paint );
@@ -535,11 +535,11 @@ bool KPrEffectHandler::appearComeLeftTop( KPrObject *object )
 bool KPrEffectHandler::appearComeLeftBottom( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int ox = objectRect.x();
     int oy = objectRect.y();
-    int xdiff = tqrepaintRect.x() - ox;
-    int ydiff = tqrepaintRect.y() - oy;
+    int xdiff = repaintRect.x() - ox;
+    int ydiff = repaintRect.y() - oy;
 
     bool positionReached = false;
     int x = m_effectStep * m_stepWidth - objectRect.width();
@@ -554,9 +554,9 @@ bool KPrEffectHandler::appearComeLeftBottom( KPrObject *object )
     if ( x == ox && y == oy )
         positionReached = true;
 
-    tqrepaintRect.moveLeft( x + xdiff );
-    tqrepaintRect.moveTop( y + ydiff );
-    m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+    repaintRect.moveLeft( x + xdiff );
+    repaintRect.moveTop( y + ydiff );
+    m_repaintRects.append( new TQRect( repaintRect ) );
 
     //kdDebug(33001) << "KPrEffectHandler appearComeLeftBottom x = " << x << ",y = " << y << " " <<  positionReached << endl;
     drawObject( object, x - ox, y - oy, &m_paint );
@@ -568,11 +568,11 @@ bool KPrEffectHandler::appearComeLeftBottom( KPrObject *object )
 bool KPrEffectHandler::appearComeRightTop( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int ox = objectRect.x();
     int oy = objectRect.y();
-    int xdiff = tqrepaintRect.x() - ox;
-    int ydiff = tqrepaintRect.y() - oy;
+    int xdiff = repaintRect.x() - ox;
+    int ydiff = repaintRect.y() - oy;
 
     bool positionReached = false;
     int x = m_src->width() - m_effectStep * m_stepWidth;
@@ -587,9 +587,9 @@ bool KPrEffectHandler::appearComeRightTop( KPrObject *object )
     if ( x == ox && y == oy )
         positionReached = true;
 
-    tqrepaintRect.moveLeft( x + xdiff );
-    tqrepaintRect.moveTop( y + ydiff );
-    m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+    repaintRect.moveLeft( x + xdiff );
+    repaintRect.moveTop( y + ydiff );
+    m_repaintRects.append( new TQRect( repaintRect ) );
 
     //kdDebug(33001) << "KPrEffectHandler appearComeRightTop x = " << x << ",y = " << y << " " <<  positionReached << endl;
     drawObject( object, x - ox, y - oy, &m_paint );
@@ -601,11 +601,11 @@ bool KPrEffectHandler::appearComeRightTop( KPrObject *object )
 bool KPrEffectHandler::appearComeRightBottom( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int ox = objectRect.x();
     int oy = objectRect.y();
-    int xdiff = tqrepaintRect.x() - ox;
-    int ydiff = tqrepaintRect.y() - oy;
+    int xdiff = repaintRect.x() - ox;
+    int ydiff = repaintRect.y() - oy;
 
     bool positionReached = false;
     int x = m_src->width() - m_effectStep * m_stepWidth;
@@ -620,9 +620,9 @@ bool KPrEffectHandler::appearComeRightBottom( KPrObject *object )
     if ( x == ox && y == oy )
         positionReached = true;
 
-    tqrepaintRect.moveLeft( x + xdiff );
-    tqrepaintRect.moveTop( y + ydiff );
-    m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+    repaintRect.moveLeft( x + xdiff );
+    repaintRect.moveTop( y + ydiff );
+    m_repaintRects.append( new TQRect( repaintRect ) );
 
     //kdDebug(33001) << "KPrEffectHandler appearComeRightBottom x = " << x << ",y = " << y << " " <<  positionReached << endl;
     drawObject( object, x - ox, y - oy, &m_paint );
@@ -633,8 +633,8 @@ bool KPrEffectHandler::appearComeRightBottom( KPrObject *object )
 
 bool KPrEffectHandler::appearWipeLeft( KPrObject *object )
 {
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
-    int ow = tqrepaintRect.width();
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    int ow = repaintRect.width();
 
     bool positionReached = false;
     int w = m_effectStep * m_stepWidth;
@@ -644,17 +644,17 @@ bool KPrEffectHandler::appearWipeLeft( KPrObject *object )
         positionReached = true;
     }
 
-    tqrepaintRect.setWidth( w );
-    m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
-    drawObject( object, 0, 0, &m_paint, &tqrepaintRect );
+    repaintRect.setWidth( w );
+    m_repaintRects.append( new TQRect( repaintRect ) );
+    drawObject( object, 0, 0, &m_paint, &repaintRect );
     //kdDebug(33001) << "KPrEffectHandler appearWipeLeft w = " << w << positionReached << endl;
     return positionReached;
 }
 
 bool KPrEffectHandler::appearWipeRight( KPrObject *object )
 {
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
-    int ow = tqrepaintRect.width();
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    int ow = repaintRect.width();
 
     bool positionReached = false;
     int w = m_effectStep * m_stepWidth;
@@ -664,9 +664,9 @@ bool KPrEffectHandler::appearWipeRight( KPrObject *object )
         positionReached = true;
     }
 
-    tqrepaintRect.setLeft( tqrepaintRect.right() - w );
-    m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
-    drawObject( object, 0, 0, &m_paint, &tqrepaintRect );
+    repaintRect.setLeft( repaintRect.right() - w );
+    m_repaintRects.append( new TQRect( repaintRect ) );
+    drawObject( object, 0, 0, &m_paint, &repaintRect );
     //kdDebug(33001) << "KPrEffectHandler appearWipeLeft w = " << w << positionReached << endl;
     return positionReached;
 }
@@ -674,8 +674,8 @@ bool KPrEffectHandler::appearWipeRight( KPrObject *object )
 
 bool KPrEffectHandler::appearWipeTop( KPrObject *object )
 {
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
-    int oh = tqrepaintRect.height();
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    int oh = repaintRect.height();
 
     bool positionReached = false;
     int h = m_effectStep * m_stepHeight;
@@ -685,9 +685,9 @@ bool KPrEffectHandler::appearWipeTop( KPrObject *object )
         positionReached = true;
     }
 
-    tqrepaintRect.setHeight( h );
-    m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
-    drawObject( object, 0, 0, &m_paint, &tqrepaintRect );
+    repaintRect.setHeight( h );
+    m_repaintRects.append( new TQRect( repaintRect ) );
+    drawObject( object, 0, 0, &m_paint, &repaintRect );
     //kdDebug(33001) << "KPrEffectHandler appearWipeLeft h = " << h << positionReached << endl;
     return positionReached;
 }
@@ -695,8 +695,8 @@ bool KPrEffectHandler::appearWipeTop( KPrObject *object )
 
 bool KPrEffectHandler::appearWipeBottom( KPrObject *object )
 {
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
-    int oh = tqrepaintRect.height();
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    int oh = repaintRect.height();
 
     bool positionReached = false;
     int h = m_effectStep * m_stepHeight;
@@ -706,9 +706,9 @@ bool KPrEffectHandler::appearWipeBottom( KPrObject *object )
         positionReached = true;
     }
 
-    tqrepaintRect.setTop( tqrepaintRect.bottom() - h );
-    m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
-    drawObject( object, 0, 0, &m_paint, &tqrepaintRect );
+    repaintRect.setTop( repaintRect.bottom() - h );
+    m_repaintRects.append( new TQRect( repaintRect ) );
+    drawObject( object, 0, 0, &m_paint, &repaintRect );
     //kdDebug(33001) << "KPrEffectHandler appearWipeLeft h = " << h << positionReached << endl;
     return positionReached;
 }
@@ -717,7 +717,7 @@ bool KPrEffectHandler::appearWipeBottom( KPrObject *object )
 bool KPrEffectHandler::disappearGoLeft( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int ox = objectRect.x();
 
     bool positionReached = false;
@@ -728,8 +728,8 @@ bool KPrEffectHandler::disappearGoLeft( KPrObject *object )
     }
     else
     {
-        tqrepaintRect.moveBy( -x, 0 );
-        m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+        repaintRect.moveBy( -x, 0 );
+        m_repaintRects.append( new TQRect( repaintRect ) );
         //kdDebug(33001) << "KPrEffectHandler disappearGoLeft x = " << -x + ox << " " << positionReached << endl;
         drawObject( object, -x, 0, &m_paint );
     }
@@ -741,7 +741,7 @@ bool KPrEffectHandler::disappearGoLeft( KPrObject *object )
 bool KPrEffectHandler::disappearGoTop( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int oy = objectRect.y();
 
     bool positionReached = false;
@@ -752,8 +752,8 @@ bool KPrEffectHandler::disappearGoTop( KPrObject *object )
     }
     else
     {
-        tqrepaintRect.moveBy( 0, -y );
-        m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+        repaintRect.moveBy( 0, -y );
+        m_repaintRects.append( new TQRect( repaintRect ) );
         //kdDebug(33001) << "KPrEffectHandler disappearGoTop y = " << -y + oy << " " << positionReached << endl;
         drawObject( object, 0, -y, &m_paint );
     }
@@ -765,7 +765,7 @@ bool KPrEffectHandler::disappearGoTop( KPrObject *object )
 bool KPrEffectHandler::disappearGoRight( KPrObject *object )
 {
     int ox = m_view->zoomHandler()->zoomItX( object->getRealRect().x() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
 
     bool positionReached = false;
     int x = m_effectStep * m_stepWidth;
@@ -775,8 +775,8 @@ bool KPrEffectHandler::disappearGoRight( KPrObject *object )
     }
     else
     {
-        tqrepaintRect.moveBy( x, 0 );
-        m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+        repaintRect.moveBy( x, 0 );
+        m_repaintRects.append( new TQRect( repaintRect ) );
         //kdDebug(33001) << "KPrEffectHandler disappearGoRight x = " << x + ox << " " << positionReached << endl;
         drawObject( object, x, 0, &m_paint );
     }
@@ -788,7 +788,7 @@ bool KPrEffectHandler::disappearGoRight( KPrObject *object )
 bool KPrEffectHandler::disappearGoBottom( KPrObject *object )
 {
     int oy = m_view->zoomHandler()->zoomItY( object->getRealRect().y() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
 
     bool positionReached = false;
     int y = m_effectStep * m_stepHeight;
@@ -798,8 +798,8 @@ bool KPrEffectHandler::disappearGoBottom( KPrObject *object )
     }
     else
     {
-        tqrepaintRect.moveBy( 0, y );
-        m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+        repaintRect.moveBy( 0, y );
+        m_repaintRects.append( new TQRect( repaintRect ) );
         //kdDebug(33001) << "KPrEffectHandler disappearGoBottom y = " << y + oy << " " << positionReached << endl;
         drawObject( object, 0, y, &m_paint );
     }
@@ -811,7 +811,7 @@ bool KPrEffectHandler::disappearGoBottom( KPrObject *object )
 bool KPrEffectHandler::disappearGoLeftTop( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int ox = objectRect.x();
     int oy = objectRect.y();
 
@@ -824,8 +824,8 @@ bool KPrEffectHandler::disappearGoLeftTop( KPrObject *object )
     }
     else
     {
-        tqrepaintRect.moveBy( -x, -y );
-        m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+        repaintRect.moveBy( -x, -y );
+        m_repaintRects.append( new TQRect( repaintRect ) );
         //kdDebug(33001) << "KPrEffectHandler disappearGoLeftTop x = " << -x + ox << ", y = " << -y + oy << positionReached << endl;
         drawObject( object, -x, -y, &m_paint );
     }
@@ -837,7 +837,7 @@ bool KPrEffectHandler::disappearGoLeftTop( KPrObject *object )
 bool KPrEffectHandler::disappearGoLeftBottom( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int ox = objectRect.x();
     int oy = objectRect.y();
 
@@ -850,8 +850,8 @@ bool KPrEffectHandler::disappearGoLeftBottom( KPrObject *object )
     }
     else
     {
-        tqrepaintRect.moveBy( -x, y );
-        m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+        repaintRect.moveBy( -x, y );
+        m_repaintRects.append( new TQRect( repaintRect ) );
         //kdDebug(33001) << "KPrEffectHandler disappearGoLeftTop x = " << -x + ox << ", y = " << y + oy << positionReached << endl;
         drawObject( object, -x, y, &m_paint );
     }
@@ -863,7 +863,7 @@ bool KPrEffectHandler::disappearGoLeftBottom( KPrObject *object )
 bool KPrEffectHandler::disappearGoRightTop( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int ox = objectRect.x();
     int oy = objectRect.y();
 
@@ -876,8 +876,8 @@ bool KPrEffectHandler::disappearGoRightTop( KPrObject *object )
     }
     else
     {
-        tqrepaintRect.moveBy( x, -y );
-        m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+        repaintRect.moveBy( x, -y );
+        m_repaintRects.append( new TQRect( repaintRect ) );
         //kdDebug(33001) << "KPrEffectHandler disappearGoLeftTop x = " << x + ox << ", y = " << -y + oy << positionReached << endl;
         drawObject( object, x, -y, &m_paint );
     }
@@ -889,7 +889,7 @@ bool KPrEffectHandler::disappearGoRightTop( KPrObject *object )
 bool KPrEffectHandler::disappearGoRightBottom( KPrObject *object )
 {
     TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() );
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
     int ox = objectRect.x();
     int oy = objectRect.y();
 
@@ -902,8 +902,8 @@ bool KPrEffectHandler::disappearGoRightBottom( KPrObject *object )
     }
     else
     {
-        tqrepaintRect.moveBy( x, y );
-        m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
+        repaintRect.moveBy( x, y );
+        m_repaintRects.append( new TQRect( repaintRect ) );
         //kdDebug(33001) << "KPrEffectHandler disappearGoLeftTop x = " << x + ox << ", y = " << y + oy << positionReached << endl;
         drawObject( object, x, y, &m_paint );
     }
@@ -914,8 +914,8 @@ bool KPrEffectHandler::disappearGoRightBottom( KPrObject *object )
 
 bool KPrEffectHandler::disappearWipeLeft( KPrObject *object )
 {
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
-    int ow = tqrepaintRect.width();
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    int ow = repaintRect.width();
 
     bool positionReached = false;
     int w = ow - m_effectStep * m_stepWidth;
@@ -925,9 +925,9 @@ bool KPrEffectHandler::disappearWipeLeft( KPrObject *object )
     }
     else
     {
-        tqrepaintRect.setWidth( w );
-        m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
-        drawObject( object, 0, 0, &m_paint, &tqrepaintRect );
+        repaintRect.setWidth( w );
+        m_repaintRects.append( new TQRect( repaintRect ) );
+        drawObject( object, 0, 0, &m_paint, &repaintRect );
         //kdDebug(33001) << "KPrEffectHandler appearWipeLeft w = " << w << positionReached << endl;
     }
     return positionReached;
@@ -936,8 +936,8 @@ bool KPrEffectHandler::disappearWipeLeft( KPrObject *object )
 
 bool KPrEffectHandler::disappearWipeRight( KPrObject *object )
 {
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
-    int ow = tqrepaintRect.width();
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    int ow = repaintRect.width();
 
     bool positionReached = false;
     int w = ow - m_effectStep * m_stepWidth;
@@ -947,9 +947,9 @@ bool KPrEffectHandler::disappearWipeRight( KPrObject *object )
     }
     else
     {
-        tqrepaintRect.setLeft( tqrepaintRect.right() - w );
-        m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
-        drawObject( object, 0, 0, &m_paint, &tqrepaintRect );
+        repaintRect.setLeft( repaintRect.right() - w );
+        m_repaintRects.append( new TQRect( repaintRect ) );
+        drawObject( object, 0, 0, &m_paint, &repaintRect );
         //kdDebug(33001) << "KPrEffectHandler appearWipeLeft w = " << w << positionReached << endl;
     }
     return positionReached;
@@ -958,8 +958,8 @@ bool KPrEffectHandler::disappearWipeRight( KPrObject *object )
 
 bool KPrEffectHandler::disappearWipeTop( KPrObject *object )
 {
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
-    int oh = tqrepaintRect.height();
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    int oh = repaintRect.height();
 
     bool positionReached = false;
     int h = oh - m_effectStep * m_stepHeight;
@@ -969,9 +969,9 @@ bool KPrEffectHandler::disappearWipeTop( KPrObject *object )
     }
     else
     {
-        tqrepaintRect.setHeight( h );
-        m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
-        drawObject( object, 0, 0, &m_paint, &tqrepaintRect );
+        repaintRect.setHeight( h );
+        m_repaintRects.append( new TQRect( repaintRect ) );
+        drawObject( object, 0, 0, &m_paint, &repaintRect );
         //kdDebug(33001) << "KPrEffectHandler appearWipeLeft h = " << h << positionReached << endl;
     }
     return positionReached;
@@ -980,8 +980,8 @@ bool KPrEffectHandler::disappearWipeTop( KPrObject *object )
 
 bool KPrEffectHandler::disappearWipeBottom( KPrObject *object )
 {
-    TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
-    int oh = tqrepaintRect.height();
+    TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() );
+    int oh = repaintRect.height();
 
     bool positionReached = false;
     int h = oh - m_effectStep * m_stepHeight;
@@ -991,9 +991,9 @@ bool KPrEffectHandler::disappearWipeBottom( KPrObject *object )
     }
     else
     {
-        tqrepaintRect.setTop( tqrepaintRect.bottom() - h );
-        m_tqrepaintRects.append( new TQRect( tqrepaintRect ) );
-        drawObject( object, 0, 0, &m_paint, &tqrepaintRect );
+        repaintRect.setTop( repaintRect.bottom() - h );
+        m_repaintRects.append( new TQRect( repaintRect ) );
+        drawObject( object, 0, 0, &m_paint, &repaintRect );
         //kdDebug(33001) << "KPrEffectHandler appearWipeLeft h = " << h << positionReached << endl;
     }
     return positionReached;
@@ -1035,7 +1035,7 @@ void KPrEffectHandler::drawObject( KPrObject *object, int x, int y, TQPixmap *sc
         if ( ( obj->getAppearStep() < m_step.m_step
             || obj->getAppearStep() == m_step.m_step && !m_appearEffectObjects.tqcontainsRef( obj ) )
             && ( ( obj->getDisappear() && obj->getDisappearStep() > m_step.m_step ) || ! obj->getDisappear() )
-            && m_view->zoomHandler()->zoomRect( obj->getRealRect()).intersects(*m_tqrepaintRects.getLast()) )
+            && m_view->zoomHandler()->zoomRect( obj->getRealRect()).intersects(*m_repaintRects.getLast()) )
         {
             if ( obj->getAppearStep() == m_step.m_step && ! m_back )
             {
diff --git a/kpresenter/KPrEffectHandler.h b/kpresenter/KPrEffectHandler.h
index 877ed2f0b..0b383e06f 100644
--- a/kpresenter/KPrEffectHandler.h
+++ b/kpresenter/KPrEffectHandler.h
@@ -322,7 +322,7 @@ protected:
   /**
    * The rects which have to be bitblt
    */
-  TQPtrList<TQRect> m_tqrepaintRects;
+  TQPtrList<TQRect> m_repaintRects;
 
   /**
    * The rects which have to be bitblt as the objects
diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h
index ce5b37c52..598373ea3 100644
--- a/kpresenter/KPrObject.h
+++ b/kpresenter/KPrObject.h
@@ -188,7 +188,7 @@ public:
     virtual KoPoint getRealOrig() const;
     KoRect getRealRect() const;
     /**
-     * @brief Get the rect which has to be tqrepainted
+     * @brief Get the rect which has to be repainted
      *
      * This also contains the shadow. 
      */
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp
index 2fbbbaa24..b357ded97 100644
--- a/kpresenter/KPrPage.cpp
+++ b/kpresenter/KPrPage.cpp
@@ -2202,7 +2202,7 @@ KCommand *KPrPage::moveObject(KPrView *m_view,const KoPoint &_move,bool key)
     return moveByCmd;
 }
 
-void KPrPage::tqrepaintObj()
+void KPrPage::repaintObj()
 {
     TQPtrListIterator<KPrObject> it( m_objectList );
     for ( ; it.current() ; ++it )
diff --git a/kpresenter/KPrPage.h b/kpresenter/KPrPage.h
index 03953df97..431a3662d 100644
--- a/kpresenter/KPrPage.h
+++ b/kpresenter/KPrPage.h
@@ -503,7 +503,7 @@ public:
     TQPtrList<KoTextObject> allTextObjects() const;
     void addTextObjects(TQPtrList<KoTextObject>& lst) const;
 
-    void tqrepaintObj();
+    void repaintObj();
 
     KPrObject * getCursor(const TQPoint &pos );
     KPrObject * getCursor(const KoPoint &pos );
diff --git a/kpresenter/KPrPageEffects.cpp b/kpresenter/KPrPageEffects.cpp
index a8192edbf..a7c3093b6 100644
--- a/kpresenter/KPrPageEffects.cpp
+++ b/kpresenter/KPrPageEffects.cpp
@@ -436,15 +436,15 @@ bool KPrPageEffects::effectSurround1() const
 
     int h = m_height / 10;
     int w = m_width / 10;
-    int tqrepaint_h = h;
-    int tqrepaint_w = w;
+    int repaint_h = h;
+    int repaint_w = w;
 
     bool finished = false;
     bool tqrepaint= false;
     int rh = 0;
     int rw = 0;
-    int tqrepaint_rh = 0;
-    int tqrepaint_rw = 0;
+    int repaint_rh = 0;
+    int repaint_rw = 0;
 
     // 1
     if ( step < m_height )
@@ -456,9 +456,9 @@ bool KPrPageEffects::effectSurround1() const
         {
             tqrepaint = true;
 
-            tqrepaint_rh = m_height - tqrepaint_h;
-            tqrepaint_rw = step - m_height + tqrepaint_w;
-            tqrepaint_w = stepSize;
+            repaint_rh = m_height - repaint_h;
+            repaint_rw = step - m_height + repaint_w;
+            repaint_w = stepSize;
         }
     }
     // 2
@@ -467,13 +467,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = m_height - h;
         rw = step - m_height + w;
         w = stepSize;
-        if ( step + stepSize >= m_height + m_width - tqrepaint_w )
+        if ( step + stepSize >= m_height + m_width - repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = m_height - ( step - m_height + tqrepaint_h - m_width + tqrepaint_w + stepSize );
-            tqrepaint_rw = m_width - tqrepaint_w;
-            tqrepaint_h = stepSize;
+            repaint_rh = m_height - ( step - m_height + repaint_h - m_width + repaint_w + stepSize );
+            repaint_rw = m_width - repaint_w;
+            repaint_h = stepSize;
         }
     }
     // 3
@@ -482,13 +482,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = m_height - ( step - m_height + h - m_width + w + stepSize );
         rw = m_width - w;
         h = stepSize;
-        if ( step + stepSize >=  2 * m_height - tqrepaint_h + m_width - tqrepaint_w )
+        if ( step + stepSize >=  2 * m_height - repaint_h + m_width - repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = 0;
-            tqrepaint_rw = m_width - ( step - 2 * m_height + tqrepaint_h - m_width + 2 * tqrepaint_w + stepSize );
-            tqrepaint_w = stepSize;
+            repaint_rh = 0;
+            repaint_rw = m_width - ( step - 2 * m_height + repaint_h - m_width + 2 * repaint_w + stepSize );
+            repaint_w = stepSize;
         }
     }
     // 4
@@ -497,13 +497,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = 0;
         rw = m_width - ( step - 2 * m_height + h - m_width + 2 * w + stepSize );
         w = stepSize;
-        if ( step + stepSize >= 2 * m_height - tqrepaint_h + 2 * m_width - 3 * tqrepaint_w )
+        if ( step + stepSize >= 2 * m_height - repaint_h + 2 * m_width - 3 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = step - 2 * m_height + 2 * tqrepaint_h - 2 * m_width + 3 * tqrepaint_w;
-            tqrepaint_rw = tqrepaint_w;
-            tqrepaint_h = stepSize;
+            repaint_rh = step - 2 * m_height + 2 * repaint_h - 2 * m_width + 3 * repaint_w;
+            repaint_rw = repaint_w;
+            repaint_h = stepSize;
         }
     }
     // 5
@@ -512,13 +512,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = step - 2 * m_height + 2 * h - 2 * m_width + 3 * w;
         rw = w;
         h = stepSize;
-        if ( step + stepSize >=  3 * m_height - 3 * tqrepaint_h + 2 * m_width - 3 * tqrepaint_w )
+        if ( step + stepSize >=  3 * m_height - 3 * repaint_h + 2 * m_width - 3 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = m_height - 2 * tqrepaint_h;
-            tqrepaint_rw = step - 3 * m_height + 3 * tqrepaint_h - 2 * m_width + 5 * tqrepaint_w;
-            tqrepaint_w = stepSize;
+            repaint_rh = m_height - 2 * repaint_h;
+            repaint_rw = step - 3 * m_height + 3 * repaint_h - 2 * m_width + 5 * repaint_w;
+            repaint_w = stepSize;
         }
     }
     // 6
@@ -527,13 +527,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = m_height - 2 * h;
         rw = step - 3 * m_height + 3 * h - 2 * m_width + 5 * w;
         w = stepSize;
-        if ( step + stepSize >= 3 * m_height - 3 * tqrepaint_h + 3 * m_width - 6 * tqrepaint_w )
+        if ( step + stepSize >= 3 * m_height - 3 * repaint_h + 3 * m_width - 6 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = m_height - ( step - 3 * m_height + 5 * tqrepaint_h - 3 * m_width + 6 * tqrepaint_w + stepSize );
-            tqrepaint_rw = m_width - 2 * tqrepaint_w;
-            tqrepaint_h = stepSize;
+            repaint_rh = m_height - ( step - 3 * m_height + 5 * repaint_h - 3 * m_width + 6 * repaint_w + stepSize );
+            repaint_rw = m_width - 2 * repaint_w;
+            repaint_h = stepSize;
         }
     }
     // 7
@@ -542,13 +542,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = m_height - ( step - 3 * m_height + 5 * h - 3 * m_width + 6 * w + stepSize );
         rw = m_width - 2 * w;
         h = stepSize;
-        if ( step + stepSize >= 4 * m_height - 6 * tqrepaint_h + 3 * m_width - 6 * tqrepaint_w )
+        if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 3 * m_width - 6 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = tqrepaint_h;
-            tqrepaint_rw = m_width - ( step - 4 * m_height + 6 * tqrepaint_h - 3 * m_width + 8 * tqrepaint_w + stepSize );
-            tqrepaint_w = stepSize;
+            repaint_rh = repaint_h;
+            repaint_rw = m_width - ( step - 4 * m_height + 6 * repaint_h - 3 * m_width + 8 * repaint_w + stepSize );
+            repaint_w = stepSize;
         }
     }
     // 8
@@ -557,13 +557,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = h;
         rw = m_width - ( step - 4 * m_height + 6 * h - 3 * m_width + 8 * w + stepSize );
         w = stepSize;
-        if ( step + stepSize >= 4 * m_height - 6 * tqrepaint_h + 4 * m_width - 10 * tqrepaint_w )
+        if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 4 * m_width - 10 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = step - 4 * m_height + 8 * tqrepaint_h - 4 * m_width + 10 * tqrepaint_w;
-            tqrepaint_rw = 2 * tqrepaint_w;
-            tqrepaint_h = stepSize;
+            repaint_rh = step - 4 * m_height + 8 * repaint_h - 4 * m_width + 10 * repaint_w;
+            repaint_rw = 2 * repaint_w;
+            repaint_h = stepSize;
         }
     }
     // 9
@@ -572,13 +572,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = step - 4 * m_height + 8 * h - 4 * m_width + 10 * w;
         rw = 2 * w;
         h = stepSize;
-        if ( step + stepSize >= 5 * m_height - 10 * tqrepaint_h + 4 * m_width - 10 * tqrepaint_w )
+        if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 4 * m_width - 10 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = m_height - 3 * tqrepaint_h;
-            tqrepaint_rw = step - 5 * m_height + 10 * tqrepaint_h - 4 * m_width + 13 * tqrepaint_w;
-            tqrepaint_w = stepSize;
+            repaint_rh = m_height - 3 * repaint_h;
+            repaint_rw = step - 5 * m_height + 10 * repaint_h - 4 * m_width + 13 * repaint_w;
+            repaint_w = stepSize;
         }
     }
     // 10
@@ -587,13 +587,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = m_height - 3 * h;
         rw = step - 5 * m_height + 10 * h - 4 * m_width + 13 * w;
         w = stepSize;
-        if ( step + stepSize >= 5 * m_height - 10 * tqrepaint_h + 5 * m_width - 15 * tqrepaint_w )
+        if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 5 * m_width - 15 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = m_height - ( step - 5 * m_height + 13 * tqrepaint_h - 5 * m_width + 15 * tqrepaint_w + stepSize );
-            tqrepaint_rw = m_width - 3 * tqrepaint_w;
-            tqrepaint_h = stepSize;
+            repaint_rh = m_height - ( step - 5 * m_height + 13 * repaint_h - 5 * m_width + 15 * repaint_w + stepSize );
+            repaint_rw = m_width - 3 * repaint_w;
+            repaint_h = stepSize;
         }
     }
     // 11
@@ -602,13 +602,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = m_height - ( step - 5 * m_height + 13 * h - 5 * m_width + 15 * w + stepSize );
         rw = m_width - 3 * w;
         h = stepSize;
-        if ( step + stepSize >= 6 * m_height - 15 * tqrepaint_h + 5 * m_width - 15 * tqrepaint_w )
+        if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 5 * m_width - 15 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = 2 * tqrepaint_h;
-            tqrepaint_rw = m_width - ( step - 6 * m_height + 15 * tqrepaint_h - 5 * m_width + 18 * tqrepaint_w + stepSize );
-            tqrepaint_w = stepSize;
+            repaint_rh = 2 * repaint_h;
+            repaint_rw = m_width - ( step - 6 * m_height + 15 * repaint_h - 5 * m_width + 18 * repaint_w + stepSize );
+            repaint_w = stepSize;
         }
     }
     // 12
@@ -617,13 +617,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = 2 * h;
         rw = m_width - ( step - 6 * m_height + 15 * h - 5 * m_width + 18 * w + stepSize );
         w = stepSize;
-        if ( step + stepSize >= 6 * m_height - 15 * tqrepaint_h + 6 * m_width - 21 * tqrepaint_w )
+        if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 6 * m_width - 21 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = step - 6 * m_height + 18 * tqrepaint_h - 6 * m_width + 21 * tqrepaint_w;
-            tqrepaint_rw = 3 * tqrepaint_w;
-            tqrepaint_h = stepSize;
+            repaint_rh = step - 6 * m_height + 18 * repaint_h - 6 * m_width + 21 * repaint_w;
+            repaint_rw = 3 * repaint_w;
+            repaint_h = stepSize;
         }
     }
     // 13
@@ -632,13 +632,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = step - 6 * m_height + 18 * h - 6 * m_width + 21 * w;
         rw = 3 * w;
         h = stepSize;
-        if ( step + stepSize >= 7 * m_height - 21 * tqrepaint_h + 6 * m_width - 21 * tqrepaint_w )
+        if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 6 * m_width - 21 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = m_height - 4 * tqrepaint_h;
-            tqrepaint_rw = step - 7 * m_height + 21 * tqrepaint_h - 6 * m_width + 25 * tqrepaint_w;
-            tqrepaint_w = stepSize;
+            repaint_rh = m_height - 4 * repaint_h;
+            repaint_rw = step - 7 * m_height + 21 * repaint_h - 6 * m_width + 25 * repaint_w;
+            repaint_w = stepSize;
         }
     }
     // 14
@@ -647,13 +647,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = m_height - 4 * h;
         rw = step - 7 * m_height + 21 * h - 6 * m_width + 25 * w;
         w = stepSize;
-        if ( step + stepSize >= 7 * m_height - 21 * tqrepaint_h + 7 * m_width - 28 * tqrepaint_w )
+        if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 7 * m_width - 28 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = m_height - ( step - 7 * m_height + 25 * tqrepaint_h - 7 * m_width + 28 * tqrepaint_w + stepSize );
-            tqrepaint_rw = m_width - 4 * tqrepaint_w;
-            tqrepaint_h = stepSize;
+            repaint_rh = m_height - ( step - 7 * m_height + 25 * repaint_h - 7 * m_width + 28 * repaint_w + stepSize );
+            repaint_rw = m_width - 4 * repaint_w;
+            repaint_h = stepSize;
         }
     }
     // 15
@@ -662,13 +662,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = m_height - ( step - 7 * m_height + 25 * h - 7 * m_width + 28 * w + stepSize );
         rw = m_width - 4 * w;
         h = stepSize;
-        if ( step + stepSize >= 8 * m_height - 28 * tqrepaint_h + 7 * m_width - 28 * tqrepaint_w )
+        if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 7 * m_width - 28 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = 3 * tqrepaint_h;
-            tqrepaint_rw = m_width - ( step - 8 * m_height + 28 * tqrepaint_h - 7 * m_width + 32 * tqrepaint_w + stepSize );
-            tqrepaint_w = stepSize;
+            repaint_rh = 3 * repaint_h;
+            repaint_rw = m_width - ( step - 8 * m_height + 28 * repaint_h - 7 * m_width + 32 * repaint_w + stepSize );
+            repaint_w = stepSize;
         }
     }
     // 16
@@ -677,13 +677,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = 3 * h;
         rw = m_width - ( step - 8 * m_height + 28 * h - 7 * m_width + 32 * w + stepSize );
         w = stepSize;
-        if ( step + stepSize >= 8 * m_height - 28 * tqrepaint_h + 8 * m_width - 36 * tqrepaint_w )
+        if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 8 * m_width - 36 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = step - 8 * m_height + 32 * tqrepaint_h - 8 * m_width + 36 * tqrepaint_w;
-            tqrepaint_rw = 4 * tqrepaint_w;
-            tqrepaint_h = stepSize;
+            repaint_rh = step - 8 * m_height + 32 * repaint_h - 8 * m_width + 36 * repaint_w;
+            repaint_rw = 4 * repaint_w;
+            repaint_h = stepSize;
         }
     }
     // 17
@@ -692,13 +692,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = step - 8 * m_height + 32 * h - 8 * m_width + 36 * w;
         rw = 4 * w;
         h = stepSize;
-        if ( step + stepSize >= 9 * m_height - 36 * tqrepaint_h + 8 * m_width - 36 * tqrepaint_w )
+        if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 8 * m_width - 36 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = m_height - 5 * tqrepaint_h;
-            tqrepaint_rw = step - 9 * m_height + 36 * tqrepaint_h - 8 * m_width + 41 * tqrepaint_w;
-            tqrepaint_w = stepSize;
+            repaint_rh = m_height - 5 * repaint_h;
+            repaint_rw = step - 9 * m_height + 36 * repaint_h - 8 * m_width + 41 * repaint_w;
+            repaint_w = stepSize;
         }
     }
     // 18
@@ -707,13 +707,13 @@ bool KPrPageEffects::effectSurround1() const
         rh = m_height - 5 * h;
         rw = step - 9 * m_height + 36 * h - 8 * m_width + 41 * w;
         w = stepSize;
-        if ( step + stepSize >= 9 * m_height - 36 * tqrepaint_h + 9 * m_width - 45 * tqrepaint_w )
+        if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 9 * m_width - 45 * repaint_w )
         {
             tqrepaint = true;
 
-            tqrepaint_rh = m_height - ( step - 9 * m_height + 41 * tqrepaint_h - 9 * m_width + 45 * tqrepaint_w + stepSize );
-            tqrepaint_rw = m_width - 5 * tqrepaint_w;
-            tqrepaint_h = stepSize;
+            repaint_rh = m_height - ( step - 9 * m_height + 41 * repaint_h - 9 * m_width + 45 * repaint_w + stepSize );
+            repaint_rw = m_width - 5 * repaint_w;
+            repaint_h = stepSize;
         }
     }
     // 19
@@ -739,7 +739,7 @@ bool KPrPageEffects::effectSurround1() const
 
     if ( tqrepaint )
     {
-        bitBlt( m_dst, tqrepaint_rw, tqrepaint_rh, &m_pageTo, tqrepaint_rw, tqrepaint_rh, tqrepaint_w, tqrepaint_h );
+        bitBlt( m_dst, repaint_rw, repaint_rh, &m_pageTo, repaint_rw, repaint_rh, repaint_w, repaint_h );
     }
 
     return finished;
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 90b3c66f5..4d1a94c4a 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -136,11 +136,11 @@ KPrTextObject::KPrTextObject(  KPrDocument *doc )
              TQT_SLOT( slotNewCommand( KCommand * ) ) );
     connect( m_textobj, TQT_SIGNAL( availableHeightNeeded() ),
              TQT_SLOT( slotAvailableHeightNeeded() ) );
-    connect( m_textobj, TQT_SIGNAL( tqrepaintChanged( KoTextObject* ) ),
+    connect( m_textobj, TQT_SIGNAL( repaintChanged( KoTextObject* ) ),
              TQT_SLOT( slotRepaintChanged() ) );
 
-    // Send our "tqrepaintChanged" signals to the document.
-    connect( this, TQT_SIGNAL( tqrepaintChanged( KPrTextObject * ) ),
+    // Send our "repaintChanged" signals to the document.
+    connect( this, TQT_SIGNAL( repaintChanged( KPrTextObject * ) ),
              m_doc, TQT_SLOT( slotRepaintChanged( KPrTextObject * ) ) );
     connect(m_textobj, TQT_SIGNAL( showFormatObject(const KoTextFormat &) ),
             TQT_SLOT( slotFormatChanged(const KoTextFormat &)) );
@@ -1296,7 +1296,7 @@ void KPrTextObject::recalcPageNum( KPrPage *page )
 void KPrTextObject::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 );
 }
 
@@ -1441,7 +1441,7 @@ void KPrTextObject::slotAvailableHeightNeeded()
 
 void KPrTextObject::slotRepaintChanged()
 {
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
 }
 
 KPrTextView * KPrTextObject::createKPTextView( KPrCanvas * _canvas, bool temp )
@@ -1518,7 +1518,7 @@ KCommand * KPrTextObject::pasteOasis( KoTextCursor * cursor, const TQByteArray &
     *cursor = *( cmd->execute( cursor ) );
 
     m_textobj->formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     m_textobj->emitEnsureCursorVisible();
     m_textobj->emitUpdateUI( true );
     m_textobj->emitShowCursor();
diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h
index a85b2e8a3..141062d16 100644
--- a/kpresenter/KPrTextObject.h
+++ b/kpresenter/KPrTextObject.h
@@ -176,7 +176,7 @@ public:
     TQPoint viewToInternal( const TQPoint & pos, KPrCanvas* canvas ) const;
 
 signals:
-    void tqrepaintChanged( KPrTextObject* );
+    void repaintChanged( KPrTextObject* );
 
 protected slots:
     void slotFormatChanged(const KoTextFormat &);
diff --git a/kspread/DESIGN.html b/kspread/DESIGN.html
index 2358c3c2b..586c9d687 100644
--- a/kspread/DESIGN.html
+++ b/kspread/DESIGN.html
@@ -184,7 +184,7 @@ recursive dependency calculation at almost no cost.</p>
 <p>tqStatus: PLANNED.</p>
 
 <p>Currently, every operation on a cell or on a range of cells is quite complex.
-You need to ensure correct tqrepainting, recalculation, iterate on a range and so on.</p>
+You need to ensure correct repainting, recalculation, iterate on a range and so on.</p>
 
 <p>To address this issue, manipulators shall be implemented. A manipulator will
 implement one operation (formatting change, sequence fill, ..., ...).</p>
@@ -230,7 +230,7 @@ because thanks to manipulators, each operation will automatically support these.
 <p>tqStatus: PLANNED</p>
 
 <p>As mentioned above, the interface between the core and the GUI needs to be kept
-at minimum. Also, the number of tqrepaints needs to be as low as possible, and tqrepaints
+at minimum. Also, the number of repaints needs to be as low as possible, and repaints
 should be groupped whenever possible. To achieve all this, the following approach
 can be used:</p>
 
@@ -246,8 +246,8 @@ methods - disableUpdates(), enableUpdates(), rangeListChanged() and
 rangeListFormattingChanged(). All these will be used (solely?) by manipulators,
 preferably by the base manipulator class, so that we don't have to call these
 functions in each operation. After a call to disableUpdates(), there will
-be no tqrepainting and no dependency calculation. Note that a call to
-enableUpdates() won't cause any tqrepaints either, as the sheet cannot remember
+be no repainting and no dependency calculation. Note that a call to
+enableUpdates() won't cause any repaints either, as the sheet cannot remember
 all the calls (due to loss of range information). Hence, the base manipulator
 class needs to call the correct rangeList*Changed method to trigger an
 update in an effective way. The base manipulator needs to be configurable by
diff --git a/kspread/doc/PAINTING.html b/kspread/doc/PAINTING.html
index 58bd1ed5b..d3c739a81 100644
--- a/kspread/doc/PAINTING.html
+++ b/kspread/doc/PAINTING.html
@@ -16,7 +16,7 @@ supposed to work. At present, it is not a complete description.</p>
 <h2>General</h2>
 
 <p>Painting is started by KSpreadCanvas::paintUpdates().  This method
-calls paintCell() on all visible cells, i.e. it always tqrepaints the
+calls paintCell() on all visible cells, i.e. it always repaints the
 entire sheet.  This is inefficient, but is OK for most circumstances.
 There is a bug in bugzilla (#xxxx) which points this out.</p>
 
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc
index d3cd81996..84c84fca0 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cc
@@ -2157,7 +2157,7 @@ void Canvas::processEscapeKey(TQKeyEvent * event)
 
         activeSheet()->setRegionPaintDirty( oldBoundingRect );
         tqrepaint( oldBoundingRect );
-        tqrepaintObject( d->m_resizeObject );
+        repaintObject( d->m_resizeObject );
         d->m_ratio = 0.0;
         d->m_resizeObject = 0;
         d->m_isResizing = false;
@@ -3307,7 +3307,7 @@ void Canvas::selectObject( EmbeddedObject *obj )
   if ( obj->sheet() != activeSheet() || obj->isSelected() )
     return;
   obj->setSelected( true );
-  tqrepaintObject( obj );
+  repaintObject( obj );
 
   d->mouseSelectedObject = true;
   emit objectSelectedChanged();
@@ -3319,7 +3319,7 @@ void Canvas::deselectObject( EmbeddedObject *obj )
   if ( obj->sheet() != activeSheet() || !obj->isSelected() )
     return;
   obj->setSelected( false );
-  tqrepaintObject( obj );
+  repaintObject( obj );
 
   d->mouseSelectedObject = false;
   emit objectSelectedChanged();
@@ -3572,11 +3572,11 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep
 //       {
 //         sp.setY( rect.bottom() );
 //       }
-//       m_gl.tqrepaintSnapping( sp, snaptqStatus );
+//       m_gl.repaintSnapping( sp, snaptqStatus );
 //     }
 
     tqrepaint( oldBoundingRect );
-    tqrepaintObject( obj );
+    repaintObject( obj );
     emit objectSizeChanged();
   }
 }
@@ -3603,7 +3603,7 @@ void Canvas::finishResizeObject( const TQString &/*name*/, bool /*tqlayout*/ )
 
     d->m_ratio = 0.0;
     d->m_isResizing = false;
-    tqrepaintObject( d->m_resizeObject );
+    repaintObject( d->m_resizeObject );
     d->m_resizeObject = NULL;
   }
 }
@@ -3817,7 +3817,7 @@ bool Canvas::createEditor( EditorType ed, bool addFocus, bool captureArrowKeys )
   return true;
 }
 
-void Canvas::tqrepaintObject( EmbeddedObject *obj )
+void Canvas::repaintObject( EmbeddedObject *obj )
 {
 	//Calculate where the object appears on the canvas widget and then tqrepaint that part of the widget
 	TQRect canvasRelativeGeometry = doc()->zoomRect( obj->tqgeometry() );
diff --git a/kspread/kspread_canvas.h b/kspread/kspread_canvas.h
index ce18e157b..f5aa67469 100644
--- a/kspread/kspread_canvas.h
+++ b/kspread/kspread_canvas.h
@@ -354,7 +354,7 @@ public:
 
     KoRect objectRect( bool all ) const;
 
-    void tqrepaintObject( EmbeddedObject *obj );
+    void repaintObject( EmbeddedObject *obj );
 
     /**
      * This is intended to copy the selected objects to the clipboard so that they can be pasted into other
@@ -557,7 +557,7 @@ private:
    * This function sets the paint dirty flag for a @p changedRegion in a
    * @p sheet .
    * The calculation which cells really should look different with the new
-   * selection rather than tqrepainting the entire area has to be done before.
+   * selection rather than repainting the entire area has to be done before.
    * @param sheet the sheet, which contains the cells
    * @param changedRegion the cell region to be set as dirty
    */
diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc
index d71e01853..9314d220e 100644
--- a/kspread/kspread_cell.cc
+++ b/kspread/kspread_cell.cc
@@ -2535,7 +2535,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
   TQRect zoomedCellRect = sheet()->doc()->zoomRect( cellRect );
 
   //The highlight rect is just inside the main cell rect
-  //This saves the hassle of tqrepainting nearby cells when the highlight is changed as the highlight areas
+  //This saves the hassle of repainting nearby cells when the highlight is changed as the highlight areas
   //do not overlap
   zoomedCellRect.setLeft(zoomedCellRect.left()+1);
   //zoomedCellRect.setRight(zoomedCellRect.right()-1);
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc
index 825808b8e..6a40cbd96 100644
--- a/kspread/kspread_doc.cc
+++ b/kspread/kspread_doc.cc
@@ -205,7 +205,7 @@ Doc::Doc( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent,
 
   d->dcop = 0;
   d->isLoading = false;
-  d->numOperations = 1; // don't start tqrepainting before the GUI is done...
+  d->numOperations = 1; // don't start repainting before the GUI is done...
 
   d->undoLocked = 0;
   d->commandHistory = new KoCommandHistory( actionCollection() );
@@ -2400,7 +2400,7 @@ void Doc::tqrepaint( EmbeddedObject *obj )
   {
     Canvas* canvas = ((View*)it.current())->canvasWidget();
     if ( obj->sheet() == canvas->activeSheet() )
-        canvas->tqrepaintObject( obj );
+        canvas->repaintObject( obj );
   }
 }
 
diff --git a/kspread/kspread_doc.h b/kspread/kspread_doc.h
index f4cca795a..57f95d8e8 100644
--- a/kspread/kspread_doc.h
+++ b/kspread/kspread_doc.h
@@ -547,7 +547,7 @@ public:
    * - No cell calculation will be done (maybe there are exceptions, such
    *   as the goalseek operation needs to calculate values)
    * During an operation, calls to Sheet::setRegionPaintDirty mark
-   * regions as needing tqrepainted.  Once the emitEndOperation function is
+   * regions as needing repainted.  Once the emitEndOperation function is
    * called, those regions will be painted all at once, values being calculated
    * as necessary.
    * Calls to begin/endOperation may be nested.  Calcualation/painting will
diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc
index ca69af156..703231246 100644
--- a/kspread/kspread_sheet.cc
+++ b/kspread/kspread_sheet.cc
@@ -6155,7 +6155,7 @@ KCommand *Sheet::moveObject(View *_view, double diffx, double diffy)
             br.moveBy( doc()->zoomItX( diffx ), doc()->zoomItY( diffy ) );
             br.moveBy( doc()->zoomItX( -canvas->xOffset() ), doc()->zoomItY( -canvas->yOffset() ) );
             canvas->tqrepaint( br ); // Previous position
-            canvas->tqrepaintObject( it.current() ); // New position
+            canvas->repaintObject( it.current() ); // New position
             createCommand=true;
         }
     }
@@ -6191,7 +6191,7 @@ KCommand *Sheet::moveObject(View *_view,const KoPoint &_move,bool key)
             _objects.append( it.current() );
 
             canvas->tqrepaint( oldBoundingRect );
-            canvas->tqrepaintObject( it.current() );
+            canvas->repaintObject( it.current() );
         }
     }
 
@@ -8083,7 +8083,7 @@ void Sheet::emit_updateRow( RowFormat *_format, int _row, bool tqrepaint )
 
     if ( tqrepaint )
     {
-        //All the cells in this row, or below this row will need to be tqrepainted
+        //All the cells in this row, or below this row will need to be repainted
         //So add that region of the sheet to the paint dirty list.
         setRegionPaintDirty( TQRect( 0 , _row , KS_colMax , KS_rowMax) );
 
@@ -8104,7 +8104,7 @@ void Sheet::emit_updateColumn( ColumnFormat *_format, int _column )
         if ( c->column() == _column )
             c->setLayoutDirtyFlag( true );
 
-    //All the cells in this column or to the right of it will need to be tqrepainted if the column
+    //All the cells in this column or to the right of it will need to be repainted if the column
     //has been resized or hidden, so add that region of the sheet to the paint dirty list.
     setRegionPaintDirty( TQRect( _column , 0 , KS_colMax , KS_rowMax) );
 
diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h
index 08fc0fe0c..1ba2e3f5b 100644
--- a/kspread/kspread_sheet.h
+++ b/kspread/kspread_sheet.h
@@ -1083,17 +1083,17 @@ public:
     void update();
 
     /**
-     * tqrepaints all visible cells
+     * repaints all visible cells
      */
     void updateView();
 
     /**
-     * tqrepaints all visible cells in the given rect
+     * repaints all visible cells in the given rect
      */
     void updateView( TQRect const & rect );
 
     /**
-     * tqrepaints all visible cells in the given rect
+     * repaints all visible cells in the given rect
      */
     void updateView(Region*);
 
@@ -1120,7 +1120,7 @@ public:
 
   /**
    * set a region of the spreadsheet to be 'paint dirty' meaning it
-   * needs tqrepainted.  This is not a flag on the cell itself since quite
+   * needs repainted.  This is not a flag on the cell itself since quite
    * often this needs set on a default cell
    */
   void setRegionPaintDirty(TQRect const & range);
@@ -1132,7 +1132,7 @@ public:
   void clearPaintDirtyData();
 
   /**
-   * Test whether a cell needs tqrepainted
+   * Test whether a cell needs repainted
    */
   bool cellIsPaintDirty(TQPoint const & cell) const;
 
diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc
index e66e7b2fc..de8d4a175 100644
--- a/kspread/kspread_sheetprint.cc
+++ b/kspread/kspread_sheetprint.cc
@@ -285,7 +285,7 @@ bool SheetPrint::print( TQPainter &painter, KPrinter *_printer )
     m_uprintPages = page_list.count();
 
 
-    //Cache all object so they only need to be tqrepainted once.
+    //Cache all object so they only need to be repainted once.
     TQPtrListIterator<EmbeddedObject> itObject( m_pDoc->embeddedObjects() );
     for ( ; itObject.current(); ++itObject )
     {
@@ -1141,7 +1141,7 @@ void SheetPrint::setPaperLayout( float _leftBorder, float _topBorder,
 //    for( ;it.current(); ++it )
 //    {
 //        View *v = static_cast<View *>( it.current() );
-          // We need to trigger the appropriate tqrepaintings in the cells near the
+          // We need to trigger the appropriate repaintings in the cells near the
           // border of the page. The easiest way for this is to turn the borders
           // off and on (or on and off if they were off).
 //        bool bBorderWasShown = v->activeSheet()->isShowPageBorders();
diff --git a/kspread/kspread_sheetprint.h b/kspread/kspread_sheetprint.h
index 99991f75a..d0779eb57 100644
--- a/kspread/kspread_sheetprint.h
+++ b/kspread/kspread_sheetprint.h
@@ -153,7 +153,7 @@ public:
     KoPageLayout paperLayout() const;
 
      /**
-     * Changes the paper tqlayout and tqrepaints the currently displayed Sheet.
+     * Changes the paper tqlayout and repaints the currently displayed Sheet.
      */
     void setPaperLayout( float _leftBorder, float _topBorder, float _rightBorder, float _bottomBoder,
                          KoFormat _paper, KoOrientation orientation );
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index c0c21005f..b667214f5 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -1877,7 +1877,7 @@ View::~View()
 
     d->canvas->endChoose();
     d->activeSheet = 0; // set the active sheet to 0L so that when during destruction
-    // of embedded child documents possible tqrepaints in Sheet are not
+    // of embedded child documents possible repaints in Sheet are not
     // performed. The repains can happen if you delete an embedded document,
     // which leads to an regionInvalidated() signal emission in KoView, which calls
     // tqrepaint, etc.etc. :-) (Simon)
@@ -6941,7 +6941,7 @@ void View::slotUpdateView( Sheet * _sheet, const Region& region )
 
 void View::slotUpdateView( EmbeddedObject *obj )
 {
-  d->canvas->tqrepaintObject( obj );
+  d->canvas->repaintObject( obj );
 }
 
 void View::slotUpdateHBorder( Sheet * _sheet )
diff --git a/kspread/kspread_view.h b/kspread/kspread_view.h
index 04efd1644..f82912b3d 100644
--- a/kspread/kspread_view.h
+++ b/kspread/kspread_view.h
@@ -322,7 +322,7 @@ public:
 
     /**
      * Mark all selected cells / regions of cells as 'dirty' (ie. requiring a tqrepaint)
-     * They will be tqrepainted on the next call to paintUpdates()
+     * They will be repainted on the next call to paintUpdates()
      */
     void markSelectionAsDirty();
 
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp
index 2e147e6c1..1551026c0 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 223161f6f..f7fffbbdd 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 810856ef4..e1f0f52b8 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 a32721045..7c905fb39 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 e7f2f8f29..7decd25d4 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 19d87a05d..138cf92a0 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 2d4e5abf8..029930d8b 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 970b0de08..5c21daa38 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 cdc46ec85..d33d91180 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 0e72f1681..d07a55e26 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 d4c1bae90..be9337c0b 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 9aa65e636..afb07d2ab 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 e7f557b11..1fc51fd84 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 26b4da074..f976dd784 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 751869eb3..2651e6ad0 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 6967e9685..02130dc09 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 40736b4ef..e3b68fa97 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)
diff --git a/lib/kofficecore/KoChild.h b/lib/kofficecore/KoChild.h
index 64f41064d..b79f6802d 100644
--- a/lib/kofficecore/KoChild.h
+++ b/lib/kofficecore/KoChild.h
@@ -261,7 +261,7 @@ public:
   virtual void setTransparent( bool transparent );
 
   /**
-   * It might be interesting for view updates and tqrepainting in general
+   * It might be interesting for view updates and repainting in general
    * whether a child is transparent or not.
    * @return true when this child is marked as transparent.
    */
diff --git a/lib/kofficecore/THOUGHTS b/lib/kofficecore/THOUGHTS
index 5d0a93380..33befa051 100644
--- a/lib/kofficecore/THOUGHTS
+++ b/lib/kofficecore/THOUGHTS
@@ -28,7 +28,7 @@ just agree that this QRect represents screen pixels at the given zoom value(s)
 and the app can calculate the requested area to be painted itself. This should
 solve zooming and "scrolling" problems.
 One ugly problem also is what we will do about performance problems on
-tqrepainting a part. Some time ago we got a mail on KOffice where some guy
+repainting a part. Some time ago we got a mail on KOffice where some guy
 asked what to do about making that embedded painting faster. The reason is
 that we *always* tqrepaint the whole area, no matter what. This can easily be
 optimized to a WNorthWestGravity like behavior, because you can't edit those
@@ -72,7 +72,7 @@ each axe here. (i.e. x/y zoom factors)
 
 Related to that is child-panning. Indepenent of the zoom factor
 the child shouldn't just show the left/top corner, but it should
-"remember" the position inside the document when it's tqrepainted
+"remember" the position inside the document when it's repainted
 as inactive child.
 ###
 
diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp
index 5694889c2..a7e85bcfc 100644
--- a/lib/kofficeui/KoGuides.cpp
+++ b/lib/kofficeui/KoGuides.cpp
@@ -476,7 +476,7 @@ void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqSta
 }
 
 
-void KoGuides::tqrepaintSnapping( const KoRect &snappedRect )
+void KoGuides::repaintSnapping( const KoRect &snappedRect )
 {
     bool needRepaint = false;
     for ( int i = 0; i < GL_END; ++i )
@@ -530,7 +530,7 @@ void KoGuides::tqrepaintSnapping( const KoRect &snappedRect )
 }
 
 
-void KoGuides::tqrepaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus )
+void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus )
 {
     bool needRepaint = false;
     for ( int i = 0; i < GL_END; ++i )
@@ -585,7 +585,7 @@ void KoGuides::tqrepaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snap
 }
 
 
-void KoGuides::tqrepaintAfterSnapping()
+void KoGuides::repaintAfterSnapping()
 {
     bool needRepaint = false;
 
diff --git a/lib/kofficeui/KoGuides.h b/lib/kofficeui/KoGuides.h
index e3529c720..15d99ca27 100644
--- a/lib/kofficeui/KoGuides.h
+++ b/lib/kofficeui/KoGuides.h
@@ -179,7 +179,7 @@ public:
      *
      * @param snappedRect the rect after it has been snapped
      */
-    void tqrepaintSnapping( const KoRect &snappedRect );
+    void repaintSnapping( const KoRect &snappedRect );
 
     /**
      * @brief tqrepaint guides if any changed snapping status
@@ -188,7 +188,7 @@ public:
      *
      * @param snappedPoint the point after it has been snapped
      */
-    void tqrepaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus );
+    void repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus );
 
     /**
      * @brief tqrepaint guides so none is snapped
@@ -196,7 +196,7 @@ public:
      * This issues a paint request if any guides have changed snapping status.
      * It also effectively un-snaps all since it doesn't take an argument 
      */
-    void tqrepaintAfterSnapping( );
+    void repaintAfterSnapping( );
 
     /**
      * @brief Find the closesed disance to the next guide within the given distance
diff --git a/lib/kofficeui/KoPictureFilePreview.cpp b/lib/kofficeui/KoPictureFilePreview.cpp
index fade4e9a6..3f44f1e9b 100644
--- a/lib/kofficeui/KoPictureFilePreview.cpp
+++ b/lib/kofficeui/KoPictureFilePreview.cpp
@@ -65,7 +65,7 @@ public:
         m_size = picture.getOriginalSize();
         m_picture = picture;
         resizeContents( m_size.width(), m_size.height() );
-        tqrepaintContents();
+        repaintContents();
         return true;
     }
 
diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cc
index ae4bc6139..4c7aab32a 100644
--- a/lib/kopainter/koIconChooser.cc
+++ b/lib/kopainter/koIconChooser.cc
@@ -167,8 +167,8 @@ void KoIconChooser::setCurrentItem(KoIconItem *item)
     mCurCol = index % mNCols;
 
     // tqrepaint the old and the new item
-    tqrepaintCell(oldRow, oldCol);
-    tqrepaintCell(mCurRow, mCurCol);
+    repaintCell(oldRow, oldCol);
+    repaintCell(mCurRow, mCurCol);
 
     ensureCellVisible(mCurRow, mCurCol);
   }
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index d664b6b89..880ccc9c2 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -436,7 +436,7 @@ Editor::undo()
 		d->currentItem->property()->resetValue();
 	if (d->currentWidget && d->currentItem) {//(check because current widget could be removed by resetValue())
 		d->currentWidget->setValue( d->currentItem->property()->value());
-		tqrepaintItem(d->currentItem);
+		repaintItem(d->currentItem);
 	}
 }
 
@@ -451,7 +451,7 @@ Editor::slotPropertyChanged(Set& set, Property& property)
 	if (d->currentItem && d->currentItem->property() == &property) {
 		d->currentWidget->setValue(property.value(), false);
 		for(TQListViewItem *item = d->currentItem->firstChild(); item; item = item->nextSibling())
-			tqrepaintItem(item);
+			repaintItem(item);
 	}
 	else  {
 		// prop not in the dict, might be a child property:
@@ -459,9 +459,9 @@ Editor::slotPropertyChanged(Set& set, Property& property)
 		if(!item && property.tqparent())
 			item = d->itemDict[property.tqparent()->name()];
 		if (item) {
-			tqrepaintItem(item);
+			repaintItem(item);
 			for(TQListViewItem *it = item->firstChild(); it; it = it->nextSibling())
-				tqrepaintItem(it);
+				repaintItem(it);
 		}
 	}
 
@@ -499,7 +499,7 @@ Editor::slotPropertyReset(Set& set, Property& property)
 	if (d->currentItem && d->currentItem->property() == &property) {
 		d->currentWidget->setValue(property.value(), false);
 		for(TQListViewItem *item = d->currentItem->firstChild(); item; item = item->nextSibling())
-			tqrepaintItem(item);
+			repaintItem(item);
 	}
 	else  {
 		EditorItem *item = d->itemDict[property.name()];
@@ -507,9 +507,9 @@ Editor::slotPropertyReset(Set& set, Property& property)
 		if(!item && property.tqparent())
 			item = d->itemDict[property.tqparent()->name()];
 		if (item) {
-			tqrepaintItem(item);
+			repaintItem(item);
 			for(TQListViewItem *it = item->firstChild(); it; it = it->nextSibling())
-				tqrepaintItem(it);
+				repaintItem(it);
 		}
 	}
 
@@ -790,7 +790,7 @@ Editor::slotExpanded(TQListViewItem *item)
 	}
 	updateEditorGeometry();
 	updateGroupLabelsPosition();
-	tqrepaintContents();
+	repaintContents();
 	tqrepaint();
 }
 
@@ -814,7 +814,7 @@ Editor::slotCollapsed(TQListViewItem *item)
 	}
 	updateEditorGeometry();
 	updateGroupLabelsPosition();
-	tqrepaintContents();
+	repaintContents();
 	tqrepaint();
 }
 
@@ -842,7 +842,7 @@ Editor::slotColumnSizeChanged(int section, int oldSize, int newSize)
 					d->currentWidget->height());
 		}
 	}*/
-//	tqrepaintContents();
+//	repaintContents();
 //	tqrepaint();
 	updateEditorGeometry();
 	update();
@@ -1020,7 +1020,7 @@ Editor::setSorting( int column, bool ascending )
 	KListView::setSorting( column, ascending );
 	updateEditorGeometry();
 	updateGroupLabelsPosition();
-	tqrepaintContents();
+	repaintContents();
 	tqrepaint();
 }
 
diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp
index d20dd80d9..ae2f3668e 100644
--- a/lib/kotext/KoBgSpellCheck.cpp
+++ b/lib/kotext/KoBgSpellCheck.cpp
@@ -242,7 +242,7 @@ void KoBgSpellCheck::slotParagraphModified( KoTextParag* parag, int /*ParagModif
 
         // Tricky: KSpell2::Filter::nextWord's behavior makes the for() loop skip ignored words,
         // so it doesn't mark them as OK... So we need to clear the marks everywhere first.
-        // To avoid flickering the tqrepainting is only done once, after checking the parag.
+        // To avoid flickering the repainting is only done once, after checking the parag.
         markWord( parag, curPos, parag->length() - curPos, false );
 
         for ( Word w = filter.nextWord(); !w.end; w = filter.nextWord() ) {
@@ -287,7 +287,7 @@ void KoBgSpellCheck::slotClearPara()
     // (e.g. due to adding a word to the ignore list, not due to editing)
     //
     // TODO: do this all only if there was a format with 'misspelled' in the paragraph,
-    // to minimize tqrepaints
+    // to minimize repaints
     KoTextStringChar *ch = parag->at( 0 );
     KoTextFormat format( *ch->format() );
     format.setMisspelled( false );
diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp
index 2eb2dd005..b637f0a6c 100644
--- a/lib/kotext/KoTextDocument.cpp
+++ b/lib/kotext/KoTextDocument.cpp
@@ -1271,12 +1271,12 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx,
 #ifdef DEBUG_PAINTING
         kdDebug(32500) << " Repainting from lineChanged=" << parag->lineChanged() << " -> adding " << offsetY << " to rect" << endl;
 #endif
-        // Skip the lines that are not tqrepainted by moving Top. The bottom doesn't change.
+        // Skip the lines that are not repainted by moving Top. The bottom doesn't change.
         rect.rTop() += offsetY;
     }
 
     TQRect crect( cx, cy, cw, ch ); // the overall crect
-    TQRect ir( rect ); // will be the rect to be tqrepainted
+    TQRect ir( rect ); // will be the rect to be repainted
 
     TQBrush brush = cg.brush( TQColorGroup::Base );
 
diff --git a/lib/kotext/KoTextDocument.h b/lib/kotext/KoTextDocument.h
index 2b658a1a0..44bb00010 100644
--- a/lib/kotext/KoTextDocument.h
+++ b/lib/kotext/KoTextDocument.h
@@ -320,7 +320,7 @@ public:
         emit newCommand( cmd );
     }
     void emitRepaintChanged() {
-        emit tqrepaintChanged();
+        emit repaintChanged();
     }
 signals:
     /**
@@ -330,10 +330,10 @@ signals:
      */
     void newCommand( KCommand *cmd );
     /**
-     * Tell the world that we'd like some tqrepainting to happen.
+     * Tell the world that we'd like some repainting to happen.
      * KoTextObject connects (and forwards) that one.
      */
-    void tqrepaintChanged();
+    void repaintChanged();
 
 protected:
     void drawWithoutDoubleBuffer( TQPainter *p, const TQRect &rect, const TQColorGroup &cg,
diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp
index c65e3bb69..f6716b2dc 100644
--- a/lib/kotext/KoTextObject.cpp
+++ b/lib/kotext/KoTextObject.cpp
@@ -105,7 +105,7 @@ void KoTextObject::init()
              this, TQT_SLOT( slotParagraphDeleted( KoTextParag* ) ) );
     connect( textdoc, TQT_SIGNAL( newCommand( KCommand* ) ),
              this, TQT_SIGNAL( newCommand( KCommand* ) ) );
-    connect( textdoc, TQT_SIGNAL( tqrepaintChanged() ),
+    connect( textdoc, TQT_SIGNAL( repaintChanged() ),
              this, TQT_SLOT( emitRepaintChanged() ) );
 
     connect( this, TQT_SIGNAL(paragraphModified( KoTextParag*, int, int , int ) ),
@@ -193,7 +193,7 @@ bool KoTextObject::selectionHasCustomItems( KoTextDocument::SelectionId selectio
 void KoTextObject::slotAfterUndoRedo()
 {
     formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     emit updateUI( true );
     emit showCursor();
     emit ensureCursorVisible();
@@ -520,7 +520,7 @@ void KoTextObject::doKeyboardAction( KoTextCursor * cursor, KoTextFormat * & /*c
                         cursor->parag()->setNoCounter();
 
                         formatMore( 2 );
-                        emit tqrepaintChanged( this );
+                        emit repaintChanged( this );
                         emit ensureCursorVisible();
                         emit showCursor();
                         emit updateUI( doUpdateCurrentFormat );
@@ -588,7 +588,7 @@ void KoTextObject::doKeyboardAction( KoTextCursor * cursor, KoTextFormat * & /*c
         clearUndoRedoInfo();
 
     formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     emit ensureCursorVisible();
     emit showCursor();
     emit updateUI( doUpdateCurrentFormat );
@@ -704,7 +704,7 @@ void KoTextObject::insert( KoTextCursor * cursor, KoTextFormat * currentFormat,
     }
 
     if ( tqrepaint ) {
-        emit tqrepaintChanged( this );
+        emit repaintChanged( this );
         emit ensureCursorVisible();
         emit showCursor();
         // we typed the first char of a paragraph in AlignAuto mode -> show correct tqalignment in UI
@@ -763,7 +763,7 @@ void KoTextObject::pasteText( KoTextCursor * cursor, const TQString & text, KoTe
         insert( cursor, currentFormat, t, i18n("Paste Text"),
                 KoTextDocument::Standard, insertFlags );
         formatMore( 2 );
-        emit tqrepaintChanged( this );
+        emit repaintChanged( this );
     }
 }
 
@@ -793,7 +793,7 @@ KCommand* KoTextObject::setParagLayoutCommand( KoTextCursor * cursor, const KoPa
         }
 
         formatMore( 2 );
-        emit tqrepaintChanged( this );
+        emit repaintChanged( this );
         emit showCursor();
         emit updateUI( true );
 
@@ -925,7 +925,7 @@ KCommand *KoTextObject::applyStyleCommand( KoTextCursor * cursor, const KoParagS
     {
         setLastFormattedParag( firstParag );
         formatMore( 2 );
-        emit tqrepaintChanged( this );
+        emit repaintChanged( this );
         emit updateUI( true );
         emit showCursor();
     }
@@ -977,7 +977,7 @@ void KoTextObject::applyStyleChange( KoStyleChangeDefMap changed )
     }
     setLastFormattedParag( textdoc->firstParag() );
     formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     emit updateUI( true );
 }
 
@@ -1054,7 +1054,7 @@ KCommand * KoTextObject::setFormatCommand( KoTextCursor * cursor, KoTextFormat *
         undoRedoInfo.clear();
         setLastFormattedParag( c1.parag() );
         formatMore( 2 );
-        emit tqrepaintChanged( this );
+        emit repaintChanged( this );
         emit showCursor();
     }
     if ( isNewFormat ) {
@@ -1068,7 +1068,7 @@ KCommand * KoTextObject::setFormatCommand( KoTextCursor * cursor, KoTextFormat *
                 cursor->parag()->setFormat( newFormat );
                 cursor->parag()->tqinvalidate(0);
                 cursor->parag()->format();
-                emit tqrepaintChanged( this );
+                emit repaintChanged( this );
             }
         }
     }
@@ -1125,7 +1125,7 @@ KCommand *KoTextObject::setCounterCommand( KoTextCursor * cursor, const KoParagC
         }
     }
     formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     if ( !undoRedoInfo.newParagLayout.counter )
         undoRedoInfo.newParagLayout.counter = new KoParagCounter;
     *undoRedoInfo.newParagLayout.counter = counter;
@@ -1164,7 +1164,7 @@ KCommand * KoTextObject::setAlignCommand( KoTextCursor * cursor, int align, KoTe
             start->setAlign(align);
     }
     formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     undoRedoInfo.newParagLayout.tqalignment = align;
     KoTextParagCommand *cmd = new KoTextParagCommand(
         textdoc, undoRedoInfo.id, undoRedoInfo.eid,
@@ -1202,7 +1202,7 @@ KCommand * KoTextObject::setMarginCommand( KoTextCursor * cursor, TQStyleSheetIt
             start->setMargin(m, margin);
     }
     formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     undoRedoInfo.newParagLayout.margins[m] = margin;
     KoTextParagCommand *cmd = new KoTextParagCommand(
         textdoc, undoRedoInfo.id, undoRedoInfo.eid,
@@ -1250,7 +1250,7 @@ KCommand * KoTextObject::setBackgroundColorCommand( KoTextCursor * cursor,
             start->setBackgroundColor(color);
     }
     formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
 
     // Update undo/redo info
     undoRedoInfo.newParagLayout.backgroundColor = color;
@@ -1298,7 +1298,7 @@ KCommand * KoTextObject::setLineSpacingCommand( KoTextCursor * cursor, double sp
         }
     }
     formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     undoRedoInfo.newParagLayout.setLineSpacingValue( spacing );
     undoRedoInfo.newParagLayout.lineSpacingType = _type;
     KoTextParagCommand *cmd = new KoTextParagCommand(
@@ -1358,7 +1358,7 @@ KCommand * KoTextObject::setBordersCommand( KoTextCursor * cursor, const KoBorde
             end->next()->setChanged( true );
     }
     formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     undoRedoInfo.newParagLayout.leftBorder=leftBorder;
     undoRedoInfo.newParagLayout.rightBorder=rightBorder;
     undoRedoInfo.newParagLayout.topBorder=topBorder;
@@ -1414,7 +1414,7 @@ KCommand * KoTextObject::setJoinBordersCommand( KoTextCursor * cursor, bool join
     }
     formatMore( 2 );
 
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     undoRedoInfo.newParagLayout.joinBorder=join;
 
     KoTextParagCommand *cmd = new KoTextParagCommand(
@@ -1456,7 +1456,7 @@ KCommand * KoTextObject::setTabListCommand( KoTextCursor * cursor, const KoTabul
     }
 
     formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     undoRedoInfo.newParagLayout.setTabList( tabList );
     KoTextParagCommand *cmd = new KoTextParagCommand(
         textdoc, undoRedoInfo.id, undoRedoInfo.eid,
@@ -1494,7 +1494,7 @@ KCommand * KoTextObject::setParagDirectionCommand( KoTextCursor * cursor, TQChar
     }
 
     formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     ////// ### TODO
 #if 0
     undoRedoInfo.newParagLayout.direction = d;
@@ -1537,7 +1537,7 @@ void KoTextObject::removeSelectedText( KoTextCursor * cursor, KoTextDocument::Se
 
     setLastFormattedParag( cursor->parag() );
     formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     emit ensureCursorVisible();
     emit updateUI( true );
     emit showCursor();
@@ -1628,7 +1628,7 @@ KCommand* KoTextObject::replaceSelectionCommand( KoTextCursor * cursor, const TQ
     if ( tqrepaint )
     {
         formatMore( 2 );
-        emit tqrepaintChanged( this );
+        emit repaintChanged( this );
         emit ensureCursorVisible();
         emit updateUI( true );
         emit showCursor();
@@ -1665,7 +1665,7 @@ void KoTextObject::highlightPortion( KoTextParag * parag, int index, int length,
     textdoc->setSelectionEnd( KoTextDocument::HighlightSelection, &cursor );
     if ( tqrepaint ) {
         parag->setChanged( true );
-        emit tqrepaintChanged( this );
+        emit repaintChanged( this );
     }
 }
 
@@ -1678,7 +1678,7 @@ void KoTextObject::removeHighlight(bool tqrepaint)
         textdoc->removeSelection( KoTextDocument::HighlightSelection );
     }
     if ( tqrepaint )
-        emit tqrepaintChanged( this );
+        emit repaintChanged( this );
 }
 
 void KoTextObject::selectAll( bool select )
@@ -1692,7 +1692,7 @@ void KoTextObject::selectAll( bool select )
 
 void KoTextObject::selectionChangedNotify( bool enableActions /* = true */)
 {
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     if ( enableActions )
         emit selectionChanged( hasSelection() );
 }
@@ -2020,7 +2020,7 @@ KCommand *KoTextObject::changeCaseOfText(KoTextCursor *cursor,KoChangeCaseDia::T
         }
     }
     formatMore( 2 );
-    emit tqrepaintChanged( this );
+    emit repaintChanged( this );
     emit ensureCursorVisible();
     emit updateUI( true );
     emit showCursor();
diff --git a/lib/kotext/KoTextObject.h b/lib/kotext/KoTextObject.h
index e6414f990..e1519ff4b 100644
--- a/lib/kotext/KoTextObject.h
+++ b/lib/kotext/KoTextObject.h
@@ -348,7 +348,7 @@ public:
      * @param paragLayoutFlags which settings from the paragraph tqlayout to apply
      * @param formatFlags which settings from the text format to apply
      * @param createUndoRedo if true, an undo/redo command will be created and emitted
-     * @param interactive if true, the text will be reformatted/tqrepainted to show the new style
+     * @param interactive if true, the text will be reformatted/repainted to show the new style
      */
     void applyStyle( KoTextCursor * cursor, const KoParagStyle * style,
                      KoTextDocument::SelectionId selectionId = KoTextDocument::Standard,
@@ -500,8 +500,8 @@ signals:
      */
     void newCommand( KCommand *cmd );
 
-    /** Tell the world that we'd like some tqrepainting to happen */
-    void tqrepaintChanged( KoTextObject * );
+    /** Tell the world that we'd like some repainting to happen */
+    void repaintChanged( KoTextObject * );
 
     void hideCursor();
     void showCursor();
@@ -529,7 +529,7 @@ public slots:
     // The return value is used by ensureFormatted
     bool formatMore( int count = 10, bool emitAfterFormatting = true );
 
-    void emitRepaintChanged() { emit tqrepaintChanged( this ); }
+    void emitRepaintChanged() { emit repaintChanged( this ); }
 
 public: // made public for KWTextFrameSet...
 
diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index 2e5663afe..e333eb369 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -541,7 +541,7 @@ TQValueList<KoVariable *> KoVariableCollection::recalcVariables(int type)
     // TODO pass list of textdocuments as argument
     // Or even better, call emitRepaintChanged on all modified textobjects
     if( !modifiedVariables.isEmpty() )
-        emit tqrepaintVariable();
+        emit repaintVariable();
 #endif
     return modifiedVariables;
 }
diff --git a/lib/kotext/KoVariable.h b/lib/kotext/KoVariable.h
index d00dcb5c9..e0a5a5305 100644
--- a/lib/kotext/KoVariable.h
+++ b/lib/kotext/KoVariable.h
@@ -407,7 +407,7 @@ public:
     /**
      * Ask this variable to recalculate and to tqrepaint itself
      * Only use this if you're working on a single variable (e.g. popupmenu).
-     * Otherwise, better do the tqrepainting all at once.
+     * Otherwise, better do the repainting all at once.
      * @see KoVariableCollection::recalcVariables()
      */
     void recalcAndRepaint();