rename the following methods:

tqfind find
tqreplace replace
tqcontains contains

1 files changed, 7 insertions, 7 deletions

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.