diff options
| author | Timothy Pearson <[email protected]> | 2012-03-02 02:11:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-03-02 02:11:59 -0600 |
| commit | 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 (patch) | |
| tree | df1e10cc7504665622d096f9ba80dc9e56f3afb8 /src/sql/qsqldatabase.cpp | |
| parent | a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff) | |
| download | qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.tar.gz qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.zip | |
Undo prior accidental commit
Diffstat (limited to 'src/sql/qsqldatabase.cpp')
| -rw-r--r-- | src/sql/qsqldatabase.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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" ) ); |