rename the following methods:

tqfind find
tqreplace replace
tqcontains contains

2 files changed, 33 insertions, 33 deletions

diff --git a/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblemenu.cpp b/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblemenu.cpp
index 21a99b1..4a120d9 100644
--- a/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblemenu.cpp
+++ b/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblemenu.cpp
@@ -81,7 +81,7 @@ TQString TQAccessiblePopup::text( Text t, int control ) const
     TQMenuItem *item = 0;
     if ( control ) {
 	id = popupMenu()->idAt( control - 1 );
-	item = popupMenu()->tqfindItem( id );
+	item = popupMenu()->findItem( id );
     }
 
     switch ( t ) {
@@ -110,7 +110,7 @@ TQAccessible::Role TQAccessiblePopup::role( int control ) const
     if ( !control )
 	return PopupMenu;
     
-    TQMenuItem *item = popupMenu()->tqfindItem( popupMenu()->idAt( control -1 ) );
+    TQMenuItem *item = popupMenu()->findItem( popupMenu()->idAt( control -1 ) );
     if ( item && item->isSeparator() )
 	return Separator;
     return MenuItem;
@@ -123,7 +123,7 @@ TQAccessible::State TQAccessiblePopup::state( int control ) const
 	return (State)s;
 
     int id = popupMenu()->idAt( control -1 );
-    TQMenuItem *item = popupMenu()->tqfindItem( id );
+    TQMenuItem *item = popupMenu()->findItem( id );
     if ( !item )
 	return (State)s;
 
@@ -145,7 +145,7 @@ bool TQAccessiblePopup::doDefaultAction( int control )
 	return FALSE;
 
     int id = popupMenu()->idAt( control -1 );
-    TQMenuItem *item = popupMenu()->tqfindItem( id );
+    TQMenuItem *item = popupMenu()->findItem( id );
     if ( !item || !item->isEnabled() )
 	return FALSE;
 
@@ -159,7 +159,7 @@ bool TQAccessiblePopup::setFocus( int control )
 	return FALSE;
 
     int id = popupMenu()->idAt( control -1 );
-    TQMenuItem *item = popupMenu()->tqfindItem( id );
+    TQMenuItem *item = popupMenu()->findItem( id );
     if ( !item || !item->isEnabled() )
 	return FALSE;
 
@@ -268,7 +268,7 @@ TQAccessible::Role TQAccessibleMenuBar::role( int control ) const
     if ( !control )
 	return MenuBar;
 
-    TQMenuItem *item = menuBar()->tqfindItem( menuBar()->idAt( control -1 ) );
+    TQMenuItem *item = menuBar()->findItem( menuBar()->idAt( control -1 ) );
     if ( item && item->isSeparator() )
 	return Separator;
     return MenuItem;
@@ -281,7 +281,7 @@ TQAccessible::State TQAccessibleMenuBar::state( int control ) const
 	return (State)s;
 
     int id = menuBar()->idAt( control -1 );
-    TQMenuItem *item = menuBar()->tqfindItem( id );
+    TQMenuItem *item = menuBar()->findItem( id );
     if ( !item )
 	return (State)s;
 
@@ -301,7 +301,7 @@ bool TQAccessibleMenuBar::doDefaultAction( int control )
 	return FALSE;
 
     int id = menuBar()->idAt( control -1 );
-    TQMenuItem *item = menuBar()->tqfindItem( id );
+    TQMenuItem *item = menuBar()->findItem( id );
     if ( !item || !item->isEnabled() )
 	return FALSE;
 
@@ -315,7 +315,7 @@ bool TQAccessibleMenuBar::setFocus( int control )
 	return FALSE;
 
     int id = menuBar()->idAt( control -1 );
-    TQMenuItem *item = menuBar()->tqfindItem( id );
+    TQMenuItem *item = menuBar()->findItem( id );
     if ( !item || !item->isEnabled() )
 	return FALSE;
 
diff --git a/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp b/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp
index 6741bf0..224ee09 100644
--- a/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp
+++ b/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp
@@ -81,7 +81,7 @@ TQString hotKey( const TQString &text )
     TQString n = text;
     int fa = 0;
     bool ac = FALSE;
-    while ( ( fa = n.tqfind( "&", fa ) ) != -1 ) {
+    while ( ( fa = n.find( "&", fa ) ) != -1 ) {
 	if ( n.at(fa+1) != '&' ) {
 	    ac = TRUE;
 	    break;
@@ -134,7 +134,7 @@ int TQAccessibleWidget::controlAt( int x, int y ) const
 {
     TQWidget *w = widget();
     TQPoint gp = w->mapToGlobal( TQPoint( 0, 0 ) );
-    if ( !TQRect( gp.x(), gp.y(), w->width(), w->height() ).tqcontains( x, y ) )
+    if ( !TQRect( gp.x(), gp.y(), w->width(), w->height() ).contains( x, y ) )
 	return -1;
 
     TQPoint rp = w->mapFromGlobal( TQPoint( x, y ) );
@@ -148,7 +148,7 @@ int TQAccessibleWidget::controlAt( int x, int y ) const
     TQWidget *child = 0;
     int index = 1;
     while ( ( child = (TQWidget*)it.current() ) ) {
-	if ( !child->isTopLevel() && !child->isHidden() && child->tqgeometry().tqcontains( rp ) ) {
+	if ( !child->isTopLevel() && !child->isHidden() && child->tqgeometry().contains( rp ) ) {
 	    delete list;
 	    return index;
 	}
@@ -244,7 +244,7 @@ int TQAccessibleWidget::navigate( NavDirection dir, int startControl ) const
 		return -1;
 
 	    TQObjectList *list = w->queryList( "TQWidget", 0, FALSE, FALSE );
-	    int index = list->tqfindRef( w2 );
+	    int index = list->findRef( w2 );
 	    delete list;
 	    return ( index != -1 ) ? index+1 : -1;
 	}
@@ -654,9 +654,9 @@ TQAccessibleSpinWidget::TQAccessibleSpinWidget( TQObject *o )
 int TQAccessibleSpinWidget::controlAt( int x, int y ) const
 {
     TQPoint tl = widget()->mapFromGlobal( TQPoint( x, y ) );
-    if ( ((TQSpinWidget*)widget())->upRect().tqcontains( tl ) )
+    if ( ((TQSpinWidget*)widget())->upRect().contains( tl ) )
 	return 1;
-    else if ( ((TQSpinWidget*)widget())->downRect().tqcontains( tl ) )
+    else if ( ((TQSpinWidget*)widget())->downRect().contains( tl ) )
 	return 2;
 
     return -1;
@@ -832,7 +832,7 @@ TQScrollBar *TQAccessibleScrollBar::scrollBar() const
 int TQAccessibleScrollBar::controlAt( int x, int y ) const
 {
     for ( int i = 1; i <= childCount(); i++ ) {
-	if ( rect(i).tqcontains( x,y ) )
+	if ( rect(i).contains( x,y ) )
 	    return i;
     }
     return 0;
@@ -1029,7 +1029,7 @@ TQSlider *TQAccessibleSlider::slider() const
 int TQAccessibleSlider::controlAt( int x, int y ) const
 {
     for ( int i = 1; i <= childCount(); i++ ) {
-	if ( rect(i).tqcontains( x,y ) )
+	if ( rect(i).contains( x,y ) )
 	    return i;
     }
     return 0;
@@ -1331,7 +1331,7 @@ int TQAccessibleHeader::controlAt( int x, int y ) const
 {
     TQPoint point = header()->mapFromGlobal( TQPoint( x, y ) );
     for ( int i = 0; i < header()->count(); i++ ) {
-	if ( header()->sectionRect( i ).tqcontains( point ) )
+	if ( header()->sectionRect( i ).contains( point ) )
 	    return i+1;
     }
     return -1;
@@ -1675,7 +1675,7 @@ TQComboBox *TQAccessibleComboBox::comboBox() const
 int TQAccessibleComboBox::controlAt( int x, int y ) const
 {
     for ( int i = childCount(); i >= 0; --i ) {
-	if ( rect( i ).tqcontains( x, y ) )
+	if ( rect( i ).contains( x, y ) )
 	    return i;
     }
     return -1;
@@ -1976,7 +1976,7 @@ TQString TQAccessibleTitleBar::text( Text t, int control ) const
 	case 5:
 	    return TQTitleBar::tr("Closes the window");
 	default:
-	    return TQTitleBar::tr("Displays the name of the window and tqcontains controls to manipulate it");
+	    return TQTitleBar::tr("Displays the name of the window and contains controls to manipulate it");
 	}
     default:
 	break;
@@ -2353,7 +2353,7 @@ TQMemArray<int> TQAccessibleListBox::selection() const
   \brief The TQAccessibleListView class implements the TQAccessibleInterface for list views.
 */
 
-static TQListViewItem *tqfindLVItem( TQListView* listView, int control )
+static TQListViewItem *findLVItem( TQListView* listView, int control )
 {
     int id = 1;
     TQListViewItemIterator it( listView );
@@ -2402,7 +2402,7 @@ int TQAccessibleListView::itemAt( int x, int y ) const
 /*! \reimp */
 TQRect TQAccessibleListView::tqitemRect( int control ) const
 {
-    TQListViewItem *item = tqfindLVItem( listView(), control );
+    TQListViewItem *item = findLVItem( listView(), control );
     if ( !item )
 	return TQRect();
     return listView()->tqitemRect( item );
@@ -2427,7 +2427,7 @@ TQString TQAccessibleListView::text( Text t, int control ) const
     if ( !control || t != Name )
 	return TQAccessibleScrollView::text( t, control );
 
-    TQListViewItem *item = tqfindLVItem( listView(), control );
+    TQListViewItem *item = findLVItem( listView(), control );
     if ( !item )
 	return TQString::null;
     return item->text( 0 );
@@ -2446,7 +2446,7 @@ TQAccessible::State TQAccessibleListView::state( int control ) const
 {
     int state = TQAccessibleScrollView::state( control );
     TQListViewItem *item;
-    if ( !control || !( item = tqfindLVItem( listView(), control ) ) )
+    if ( !control || !( item = findLVItem( listView(), control ) ) )
 	return (State)state;
 
     if ( item->isSelectable() ) {
@@ -2507,7 +2507,7 @@ bool TQAccessibleListView::setFocus( int control )
     if ( !control || !res )
 	return res;
 
-    TQListViewItem *item = tqfindLVItem( listView(), control );
+    TQListViewItem *item = findLVItem( listView(), control );
     if ( !item )
 	return FALSE;
     listView()->setCurrentItem( item );
@@ -2522,7 +2522,7 @@ bool TQAccessibleListView::setSelected( int control, bool on, bool extend )
 	listView()->selectionMode() != TQListView::Multi ) )
 	return FALSE;
 
-    TQListViewItem *item = tqfindLVItem( listView(), control );
+    TQListViewItem *item = findLVItem( listView(), control );
     if ( !item )
 	return FALSE;
     if ( !extend ) {
@@ -2578,7 +2578,7 @@ TQMemArray<int> TQAccessibleListView::selection() const
   \brief The TQAccessibleIconView class implements the TQAccessibleInterface for icon views.
 */
 
-static TQIconViewItem *tqfindIVItem( TQIconView *iconView, int control )
+static TQIconViewItem *findIVItem( TQIconView *iconView, int control )
 {
     int id = 1;
     TQIconViewItem *item = iconView->firstItem();
@@ -2608,14 +2608,14 @@ TQIconView *TQAccessibleIconView::iconView() const
 /*! \reimp */
 int TQAccessibleIconView::itemAt( int x, int y ) const
 {
-    TQIconViewItem *item = iconView()->tqfindItem( TQPoint( x, y ) );
+    TQIconViewItem *item = iconView()->findItem( TQPoint( x, y ) );
     return iconView()->index( item ) + 1;
 }
 
 /*! \reimp */
 TQRect TQAccessibleIconView::tqitemRect( int control ) const
 {
-    TQIconViewItem *item = tqfindIVItem( iconView(), control );
+    TQIconViewItem *item = findIVItem( iconView(), control );
 
     if ( !item )
 	return TQRect();
@@ -2634,7 +2634,7 @@ TQString TQAccessibleIconView::text( Text t, int control ) const
     if ( !control || t != Name )
 	return TQAccessibleScrollView::text( t, control );
 
-    TQIconViewItem *item = tqfindIVItem( iconView(), control );
+    TQIconViewItem *item = findIVItem( iconView(), control );
     if ( !item )
 	return TQString::null;
     return item->text();
@@ -2653,7 +2653,7 @@ TQAccessible::State TQAccessibleIconView::state( int control ) const
 {
     int state = TQAccessibleScrollView::state( control );
     TQIconViewItem *item;
-    if ( !control || !( item = tqfindIVItem( iconView(), control ) ) )
+    if ( !control || !( item = findIVItem( iconView(), control ) ) )
 	return (State)state;
 
     if ( item->isSelectable() ) {
@@ -2695,7 +2695,7 @@ bool TQAccessibleIconView::setFocus( int control )
     if ( !control || !res )
 	return res;
 
-    TQIconViewItem *item = tqfindIVItem( iconView(), control );
+    TQIconViewItem *item = findIVItem( iconView(), control );
     if ( !item )
 	return FALSE;
     iconView()->setCurrentItem( item );
@@ -2710,7 +2710,7 @@ bool TQAccessibleIconView::setSelected( int control, bool on, bool extend  )
 	iconView()->selectionMode() != TQIconView::Multi ) )
 	return FALSE;
 
-    TQIconViewItem *item = tqfindIVItem( iconView(), control );
+    TQIconViewItem *item = findIVItem( iconView(), control );
     if ( !item )
 	return FALSE;
     if ( !extend ) {