rename the following methods:

tqfind find
tqreplace replace
tqcontains contains

1 files changed, 91 insertions, 91 deletions

diff --git a/tqtinterface/qt4/src/iconview/tqiconview.cpp b/tqtinterface/qt4/src/iconview/tqiconview.cpp
index c1705c7..d1e1e14 100644
--- a/tqtinterface/qt4/src/iconview/tqiconview.cpp
+++ b/tqtinterface/qt4/src/iconview/tqiconview.cpp
@@ -287,8 +287,8 @@ public:
 
 public:
 
-    /* tqfinds the containers that intersect with \a searchRect in the direction \a dir relative to \a relativeTo */
-    TQPtrList<ItemContainer>* tqfindContainers(
+    /* finds the containers that intersect with \a searchRect in the direction \a dir relative to \a relativeTo */
+    TQPtrList<ItemContainer>* findContainers(
 	TQIconView:: Direction dir,
 	const TQPoint &relativeTo,
 	const TQRect &searchRect ) const;
@@ -296,7 +296,7 @@ public:
 };
 
 
-TQPtrList<TQIconViewPrivate::ItemContainer>* TQIconViewPrivate::tqfindContainers(
+TQPtrList<TQIconViewPrivate::ItemContainer>* TQIconViewPrivate::findContainers(
 	TQIconView:: Direction dir,
 	const TQPoint &relativeTo,
 	const TQRect &searchRect ) const
@@ -398,7 +398,7 @@ void TQIconViewToolTip::maybeTip( const TQPoint &pos )
     if ( !parentWidget() || !view || view->wordWrapIconText() || !view->showToolTips() )
 	return;
 
-    TQIconViewItem *item = view->tqfindItem( view->viewportToContents( pos ) );
+    TQIconViewItem *item = view->findItem( view->viewportToContents( pos ) );
     if ( !item || item->tmpText == item->itemText )
 	return;
 
@@ -808,7 +808,7 @@ void TQIconDragData::setTextRect( const TQRect &r )
     \ingroup advanced
     \module iconview
 
-    A TQIconViewItem tqcontains an icon, a string and optionally a sort
+    A TQIconViewItem contains an icon, a string and optionally a sort
     key, and can display itself in a TQIconView.
     The class is designed to be very similar to TQListView and TQListBox
     in use, both via instantiation and subclassing.
@@ -854,7 +854,7 @@ void TQIconDragData::setTextRect( const TQRect &r )
     Items may be repositioned with move() and moveBy(). An item's
     tqgeometry is available from rect(), x(), y(), width(), height(),
     size(), pos(), textRect() and pixmapRect(). You can also test
-    against the position of a point with tqcontains() and intersects().
+    against the position of a point with contains() and intersects().
 
     To remove an item from an icon view, just delete the item. The
     TQIconViewItem destructor removes it cleanly from its icon view.
@@ -1424,7 +1424,7 @@ TQIconViewItem *TQIconViewItem::prevItem() const
     Returns a pointer to the next item, or 0 if this is the last item
     in the icon view.
 
-    To tqfind the first item use TQIconView::firstItem().
+    To find the first item use TQIconView::firstItem().
 
     Example:
     \code
@@ -1734,11 +1734,11 @@ TQRect TQIconViewItem::pixmapRect( bool relative ) const
 }
 
 /*!
-    Returns TRUE if the item tqcontains the point \a pnt (in contents
+    Returns TRUE if the item contains the point \a pnt (in contents
     coordinates); otherwise returns FALSE.
 */
 
-bool TQIconViewItem::tqcontains( const TQPoint& pnt ) const
+bool TQIconViewItem::contains( const TQPoint& pnt ) const
 {
     TQRect textArea = textRect( FALSE );
     TQRect pixmapArea = pixmapRect( FALSE );
@@ -1746,7 +1746,7 @@ bool TQIconViewItem::tqcontains( const TQPoint& pnt ) const
 	textArea.setTop( pixmapArea.bottom() );
     else
 	textArea.setLeft( pixmapArea.right() );
-    return textArea.tqcontains( pnt ) || pixmapArea.tqcontains( pnt );
+    return textArea.contains( pnt ) || pixmapArea.contains( pnt );
 }
 
 /*!
@@ -2147,7 +2147,7 @@ void TQIconViewItem::paintFocus( TQPainter *p, const TQColorGroup & )
 
     This function is called when something is dropped on the item. \a
     e provides all the information about the drop. If the drag object
-    of the drop was a TQIconDrag, \a lst tqcontains the list of the
+    of the drop was a TQIconDrag, \a lst contains the list of the
     dropped items. You can get the data by calling
     TQIconDragItem::data() on each item. If the \a lst is empty, i.e.
     the drag was not a TQIconDrag, you must decode the data in \a e and
@@ -2309,7 +2309,7 @@ void TQIconViewItem::checkRect()
     selected. Items can be renamed in-place. TQIconView also supports
     \link #draganddrop drag and drop\endlink.
 
-    Each item tqcontains a label string, a pixmap or picture (the icon
+    Each item contains a label string, a pixmap or picture (the icon
     itself) and optionally a sort key. The sort key is used for
     sorting the items and defaults to the label string. The label
     string can be displayed below or to the right of the icon (see \l
@@ -2388,8 +2388,8 @@ void TQIconViewItem::checkRect()
 	    do_something( item );
     \endcode
     TQIconView also provides currentItem(). You can search for an item
-    using tqfindItem() (searching by position or for label text) and
-    with tqfindFirstVisibleItem() and tqfindLastVisibleItem(). The number
+    using findItem() (searching by position or for label text) and
+    with findFirstVisibleItem() and findLastVisibleItem(). The number
     of items is returned by count(). An item can be removed from an
     icon view using takeItem(); to delete an item use \c delete. All
     the items can be deleted with clear().
@@ -2471,7 +2471,7 @@ void TQIconViewItem::checkRect()
     connect to the dropped() signal and reimplement
     TQIconViewItem::acceptDrop() and TQIconViewItem::dropped(). If you've
     used a TQIconDrag (or a subclass of it) the second argument to the
-    dropped signal tqcontains a TQValueList of TQIconDragItems -- you can
+    dropped signal contains a TQValueList of TQIconDragItems -- you can
     access their data by calling TQIconDragItem::data() on each one.
 
     For an example implementation of complex drag-and-drop look at the
@@ -2560,7 +2560,7 @@ void TQIconViewItem::checkRect()
     (but not on any icon) which the icon view itself can't handle.
 
     \a e provides all the information about the drop. If the drag
-    object of the drop was a TQIconDrag, \a lst tqcontains the list of
+    object of the drop was a TQIconDrag, \a lst contains the list of
     the dropped items. You can get the data using
     TQIconDragItem::data() on each item. If the \a lst is empty, i.e.
     the drag was not a TQIconDrag, you have to decode the data in \a e
@@ -3351,7 +3351,7 @@ void TQIconView::doAutoScroll()
 	    alreadyIntersected = TRUE;
 	    TQIconViewItem *item = c->items.first();
 	    for ( ; item; item = c->items.next() ) {
-		if ( d->selectedItems.tqfind( item ) )
+		if ( d->selectedItems.find( item ) )
 		    continue;
 		if ( !item->intersects( nr ) ) {
 		    if ( item->isSelected() ) {
@@ -3453,14 +3453,14 @@ void TQIconView::doAutoScroll()
 	    emit selectionChanged( d->currentItem );
     }
 
-    if ( !TQRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).tqcontains( vp ) &&
+    if ( !TQRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).contains( vp ) &&
 	 !d->scrollTimer ) {
 	d->scrollTimer = new TQTimer( this );
 
 	connect( d->scrollTimer, TQT_SIGNAL( timeout() ),
 		 this, TQT_SLOT( doAutoScroll() ) );
 	d->scrollTimer->start( 100, FALSE );
-    } else if ( TQRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).tqcontains( vp ) &&
+    } else if ( TQRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).contains( vp ) &&
 		d->scrollTimer ) {
 	disconnect( d->scrollTimer, TQT_SIGNAL( timeout() ),
 		    this, TQT_SLOT( doAutoScroll() ) );
@@ -3739,22 +3739,22 @@ TQIconView::SelectionMode TQIconView::selectionMode() const
 }
 
 /*!
-    Returns a pointer to the item that tqcontains point \a pos, which is
-    given in contents coordinates, or 0 if no item tqcontains point \a
+    Returns a pointer to the item that contains point \a pos, which is
+    given in contents coordinates, or 0 if no item contains point \a
     pos.
 */
 
-TQIconViewItem *TQIconView::tqfindItem( const TQPoint &pos ) const
+TQIconViewItem *TQIconView::findItem( const TQPoint &pos ) const
 {
     if ( !d->firstItem )
 	return 0;
 
     TQIconViewPrivate::ItemContainer *c = d->lastContainer;
     for ( ; c; c = c->p ) {
-	if ( c->rect.tqcontains( pos ) ) {
+	if ( c->rect.contains( pos ) ) {
 	    TQIconViewItem *item = c->items.last();
 	    for ( ; item; item = c->items.prev() )
-		if ( item->tqcontains( pos ) )
+		if ( item->contains( pos ) )
 		    return item;
 	}
     }
@@ -3771,7 +3771,7 @@ TQIconViewItem *TQIconView::tqfindItem( const TQPoint &pos ) const
     {TQt::StringComparisonMode}.)
 */
 
-TQIconViewItem *TQIconView::tqfindItem( const TQString &text, TQt::ComparisonFlags compare ) const
+TQIconViewItem *TQIconView::findItem( const TQString &text, TQt::ComparisonFlags compare ) const
 {
     if ( !d->firstItem )
 	return 0;
@@ -3792,7 +3792,7 @@ TQIconViewItem *TQIconView::tqfindItem( const TQString &text, TQt::ComparisonFla
 
     TQIconViewItem *beginsWithItem = 0;
     TQIconViewItem *endsWithItem = 0;
-    TQIconViewItem *tqcontainsItem = 0;
+    TQIconViewItem *containsItem = 0;
 
     if ( item ) {
 	for ( ; item; item = item->next ) {
@@ -3804,11 +3804,11 @@ TQIconViewItem *TQIconView::tqfindItem( const TQString &text, TQt::ComparisonFla
 	    if ( compare & TQt::ExactMatch && itmtxt == comtxt )
 		return item;
 	    if ( compare & TQt::BeginsWith && !beginsWithItem && itmtxt.startsWith( comtxt ) )
-		beginsWithItem = tqcontainsItem = item;
+		beginsWithItem = containsItem = item;
 	    if ( compare & TQt::EndsWith && !endsWithItem && itmtxt.endsWith( comtxt ) )
-		endsWithItem = tqcontainsItem = item;
-	    if ( compare & TQt::Contains && !tqcontainsItem && itmtxt.tqcontains( comtxt ) )
-		tqcontainsItem = item;
+		endsWithItem = containsItem = item;
+	    if ( compare & TQt::Contains && !containsItem && itmtxt.contains( comtxt ) )
+		containsItem = item;
 	}
 
 	if ( d->currentItem && d->firstItem ) {
@@ -3822,11 +3822,11 @@ TQIconViewItem *TQIconView::tqfindItem( const TQString &text, TQt::ComparisonFla
 		if ( compare & TQt::ExactMatch && itmtxt == comtxt )
 		    return item;
 		if ( compare & TQt::BeginsWith && !beginsWithItem && itmtxt.startsWith( comtxt ) )
-		    beginsWithItem = tqcontainsItem = item;
+		    beginsWithItem = containsItem = item;
 		if ( compare & TQt::EndsWith && !endsWithItem && itmtxt.endsWith( comtxt ) )
-		    endsWithItem = tqcontainsItem = item;
-		if ( compare & TQt::Contains && !tqcontainsItem && itmtxt.tqcontains( comtxt ) )
-		    tqcontainsItem = item;
+		    endsWithItem = containsItem = item;
+		if ( compare & TQt::Contains && !containsItem && itmtxt.contains( comtxt ) )
+		    containsItem = item;
 	    }
 	}
     }
@@ -3836,8 +3836,8 @@ TQIconViewItem *TQIconView::tqfindItem( const TQString &text, TQt::ComparisonFla
 	return beginsWithItem;
     else if ( endsWithItem )
 	return endsWithItem;
-    else if ( tqcontainsItem )
-	return tqcontainsItem;
+    else if ( containsItem )
+	return containsItem;
     return 0;
 }
 
@@ -3993,15 +3993,15 @@ void TQIconView::ensureItemVisible( TQIconViewItem *item )
     returns a pointer to that item. \a r is given in content
     coordinates. Returns 0 if no item overlaps \a r.
 
-    If you want to tqfind all items that touch \a r, you will need to
+    If you want to find all items that touch \a r, you will need to
     use this function and nextItem() in a loop ending at
-    tqfindLastVisibleItem() and test TQIconViewItem::rect() for each of
+    findLastVisibleItem() and test TQIconViewItem::rect() for each of
     these items.
 
-    \sa tqfindLastVisibleItem() TQIconViewItem::rect()
+    \sa findLastVisibleItem() TQIconViewItem::rect()
 */
 
-TQIconViewItem* TQIconView::tqfindFirstVisibleItem( const TQRect &r ) const
+TQIconViewItem* TQIconView::findFirstVisibleItem( const TQRect &r ) const
 {
     TQIconViewPrivate::ItemContainer *c = d->firstContainer;
     TQIconViewItem *i = 0;
@@ -4039,10 +4039,10 @@ TQIconViewItem* TQIconView::tqfindFirstVisibleItem( const TQRect &r ) const
     returns a pointer to that item. \a r is given in content
     coordinates. Returns 0 if no item overlaps \a r.
 
-    \sa tqfindFirstVisibleItem()
+    \sa findFirstVisibleItem()
 */
 
-TQIconViewItem* TQIconView::tqfindLastVisibleItem( const TQRect &r ) const
+TQIconViewItem* TQIconView::findLastVisibleItem( const TQRect &r ) const
 {
     TQIconViewPrivate::ItemContainer *c = d->firstContainer;
     TQIconViewItem *i = 0;
@@ -4486,7 +4486,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e )
     }
 
     d->dragStartPos = e->pos();
-    TQIconViewItem *item = tqfindItem( e->pos() );
+    TQIconViewItem *item = findItem( e->pos() );
     d->pressedItem = item;
 
     if ( item )
@@ -4509,7 +4509,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e )
 
     if ( e->button() == Qt::LeftButton && !( e->state() & ShiftButton ) &&
 	 !( e->state() & ControlButton ) && item && item->isSelected() &&
-	 item->textRect( FALSE ).tqcontains( e->pos() ) ) {
+	 item->textRect( FALSE ).contains( e->pos() ) ) {
 
 	if ( !item->renameEnabled() ) {
 	    d->mousePressed = TRUE;
@@ -4641,7 +4641,7 @@ void TQIconView::contentsContextMenuEvent( TQContextMenuEvent *e )
 	emit contextMenuRequested( item, viewport()->mapToGlobal( contentsToViewport( r.center() ) ) );
     } else {
 	d->mousePressed = FALSE;
-	TQIconViewItem *item = tqfindItem( e->pos() );
+	TQIconViewItem *item = findItem( e->pos() );
 	emit contextMenuRequested( item, e->globalPos() );
     }
 }
@@ -4652,7 +4652,7 @@ void TQIconView::contentsContextMenuEvent( TQContextMenuEvent *e )
 
 void TQIconView::contentsMouseReleaseEvent( TQMouseEvent *e )
 {
-    TQIconViewItem *item = tqfindItem( e->pos() );
+    TQIconViewItem *item = findItem( e->pos() );
     d->selectedItems.clear();
 
     bool emitClicked = TRUE;
@@ -4714,7 +4714,7 @@ void TQIconView::contentsMouseReleaseEvent( TQMouseEvent *e )
 
 void TQIconView::contentsMouseMoveEvent( TQMouseEvent *e )
 {
-    TQIconViewItem *item = tqfindItem( e->pos() );
+    TQIconViewItem *item = findItem( e->pos() );
     if ( d->highlightedItem != item ) {
 	if ( item )
 	    emit onItem( item );
@@ -4755,7 +4755,7 @@ void TQIconView::contentsMouseMoveEvent( TQMouseEvent *e )
 
 void TQIconView::contentsMouseDoubleClickEvent( TQMouseEvent *e )
 {
-    TQIconViewItem *item = tqfindItem( e->pos() );
+    TQIconViewItem *item = findItem( e->pos() );
     if ( item ) {
 	selectAll( FALSE );
 	item->setSelected( TRUE, TRUE );
@@ -4800,16 +4800,16 @@ void TQIconView::contentsDragMoveEvent( TQDragMoveEvent *e )
     TQIconViewItem *old = d->tmpCurrentItem;
     d->tmpCurrentItem = 0;
 
-    TQIconViewItem *item = tqfindItem( e->pos() );
+    TQIconViewItem *item = findItem( e->pos() );
 
     if ( item ) {
 	if ( old &&
-	     old->rect().tqcontains(d->oldDragPos) &&
-	     !old->rect().tqcontains(e->pos()) ) {
+	     old->rect().contains(d->oldDragPos) &&
+	     !old->rect().contains(e->pos()) ) {
 	    old->dragLeft();
 	    repaintItem( old );
 	}
-	if ( !item->rect().tqcontains(d->oldDragPos) )
+	if ( !item->rect().contains(d->oldDragPos) )
 	    item->dragEntered();
         if (item->acceptDrop(e) || (item->isSelected() && e->source() == viewport())) {
 	    d->oldDragAcceptAction = TRUE;
@@ -4872,7 +4872,7 @@ void TQIconView::contentsDropEvent( TQDropEvent *e )
     if ( d->tmpCurrentItem )
 	repaintItem( d->tmpCurrentItem );
 
-    TQIconViewItem *i = tqfindItem( e->pos() );
+    TQIconViewItem *i = findItem( e->pos() );
 
     if ((!i || i->isSelected()) && e->source() == viewport() && d->currentItem && !d->cleared) {
 	if ( !d->rearrangeEnabled )
@@ -5024,13 +5024,13 @@ void TQIconView::keyPressEvent( TQKeyEvent *e )
 		} else {
 		    if ( d->arrangement == LeftToRight ) {
 			// we use pixmap so the items textlength are ignored
-			// tqfind topmost, leftmost item
+			// find topmost, leftmost item
 			if ( i->pixmapRect( FALSE ).y() < item->pixmapRect( FALSE ).y() ||
 			     ( i->pixmapRect( FALSE ).y() == item->pixmapRect( FALSE ).y() &&
 			       i->pixmapRect( FALSE ).x() < item->pixmapRect( FALSE ).x() ) )
 			    item = i;
 		    } else {
-			// tqfind leftmost, topmost item
+			// find leftmost, topmost item
 			if ( i->pixmapRect( FALSE ).x() < item->pixmapRect( FALSE ).x() ||
 			     ( i->pixmapRect( FALSE ).x() == item->pixmapRect( FALSE ).x() &&
 			       i->pixmapRect( FALSE ).y() < item->pixmapRect( FALSE ).y() ) )
@@ -5067,13 +5067,13 @@ void TQIconView::keyPressEvent( TQKeyEvent *e )
 		    item = i;
 		} else {
 		    if ( d->arrangement == LeftToRight ) {
-			// tqfind bottommost, rightmost item
+			// find bottommost, rightmost item
 			if ( i->pixmapRect( FALSE ).bottom() > item->pixmapRect( FALSE ).bottom() ||
 			     ( i->pixmapRect( FALSE ).bottom() == item->pixmapRect( FALSE ).bottom() &&
 			       i->pixmapRect( FALSE ).right() > item->pixmapRect( FALSE ).right() ) )
 			    item = i;
 		    } else {
-			// tqfind rightmost, bottommost item
+			// find rightmost, bottommost item
 			if ( i->pixmapRect( FALSE ).right() > item->pixmapRect( FALSE ).right() ||
 			     ( i->pixmapRect( FALSE ).right() == item->pixmapRect( FALSE ).right() &&
 			       i->pixmapRect( FALSE ).bottom() > item->pixmapRect( FALSE ).bottom() ) )
@@ -5100,12 +5100,12 @@ void TQIconView::keyPressEvent( TQKeyEvent *e )
 	Direction dir = DirRight;
 
 	TQRect r( 0, d->currentItem->y(), contentsWidth(), d->currentItem->height() );
-	item = tqfindItem( dir, d->currentItem->rect().center(), r );
+	item = findItem( dir, d->currentItem->rect().center(), r );
 
 	// search the row below from the right
 	while ( !item && r.y() < contentsHeight() ) {
 	    r.moveBy(0, d->currentItem->height() );
-	    item = tqfindItem( dir, TQPoint( 0, r.center().y() ), r );
+	    item = findItem( dir, TQPoint( 0, r.center().y() ), r );
 	}
 
 	if ( item ) {
@@ -5122,12 +5122,12 @@ void TQIconView::keyPressEvent( TQKeyEvent *e )
 	Direction dir = DirLeft;
 
 	TQRect r( 0, d->currentItem->y(), contentsWidth(), d->currentItem->height() );
-	item = tqfindItem( dir, d->currentItem->rect().center(), r );
+	item = findItem( dir, d->currentItem->rect().center(), r );
 
 	// search the row above from the left
 	while ( !item && r.y() >= 0 ) {
 	    r.moveBy(0, - d->currentItem->height() );
-	    item = tqfindItem( dir, TQPoint( contentsWidth(), r.center().y() ), r );
+	    item = findItem( dir, TQPoint( contentsWidth(), r.center().y() ), r );
 	}
 
 	if ( item ) {
@@ -5155,12 +5155,12 @@ void TQIconView::keyPressEvent( TQKeyEvent *e )
 	Direction dir = DirDown;
 
 	TQRect r( d->currentItem->x(), 0, d->currentItem->width(), contentsHeight() );
-	item = tqfindItem( dir, d->currentItem->rect().center(), r );
+	item = findItem( dir, d->currentItem->rect().center(), r );
 
-	// tqfinding the closest item below and to the right
+	// finding the closest item below and to the right
 	while ( !item && r.x() < contentsWidth() ) {
 	    r.moveBy( r.width() , 0 );
-	    item = tqfindItem( dir, TQPoint( r.center().x(), 0 ), r );
+	    item = findItem( dir, TQPoint( r.center().x(), 0 ), r );
 	}
 
 
@@ -5176,12 +5176,12 @@ void TQIconView::keyPressEvent( TQKeyEvent *e )
 	Direction dir = DirUp;
 
 	TQRect r( d->currentItem->x(), 0, d->currentItem->width(), contentsHeight() );
-	item = tqfindItem( dir, d->currentItem->rect().center(), r );
+	item = findItem( dir, d->currentItem->rect().center(), r );
 
-	// tqfinding the closest item above and to the left
+	// finding the closest item above and to the left
 	while ( !item && r.x() >= 0 ) {
 	    r.moveBy(- r.width(), 0 );
-	    item = tqfindItem( dir, TQPoint(r.center().x(), contentsHeight() ), r );
+	    item = findItem( dir, TQPoint(r.center().x(), contentsHeight() ), r );
 	}
 
 	TQIconViewItem *i = d->currentItem;
@@ -5198,13 +5198,13 @@ void TQIconView::keyPressEvent( TQKeyEvent *e )
 	else
 	    r = TQRect( d->currentItem->x() + visibleWidth(), 0, visibleWidth(), contentsHeight() );
 	TQIconViewItem *item = d->currentItem;
-	TQIconViewItem *ni = tqfindFirstVisibleItem( r  );
+	TQIconViewItem *ni = findFirstVisibleItem( r  );
 	if ( !ni ) {
 	    if ( d->arrangement == LeftToRight )
 		r = TQRect( 0, d->currentItem->y() + d->currentItem->height(), contentsWidth(), contentsHeight() );
 	    else
 		r = TQRect( d->currentItem->x() + d->currentItem->width(), 0, contentsWidth(), contentsHeight() );
-	    ni = tqfindLastVisibleItem( r  );
+	    ni = findLastVisibleItem( r  );
 	}
 	if ( ni ) {
 	    setCurrentItem( ni );
@@ -5220,13 +5220,13 @@ void TQIconView::keyPressEvent( TQKeyEvent *e )
 	else
 	    r = TQRect( d->currentItem->x() - visibleWidth(), 0, visibleWidth(), contentsHeight() );
 	TQIconViewItem *item = d->currentItem;
-	TQIconViewItem *ni = tqfindFirstVisibleItem( r  );
+	TQIconViewItem *ni = findFirstVisibleItem( r  );
 	if ( !ni ) {
 	    if ( d->arrangement == LeftToRight )
 		r = TQRect( 0, 0, contentsWidth(), d->currentItem->y() );
 	    else
 		r = TQRect( 0, 0, d->currentItem->x(), contentsHeight() );
-	    ni = tqfindFirstVisibleItem( r  );
+	    ni = findFirstVisibleItem( r  );
 	}
 	if ( ni ) {
 	    setCurrentItem( ni );
@@ -5244,18 +5244,18 @@ void TQIconView::keyPressEvent( TQKeyEvent *e )
 		i = i->next;
 		if ( !i )
 		    i = d->firstItem;
-		i = tqfindItemByName( i );
+		i = findItemByName( i );
 	    } else {
 		d->inputTimer->stop();
 		d->currInputString += e->text();
-		i = tqfindItemByName( i );
+		i = findItemByName( i );
 		if ( !i ) {
 		    d->currInputString = e->text();
 		    if (d->currentItem && d->currentItem->next)
 			i = d->currentItem->next;
 		    else
 			i = d->firstItem;
-		    i = tqfindItemByName(i);
+		    i = findItemByName(i);
 		}
 	    }
 	    if ( i ) {
@@ -5308,7 +5308,7 @@ void TQIconView::keyPressEvent( TQKeyEvent *e )
 
   The function choses the closest item with its center in the searchRect.
 */
-TQIconViewItem* TQIconView::tqfindItem( Direction dir,
+TQIconViewItem* TQIconView::findItem( Direction dir,
 				    const TQPoint &relativeTo,
 				    const TQRect &searchRect ) const
 {
@@ -5318,14 +5318,14 @@ TQIconViewItem* TQIconView::tqfindItem( Direction dir,
 
     // gets list of containers with potential items
     TQPtrList<TQIconViewPrivate::ItemContainer>* cList =
-	d->tqfindContainers( dir, relativeTo, searchRect);
+	d->findContainers( dir, relativeTo, searchRect);
 
     cList->first();
     while ( cList->current() && !centerMatch ) {
 	TQPtrList<TQIconViewItem> &list = (cList->current())->items;
 	for ( item = list.first(); item; item = list.next() ) {
 	    if ( neighbourItem( dir, relativeTo, item ) &&
-		 searchRect.tqcontains( item->rect().center() ) &&
+		 searchRect.contains( item->rect().center() ) &&
 		 item != currentItem() ) {
  		int ml = (relativeTo - item->rect().center()).manhattanLength();
 		if ( centerMatch ) {
@@ -5622,7 +5622,7 @@ void TQIconView::emitRenamed( TQIconViewItem *item )
 
 /*!
     If a drag enters the icon view the tqshapes of the objects which the
-    drag tqcontains are drawn, usnig \a pos as origin.
+    drag contains are drawn, usnig \a pos as origin.
 */
 
 void TQIconView::drawDragShapes( const TQPoint &pos )
@@ -5767,7 +5767,7 @@ TQSize TQIconView::tqminimumSizeHint() const
   with \a text.
 */
 
-TQIconViewItem* TQIconView::tqfindItemByName( TQIconViewItem *start )
+TQIconViewItem* TQIconView::findItemByName( TQIconViewItem *start )
 {
     if ( !start )
 	return 0;
@@ -6001,7 +6001,7 @@ int TQIconView::calcGridNum( int w, int x ) const
 
 /*!
   \internal
-  Returns the first item of the row which tqcontains \a item.
+  Returns the first item of the row which contains \a item.
 */
 
 TQIconViewItem *TQIconView::rowBegin( TQIconViewItem * ) const
@@ -6162,10 +6162,10 @@ void TQIconView::updateItemContainer( TQIconViewItem *item )
     }
 
     const TQRect irect = item->rect();
-    bool tqcontains = FALSE;
+    bool contains = FALSE;
     for (;;) {
 	if ( c->rect.intersects( irect ) ) {
-	    tqcontains = c->rect.tqcontains( irect );
+	    contains = c->rect.contains( irect );
 	    break;
 	}
 
@@ -6187,7 +6187,7 @@ void TQIconView::updateItemContainer( TQIconViewItem *item )
         c->items.append( item );
         item->d->container1 = c;
 
-        if ( !tqcontains ) {
+        if ( !contains ) {
 	    c = c->n;
 	    if ( !c ) {
 	        appendItemContainer();
@@ -6209,7 +6209,7 @@ void TQIconView::updateItemContainer( TQIconViewItem *item )
 void TQIconView::appendItemContainer()
 {
     TQSize s;
-    // #### We have to tqfind out which value is best here
+    // #### We have to find out which value is best here
     if ( d->arrangement == LeftToRight )
 	s = TQSize( INT_MAX - 1, RECT_EXTENSION );
     else
@@ -6251,7 +6251,7 @@ void TQIconView::rebuildContainers()
     c = d->lastContainer;
     while ( item ) {
         if (item->isVisible()) {
-	    if ( c->rect.tqcontains( item->rect() ) ) {
+	    if ( c->rect.contains( item->rect() ) ) {
 	        item->d->container1 = c;
 	        item->d->container2 = 0;
 	        c->items.append( item );
@@ -6350,7 +6350,7 @@ void TQIconView::handleItemChange( TQIconViewItem *old, bool shift,
  		}
 
 
-		// tqfinding the rectangles
+		// finding the rectangles
 		TQRect topRect, bottomRect, midRect;
 		if ( !spanning ) {
 		    midRect = from->rect().unite( to->rect() );
@@ -6378,7 +6378,7 @@ void TQIconView::handleItemChange( TQIconViewItem *old, bool shift,
 		    }
 		}
 
-		// tqfinding contained items and selecting them
+		// finding contained items and selecting them
 		TQIconViewItem *item = 0;
 		bool changed = FALSE;
 		bool midValid = midRect.isValid();
@@ -6388,11 +6388,11 @@ void TQIconView::handleItemChange( TQIconViewItem *old, bool shift,
 		for ( item = d->firstItem; item; item = item->next ) {
 		    bool contained = FALSE;
 		    TQPoint itemCenter = item->rect().center();
-		    if ( midValid && midRect.tqcontains( itemCenter ) )
+		    if ( midValid && midRect.contains( itemCenter ) )
 			contained = TRUE;
-		    if ( !contained && topValid && topRect.tqcontains( itemCenter ) )
+		    if ( !contained && topValid && topRect.contains( itemCenter ) )
 			contained = TRUE;
-		    if ( !contained && bottomValid && bottomRect.tqcontains( itemCenter ) )
+		    if ( !contained && bottomValid && bottomRect.contains( itemCenter ) )
 			contained = TRUE;
 
 		    if ( contained ) {
@@ -6442,7 +6442,7 @@ void TQIconView::handleItemChange( TQIconViewItem *old, bool shift,
 TQBitmap TQIconView::tqmask( TQPixmap *pix ) const
 {
     TQPixmap m;
-    if ( d->maskCache.tqfind( TQT_TQSTRING(TQString::number( pix->serialNumber() )), m ) )
+    if ( d->maskCache.find( TQT_TQSTRING(TQString::number( pix->serialNumber() )), m ) )
 	return TQBitmap(m);
     m = pix->createHeuristicMask();
     d->maskCache.insert( TQString::number( pix->serialNumber() ), m );