summaryrefslogtreecommitdiffstats
path: root/src/sql/drivers/mysql/tqsql_mysql.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/sql/drivers/mysql/tqsql_mysql.cpp')
-rw-r--r--src/sql/drivers/mysql/tqsql_mysql.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/sql/drivers/mysql/tqsql_mysql.cpp b/src/sql/drivers/mysql/tqsql_mysql.cpp
index 603a5b960..04c8e477f 100644
--- a/src/sql/drivers/mysql/tqsql_mysql.cpp
+++ b/src/sql/drivers/mysql/tqsql_mysql.cpp
@@ -102,7 +102,7 @@ public:
TQValueVector<TQVariant::Type> fieldTypes;
};
-TQSqlError qMakeError( const TQString& err, int type, const TQMYSQLDriverPrivate* p )
+TQSqlError tqMakeError( const TQString& err, int type, const TQMYSQLDriverPrivate* p )
{
return TQSqlError(TQMYSQL_DRIVER_NAME ": " + err, TQString(mysql_error( p->mysql )), type, mysql_errno( p->mysql ));
}
@@ -306,7 +306,7 @@ bool TQMYSQLResult::reset ( const TQString& query )
const char *encQuery = query.ascii();
if ( mysql_real_query( d->mysql, encQuery, tqstrlen(encQuery) ) ) {
- setLastError( qMakeError("Unable to execute query", TQSqlError::Statement, d ) );
+ setLastError( tqMakeError("Unable to execute query", TQSqlError::Statement, d ) );
return FALSE;
}
if ( isForwardOnly() ) {
@@ -317,7 +317,7 @@ bool TQMYSQLResult::reset ( const TQString& query )
d->result = mysql_store_result( d->mysql );
}
if ( !d->result && mysql_field_count( d->mysql ) > 0 ) {
- setLastError( qMakeError( "Unable to store result", TQSqlError::Statement, d ) );
+ setLastError( tqMakeError( "Unable to store result", TQSqlError::Statement, d ) );
return FALSE;
}
int numFields = mysql_field_count( d->mysql );
@@ -511,7 +511,7 @@ bool TQMYSQLDriver::open( const TQString& db,
}
if (!(d->mysql = mysql_init((MYSQL*) 0))) {
- setLastError( qMakeError( "Unable to connect", TQSqlError::Connection, d ) );
+ setLastError( tqMakeError( "Unable to connect", TQSqlError::Connection, d ) );
mysql_close( d->mysql );
setOpenError( TRUE );
return FALSE;
@@ -561,13 +561,13 @@ bool TQMYSQLDriver::open( const TQString& db,
clientOptionFlags ) )
{
if ( !db.isEmpty() && mysql_select_db( d->mysql, db )) {
- setLastError( qMakeError("Unable open database '" + db + "'", TQSqlError::Connection, d ) );
+ setLastError( tqMakeError("Unable open database '" + db + "'", TQSqlError::Connection, d ) );
mysql_close( d->mysql );
setOpenError( TRUE );
return FALSE;
}
} else {
- setLastError( qMakeError( "Unable to connect", TQSqlError::Connection, d ) );
+ setLastError( tqMakeError( "Unable to connect", TQSqlError::Connection, d ) );
mysql_close( d->mysql );
setOpenError( TRUE );
return FALSE;
@@ -596,7 +596,7 @@ bool TQMYSQLDriver::ping()
return TRUE;
}
else {
- setLastError( qMakeError("Unable to execute ping", TQSqlError::Statement, d ) );
+ setLastError( tqMakeError("Unable to execute ping", TQSqlError::Statement, d ) );
return FALSE;
}
}
@@ -758,7 +758,7 @@ bool TQMYSQLDriver::beginTransaction()
return FALSE;
}
if ( mysql_query( d->mysql, "BEGIN WORK" ) ) {
- setLastError( qMakeError("Unable to begin transaction", TQSqlError::Statement, d ) );
+ setLastError( tqMakeError("Unable to begin transaction", TQSqlError::Statement, d ) );
return FALSE;
}
return TRUE;
@@ -776,7 +776,7 @@ bool TQMYSQLDriver::commitTransaction()
return FALSE;
}
if ( mysql_query( d->mysql, "COMMIT" ) ) {
- setLastError( qMakeError("Unable to commit transaction", TQSqlError::Statement, d ) );
+ setLastError( tqMakeError("Unable to commit transaction", TQSqlError::Statement, d ) );
return FALSE;
}
return TRUE;
@@ -794,7 +794,7 @@ bool TQMYSQLDriver::rollbackTransaction()
return FALSE;
}
if ( mysql_query( d->mysql, "ROLLBACK" ) ) {
- setLastError( qMakeError("Unable to rollback transaction", TQSqlError::Statement, d ) );
+ setLastError( tqMakeError("Unable to rollback transaction", TQSqlError::Statement, d ) );
return FALSE;
}
return TRUE;