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