rename the following methods:

tqfind find
tqreplace replace
tqcontains contains

22 files changed, 132 insertions, 132 deletions

diff --git a/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp b/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp
index f97cd2e..e13f12b 100644
--- a/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp
+++ b/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp
@@ -476,7 +476,7 @@ bool TQMYSTQLDriver::open( const TQString& db,
     for ( it = raw.begin(); it != raw.end(); ++it ) {
 	TQString tmp( *it );
 	int idx;
-	if ( (idx = tmp.tqfind( '=' )) != -1 ) {
+	if ( (idx = tmp.find( '=' )) != -1 ) {
 	    TQString val( tmp.mid( idx + 1 ) );
 	    val.simplifyWhiteSpace();
 	    if ( val == "TRUE" || val == "1" )
@@ -764,7 +764,7 @@ TQString TQMYSTQLDriver::formatValue( const TQSqlField* field, bool trimStrings
 	case TQVariant::CString: {
 	    // Escape '\' characters
 	    r = TQSqlDriver::formatValue( field );
-	    r.tqreplace( "\\", "\\\\" );
+	    r.replace( "\\", "\\\\" );
 	    break;
 	}
 	default:
diff --git a/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp b/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp
index fda38a8..3401435 100644
--- a/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp
+++ b/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp
@@ -291,7 +291,7 @@ static TQString qGetStringData( STQLHANDLE hStmt, int column, int colSize, bool&
 	    }
 	    // if STQL_SUCCESS_WITH_INFO is returned, indicating that
 	    // more data can be fetched, the length indicator does NOT
-	    // contain the number of bytes returned - it tqcontains the
+	    // contain the number of bytes returned - it contains the
 	    // total number of bytes that CAN be fetched
 	    // colSize-1: remove 0 termination when there is more data to fetch
 	    int rSize = (r == STQL_SUCCESS_WITH_INFO) ? (tqunicode ? colSize-2 : colSize-1) : lengthIndicator;
@@ -521,7 +521,7 @@ bool TQODBCPrivate::setConnectionOptions( const TQString& connOpts )
     for ( TQStringList::ConstIterator it = raw.begin(); it != raw.end(); ++it ) {
 	TQString tmp( *it );
 	int idx;
-	if ( (idx = tmp.tqfind( '=' )) != -1 )
+	if ( (idx = tmp.find( '=' )) != -1 )
 	    connMap[ tmp.left( idx ) ] = tmp.mid( idx + 1 ).simplifyWhiteSpace();
 	else
 	    qWarning( "TQODBCDriver::open: Illegal connect option value '%s'", tmp.latin1() );
@@ -863,7 +863,7 @@ TQVariant TQODBCResult::data( int field )
 	qWarning( "TQODBCResult::data: column %d out of range", field );
 	return TQVariant();
     }
-    if ( fieldCache.tqcontains( field ) )
+    if ( fieldCache.contains( field ) )
 	return fieldCache[ field ];
     STQLRETURN r(0);
     TQSTQLLEN lengthIndicator = 0;
@@ -963,8 +963,8 @@ TQVariant TQODBCResult::data( int field )
 
 bool TQODBCResult::isNull( int field )
 {
-    if ( !fieldCache.tqcontains( field ) ) {
-	// since there is no good way to tqfind out whether the value is NULL
+    if ( !fieldCache.contains( field ) ) {
+	// since there is no good way to find out whether the value is NULL
 	// without fetching the field we'll fetch it here.
 	// (data() also sets the NULL flag)
 	data( field );
@@ -1443,9 +1443,9 @@ bool TQODBCDriver::open( const TQString & db,
     // Create the connection string
     TQString connTQStr;
     // support the "DRIVER={SQL SERVER};SERVER=blah" syntax
-    if ( db.tqcontains(".dsn") )
+    if ( db.contains(".dsn") )
 	connTQStr = "FILEDSN=" + db;
-    else if ( db.tqcontains( "DRIVER" ) || db.tqcontains( "SERVER" ) )
+    else if ( db.contains( "DRIVER" ) || db.contains( "SERVER" ) )
 	connTQStr = db;
     else
 	connTQStr = "DSN=" + db;
diff --git a/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp b/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp
index db233ce..b5885bf 100644
--- a/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp
+++ b/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp
@@ -260,7 +260,7 @@ bool TQPSTQLResult::fetchLast()
 static TQPoint pointFromString( const TQString& s)
 {
     // format '(x,y)'
-    int pivot = s.tqfind( ',' );
+    int pivot = s.find( ',' );
     if ( pivot != -1 ) {
 	int x = s.mid( 1, pivot-1 ).toInt();
 	int y = s.mid( pivot+1, s.length()-pivot-2 ).toInt();
@@ -336,7 +336,7 @@ TQVariant TQPSTQLResult::data( int i )
 	return TQVariant( pointFromString( val ) );
     case TQVariant::Rect: // format '(x,y),(x',y')'
 	{
-	    int pivot = val.tqfind( "),(" );
+	    int pivot = val.find( "),(" );
 	    if ( pivot != -1 )
 		return TQVariant( TQRect( pointFromString( val.mid(pivot+2,val.length()) ), pointFromString( val.mid(0,pivot+1) ) ) );
 	    return TQVariant( TQRect() );
@@ -344,14 +344,14 @@ TQVariant TQPSTQLResult::data( int i )
     case TQVariant::PointArray: // format '((x,y),(x1,y1),...,(xn,yn))'
 	{
 	    TQRegExp pointPattern("\\([0-9-]*,[0-9-]*\\)");
-	    int points = val.tqcontains( pointPattern );
+	    int points = val.contains( pointPattern );
 	    TQPointArray parray( points );
 	    int idx = 1;
 	    for ( int i = 0; i < points; i++ ){
-		int start = val.tqfind( pointPattern, idx );
+		int start = val.find( pointPattern, idx );
 		int end = -1;
 		if ( start != -1 ) {
-		    end = val.tqfind( ')', start+1 );
+		    end = val.find( ')', start+1 );
 		    if ( end != -1 ) {
 			parray.setPoint( i, pointFromString( val.mid(idx, end-idx+1) ) );
 		    }
@@ -1080,7 +1080,7 @@ TQString TQPSTQLDriver::formatValue( const TQSqlField* field,
 		default:
 		    // Escape '\' characters
 		    r = TQSqlDriver::formatValue( field );
-		    r.tqreplace( "\\", "\\\\" );
+		    r.replace( "\\", "\\\\" );
 		    break;
 	    }
 	    break;
diff --git a/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp b/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp
index c94f595..864c4c9 100644
--- a/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp
+++ b/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp
@@ -250,7 +250,7 @@ bool TQSTQLiteResult::reset (const TQString& query)
 	setActive(FALSE);
 	return FALSE;
     }
-    // we have to fetch one row to tqfind out about
+    // we have to fetch one row to find out about
     // the structure of the result set
     d->skippedtqStatus = d->fetchNext(0);
     setSelect(!d->rInf.isEmpty());
@@ -450,7 +450,7 @@ TQSqlIndex TQSTQLiteDriver::primaryIndex(const TQString &tblname) const
 
     TQSqlQuery q = createQuery();
     q.setForwardOnly(TRUE);
-    // finrst tqfind a UNITQUE INDEX
+    // finrst find a UNITQUE INDEX
     q.exec("PRAGMA index_list('" + tblname + "');");
     TQString indexname;
     while(q.next()) {
@@ -468,8 +468,8 @@ TQSqlIndex TQSTQLiteDriver::primaryIndex(const TQString &tblname) const
     while(q.next()) {
 	TQString name = q.value(2).toString();
 	TQSqlVariant::Type type = TQSqlVariant::Invalid;
-	if (rec.tqcontains(name))
-	    type = rec.tqfind(name).type();
+	if (rec.contains(name))
+	    type = rec.find(name).type();
 	index.append(TQSqlField(name, type));
     }
     return index;
diff --git a/tqtinterface/qt4/src/sql/qt_sql.pri b/tqtinterface/qt4/src/sql/qt_sql.pri
index 29845f8..732c674 100644
--- a/tqtinterface/qt4/src/sql/qt_sql.pri
+++ b/tqtinterface/qt4/src/sql/qt_sql.pri
@@ -53,21 +53,21 @@ sql {
 		    $$SQL_CPP/tqsqlselectcursor.cpp \
 		    $$SQL_CPP/drivers/cache/tqsqlcachedresult.cpp
 
-	tqcontains(sql-drivers, all ) {
+	contains(sql-drivers, all ) {
 		sql-driver += psql mysql odbc oci tds db2 sqlite ibase
 	}			
 
-	tqcontains(sql-drivers, psql) {
+	contains(sql-drivers, psql) {
 		HEADERS += $$SQL_CPP/drivers/psql/tqsql_psql.h
 		SOURCES += $$SQL_CPP/drivers/psql/tqsql_psql.cpp
 		DEFINES += TQT_SQL_POSTGRES
 		unix {
-			!tqcontains( LIBS, .*pq.* ) {
+			!contains( LIBS, .*pq.* ) {
 				LIBS *= -lpq
 			}
 		}
 		win32 {
-			!tqcontains( LIBS, .*libpq.* ) {
+			!contains( LIBS, .*libpq.* ) {
 				LIBS *= libpqdll.lib
 			}
 #			win32-msvc: { 
@@ -80,17 +80,17 @@ sql {
 		}
 	}
 
-	tqcontains(sql-drivers, mysql) {
+	contains(sql-drivers, mysql) {
 		HEADERS += $$SQL_CPP/drivers/mysql/tqsql_mysql.h
 		SOURCES += $$SQL_CPP/drivers/mysql/tqsql_mysql.cpp
 		DEFINES += TQT_SQL_MYSQL
 		unix {
-			!tqcontains( LIBS, .*mysql.* ) {
+			!contains( LIBS, .*mysql.* ) {
 				LIBS    *= -lmysqlclient
 			}
 		}
 		win32 {
-			!tqcontains( LIBS, .*mysql.* ) {
+			!contains( LIBS, .*mysql.* ) {
 				LIBS    *= libmysql.lib
 			}
 #			win32-msvc: { 
@@ -103,19 +103,19 @@ sql {
 		}
 	}
 	
-	tqcontains(sql-drivers, odbc) {
+	contains(sql-drivers, odbc) {
 		HEADERS += $$SQL_CPP/drivers/odbc/tqsql_odbc.h
 		SOURCES += $$SQL_CPP/drivers/odbc/tqsql_odbc.cpp
 		DEFINES += TQT_SQL_ODBC
 
 		mac {
-			!tqcontains( LIBS, .*odbc.* ) {
+			!contains( LIBS, .*odbc.* ) {
 				LIBS        *= -liodbc
 			}
 		}
 
 		unix {
-			!tqcontains( LIBS, .*odbc.* ) {
+			!contains( LIBS, .*odbc.* ) {
 				LIBS        *= -lodbc
 			}
 		}
@@ -127,12 +127,12 @@ sql {
 
 	}
 
-	tqcontains(sql-drivers, oci) {
+	contains(sql-drivers, oci) {
 		HEADERS += $$SQL_CPP/drivers/oci/tqsql_oci.h
 		SOURCES += $$SQL_CPP/drivers/oci/tqsql_oci.cpp
 		DEFINES += TQT_SQL_OCI
 		unix {
-			!tqcontains( LIBS, .*clnts.* ) {
+			!contains( LIBS, .*clnts.* ) {
 			    LIBS += -lclntsh -lwtc8
 			}
 		}
@@ -148,7 +148,7 @@ sql {
 		}
 	}
 
-	tqcontains(sql-drivers, tds) {
+	contains(sql-drivers, tds) {
 		HEADERS += $$SQL_CPP/drivers/tds/tqsql_tds.h \
 			   $$SQL_CPP/drivers/shared/tqsql_result.h
 		SOURCES += $$SQL_CPP/drivers/tds/tqsql_tds.cpp \
@@ -170,7 +170,7 @@ sql {
 		}
 	}
 
-	tqcontains(sql-drivers, db2) {
+	contains(sql-drivers, db2) {
 		HEADERS += $$SQL_CPP/drivers/db2/tqsql_db2.h
 		SOURCES += $$SQL_CPP/drivers/db2/tqsql_db2.cpp
 		DEFINES += TQT_SQL_DB2
@@ -183,7 +183,7 @@ sql {
 		}
 	}
 
-	tqcontains(sql-drivers, ibase) {
+	contains(sql-drivers, ibase) {
                 HEADERS += $$SQL_CPP/drivers/ibase/tqsql_ibase.h
                 SOURCES += $$SQL_CPP/drivers/ibase/tqsql_ibase.cpp
                 DEFINES += TQT_SQL_IBASE
@@ -196,8 +196,8 @@ sql {
                 }
 	}
 
-        tqcontains(sql-drivers, sqlite) {
-	    !tqcontains( LIBS, .*sqlite.* ) {
+        contains(sql-drivers, sqlite) {
+	    !contains( LIBS, .*sqlite.* ) {
 
                 INCLUDEPATH += $$SQL_CPP/../3rdparty/sqlite/
 
diff --git a/tqtinterface/qt4/src/sql/tqdatabrowser.cpp b/tqtinterface/qt4/src/sql/tqdatabrowser.cpp
index bf27e14..910fb11 100644
--- a/tqtinterface/qt4/src/sql/tqdatabrowser.cpp
+++ b/tqtinterface/qt4/src/sql/tqdatabrowser.cpp
@@ -964,7 +964,7 @@ bool TQDataBrowser::insertCurrent()
 	updateBoundary();
     } else {
 	refresh();
-	d->cur.tqfindBuffer( cur->primaryIndex() );
+	d->cur.findBuffer( cur->primaryIndex() );
 	updateBoundary();
 	cursorChanged( TQSqlCursor::Insert );
 	return TRUE;
@@ -1002,7 +1002,7 @@ bool TQDataBrowser::updateCurrent()
 	updateBoundary();
     } else {
 	refresh();
-	d->cur.tqfindBuffer( cur->primaryIndex() );
+	d->cur.findBuffer( cur->primaryIndex() );
 	updateBoundary();
 	cur->editBuffer( TRUE );
 	cursorChanged( TQSqlCursor::Update );
diff --git a/tqtinterface/qt4/src/sql/tqdatatable.cpp b/tqtinterface/qt4/src/sql/tqdatatable.cpp
index 496da9d..647c3a2 100644
--- a/tqtinterface/qt4/src/sql/tqdatatable.cpp
+++ b/tqtinterface/qt4/src/sql/tqdatatable.cpp
@@ -197,7 +197,7 @@ void qt_debug_buffer( const TQString& msg, TQSqlRecord* cursor )
 
     The contents of a cell is available as a TQString with text() or as
     a TQVariant with value(). The current record is returned by
-    currentRecord(). Use the tqfind() function to search for a string in
+    currentRecord(). Use the find() function to search for a string in
     the table.
 
     Editing actions can be applied programatically. For example, the
@@ -377,7 +377,7 @@ void TQDataTable::setColumnWidth( int col, int w )
 
 /*!
     Resizes column \a col so that the column width is wide enough to
-    display the widest item the column tqcontains (including the column
+    display the widest item the column contains (including the column
     label). If the table's TQSqlCursor is not currently active, the
     cursor will be refreshed before the column width is calculated. Be
     aware that this function may be slow on tables that contain large
@@ -475,7 +475,7 @@ void TQDataTable::setSort( const TQStringList& sort )
     \overload
 
     Sets the sort to be applied to the displayed data to \a sort. If
-    there is no current cursor, nothing happens. A TQSqlIndex tqcontains
+    there is no current cursor, nothing happens. A TQSqlIndex contains
     field names and their ordering (ASC or DESC); these are used to
     compose the ORDER BY clause.
 
@@ -821,7 +821,7 @@ void TQDataTable::contentsMousePressEvent( TQMouseEvent* e )
 }
 
 /*! \reimp */
-TQWidget* TQDataTable::beginEdit ( int row, int col, bool tqreplace )
+TQWidget* TQDataTable::beginEdit ( int row, int col, bool replace )
 {
     d->editRow = -1;
     d->editCol = -1;
@@ -837,12 +837,12 @@ TQWidget* TQDataTable::beginEdit ( int row, int col, bool tqreplace )
 	// see comment in beginInsert()
 	bool fakeReadOnly = isColumnReadOnly( col );
 	setColumnReadOnly( col, FALSE );
-	TQWidget* w = TQTable::beginEdit( row, col, tqreplace );
+	TQWidget* w = TQTable::beginEdit( row, col, replace );
 	setColumnReadOnly( col, fakeReadOnly );
 	return w;
     }
     if ( d->dat.mode() == TQSql::None && sqlCursor()->canUpdate() && sqlCursor()->primaryIndex().count() > 0 )
-	return beginUpdate( row, col, tqreplace );
+	return beginUpdate( row, col, replace );
     return 0;
 }
 
@@ -1009,11 +1009,11 @@ bool TQDataTable::beginInsert()
 
     \a row and \a col refer to the row and column in the TQDataTable.
 
-    (\a tqreplace is provided for reimplementors and reflects the API of
+    (\a replace is provided for reimplementors and reflects the API of
     TQTable::beginEdit().)
 */
 
-TQWidget* TQDataTable::beginUpdate ( int row, int col, bool tqreplace )
+TQWidget* TQDataTable::beginUpdate ( int row, int col, bool replace )
 {
     if ( !sqlCursor() || isReadOnly() || isColumnReadOnly( col ) )
 	return 0;
@@ -1023,7 +1023,7 @@ TQWidget* TQDataTable::beginUpdate ( int row, int col, bool tqreplace )
 	d->editBuffer = sqlCursor()->primeUpdate();
 	sqlCursor()->seek( currentRow() );
 	emit primeUpdate( d->editBuffer );
-	return TQTable::beginEdit( row, col, tqreplace );
+	return TQTable::beginEdit( row, col, replace );
     }
     return 0;
 }
@@ -1075,7 +1075,7 @@ bool TQDataTable::insertCurrent()
 	    endInsert();
 	    refresh();
 	    TQSqlIndex idx = sqlCursor()->primaryIndex();
-	    tqfindBuffer( idx, d->lastAt );
+	    findBuffer( idx, d->lastAt );
 	    repaintContents( contentsX(), contentsY(), visibleWidth(), visibleHeight(), FALSE );
 	    emit cursorChanged( TQSql::Insert );
 	}
@@ -1276,12 +1276,12 @@ TQSql::Confirm  TQDataTable::confirmCancel( TQSql::Op m )
     caseSensitive is FALSE the case of \a str will be ignored.
 
     The search will wrap, i.e. if the first (or if backwards is TRUE,
-    last) cell is reached without tqfinding \a str the search will
+    last) cell is reached without finding \a str the search will
     continue until it reaches the starting cell. If \a str is not
     found the search will fail and the current cell will remain
     unchanged.
 */
-void TQDataTable::tqfind( const TQString & str, bool caseSensitive, bool backwards )
+void TQDataTable::find( const TQString & str, bool caseSensitive, bool backwards )
 {
     if ( !sqlCursor() )
 	return;
@@ -1312,7 +1312,7 @@ void TQDataTable::tqfind( const TQString & str, bool caseSensitive, bool backwar
 		if( !caseSensitive ){
 		    text = text.lower();
 		}
-		if( text.tqcontains( tmp ) ){
+		if( text.contains( tmp ) ){
 		    setCurrentCell( row, i );
 		    col = i;
 		    found = TRUE;
@@ -2147,12 +2147,12 @@ void TQDataTable::refresh()
     searching.
 */
 
-bool TQDataTable::tqfindBuffer( const TQSqlIndex& idx, int atHint )
+bool TQDataTable::findBuffer( const TQSqlIndex& idx, int atHint )
 {
     TQSqlCursor* cur = sqlCursor();
     if ( !cur )
 	return FALSE;
-    bool found = d->cur.tqfindBuffer( idx, atHint );
+    bool found = d->cur.findBuffer( idx, atHint );
     if ( found )
 	setCurrentCell( cur->at(), currentColumn() );
     return found;
diff --git a/tqtinterface/qt4/src/sql/tqdatatable.h b/tqtinterface/qt4/src/sql/tqdatatable.h
index 657dc9c..2f1c5dd 100644
--- a/tqtinterface/qt4/src/sql/tqdatatable.h
+++ b/tqtinterface/qt4/src/sql/tqdatatable.h
@@ -152,7 +152,7 @@ public:
     int          numRows() const;
     void         setNumCols( int c );
     void         setNumRows ( int r );
-    bool         tqfindBuffer( const TQSqlIndex& idx, int atHint = 0 );
+    bool         findBuffer( const TQSqlIndex& idx, int atHint = 0 );
 
     void 	 hideColumn( int col );
     void 	 showColumn( int col );
@@ -167,7 +167,7 @@ Q_SIGNALS:
     void         cursorChanged( TQSql::Op mode );
 
 public Q_SLOTS:
-    virtual void tqfind( const TQString & str, bool caseSensitive,
+    virtual void find( const TQString & str, bool caseSensitive,
 			     bool backwards );
     virtual void sortAscending( int col );
     virtual void sortDescending( int col );
@@ -188,14 +188,14 @@ protected:
     virtual void handleError( const TQSqlError& e );
 
     virtual bool beginInsert();
-    virtual TQWidget* beginUpdate ( int row, int col, bool tqreplace );
+    virtual TQWidget* beginUpdate ( int row, int col, bool replace );
 
     bool         eventFilter( TQObject *o, TQEvent *e );
     void         keyPressEvent( TQKeyEvent* );
     void         resizeEvent ( TQResizeEvent * );
     void         contentsMousePressEvent( TQMouseEvent* e );
     void         contentsContextMenuEvent( TQContextMenuEvent* e );
-    void         endEdit( int row, int col, bool accept, bool tqreplace );
+    void         endEdit( int row, int col, bool accept, bool replace );
     TQWidget *    createEditor( int row, int col, bool initFromCell ) const;
     void         activateNextCell();
     int          indexOf( uint i ) const; // ### make this public in 4.0
@@ -229,7 +229,7 @@ private Q_SLOTS:
 private:
     TQString 	 fieldToString( const TQSqlField * field );
     void         init();
-    TQWidget*     beginEdit ( int row, int col, bool tqreplace );
+    TQWidget*     beginEdit ( int row, int col, bool replace );
     void         updateRow( int row );
     void         endInsert();
     void         endUpdate();
diff --git a/tqtinterface/qt4/src/sql/tqsqlcursor.cpp b/tqtinterface/qt4/src/sql/tqsqlcursor.cpp
index 0d9fc53..621d693 100644
--- a/tqtinterface/qt4/src/sql/tqsqlcursor.cpp
+++ b/tqtinterface/qt4/src/sql/tqsqlcursor.cpp
@@ -134,11 +134,11 @@ TQString qWhereClause( TQSqlRecord* rec, const TQString& prefix, const TQString&
     A TQSqlCursor is a database record (see \l TQSqlRecord) that
     corresponds to a table or view within an SQL database (see \l
     TQSqlDatabase). There are two buffers in a cursor, one used for
-    browsing and one used for editing records. Each buffer tqcontains a
+    browsing and one used for editing records. Each buffer contains a
     list of fields which correspond to the fields in the table or
     view.
 
-    When positioned on a valid record, the browse buffer tqcontains the
+    When positioned on a valid record, the browse buffer contains the
     values of the current record's fields from the database. The edit
     buffer is separate, and is used for editing existing records and
     inserting new records.
@@ -168,7 +168,7 @@ TQString qWhereClause( TQSqlRecord* rec, const TQString& prefix, const TQString&
     When next() returns FALSE, there are no more records to process,
     and the loop terminates.
 
-    For editing records (rows of data), a cursor tqcontains a separate
+    For editing records (rows of data), a cursor contains a separate
     edit buffer which is independent of the fields used when browsing.
     The functions insert(), update() and del() operate on the edit
     buffer. This allows the cursor to be repositioned to other
@@ -216,7 +216,7 @@ TQString qWhereClause( TQSqlRecord* rec, const TQString& prefix, const TQString&
     from becoming invalid. The edits will still not be visible when
     navigating the cursor until select() is called.
 
-    TQSqlCursor tqcontains virtual methods which allow editing behavior
+    TQSqlCursor contains virtual methods which allow editing behavior
     to be customized by subclasses. This allows custom cursors to be
     created that encapsulate the editing behavior of a database table
     for an entire application. For example, a cursor can be customized
@@ -548,7 +548,7 @@ TQSqlIndex TQSqlCursor::primaryIndex( bool setFromCursor ) const
     if ( setFromCursor ) {
 	for ( uint i = 0; i < d->priIndx.count(); ++i ) {
 	    const TQString fn = d->priIndx.fieldName( i );
-	    if ( tqcontains( fn ) )
+	    if ( contains( fn ) )
 		d->priIndx.setValue( i, value( fn ) );
 	}
     }
@@ -737,9 +737,9 @@ bool TQSqlCursor::select( const TQSqlIndex& sort )
 
     In this example the TQSqlIndex, pk, is used for two different
     purposes. When used as the filter (first) argument, the field
-    names it tqcontains are used to construct the WHERE clause, each set
+    names it contains are used to construct the WHERE clause, each set
     to the current cursor value, \c{WHERE id=10}, in this case. When
-    used as the sort (second) argument the field names it tqcontains are
+    used as the sort (second) argument the field names it contains are
     used for the ORDER BY clause, \c{ORDER BY id} in this example.
 */
 
diff --git a/tqtinterface/qt4/src/sql/tqsqldatabase.cpp b/tqtinterface/qt4/src/sql/tqsqldatabase.cpp
index 45cca58..70a15ae 100644
--- a/tqtinterface/qt4/src/sql/tqsqldatabase.cpp
+++ b/tqtinterface/qt4/src/sql/tqsqldatabase.cpp
@@ -155,7 +155,7 @@ public:
     static TQSqlDatabase* addDatabase( TQSqlDatabase* db, const TQString & name );
     static void          removeDatabase( const TQString& name );
     static void          removeDatabase( TQSqlDatabase* db );
-    static bool          tqcontains( const TQString& name );
+    static bool          contains( const TQString& name );
     static TQDriverDict*  driverDict();
 
 protected:
@@ -229,11 +229,11 @@ TQSqlDatabaseManager* TQSqlDatabaseManager::instance()
 
 TQSqlDatabase* TQSqlDatabaseManager::database( const TQString& name, bool open )
 {
-    if ( !tqcontains( name ) )
+    if ( !contains( name ) )
 	return 0;
 
     TQSqlDatabaseManager* sqlConnection = instance();
-    TQSqlDatabase* db = sqlConnection->dbDict.tqfind( name );
+    TQSqlDatabase* db = sqlConnection->dbDict.find( name );
     if ( db && !db->isOpen() && open ) {
 	db->open();
 #ifdef TQT_CHECK_RANGE
@@ -246,14 +246,14 @@ TQSqlDatabase* TQSqlDatabaseManager::database( const TQString& name, bool open )
 }
 
 /*!
-    Returns TRUE if the list of database connections tqcontains \a name;
+    Returns TRUE if the list of database connections contains \a name;
     otherwise returns FALSE.
 */
 
-bool TQSqlDatabaseManager::tqcontains( const TQString& name )
+bool TQSqlDatabaseManager::contains( const TQString& name )
 {
    TQSqlDatabaseManager* sqlConnection = instance();
-   TQSqlDatabase* db = sqlConnection->dbDict.tqfind( name );
+   TQSqlDatabase* db = sqlConnection->dbDict.find( name );
    if ( db )
        return TRUE;
    return FALSE;
@@ -280,7 +280,7 @@ TQSqlDatabase* TQSqlDatabaseManager::addDatabase( TQSqlDatabase* db, const TQStr
     TQSqlDatabaseManager* sqlConnection = instance();
     if( sqlConnection == 0 )
 	return 0;
-    if ( tqcontains( name ) )
+    if ( contains( name ) )
 	sqlConnection->removeDatabase( name );
     sqlConnection->dbDict.insert( name, db );
     return db;
@@ -365,7 +365,7 @@ public:
     \module sql
 
     Note that transaction handling is not supported by every SQL
-    database. You can tqfind out whether transactions are supported
+    database. You can find out whether transactions are supported
     using TQSqlDriver::hasFeature().
 
     The TQSqlDatabase class provides an abstract interface for
@@ -393,7 +393,7 @@ public:
     database connection.
 
     \warning If you add a database with the same name as an
-    existing database, the new database will tqreplace the old one.
+    existing database, the new database will replace the old one.
     This will happen automatically if you call this function more
     than once without specifying \a connectionName.
 
@@ -486,41 +486,41 @@ TQStringList TQSqlDatabase::drivers()
 
     TQDictIterator<TQSqlDriverCreatorBase> itd( *TQSqlDatabaseManager::driverDict() );
     while ( itd.current() ) {
-	if ( !l.tqcontains( itd.currentKey() ) )
+	if ( !l.contains( itd.currentKey() ) )
 	    l << itd.currentKey();
 	++itd;
     }
 
 #ifdef TQT_STQL_POSTGRES
-    if ( !l.tqcontains( "TQPSQL7" ) )
+    if ( !l.contains( "TQPSQL7" ) )
 	l << "TQPSQL7";
 #endif
 #ifdef TQT_STQL_MYSQL
-    if ( !l.tqcontains( "TQMYSQL3" ) )
+    if ( !l.contains( "TQMYSQL3" ) )
 	l << "TQMYSQL3";
 #endif
 #ifdef TQT_STQL_ODBC
-    if ( !l.tqcontains( "TQODBC3" ) )
+    if ( !l.contains( "TQODBC3" ) )
 	l << "TQODBC3";
 #endif
 #ifdef TQT_STQL_OCI
-    if ( !l.tqcontains( "TQOCI8" ) )
+    if ( !l.contains( "TQOCI8" ) )
 	l << "TQOCI8";
 #endif
 #ifdef TQT_STQL_TDS
-    if ( !l.tqcontains( "TQTDS7" ) )
+    if ( !l.contains( "TQTDS7" ) )
 	l << "TQTDS7";
 #endif
 #ifdef TQT_STQL_DB2
-    if ( !l.tqcontains( "TQDB2" ) )
+    if ( !l.contains( "TQDB2" ) )
 	l << "TQDB2";
 #endif
 #ifdef TQT_STQL_STQLITE
-    if ( !l.tqcontains( "TQSQLITE" ) )
+    if ( !l.contains( "TQSQLITE" ) )
 	l << "TQSQLITE";
 #endif
 #ifdef TQT_STQL_IBASE
-    if ( !l.tqcontains( "TQIBASE" ) )
+    if ( !l.contains( "TQIBASE" ) )
 	l << "TQIBASE";
 #endif
 
@@ -551,13 +551,13 @@ void TQSqlDatabase::registerSqlDriver( const TQString& name, const TQSqlDriverCr
 }
 
 /*!
-    Returns TRUE if the list of database connections tqcontains \a
+    Returns TRUE if the list of database connections contains \a
     connectionName; otherwise returns FALSE.
 */
 
-bool TQSqlDatabase::tqcontains( const TQString& connectionName )
+bool TQSqlDatabase::contains( const TQString& connectionName )
 {
-    return TQSqlDatabaseManager::tqcontains( connectionName );
+    return TQSqlDatabaseManager::contains( connectionName );
 }
 
 
diff --git a/tqtinterface/qt4/src/sql/tqsqldatabase.h b/tqtinterface/qt4/src/sql/tqsqldatabase.h
index 730fb44..98e7be2 100644
--- a/tqtinterface/qt4/src/sql/tqsqldatabase.h
+++ b/tqtinterface/qt4/src/sql/tqsqldatabase.h
@@ -134,7 +134,7 @@ public:
     static TQSqlDatabase* database( const TQString& connectionName = defaultConnection, bool open = TRUE );
     static void          removeDatabase( const TQString& connectionName );
     static void          removeDatabase( TQSqlDatabase* db );
-    static bool          tqcontains( const TQString& connectionName = defaultConnection );
+    static bool          contains( const TQString& connectionName = defaultConnection );
     static TQStringList   drivers();
     static void          registerSqlDriver( const TQString& name, const TQSqlDriverCreatorBase* creator ); // ### 4.0: creator should not be const
     static bool 	 isDriverAvailable( const TQString& name );
diff --git a/tqtinterface/qt4/src/sql/tqsqldriver.cpp b/tqtinterface/qt4/src/sql/tqsqldriver.cpp
index 3f8cdca..3f6f137 100644
--- a/tqtinterface/qt4/src/sql/tqsqldriver.cpp
+++ b/tqtinterface/qt4/src/sql/tqsqldriver.cpp
@@ -133,7 +133,7 @@ TQSqlDriver::~TQSqlDriver()
 bool TQSqlDriver::isOpen() const
 {
     if ( !qSqlDriverExtDict()->isEmpty() ) {
-	TQSqlDriverExtension *ext = qSqlDriverExtDict()->tqfind( (TQSqlDriver *) this );
+	TQSqlDriverExtension *ext = qSqlDriverExtDict()->find( (TQSqlDriver *) this );
 	if ( ext )
 	    return ext->isOpen();
     }
@@ -154,7 +154,7 @@ bool TQSqlDriver::isOpenError() const
 /*!
     \enum TQSqlDriver::DriverFeature
 
-    This enum tqcontains a list of features a driver may support. Use
+    This enum contains a list of features a driver may support. Use
     hasFeature() to query whether a feature is supported or not.
 
     \value Transactions  whether the driver supports SQL transactions
@@ -274,7 +274,7 @@ void TQSqlDriver::setLastError( const TQSqlError& e )
 }
 
 /*!
-    Returns a TQSqlError object which tqcontains information about the
+    Returns a TQSqlError object which contains information about the
     last error that occurred on the database.
 */
 
@@ -289,7 +289,7 @@ TQSqlError TQSqlDriver::lastError() const
 
     The \a tableType argument describes what types of tables
     should be returned. Due to binary compatibility, the string
-    tqcontains the value of the enum TQSql::TableTypes as text.
+    contains the value of the enum TQSql::TableTypes as text.
     An empty string should be treated as TQSql::Tables for
     downward compatibility.
 
@@ -386,7 +386,7 @@ TQString TQSqlDriver::nullText() const
     \i If \a field is character data, the value is returned enclosed
     in single quotation marks, which is appropriate for many SQL
     databases. Any embedded single-quote characters are escaped
-    (tqreplaced with two single-quote characters). If \a trimStrings is
+    (replaced with two single-quote characters). If \a trimStrings is
     TRUE (the default is FALSE), all trailing whitespace is trimmed
     from the field.
 
@@ -448,7 +448,7 @@ TQString TQSqlDriver::formatValue( const TQSqlField* field, bool trimStrings ) c
 		result.truncate( end );
 	    }
 	    /* escape the "'" character */
-	    result.tqreplace( TQChar( '\'' ), "''" );
+	    result.replace( TQChar( '\'' ), "''" );
 	    r = "'" + result + "'";
 	    break;
 	}
@@ -499,7 +499,7 @@ bool TQSqlDriver::open( const TQString& db,
 		       const TQString& connOpts )
 {
     if ( !qSqlOpenExtDict()->isEmpty() ) {
-	TQSqlOpenExtension *ext = qSqlOpenExtDict()->tqfind( (TQSqlDriver *) this );
+	TQSqlOpenExtension *ext = qSqlOpenExtDict()->find( (TQSqlDriver *) this );
 	if ( ext )
 	    return ext->open( db, user, password, host, port, connOpts );
     }
diff --git a/tqtinterface/qt4/src/sql/tqsqlextension_p.cpp b/tqtinterface/qt4/src/sql/tqsqlextension_p.cpp
index dd4f1fb..6f115f7 100644
--- a/tqtinterface/qt4/src/sql/tqsqlextension_p.cpp
+++ b/tqtinterface/qt4/src/sql/tqsqlextension_p.cpp
@@ -65,7 +65,7 @@ void TQSqlExtension::bindValue( const TQString& placeholder, const TQVariant& va
     bindm = BindByName;
     // if the index has already been set when doing emulated named
     // bindings - don't reset it
-    if ( index.tqcontains( (int)values.count() ) ) {
+    if ( index.contains( (int)values.count() ) ) {
 	index[ (int)values.count() ] = placeholder;
     }
     values[ placeholder ] = Param( val, tp );
diff --git a/tqtinterface/qt4/src/sql/tqsqlfield.cpp b/tqtinterface/qt4/src/sql/tqsqlfield.cpp
index fcbb08d..b9f9590 100644
--- a/tqtinterface/qt4/src/sql/tqsqlfield.cpp
+++ b/tqtinterface/qt4/src/sql/tqsqlfield.cpp
@@ -53,7 +53,7 @@
 
     TQSqlField represents the characteristics of a single column in a
     database table or view, such as the data type and column name. A
-    field also tqcontains the value of the database column, which can be
+    field also contains the value of the database column, which can be
     viewed or changed.
 
     Field data values are stored as TQVariants. Using an incompatible
diff --git a/tqtinterface/qt4/src/sql/tqsqlform.cpp b/tqtinterface/qt4/src/sql/tqsqlform.cpp
index ed1f935..a33c18b 100644
--- a/tqtinterface/qt4/src/sql/tqsqlform.cpp
+++ b/tqtinterface/qt4/src/sql/tqsqlform.cpp
@@ -102,7 +102,7 @@ public:
     // Move the cursor to a valid record (the first record)
     myCursor.next();
     // Set the form's record pointer to the cursor's edit buffer (which
-    // tqcontains the current record's values)
+    // contains the current record's values)
     myForm.setRecord( myCursor.primeUpdate() );
 
     // Insert a field into the form that uses myEditor to edit the
@@ -200,8 +200,8 @@ void TQSqlForm::insert( TQWidget * widget, const TQString& field )
 void TQSqlForm::remove( const TQString& field )
 {
     d->dirty = TRUE;
-    if ( d->fld.tqfind( field ) != d->fld.end() )
-	d->fld.remove( d->fld.tqfind( field ) );
+    if ( d->fld.find( field ) != d->fld.end() )
+	d->fld.remove( d->fld.find( field ) );
     d->wgt.remove( field );
 }
 
@@ -296,7 +296,7 @@ TQWidget * TQSqlForm::fieldToWidget( TQSqlField * field ) const
 */
 TQSqlField * TQSqlForm::widgetToField( TQWidget * widget ) const
 {
-    if( d->map.tqcontains( widget ) )
+    if( d->map.contains( widget ) )
 	return d->map[widget];
     else
 	return 0;
diff --git a/tqtinterface/qt4/src/sql/tqsqlindex.cpp b/tqtinterface/qt4/src/sql/tqsqlindex.cpp
index 525b1cd..9d5880c 100644
--- a/tqtinterface/qt4/src/sql/tqsqlindex.cpp
+++ b/tqtinterface/qt4/src/sql/tqsqlindex.cpp
@@ -180,7 +180,7 @@ void TQSqlIndex::setDescending( int i, bool desc )
     "\a{prefix}.<fieldname>"
 
     If \a sep is specified, each field is separated by \a sep. If \a
-    verbose is TRUE (the default), each field tqcontains a suffix
+    verbose is TRUE (the default), each field contains a suffix
     indicating an ASCending or DESCending sort order.
 */
 
@@ -207,7 +207,7 @@ TQString TQSqlIndex::toString( const TQString& prefix, const TQString& sep, bool
 
     "\a{prefix}.<fieldname>"
 
-    If \a verbose is TRUE (the default), each field tqcontains a suffix
+    If \a verbose is TRUE (the default), each field contains a suffix
     indicating an ASCending or DESCending sort order.
 
     Note that if you want to iterate over the list, you should iterate
@@ -270,7 +270,7 @@ TQSqlIndex TQSqlIndex::fromStringList( const TQStringList& l, const TQSqlCursor*
 	    desc = TRUE;
 	    f = f.mid( 0, f.length()-4 );
 	}
-	int dot = f.tqfindRev( '.' );
+	int dot = f.findRev( '.' );
 	if ( dot != -1 )
 	    f = f.mid( dot+1 );
 	const TQSqlField* field = cursor->field( f.simplifyWhiteSpace() );
diff --git a/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp b/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp
index 8412c94..6a35ef7 100644
--- a/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp
+++ b/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp
@@ -339,16 +339,16 @@ update.  For example:
     ...
     myCursor->update();  // update current record
     myCursor->select();  // refresh the cursor
-    myManager.tqfindBuffer( myCursor->primaryIndex() ); // go to the updated record
+    myManager.findBuffer( myCursor->primaryIndex() ); // go to the updated record
 \endcode
 
 */
 
 //## possibly add tqsizeHint parameter
-bool TQSqlCursorManager::tqfindBuffer( const TQSqlIndex& idx, int atHint )
+bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint )
 {
 #ifdef TQT_DEBUG_DATAMANAGER
-    qDebug("TQSqlCursorManager::tqfindBuffer:");
+    qDebug("TQSqlCursorManager::findBuffer:");
 #endif
     TQSqlCursor* cur = cursor();
     if ( !cur )
diff --git a/tqtinterface/qt4/src/sql/tqsqlmanager_p.h b/tqtinterface/qt4/src/sql/tqsqlmanager_p.h
index 9f19335..ed892e3 100644
--- a/tqtinterface/qt4/src/sql/tqsqlmanager_p.h
+++ b/tqtinterface/qt4/src/sql/tqsqlmanager_p.h
@@ -93,7 +93,7 @@ public:
     bool autoDelete() const;
 
     virtual bool refresh();
-    virtual bool tqfindBuffer( const TQSqlIndex& idx, int atHint = 0 );
+    virtual bool findBuffer( const TQSqlIndex& idx, int atHint = 0 );
 
 private:
     TQSqlCursorManagerPrivate* d;
diff --git a/tqtinterface/qt4/src/sql/tqsqlpropertymap.cpp b/tqtinterface/qt4/src/sql/tqsqlpropertymap.cpp
index 63b7e3a..d1498d9 100644
--- a/tqtinterface/qt4/src/sql/tqsqlpropertymap.cpp
+++ b/tqtinterface/qt4/src/sql/tqsqlpropertymap.cpp
@@ -110,7 +110,7 @@ public:
     ...
     \endcode
 
-    You can also tqreplace the global TQSqlPropertyMap that is used by
+    You can also replace the global TQSqlPropertyMap that is used by
     default. (Bear in mind that TQSqlPropertyMap takes ownership of the
     new default map.)
 
@@ -216,7 +216,7 @@ TQVariant TQSqlPropertyMap::property( TQWidget * widget )
 {
     if( !widget ) return TQVariant();
     const QMetaObject* mo = widget->metaObject();
-    while ( mo && !d->propertyMap.tqcontains( TQString( mo->className() ) ) )
+    while ( mo && !d->propertyMap.contains( TQString( mo->className() ) ) )
 	mo = mo->superClass();
 
     if ( !mo ) {
@@ -236,7 +236,7 @@ void TQSqlPropertyMap::setProperty( TQWidget * widget, const TQVariant & value )
     if( !widget ) return;
 
     QMetaObject* mo = const_cast<QMetaObject*>(widget->metaObject());
-    while ( mo && !d->propertyMap.tqcontains( TQString( mo->className() ) ) )
+    while ( mo && !d->propertyMap.contains( TQString( mo->className() ) ) )
 	mo = const_cast<QMetaObject*>(mo->superClass());
     if ( !mo ) {
 #ifdef TQT_CHECK_RANGE
diff --git a/tqtinterface/qt4/src/sql/tqsqlquery.cpp b/tqtinterface/qt4/src/sql/tqsqlquery.cpp
index 9a6f649..a1a7632 100644
--- a/tqtinterface/qt4/src/sql/tqsqlquery.cpp
+++ b/tqtinterface/qt4/src/sql/tqsqlquery.cpp
@@ -969,7 +969,7 @@ bool TQSqlQuery::prepare( const TQString& query )
 	    TQRegExp rx(TQString::tqfromLatin1("'[^']*'|\\?"));
 	    while ( (i = rx.search( q, i )) != -1 ) {
 		if ( rx.cap(0) == "?" ) {
-		    q = q.tqreplace( i, 1, ":f" + TQString::number(cnt) );
+		    q = q.replace( i, 1, ":f" + TQString::number(cnt) );
 		    cnt++;
 		}
 		i += rx.matchedLength();
@@ -982,7 +982,7 @@ bool TQSqlQuery::prepare( const TQString& query )
 		    // record the index of the placeholder - needed
 		    // for emulating named bindings with ODBC
 		    d->sqlResult->extension()->index[ cnt ]= rx.cap(0);
-		    q = q.tqreplace( i, rx.matchedLength(), "?" );
+		    q = q.replace( i, rx.matchedLength(), "?" );
 		    i++;
 		    cnt++;
 		}
@@ -1017,7 +1017,7 @@ bool TQSqlQuery::exec()
     if ( driver()->hasFeature( TQSqlDriver::PreparedQueries ) ) {
 	ret = d->sqlResult->extension()->exec();
     } else {
-	// fake preparation - just tqreplace the placeholders..
+	// fake preparation - just replace the placeholders..
 	TQString query = d->sqlResult->lastQuery();
 	if ( d->sqlResult->extension()->bindMethod() == TQSqlExtension::BindByName ) {
 	    int i;
@@ -1031,7 +1031,7 @@ bool TQSqlQuery::exec()
 		    f.setNull();
 		else
 		    f.setValue( val );
-		query = query.tqreplace( (uint)d->sqlResult->extension()->holders[ (uint)i ].holderPos,
+		query = query.replace( (uint)d->sqlResult->extension()->holders[ (uint)i ].holderPos,
 			holder.length(), driver()->formatValue( &f ) );
 	    }
 	} else {
@@ -1040,7 +1040,7 @@ bool TQSqlQuery::exec()
 	    int i = 0;
 	    for ( it = d->sqlResult->extension()->index.begin();
 		  it != d->sqlResult->extension()->index.end(); ++it ) {
-		i = query.tqfind( '?', i );
+		i = query.find( '?', i );
 		if ( i > -1 ) {
 		    TQSqlField f( "", d->sqlResult->extension()->values[ it.data() ].value.type() );
 		    if ( d->sqlResult->extension()->values[ it.data() ].value.isNull() )
@@ -1048,7 +1048,7 @@ bool TQSqlQuery::exec()
 		    else
 			f.setValue( d->sqlResult->extension()->values[ it.data() ].value );
 		    val = driver()->formatValue( &f );
-		    query = query.tqreplace( i, 1, driver()->formatValue( &f ) );
+		    query = query.replace( i, 1, driver()->formatValue( &f ) );
 		    i += val.length();
 		}
 	    }
@@ -1202,7 +1202,7 @@ TQMap<TQString,TQVariant> TQSqlQuery::boundValues() const
     In most cases this function returns the same as lastQuery(). If a
     prepared query with placeholders is executed on a DBMS that does
     not support it, the preparation of this query is emulated. The
-    placeholders in the original query are tqreplaced with their bound
+    placeholders in the original query are replaced with their bound
     values to form a new query. This function returns the modified
     query. Useful for debugging purposes.
 
diff --git a/tqtinterface/qt4/src/sql/tqsqlrecord.cpp b/tqtinterface/qt4/src/sql/tqsqlrecord.cpp
index c082d16..00a7acc 100644
--- a/tqtinterface/qt4/src/sql/tqsqlrecord.cpp
+++ b/tqtinterface/qt4/src/sql/tqsqlrecord.cpp
@@ -137,7 +137,7 @@ public:
     {
 	return cnt;
     }
-    bool tqcontains( int i ) const
+    bool contains( int i ) const
     {
 	return i >= 0 && i < (int)fi.count() && fi[ i ].isValid();
     }
@@ -302,7 +302,7 @@ int TQSqlRecord::position( const TQString& name ) const
 	    return i;
     }
 #ifdef TQT_CHECK_RANGE
-    qWarning( "TQSqlRecord::position: unable to tqfind field %s", name.latin1() );
+    qWarning( "TQSqlRecord::position: unable to find field %s", name.latin1() );
 #endif
     return -1;
 }
@@ -315,7 +315,7 @@ int TQSqlRecord::position( const TQString& name ) const
 TQSqlField* TQSqlRecord::field( int i )
 {
     checkDetach();
-    if ( !sh->d->tqcontains( i ) ) {
+    if ( !sh->d->contains( i ) ) {
 #ifdef TQT_CHECK_RANGE
 	qWarning( "TQSqlRecord::field: index out of range: %d", i );
 #endif
@@ -334,7 +334,7 @@ TQSqlField* TQSqlRecord::field( int i )
 TQSqlField* TQSqlRecord::field( const TQString& name )
 {
     checkDetach();
-    if ( !sh->d->tqcontains( position( name ) ) )
+    if ( !sh->d->contains( position( name ) ) )
 	return 0;
     return &sh->d->fieldInfo( position( name ) )->field;
 }
@@ -346,7 +346,7 @@ TQSqlField* TQSqlRecord::field( const TQString& name )
 
 const TQSqlField* TQSqlRecord::field( int i ) const
 {
-    if ( !sh->d->tqcontains( i ) ) {
+    if ( !sh->d->contains( i ) ) {
 #ifdef TQT_CHECK_RANGE
 	qWarning( "TQSqlRecord::field: index out of range: %d", i  );
 #endif // TQT_CHECK_RANGE
@@ -364,7 +364,7 @@ const TQSqlField* TQSqlRecord::field( int i ) const
 
 const TQSqlField* TQSqlRecord::field( const TQString& name ) const
 {
-    if( !sh->d->tqcontains( position( name ) ) )
+    if( !sh->d->contains( position( name ) ) )
 	return 0;
     return &sh->d->fieldInfo( position( name ) )->field;
 }
@@ -384,7 +384,7 @@ void TQSqlRecord::append( const TQSqlField& field )
     exists at \a pos, it is removed.
 */
 
-void TQSqlRecord::insert( int pos, const TQSqlField& field ) // ### 4.0: rename to ::tqreplace
+void TQSqlRecord::insert( int pos, const TQSqlField& field ) // ### 4.0: rename to ::replace
 {
     checkDetach();
     sh->d->insert( pos, field );
@@ -429,7 +429,7 @@ bool TQSqlRecord::isEmpty() const
     otherwise returns FALSE.
 */
 
-bool TQSqlRecord::tqcontains( const TQString& name ) const
+bool TQSqlRecord::contains( const TQString& name ) const
 {
     for ( uint i = 0; i < count(); ++i ) {
 	if ( fieldName(i).upper() == name.upper() )
@@ -695,8 +695,8 @@ void TQSqlRecord::setValue( const TQString& name, const TQVariant& val )
     \module sql
 
     This class is a TQValueList that holds a set of database field meta
-    data. Use tqcontains() to see if a given field name exists in the
-    record, and use tqfind() to get a TQSqlFieldInfo record for a named
+    data. Use contains() to see if a given field name exists in the
+    record, and use find() to get a TQSqlFieldInfo record for a named
     field.
 
     \sa TQValueList, TQSqlFieldInfo
@@ -718,7 +718,7 @@ TQSqlRecordInfo::TQSqlRecordInfo( const TQSqlRecord& other )
     Returns the number of times a field called \a fieldName occurs in
     the record. Returns 0 if no field by that name could be found.
 */
-TQSqlRecordInfo::size_type TQSqlRecordInfo::tqcontains( const TQString& fieldName ) const
+TQSqlRecordInfo::size_type TQSqlRecordInfo::contains( const TQString& fieldName ) const
 {
    size_type i = 0;
    TQString fName = fieldName.upper();
@@ -735,7 +735,7 @@ TQSqlRecordInfo::size_type TQSqlRecordInfo::tqcontains( const TQString& fieldNam
     which has the field name \a fieldName. If no matching field is
     found then an empty TQSqlFieldInfo object is returned.
 */
-TQSqlFieldInfo TQSqlRecordInfo::tqfind( const TQString& fieldName ) const
+TQSqlFieldInfo TQSqlRecordInfo::find( const TQString& fieldName ) const
 {
    TQString fName = fieldName.upper();
    for( const_iterator it = begin(); it != end(); ++it ) {
diff --git a/tqtinterface/qt4/src/sql/tqsqlrecord.h b/tqtinterface/qt4/src/sql/tqsqlrecord.h
index 1dd99a3..60c4a30 100644
--- a/tqtinterface/qt4/src/sql/tqsqlrecord.h
+++ b/tqtinterface/qt4/src/sql/tqsqlrecord.h
@@ -96,7 +96,7 @@ public:
     virtual void         remove( int pos );
 
     bool                 isEmpty() const;
-    bool                 tqcontains( const TQString& name ) const;
+    bool                 contains( const TQString& name ) const;
     virtual void         clear();
     virtual void         clearValues( bool nullify = FALSE );
     uint                 count() const;
@@ -130,8 +130,8 @@ public:
     TQSqlRecordInfo( const TQSqlFieldInfoList& other ): TQSqlFieldInfoList( other ) {}
     TQSqlRecordInfo( const TQSqlRecord& other );
 
-    size_type tqcontains( const TQString& fieldName ) const;
-    TQSqlFieldInfo tqfind( const TQString& fieldName ) const;
+    size_type contains( const TQString& fieldName ) const;
+    TQSqlFieldInfo find( const TQString& fieldName ) const;
     TQSqlRecord toRecord() const;
 
 };