diff options
Diffstat (limited to 'src/sql/drivers/mysql/qsql_mysql.cpp')
| -rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
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; } |