diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-02-12 14:08:42 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-02-12 14:08:52 +0900 |
| commit | 67bff2edcacb208dc44dcd521386bef686dc6dbf (patch) | |
| tree | 538584042585402a59d4b1464b117033778ccc28 /src/sql/drivers | |
| parent | fb401a891f1b426e9419c0cb16403df407138611 (diff) | |
| download | tqt3-67bff2edcacb208dc44dcd521386bef686dc6dbf.tar.gz tqt3-67bff2edcacb208dc44dcd521386bef686dc6dbf.zip | |
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 <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/sql/drivers')
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 2 | ||||
| -rw-r--r-- | src/sql/drivers/sqlite/qsql_sqlite.cpp | 4 | ||||
| -rw-r--r-- | src/sql/drivers/sqlite3/qsql_sqlite3.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
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 <ntqregexp.h> #include <ntqfile.h> #include <ntqptrvector.h> -#if !defined Q_WS_WIN32 +#if !defined TQ_WS_WIN32 # include <unistd.h> #endif #include <sqlite.h> @@ -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 <ntqfile.h> #include <sqlite3.h> #include <ntqptrvector.h> -#if !defined Q_WS_WIN32 +#if !defined TQ_WS_WIN32 # include <unistd.h> #endif |