Changeset 561 for trunk/src/activeqt/container

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/container/container.pro (modified) (1 diff)
• src/activeqt/container/qaxbase.cpp (modified) (51 diffs)
• src/activeqt/container/qaxbase.h (modified) (1 diff)
• src/activeqt/container/qaxdump.cpp (modified) (9 diffs)
• src/activeqt/container/qaxobject.cpp (modified) (6 diffs)
• src/activeqt/container/qaxobject.h (modified) (1 diff)
• src/activeqt/container/qaxscript.cpp (modified) (10 diffs)
• src/activeqt/container/qaxscript.h (modified) (1 diff)
• src/activeqt/container/qaxscriptwrapper.cpp (modified) (1 diff)
• src/activeqt/container/qaxselect.cpp (modified) (5 diffs)
• src/activeqt/container/qaxselect.h (modified) (1 diff)
• src/activeqt/container/qaxselect.ui (modified) (1 diff)
• src/activeqt/container/qaxwidget.cpp (modified) (29 diffs)
• src/activeqt/container/qaxwidget.h (modified) (1 diff)

trunk/src/activeqt/container/container.pro

@@ -22 +22 @@
 win32-g++:LIBS += -luuid
 
-contains(QT_EDITION, OpenSource|Console) {
-    message( "You are not licensed to use ActiveQt." )
-} else {
-    HEADERS         = ../control/qaxaggregated.h \
-                      qaxbase.h \
-                      qaxwidget.h \
-                      qaxobject.h \
-                      qaxscript.h \
-                      qaxselect.h \
-                      ../shared/qaxtypes.h
+HEADERS =   ../control/qaxaggregated.h \
+            qaxbase.h \
+            qaxwidget.h \
+            qaxobject.h \
+            qaxscript.h \
+            qaxselect.h \
+            ../shared/qaxtypes.h
 
-    SOURCES         = qaxbase.cpp \
-                      qaxdump.cpp \
-                      qaxwidget.cpp \
-                      qaxobject.cpp \
-                      qaxscript.cpp \
-                      qaxscriptwrapper.cpp \
-                      qaxselect.cpp \
-                      ../shared/qaxtypes.cpp
+SOURCES =   qaxbase.cpp \
+            qaxdump.cpp \
+            qaxwidget.cpp \
+            qaxobject.cpp \
+            qaxscript.cpp \
+            qaxscriptwrapper.cpp \
+            qaxselect.cpp \
+            ../shared/qaxtypes.cpp
 
-    FORMS           = qaxselect.ui
-}
+FORMS =     qaxselect.ui

trunk/src/activeqt/container/qaxbase.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
@@ -40 +41 @@
 //#define QAX_NO_CLASSINFO
 
-#ifndef UNICODE
-#define UNICODE
-#endif
-
 #define QT_CHECK_STATE
 
@@ -175 +172 @@
         // get the Dispatch ID from the object
         QString unicodeName = QLatin1String(name);
-        OLECHAR *names = (TCHAR*)unicodeName.utf16();
+        OLECHAR *names = (wchar_t*)unicodeName.utf16();
         disp->GetIDsOfNames(IID_NULL, &names, 1, LOCALE_USER_DEFAULT, &dispid);
         if (dispid != DISPID_UNKNOWN)
@@ -422 +419 @@
                     } else {
                         argv[p + 1] = const_cast<void*>(varp[p + 1].constData());
-                        if (ptype.endsWith("*")) {
+                        if (ptype.endsWith('*')) {
                             argv_pointer[p + 1] = argv[p + 1];
                             argv[p + 1] = argv_pointer + p + 1;
@@ -639 +636 @@
     typeinfo->GetNames(dispID, &names, 1, &cNames);
     if (cNames) {
-        propname = QString::fromUtf16((const ushort *)names).toLatin1();
+        propname = QString::fromWCharArray(names).toLatin1();
         SysFreeString(names);
     }
@@ -649 +646 @@
     const QMetaProperty prop = mo->property(index);
     propsignal += prop.typeName();
-    propsignal += ")";
+    propsignal += ')';
     addProperty(dispID, propname, propsignal);
 
@@ -913 +910 @@
     \brief the name of the COM object wrapped by this QAxBase object.
 
-    Setting this property initilializes the COM object. Any COM object
+    Setting this property initializes the COM object. Any COM object
     previously set is shut down.
 
@@ -973 +970 @@
         if (uuid.isNull()) {
             CLSID clsid;
-            HRESULT res = CLSIDFromProgID((WCHAR*)c.utf16(), &clsid);
+            HRESULT res = CLSIDFromProgID((wchar_t*)c.utf16(), &clsid);
             if (res == S_OK)
                 search = QUuid(clsid).toString();
@@ -1138 +1135 @@
                     if (!verb.lpszVerbName)
                         continue;
-                    QString verbName = QString::fromUtf16((const ushort *)verb.lpszVerbName);
+                    QString verbName = QString::fromWCharArray(verb.lpszVerbName);
                     if (!verbName.isEmpty())
                         d->verbs.insert(verbName, verb.lVerb);
@@ -1266 +1263 @@
                 BSTR licenseKey;
                 factory2->RequestLicKey(0, &licenseKey);
-                QString qlicenseKey = QString::fromUtf16((const ushort *)licenseKey);
+                QString qlicenseKey = QString::fromWCharArray(licenseKey);
                 SysFreeString(licenseKey);
                 qWarning("Use license key is '%s' to create object on unlicensed machine.",
@@ -1276 +1273 @@
                 BSTR licenseKey;
                 factory2->RequestLicKey(0, &licenseKey);
-                QString qlicenseKey = QString::fromUtf16((const ushort *)licenseKey);
+                QString qlicenseKey = QString::fromWCharArray(licenseKey);
                 SysFreeString(licenseKey);
 
@@ -1436 +1433 @@
     serverInfo.dwReserved2 = 0;
     serverInfo.pAuthInfo = &authInfo;
-    serverInfo.pwszName = (WCHAR*)server.utf16();
+    serverInfo.pwszName = (wchar_t*)server.utf16();
 
     IClassFactory *factory = 0;
@@ -1661 +1658 @@
     void addProperty(const QByteArray &type, const QByteArray &name, uint flags)
     {
+        QByteArray propertyType(type);
+        if (propertyType.endsWith('&'))
+            propertyType.chop(1);
+
         Property &prop = property_list[name];
-        if (!type.isEmpty() && type != "HRESULT") {
-            prop.type = replaceType(type);
-            if (prop.type != type)
-                prop.realType = type;
+        if (!propertyType.isEmpty() && propertyType != "HRESULT") {
+            prop.type = replaceType(propertyType);
+            if (prop.type != propertyType)
+                prop.realType = propertyType;
         }
         if (flags & Writable)
@@ -1744 +1745 @@
         return 0;
 
-    className = QString::fromUtf16((const ushort *)bstr);
+    className = QString::fromWCharArray(bstr);
     SysFreeString(bstr);
 
@@ -1765 +1766 @@
         return 0;
 
-    className = QString::fromUtf16((const ushort *)bstr);
+    className = QString::fromWCharArray(bstr);
     SysFreeString(bstr);
 
@@ -1792 +1793 @@
 
             interfaceInfo->GetDocumentation(-1, &bstr, 0, 0, 0);
-            QString interfaceName = QString::fromUtf16((const ushort *)bstr);
+            QString interfaceName = QString::fromWCharArray(bstr);
             SysFreeString(bstr);
             QByteArray key;
@@ -1840 +1841 @@
         BSTR bstr;
         typelib->GetDocumentation(-1, &bstr, 0, 0, 0);
-        current_typelib = QString::fromUtf16((const ushort *)bstr).toLatin1();
+        current_typelib = QString::fromWCharArray(bstr).toLatin1();
         SysFreeString(bstr);
     }
@@ -1888 +1889 @@
             BSTR typelibname = 0;
             usertypelib->GetDocumentation(-1, &typelibname, 0, 0, 0);
-            QByteArray typeLibName = QString::fromUtf16((const ushort *)typelibname).toLatin1();
+            QByteArray typeLibName = QString::fromWCharArray(typelibname).toLatin1();
             SysFreeString(typelibname);
 
@@ -1894 +1895 @@
             BSTR usertypename = 0;
             usertypelib->GetDocumentation(index, &usertypename, 0, 0, 0);
-            QByteArray userTypeName = QString::fromUtf16((const ushort *)usertypename).toLatin1();
+            QByteArray userTypeName = QString::fromWCharArray(usertypename).toLatin1();
             SysFreeString(usertypename);
 
@@ -2043 +2044 @@
         case VT_UINT:
         case VT_CY:
-            str += "&";
+            str += '&';
             break;
         case VT_PTR:
             if (str == "QFont" || str == "QPixmap") {
-                str += "&";
+                str += '&';
                 break;
             } else if (str == "void*") {
@@ -2056 +2057 @@
         default:
             if (str == "QColor")
-                str += "&";
+                str += '&';
             else if (str == "QDateTime")
-                str += "&";
+                str += '&';
             else if (str == "QVariantList")
-                str += "&";
+                str += '&';
             else if (str == "QByteArray")
-                str += "&";
+                str += '&';
             else if (str == "QStringList")
-                str += "&";
+                str += '&';
             else if (!str.isEmpty() && hasEnum(str))
-                str += "&";
+                str += '&';
             else if (!str.isEmpty() && str != "QFont" && str != "QPixmap" && str != "QVariant")
-                str += "*";
+                str += '*';
         }
         break;
@@ -2086 +2087 @@
             str = guessTypes(tdesc.lpadesc->tdescElem, info, function);
             if (!str.isEmpty())
-                str = "QList<" + str + ">";
+                str = "QList<" + str + '>';
             break;
         }
@@ -2094 +2095 @@
         if (!str.isEmpty()) {
             for (int index = 0; index < tdesc.lpadesc->cDims; ++index)
-                str += "[" + QByteArray::number((int)tdesc.lpadesc->rgbounds[index].cElements) + "]";
+                str += '[' + QByteArray::number((int)tdesc.lpadesc->rgbounds[index].cElements) + ']';
         }
         break;
@@ -2111 +2112 @@
 
     if (tdesc.vt & VT_BYREF)
-        str += "&";
+        str += '&';
 
     str.replace("&*", "**");
@@ -2138 +2139 @@
                 QString coClassIDstr = iidnames.value(QLatin1String("/CLSID/") + coClassID + QLatin1String("/Default"), coClassID).toString();
                 addClassInfo("CoClass", coClassIDstr.isEmpty() ? coClassID.toLatin1() : coClassIDstr.toLatin1());
-                QByteArray version = QByteArray::number(typeattr->wMajorVerNum) + "." + QByteArray::number(typeattr->wMinorVerNum);
+                QByteArray version = QByteArray::number(typeattr->wMajorVerNum) + '.' + QByteArray::number(typeattr->wMinorVerNum);
                 if (version != "0.0")
                     addClassInfo("Version", version);
@@ -2171 +2172 @@
                 QString version = *vit;
                 ++vit;
-                tlfile = controls.value(QLatin1String("/") + version + QLatin1String("/0/win32/.")).toString();
+                tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString();
             }
             controls.endGroup();
@@ -2284 +2285 @@
             QByteArray enumName;
             if (typelib->GetDocumentation(i, &enumname, 0, 0, 0) == S_OK) {
-                enumName = QString::fromUtf16((const ushort *)enumname).toLatin1();
+                enumName = QString::fromWCharArray(enumname).toLatin1();
                 SysFreeString(enumname);
             } else {
@@ -2307 +2308 @@
                         enuminfo->GetNames(memid, &valuename, 1, &maxNamesOut);
                         if (maxNamesOut) {
-                            valueName = QString::fromUtf16((const ushort *)valuename).toLatin1();
+                            valueName = QString::fromWCharArray(valuename).toLatin1();
                             SysFreeString(valuename);
                         } else {
@@ -2344 +2345 @@
     QByteArray signalName(function);
     signalName += "Changed";
-    QByteArray signalProto = signalName + "(" + replaceType(type) + ")";
+    QByteArray signalProto = signalName + '(' + replaceType(type) + ')';
     if (!hasSignal(signalProto))
         addSignal(signalProto, function);
@@ -2361 +2362 @@
         prototype[0] = toupper(prototype[0]);
     }
-    prototype = set + prototype + "(" + propertyType(property) + ")";
+    prototype = set + prototype + '(' + propertyType(property) + ')';
     if (!hasSlot(prototype))
         addSlot(0, prototype, property);
@@ -2378 +2379 @@
     }
 
-    prototype = function + "(";
+    prototype = function + '(';
     if (funcdesc->invkind == INVOKE_FUNC && type == hresult)
         type = 0;
@@ -2392 +2393 @@
         QByteArray ptype = guessTypes(tdesc, typeinfo, function);
         if (pdesc.wParamFlags & PARAMFLAG_FRETVAL) {
-            if (ptype.endsWith("&")) {
+            if (ptype.endsWith('&')) {
                 ptype.truncate(ptype.length() - 1);
             } else if (ptype.endsWith("**")) {
@@ -2400 +2401 @@
         } else {
             prototype += ptype;
-            if (pdesc.wParamFlags & PARAMFLAG_FOUT && !ptype.endsWith("&") && !ptype.endsWith("**"))
-                prototype += "&";
+            if (pdesc.wParamFlags & PARAMFLAG_FOUT && !ptype.endsWith('&') && !ptype.endsWith("**"))
+                prototype += '&';
             if (optional || pdesc.wParamFlags & PARAMFLAG_FOPT)
                 paramName += "=0";
@@ -2411 +2412 @@
         }
         if (p < funcdesc->cParams && !(pdesc.wParamFlags & PARAMFLAG_FRETVAL))
-            prototype += ",";
+            prototype += ',';
     }
 
     if (!prototype.isEmpty()) {
-        if (prototype.right(1) == ",") {
+        if (prototype.endsWith(',')) {
             if (funcdesc->invkind == INVOKE_PROPERTYPUT && p == funcdesc->cParams) {
                 TYPEDESC tdesc = funcdesc->lprgelemdescParam[p-1].tdesc;
                 QByteArray ptype = guessTypes(tdesc, typeinfo, function);
                 prototype += ptype;
-                prototype += ")";
+                prototype += ')';
                 parameters << "rhs";
             } else {
@@ -2426 +2427 @@
             }
         } else {
-            prototype += ")";
+            prototype += ')';
         }
     }
@@ -2464 +2465 @@
         int p;
         for (p = 0; p < (int)maxNamesOut; ++p) {
-            names << QString::fromUtf16((const ushort *)bstrNames[p]).toLatin1();
+            names << QString::fromWCharArray(bstrNames[p]).toLatin1();
             SysFreeString(bstrNames[p]);
         }
@@ -2574 +2575 @@
                     if (defargs) {
                         parameters.takeLast();
-                        int lastParam = prototype.lastIndexOf(",");
+                        int lastParam = prototype.lastIndexOf(',');
                         if (lastParam == -1)
-                            lastParam = prototype.indexOf("(") + 1;
+                            lastParam = prototype.indexOf('(') + 1;
                         prototype.truncate(lastParam);
-                        prototype += ")";
+                        prototype += ')';
                     }
                 } while (defargs);
@@ -2591 +2592 @@
         BSTR bstrDocu;
         info->GetDocumentation(funcdesc->memid, 0, &bstrDocu, 0, 0);
-        QString strDocu = QString::fromUtf16((const ushort*)bstrDocu);
+        QString strDocu = QString::fromWCharArray(bstrDocu);
         SysFreeString(bstrDocu);
         if (!!strDocu)
-            desc += "[" + strDocu + "]";
-        desc += "\n";
+            desc += '[' + strDocu + ']';
+        desc += '\n';
 #endif
         typeinfo->ReleaseFuncDesc(funcdesc);
@@ -2638 +2639 @@
         uint flags = 0;
 
-        variableName = QString::fromUtf16((const ushort *)bstrName).toLatin1();
+        variableName = QString::fromWCharArray(bstrName).toLatin1();
         SysFreeString(bstrName);
 
@@ -2674 +2675 @@
         BSTR bstrDocu;
         info->GetDocumentation(vardesc->memid, 0, &bstrDocu, 0, 0);
-        QString strDocu = QString::fromUtf16((const ushort*)bstrDocu);
+        QString strDocu = QString::fromWCharArray(bstrDocu);
         SysFreeString(bstrDocu);
         if (!!strDocu)
-            desc += "[" + strDocu + "]";
-        desc += "\n";
+            desc += '[' + strDocu + ']';
+        desc += '\n';
 #endif
         typeinfo->ReleaseVarDesc(vardesc);
@@ -2797 +2798 @@
         int p;
         for (p = 0; p < (int)maxNamesOut; ++p) {
-            names << QString::fromUtf16((const ushort *)bstrNames[p]).toLatin1();
+            names << QString::fromWCharArray(bstrNames[p]).toLatin1();
             SysFreeString(bstrNames[p]);
         }
@@ -2821 +2822 @@
         BSTR bstrDocu;
         eventinfo->GetDocumentation(funcdesc->memid, 0, &bstrDocu, 0, 0);
-        QString strDocu = QString::fromUtf16((const ushort*)bstrDocu);
+        QString strDocu = QString::fromWCharArray(bstrDocu);
         SysFreeString(bstrDocu);
         if (!!strDocu)
-            desc += "[" + strDocu + "]";
-        desc += "\n";
+            desc += '[' + strDocu + ']';
+        desc += '\n';
 #endif
         eventinfo->ReleaseFuncDesc(funcdesc);
@@ -2979 +2980 @@
             BSTR bstr;
             typelib->GetDocumentation(-1, &bstr, 0, 0, 0);
-            current_typelib = QString::fromUtf16((const ushort *)bstr).toLatin1();
+            current_typelib = QString::fromWCharArray(bstr).toLatin1();
             SysFreeString(bstr);
         }
@@ -3205 +3206 @@
 
 static QMetaObject qaxobject_staticMetaObject = {
-    &QObject::staticMetaObject, qt_meta_stringdata_QAxBase,
-        qt_meta_data_QAxBase, 0
+    { &QObject::staticMetaObject, qt_meta_stringdata_QAxBase,
+        qt_meta_data_QAxBase, 0 }
 };
 static QMetaObject qaxwidget_staticMetaObject = {
-    &QWidget::staticMetaObject, qt_meta_stringdata_QAxBase,
-        qt_meta_data_QAxBase, 0
+    { &QWidget::staticMetaObject, qt_meta_stringdata_QAxBase,
+        qt_meta_data_QAxBase, 0 }
 };
 
@@ -3388 +3389 @@
 
                 code = exc->wCode ? exc->wCode : exc->scode;
-                source = QString::fromUtf16((const ushort *)exc->bstrSource);
-                desc = QString::fromUtf16((const ushort *)exc->bstrDescription);
-                help = QString::fromUtf16((const ushort *)exc->bstrHelpFile);
+                source = QString::fromWCharArray(exc->bstrSource);
+                desc = QString::fromWCharArray(exc->bstrDescription);
+                help = QString::fromWCharArray(exc->bstrHelpFile);
                 uint helpContext = exc->dwHelpContext;
 
@@ -3693 +3694 @@
             id = internalInvoke(call, id, v);
             break;
+        default:
+            break;
         }
         break;
@@ -3706 +3709 @@
     case QMetaObject::QueryPropertyUser:
         id -= mo->propertyCount();
+        break;
+    default:
         break;
     }
@@ -3906 +3911 @@
                 paramType = d->metaobj->paramType(normFunction, i, &out);
 
-            if (!parse && d->useMetaObject && var.type() == QVariant::String || var.type() == QVariant::ByteArray) {
+            if ((!parse && d->useMetaObject && var.type() == QVariant::String) || var.type() == QVariant::ByteArray) {
                 int enumIndex =mo->indexOfEnumerator(paramType);
                 if (enumIndex != -1) {
@@ -4225 +4230 @@
             return E_POINTER;
 
-        QString property = QString::fromUtf16((const ushort *)name);
+        QString property = QString::fromWCharArray(name);
         QVariant qvar = map.value(property);
         QVariantToVARIANT(qvar, *var);
@@ -4234 +4239 @@
         if (!var)
             return E_POINTER;
-        QString property = QString::fromUtf16((const ushort *)name);
+        QString property = QString::fromWCharArray(name);
         QVariant qvar = VARIANTToQVariant(*var, 0);
         map[property] = qvar;
@@ -4395 +4400 @@
         QObject *object = qObject();
         if (QMetaType::type(cn))
-            qvar = QVariant(qRegisterMetaType<QObject*>(cn + "*"), &object);
-//            qVariantSetValue(qvar, qObject(), cn + "*");
+            qvar = QVariant(qRegisterMetaType<QObject*>(cn + '*'), &object);
+//            qVariantSetValue(qvar, qObject(), cn + '*');
     }
 

trunk/src/activeqt/container/qaxbase.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.

trunk/src/activeqt/container/qaxdump.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
@@ -67 +68 @@
         ulong helpContext;
         HRESULT hres = typeInfo->GetDocumentation(memId, 0, &docStringBstr, &helpContext, &helpFileBstr);
-        QString docString = QString::fromUtf16((const ushort *)docStringBstr);
-        QString helpFile = QString::fromUtf16((const ushort *)helpFileBstr);
+        QString docString = QString::fromWCharArray(docStringBstr);
+        QString helpFile = QString::fromWCharArray(helpFileBstr);
         SysFreeString(docStringBstr);
         SysFreeString(helpFileBstr);
@@ -95 +96 @@
 
         if (p < parameterNames.count())
-            prototype += " " + parameterNames.at(p);
+            prototype += ' ' + parameterNames.at(p);
          
         if (numDefArgs >= parameterTypes.count() - p)
@@ -102 +103 @@
             prototype += ", ";
     }
-    prototype += ")";
+    prototype += ')';
 
     return prototype;
@@ -197 +198 @@
             prototype = namedPrototype(slot.parameterTypes(), slot.parameterNames());
             QString detail = QString::fromLatin1("<h3><a name=") + QString::fromLatin1(name.constData()) + QLatin1String("></a>") +
-                             QString::fromLatin1(returntype.constData()) + QLatin1String(" ") +
-                             QString::fromLatin1(name.constData()) + QLatin1String(" ") +
+                             QLatin1String(returntype.constData()) + QLatin1Char(' ') +
+                             QLatin1String(name.constData()) + QLatin1Char(' ') +
                              QString::fromLatin1(prototype.constData()) + QLatin1String("<tt> [slot]</tt></h3>\n");
             prototype = namedPrototype(slot.parameterTypes(), QList<QByteArray>());
@@ -221 +222 @@
                 }
                 if (returntype != "void")
-                    detail += QString::fromLatin1(returntype.constData()) + QLatin1String(" result = ");
-                detail += QLatin1String("object->") + QString::fromLatin1(functionToCall.constData()) +
-                          QLatin1String("(\"" + name + prototype + "\"");
+                    detail += QLatin1String(returntype.constData()) + QLatin1String(" result = ");
+                detail += QLatin1String("object->") + QLatin1String(functionToCall.constData()) +
+                          QLatin1String("(\"" + name + prototype + '\"');
                 if (hasParams)
                     detail += QLatin1String(", params");
-                detail += QLatin1String(")");
+                detail += QLatin1Char(')');
                 if (returntype != "void" && returntype != "QAxObject *" && returntype != "QVariant")
-                    detail += QLatin1String(".") + QString::fromLatin1(toType(returntype));
+                    detail += QLatin1Char('.') + QLatin1String(toType(returntype));
                 detail += QLatin1String(";</pre>\n");
             } else {
@@ -263 +264 @@
             stream << "<li>void <a href=\"#" << name << "\"><b>" << name << "</b></a>" << prototype << ";</li>" << endl;
 
-            QString detail = QLatin1String("<h3><a name=") + QString::fromLatin1(name.constData()) + QLatin1String("></a>void ") +
-                             QString::fromLatin1(name.constData()) + QLatin1String(" ") +
-                             QString::fromLatin1(prototype.constData()) + QLatin1String("<tt> [signal]</tt></h3>\n");
+            QString detail = QLatin1String("<h3><a name=") + QLatin1String(name.constData()) + QLatin1String("></a>void ") +
+                             QLatin1String(name.constData()) + QLatin1Char(' ') +
+                             QLatin1String(prototype.constData()) + QLatin1String("<tt> [signal]</tt></h3>\n");
             if (typeLib) {
                 interCount = 0;
@@ -312 +313 @@
             stream << "<li>" << type << " <a href=\"#" << name << "\"><b>" << name << "</b></a>;</li>" << endl;
             QString detail = QLatin1String("<h3><a name=") + QString::fromLatin1(name.constData()) + QLatin1String("></a>") +
-                             QString::fromLatin1(type.constData()) +
-                             QLatin1String(" ") + QString::fromLatin1(name.constData()) + QLatin1String("</h3>\n");
+                             QLatin1String(type.constData()) +
+                             QLatin1Char(' ') + QLatin1String(name.constData()) + QLatin1String("</h3>\n");
             detail += docuFromName(typeInfo, QString::fromLatin1(name));
             QVariant::Type vartype = QVariant::nameToType(type);
@@ -327 +328 @@
                     detail += QLatin1String("\tint val = ");
                 else
-                    detail += QLatin1String("\t") + QString::fromLatin1(type.constData()) + QLatin1String(" val = ");
-                detail += QLatin1String("object->property(\"") + QString::fromLatin1(name.constData()) +
-                          QLatin1String("\").") + QString::fromLatin1(toType(type).constData()) + QLatin1String(";\n");
+                    detail += QLatin1Char('\t') + QLatin1String(type.constData()) + QLatin1String(" val = ");
+                detail += QLatin1String("object->property(\"") + QLatin1String(name.constData()) +
+                          QLatin1String("\").") + QLatin1String(toType(type).constData()) + QLatin1String(";\n");
                 detail += QLatin1String("</pre>\n");
             } else if (type == "IDispatch*" || type == "IUnknown*") {
                 detail += QLatin1String("<p>Get the subobject using querySubObject:<pre>\n");
-                detail += QLatin1String("\tQAxObject *") + QString::fromLatin1(name.constData()) +
-                          QLatin1String(" = object->querySubObject(\"") + QString::fromLatin1(name.constData()) + QLatin1String("\");\n");
+                detail += QLatin1String("\tQAxObject *") + QLatin1String(name.constData()) +
+                          QLatin1String(" = object->querySubObject(\"") + QLatin1String(name.constData()) + QLatin1String("\");\n");
                 detail += QLatin1String("</pre>\n");
             } else {

trunk/src/activeqt/container/qaxobject.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
@@ -38 +39 @@
 ****************************************************************************/
 
-#ifndef UNICODE
-#define UNICODE
-#endif
-
 #include "qaxobject.h"
 
@@ -127 +124 @@
 
 /*!
-    \reimp
+    \internal
 */
 const QMetaObject *QAxObject::metaObject() const
@@ -135 +132 @@
 
 /*!
-    \reimp
+    \internal
 */
 const QMetaObject *QAxObject::parentMetaObject() const
@@ -153 +150 @@
 
 /*!
-    \reimp
+    \internal
 */
 const char *QAxObject::className() const
@@ -161 +158 @@
 
 /*!
-    \reimp
+    \internal
 */
 int QAxObject::qt_metacall(QMetaObject::Call call, int id, void **v)

trunk/src/activeqt/container/qaxobject.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.

trunk/src/activeqt/container/qaxscript.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
@@ -38 +39 @@
 ****************************************************************************/
 
-#ifndef UNICODE
-#define UNICODE
-#endif
-
 #include "qaxscript.h"
 
@@ -195 +192 @@
         return E_POINTER;
     
-    QAxBase *object = script->findObject(QString::fromUtf16((const ushort*)pstrName));
+    QAxBase *object = script->findObject(QString::fromWCharArray(pstrName));
     if (!object)
         return TYPE_E_ELEMENTNOTFOUND;
@@ -237 +234 @@
     if (exception)
         emit script->finished(exception->wCode, 
-        QString::fromUtf16((const ushort*)exception->bstrSource),
-        QString::fromUtf16((const ushort*)exception->bstrDescription),
-        QString::fromUtf16((const ushort*)exception->bstrHelpFile)
+        QString::fromWCharArray(exception->bstrSource),
+        QString::fromWCharArray(exception->bstrDescription),
+        QString::fromWCharArray(exception->bstrHelpFile)
                             );
     return S_OK;
@@ -288 +285 @@
     HRESULT hres = error->GetSourceLineText(&bstrLineText);
     if (hres == S_OK) {
-        lineText = QString::fromUtf16((const ushort*)bstrLineText);
+        lineText = QString::fromWCharArray(bstrLineText);
         SysFreeString(bstrLineText);
     }
@@ -295 +292 @@
     SysFreeString(exception.bstrHelpFile);
 
-    emit script->error(exception.wCode, QString::fromUtf16((const ushort*)exception.bstrDescription), lineNumber, lineText);
+    emit script->error(exception.wCode, QString::fromWCharArray(exception.bstrDescription), lineNumber, lineText);
     
     return S_OK;
@@ -464 +461 @@
     
     CLSID clsid;
-    HRESULT hres = CLSIDFromProgID((WCHAR*)script_language.utf16(), &clsid);
+    HRESULT hres = CLSIDFromProgID((wchar_t*)script_language.utf16(), &clsid);
     if(FAILED(hres))
         return false;
@@ -610 +607 @@
         return;
     
-    engine->AddNamedItem((WCHAR*)name.utf16(), SCRIPTITEM_ISSOURCE|SCRIPTITEM_ISVISIBLE);
+    engine->AddNamedItem((wchar_t*)name.utf16(), SCRIPTITEM_ISSOURCE|SCRIPTITEM_ISVISIBLE);
 #endif
 }
@@ -1174 +1171 @@
     
     CLSID clsid;
-    HRESULT hres = CLSIDFromProgID((WCHAR*)name.utf16(), &clsid);
+    HRESULT hres = CLSIDFromProgID((wchar_t*)name.utf16(), &clsid);
     if (hres != S_OK)
         return false;
@@ -1204 +1201 @@
         
         allFiles += QLatin1String(" *") + engine.extension;
-        specialFiles += QLatin1String(";;") + engine.name + QLatin1String(" Files (*") + engine.extension + QLatin1String(")");
-    }
-    allFiles += QLatin1String(")");
+        specialFiles += QLatin1String(";;") + engine.name + QLatin1String(" Files (*") + engine.extension + QLatin1Char(')');
+    }
+    allFiles += QLatin1Char(')');
     
     return allFiles + specialFiles + QLatin1String(";;All Files (*.*)");

trunk/src/activeqt/container/qaxscript.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.

trunk/src/activeqt/container/qaxscriptwrapper.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.

trunk/src/activeqt/container/qaxselect.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
@@ -53 +54 @@
     {
         HKEY classes_key;
-        QT_WA_INLINE(
-            RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_READ, &classes_key),
-            RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &classes_key));
+        RegOpenKeyEx(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_READ, &classes_key);
         if (!classes_key)
             return;
@@ -61 +60 @@
         DWORD index = 0;
         LONG result = 0;
-        TCHAR buffer[256];
-        DWORD szBuffer = sizeof(buffer);
+        wchar_t buffer[256];
+        DWORD szBuffer = sizeof(buffer) / sizeof(wchar_t);
         FILETIME ft;
         do {
-            result = QT_WA_INLINE(
-                RegEnumKeyExW(classes_key, index, (wchar_t*)&buffer, &szBuffer, 0, 0, 0, &ft),
-                RegEnumKeyExA(classes_key, index, (char*)&buffer, &szBuffer, 0, 0, 0, &ft));
-            szBuffer = sizeof(buffer);
+            result = RegEnumKeyEx(classes_key, index, buffer, &szBuffer, 0, 0, 0, &ft);
+            szBuffer = sizeof(buffer) / sizeof(wchar_t);
             if (result == ERROR_SUCCESS) {
                 HKEY sub_key;
-                QString clsid = QT_WA_INLINE(QString::fromUtf16((ushort*)buffer), QString::fromLocal8Bit((char*)buffer));
-                result = QT_WA_INLINE(
-                    RegOpenKeyExW(classes_key, reinterpret_cast<const wchar_t *>(QString(clsid + "\\Control").utf16()), 0, KEY_READ, &sub_key),
-                    RegOpenKeyA(classes_key, QString(clsid + QLatin1String("\\Control")).toLocal8Bit(), &sub_key));
+                QString clsid = QString::fromWCharArray(buffer);
+                result = RegOpenKeyEx(classes_key, reinterpret_cast<const wchar_t *>(QString(clsid + "\\Control").utf16()), 0, KEY_READ, &sub_key);
                 if (result == ERROR_SUCCESS) {
                     RegCloseKey(sub_key);
-                    QT_WA_INLINE(
-                        RegistryQueryValueW(classes_key, buffer, (LPBYTE)buffer, &szBuffer),
-                        RegQueryValueA(classes_key, (char*)buffer, (char*)buffer, (LONG*)&szBuffer));
-                    QString name = QT_WA_INLINE(QString::fromUtf16((ushort*)buffer, szBuffer / sizeof(TCHAR)) , QString::fromLocal8Bit((char*)buffer, szBuffer));
+                    RegistryQueryValue(classes_key, buffer, (LPBYTE)buffer, &szBuffer);
+                    QString name = QString::fromWCharArray(buffer);
 
                     controls << name;
@@ -87 +80 @@
                 result = ERROR_SUCCESS;
             }
-            szBuffer = sizeof(buffer);
+            szBuffer = sizeof(buffer) / sizeof(wchar_t);
             ++index;
         } while (result == ERROR_SUCCESS);
@@ -94 +87 @@
     }
 
-    LONG RegistryQueryValueW(HKEY hKey, LPCWSTR lpSubKey, LPBYTE lpData, LPDWORD lpcbData)
+    LONG RegistryQueryValue(HKEY hKey, LPCWSTR lpSubKey, LPBYTE lpData, LPDWORD lpcbData)
     {
         LONG ret = ERROR_FILE_NOT_FOUND;
         HKEY hSubKey = NULL;
-        RegOpenKeyExW(hKey, lpSubKey, 0, KEY_READ, &hSubKey);
+        RegOpenKeyEx(hKey, lpSubKey, 0, KEY_READ, &hSubKey);
         if (hSubKey) {
-            ret = RegQueryValueExW(hSubKey, 0, 0, 0, lpData, lpcbData);
+            ret = RegQueryValueEx(hSubKey, 0, 0, 0, lpData, lpcbData);
             RegCloseKey(hSubKey);
         }

trunk/src/activeqt/container/qaxselect.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.

trunk/src/activeqt/container/qaxselect.ui

@@ -4 +4 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.

trunk/src/activeqt/container/qaxwidget.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
@@ -38 +39 @@
 ****************************************************************************/
 
-#ifndef UNICODE
-#define UNICODE
-#endif
-
-
 #include "qaxwidget.h"
 
@@ -124 +120 @@
 
     int qt_metacall(QMetaObject::Call, int isignal, void **argv);
+    void* qt_metacast(const char *clname);
+
     inline QAxClientSite *clientSite() const
     {
@@ -384 +382 @@
 
 private:
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
     struct OleMenuItem {
         OleMenuItem(HMENU hm = 0, int ID = 0, QMenu *menu = 0)
@@ -409 +407 @@
 
     DWORD m_dwOleObject;
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
     HWND m_menuOwner;
 #endif
@@ -418 +416 @@
     QAxWidget *widget;
     QAxHostWidget *host;
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
     QPointer<QMenuBar> menuBar;
     QMap<QAction*,OleMenuItem> menuItemMap;
@@ -468 +466 @@
 #error "Fix QAbstractEventDispatcher::setEventFilter"
 #endif
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
 static int filter_ref = 0;
 #else
-static const char *qaxatom = "QAxContainer4_Atom";
+static const wchar_t *qaxatom = L"QAxContainer4_Atom";
 #endif
 
@@ -484 +482 @@
         QAxHostWidget *host = 0;
         while (!host && hwnd) {
-            host = qobject_cast<QAxHostWidget*>(QWidget::find(hwnd));
+            QWidget *widget = QWidget::find(hwnd);
+            if (widget && widget->inherits("QAxHostWidget"))
+                host = qobject_cast<QAxHostWidget*>(widget);
             hwnd = ::GetParent(hwnd);
         }
@@ -533 +533 @@
 
 QAxClientSite::QAxClientSite(QAxWidget *c)
-: ref(1), widget(c), host(0), eventTranslated(true)
+: eventTranslated(true), ref(1), widget(c), host(0)
 {
     aggregatedObject = widget->createAggregate();
@@ -552 +552 @@
 
     m_dwOleObject = 0;
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
     m_menuOwner = 0;
     menuBar = 0;
@@ -715 +715 @@
         HRESULT result = m_spOleObject->GetUserType(USERCLASSTYPE_SHORT, &userType);
         if (result == S_OK) {
-            widget->setWindowTitle(QString::fromUtf16((const ushort *)userType));
+            widget->setWindowTitle(QString::fromWCharArray(userType));
             CoTaskMemFree(userType);
         }
@@ -982 +982 @@
 HRESULT WINAPI QAxClientSite::TranslateAccelerator(LPMSG lpMsg, DWORD /*grfModifiers*/)
 {
-    eventTranslated = false;
     if (lpMsg->message == WM_KEYDOWN && !lpMsg->wParam)
         return S_OK;
-    QT_WA_INLINE(
-        SendMessage(host->winId(), lpMsg->message, lpMsg->wParam, lpMsg->lParam),
-        SendMessageA(host->winId(), lpMsg->message, lpMsg->wParam, lpMsg->lParam)
-    );
+
+    bool ActiveQtDetected = false;
+    bool fromInProcServer = false;
+#ifdef GWLP_USERDATA
+    LONG_PTR serverType = GetWindowLongPtr(lpMsg->hwnd, GWLP_USERDATA);
+#else
+    LONG serverType = GetWindowLong(lpMsg->hwnd, GWL_USERDATA);
+#endif
+    if (serverType == QAX_INPROC_SERVER) {
+        ActiveQtDetected = true;
+        fromInProcServer = true;
+    } else if (serverType == QAX_OUTPROC_SERVER) {
+        ActiveQtDetected = true;
+        fromInProcServer = false;
+    }
+
+    eventTranslated = false;
+    if (!ActiveQtDetected || !fromInProcServer) {
+        // if the request is coming from an out-of-proc server or a non ActiveQt server,
+        // we send the message to the host window. This will make sure this key event
+        // comes to Qt for processing.
+        SendMessage(host->winId(), lpMsg->message, lpMsg->wParam, lpMsg->lParam);
+        if (ActiveQtDetected && !fromInProcServer) {
+            // ActiveQt based servers will need further processing of the event
+            // (eg. <SPACE> key for a checkbox), so we return false.
+            return S_FALSE;
+        }
+    }
+    // ActiveQt based in-processes-servers will handle the event properly, so
+    // we dont need to send this key event to the host.
     return S_OK;
 }
@@ -1133 +1158 @@
 
 //**** IOleInPlaceFrame
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
 HRESULT WINAPI QAxClientSite::InsertMenus(HMENU /*hmenuShared*/, LPOLEMENUGROUPWIDTHS /*lpMenuWidths*/)
 {
@@ -1174 +1199 @@
 }
 
-static int menuItemEntry(HMENU menu, int index, MENUITEMINFOA item, QString &text, QPixmap &/*icon*/)
+static int menuItemEntry(HMENU menu, int index, MENUITEMINFO item, QString &text, QPixmap &/*icon*/)
 {
     if (item.fType == MFT_STRING && item.cch) {
-        char *titlebuf = new char[item.cch+1];
+        wchar_t *titlebuf = new wchar_t[item.cch + 1];
         item.dwTypeData = titlebuf;
         item.cch++;
-        ::GetMenuItemInfoA(menu, index, true, &item);
-        text = QString::fromLocal8Bit(titlebuf);
-        delete []titlebuf;
+        ::GetMenuItemInfo(menu, index, true, &item);
+        text = QString::fromWCharArray(titlebuf);
+        delete [] titlebuf;
         return MFT_STRING;
     }
@@ -1192 +1217 @@
         QPixmap pixmap(1,1);
         QSize sz(MAP_LOGHIM_TO_PIX(bmsize.cx, pixmap.logicalDpiX()),
-            MAP_LOGHIM_TO_PIX(bmsize.cy, pixmap.logicalDpiY()));
+                 MAP_LOGHIM_TO_PIX(bmsize.cy, pixmap.logicalDpiY()));
 
         pixmap.resize(bmsize.cx, bmsize.cy);
@@ -1216 +1241 @@
         popup = new QMenu(parent);
     for (int i = 0; i < count; ++i) {
-        MENUITEMINFOA item;
-        memset(&item, 0, sizeof(MENUITEMINFOA));
-        item.cbSize = sizeof(MENUITEMINFOA);
+        MENUITEMINFO item;
+        memset(&item, 0, sizeof(MENUITEMINFO));
+        item.cbSize = sizeof(MENUITEMINFO);
         item.fMask = MIIM_ID | MIIM_TYPE | MIIM_SUBMENU;
-        ::GetMenuItemInfoA(subMenu, i, true, &item);
+        ::GetMenuItemInfo(subMenu, i, true, &item);
 
         QAction *action = 0;
@@ -1296 +1321 @@
         int count = GetMenuItemCount(hmenuShared);
         for (int i = 0; i < count; ++i) {
-            MENUITEMINFOA item;
-            memset(&item, 0, sizeof(MENUITEMINFOA));
-            item.cbSize = sizeof(MENUITEMINFOA);
+            MENUITEMINFO item;
+            memset(&item, 0, sizeof(MENUITEMINFO));
+            item.cbSize = sizeof(MENUITEMINFO);
             item.fMask = MIIM_ID | MIIM_TYPE | MIIM_SUBMENU;
-            ::GetMenuItemInfoA(hmenuShared, i, true, &item);
+            ::GetMenuItemInfo(hmenuShared, i, true, &item);
 
             QAction *action = 0;
@@ -1380 +1405 @@
     OleMenuItem oleItem = menuItemMap.value(action);
     if (oleItem.hMenu)
-        ::PostMessageA(m_menuOwner, WM_COMMAND, oleItem.id, 0);
+        ::PostMessage(m_menuOwner, WM_COMMAND, oleItem.id, 0);
     return -1;
 #endif
@@ -1405 +1430 @@
 HRESULT WINAPI QAxClientSite::SetStatusText(LPCOLESTR pszStatusText)
 {
-    QStatusTipEvent tip(QString::fromUtf16((const ushort *)(BSTR)pszStatusText));
+    QStatusTipEvent tip(QString::fromWCharArray(pszStatusText));
     QApplication::sendEvent(widget, &tip);
     return S_OK;
@@ -1414 +1439 @@
 HRESULT WINAPI QAxClientSite::EnableModeless(BOOL fEnable)
 {
+#if !defined(Q_OS_WINCE)
+    LockWindowUpdate(host->window()->winId());
+#endif
     EnableWindow(host->window()->winId(), fEnable);
 
@@ -1424 +1452 @@
     }
     qt_win_ignoreNextMouseReleaseEvent = false;
-
+#if !defined(Q_OS_WINCE)
+    LockWindowUpdate(0);
+#endif
     return S_OK;
 }
@@ -1512 +1542 @@
 {
     AX_DEBUG(QAxClientSite::SetActiveObject);
-
-    if (pszObjName && widget)
-        widget->setWindowTitle(QString::fromUtf16((const ushort *)(BSTR)pszObjName));
+    
+    Q_UNUSED(pszObjName);
+    // we are ignoring the name of the object, as suggested by MSDN documentation 
+    // for IOleInPlaceUIWindow::SetActiveObject().
 
     if (m_spInPlaceActiveObject) {
@@ -1624 +1655 @@
         return axhost->qt_metacall(call, isignal, argv);
     return -1;
+}
+
+void* QAxHostWidget::qt_metacast(const char *clname)
+{
+    if (!clname) return 0;
+    if (!qstrcmp(clname,"QAxHostWidget"))
+        return static_cast<void*>(const_cast< QAxHostWidget*>(this));
+    return QWidget::qt_metacast(clname);
 }
 
@@ -1953 +1992 @@
 
 #if !defined(Q_OS_WINCE)
-    ATOM filter_ref = FindAtomA(qaxatom);
+    ATOM filter_ref = FindAtom(qaxatom);
 #endif
     if (!filter_ref)
         previous_filter = QAbstractEventDispatcher::instance()->setEventFilter(axc_FilterProc);
 #if !defined(Q_OS_WINCE)
-    AddAtomA(qaxatom);
+    AddAtom(qaxatom);
 #else
     ++filter_ref;
@@ -1993 +2032 @@
     if (!control().isEmpty()) {
 #if !defined(Q_OS_WINCE)
-        ATOM filter_ref = FindAtomA(qaxatom);
+        ATOM filter_ref = FindAtom(qaxatom);
         if (filter_ref)
             DeleteAtom(filter_ref);
-        filter_ref = FindAtomA(qaxatom);
+        filter_ref = FindAtom(qaxatom);
         if (!filter_ref) {
 #else
@@ -2043 +2082 @@
 
 /*!
-    \reimp
+    \internal
 */
 const QMetaObject *QAxWidget::metaObject() const
@@ -2051 +2090 @@
 
 /*!
-    \reimp
+    \internal
 */
 const QMetaObject *QAxWidget::parentMetaObject() const
@@ -2069 +2108 @@
 
 /*!
-    \reimp
+    \internal
 */
 const char *QAxWidget::className() const
@@ -2077 +2116 @@
 
 /*!
-    \reimp
+    \internal
 */
 int QAxWidget::qt_metacall(QMetaObject::Call call, int id, void **v)

trunk/src/activeqt/container/qaxwidget.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.