summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/qt.pro2
-rw-r--r--src/sql/drivers/mysql/tqsql_mysql.cpp20
-rw-r--r--src/sql/drivers/odbc/tqsql_odbc.cpp32
-rw-r--r--src/sql/drivers/psql/tqsql_psql.cpp14
-rw-r--r--src/sql/drivers/sqlite3/tqsql_sqlite3.cpp10
-rw-r--r--src/tools/tqfile.cpp2
6 files changed, 40 insertions, 40 deletions
diff --git a/src/qt.pro b/src/qt.pro
index 24302751b..3b166d248 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -6,7 +6,7 @@ DESTDIR = $$QMAKE_LIBDIR_TQT
DLLDESTDIR = ../bin
CONFIG += qt warn_on depend_includepath
-CONFIG += qmake_cache
+CONFIG += tqmake_cache
win32:!shared:CONFIG += staticlib
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;
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,
diff --git a/src/sql/drivers/psql/tqsql_psql.cpp b/src/sql/drivers/psql/tqsql_psql.cpp
index df79ac2fd..be73b6303 100644
--- a/src/sql/drivers/psql/tqsql_psql.cpp
+++ b/src/sql/drivers/psql/tqsql_psql.cpp
@@ -120,7 +120,7 @@ bool TQPSQLOpenExtension::open( const TQString& db,
return driver->open( db, user, password, host, port, connOpts );
}
-static TQSqlError qMakeError( const TQString& err, int type, const TQPSQLPrivate* p )
+static TQSqlError tqMakeError( const TQString& err, int type, const TQPSQLPrivate* p )
{
const char *s = PQerrorMessage(p->connection);
TQString msg = p->isUtf8 ? TQString::fromUtf8(s) : TQString::fromLocal8Bit(s);
@@ -484,7 +484,7 @@ bool TQPSQLResult::reset ( const TQString& query )
setActive( TRUE );
return TRUE;
}
- setLastError( qMakeError( "Unable to create query", TQSqlError::Statement, d ) );
+ setLastError( tqMakeError( "Unable to create query", TQSqlError::Statement, d ) );
return FALSE;
}
@@ -656,7 +656,7 @@ bool TQPSQLDriver::open( const TQString & db,
d->connection = PQconnectdb( connectString.local8Bit().data() );
if ( PQstatus( d->connection ) == CONNECTION_BAD ) {
- setLastError( qMakeError("Unable to connect", TQSqlError::Connection, d ) );
+ setLastError( tqMakeError("Unable to connect", TQSqlError::Connection, d ) );
setOpenError( TRUE );
return FALSE;
}
@@ -697,7 +697,7 @@ bool TQPSQLDriver::ping()
if ( PQstatus( d->connection ) != CONNECTION_OK ) {
PQreset( d->connection );
if ( PQstatus( d->connection ) != CONNECTION_OK ) {
- setLastError( qMakeError("Unable to execute ping", TQSqlError::Statement, d ) );
+ setLastError( tqMakeError("Unable to execute ping", TQSqlError::Statement, d ) );
return FALSE;
}
}
@@ -720,7 +720,7 @@ bool TQPSQLDriver::beginTransaction()
PGresult* res = PQexec( d->connection, "BEGIN" );
if ( !res || PQresultStatus( res ) != PGRES_COMMAND_OK ) {
PQclear( res );
- setLastError( qMakeError( "Could not begin transaction", TQSqlError::Transaction, d ) );
+ setLastError( tqMakeError( "Could not begin transaction", TQSqlError::Transaction, d ) );
return FALSE;
}
PQclear( res );
@@ -738,7 +738,7 @@ bool TQPSQLDriver::commitTransaction()
PGresult* res = PQexec( d->connection, "COMMIT" );
if ( !res || PQresultStatus( res ) != PGRES_COMMAND_OK ) {
PQclear( res );
- setLastError( qMakeError( "Could not commit transaction", TQSqlError::Transaction, d ) );
+ setLastError( tqMakeError( "Could not commit transaction", TQSqlError::Transaction, d ) );
return FALSE;
}
PQclear( res );
@@ -755,7 +755,7 @@ bool TQPSQLDriver::rollbackTransaction()
}
PGresult* res = PQexec( d->connection, "ROLLBACK" );
if ( !res || PQresultStatus( res ) != PGRES_COMMAND_OK ) {
- setLastError( qMakeError( "Could not rollback transaction", TQSqlError::Transaction, d ) );
+ setLastError( tqMakeError( "Could not rollback transaction", TQSqlError::Transaction, d ) );
PQclear( res );
return FALSE;
}
diff --git a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
index f75feaa1b..df3084c97 100644
--- a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
+++ b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
@@ -43,7 +43,7 @@ static TQVariant::Type qSqliteType(int tp)
}
}
-static TQSqlError qMakeError(sqlite3 *access, const TQString &descr, TQSqlError::Type type,
+static TQSqlError tqMakeError(sqlite3 *access, const TQString &descr, TQSqlError::Type type,
int errorCode = -1)
{
return TQSqlError(descr,
@@ -191,7 +191,7 @@ bool TQSQLite3ResultPrivate::fetchNext(TQtSqlCachedResult::RowCache* row)
case SQLITE_MISUSE:
default:
// something wrong, don't get col info, but still return false
- q->setLastError(qMakeError(access, "Unable to fetch row", TQSqlError::Connection, res));
+ q->setLastError(tqMakeError(access, "Unable to fetch row", TQSqlError::Connection, res));
finalize();
q->setAt(TQSql::AfterLast);
return false;
@@ -229,7 +229,7 @@ bool TQSQLite3Result::reset (const TQString &query)
&d->stmt, 0);
if (res != SQLITE_OK) {
- setLastError(qMakeError(d->access, "Unable to execute statement", TQSqlError::Statement, res));
+ setLastError(tqMakeError(d->access, "Unable to execute statement", TQSqlError::Statement, res));
d->finalize();
return false;
}
@@ -309,7 +309,7 @@ bool TQSQLite3Driver::open(const TQString & db, const TQString &, const TQString
setOpenError(false);
return true;
} else {
- setLastError(qMakeError(d->access, "Error opening database",
+ setLastError(tqMakeError(d->access, "Error opening database",
TQSqlError::Connection));
setOpenError(true);
return false;
@@ -320,7 +320,7 @@ void TQSQLite3Driver::close()
{
if (isOpen()) {
if (sqlite3_close(d->access) != SQLITE_OK)
- setLastError(qMakeError(d->access, "Error closing database",
+ setLastError(tqMakeError(d->access, "Error closing database",
TQSqlError::Connection));
d->access = 0;
setOpen(false);
diff --git a/src/tools/tqfile.cpp b/src/tools/tqfile.cpp
index d67578929..a5f2ae9d2 100644
--- a/src/tools/tqfile.cpp
+++ b/src/tools/tqfile.cpp
@@ -57,7 +57,7 @@
// Duplicated from tqobject.h, but we cannot include tqobject.h here since
-// it causes qmake to not build on irix g++
+// it causes tqmake to not build on irix g++
#define TQT_TRANSLATE_NOOP(scope,x) (x)
const char* qt_fileerr_unknown = TQT_TRANSLATE_NOOP( "TQFile", "Unknown error" );
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 00:37:02 +0000