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

Also, buffer sizes passed to Registry APIs were incorrect.

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

1 files changed, 4 insertions, 9 deletions

diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp
index 916fcca..49aa99c 100644
--- a/src/activeqt/shared/qaxtypes.cpp
+++ b/src/activeqt/shared/qaxtypes.cpp
@@ -37,11 +37,6 @@
 **
 ****************************************************************************/
 
-#ifndef UNICODE
-#define UNICODE
-#endif
-
-
 #include <ocidl.h>
 #include <olectl.h>
 
@@ -123,7 +118,7 @@ static QFont IFontToQFont(IFont *f)
     f->get_Strikethrough(&strike);
     f->get_Underline(&underline);
     f->get_Weight(&weight);
-    QFont font(QString::fromUtf16((const ushort *)name), size.Lo/9750, weight / 97, italic);
+    QFont font(QString::fromWCharArray(name), size.Lo/9750, weight / 97, italic);
     font.setBold(bold);
     font.setStrikeOut(strike);
     font.setUnderline(underline);
@@ -925,10 +920,10 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
     QVariant var;
     switch(arg.vt) {
     case VT_BSTR:
-        var = QString::fromUtf16((const ushort *)arg.bstrVal);
+        var = QString::fromWCharArray(arg.bstrVal);
         break;
     case VT_BSTR|VT_BYREF:
-        var = QString::fromUtf16((const ushort *)*arg.pbstrVal);
+        var = QString::fromWCharArray(*arg.pbstrVal);
         break;
     case VT_BOOL:
         var = QVariant((bool)arg.boolVal);
@@ -1245,7 +1240,7 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
             for (long i = lBound; i <= uBound; ++i) {
                 BSTR bstr;
                 SafeArrayGetElement(array, &i, &bstr);
-                strings << QString::fromUtf16((const ushort *)bstr);
+                strings << QString::fromWCharArray(bstr);
                 SysFreeString(bstr);
             }