Changeset 561 for trunk/tools/activeqt/dumpcpp/main.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)
• tools/activeqt/dumpcpp/main.cpp (modified) (6 diffs)

trunk/tools/activeqt/dumpcpp/main.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 tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -970 +970 @@
     BSTR nameString;
     typelib->GetDocumentation(-1, &nameString, 0, 0, 0);
-    libName = QString::fromUtf16((const ushort *)nameString);
+    libName = QString::fromnameString);
     SysFreeString(nameString);
     if (!nameSpace.isEmpty())
@@ -1087 +1087 @@
                         if (S_OK != typeinfo->GetDocumentation(-1, &bstr, 0, 0, 0))
                             break;
-                        className = QString::fromUtf16((const ushort *)bstr).toLatin1();
+                        className = QString::frombstr).toLatin1();
                         SysFreeString(bstr);
                         switch (typekind) {
@@ -1228 +1228 @@
                 if (S_OK != typeinfo->GetDocumentation(-1, &bstr, 0, 0, 0))
                     break;
-                className = QString::fromUtf16((const ushort *)bstr).toLatin1();
+                className = QString::frombstr).toLatin1();
                 SysFreeString(bstr);