src/sql: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support

Also remove many #ifdef UNICODE blocks

Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>

2 files changed, 2 insertions, 37 deletions

diff --git a/src/sql/drivers/db2/qsql_db2.cpp b/src/sql/drivers/db2/qsql_db2.cpp
index 1a82377..e4f564a 100644
--- a/src/sql/drivers/db2/qsql_db2.cpp
+++ b/src/sql/drivers/db2/qsql_db2.cpp
@@ -51,10 +51,6 @@
 #include <qvector.h>
 #include <QDebug>
 
-#ifndef UNICODE
-#define UNICODE
-#endif
-
 #if defined(Q_CC_BOR)
 // DB2's sqlsystm.h (included through sqlcli1.h) defines the SQL_BIGINT_TYPE
 // and SQL_BIGUINT_TYPE to wrong the types for Borland; so do the defines to
@@ -111,22 +107,14 @@ public:
 
 static QString qFromTChar(SQLTCHAR* str)
 {
-#ifdef UNICODE
     return QString::fromUtf16(str);
-#else
-    return QString::fromLocal8Bit((const char*) str);
-#endif
 }
 
 // dangerous!! (but fast). Don't use in functions that
 // require out parameters!
 static SQLTCHAR* qToTChar(const QString& str)
 {
-#ifdef UNICODE
     return (SQLTCHAR*)str.utf16();
-#else
-    return (unsigned char*) str.ascii();
-#endif
 }
 
 static QString qWarnDB2Handle(int handleType, SQLHANDLE handle)
@@ -347,12 +335,8 @@ static QString qGetStringData(SQLHANDLE hStmt, int column, int colSize, bool& is
 
     while (true) {
         r = SQLGetData(hStmt,
-                        column+1,
-#ifdef UNICODE
+                        column + 1,
                         SQL_C_WCHAR,
-#else
-                        SQL_C_CHAR,
-#endif
                         (SQLPOINTER)buf,
                         colSize * sizeof(SQLTCHAR),
                         &lengthIndicator);
@@ -740,7 +724,6 @@ bool QDB2Result::exec()
                                       ind);
                 break; }
             case QVariant::String:
-#ifdef UNICODE
             {
                 QString str(values.at(i).toString());
                 if (*ind != SQL_NULL_DATA)
@@ -774,8 +757,6 @@ bool QDB2Result::exec()
                 }
                 break;
             }
-#endif
-            // fall through
             default: {
                 QByteArray ba = values.at(i).toString().toAscii();
                 int len = ba.length() + 1;
@@ -849,12 +830,9 @@ bool QDB2Result::exec()
             case QVariant::ByteArray:
                 break;
             case QVariant::String:
-#ifdef UNICODE
                 if (bindValueType(i) & QSql::Out)
                     values[i] = QString::fromUtf16((ushort*)tmpStorage.takeFirst().constData());
                 break;
-#endif
-                // fall through
             default: {
                 values[i] = QString::fromAscii(tmpStorage.takeFirst().constData());
                 break; }
@@ -1542,13 +1520,7 @@ bool QDB2Driver::hasFeature(DriverFeature f) const
         case FinishQuery:
             return true;
         case Unicode:
-        // this is the query that shows the codepage for the types:
-        // select typename, codepage from syscat.datatypes
-#ifdef UNICODE
             return true;
-#else
-            return false;
-#endif
     }
     return false;
 }
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index af0c297..c48c7cd 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -1843,14 +1843,7 @@ void QODBCDriverPrivate::checkUnicode()
     unicode = false;
     return;
 #endif
-#if defined(Q_WS_WIN)
-    QT_WA(
-    {},
-    {
-        unicode = false;
-        return;
-    })
-#endif
+
     SQLRETURN   r;
     SQLUINTEGER fFunc;