Changeset 561 for trunk/src/activeqt/shared

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/activeqt/shared/qaxtypes.cpp (modified) (7 diffs)
• src/activeqt/shared/qaxtypes.h (modified) (2 diffs)

trunk/src/activeqt/shared/qaxtypes.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
@@ -38 +39 @@
 ****************************************************************************/
 
-#ifndef UNICODE
-#define UNICODE
-#endif
-
-
 #include <ocidl.h>
 #include <olectl.h>
@@ -124 +120 @@
     f->get_Underline(&underline);
     f->get_Weight(&weight);
-    QFont font(QString::fromUtf16((const ushort *)name), size.Lo/9750, weight / 97, italic);
+    QFont font(QString::fromname), size.Lo/9750, weight / 97, italic);
     font.setBold(bold);
     font.setStrikeOut(strike);
@@ -558 +554 @@
                 if (maxColumns) {
                     is2D = true;
-                    SAFEARRAYBOUND rgsabound[2] = {0};
+                    SAFEARRAYBOUND rgsabound[2] = {};
                     rgsabound[0].cElements = count;
                     rgsabound[1].cElements = maxColumns;
@@ -926 +922 @@
     switch(arg.vt) {
     case VT_BSTR:
-        var = QString::fromUtf16((const ushort *)arg.bstrVal);
+        var = QString::fromarg.bstrVal);
         break;
     case VT_BSTR|VT_BYREF:
-        var = QString::fromUtf16((const ushort *)*arg.pbstrVal);
+        var = QString::from*arg.pbstrVal);
         break;
     case VT_BOOL:
@@ -1112 +1108 @@
                     QObject *qObj = iface->qObject();
                     iface->Release();
-                    var = QVariant(qRegisterMetaType<QObject*>(qObj ? QByteArray(qObj->metaObject()->className()) + "*" : typeName), &qObj);
+                    var = QVariant(qRegisterMetaType<QObject*>(qObj ? QByteArray(qObj->metaObject()->className()) +  : typeName), &qObj);
                 } else
 #endif
@@ -1246 +1242 @@
                 BSTR bstr;
                 SafeArrayGetElement(array, &i, &bstr);
-                strings << QString::fromUtf16((const ushort *)bstr);
+                strings << QString::frombstr);
                 SysFreeString(bstr);
             }

trunk/src/activeqt/shared/qaxtypes.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
@@ -90 +91 @@
 extern void clearVARIANT(VARIANT *var);
 
+
+
+
 QT_END_NAMESPACE
 #endif // QT_NO_WIN_ACTIVEQT