diff options
Diffstat (limited to 'src/sql/drivers/odbc/tqsql_odbc.cpp')
| -rw-r--r-- | src/sql/drivers/odbc/tqsql_odbc.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/sql/drivers/odbc/tqsql_odbc.cpp b/src/sql/drivers/odbc/tqsql_odbc.cpp index 3da2dd50c..13b3af584 100644 --- a/src/sql/drivers/odbc/tqsql_odbc.cpp +++ b/src/sql/drivers/odbc/tqsql_odbc.cpp @@ -193,7 +193,7 @@ static void qSqlWarning( const TQString& message, const TQODBCPrivate* odbc ) #endif } -static TQSqlError qMakeError( const TQString& err, int type, const TQODBCPrivate* p ) +static TQSqlError tqMakeError( const TQString& err, int type, const TQODBCPrivate* p ) { return TQSqlError( "TQODBC3: " + err, qODBCWarn(p), type ); } @@ -444,7 +444,7 @@ static SQLBIGINT qGetBigIntData( SQLHANDLE hStmt, int column, bool& isNull ) // creates a TQSqlFieldInfo from a valid hStmt generated // by SQLColumns. The hStmt has to point to a valid position. -static TQSqlFieldInfo qMakeFieldInfo( const SQLHANDLE hStmt, const TQODBCPrivate* p ) +static TQSqlFieldInfo tqMakeFieldInfo( const SQLHANDLE hStmt, const TQODBCPrivate* p ) { bool isNull; TQString fname = qGetStringData( hStmt, 3, -1, isNull, p->unicode ); @@ -463,7 +463,7 @@ static TQSqlFieldInfo qMakeFieldInfo( const SQLHANDLE hStmt, const TQODBCPrivate return TQSqlFieldInfo( fname, qDecodeODBCType( type, p ), required, size, prec, TQVariant(), type ); } -static TQSqlFieldInfo qMakeFieldInfo( const TQODBCPrivate* p, int i ) +static TQSqlFieldInfo tqMakeFieldInfo( const TQODBCPrivate* p, int i ) { SQLSMALLINT colNameLen; SQLSMALLINT colType; @@ -484,7 +484,7 @@ static TQSqlFieldInfo qMakeFieldInfo( const TQODBCPrivate* p, int i ) if ( r != SQL_SUCCESS ) { #ifdef QT_CHECK_RANGE - qSqlWarning( TQString("qMakeField: Unable to describe column %1").arg(i), p ); + qSqlWarning( TQString("tqMakeField: Unable to describe column %1").arg(i), p ); #endif return TQSqlFieldInfo(); } @@ -722,7 +722,7 @@ bool TQODBCResult::reset ( const TQString& query ) (SQLINTEGER) query8.length() ); #endif if ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) { - setLastError( qMakeError( "Unable to execute statement", TQSqlError::Statement, d ) ); + setLastError( tqMakeError( "Unable to execute statement", TQSqlError::Statement, d ) ); return FALSE; } SQLSMALLINT count; @@ -730,7 +730,7 @@ bool TQODBCResult::reset ( const TQString& query ) if ( count ) { setSelect( TRUE ); for ( int i = 0; i < count; ++i ) { - d->rInf.append( qMakeFieldInfo( d, i ) ); + d->rInf.append( tqMakeFieldInfo( d, i ) ); } } else { setSelect( FALSE ); @@ -1231,7 +1231,7 @@ bool TQODBCResult::exec() #ifdef QT_CHECK_RANGE tqWarning( "TQODBCResult::exec: unable to bind variable: %s", qODBCWarn( d ).local8Bit().data() ); #endif - setLastError( qMakeError( "Unable to bind variable", TQSqlError::Statement, d ) ); + setLastError( tqMakeError( "Unable to bind variable", TQSqlError::Statement, d ) ); return FALSE; } } @@ -1241,7 +1241,7 @@ bool TQODBCResult::exec() #ifdef QT_CHECK_RANGE tqWarning( "TQODBCResult::exec: Unable to execute statement: %s", qODBCWarn( d ).local8Bit().data() ); #endif - setLastError( qMakeError( "Unable to execute statement", TQSqlError::Statement, d ) ); + setLastError( tqMakeError( "Unable to execute statement", TQSqlError::Statement, d ) ); return FALSE; } SQLSMALLINT count; @@ -1249,7 +1249,7 @@ bool TQODBCResult::exec() if ( count ) { setSelect( TRUE ); for ( int i = 0; i < count; ++i ) { - d->rInf.append( qMakeFieldInfo( d, i ) ); + d->rInf.append( tqMakeFieldInfo( d, i ) ); } } else { setSelect( FALSE ); @@ -1464,13 +1464,13 @@ bool TQODBCDriver::open( const TQString & db, &cb, SQL_DRIVER_NOPROMPT ); if ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) { - setLastError( qMakeError( "Unable to connect", TQSqlError::Connection, d ) ); + setLastError( tqMakeError( "Unable to connect", TQSqlError::Connection, d ) ); setOpenError( TRUE ); return FALSE; } if ( !d->checkDriver() ) { - setLastError( qMakeError( "Unable to connect - Driver doesn't support all needed functionality", TQSqlError::Connection, d ) ); + setLastError( tqMakeError( "Unable to connect - Driver doesn't support all needed functionality", TQSqlError::Connection, d ) ); setOpenError( TRUE ); return FALSE; } @@ -1672,7 +1672,7 @@ bool TQODBCDriver::beginTransaction() (SQLPOINTER)ac, sizeof(ac) ); if ( r != SQL_SUCCESS ) { - setLastError( qMakeError( "Unable to disable autocommit", TQSqlError::Transaction, d ) ); + setLastError( tqMakeError( "Unable to disable autocommit", TQSqlError::Transaction, d ) ); return FALSE; } return TRUE; @@ -1690,7 +1690,7 @@ bool TQODBCDriver::commitTransaction() d->hDbc, SQL_COMMIT ); if ( r != SQL_SUCCESS ) { - setLastError( qMakeError("Unable to commit transaction", TQSqlError::Transaction, d ) ); + setLastError( tqMakeError("Unable to commit transaction", TQSqlError::Transaction, d ) ); return FALSE; } return endTrans(); @@ -1708,7 +1708,7 @@ bool TQODBCDriver::rollbackTransaction() d->hDbc, SQL_ROLLBACK ); if ( r != SQL_SUCCESS ) { - setLastError( qMakeError( "Unable to rollback transaction", TQSqlError::Transaction, d ) ); + setLastError( tqMakeError( "Unable to rollback transaction", TQSqlError::Transaction, d ) ); return FALSE; } return endTrans(); @@ -1722,7 +1722,7 @@ bool TQODBCDriver::endTrans() (SQLPOINTER)ac, sizeof(ac)); if ( r != SQL_SUCCESS ) { - setLastError( qMakeError( "Unable to enable autocommit", TQSqlError::Transaction, d ) ); + setLastError( tqMakeError( "Unable to enable autocommit", TQSqlError::Transaction, d ) ); return FALSE; } return TRUE; @@ -1968,7 +1968,7 @@ TQSqlRecordInfo TQODBCDriver::recordInfo( const TQString& tablename ) const // Store all fields in a StringList because some drivers can't detail fields in this FETCH loop while ( r == SQL_SUCCESS ) { - fil.append( qMakeFieldInfo( hStmt, d ) ); + fil.append( tqMakeFieldInfo( hStmt, d ) ); r = SQLFetchScroll( hStmt, SQL_FETCH_NEXT, |