Changeset 561 for trunk/src/activeqt/control/qaxserver.cpp
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/activeqt/control/qaxserver.cpp (modified) (35 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/activeqt/control/qaxserver.cpp
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the ActiveQt framework of the Qt Toolkit. … … 64 65 HANDLE qAxInstance = 0; 65 66 ITypeLib *qAxTypeLibrary = 0; 66 charqAxModuleFilename[MAX_PATH];67 wchar_t qAxModuleFilename[MAX_PATH]; 67 68 bool qAxOutProcServer = false; 68 69 … … 91 92 for (int i = 0; i < keys.count(); ++i) { 92 93 QString key(keys.at(i)); 93 qRegisterMetaType((key + QLatin1 String("*")).toLatin1(), (void**)0);94 qRegisterMetaType((key + QLatin1Char('*')).toLatin1(), (void**)0); 94 95 } 95 96 } … … 117 118 InitializeCriticalSection(&qAxModuleSection); 118 119 119 libFile = QString::from Local8Bit(qAxModuleFilename);120 libFile = QString::fromWCharArray(qAxModuleFilename); 120 121 libFile = libFile.toLower(); 121 if (LoadTypeLibEx(( TCHAR*)libFile.utf16(), REGKIND_NONE, &qAxTypeLibrary) == S_OK)122 if (LoadTypeLibEx((wchar_t*)libFile.utf16(), REGKIND_NONE, &qAxTypeLibrary) == S_OK) 122 123 return libFile; 123 124 124 125 int lastDot = libFile.lastIndexOf(QLatin1Char('.')); 125 126 libFile = libFile.left(lastDot) + QLatin1String(".tlb"); 126 if (LoadTypeLibEx(( TCHAR*)libFile.utf16(), REGKIND_NONE, &qAxTypeLibrary) == S_OK)127 if (LoadTypeLibEx((wchar_t*)libFile.utf16(), REGKIND_NONE, &qAxTypeLibrary) == S_OK) 127 128 return libFile; 128 129 129 130 lastDot = libFile.lastIndexOf(QLatin1Char('.')); 130 131 libFile = libFile.left(lastDot) + QLatin1String(".olb"); 131 if (LoadTypeLibEx(( TCHAR*)libFile.utf16(), REGKIND_NONE, &qAxTypeLibrary) == S_OK)132 if (LoadTypeLibEx((wchar_t*)libFile.utf16(), REGKIND_NONE, &qAxTypeLibrary) == S_OK) 132 133 return libFile; 133 134 … … 208 209 { 209 210 qAxIsServer = false; 210 QString file = QString::from Local8Bit(qAxModuleFilename);211 QString path = file.left(file.lastIndexOf(QLatin1 String("\\"))+1);211 QString file = QString::fromWCharArray(qAxModuleFilename); 212 QString path = file.left(file.lastIndexOf(QLatin1Char('\\'))+1); 212 213 QString module = file.right(file.length() - path.length()); 213 module = module.left(module.lastIndexOf(QLatin1 String(".")));214 module = module.left(module.lastIndexOf(QLatin1Char('.'))); 214 215 215 216 const QString appId = qAxFactory()->appID().toString().toUpper(); … … 227 228 DWORD major = libAttr->wMajorVerNum; 228 229 DWORD minor = libAttr->wMinorVerNum; 229 typeLibVersion = QString::number((uint)major) + QLatin1 String(".") + QString::number((uint)minor);230 typeLibVersion = QString::number((uint)major) + QLatin1Char('.') + QString::number((uint)minor); 230 231 231 232 if (bRegister) 232 RegisterTypeLib(qAxTypeLibrary, ( TCHAR*)libFile.utf16(), 0);233 RegisterTypeLib(qAxTypeLibrary, (wchar_t*)libFile.utf16(), 0); 233 234 else 234 235 UnRegisterTypeLib(libAttr->guid, libAttr->wMajorVerNum, libAttr->wMinorVerNum, libAttr->lcid, libAttr->syskind); … … 272 273 273 274 if (object) { // don't register subobject classes 274 QString classVersion = mo ? QString (QLatin1String(mo->classInfo(mo->indexOfClassInfo("Version")).value())) : QString();275 QString classVersion = mo ? QString::fromLatin1(mo->classInfo(mo->indexOfClassInfo("Version")).value()) : QString(); 275 276 if (classVersion.isNull()) 276 277 classVersion = QLatin1String("1.0"); 277 278 bool insertable = mo && !qstricmp(mo->classInfo(mo->indexOfClassInfo("Insertable")).value(), "yes"); 278 279 bool control = object->isWidgetType(); 279 const QString classMajorVersion = classVersion.left(classVersion.indexOf(QLatin1 String(".")));280 const QString classMajorVersion = classVersion.left(classVersion.indexOf(QLatin1Char('.'))); 280 281 uint olemisc = OLEMISC_SETCLIENTSITEFIRST 281 282 |OLEMISC_ACTIVATEWHENVISIBLE … … 288 289 olemisc |= OLEMISC_WANTSTOMENUMERGE; 289 290 290 settings.setValue(QLatin1 String("/") + module + QLatin1String(".") + className + QLatin1String(".") + classMajorVersion + QLatin1String("/."), className + QLatin1String(" Class"));291 settings.setValue(QLatin1 String("/") + module + QLatin1String(".") + className + QLatin1String(".") + classMajorVersion + QLatin1String("/CLSID/."), classId);291 settings.setValue(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1Char('.') + classMajorVersion + QLatin1String("/."), className + QLatin1String(" Class")); 292 settings.setValue(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1Char('.') + classMajorVersion + QLatin1String("/CLSID/."), classId); 292 293 if (insertable) 293 settings.setValue(QLatin1 String("/") + module + QLatin1String(".") + className + QLatin1String(".") + classMajorVersion + QLatin1String("/Insertable/."), QVariant(QLatin1String("")));294 settings.setValue(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1Char('.') + classMajorVersion + QLatin1String("/Insertable/."), QVariant(QLatin1String(""))); 294 295 295 settings.setValue(QLatin1 String("/") + module + QLatin1String(".") + className + QLatin1String("/."), className + QLatin1String(" Class"));296 settings.setValue(QLatin1 String("/") + module + QLatin1String(".") + className + QLatin1String("/CLSID/."), classId);297 settings.setValue(QLatin1 String("/") + module + QLatin1String(".") + className + QLatin1String("/CurVer/."), module + QLatin1String(".") + className + QLatin1String(".") + classMajorVersion);296 settings.setValue(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1String("/."), className + QLatin1String(" Class")); 297 settings.setValue(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1String("/CLSID/."), classId); 298 settings.setValue(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1String("/CurVer/."), module + QLatin1Char('.') + className + QLatin1Char('.') + classMajorVersion); 298 299 299 300 settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/."), className + QLatin1String(" Class")); 300 if (file. right(3).toLower() == QLatin1String("exe"))301 if (file.endsWith(QLatin1String("exe"), Qt::CaseInsensitive)) 301 302 settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/AppID"), appId); 302 303 if (control) … … 308 309 else 309 310 settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/LocalServer32/."), 310 QLatin1 String("\"") + file + QLatin1String("\" -activex"));311 QLatin1Char('\"') + file + QLatin1String("\" -activex")); 311 312 settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/MiscStatus/."), control ? QLatin1String("1") : QLatin1String("0")); 312 313 settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/MiscStatus/1/."), QString::number(olemisc)); 313 314 settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/Programmable/."), QVariant(QLatin1String(""))); 314 settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/ToolboxBitmap32/."), QLatin1 String("\"") +315 settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/ToolboxBitmap32/."), QLatin1Char('\"') + 315 316 file + QLatin1String("\", 101")); 316 317 settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/TypeLib/."), libId); settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/Version/."), classVersion); 317 settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/VersionIndependentProgID/."), module + QLatin1 String(".") + className);318 settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/ProgID/."), module + QLatin1 String(".") + className + QLatin1String(".") + classVersion.left(classVersion.indexOf(QLatin1Char('.'))));318 settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/VersionIndependentProgID/."), module + QLatin1Char('.') + className); 319 settings.setValue(QLatin1String("/CLSID/") + classId + QLatin1String("/ProgID/."), module + QLatin1Char('.') + className + QLatin1Char('.') + classVersion.left(classVersion.indexOf(QLatin1Char('.')))); 319 320 320 321 QString mime = QLatin1String(mo->classInfo(mo->indexOfClassInfo("MIME")).value()); … … 331 332 // Prepend '.' before extension, if required. 332 333 extension = extension.trimmed(); 333 if (extension[0] != Q Char(QLatin1Char('.')))334 extension = QLatin1 String(".") + extension;334 if (extension[0] != QLatin1Char('.')) 335 extension = QLatin1Char('.') + extension; 335 336 } 336 337 337 338 if (!extension.isEmpty()) { 338 settings.setValue(QLatin1 String("/") + extension + QLatin1String("/."), module + QLatin1String(".") + className);339 settings.setValue(QLatin1 String("/") + extension + QLatin1String("/Content Type"), mime);340 341 mime = mime.replace(QLatin1 String("/"), QLatin1String("\\"));339 settings.setValue(QLatin1Char('/') + extension + QLatin1String("/."), module + QLatin1Char('.') + className); 340 settings.setValue(QLatin1Char('/') + extension + QLatin1String("/Content Type"), mime); 341 342 mime = mime.replace(QLatin1Char('/'), QLatin1Char('\\')); 342 343 settings.setValue(QLatin1String("/MIME/Database/Content Type/") + mime + QLatin1String("/CLSID"), classId); 343 344 settings.setValue(QLatin1String("/MIME/Database/Content Type/") + mime + QLatin1String("/Extension"), extension); … … 352 353 } 353 354 } else { 355 if (qAxOutProcServer) { 356 settings.remove(QLatin1String("/AppID/") + appId + QLatin1String("/.")); 357 settings.remove(QLatin1String("/AppID/") + module + QLatin1String(".EXE")); 358 } 354 359 QStringList keys = qAxFactory()->featureList(); 355 360 for (QStringList::Iterator key = keys.begin(); key != keys.end(); ++key) { … … 359 364 className = qax_clean_type(className, mo); 360 365 361 QString classVersion = mo ? QString (QLatin1String(mo->classInfo(mo->indexOfClassInfo("Version")).value())) : QString();366 QString classVersion = mo ? QString::fromLatin1(mo->classInfo(mo->indexOfClassInfo("Version")).value()) : QString(); 362 367 if (classVersion.isNull()) 363 368 classVersion = QLatin1String("1.0"); 364 const QString classMajorVersion = classVersion.left(classVersion.indexOf(QLatin1 String(".")));369 const QString classMajorVersion = classVersion.left(classVersion.indexOf(QLatin1Char('.'))); 365 370 366 371 qAxFactory()->unregisterClass(*key, &settings); 367 372 368 settings.remove(QLatin1 String("/") + module + QLatin1String(".") + className + QLatin1String(".") + classMajorVersion + QLatin1String("/CLSID/."));369 settings.remove(QLatin1 String("/") + module + QLatin1String(".") + className + QLatin1String(".") + classMajorVersion + QLatin1String("/Insertable/."));370 settings.remove(QLatin1 String("/") + module + QLatin1String(".") + className + QLatin1String(".") + classMajorVersion + QLatin1String("/."));371 settings.remove(QLatin1 String("/") + module + QLatin1String(".") + className + QLatin1String(".") + classMajorVersion);373 settings.remove(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1Char('.') + classMajorVersion + QLatin1String("/CLSID/.")); 374 settings.remove(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1Char('.') + classMajorVersion + QLatin1String("/Insertable/.")); 375 settings.remove(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1Char('.') + classMajorVersion + QLatin1String("/.")); 376 settings.remove(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1Char('.') + classMajorVersion); 372 377 373 settings.remove(QLatin1 String("/") + module + QLatin1String(".") + className + QLatin1String("/CLSID/."));374 settings.remove(QLatin1 String("/") + module + QLatin1String(".") + className + QLatin1String("/CurVer/."));375 settings.remove(QLatin1 String("/") + module + QLatin1String(".") + className + QLatin1String("/."));376 settings.remove(QLatin1 String("/") + module + QLatin1String(".") + className);378 settings.remove(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1String("/CLSID/.")); 379 settings.remove(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1String("/CurVer/.")); 380 settings.remove(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1String("/.")); 381 settings.remove(QLatin1Char('/') + module + QLatin1Char('.') + className); 377 382 378 383 settings.remove(QLatin1String("/CLSID/") + classId + QLatin1String("/AppID")); … … 405 410 // Prepend '.' before extension, if required. 406 411 extension = extension.trimmed(); 407 if (extension[0] != Q Char(QLatin1Char('.')))408 extension = QLatin1String(".") + extension;412 if (extension[0] != QLatin1Char('.')) 413 extension.prepend(QLatin1Char('.')); 409 414 } 410 415 if (!extension.isEmpty()) { 411 settings.remove(QLatin1 String("/") + extension + QLatin1String("/Content Type"));412 settings.remove(QLatin1 String("/") + extension + QLatin1String("/."));413 settings.remove(QLatin1 String("/") + extension);414 mime = mime.replace(QLatin1String("/"), QLatin1String("\\"));416 settings.remove(QLatin1Char('/') + extension + QLatin1String("/Content Type")); 417 settings.remove(QLatin1Char('/') + extension + QLatin1String("/.")); 418 settings.remove(QLatin1Char('/') + extension); 419 mime.replace(QLatin1Char('/'), QLatin1Char('\\')); 415 420 settings.remove(QLatin1String("/MIME/Database/Content Type/") + mime + QLatin1String("/Extension")); 416 421 settings.remove(QLatin1String("/MIME/Database/Content Type/") + mime + QLatin1String("/CLSID")); … … 456 461 { "QPixmap", "IPictureDisp*" }, 457 462 { "QVariant", "VARIANT" }, 458 { "QVariantList", "SAFEARRAY(VARIANT)" },459 { "QList<QVariant>", "SAFEARRAY(VARIANT)" },463 { "QVariantList", "SAFEARRAY(VARIANT)" }, 464 { "QList<QVariant>", "SAFEARRAY(VARIANT)" }, 460 465 { "quint64", "CY" }, 461 466 { "qint64", "CY" }, … … 465 470 { "QStringList", "SAFEARRAY(BSTR)" }, 466 471 // Userdefined Qt datatypes - some not on Borland though 467 { "QCursor", "enum MousePointer" },468 { "Qt::FocusPolicy", "enum FocusPolicy" },472 { "QCursor", "enum MousePointer" }, 473 { "Qt::FocusPolicy", "enum FocusPolicy" }, 469 474 #ifndef Q_CC_BOR 470 475 # if __REQUIRED_RPCNDR_H_VERSION__ >= Q_REQUIRED_RPCNDR_H_VERSION … … 579 584 if (mapping.contains(name)) { 580 585 int n = mapping.value(name); 581 newName = name + "_"+ QByteArray::number(n);586 newName = name + '_' + QByteArray::number(n); 582 587 mapping.insert(name, n+1); 583 588 } else { … … 687 692 QByteArray name(parameterNames.at(p)); 688 693 689 if (type.endsWith( "&")) {694 if (type.endsWith('&')) { 690 695 out = true; 691 696 type.truncate(type.length() - 1); … … 693 698 out = true; 694 699 type.truncate(type.length() - 1); 695 } else if (type.endsWith( "*") && !subtypes.contains(type)) {700 } else if (type.endsWith('*') && !subtypes.contains(type)) { 696 701 type.truncate(type.length() - 1); 697 702 } … … 702 707 type = convertTypes(type, ok); 703 708 if (!out) 704 prototype += "[in] " + type + " ";709 prototype += "[in] " + type + ' '; 705 710 else 706 prototype += "[in,out] " + type + " ";711 prototype += "[in,out] " + type + ' '; 707 712 708 713 if (out) 709 prototype += "*";714 prototype += '*'; 710 715 if (name.isEmpty()) 711 prototype += "p"+ QByteArray::number(p);716 prototype += 'p' + QByteArray::number(p); 712 717 else 713 718 prototype += "p_" + replaceKeyword(name); … … 729 734 int in = -1; 730 735 while (numDefArgs) { 731 in = ptype.lastIndexOf( "]", in);736 in = ptype.lastIndexOf(']', in); 732 737 ptype.replace(in, 1, ",optional]"); 733 738 in = ptype.indexOf(' ', in) + 1; 734 739 QByteArray type = ptype.mid(in, ptype.indexOf(' ', in) - in); 735 740 if (type == "enum") 736 type += " "+ ptype.mid(in + 5, ptype.indexOf(' ', in + 5) - in - 5);741 type += ' ' + ptype.mid(in + 5, ptype.indexOf(' ', in + 5) - in - 5); 737 742 ptype.replace(in, type.length(), QByteArray("VARIANT /*was: ") + type + "*/"); 738 743 --numDefArgs; … … 802 807 QByteArray key(enumerator.key(j)); 803 808 while (enumValues.contains(key)) { 804 key += "_";809 key += '_'; 805 810 } 806 811 enumValues.append(key); … … 823 828 enums.append("MousePointer"); 824 829 out << "\tenum MousePointer {" << endl; 825 out << "\t\tArrowCursor = " << Qt::ArrowCursor << ","<< endl;826 out << "\t\tUpArrowCursor = " << Qt::UpArrowCursor << ","<< endl;827 out << "\t\tCrossCursor = " << Qt::CrossCursor << ","<< endl;828 out << "\t\tWaitCursor = " << Qt::WaitCursor << ","<< endl;829 out << "\t\tIBeamCursor = " << Qt::IBeamCursor << ","<< endl;830 out << "\t\tSizeVerCursor = " << Qt::SizeVerCursor << ","<< endl;831 out << "\t\tSizeHorCursor = " << Qt::SizeHorCursor << ","<< endl;832 out << "\t\tSizeBDiagCursor = " << Qt::SizeBDiagCursor << ","<< endl;833 out << "\t\tSizeFDiagCursor = " << Qt::SizeFDiagCursor << ","<< endl;834 out << "\t\tSizeAllCursor = " << Qt::SizeAllCursor << ","<< endl;835 out << "\t\tBlankCursor = " << Qt::BlankCursor << ","<< endl;836 out << "\t\tSplitVCursor = " << Qt::SplitVCursor << ","<< endl;837 out << "\t\tSplitHCursor = " << Qt::SplitHCursor << ","<< endl;838 out << "\t\tPointingHandCursor = " << Qt::PointingHandCursor << ","<< endl;839 out << "\t\tForbiddenCursor = " << Qt::ForbiddenCursor << ","<< endl;840 out << "\t\tWhatsThisCursor = " << Qt::WhatsThisCursor << ","<< endl;830 out << "\t\tArrowCursor = " << Qt::ArrowCursor << ',' << endl; 831 out << "\t\tUpArrowCursor = " << Qt::UpArrowCursor << ',' << endl; 832 out << "\t\tCrossCursor = " << Qt::CrossCursor << ',' << endl; 833 out << "\t\tWaitCursor = " << Qt::WaitCursor << ',' << endl; 834 out << "\t\tIBeamCursor = " << Qt::IBeamCursor << ',' << endl; 835 out << "\t\tSizeVerCursor = " << Qt::SizeVerCursor << ',' << endl; 836 out << "\t\tSizeHorCursor = " << Qt::SizeHorCursor << ',' << endl; 837 out << "\t\tSizeBDiagCursor = " << Qt::SizeBDiagCursor << ',' << endl; 838 out << "\t\tSizeFDiagCursor = " << Qt::SizeFDiagCursor << ',' << endl; 839 out << "\t\tSizeAllCursor = " << Qt::SizeAllCursor << ',' << endl; 840 out << "\t\tBlankCursor = " << Qt::BlankCursor << ',' << endl; 841 out << "\t\tSplitVCursor = " << Qt::SplitVCursor << ',' << endl; 842 out << "\t\tSplitHCursor = " << Qt::SplitHCursor << ',' << endl; 843 out << "\t\tPointingHandCursor = " << Qt::PointingHandCursor << ',' << endl; 844 out << "\t\tForbiddenCursor = " << Qt::ForbiddenCursor << ',' << endl; 845 out << "\t\tWhatsThisCursor = " << Qt::WhatsThisCursor << ',' << endl; 841 846 out << "\t\tBusyCursor\t= " << Qt::BusyCursor << endl; 842 847 out << "\t};" << endl << endl; … … 845 850 enums.append("FocusPolicy"); 846 851 out << "\tenum FocusPolicy {" << endl; 847 out << "\t\tNoFocus = " << Qt::NoFocus << ","<< endl;848 out << "\t\tTabFocus = " << Qt::TabFocus << ","<< endl;849 out << "\t\tClickFocus = " << Qt::ClickFocus << ","<< endl;850 out << "\t\tStrongFocus = " << Qt::StrongFocus << ","<< endl;852 out << "\t\tNoFocus = " << Qt::NoFocus << ',' << endl; 853 out << "\t\tTabFocus = " << Qt::TabFocus << ',' << endl; 854 out << "\t\tClickFocus = " << Qt::ClickFocus << ',' << endl; 855 out << "\t\tStrongFocus = " << Qt::StrongFocus << ',' << endl; 851 856 out << "\t\tWheelFocus = " << Qt::WheelFocus << endl; 852 857 out << "\t};" << endl << endl; … … 878 883 out << "\t/****** Property is of unsupported datatype" << endl; 879 884 880 out << "\t\t[id(" << id << ")";885 out << "\t\t[id(" << id << ')'; 881 886 if (!property.isWritable()) 882 887 out << ", readonly"; … … 887 892 if (isBindable) 888 893 out << ", requestedit"; 889 if (defProp == Q String::fromLatin1(name.constData()))894 if (defProp == QLatin1String(name)) 890 895 out << ", uidefault"; 891 out << "] " << type << " " << name << ";"<< endl;896 out << "] " << type << ' ' << name << ';' << endl; 892 897 893 898 if (!ok) … … 940 945 outBuffer += "\t/****** Slot parameter uses unsupported datatype\n"; 941 946 942 outBuffer += "\t\t[id(" + QString::number(id).toLatin1() + ")] " + type + " " + name + "("+ ptype + ");\n";947 outBuffer += "\t\t[id(" + QString::number(id).toLatin1() + ")] " + type + ' ' + name + '(' + ptype + ");\n"; 943 948 944 949 if (!ok) … … 992 997 QList<QByteArray> parameterNames(signal.parameterNames()); 993 998 994 bool isDefault = defSignal == Q String::fromLatin1(name.constData());999 bool isDefault = defSignal == QLatin1String(name); 995 1000 name = renameOverloads(replaceKeyword(name)); 996 1001 bool ok = true; … … 1004 1009 out << "\t/****** Signal parameter uses unsupported datatype" << endl; 1005 1010 1006 out << "\t\t[id(" << id << ")";1011 out << "\t\t[id(" << id << ')'; 1007 1012 if (isDefault) 1008 1013 out << ", uidefault"; 1009 out << "] void " << name << "("<< ptype << ");" << endl;1014 out << "] void " << name << '(' << ptype << ");" << endl; 1010 1015 1011 1016 if (!ok) … … 1032 1037 if (classVersion) 1033 1038 out << "\t\tversion(" << classVersion << ")," << endl; 1034 out << "\t\tuuid(" << classID << ")";1039 out << "\t\tuuid(" << classID << ')'; 1035 1040 if (control) { 1036 1041 out << ", " << endl; … … 1044 1049 out << "\tcoclass " << cleanClassName << endl; 1045 1050 out << "\t{" << endl; 1046 out << "\t\t[default] dispinterface I" << cleanClassName << ";"<< endl;1051 out << "\t\t[default] dispinterface I" << cleanClassName << ';' << endl; 1047 1052 if (hasEvents) 1048 1053 out << "\t\t[default, source] dispinterface I" << cleanClassName << "Events;" << endl; … … 1068 1073 file.remove(); 1069 1074 1070 QString filebase = QString::from Local8Bit(qAxModuleFilename);1071 filebase = filebase.left(filebase.lastIndexOf(QLatin1 String(".")));1075 QString filebase = QString::fromWCharArray(qAxModuleFilename); 1076 filebase = filebase.left(filebase.lastIndexOf(QLatin1Char('.'))); 1072 1077 1073 1078 QString appID = qAxFactory()->appID().toString().toUpper(); … … 1104 1109 out << "** Interface definition generated for ActiveQt project" << endl; 1105 1110 out << "**" << endl; 1106 out << "** '" << qAxModuleFilename << "'"<< endl;1111 out << "** '" << QString::fromWCharArray(qAxModuleFilename) << '\'' << endl; 1107 1112 out << "**" << endl; 1108 1113 out << "** Created: " << QDateTime::currentDateTime().toString() << endl; … … 1122 1127 } 1123 1128 1124 out << "["<< endl;1129 out << '[' << endl; 1125 1130 out << "\tuuid(" << typeLibID << ")," << endl; 1126 1131 out << "\tversion(" << version << ")," << endl; 1127 out << "\thelpstring(\"" << typelib << " "<< version << " Type Library\")" << endl;1128 out << "]"<< endl;1132 out << "\thelpstring(\"" << typelib << ' ' << version << " Type Library\")" << endl; 1133 out << ']' << endl; 1129 1134 out << "library " << typelib << "Lib" << endl; 1130 out << "{"<< endl;1135 out << '{' << endl; 1131 1136 out << "\timportlib(\"stdole32.tlb\");" << endl; 1132 1137 out << "\timportlib(\"stdole2.tlb\");" << endl << endl; … … 1189 1194 if (mo) { 1190 1195 QByteArray cleanType = qax_clean_type(*key, mo).toLatin1(); 1191 out << "\tcoclass " << cleanType << ";"<< endl;1196 out << "\tcoclass " << cleanType << ';' << endl; 1192 1197 subtypes.append(cleanType); 1193 subtypes.append(cleanType + "*");1194 1198 qRegisterMetaType(cleanType, (void**)0); 1195 qRegisterMetaType(cleanType + "*", (void**)0); 1199 cleanType += '*'; 1200 subtypes.append(cleanType); 1201 qRegisterMetaType(cleanType, (void**)0); 1196 1202 } 1197 1203 } … … 1226 1232 QByteArray cleanType = qax_clean_type(*key, mo).toLatin1(); 1227 1233 subtypes.append(cleanType); 1228 subtypes.append(cleanType + "*");1234 subtypes.append(cleanType + '*'); 1229 1235 res = classIDL(o, mo, QString::fromLatin1(className.constData()), isBindable, out); 1230 1236 delete o;
Note:
See TracChangeset
for help on using the changeset viewer.
