rename the following methods:

tqfind find
tqreplace replace
tqcontains contains

8 files changed, 24 insertions, 24 deletions

diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/addressbook/addressbook.ui.h b/experimental/tqtinterface/qt4/tools/designer/examples/addressbook/addressbook.ui.h
index bd3c218ab..208c62804 100644
--- a/experimental/tqtinterface/qt4/tools/designer/examples/addressbook/addressbook.ui.h
+++ b/experimental/tqtinterface/qt4/tools/designer/examples/addressbook/addressbook.ui.h
@@ -129,7 +129,7 @@ void AddressBook::searchAddress( const TQString &expr )
     TQListViewItemIterator it( addressView );
     while ( it.current() ) {
 	for ( int i = 0; i < 7; ++i ) {
-	    if ( it.current()->text( i ).tqfind( expr ) != -1 )
+	    if ( it.current()->text( i ).find( expr ) != -1 )
 		addressView->setSelected( it.current(), TRUE );
 	}
 	++it;
diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/book/book8/editbook.ui.h b/experimental/tqtinterface/qt4/tools/designer/examples/book/book8/editbook.ui.h
index 12e6eb6db..45876fe71 100644
--- a/experimental/tqtinterface/qt4/tools/designer/examples/book/book8/editbook.ui.h
+++ b/experimental/tqtinterface/qt4/tools/designer/examples/book/book8/editbook.ui.h
@@ -38,7 +38,7 @@ void EditBookForm::primeUpdateBook( TQSqlRecord * buffer )
     int id = buffer->value( "authorid" ).toInt();
     for ( int i = 0; i < ComboBoxAuthor->count(); i++ ) {
 	TQString author = ComboBoxAuthor->text( i );
-	if ( authorMap.tqcontains( author ) && authorMap[author] == id ) {
+	if ( authorMap.contains( author ) && authorMap[author] == id ) {
 	    ComboBoxAuthor->setCurrentItem( i ) ;
 	    break;
 	}
diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui.h b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui.h
index 8c502771a..70d7f62f3 100644
--- a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui.h
+++ b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui.h
@@ -20,7 +20,7 @@ void ColorNameForm::validate()
 {
     TQString name = colorLineEdit->text();
     if ( ! name.isEmpty() &&
-	 ( m_colors.isEmpty() || ! m_colors.tqcontains( name ) ) )
+	 ( m_colors.isEmpty() || ! m_colors.contains( name ) ) )
 	accept();
     else
 	colorLineEdit->selectAll();
diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui
index 2863f02f8..6cec9a718 100644
--- a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui
+++ b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui
@@ -35,12 +35,12 @@
                         <string>&amp;Look for</string>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring>tqfindLineEdit</cstring>
+                        <cstring>findLineEdit</cstring>
                     </property>
                 </widget>
                 <widget class="TQLineEdit">
                     <property name="name">
-                        <cstring>tqfindLineEdit</cstring>
+                        <cstring>findLineEdit</cstring>
                     </property>
                 </widget>
             </hbox>
@@ -89,7 +89,7 @@
                 </spacer>
                 <widget class="TQPushButton">
                     <property name="name">
-                        <cstring>tqfindPushButton</cstring>
+                        <cstring>findPushButton</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Find</string>
@@ -118,10 +118,10 @@
         <slot>accept()</slot>
     </connection>
     <connection>
-        <sender>tqfindPushButton</sender>
+        <sender>findPushButton</sender>
         <signal>clicked()</signal>
         <receiver>FindForm</receiver>
-        <slot>tqfind()</slot>
+        <slot>find()</slot>
     </connection>
 </connections>
 <includes>
@@ -131,7 +131,7 @@
     <signal>lookfor(const QString&amp;)</signal>
 </Q_SIGNALS>
 <Q_SLOTS>
-    <slot>tqfind()</slot>
+    <slot>find()</slot>
 </Q_SLOTS>
 <functions>
     <function>notfound()</function>
diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui.h b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui.h
index 1f6e6b99b..1f3e993b6 100644
--- a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui.h
+++ b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui.h
@@ -7,12 +7,12 @@
 *****************************************************************************/
 
 
-void FindForm::tqfind()
+void FindForm::find()
 {
-    emit lookfor( tqfindLineEdit->text() );
+    emit lookfor( findLineEdit->text() );
 }
 
 void FindForm::notfound()
 {
-    tqfindLineEdit->selectAll();
+    findLineEdit->selectAll();
 }
diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui
index 448a88eb8..cf978bfdd 100644
--- a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui
+++ b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui
@@ -526,7 +526,7 @@
     </connection>
 </connections>
 <includes>
-    <include location="local" impldecl="in declaration">tqfindform.h</include>
+    <include location="local" impldecl="in declaration">findform.h</include>
     <include location="local" impldecl="in implementation">qsettings.h</include>
     <include location="local" impldecl="in implementation">qradiobutton.h</include>
     <include location="local" impldecl="in implementation">qcheckbox.h</include>
@@ -560,7 +560,7 @@
     <variable>int m_clip_as;</variable>
     <variable>bool m_show_web;</variable>
     <variable>QClipboard *clipboard;</variable>
-    <variable>FindForm *tqfindForm;</variable>
+    <variable>FindForm *findForm;</variable>
     <variable>QMap&lt;QString,QColor&gt; m_colors;</variable>
 </variables>
 <Q_SLOTS>
diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui.h b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui.h
index 0026d8a70..62c072976 100644
--- a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui.h
+++ b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui.h
@@ -22,7 +22,7 @@ void MainForm::init()
     if ( clipboard->supportsSelection() )
 	clipboard->setSelectionMode( TRUE );
 
-    tqfindForm = 0;
+    findForm = 0;
     loadSettings();
     m_filename = "";
     m_changed = FALSE;
@@ -354,12 +354,12 @@ void MainForm::editCopy()
 
 void MainForm::editFind()
 {
-    if ( ! tqfindForm ) {
-	tqfindForm = new FindForm( this );
-	connect( tqfindForm, TQT_SIGNAL( lookfor(const TQString&) ),
+    if ( ! findForm ) {
+	findForm = new FindForm( this );
+	connect( findForm, TQT_SIGNAL( lookfor(const TQString&) ),
 		 this, TQT_SLOT( lookfor(const TQString&) ) );
     }
-    tqfindForm->show();
+    findForm->show();
 }
 
 void MainForm::lookfor( const TQString& text )
@@ -373,7 +373,7 @@ void MainForm::lookfor( const TQString& text )
     if ( visible == tablePage && colorTable->numRows() ) {
 	int row = colorTable->currentRow();
 	for ( int i = row + 1; i < colorTable->numRows(); ++i )
-	    if ( colorTable->text( i, 0 ).lower().tqcontains( ltext ) ) {
+	    if ( colorTable->text( i, 0 ).lower().contains( ltext ) ) {
 		colorTable->setCurrentCell( i, 0 );
 		colorTable->clearSelection();
 		colorTable->selectRow( i );
@@ -387,7 +387,7 @@ void MainForm::lookfor( const TQString& text )
     else if ( visible == iconsPage ) {
 	TQIconViewItem *start = colorIconView->currentItem();
 	for ( TQIconViewItem *item = start->nextItem(); item; item = item->nextItem() )
-	    if ( item->text().lower().tqcontains( ltext ) ) {
+	    if ( item->text().lower().contains( ltext ) ) {
 		colorIconView->setCurrentItem( item );
 		colorIconView->ensureItemVisible( item );
 		found = TRUE;
@@ -397,9 +397,9 @@ void MainForm::lookfor( const TQString& text )
 	    colorIconView->setCurrentItem( start );
     }
     if ( ! found ) {
-	statusBar()->message( TQString( "Could not tqfind '%1' after here" ).
+	statusBar()->message( TQString( "Could not find '%1' after here" ).
 			      arg( text ) );
-	tqfindForm->notfound();
+	findForm->notfound();
     }
 }
 
diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/richedit/richedit.ui.h b/experimental/tqtinterface/qt4/tools/designer/examples/richedit/richedit.ui.h
index 087d8d0af..e99a3ab69 100644
--- a/experimental/tqtinterface/qt4/tools/designer/examples/richedit/richedit.ui.h
+++ b/experimental/tqtinterface/qt4/tools/designer/examples/richedit/richedit.ui.h
@@ -99,7 +99,7 @@ int EditorForm::saveAndContinue(const TQString & action)
     if ( textEdit->isModified() ) {  
 	switch( TQMessageBox::information(     
 		this, "Rich Edit",   
-		"The document tqcontains unsaved changes.\n"   
+		"The document contains unsaved changes.\n"   
 		"Do you want to save the changes?",   
 		"&Save", "&Don't Save", "&Cancel " + action,   
 		0, // Enter == button 0