summaryrefslogtreecommitdiffstats
path: root/tools/activeqt
diff options
context:
space:
mode:
authorminiak <milan.burda@gmail.com>2009-07-01 09:50:23 (GMT)
committerMarius Storm-Olsen <marius@trolltech.com>2009-07-01 09:51:23 (GMT)
commit5ea86cfac34f65b2321ceeeb651e4e7099bf59a0 (patch)
tree22b8a82d8ea31ad1df0d8806394d03e23079c5fa /tools/activeqt
parent24e7a5f983ead3fe722703851cf59cd0943e3964 (diff)
downloadQt-5ea86cfac34f65b2321ceeeb651e4e7099bf59a0.zip
Qt-5ea86cfac34f65b2321ceeeb651e4e7099bf59a0.tar.gz
Qt-5ea86cfac34f65b2321ceeeb651e4e7099bf59a0.tar.bz2
tools: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support
Also QString::fromUtf16() -> QString::fromWCharArray() Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
Diffstat (limited to 'tools/activeqt')
-rw-r--r--tools/activeqt/dumpcpp/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/activeqt/dumpcpp/main.cpp b/tools/activeqt/dumpcpp/main.cpp
index 0a4aa06..de3ec57 100644
--- a/tools/activeqt/dumpcpp/main.cpp
+++ b/tools/activeqt/dumpcpp/main.cpp
@@ -969,7 +969,7 @@ bool generateTypeLibrary(const QByteArray &typeLib, const QByteArray &outname, O
QString libName;
BSTR nameString;
typelib->GetDocumentation(-1, &nameString, 0, 0, 0);
- libName = QString::fromUtf16((const ushort *)nameString);
+ libName = QString::fromWCharArray(nameString);
SysFreeString(nameString);
if (!nameSpace.isEmpty())
libName = QString(nameSpace);
@@ -1086,7 +1086,7 @@ bool generateTypeLibrary(const QByteArray &typeLib, const QByteArray &outname, O
BSTR bstr;
if (S_OK != typeinfo->GetDocumentation(-1, &bstr, 0, 0, 0))
break;
- className = QString::fromUtf16((const ushort *)bstr).toLatin1();
+ className = QString::fromWCharArray(bstr).toLatin1();
SysFreeString(bstr);
switch (typekind) {
case TKIND_RECORD:
@@ -1227,7 +1227,7 @@ bool generateTypeLibrary(const QByteArray &typeLib, const QByteArray &outname, O
BSTR bstr;
if (S_OK != typeinfo->GetDocumentation(-1, &bstr, 0, 0, 0))
break;
- className = QString::fromUtf16((const ushort *)bstr).toLatin1();
+ className = QString::fromWCharArray(bstr).toLatin1();
SysFreeString(bstr);
declOut << "// stub for vtable-only interface" << endl;