1 files changed, 21 insertions, 21 deletions

diff --git a/experimental/tqtinterface/qt4/src/sql/tqsqldatabase.cpp b/experimental/tqtinterface/qt4/src/sql/tqsqldatabase.cpp
index 45cca58da..70a15ae49 100644
--- a/experimental/tqtinterface/qt4/src/sql/tqsqldatabase.cpp
+++ b/experimental/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 );
 }