summaryrefslogtreecommitdiffstats
path: root/src/sql/drivers/psql/qsql_psql.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/sql/drivers/psql/qsql_psql.cpp')
-rw-r--r--src/sql/drivers/psql/qsql_psql.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index 84c3ff2..7fe1a91 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -64,8 +64,8 @@
# undef open
#endif
-QPtrDict<QSqlDriverExtension> *tqSqlDriverExtDict();
-QPtrDict<QSqlOpenExtension> *tqSqlOpenExtDict();
+QPtrDict<QSqlDriverExtension> *qSqlDriverExtDict();
+QPtrDict<QSqlOpenExtension> *qSqlOpenExtDict();
class QPSQLPrivate
{
@@ -272,7 +272,7 @@ static QPoint pointFromString( const QString& s)
QVariant QPSQLResult::data( int i )
{
if ( i >= PQnfields( d->result ) ) {
- tqWarning( "QPSQLResult::data: column %d out of range", i );
+ qWarning( "QPSQLResult::data: column %d out of range", i );
return QVariant();
}
int ptype = PQftype( d->result, i );
@@ -395,7 +395,7 @@ QVariant QPSQLResult::data( int i )
int fd = lo_open( d->connection, oid, INV_READ );
#ifdef QT_CHECK_RANGE
if ( fd < 0) {
- tqWarning( "QPSQLResult::data: unable to open large object for read" );
+ qWarning( "QPSQLResult::data: unable to open large object for read" );
((QSqlDriver*)driver())->commitTransaction();
return QVariant( ba );
}
@@ -429,7 +429,7 @@ QVariant QPSQLResult::data( int i )
#endif
if (retval < 0) {
- tqWarning( "QPSQLResult::data: unable to read large object" );
+ qWarning( "QPSQLResult::data: unable to read large object" );
} else {
ba.duplicate( buf, size );
}
@@ -441,7 +441,7 @@ QVariant QPSQLResult::data( int i )
default:
case QVariant::Invalid:
#ifdef QT_CHECK_RANGE
- tqWarning("QPSQLResult::data: unknown data type");
+ qWarning("QPSQLResult::data: unknown data type");
#endif
;
}
@@ -512,7 +512,7 @@ static void setDatestyle( PGconn* connection )
#ifdef QT_CHECK_RANGE
int status = PQresultStatus( result );
if ( status != PGRES_COMMAND_OK )
- tqWarning( "%s", PQerrorMessage( connection ) );
+ qWarning( "%s", PQerrorMessage( connection ) );
#endif
PQclear( result );
}
@@ -531,7 +531,7 @@ static QPSQLDriver::Protocol getPSQLVersion( PGconn* connection )
int vMin = rx.cap( 2 ).toInt();
if ( vMaj < 6 ) {
#ifdef QT_CHECK_RANGE
- tqWarning( "This version of PostgreSQL is not supported and may not work." );
+ qWarning( "This version of PostgreSQL is not supported and may not work." );
#endif
return QPSQLDriver::Version6;
}
@@ -547,7 +547,7 @@ static QPSQLDriver::Protocol getPSQLVersion( PGconn* connection )
}
} else {
#ifdef QT_CHECK_RANGE
- tqWarning( "This version of PostgreSQL is not supported and may not work." );
+ qWarning( "This version of PostgreSQL is not supported and may not work." );
#endif
}
@@ -574,8 +574,8 @@ QPSQLDriver::QPSQLDriver( PGconn * conn, QObject * parent, const char * name )
void QPSQLDriver::init()
{
- tqSqlDriverExtDict()->insert( this, new QPSQLDriverExtension(this) );
- tqSqlOpenExtDict()->insert( this, new QPSQLOpenExtension(this) );
+ qSqlDriverExtDict()->insert( this, new QPSQLDriverExtension(this) );
+ qSqlOpenExtDict()->insert( this, new QPSQLOpenExtension(this) );
d = new QPSQLPrivate();
}
@@ -585,12 +585,12 @@ QPSQLDriver::~QPSQLDriver()
if ( d->connection )
PQfinish( d->connection );
delete d;
- if ( !tqSqlDriverExtDict()->isEmpty() ) {
- QSqlDriverExtension *ext = tqSqlDriverExtDict()->take( this );
+ if ( !qSqlDriverExtDict()->isEmpty() ) {
+ QSqlDriverExtension *ext = qSqlDriverExtDict()->take( this );
delete ext;
}
- if ( !tqSqlOpenExtDict()->isEmpty() ) {
- QSqlOpenExtension *ext = tqSqlOpenExtDict()->take( this );
+ if ( !qSqlOpenExtDict()->isEmpty() ) {
+ QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
delete ext;
}
}
@@ -623,7 +623,7 @@ bool QPSQLDriver::open( const QString&,
const QString&,
int )
{
- tqWarning("QPSQLDriver::open(): This version of open() is no longer supported." );
+ qWarning("QPSQLDriver::open(): This version of open() is no longer supported." );
return FALSE;
}
@@ -688,7 +688,7 @@ bool QPSQLDriver::beginTransaction()
{
if ( !isOpen() ) {
#ifdef QT_CHECK_RANGE
- tqWarning( "QPSQLDriver::beginTransaction: Database not open" );
+ qWarning( "QPSQLDriver::beginTransaction: Database not open" );
#endif
return FALSE;
}
@@ -706,7 +706,7 @@ bool QPSQLDriver::commitTransaction()
{
if ( !isOpen() ) {
#ifdef QT_CHECK_RANGE
- tqWarning( "QPSQLDriver::commitTransaction: Database not open" );
+ qWarning( "QPSQLDriver::commitTransaction: Database not open" );
#endif
return FALSE;
}
@@ -724,7 +724,7 @@ bool QPSQLDriver::rollbackTransaction()
{
if ( !isOpen() ) {
#ifdef QT_CHECK_RANGE
- tqWarning( "QPSQLDriver::rollbackTransaction: Database not open" );
+ qWarning( "QPSQLDriver::rollbackTransaction: Database not open" );
#endif
return FALSE;
}