Undo prior accidental commit

14 files changed, 108 insertions, 108 deletions

diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp
index 793a157..6954ef8 100644
--- a/src/sql/drivers/ibase/qsql_ibase.cpp
+++ b/src/sql/drivers/ibase/qsql_ibase.cpp
@@ -411,7 +411,7 @@ QIBaseResult::~QIBaseResult()
 
 bool QIBaseResult::prepare(const QString& query)
 {
-    //tqDebug("prepare: %s", query.ascii());
+    //qDebug("prepare: %s", query.ascii());
     if (!driver() || !driver()->isOpen() || driver()->isOpenError())
 	return FALSE;
     d->cleanup();
@@ -471,7 +471,7 @@ bool QIBaseResult::exec()
     if (d->inda && extension()->index.count() > 0) {
 	QMap<int, QString>::ConstIterator it;
 	if ((int)extension()->index.count() > d->inda->sqld) {
-	    tqWarning("QIBaseResult::exec: Parameter mismatch, expected %d, got %d parameters", d->inda->sqld, extension()->index.count());
+	    qWarning("QIBaseResult::exec: Parameter mismatch, expected %d, got %d parameters", d->inda->sqld, extension()->index.count());
 	    return FALSE;
 	}
 	int para = 0;
@@ -560,7 +560,7 @@ bool QIBaseResult::exec()
 
 bool QIBaseResult::reset (const QString& query)
 {
-//    tqDebug("reset: %s", query.ascii());
+//    qDebug("reset: %s", query.ascii());
     if (!driver() || !driver()->isOpen() || driver()->isOpenError())
 	return FALSE;
     d->cleanup();
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index 67d3684..7cfe0a7 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -53,7 +53,7 @@
 # define Q_NO_MYSQL_EMBEDDED
 #endif
 
-QPtrDict<QSqlOpenExtension> *tqSqlOpenExtDict();
+QPtrDict<QSqlOpenExtension> *qSqlOpenExtDict();
 
 static int qMySqlConnectionCount = 0;
 static bool qMySqlInitHandledByUser = FALSE;
@@ -237,7 +237,7 @@ bool QMYSQLResult::fetchFirst()
 QVariant QMYSQLResult::data( int field )
 {
     if ( !isSelect() || field >= (int) d->fieldTypes.count() ) {
-	tqWarning( "QMYSQLResult::data: column %d out of range", field );
+	qWarning( "QMYSQLResult::data: column %d out of range", field );
 	return QVariant();
     }
     
@@ -284,7 +284,7 @@ QVariant QMYSQLResult::data( int field )
 	return QVariant( val );
     }
 #ifdef QT_CHECK_RANGE
-    tqWarning("QMYSQLResult::data: unknown data type");
+    qWarning("QMYSQLResult::data: unknown data type");
 #endif
     return QVariant();
 }
@@ -368,7 +368,7 @@ static void qServerInit()
     // but is vital for the embedded lib
     if ( mysql_server_init( 0, 0, 0 ) ) {
 #  ifdef QT_CHECK_RANGE
-	tqWarning( "QMYSQLDriver::qServerInit: unable to start server." );
+	qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
 #  endif
     }
     
@@ -404,7 +404,7 @@ QMYSQLDriver::QMYSQLDriver( MYSQL * con, QObject * parent, const char * name )
 
 void QMYSQLDriver::init()
 {
-    tqSqlOpenExtDict()->insert( this, new QMYSQLOpenExtension(this) );
+    qSqlOpenExtDict()->insert( this, new QMYSQLOpenExtension(this) );
     d = new QMYSQLDriverPrivate();
     d->mysql = 0;
     qMySqlConnectionCount++;
@@ -417,8 +417,8 @@ QMYSQLDriver::~QMYSQLDriver()
         qServerEnd();
 
     delete d;
-    if ( !tqSqlOpenExtDict()->isEmpty() ) {
-	QSqlOpenExtension *ext = tqSqlOpenExtDict()->take( this );
+    if ( !qSqlOpenExtDict()->isEmpty() ) {
+	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
 	delete ext;
     }
 }
@@ -452,7 +452,7 @@ bool QMYSQLDriver::open( const QString&,
 			 const QString&,
 			 int )
 {
-    tqWarning("QMYSQLDriver::open(): This version of open() is no longer supported." );
+    qWarning("QMYSQLDriver::open(): This version of open() is no longer supported." );
     return FALSE;
 }
 
@@ -482,7 +482,7 @@ bool QMYSQLDriver::open( const QString& db,
 	    if ( val == "TRUE" || val == "1" )
 		opts << tmp.left( idx );
 	    else
-		tqWarning( "QMYSQLDriver::open: Illegal connect option value '%s'", tmp.latin1() );
+		qWarning( "QMYSQLDriver::open: Illegal connect option value '%s'", tmp.latin1() );
 	} else {
 	    opts << tmp;
 	}
@@ -505,7 +505,7 @@ bool QMYSQLDriver::open( const QString& db,
 	else if ( opt == "CLIENT_SSL" )
 	    optionFlags |= CLIENT_SSL;
 	else 
-	    tqWarning( "QMYSQLDriver::open: Unknown connect option '%s'", (*it).latin1() );
+	    qWarning( "QMYSQLDriver::open: Unknown connect option '%s'", (*it).latin1() );
     }
 
     if ( (d->mysql = mysql_init((MYSQL*) 0)) &&
@@ -696,7 +696,7 @@ bool QMYSQLDriver::beginTransaction()
 #endif
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QMYSQLDriver::beginTransaction: Database not open" );
+	qWarning( "QMYSQLDriver::beginTransaction: Database not open" );
 #endif
 	return FALSE;
     }
@@ -714,7 +714,7 @@ bool QMYSQLDriver::commitTransaction()
 #endif
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QMYSQLDriver::commitTransaction: Database not open" );
+	qWarning( "QMYSQLDriver::commitTransaction: Database not open" );
 #endif
 	return FALSE;
     }
@@ -732,7 +732,7 @@ bool QMYSQLDriver::rollbackTransaction()
 #endif
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QMYSQLDriver::rollbackTransaction: Database not open" );
+	qWarning( "QMYSQLDriver::rollbackTransaction: Database not open" );
 #endif
 	return FALSE;
     }
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 416e722..b09afd2 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -127,7 +127,7 @@ public:
     QODBCResult * result;
 };
 
-QPtrDict<QSqlOpenExtension> *tqSqlOpenExtDict();
+QPtrDict<QSqlOpenExtension> *qSqlOpenExtDict();
 
 class QODBCOpenExtension : public QSqlOpenExtension
 {
@@ -190,7 +190,7 @@ static QString qODBCWarn( const QODBCPrivate* odbc)
 static void qSqlWarning( const QString& message, const QODBCPrivate* odbc )
 {
 #ifdef QT_CHECK_RANGE
-    tqWarning( "%s\tError: %s", message.local8Bit().data(), qODBCWarn( odbc ).local8Bit().data() );
+    qWarning( "%s\tError: %s", message.local8Bit().data(), qODBCWarn( odbc ).local8Bit().data() );
 #endif
 }
 
@@ -309,7 +309,7 @@ static QString qGetStringData( SQLHANDLE hStmt, int column, int colSize, bool& i
 	    break;
 	} else {
 #ifdef QT_CHECK_RANGE
-	    tqWarning( "qGetStringData: Error while fetching data (%d)", r );
+	    qWarning( "qGetStringData: Error while fetching data (%d)", r );
 #endif
 	    fieldVal = QString::null;
 	    break;
@@ -341,7 +341,7 @@ static QByteArray qGetBinaryData( SQLHANDLE hStmt, int column, QSQLLEN& lengthIn
 			&nullable );
 #ifdef QT_CHECK_RANGE
     if ( r != SQL_SUCCESS )
-	tqWarning( "qGetBinaryData: Unable to describe column %d", column );
+	qWarning( "qGetBinaryData: Unable to describe column %d", column );
 #endif
     // SQLDescribeCol may return 0 if size cannot be determined
     if (!colSize) {
@@ -524,7 +524,7 @@ bool QODBCPrivate::setConnectionOptions( const QString& connOpts )
 	if ( (idx = tmp.find( '=' )) != -1 )
 	    connMap[ tmp.left( idx ) ] = tmp.mid( idx + 1 ).simplifyWhiteSpace();
 	else
-	    tqWarning( "QODBCDriver::open: Illegal connect option value '%s'", tmp.latin1() );
+	    qWarning( "QODBCDriver::open: Illegal connect option value '%s'", tmp.latin1() );
     }
     if ( connMap.count() ) {
 	QMap<QString, QString>::ConstIterator it;
@@ -540,7 +540,7 @@ bool QODBCPrivate::setConnectionOptions( const QString& connOpts )
 		} else if ( val == "SQL_MODE_READ_WRITE" ) {
 		    v = SQL_MODE_READ_WRITE;
 		} else {
-		    tqWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) );
+		    qWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) );
 		    break;
 		}
 		r = SQLSetConnectAttr( hDbc, SQL_ATTR_ACCESS_MODE, (SQLPOINTER) v, 0 );
@@ -565,7 +565,7 @@ bool QODBCPrivate::setConnectionOptions( const QString& connOpts )
 		} else if ( val == "SQL_FALSE" ) {
 		    v = SQL_FALSE;
 		} else {
-		    tqWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) );
+		    qWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) );
 		    break;
 		}
 		r = SQLSetConnectAttr( hDbc, SQL_ATTR_METADATA_ID, (SQLPOINTER) v, 0 );
@@ -587,14 +587,14 @@ bool QODBCPrivate::setConnectionOptions( const QString& connOpts )
 		} else if ( val == "SQL_OPT_TRACE_ON" ) {
 		    v = SQL_OPT_TRACE_ON;
 		} else {
-		    tqWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) );
+		    qWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) );
 		    break;
 		}
 		r = SQLSetConnectAttr( hDbc, SQL_ATTR_TRACE, (SQLPOINTER) v, 0 );
 	    }
 #ifdef QT_CHECK_RANGE
               else {
-		  tqWarning( QString("QODBCDriver::open: Unknown connection attribute '%1'").arg( opt ) );
+		  qWarning( QString("QODBCDriver::open: Unknown connection attribute '%1'").arg( opt ) );
 	    }
 #endif
 	    if ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) {
@@ -860,7 +860,7 @@ bool QODBCResult::fetchLast()
 QVariant QODBCResult::data( int field )
 {
     if ( field >= (int) d->rInf.count() ) {
-	tqWarning( "QODBCResult::data: column %d out of range", field );
+	qWarning( "QODBCResult::data: column %d out of range", field );
 	return QVariant();
     }
     if ( fieldCache.contains( field ) )
@@ -1230,7 +1230,7 @@ bool QODBCResult::exec()
 	    para++;
 	    if ( r != SQL_SUCCESS ) {
 #ifdef QT_CHECK_RANGE
-		tqWarning( "QODBCResult::exec: unable to bind variable: %s", qODBCWarn( d ).local8Bit().data() );
+		qWarning( "QODBCResult::exec: unable to bind variable: %s", qODBCWarn( d ).local8Bit().data() );
 #endif
 		setLastError( qMakeError( "Unable to bind variable", QSqlError::Statement, d ) );
 		return FALSE;
@@ -1240,7 +1240,7 @@ bool QODBCResult::exec()
     r = SQLExecute( d->hStmt );
     if ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QODBCResult::exec: Unable to execute statement: %s", qODBCWarn( d ).local8Bit().data() );
+	qWarning( "QODBCResult::exec: Unable to execute statement: %s", qODBCWarn( d ).local8Bit().data() );
 #endif
 	setLastError( qMakeError( "Unable to execute statement", QSqlError::Statement, d ) );
 	return FALSE;
@@ -1345,7 +1345,7 @@ QODBCDriver::QODBCDriver( SQLHANDLE env, SQLHANDLE con, QObject * parent, const
 
 void QODBCDriver::init()
 {
-    tqSqlOpenExtDict()->insert( this, new QODBCOpenExtension(this) );
+    qSqlOpenExtDict()->insert( this, new QODBCOpenExtension(this) );
     d = new QODBCPrivate();
 }
 
@@ -1353,8 +1353,8 @@ QODBCDriver::~QODBCDriver()
 {
     cleanup();
     delete d;
-    if ( !tqSqlOpenExtDict()->isEmpty() ) {
-	QSqlOpenExtension *ext = tqSqlOpenExtDict()->take( this );
+    if ( !qSqlOpenExtDict()->isEmpty() ) {
+	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
 	delete ext;
     }
 }
@@ -1398,7 +1398,7 @@ bool QODBCDriver::open( const QString&,
 			const QString&,
 			int )
 {
-    tqWarning("QODBCDriver::open(): This version of open() is no longer supported." );
+    qWarning("QODBCDriver::open(): This version of open() is no longer supported." );
     return FALSE;
 }
 
@@ -1603,7 +1603,7 @@ bool QODBCPrivate::checkDriver() const
 #endif
 	if ( sup == SQL_FALSE ) {
 #ifdef QT_CHECK_RANGE
-	    tqWarning ( "QODBCDriver::open: Warning - Driver doesn't support all needed functionality (%d). "
+	    qWarning ( "QODBCDriver::open: Warning - Driver doesn't support all needed functionality (%d). "
 		       "Please look at the Qt SQL Module Driver documentation for more information.", reqFunc[ i ] );
 #endif
 	    return FALSE;
@@ -1623,7 +1623,7 @@ bool QODBCPrivate::checkDriver() const
 #endif
 	if ( sup == SQL_FALSE ) {
 #ifdef QT_CHECK_RANGE
-	    tqWarning( "QODBCDriver::checkDriver: Warning - Driver doesn't support some non-critical functions (%d)", optFunc[ i ] );
+	    qWarning( "QODBCDriver::checkDriver: Warning - Driver doesn't support some non-critical functions (%d)", optFunc[ i ] );
 #endif
 	    return TRUE;
 	}
@@ -1656,7 +1656,7 @@ bool QODBCDriver::beginTransaction()
 {
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning(" QODBCDriver::beginTransaction: Database not open" );
+	qWarning(" QODBCDriver::beginTransaction: Database not open" );
 #endif
 	return FALSE;
     }
@@ -1676,7 +1676,7 @@ bool QODBCDriver::commitTransaction()
 {
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning(" QODBCDriver::commitTransaction: Database not open" );
+	qWarning(" QODBCDriver::commitTransaction: Database not open" );
 #endif
 	return FALSE;
     }
@@ -1694,7 +1694,7 @@ bool QODBCDriver::rollbackTransaction()
 {
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning(" QODBCDriver::rollbackTransaction: Database not open" );
+	qWarning(" QODBCDriver::rollbackTransaction: Database not open" );
 #endif
 	return FALSE;
     }
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index 84c3ff2..7fe1a91 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -64,8 +64,8 @@
 # undef open
 #endif
 
-QPtrDict<QSqlDriverExtension> *tqSqlDriverExtDict();
-QPtrDict<QSqlOpenExtension> *tqSqlOpenExtDict();
+QPtrDict<QSqlDriverExtension> *qSqlDriverExtDict();
+QPtrDict<QSqlOpenExtension> *qSqlOpenExtDict();
 
 class QPSQLPrivate
 {
@@ -272,7 +272,7 @@ static QPoint pointFromString( const QString& s)
 QVariant QPSQLResult::data( int i )
 {
     if ( i >= PQnfields( d->result ) ) {
-	tqWarning( "QPSQLResult::data: column %d out of range", i );
+	qWarning( "QPSQLResult::data: column %d out of range", i );
 	return QVariant();
     }
     int ptype = PQftype( d->result, i );
@@ -395,7 +395,7 @@ QVariant QPSQLResult::data( int i )
 	int fd = lo_open( d->connection, oid, INV_READ );
 #ifdef QT_CHECK_RANGE
 	if ( fd < 0) {
-	    tqWarning( "QPSQLResult::data: unable to open large object for read" );
+	    qWarning( "QPSQLResult::data: unable to open large object for read" );
 	    ((QSqlDriver*)driver())->commitTransaction();
 	    return QVariant( ba );
 	}
@@ -429,7 +429,7 @@ QVariant QPSQLResult::data( int i )
 #endif
 
 	if (retval < 0) {
-	    tqWarning( "QPSQLResult::data: unable to read large object" );
+	    qWarning( "QPSQLResult::data: unable to read large object" );
 	} else {
 	    ba.duplicate( buf, size );
 	}
@@ -441,7 +441,7 @@ QVariant QPSQLResult::data( int i )
     default:
     case QVariant::Invalid:
 #ifdef QT_CHECK_RANGE
-	tqWarning("QPSQLResult::data: unknown data type");
+	qWarning("QPSQLResult::data: unknown data type");
 #endif
 	;
     }
@@ -512,7 +512,7 @@ static void setDatestyle( PGconn* connection )
 #ifdef QT_CHECK_RANGE
     int status =  PQresultStatus( result );
     if ( status != PGRES_COMMAND_OK )
-        tqWarning( "%s", PQerrorMessage( connection ) );
+        qWarning( "%s", PQerrorMessage( connection ) );
 #endif
     PQclear( result );
 }
@@ -531,7 +531,7 @@ static QPSQLDriver::Protocol getPSQLVersion( PGconn* connection )
 	    int vMin = rx.cap( 2 ).toInt();
 	    if ( vMaj < 6 ) {
 #ifdef QT_CHECK_RANGE
-		tqWarning( "This version of PostgreSQL is not supported and may not work." );
+		qWarning( "This version of PostgreSQL is not supported and may not work." );
 #endif
 		return QPSQLDriver::Version6;
 	    }
@@ -547,7 +547,7 @@ static QPSQLDriver::Protocol getPSQLVersion( PGconn* connection )
 	}
     } else {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "This version of PostgreSQL is not supported and may not work." );
+	qWarning( "This version of PostgreSQL is not supported and may not work." );
 #endif
     }
 
@@ -574,8 +574,8 @@ QPSQLDriver::QPSQLDriver( PGconn * conn, QObject * parent, const char * name )
 
 void QPSQLDriver::init()
 {
-    tqSqlDriverExtDict()->insert( this, new QPSQLDriverExtension(this) );
-    tqSqlOpenExtDict()->insert( this, new QPSQLOpenExtension(this) );
+    qSqlDriverExtDict()->insert( this, new QPSQLDriverExtension(this) );
+    qSqlOpenExtDict()->insert( this, new QPSQLOpenExtension(this) );
 
     d = new QPSQLPrivate();
 }
@@ -585,12 +585,12 @@ QPSQLDriver::~QPSQLDriver()
     if ( d->connection )
 	PQfinish( d->connection );
     delete d;
-    if ( !tqSqlDriverExtDict()->isEmpty() ) {
-	QSqlDriverExtension *ext = tqSqlDriverExtDict()->take( this );
+    if ( !qSqlDriverExtDict()->isEmpty() ) {
+	QSqlDriverExtension *ext = qSqlDriverExtDict()->take( this );
 	delete ext;
     }
-    if ( !tqSqlOpenExtDict()->isEmpty() ) {
-	QSqlOpenExtension *ext = tqSqlOpenExtDict()->take( this );
+    if ( !qSqlOpenExtDict()->isEmpty() ) {
+	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
 	delete ext;
     }
 }
@@ -623,7 +623,7 @@ bool QPSQLDriver::open( const QString&,
 			const QString&,
 			int )
 {
-    tqWarning("QPSQLDriver::open(): This version of open() is no longer supported." );
+    qWarning("QPSQLDriver::open(): This version of open() is no longer supported." );
     return FALSE;
 }
 
@@ -688,7 +688,7 @@ bool QPSQLDriver::beginTransaction()
 {
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QPSQLDriver::beginTransaction: Database not open" );
+	qWarning( "QPSQLDriver::beginTransaction: Database not open" );
 #endif
 	return FALSE;
     }
@@ -706,7 +706,7 @@ bool QPSQLDriver::commitTransaction()
 {
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QPSQLDriver::commitTransaction: Database not open" );
+	qWarning( "QPSQLDriver::commitTransaction: Database not open" );
 #endif
 	return FALSE;
     }
@@ -724,7 +724,7 @@ bool QPSQLDriver::rollbackTransaction()
 {
     if ( !isOpen() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QPSQLDriver::rollbackTransaction: Database not open" );
+	qWarning( "QPSQLDriver::rollbackTransaction: Database not open" );
 #endif
 	return FALSE;
     }
diff --git a/src/sql/qdatatable.cpp b/src/sql/qdatatable.cpp
index 69656a0..d1404d9 100644
--- a/src/sql/qdatatable.cpp
+++ b/src/sql/qdatatable.cpp
@@ -112,10 +112,10 @@ public:
 #ifdef QT_DEBUG_DATATABLE
 void qt_debug_buffer( const QString& msg, QSqlRecord* cursor )
 {
-    tqDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
-    tqDebug(msg);
+    qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
+    qDebug(msg);
     for ( uint j = 0; j < cursor->count(); ++j ) {
-	tqDebug(cursor->field(j)->name() + " type:" + QString(cursor->field(j)->value().typeName()) + " value:" + cursor->field(j)->value().toString() );
+	qDebug(cursor->field(j)->name() + " type:" + QString(cursor->field(j)->value().typeName()) + " value:" + cursor->field(j)->value().toString() );
     }
 }
 #endif
@@ -1047,7 +1047,7 @@ bool QDataTable::insertCurrent()
 	return FALSE;
     if ( !sqlCursor()->canInsert() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QDataTable::insertCurrent: insert not allowed for %s",
+	qWarning("QDataTable::insertCurrent: insert not allowed for %s",
 		 sqlCursor()->name().latin1() );
 #endif
 	endInsert();
@@ -1121,7 +1121,7 @@ bool QDataTable::updateCurrent()
 	return FALSE;
     if ( sqlCursor()->primaryIndex().count() == 0 ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QDataTable::updateCurrent: no primary index for %s",
+	qWarning("QDataTable::updateCurrent: no primary index for %s",
 		 sqlCursor()->name().latin1() );
 #endif
 	endUpdate();
@@ -1129,7 +1129,7 @@ bool QDataTable::updateCurrent()
     }
     if ( !sqlCursor()->canUpdate() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QDataTable::updateCurrent: updates not allowed for %s",
+	qWarning("QDataTable::updateCurrent: updates not allowed for %s",
 		 sqlCursor()->name().latin1() );
 #endif
 	endUpdate();
@@ -1195,7 +1195,7 @@ bool QDataTable::deleteCurrent()
 	return FALSE;
     if ( sqlCursor()->primaryIndex().count() == 0 ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QDataTable::deleteCurrent: no primary index %s",
+	qWarning("QDataTable::deleteCurrent: no primary index %s",
 		 sqlCursor()->name().latin1() );
 #endif
 	return FALSE;
diff --git a/src/sql/qsqlcursor.cpp b/src/sql/qsqlcursor.cpp
index eed30f5..a1be1f8 100644
--- a/src/sql/qsqlcursor.cpp
+++ b/src/sql/qsqlcursor.cpp
@@ -400,7 +400,7 @@ void QSqlCursor::setName( const QString& name, bool autopopulate )
 	}
 #ifdef QT_CHECK_RANGE
 	if ( isEmpty() )
-	    tqWarning("QSqlCursor::setName: unable to build record, does '%s' exist?", name.latin1() );
+	    qWarning("QSqlCursor::setName: unable to build record, does '%s' exist?", name.latin1() );
 #endif
     }
 }
@@ -1533,7 +1533,7 @@ bool QSqlCursor::isNull( const QString& name ) const
 void QSqlCursor::setValue( int i, const QVariant& val )
 {
 #ifdef QT_DEBUG
-    tqDebug("QSqlCursor::setValue(): This will not affect actual database values. Use primeInsert(), primeUpdate() or primeDelete().");
+    qDebug("QSqlCursor::setValue(): This will not affect actual database values. Use primeInsert(), primeUpdate() or primeDelete().");
 #endif
     QSqlRecord::setValue( i, val );
 }
@@ -1542,7 +1542,7 @@ void QSqlCursor::setValue( int i, const QVariant& val )
 void QSqlCursor::setValue( const QString& name, const QVariant& val )
 {
 #ifdef QT_DEBUG
-    tqDebug("QSqlCursor::setValue(): This will not affect actual database values. Use primeInsert(), primeUpdate() or primeDelete().");
+    qDebug("QSqlCursor::setValue(): This will not affect actual database values. Use primeInsert(), primeUpdate() or primeDelete().");
 #endif
     QSqlRecord::setValue( name, val );
 }
diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp
index ec2aa0f..eaa7a70 100644
--- a/src/sql/qsqldatabase.cpp
+++ b/src/sql/qsqldatabase.cpp
@@ -92,7 +92,7 @@ QPtrDict<QSqlOpenExtension> *qt_open_extension_dict = 0;
 static QSingleCleanupHandler< QPtrDict<QSqlDriverExtension> > qt_driver_ext_cleanup;
 static QSingleCleanupHandler< QPtrDict<QSqlOpenExtension> > qt_open_ext_cleanup;
 
-Q_EXPORT QPtrDict<QSqlDriverExtension> *tqSqlDriverExtDict()
+Q_EXPORT QPtrDict<QSqlDriverExtension> *qSqlDriverExtDict()
 {
     if ( !qt_driver_extension_dict ) {
 	qt_driver_extension_dict = new QPtrDict<QSqlDriverExtension>;
@@ -101,7 +101,7 @@ Q_EXPORT QPtrDict<QSqlDriverExtension> *tqSqlDriverExtDict()
     return qt_driver_extension_dict;
 }
 
-Q_EXPORT QPtrDict<QSqlOpenExtension> *tqSqlOpenExtDict()
+Q_EXPORT QPtrDict<QSqlOpenExtension> *qSqlOpenExtDict()
 {
     if ( !qt_open_extension_dict ) {
 	qt_open_extension_dict = new QPtrDict<QSqlOpenExtension>;
@@ -212,7 +212,7 @@ QSqlDatabaseManager* QSqlDatabaseManager::instance()
     static QGuardedPtr<QSqlDatabaseManager> sqlConnection = 0;
     if ( !sqlConnection ) {
 	if( qApp == 0 ){
-	    tqFatal( "QSqlDatabaseManager: A QApplication object has to be "
+	    qFatal( "QSqlDatabaseManager: A QApplication object has to be "
 		    "instantiated in order to use the SQL module." );
 	    return 0;
 	}
@@ -238,7 +238,7 @@ QSqlDatabase* QSqlDatabaseManager::database( const QString& name, bool open )
 	db->open();
 #ifdef QT_CHECK_RANGE
 	if ( !db->isOpen() )
-	    tqWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
+	    qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
                     db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() );
 #endif
     }
@@ -690,8 +690,8 @@ void QSqlDatabase::init( const QString& type, const QString& )
 
     if ( !d->driver ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
-	tqWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
+	qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
+	qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
 #endif
 	d->driver = new QNullDriver();
 	d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
diff --git a/src/sql/qsqldriver.cpp b/src/sql/qsqldriver.cpp
index 47963c5..78db42c 100644
--- a/src/sql/qsqldriver.cpp
+++ b/src/sql/qsqldriver.cpp
@@ -50,8 +50,8 @@
 #define DBState_OpenError	0x0002
 
 // ### This needs to go in 4.0!
-QPtrDict<QSqlDriverExtension> *tqSqlDriverExtDict();
-QPtrDict<QSqlOpenExtension> *tqSqlOpenExtDict();
+QPtrDict<QSqlDriverExtension> *qSqlDriverExtDict();
+QPtrDict<QSqlOpenExtension> *qSqlOpenExtDict();
 
 /*!
     \class QSqlDriver qsqldriver.h
@@ -132,8 +132,8 @@ QSqlDriver::~QSqlDriver()
 
 bool QSqlDriver::isOpen() const
 {
-    if ( !tqSqlDriverExtDict()->isEmpty() ) {
-	QSqlDriverExtension *ext = tqSqlDriverExtDict()->find( (QSqlDriver *) this );
+    if ( !qSqlDriverExtDict()->isEmpty() ) {
+	QSqlDriverExtension *ext = qSqlDriverExtDict()->find( (QSqlDriver *) this );
 	if ( ext )
 	    return ext->isOpen();
     }
@@ -498,8 +498,8 @@ bool QSqlDriver::open( const QString& db,
 		       int port,
 		       const QString& connOpts )
 {
-    if ( !tqSqlOpenExtDict()->isEmpty() ) {
-	QSqlOpenExtension *ext = tqSqlOpenExtDict()->find( (QSqlDriver *) this );
+    if ( !qSqlOpenExtDict()->isEmpty() ) {
+	QSqlOpenExtension *ext = qSqlOpenExtDict()->find( (QSqlDriver *) this );
 	if ( ext )
 	    return ext->open( db, user, password, host, port, connOpts );
     }
diff --git a/src/sql/qsqlfield.cpp b/src/sql/qsqlfield.cpp
index 408b300..bf66011 100644
--- a/src/sql/qsqlfield.cpp
+++ b/src/sql/qsqlfield.cpp
@@ -193,7 +193,7 @@ void QSqlField::setValue( const QVariant& value )
 	return;
     if ( value.type() != d->type ) {
 	if ( !val.canCast( d->type ) )
-	     tqWarning("QSqlField::setValue: %s cannot cast from %s to %s",
+	     qWarning("QSqlField::setValue: %s cannot cast from %s to %s",
 		      nm.local8Bit().data(), value.typeName(), QVariant::typeToName( d->type ) );
     }
     val = value;
diff --git a/src/sql/qsqlindex.cpp b/src/sql/qsqlindex.cpp
index 3a4eb8a..f5bdace 100644
--- a/src/sql/qsqlindex.cpp
+++ b/src/sql/qsqlindex.cpp
@@ -277,7 +277,7 @@ QSqlIndex QSqlIndex::fromStringList( const QStringList& l, const QSqlCursor* cur
 	if ( field )
 	    newSort.append( *field, desc );
 	else
-	    tqWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
+	    qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
     }
     return newSort;
 }
diff --git a/src/sql/qsqlmanager_p.cpp b/src/sql/qsqlmanager_p.cpp
index 0d80286..68360dc 100644
--- a/src/sql/qsqlmanager_p.cpp
+++ b/src/sql/qsqlmanager_p.cpp
@@ -307,10 +307,10 @@ static int compare_recs( const QSqlRecord* buf1, const QSqlRecord* buf2,
 #ifdef QT_DEBUG_DATAMANAGER
 static void debug_datamanager_buffer( const QString& msg, QSqlRecord* cursor )
 {
-    tqDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
-    tqDebug( "%s", msg.latin1() );
+    qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
+    qDebug( "%s", msg.latin1() );
     for ( uint j = 0; j < cursor->count(); ++j ) {
-	tqDebug( "%s", (cursor->field(j)->name() + " type:"
+	qDebug( "%s", (cursor->field(j)->name() + " type:"
 		       + QString(cursor->field(j)->value().typeName())
 		       + " value:" + cursor->field(j)->value().toString())
 		       .latin1() );
@@ -348,7 +348,7 @@ update.  For example:
 bool QSqlCursorManager::findBuffer( const QSqlIndex& idx, int atHint )
 {
 #ifdef QT_DEBUG_DATAMANAGER
-    tqDebug("QSqlCursorManager::findBuffer:");
+    qDebug("QSqlCursorManager::findBuffer:");
 #endif
     QSqlCursor* cur = cursor();
     if ( !cur )
@@ -363,7 +363,7 @@ bool QSqlCursorManager::findBuffer( const QSqlIndex& idx, int atHint )
     QSqlRecord* buf = cur->editBuffer();
     bool indexEquals = FALSE;
 #ifdef QT_DEBUG_DATAMANAGER
-    tqDebug(" Checking hint...");
+    qDebug(" Checking hint...");
 #endif
     /* check the hint */
     if ( cur->seek( atHint ) )
@@ -371,7 +371,7 @@ bool QSqlCursorManager::findBuffer( const QSqlIndex& idx, int atHint )
 
     if ( !indexEquals ) {
 #ifdef QT_DEBUG_DATAMANAGER
-	tqDebug(" Checking current page...");
+	qDebug(" Checking current page...");
 #endif
 	/* check current page */
 	int pageSize = 20;
@@ -389,7 +389,7 @@ bool QSqlCursorManager::findBuffer( const QSqlIndex& idx, int atHint )
     if ( !indexEquals && cur->driver()->hasFeature( QSqlDriver::QuerySize )
 	 && cur->sort().count() ) {
 #ifdef QT_DEBUG_DATAMANAGER
-	tqDebug(" Using binary search...");
+	qDebug(" Using binary search...");
 #endif
 	// binary search based on record buffer and current sort fields
 	int lo = 0;
@@ -442,7 +442,7 @@ bool QSqlCursorManager::findBuffer( const QSqlIndex& idx, int atHint )
 
     if ( !indexEquals ) {
 #ifdef QT_DEBUG_DATAMANAGER
-	tqDebug(" Using brute search...");
+	qDebug(" Using brute search...");
 #endif
 #ifndef QT_NO_CURSOR
 	QApplication::setOverrideCursor( Qt::waitCursor );
@@ -465,7 +465,7 @@ bool QSqlCursorManager::findBuffer( const QSqlIndex& idx, int atHint )
 #endif
     }
 #ifdef QT_DEBUG_DATAMANAGER
-	tqDebug(" Done, result:" + QString::number( indexEquals ) );
+	qDebug(" Done, result:" + QString::number( indexEquals ) );
 #endif
     return indexEquals;
 }
diff --git a/src/sql/qsqlpropertymap.cpp b/src/sql/qsqlpropertymap.cpp
index 7222ce0..3c99a1c 100644
--- a/src/sql/qsqlpropertymap.cpp
+++ b/src/sql/qsqlpropertymap.cpp
@@ -221,7 +221,7 @@ QVariant QSqlPropertyMap::property( QWidget * widget )
 
     if ( !mo ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlPropertyMap::property: %s does not exist", widget->metaObject()->className() );
+	qWarning("QSqlPropertyMap::property: %s does not exist", widget->metaObject()->className() );
 #endif
 	return QVariant();
     }
@@ -240,7 +240,7 @@ void QSqlPropertyMap::setProperty( QWidget * widget, const QVariant & value )
 	mo = mo->superClass();
     if ( !mo ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlPropertyMap::setProperty: %s not handled by QSqlPropertyMap", widget->metaObject()->className() );
+	qWarning("QSqlPropertyMap::setProperty: %s not handled by QSqlPropertyMap", widget->metaObject()->className() );
 #endif
 	return;
     }
diff --git a/src/sql/qsqlquery.cpp b/src/sql/qsqlquery.cpp
index 44e3b67..fec2343 100644
--- a/src/sql/qsqlquery.cpp
+++ b/src/sql/qsqlquery.cpp
@@ -353,7 +353,7 @@ bool QSqlQuery::exec ( const QString& query )
     d->sqlResult->setAt( QSql::BeforeFirst );
     if ( !driver() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::exec: no driver" );
+	qWarning("QSqlQuery::exec: no driver" );
 #endif
 	return FALSE;
     }
@@ -363,18 +363,18 @@ bool QSqlQuery::exec ( const QString& query )
     d->executedQuery = d->sqlResult->lastQuery();
     if ( !driver()->isOpen() || driver()->isOpenError() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::exec: database not open" );
+	qWarning("QSqlQuery::exec: database not open" );
 #endif
 	return FALSE;
     }
     if ( query.isNull() || query.length() == 0 ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::exec: empty query" );
+	qWarning("QSqlQuery::exec: empty query" );
 #endif
 	return FALSE;
     }
 #ifdef QT_DEBUG_SQL
-    tqDebug( "\n QSqlQuery: " + query );
+    qDebug( "\n QSqlQuery: " + query );
 #endif
     return d->sqlResult->reset( query );
 }
@@ -403,7 +403,7 @@ QVariant QSqlQuery::value( int i ) const
 	return d->sqlResult->data( i );
     } else {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QSqlQuery::value: not positioned on a valid record" );
+	qWarning( "QSqlQuery::value: not positioned on a valid record" );
 #endif
     }
     return QVariant();
@@ -544,7 +544,7 @@ bool QSqlQuery::seek( int i, bool relative )
     // let drivers optimize
     if ( isForwardOnly() && actualIdx < at() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
+	qWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
 #endif
 	afterSeek();
 	return FALSE;
@@ -661,7 +661,7 @@ bool QSqlQuery::prev()
 	return FALSE;
     if ( isForwardOnly() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
+	qWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
 #endif
 	return FALSE;
     }
@@ -705,7 +705,7 @@ bool QSqlQuery::first()
 	return FALSE;
     if ( isForwardOnly() && at() > QSql::BeforeFirst ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
+	qWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
 #endif
 	return FALSE;
     }
@@ -937,7 +937,7 @@ bool QSqlQuery::prepare( const QString& query )
     d->sqlResult->extension()->clear();
     if ( !driver() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::prepare: no driver" );
+	qWarning("QSqlQuery::prepare: no driver" );
 #endif
 	return FALSE;
     }
@@ -946,18 +946,18 @@ bool QSqlQuery::prepare( const QString& query )
     d->sqlResult->setQuery( query.stripWhiteSpace() );
     if ( !driver()->isOpen() || driver()->isOpenError() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::prepare: database not open" );
+	qWarning("QSqlQuery::prepare: database not open" );
 #endif
 	return FALSE;
     }
     if ( query.isNull() || query.length() == 0 ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::prepare: empty query" );
+	qWarning("QSqlQuery::prepare: empty query" );
 #endif
 	return FALSE;
     }
 #ifdef QT_DEBUG_SQL
-    tqDebug( "\n QSqlQuery: " + query );
+    qDebug( "\n QSqlQuery: " + query );
 #endif
     QString q = query;
     QRegExp rx(QString::fromLatin1("'[^']*'|:([a-zA-Z0-9_]+)"));
@@ -1176,7 +1176,7 @@ QVariant QSqlQuery::boundValue( int pos ) const
     QMap<QString, QVariant>::ConstIterator it;
     QMap<QString, QVariant> vals = query.boundValues();
     for ( it = vals.begin(); it != vals.end(); ++it )
-        tqWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() );
+        qWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() );
     ...
 
     // Examine the bound values - bound using positional binding
@@ -1184,7 +1184,7 @@ QVariant QSqlQuery::boundValue( int pos ) const
     QValueList<QVariant> list = query.boundValues().values();
     int i = 0;
     for ( it = list.begin(); it != list.end(); ++it )
-        tqWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ );
+        qWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ );
     ...
 
     \endcode
diff --git a/src/sql/qsqlrecord.cpp b/src/sql/qsqlrecord.cpp
index 10e66ed..bc6a25f 100644
--- a/src/sql/qsqlrecord.cpp
+++ b/src/sql/qsqlrecord.cpp
@@ -302,7 +302,7 @@ int QSqlRecord::position( const QString& name ) const
 	    return i;
     }
 #ifdef QT_CHECK_RANGE
-    tqWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
+    qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
 #endif
     return -1;
 }
@@ -317,7 +317,7 @@ QSqlField* QSqlRecord::field( int i )
     checkDetach();
     if ( !sh->d->contains( i ) ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QSqlRecord::field: index out of range: %d", i );
+	qWarning( "QSqlRecord::field: index out of range: %d", i );
 #endif
 	return 0;
     }
@@ -348,7 +348,7 @@ const QSqlField* QSqlRecord::field( int i ) const
 {
     if ( !sh->d->contains( i ) ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QSqlRecord::field: index out of range: %d", i  );
+	qWarning( "QSqlRecord::field: index out of range: %d", i  );
 #endif // QT_CHECK_RANGE
 	return 0;
     }