From 67bff2edcacb208dc44dcd521386bef686dc6dbf Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 12 Feb 2024 14:08:42 +0900 Subject: Replace Q_WS_* defines with TQ_WS_* equivalents This is the first part of the replacement process. Usage of Q_WS_* has been replaced with the equivalent TQ_WS_*. Definition of Q_WS_* has been mirrored into TQ_WS_* defines, to allow TDE code to continue building till replacement is carried over to all other modules. Once that is completed, the original Q_WS_* defines will be removed. Signed-off-by: Michele Calgaro --- src/sql/drivers/odbc/qsql_odbc.cpp | 2 +- src/sql/drivers/sqlite/qsql_sqlite.cpp | 4 ++-- src/sql/drivers/sqlite3/qsql_sqlite3.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/sql/drivers') diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index 3bedbb8cc..e4141f27f 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -1535,7 +1535,7 @@ void TQODBCDriver::cleanup() // as two byte unicode characters void TQODBCPrivate::checkUnicode() { -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( !qt_winunicode ) { unicode = FALSE; return; diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index b7b7aa5e3..110eccfc2 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -18,7 +18,7 @@ #include #include #include -#if !defined Q_WS_WIN32 +#if !defined TQ_WS_WIN32 # include #endif #include @@ -160,7 +160,7 @@ bool TQSQLiteResultPrivate::fetchNext(TQtSqlCachedResult::RowCache* row) // keep trying while busy, wish I could implement this better. while ((res = sqlite_step(currentMachine, &colNum, &fvals, &cnames)) == SQLITE_BUSY) { // sleep instead requesting result again immidiately. -#if defined Q_WS_WIN32 +#if defined TQ_WS_WIN32 Sleep(1000); #else sleep(1); diff --git a/src/sql/drivers/sqlite3/qsql_sqlite3.cpp b/src/sql/drivers/sqlite3/qsql_sqlite3.cpp index a0d9ac558..763c648a0 100644 --- a/src/sql/drivers/sqlite3/qsql_sqlite3.cpp +++ b/src/sql/drivers/sqlite3/qsql_sqlite3.cpp @@ -20,7 +20,7 @@ #include #include #include -#if !defined Q_WS_WIN32 +#if !defined TQ_WS_WIN32 # include #endif -- cgit v1.2.1