From a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 1 Mar 2012 13:24:30 -0600
Subject: Rename additional global TQt functions

---
 src/sql/qsqldatabase.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/sql/qsqldatabase.cpp')

diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp
index eaa7a70..ec2aa0f 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> *qSqlDriverExtDict()
+Q_EXPORT QPtrDict<QSqlDriverExtension> *tqSqlDriverExtDict()
 {
     if ( !qt_driver_extension_dict ) {
 	qt_driver_extension_dict = new QPtrDict<QSqlDriverExtension>;
@@ -101,7 +101,7 @@ Q_EXPORT QPtrDict<QSqlDriverExtension> *qSqlDriverExtDict()
     return qt_driver_extension_dict;
 }
 
-Q_EXPORT QPtrDict<QSqlOpenExtension> *qSqlOpenExtDict()
+Q_EXPORT QPtrDict<QSqlOpenExtension> *tqSqlOpenExtDict()
 {
     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 ){
-	    qFatal( "QSqlDatabaseManager: A QApplication object has to be "
+	    tqFatal( "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() )
-	    qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
+	    tqWarning("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
-	qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
-	qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
+	tqWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
+	tqWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
 #endif
 	d->driver = new QNullDriver();
 	d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
-- 
cgit v1.2.3