diff options
Diffstat (limited to 'src/sql/drivers')
| -rw-r--r-- | src/sql/drivers/cache/qsqlcachedresult.h | 2 | ||||
| -rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.cpp | 2 | ||||
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 2 | ||||
| -rw-r--r-- | src/sql/drivers/sqlite/qsql_sqlite.cpp | 8 | ||||
| -rw-r--r-- | src/sql/drivers/sqlite/qsql_sqlite.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/sql/drivers/cache/qsqlcachedresult.h b/src/sql/drivers/cache/qsqlcachedresult.h index bde3457d1..b00779dc0 100644 --- a/src/sql/drivers/cache/qsqlcachedresult.h +++ b/src/sql/drivers/cache/qsqlcachedresult.h @@ -57,7 +57,7 @@ #include <ntqvaluevector.h> #include <ntqsqlresult.h> -#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) +#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else #define TQM_EXPORT_SQL Q_EXPORT diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index 433e8de26..d34e58500 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -305,7 +305,7 @@ bool TQMYSQLResult::reset ( const TQString& query ) cleanup(); const char *encQuery = query.ascii(); - if ( mysql_real_query( d->mysql, encQuery, qstrlen(encQuery) ) ) { + if ( mysql_real_query( d->mysql, encQuery, tqstrlen(encQuery) ) ) { setLastError( qMakeError("Unable to execute query", TQSqlError::Statement, d ) ); return FALSE; } diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index b91bea329..2a387f516 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -428,7 +428,7 @@ static double qGetDoubleData( SQLHANDLE hStmt, int column, bool& isNull ) static SQLBIGINT qGetBigIntData( SQLHANDLE hStmt, int column, bool& isNull ) { - SQLBIGINT lngbuf = Q_INT64_C( 0 ); + SQLBIGINT lngbuf = TQ_INT64_C( 0 ); isNull = FALSE; TQSQLLEN lengthIndicator = 0; SQLRETURN r = SQLGetData( hStmt, diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index 1662a6e8c..35033667b 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -18,7 +18,7 @@ #include <ntqregexp.h> #include <ntqfile.h> -#if (QT_VERSION-0 < 0x030000) +#if (TQT_VERSION-0 < 0x030000) # include <ntqvector.h> # if !defined Q_WS_WIN32 # include <unistd.h> @@ -303,7 +303,7 @@ bool TQSQLiteDriver::hasFeature(DriverFeature f) const switch (f) { case Transactions: return TRUE; -#if (QT_VERSION-0 >= 0x030000) +#if (TQT_VERSION-0 >= 0x030000) case Unicode: return d->utf8; #endif @@ -414,7 +414,7 @@ TQStringList TQSQLiteDriver::tables(const TQString &typeName) const TQSqlQuery q = createQuery(); q.setForwardOnly(TRUE); -#if (QT_VERSION-0 >= 0x030000) +#if (TQT_VERSION-0 >= 0x030000) if ((type & (int)TQSql::Tables) && (type & (int)TQSql::Views)) q.exec("SELECT name FROM sqlite_master WHERE type='table' OR type='view'"); else if (typeName.isEmpty() || (type & (int)TQSql::Tables)) @@ -431,7 +431,7 @@ TQStringList TQSQLiteDriver::tables(const TQString &typeName) const res.append(q.value(0).toString()); } -#if (QT_VERSION-0 >= 0x030000) +#if (TQT_VERSION-0 >= 0x030000) if (type & (int)TQSql::SystemTables) { // there are no internal tables beside this one: res.append("sqlite_master"); diff --git a/src/sql/drivers/sqlite/qsql_sqlite.h b/src/sql/drivers/sqlite/qsql_sqlite.h index 300642ce1..ff05ede60 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.h +++ b/src/sql/drivers/sqlite/qsql_sqlite.h @@ -21,7 +21,7 @@ #include <ntqsqlindex.h> #include "../cache/qsqlcachedresult.h" -#if (QT_VERSION-0 >= 0x030000) +#if (TQT_VERSION-0 >= 0x030000) typedef TQVariant TQSqlVariant; #endif |