Changeset 561 for trunk/src/activeqt/container/qaxdump.cpp

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/qaxdump.cpp (modified) (9 diffs)

trunk/src/activeqt/container/qaxdump.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.
@@ -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::fromdocStringBstr);
+        QString helpFile = QString::fromhelpFileBstr);
         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(" ") +
+                             Q) +
+                             Q) +
                              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 += Q(returntype.constData()) + QLatin1String(" result = ");
+                detail += QLatin1String("object->") + Q(functionToCall.constData()) +
+                          QLatin1String("(\"" + name + prototype + );
                 if (hasParams)
                     detail += QLatin1String(", params");
-                detail += QLatin1String(")");
+                detail += QLatin1);
                 if (returntype != "void" && returntype != "QAxObject *" && returntype != "QVariant")
-                    detail += QLatin1String(".") + QString::fromLatin1(toType(returntype));
+                    detail += QLatin1(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=") + Q(name.constData()) + QLatin1String("></a>void ") +
+                             Q) +
+                             Q(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");
+                             Q(type.constData()) +
+                             QLatin1(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 += QLatin1(type.constData()) + QLatin1String(" val = ");
+                detail += QLatin1String("object->property(\"") + Q(name.constData()) +
+                          QLatin1String("\").") + Q(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 *") + Q(name.constData()) +
+                          QLatin1String(" = object->querySubObject(\"") + Q(name.constData()) + QLatin1String("\");\n");
                 detail += QLatin1String("</pre>\n");
             } else {