diff options
Diffstat (limited to 'sources/shiboken6')
44 files changed, 356 insertions, 357 deletions
diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp index 15b71d0bc..530d20253 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp @@ -225,7 +225,7 @@ void AbstractMetaBuilderPrivate::registerToStringCapability(const FunctionModelI { ArgumentList arguments = function_item->arguments(); if (arguments.size() == 2) { - if (arguments.at(0)->type().toString() == QLatin1String("QDebug")) { + if (arguments.at(0)->type().toString() == u"QDebug") { const ArgumentModelItem &arg = arguments.at(1); if (AbstractMetaClass *cls = argumentToClass(arg, currentClass)) { if (arg->type().indirections() < 2) @@ -495,7 +495,7 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom, // Global functions const FunctionList &functions = dom->functions(); for (const FunctionModelItem &func : functions) { - if (func->accessPolicy() != Access::Public || func->name().startsWith(QLatin1String("operator"))) + if (func->accessPolicy() != Access::Public || func->name().startsWith(u"operator")) continue; FunctionTypeEntry *funcEntry = types->findFunctionType(func->name()); @@ -1264,7 +1264,7 @@ void AbstractMetaBuilderPrivate::fixReturnTypeOfConversionOperator(AbstractMetaF if (castTo.endsWith(u'&')) castTo.chop(1); - if (castTo.startsWith(QLatin1String("const "))) + if (castTo.startsWith(u"const ")) castTo.remove(0, 6); TypeEntry *retType = types->findType(castTo); @@ -1877,12 +1877,12 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(const Functio if (currentClass) { // Clang: Skip qt_metacast(), qt_metacall(), expanded from Q_OBJECT // and overridden metaObject(), QGADGET helpers - if (functionName == QLatin1String("qt_check_for_QGADGET_macro") - || functionName.startsWith(QLatin1String("qt_meta"))) { + if (functionName == u"qt_check_for_QGADGET_macro" + || functionName.startsWith(u"qt_meta")) { return nullptr; } className = currentClass->typeEntry()->qualifiedCppName(); - if (functionName == QLatin1String("metaObject") && className != QLatin1String("QObject")) + if (functionName == u"metaObject" && className != u"QObject") return nullptr; } @@ -1992,7 +1992,7 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(const Functio if (arguments.size() == 1) { ArgumentModelItem arg = arguments.at(0); TypeInfo type = arg->type(); - if (type.qualifiedName().constFirst() == QLatin1String("void") && type.indirections() == 0) + if (type.qualifiedName().constFirst() == u"void" && type.indirections() == 0) arguments.pop_front(); } @@ -2098,7 +2098,7 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(const Functio if (currentClass && metaFunction->arguments().size() == 1) { const AbstractMetaType &argType = metaFunction->arguments().constFirst().type(); if (argType.typeEntry() == currentClass->typeEntry() && argType.indirections() == 0) { - if (metaFunction->name() == QLatin1String("operator=")) { + if (metaFunction->name() == u"operator=") { switch (argType.referenceType()) { case NoReference: metaFunction->setFunctionType(AbstractMetaFunction::AssignmentOperatorFunction); @@ -2554,7 +2554,7 @@ std::optional<AbstractMetaType> QString name = qualifierList.takeLast(); // 4. Special case QFlags (include instantiation in name) - if (qualifiedName == QLatin1String("QFlags")) { + if (qualifiedName == u"QFlags") { qualifiedName = typeInfo.toString(); typeInfo.clearInstantiations(); } @@ -2680,9 +2680,9 @@ qint64 AbstractMetaBuilderPrivate::findOutValueFromString(const QString &stringV if (ok) return value; - if (stringValue == QLatin1String("true") || stringValue == QLatin1String("false")) { + if (stringValue == u"true" || stringValue == u"false") { ok = true; - return (stringValue == QLatin1String("true")); + return (stringValue == u"true"); } // This is a very lame way to handle expression evaluation, diff --git a/sources/shiboken6/ApiExtractor/abstractmetaenum.cpp b/sources/shiboken6/ApiExtractor/abstractmetaenum.cpp index 4e030c392..9e5ed7b7d 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetaenum.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetaenum.cpp @@ -154,7 +154,7 @@ std::optional<AbstractMetaEnumValue> { if (isAnonymous()) return findMatchingEnumValue(d->m_enumValues, value); - const int sepPos = value.indexOf(QLatin1String("::")); + const int sepPos = value.indexOf(u"::"); if (sepPos == -1) return findMatchingEnumValue(d->m_enumValues, value); if (name() == value.left(sepPos)) diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp index 26d91f935..3476ceb82 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp @@ -1027,7 +1027,7 @@ void AbstractMetaFunction::setTypeEntry(FunctionTypeEntry *typeEntry) bool AbstractMetaFunction::isCallOperator() const { - return d->m_name == QLatin1String("operator()"); + return d->m_name == u"operator()"; } bool AbstractMetaFunction::hasInjectedCode() const @@ -1108,7 +1108,7 @@ bool AbstractMetaFunction::hasSignatureModifications() const bool AbstractMetaFunction::isConversionOperator(const QString &funcName) { - return funcName.startsWith(QLatin1String("operator ")); + return funcName.startsWith(u"operator "); } ExceptionSpecification AbstractMetaFunction::exceptionSpecification() const diff --git a/sources/shiboken6/ApiExtractor/abstractmetalang.cpp b/sources/shiboken6/ApiExtractor/abstractmetalang.cpp index 92fcc230a..de8f73a1b 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetalang.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetalang.cpp @@ -549,7 +549,7 @@ bool AbstractMetaClass::isInvisibleNamespace() const bool AbstractMetaClass::isQtNamespace() const { - return isNamespace() && name() == QLatin1String("Qt"); + return isNamespace() && name() == u"Qt"; } QString AbstractMetaClass::qualifiedCppName() const diff --git a/sources/shiboken6/ApiExtractor/abstractmetatype.cpp b/sources/shiboken6/ApiExtractor/abstractmetatype.cpp index 3d1f5d210..11b8bddfa 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetatype.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetatype.cpp @@ -826,14 +826,14 @@ bool AbstractMetaType::isCString() const { return isNativePointer() && d->m_indirections.size() == 1 - && name() == QLatin1String("char"); + && name() == u"char"; } bool AbstractMetaType::isVoidPointer() const { return isNativePointer() && d->m_indirections.size() == 1 - && name() == QLatin1String("void"); + && name() == u"void"; } bool AbstractMetaType::isUserPrimitive() const @@ -920,7 +920,7 @@ std::optional<AbstractMetaType> AbstractMetaType::fromString(QString typeSignature, QString *errorMessage) { typeSignature = typeSignature.trimmed(); - if (typeSignature.startsWith(QLatin1String("::"))) + if (typeSignature.startsWith(u"::")) typeSignature.remove(0, 2); auto &cache = *metaTypeFromStringCache(); @@ -941,7 +941,7 @@ AbstractMetaType::fromString(QString typeSignature, QString *errorMessage) AbstractMetaType AbstractMetaType::fromTypeEntry(const TypeEntry *typeEntry) { QString typeName = typeEntry->qualifiedCppName(); - if (typeName.startsWith(QLatin1String("::"))) + if (typeName.startsWith(u"::")) typeName.remove(0, 2); auto &cache = *metaTypeFromStringCache(); auto it = cache.find(typeName); diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp index ac5843cac..7aee6ed67 100644 --- a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp +++ b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp @@ -347,7 +347,7 @@ FunctionModelItem BuilderPrivate::createFunction(const CXCursor &cursor, { QString name = getCursorSpelling(cursor); // Apply type fixes to "operator X &" -> "operator X&" - if (name.startsWith(QLatin1String("operator "))) + if (name.startsWith(u"operator ")) name = fixTypeName(name); FunctionModelItem result(new _FunctionModelItem(m_model, name)); setFileName(cursor, result.data()); @@ -588,7 +588,7 @@ TypeInfo BuilderPrivate::createTypeInfoUncached(const CXType &type, // the typedef source is named "type-parameter-0-0". Convert it back to the // template parameter name. The CXTypes are the same for all templates and // must not be cached. - if (!m_currentClass.isNull() && typeName.startsWith(QLatin1String("type-parameter-0-"))) { + if (!m_currentClass.isNull() && typeName.startsWith(u"type-parameter-0-")) { if (cacheable != nullptr) *cacheable = false; bool ok; @@ -939,9 +939,9 @@ BaseVisitor::StartTokenResult Builder::startToken(const CXCursor &cursor) break; case CXCursor_AnnotateAttr: { const QString annotation = getCursorSpelling(cursor); - if (annotation == QLatin1String("qt_slot")) + if (annotation == u"qt_slot") d->m_currentFunctionType = CodeModel::Slot; - else if (annotation == QLatin1String("qt_signal")) + else if (annotation == u"qt_signal") d->m_currentFunctionType = CodeModel::Signal; else d->m_currentFunctionType = CodeModel::Normal; diff --git a/sources/shiboken6/ApiExtractor/codesniphelpers.cpp b/sources/shiboken6/ApiExtractor/codesniphelpers.cpp index 4002729fc..42f68aa43 100644 --- a/sources/shiboken6/ApiExtractor/codesniphelpers.cpp +++ b/sources/shiboken6/ApiExtractor/codesniphelpers.cpp @@ -77,7 +77,7 @@ QString CodeSnipHelpers::fixSpaces(QString code) { code.remove(u'\r'); // Check for XML <tag>\n<space>bla... - if (code.startsWith(QLatin1String("\n "))) + if (code.startsWith(u"\n ")) code.remove(0, 1); while (!code.isEmpty() && code.back().isSpace()) code.chop(1); diff --git a/sources/shiboken6/ApiExtractor/modifications.cpp b/sources/shiboken6/ApiExtractor/modifications.cpp index ad1dac6cd..eb96e3c18 100644 --- a/sources/shiboken6/ApiExtractor/modifications.cpp +++ b/sources/shiboken6/ApiExtractor/modifications.cpp @@ -376,7 +376,7 @@ AddedFunction::AddedFunctionPtr const int signatureLength = signature.length(); const int qualifierLength = signatureLength - closingParenPos - 1; if (qualifierLength >= 5 - && signature.right(qualifierLength).contains(QLatin1String("const"))) { + && signature.right(qualifierLength).contains(u"const")) { isConst = true; } @@ -385,7 +385,7 @@ AddedFunction::AddedFunctionPtr if (params.isEmpty() && !errorMessage->isEmpty()) return {}; for (const auto &p : params) { - TypeInfo type = p.type == QLatin1String("...") + TypeInfo type = p.type == u"..." ? TypeInfo::varArgsType() : TypeParser::parse(p.type, errorMessage); if (!errorMessage->isEmpty()) { errorMessage->prepend(u"Unable to parse added function "_qs + signatureIn diff --git a/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp b/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp index 2ca48ec30..c7861a897 100644 --- a/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp +++ b/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp @@ -148,7 +148,7 @@ bool TypeInfoData::isVoid() const && m_arguments.isEmpty() && m_arrayElements.isEmpty() && m_instantiations.isEmpty() && m_qualifiedName.size() == 1 - && m_qualifiedName.constFirst() == QLatin1String("void"); + && m_qualifiedName.constFirst() == u"void"; } bool TypeInfo::isVoid() const @@ -517,7 +517,7 @@ void TypeInfo::stripQualifiers(QString *s) bool TypeInfoData::isStdType() const { return m_qualifiedName.size() > 1 - && m_qualifiedName.constFirst() == QLatin1String("std"); + && m_qualifiedName.constFirst() == u"std"; } bool TypeInfo::isStdType() const @@ -527,13 +527,13 @@ bool TypeInfo::isStdType() const static inline bool discardStdType(const QString &name) { - return name == QLatin1String("allocator") || name == QLatin1String("less"); + return name == u"allocator" || name == u"less"; } void TypeInfoData::simplifyStdType() { Q_ASSERT(isStdType()); - if (m_qualifiedName.at(1).startsWith(QLatin1String("__"))) + if (m_qualifiedName.at(1).startsWith(u"__")) m_qualifiedName.removeAt(1); for (int t = m_instantiations.size() - 1; t >= 0; --t) { if (m_instantiations.at(t).isStdType()) { diff --git a/sources/shiboken6/ApiExtractor/qtdocparser.cpp b/sources/shiboken6/ApiExtractor/qtdocparser.cpp index c2ae5fb0b..7ac765781 100644 --- a/sources/shiboken6/ApiExtractor/qtdocparser.cpp +++ b/sources/shiboken6/ApiExtractor/qtdocparser.cpp @@ -78,7 +78,7 @@ static void formatFunctionUnqualifiedArgTypeQuery(QTextStream &str, // to "Qt::Alignment" as seen by qdoc. const auto *flagsEntry = static_cast<const FlagsTypeEntry *>(metaType.typeEntry()); QString name = flagsEntry->qualifiedCppName(); - if (name.endsWith(u'>') && name.startsWith(QLatin1String("QFlags<"))) { + if (name.endsWith(u'>') && name.startsWith(u"QFlags<")) { const int lastColon = name.lastIndexOf(u':'); if (lastColon != -1) { name.replace(lastColon + 1, name.size() - lastColon - 1, metaType.name()); @@ -381,7 +381,7 @@ Documentation QtDocParser::retrieveModuleDocumentation(const QString& name) const QFileInfo qmlModuleFi(prefix + QLatin1String("-qmlmodule.webxml")); if (qmlModuleFi.isFile()) { QString docString = doc.detailed(); - const int pos = docString.lastIndexOf(QLatin1String("</description>")); + const int pos = docString.lastIndexOf(u"</description>"); if (pos != -1) { docString.insert(pos, qmlReferenceLink(qmlModuleFi)); doc.setDetailed(docString); diff --git a/sources/shiboken6/ApiExtractor/reporthandler.cpp b/sources/shiboken6/ApiExtractor/reporthandler.cpp index 4b9d8187b..d20768628 100644 --- a/sources/shiboken6/ApiExtractor/reporthandler.cpp +++ b/sources/shiboken6/ApiExtractor/reporthandler.cpp @@ -84,11 +84,11 @@ void ReportHandler::setDebugLevel(ReportHandler::DebugLevel level) bool ReportHandler::setDebugLevelFromArg(const QString &level) { bool result = true; - if (level == QLatin1String("sparse")) + if (level == u"sparse") ReportHandler::setDebugLevel(ReportHandler::SparseDebug); - else if (level == QLatin1String("medium")) + else if (level == u"medium") ReportHandler::setDebugLevel(ReportHandler::MediumDebug); - else if (level == QLatin1String("full")) + else if (level == u"full") ReportHandler::setDebugLevel(ReportHandler::FullDebug); else result = false; @@ -123,7 +123,7 @@ void ReportHandler::setPrefix(const QString &p) void ReportHandler::messageOutput(QtMsgType type, const QMessageLogContext &context, const QString &text) { // Check for file location separator added by SourceLocation - int fileLocationPos = text.indexOf(QLatin1String(":\t")); + int fileLocationPos = text.indexOf(u":\t"); if (type == QtWarningMsg) { if (m_silent || m_reportedWarnings.contains(text)) return; diff --git a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp index 1572c90ee..9d780ed95 100644 --- a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp @@ -43,7 +43,7 @@ void TestAbstractMetaClass::testClassName() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 1); - QCOMPARE(classes[0]->name(), QLatin1String("ClassName")); + QCOMPARE(classes[0]->name(), u"ClassName"); } void TestAbstractMetaClass::testClassNameUnderNamespace() @@ -59,12 +59,12 @@ void TestAbstractMetaClass::testClassNameUnderNamespace() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); // 1 namespace + 1 class - if (classes.constFirst()->name() != QLatin1String("ClassName")) + if (classes.constFirst()->name() != u"ClassName") qSwap(classes[0], classes[1]); - QCOMPARE(classes[0]->name(), QLatin1String("ClassName")); - QCOMPARE(classes[0]->qualifiedCppName(), QLatin1String("Namespace::ClassName")); - QCOMPARE(classes[1]->name(), QLatin1String("Namespace")); + QCOMPARE(classes[0]->name(), u"ClassName"); + QCOMPARE(classes[0]->qualifiedCppName(), u"Namespace::ClassName"); + QCOMPARE(classes[1]->name(), u"Namespace"); QVERIFY(classes[1]->isNamespace()); // Check ctors info @@ -73,13 +73,13 @@ void TestAbstractMetaClass::testClassNameUnderNamespace() auto ctors = classes[0]->queryFunctions(FunctionQueryOption::AnyConstructor); QCOMPARE(ctors.size(), 2); - if (ctors.constFirst()->minimalSignature() != QLatin1String("ClassName()")) + if (ctors.constFirst()->minimalSignature() != u"ClassName()") qSwap(ctors[0], ctors[1]); QCOMPARE(ctors[0]->arguments().size(), 0); - QCOMPARE(ctors[0]->minimalSignature(), QLatin1String("ClassName()")); + QCOMPARE(ctors[0]->minimalSignature(), u"ClassName()"); QCOMPARE(ctors[1]->arguments().size(), 1); - QCOMPARE(ctors[1]->minimalSignature(), QLatin1String("ClassName(Namespace::ClassName)")); + QCOMPARE(ctors[1]->minimalSignature(), u"ClassName(Namespace::ClassName)"); QVERIFY(!classes[0]->hasPrivateDestructor()); QVERIFY(classes[0]->isCopyConstructible()); // implicit default copy ctor @@ -275,8 +275,8 @@ void TestAbstractMetaClass::testModifiedDefaultValues() QCOMPARE(methodMatches.size(), 1); const auto method = methodMatches.constFirst(); const AbstractMetaArgument &arg = method->arguments().constFirst(); - QCOMPARE(arg.defaultValueExpression(), QLatin1String("Hello")); - QCOMPARE(arg.originalDefaultValueExpression(), QLatin1String("A::B()")); + QCOMPARE(arg.defaultValueExpression(), u"Hello"); + QCOMPARE(arg.originalDefaultValueExpression(), u"A::B()"); } void TestAbstractMetaClass::testInnerClassOfAPolymorphicOne() @@ -428,28 +428,28 @@ void TestAbstractMetaClass::testClassDefaultConstructors() auto ctors = classA->queryFunctions(FunctionQueryOption::AnyConstructor); QCOMPARE(ctors.size(), 2); - if (ctors.constFirst()->minimalSignature() != QLatin1String("A()")) + if (ctors.constFirst()->minimalSignature() != u"A()") qSwap(ctors[0], ctors[1]); QCOMPARE(ctors[0]->arguments().size(), 0); - QCOMPARE(ctors[0]->minimalSignature(), QLatin1String("A()")); + QCOMPARE(ctors[0]->minimalSignature(), u"A()"); QCOMPARE(ctors[1]->arguments().size(), 1); - QCOMPARE(ctors[1]->minimalSignature(), QLatin1String("A(A)")); + QCOMPARE(ctors[1]->minimalSignature(), u"A(A)"); AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, QLatin1String("B")); QVERIFY(classB); QCOMPARE(classB->functions().size(), 2); - QCOMPARE(classB->functions().constFirst()->minimalSignature(), QLatin1String("B()")); + QCOMPARE(classB->functions().constFirst()->minimalSignature(), u"B()"); AbstractMetaClass* classC = AbstractMetaClass::findClass(classes, QLatin1String("C")); QVERIFY(classC); QCOMPARE(classC->functions().size(), 1); - QCOMPARE(classC->functions().constFirst()->minimalSignature(), QLatin1String("C(C)")); + QCOMPARE(classC->functions().constFirst()->minimalSignature(), u"C(C)"); AbstractMetaClass* classD = AbstractMetaClass::findClass(classes, QLatin1String("D")); QVERIFY(classD); QCOMPARE(classD->functions().size(), 1); - QCOMPARE(classD->functions().constFirst()->minimalSignature(), QLatin1String("D(D)")); + QCOMPARE(classD->functions().constFirst()->minimalSignature(), u"D(D)"); QVERIFY(classD->functions().constFirst()->isPrivate()); AbstractMetaClass* classE = AbstractMetaClass::findClass(classes, QLatin1String("E")); @@ -462,13 +462,13 @@ void TestAbstractMetaClass::testClassDefaultConstructors() ctors = classF->queryFunctions(FunctionQueryOption::AnyConstructor); QCOMPARE(ctors.size(), 2); - if (ctors.constFirst()->minimalSignature() != QLatin1String("F(int,int)")) + if (ctors.constFirst()->minimalSignature() != u"F(int,int)") qSwap(ctors[0], ctors[1]); QCOMPARE(ctors[0]->arguments().size(), 2); - QCOMPARE(ctors[0]->minimalSignature(), QLatin1String("F(int,int)")); + QCOMPARE(ctors[0]->minimalSignature(), u"F(int,int)"); QCOMPARE(ctors[1]->arguments().size(), 1); - QCOMPARE(ctors[1]->minimalSignature(), QLatin1String("F(F)")); + QCOMPARE(ctors[1]->minimalSignature(), u"F(F)"); } void TestAbstractMetaClass::testClassInheritedDefaultConstructors() @@ -495,13 +495,13 @@ void TestAbstractMetaClass::testClassInheritedDefaultConstructors() auto ctors = classA->queryFunctions(FunctionQueryOption::AnyConstructor); QCOMPARE(ctors.size(), 2); - if (ctors.constFirst()->minimalSignature() != QLatin1String("A()")) + if (ctors.constFirst()->minimalSignature() != u"A()") qSwap(ctors[0], ctors[1]); QCOMPARE(ctors[0]->arguments().size(), 0); - QCOMPARE(ctors[0]->minimalSignature(), QLatin1String("A()")); + QCOMPARE(ctors[0]->minimalSignature(), u"A()"); QCOMPARE(ctors[1]->arguments().size(), 1); - QCOMPARE(ctors[1]->minimalSignature(), QLatin1String("A(A)")); + QCOMPARE(ctors[1]->minimalSignature(), u"A(A)"); QVERIFY(ctors[1]->isPrivate()); AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, QLatin1String("B")); @@ -510,7 +510,7 @@ void TestAbstractMetaClass::testClassInheritedDefaultConstructors() ctors = classB->queryFunctions(FunctionQueryOption::Constructors); QCOMPARE(ctors.size(), 1); QCOMPARE(ctors.constFirst()->arguments().size(), 0); - QCOMPARE(ctors.constFirst()->minimalSignature(), QLatin1String("B()")); + QCOMPARE(ctors.constFirst()->minimalSignature(), u"B()"); } void TestAbstractMetaClass::testAbstractClassDefaultConstructors() @@ -534,7 +534,7 @@ void TestAbstractMetaClass::testAbstractClassDefaultConstructors() const auto ctors = classA->queryFunctions(FunctionQueryOption::Constructors); QCOMPARE(ctors.size(), 1); QCOMPARE(ctors.constFirst()->arguments().size(), 0); - QCOMPARE(ctors.constFirst()->minimalSignature(), QLatin1String("A()")); + QCOMPARE(ctors.constFirst()->minimalSignature(), u"A()"); } void TestAbstractMetaClass::testObjectTypesMustNotHaveCopyConstructors() @@ -555,7 +555,7 @@ void TestAbstractMetaClass::testObjectTypesMustNotHaveCopyConstructors() const auto ctors = classA->queryFunctions(FunctionQueryOption::Constructors); QCOMPARE(ctors.size(), 1); QCOMPARE(ctors.constFirst()->arguments().size(), 0); - QCOMPARE(ctors.constFirst()->minimalSignature(), QLatin1String("A()")); + QCOMPARE(ctors.constFirst()->minimalSignature(), u"A()"); } void TestAbstractMetaClass::testIsPolymorphic() diff --git a/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp index a6123ef7e..20dc8d7f0 100644 --- a/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp @@ -78,8 +78,8 @@ void TestAbstractMetaType::testConstCharPtrType() AbstractMetaType rtype = func->type(); // Test properties of const char* QVERIFY(!rtype.isVoid()); - QCOMPARE(rtype.package(), QLatin1String("Foo")); - QCOMPARE(rtype.name(), QLatin1String("char")); + QCOMPARE(rtype.package(), u"Foo"); + QCOMPARE(rtype.name(), u"char"); QVERIFY(rtype.isConstant()); QVERIFY(!rtype.isArray()); QVERIFY(!rtype.isContainer()); @@ -142,7 +142,7 @@ void TestAbstractMetaType::testCharType() AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 1); - QCOMPARE(classes.constFirst()->package(), QLatin1String("Foo")); + QCOMPARE(classes.constFirst()->package(), u"Foo"); const auto functions = builder->globalFunctions(); QCOMPARE(functions.size(), 1); @@ -150,8 +150,8 @@ void TestAbstractMetaType::testCharType() AbstractMetaType rtype = func->type(); // Test properties of const char* QVERIFY(!rtype.isVoid()); - QCOMPARE(rtype.package(), QLatin1String("Foo")); - QCOMPARE(rtype.name(), QLatin1String("char")); + QCOMPARE(rtype.package(), u"Foo"); + QCOMPARE(rtype.name(), u"char"); QVERIFY(!rtype.isConstant()); QVERIFY(!rtype.isArray()); QVERIFY(!rtype.isContainer()); @@ -211,7 +211,7 @@ void TestAbstractMetaType::testTypedefWithTemplates() QCOMPARE(args.size(), 1); const AbstractMetaArgument &arg = args.constFirst(); AbstractMetaType metaType = arg.type(); - QCOMPARE(metaType.cppSignature(), QLatin1String("A<B >")); + QCOMPARE(metaType.cppSignature(), u"A<B >"); } @@ -239,7 +239,7 @@ void TestAbstractMetaType::testObjectTypeUsedAsValue() QCOMPARE(args.size(), 1); const AbstractMetaArgument &arg = args.constFirst(); AbstractMetaType metaType = arg.type(); - QCOMPARE(metaType.cppSignature(), QLatin1String("A")); + QCOMPARE(metaType.cppSignature(), u"A"); QVERIFY(metaType.isValue()); QVERIFY(metaType.typeEntry()->isObject()); } diff --git a/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp index 56706e596..c1a296233 100644 --- a/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp @@ -43,7 +43,7 @@ void TestAddFunction::testParsingFuncNameAndConstness() auto f1 = AddedFunction::createAddedFunction(QLatin1String(sig1), QLatin1String("void"), &errorMessage); QVERIFY2(!f1.isNull(), qPrintable(errorMessage)); - QCOMPARE(f1->name(), QLatin1String("func")); + QCOMPARE(f1->name(), u"func"); QCOMPARE(f1->arguments().size(), 3); TypeInfo retval = f1->returnType(); QCOMPARE(retval.qualifiedName(), QStringList{QLatin1String("void")}); @@ -57,24 +57,24 @@ void TestAddFunction::testParsingFuncNameAndConstness() QLatin1String("const Abc<int& , C<char*> * > * *"), &errorMessage); QVERIFY2(!f2.isNull(), qPrintable(errorMessage)); - QCOMPARE(f2->name(), QLatin1String("_fu__nc_")); + QCOMPARE(f2->name(), u"_fu__nc_"); const auto &args = f2->arguments(); QCOMPARE(args.size(), 4); retval = f2->returnType(); QCOMPARE(retval.qualifiedName(), QStringList{QLatin1String("Abc")}); QCOMPARE(retval.instantiations().size(), 2); - QCOMPARE(retval.toString(), QLatin1String("const Abc<int&, C<char*>*>**")); + QCOMPARE(retval.toString(), u"const Abc<int&, C<char*>*>**"); QCOMPARE(retval.indirections(), 2); QCOMPARE(retval.isConstant(), true); QCOMPARE(retval.referenceType(), NoReference); QVERIFY(args.at(0).name.isEmpty()); QVERIFY(args.at(1).name.isEmpty()); - QCOMPARE(args.at(2).name, QLatin1String("my_name")); + QCOMPARE(args.at(2).name, u"my_name"); auto arg2Type = args.at(2).typeInfo; QCOMPARE(arg2Type.qualifiedName(), QStringList{QLatin1String("Abc")}); QCOMPARE(arg2Type.instantiations().size(), 2); - QCOMPARE(arg2Type.toString(), QLatin1String("const Abc<int&, C<char*>*>**")); + QCOMPARE(arg2Type.toString(), u"const Abc<int&, C<char*>*>**"); QCOMPARE(arg2Type.indirections(), 2); QCOMPARE(arg2Type.isConstant(), true); QCOMPARE(arg2Type.referenceType(), NoReference); @@ -86,7 +86,7 @@ void TestAddFunction::testParsingFuncNameAndConstness() auto f3 = AddedFunction::createAddedFunction(QLatin1String(sig3), QLatin1String("void"), &errorMessage); QVERIFY2(!f3.isNull(), qPrintable(errorMessage)); - QCOMPARE(f3->name(), QLatin1String("func")); + QCOMPARE(f3->name(), u"func"); QCOMPARE(f3->arguments().size(), 0); // const call operator @@ -94,7 +94,7 @@ void TestAddFunction::testParsingFuncNameAndConstness() auto f4 = AddedFunction::createAddedFunction(QLatin1String(sig4), QLatin1String("int"), &errorMessage); QVERIFY2(!f4.isNull(), qPrintable(errorMessage)); - QCOMPARE(f4->name(), QLatin1String("operator()")); + QCOMPARE(f4->name(), u"operator()"); QCOMPARE(f4->arguments().size(), 1); QVERIFY(f4->isConstant()); } @@ -144,7 +144,7 @@ struct A { const AbstractMetaArgumentList &args = addedFunc->arguments(); QCOMPARE(args.size(), 3); QCOMPARE(args.at(0).type().typeEntry(), returnType.typeEntry()); - QCOMPARE(args.at(1).defaultValueExpression(), QLatin1String("4.6")); + QCOMPARE(args.at(1).defaultValueExpression(), u"4.6"); QCOMPARE(args.at(2).type().typeEntry(), typeDb->findType(QLatin1String("B"))); auto addedCallOperator = classA->findFunction(QLatin1String("operator()")); @@ -226,7 +226,7 @@ void TestAddFunction::testAddFunctionWithoutParenteses() auto f1 = AddedFunction::createAddedFunction(QLatin1String(sig1), QLatin1String("void"), &errorMessage); QVERIFY2(!f1.isNull(), qPrintable(errorMessage)); - QCOMPARE(f1->name(), QLatin1String("func")); + QCOMPARE(f1->name(), u"func"); QCOMPARE(f1->arguments().size(), 0); QCOMPARE(f1->isConstant(), false); @@ -260,7 +260,7 @@ void TestAddFunction::testAddFunctionWithDefaultArgs() auto f1 = AddedFunction::createAddedFunction(QLatin1String(sig1), QLatin1String("void"), &errorMessage); QVERIFY2(!f1.isNull(), qPrintable(errorMessage)); - QCOMPARE(f1->name(), QLatin1String("func")); + QCOMPARE(f1->name(), u"func"); QCOMPARE(f1->arguments().size(), 0); QCOMPARE(f1->isConstant(), false); @@ -285,7 +285,7 @@ void TestAddFunction::testAddFunctionWithDefaultArgs() const auto addedFunc = classA->findFunction(QLatin1String("func")); QVERIFY(!addedFunc.isNull()); const AbstractMetaArgument &arg = addedFunc->arguments().at(1); - QCOMPARE(arg.defaultValueExpression(), QLatin1String("2")); + QCOMPARE(arg.defaultValueExpression(), u"2"); } void TestAddFunction::testAddFunctionAtModuleLevel() @@ -317,7 +317,7 @@ void TestAddFunction::testAddFunctionAtModuleLevel() QCOMPARE(mods.size(), 1); QVERIFY(mods.constFirst().isCodeInjection()); CodeSnip snip = mods.constFirst().snips().constFirst(); - QCOMPARE(snip.code().trimmed(), QLatin1String("custom_code();")); + QCOMPARE(snip.code().trimmed(), u"custom_code();"); } void TestAddFunction::testAddFunctionWithVarargs() @@ -327,7 +327,7 @@ void TestAddFunction::testAddFunctionWithVarargs() auto f1 = AddedFunction::createAddedFunction(QLatin1String(sig1), QLatin1String("void"), &errorMessage); QVERIFY2(!f1.isNull(), qPrintable(errorMessage)); - QCOMPARE(f1->name(), QLatin1String("func")); + QCOMPARE(f1->name(), u"func"); QCOMPARE(f1->arguments().size(), 3); QVERIFY(!f1->isConstant()); @@ -447,9 +447,9 @@ void TestAddFunction::testModifyAddedFunction() QVERIFY(!method.isNull()); QCOMPARE(method->arguments().size(), 2); const AbstractMetaArgument &arg = method->arguments().at(1); - QCOMPARE(arg.defaultValueExpression(), QLatin1String("0")); - QCOMPARE(arg.name(), QLatin1String("varName")); - QCOMPARE(method->argumentName(2), QLatin1String("varName")); + QCOMPARE(arg.defaultValueExpression(), u"0"); + QCOMPARE(arg.name(), u"varName"); + QCOMPARE(method->argumentName(2), u"varName"); } void TestAddFunction::testAddFunctionOnTypedef() diff --git a/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp b/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp index 22cf7ab40..35098ca38 100644 --- a/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp @@ -58,7 +58,7 @@ void TestArrayArgument::testArrayArgumentWithSizeDefinedByInteger() const AbstractMetaArgument &arg = classA->functions().constLast()->arguments().constFirst(); QVERIFY(arg.type().isArray()); QCOMPARE(arg.type().arrayElementCount(), 3); - QCOMPARE(arg.type().arrayElementType()->name(), QLatin1String("double")); + QCOMPARE(arg.type().arrayElementType()->name(), u"double"); } static QString functionMinimalSignature(const AbstractMetaClass *c, const QString &name) @@ -92,21 +92,21 @@ void TestArrayArgument::testArraySignature() QVERIFY(!builder.isNull()); const AbstractMetaClass *classA = AbstractMetaClass::findClass(builder->classes(), QLatin1String("A")); QCOMPARE(functionMinimalSignature(classA, QLatin1String("mi1")), - QLatin1String("mi1(int[5])")); + u"mi1(int[5])"); QCOMPARE(functionMinimalSignature(classA, QLatin1String("mi1c")), - QLatin1String("mi1c(const int[5])")); + u"mi1c(const int[5])"); QCOMPARE(functionMinimalSignature(classA, QLatin1String("mi1cu")), - QLatin1String("mi1cu(const int[])")); + u"mi1cu(const int[])"); QCOMPARE(functionMinimalSignature(classA, QLatin1String("mc1cu")), - QLatin1String("mc1cu(const char*)")); + u"mc1cu(const char*)"); QCOMPARE(functionMinimalSignature(classA, QLatin1String("mc1cup")), - QLatin1String("mc1cup(const char*[])")); + u"mc1cup(const char*[])"); QCOMPARE(functionMinimalSignature(classA, QLatin1String("muc2")), - QLatin1String("muc2(unsigned char*[2][3])")); + u"muc2(unsigned char*[2][3])"); QCOMPARE(functionMinimalSignature(classA, QLatin1String("mc2c")), - QLatin1String("mc2c(const char*[5][6])")); + u"mc2c(const char*[5][6])"); QCOMPARE(functionMinimalSignature(classA, QLatin1String("mc2cu")), - QLatin1String("mc2cu(const char[][2])")); + u"mc2cu(const char[][2])"); } void TestArrayArgument::testArrayArgumentWithSizeDefinedByEnumValue() @@ -137,7 +137,7 @@ void TestArrayArgument::testArrayArgumentWithSizeDefinedByEnumValue() const AbstractMetaArgument &arg = classA->functions().constLast()->arguments().constFirst(); QVERIFY(arg.type().isArray()); QCOMPARE(arg.type().arrayElementCount(), nvalues->value().value()); - QCOMPARE(arg.type().arrayElementType()->name(), QLatin1String("double")); + QCOMPARE(arg.type().arrayElementType()->name(), u"double"); }; void TestArrayArgument::testArrayArgumentWithSizeDefinedByEnumValueFromGlobalEnum() @@ -167,7 +167,7 @@ void TestArrayArgument::testArrayArgumentWithSizeDefinedByEnumValueFromGlobalEnu const AbstractMetaArgument &arg = classA->functions().constLast()->arguments().constFirst(); QVERIFY(arg.type().isArray()); QCOMPARE(arg.type().arrayElementCount(), nvalues->value().value()); - QCOMPARE(arg.type().arrayElementType()->name(), QLatin1String("double")); + QCOMPARE(arg.type().arrayElementType()->name(), u"double"); }; QTEST_APPLESS_MAIN(TestArrayArgument) diff --git a/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp b/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp index 8d10f17cc..be0d7ab26 100644 --- a/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp @@ -150,14 +150,14 @@ void TestConversionOperator::testConversionOperatorReturningReference() QCOMPARE(classB->functions().size(), 3); QCOMPARE(classA->externalConversionOperators().size(), 1); QCOMPARE(classA->externalConversionOperators().constFirst()->type().cppSignature(), - QLatin1String("A")); + u"A"); QCOMPARE(classA->externalConversionOperators().constFirst()->ownerClass()->name(), - QLatin1String("B")); + u"B"); QCOMPARE(classA->implicitConversions().size(), 1); QCOMPARE(classA->implicitConversions().constFirst()->type().cppSignature(), - QLatin1String("A")); + u"A"); QCOMPARE(classA->implicitConversions().constFirst()->ownerClass()->name(), - QLatin1String("B")); + u"B"); } void TestConversionOperator::testConversionOperatorReturningConstReference() diff --git a/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp index 040ece5d8..94df03163 100644 --- a/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp @@ -111,7 +111,7 @@ void TestConversionRuleTag::testConversionRuleTagReplace() QCOMPARE(typeA, conversion->ownerType()); QCOMPARE(conversion->nativeToTargetConversion().simplified(), - QLatin1String("DoThis(); return ConvertFromCppToPython(%IN);")); + u"DoThis(); return ConvertFromCppToPython(%IN);"); QVERIFY(conversion->replaceOriginalTargetToNativeConversions()); QVERIFY(conversion->hasTargetToNativeConversions()); @@ -119,30 +119,30 @@ void TestConversionRuleTag::testConversionRuleTagReplace() CustomConversion::TargetToNativeConversion* toNative = conversion->targetToNativeConversions().at(0); QVERIFY(toNative); - QCOMPARE(toNative->sourceTypeName(), QLatin1String("TargetNone")); + QCOMPARE(toNative->sourceTypeName(), u"TargetNone"); QVERIFY(toNative->isCustomType()); QCOMPARE(toNative->sourceType(), nullptr); - QCOMPARE(toNative->sourceTypeCheck(), QLatin1String("%IN == Target_None")); + QCOMPARE(toNative->sourceTypeCheck(), u"%IN == Target_None"); QCOMPARE(toNative->conversion().simplified(), - QLatin1String("DoThat(); DoSomething(); %OUT = A();")); + u"DoThat(); DoSomething(); %OUT = A();"); toNative = conversion->targetToNativeConversions().at(1); QVERIFY(toNative); - QCOMPARE(toNative->sourceTypeName(), QLatin1String("B")); + QCOMPARE(toNative->sourceTypeName(), u"B"); QVERIFY(!toNative->isCustomType()); TypeEntry* typeB = typeDb->findType(QLatin1String("B")); QVERIFY(typeB); QCOMPARE(toNative->sourceType(), typeB); - QCOMPARE(toNative->sourceTypeCheck(), QLatin1String("CheckIfInputObjectIsB(%IN)")); - QCOMPARE(toNative->conversion().trimmed(), QLatin1String("%OUT = %IN.createA();")); + QCOMPARE(toNative->sourceTypeCheck(), u"CheckIfInputObjectIsB(%IN)"); + QCOMPARE(toNative->conversion().trimmed(), u"%OUT = %IN.createA();"); toNative = conversion->targetToNativeConversions().at(2); QVERIFY(toNative); - QCOMPARE(toNative->sourceTypeName(), QLatin1String("String")); + QCOMPARE(toNative->sourceTypeName(), u"String"); QVERIFY(toNative->isCustomType()); QCOMPARE(toNative->sourceType(), nullptr); - QCOMPARE(toNative->sourceTypeCheck(), QLatin1String("String_Check(%IN)")); - QCOMPARE(toNative->conversion().trimmed(), QLatin1String("%OUT = new A(String_AsString(%IN), String_GetSize(%IN));")); + QCOMPARE(toNative->sourceTypeCheck(), u"String_Check(%IN)"); + QCOMPARE(toNative->conversion().trimmed(), u"%OUT = new A(String_AsString(%IN), String_GetSize(%IN));"); } void TestConversionRuleTag::testConversionRuleTagAdd() @@ -184,12 +184,13 @@ if (!TargetDateTimeAPI) TargetDateTime_IMPORT;\n\ CustomConversion::TargetToNativeConversion *toNative = conversion->targetToNativeConversions().constFirst(); QVERIFY(toNative); - QCOMPARE(toNative->sourceTypeName(), QLatin1String("TargetDate")); + QCOMPARE(toNative->sourceTypeName(), u"TargetDate"); QVERIFY(toNative->isCustomType()); QCOMPARE(toNative->sourceType(), nullptr); - QCOMPARE(toNative->sourceTypeCheck(), QLatin1String("TargetDate_Check(%IN)")); + QCOMPARE(toNative->sourceTypeCheck(), u"TargetDate_Check(%IN)"); QCOMPARE(toNative->conversion().trimmed(), - QLatin1String("if (!TargetDateTimeAPI) TargetDateTime_IMPORT;\n%OUT = new Date(TargetDate_Day(%IN), TargetDate_Month(%IN), TargetDate_Year(%IN));")); + uR"(if (!TargetDateTimeAPI) TargetDateTime_IMPORT; +%OUT = new Date(TargetDate_Day(%IN), TargetDate_Month(%IN), TargetDate_Year(%IN));)"); } void TestConversionRuleTag::testConversionRuleTagWithInsertTemplate() diff --git a/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp b/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp index 8f66c9ef6..01b85bf47 100644 --- a/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.cpp @@ -89,7 +89,7 @@ void TestDropTypeEntries::testDropEntries() AbstractMetaEnumList globalEnums = builder->globalEnums(); QCOMPARE(globalEnums.size(), 1); - QCOMPARE(globalEnums.constFirst().name(), QLatin1String("EnumA")); + QCOMPARE(globalEnums.constFirst().name(), u"EnumA"); TypeDatabase* td = TypeDatabase::instance(); QVERIFY(td->findType(QLatin1String("funcA"))); diff --git a/sources/shiboken6/ApiExtractor/tests/testenum.cpp b/sources/shiboken6/ApiExtractor/tests/testenum.cpp index 216233e73..bb06e7ffa 100644 --- a/sources/shiboken6/ApiExtractor/tests/testenum.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testenum.cpp @@ -62,14 +62,14 @@ void TestEnum::testEnumCppSignature() AbstractMetaEnumList globalEnums = builder->globalEnums(); QCOMPARE(globalEnums.size(), 1); - QCOMPARE(globalEnums.constFirst().name(), QLatin1String("GlobalEnum")); + QCOMPARE(globalEnums.constFirst().name(), u"GlobalEnum"); // enum as parameter of a function const auto functions = builder->globalFunctions(); QCOMPARE(functions.size(), 1); QCOMPARE(functions.constFirst()->arguments().size(), 1); QCOMPARE(functions.constFirst()->arguments().constFirst().type().cppSignature(), - QLatin1String("A::ClassEnum")); + u"A::ClassEnum"); // enum as parameter of a method const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); @@ -78,16 +78,16 @@ void TestEnum::testEnumCppSignature() QVERIFY(!funcs.isEmpty()); const auto method = funcs.constFirst(); AbstractMetaArgument arg = method->arguments().constFirst(); - QCOMPARE(arg.type().name(), QLatin1String("ClassEnum")); - QCOMPARE(arg.type().cppSignature(), QLatin1String("A::ClassEnum")); + QCOMPARE(arg.type().name(), u"ClassEnum"); + QCOMPARE(arg.type().cppSignature(), u"A::ClassEnum"); QCOMPARE(functions.constFirst()->arguments().size(), 1); arg = functions.constFirst()->arguments().constFirst(); - QCOMPARE(arg.type().name(), QLatin1String("ClassEnum")); - QCOMPARE(arg.type().cppSignature(), QLatin1String("A::ClassEnum")); + QCOMPARE(arg.type().name(), u"ClassEnum"); + QCOMPARE(arg.type().cppSignature(), u"A::ClassEnum"); AbstractMetaEnumList classEnums = classA->enums(); QVERIFY(!classEnums.isEmpty()); - QCOMPARE(classEnums.constFirst().name(), QLatin1String("ClassEnum")); + QCOMPARE(classEnums.constFirst().name(), u"ClassEnum"); auto e = AbstractMetaClass::findEnumValue(classes, QLatin1String("CA")); QVERIFY(e.has_value()); e = AbstractMetaClass::findEnumValue(classes, QLatin1String("ClassEnum::CA")); @@ -142,7 +142,7 @@ void TestEnum::testAnonymousEnum() AbstractMetaEnumList globalEnums = builder->globalEnums(); QCOMPARE(globalEnums.size(), 1); QCOMPARE(globalEnums.constFirst().typeEntry()->qualifiedCppName(), - QLatin1String("Global0")); + u"Global0"); QVERIFY(globalEnums.constFirst().isAnonymous()); AbstractMetaClassList classes = builder->classes(); @@ -152,32 +152,32 @@ void TestEnum::testAnonymousEnum() auto anonEnumA1 = classes[0]->findEnum(QLatin1String("A1")); QVERIFY(anonEnumA1.has_value()); QVERIFY(anonEnumA1->isAnonymous()); - QCOMPARE(anonEnumA1->typeEntry()->qualifiedCppName(), QLatin1String("A::A1")); + QCOMPARE(anonEnumA1->typeEntry()->qualifiedCppName(), u"A::A1"); AbstractMetaEnumValue enumValueA0 = anonEnumA1->values().constFirst(); - QCOMPARE(enumValueA0.name(), QLatin1String("A0")); + QCOMPARE(enumValueA0.name(), u"A0"); QCOMPARE(enumValueA0.value().value(), 0); QCOMPARE(enumValueA0.stringValue(), QString()); AbstractMetaEnumValue enumValueA1 = anonEnumA1->values().constLast(); - QCOMPARE(enumValueA1.name(), QLatin1String("A1")); + QCOMPARE(enumValueA1.name(), u"A1"); QCOMPARE(enumValueA1.value().value(), 1); QCOMPARE(enumValueA1.stringValue(), QString()); auto anonEnumIsThis = classes[0]->findEnum(QLatin1String("isThis")); QVERIFY(anonEnumIsThis.has_value()); QVERIFY(anonEnumIsThis->isAnonymous()); - QCOMPARE(anonEnumIsThis->typeEntry()->qualifiedCppName(), QLatin1String("A::isThis")); + QCOMPARE(anonEnumIsThis->typeEntry()->qualifiedCppName(), u"A::isThis"); AbstractMetaEnumValue enumValueIsThis = anonEnumIsThis->values().constFirst(); - QCOMPARE(enumValueIsThis.name(), QLatin1String("isThis")); + QCOMPARE(enumValueIsThis.name(), u"isThis"); QCOMPARE(enumValueIsThis.value().value(), static_cast<int>(true)); - QCOMPARE(enumValueIsThis.stringValue(), QLatin1String("true")); + QCOMPARE(enumValueIsThis.stringValue(), u"true"); AbstractMetaEnumValue enumValueIsThat = anonEnumIsThis->values().constLast(); - QCOMPARE(enumValueIsThat.name(), QLatin1String("isThat")); + QCOMPARE(enumValueIsThat.name(), u"isThat"); QCOMPARE(enumValueIsThat.value().value(), static_cast<int>(false)); - QCOMPARE(enumValueIsThat.stringValue(), QLatin1String("false")); + QCOMPARE(enumValueIsThat.stringValue(), u"false"); } void TestEnum::testGlobalEnums() @@ -198,30 +198,30 @@ void TestEnum::testGlobalEnums() QCOMPARE(globalEnums.size(), 2); AbstractMetaEnum enumA = globalEnums.constFirst(); - QCOMPARE(enumA.typeEntry()->qualifiedCppName(), QLatin1String("EnumA")); + QCOMPARE(enumA.typeEntry()->qualifiedCppName(), u"EnumA"); AbstractMetaEnumValue enumValueA0 = enumA.values().constFirst(); - QCOMPARE(enumValueA0.name(), QLatin1String("A0")); + QCOMPARE(enumValueA0.name(), u"A0"); QCOMPARE(enumValueA0.value().value(), 0); QCOMPARE(enumValueA0.stringValue(), QString()); AbstractMetaEnumValue enumValueA1 = enumA.values().constLast(); - QCOMPARE(enumValueA1.name(), QLatin1String("A1")); + QCOMPARE(enumValueA1.name(), u"A1"); QCOMPARE(enumValueA1.value().value(), 1); QCOMPARE(enumValueA1.stringValue(), QString()); AbstractMetaEnum enumB = globalEnums.constLast(); - QCOMPARE(enumB.typeEntry()->qualifiedCppName(), QLatin1String("EnumB")); + QCOMPARE(enumB.typeEntry()->qualifiedCppName(), u"EnumB"); AbstractMetaEnumValue enumValueB0 = enumB.values().constFirst(); - QCOMPARE(enumValueB0.name(), QLatin1String("B0")); + QCOMPARE(enumValueB0.name(), u"B0"); QCOMPARE(enumValueB0.value().value(), 2); - QCOMPARE(enumValueB0.stringValue(), QLatin1String("2")); + QCOMPARE(enumValueB0.stringValue(), u"2"); AbstractMetaEnumValue enumValueB1 = enumB.values().constLast(); - QCOMPARE(enumValueB1.name(), QLatin1String("B1")); + QCOMPARE(enumValueB1.name(), u"B1"); QCOMPARE(enumValueB1.value().value(), 4); - QCOMPARE(enumValueB1.stringValue(), QLatin1String("0x4")); + QCOMPARE(enumValueB1.stringValue(), u"0x4"); } void TestEnum::testEnumValueFromNeighbourEnum() @@ -248,31 +248,31 @@ void TestEnum::testEnumValueFromNeighbourEnum() auto enumA = classes[0]->findEnum(QLatin1String("EnumA")); QVERIFY(enumA.has_value()); - QCOMPARE(enumA->typeEntry()->qualifiedCppName(), QLatin1String("A::EnumA")); + QCOMPARE(enumA->typeEntry()->qualifiedCppName(), u"A::EnumA"); AbstractMetaEnumValue enumValueA0 = enumA->values().constFirst(); - QCOMPARE(enumValueA0.name(), QLatin1String("ValueA0")); + QCOMPARE(enumValueA0.name(), u"ValueA0"); QCOMPARE(enumValueA0.value().value(), 0); QCOMPARE(enumValueA0.stringValue(), QString()); AbstractMetaEnumValue enumValueA1 = enumA->values().constLast(); - QCOMPARE(enumValueA1.name(), QLatin1String("ValueA1")); + QCOMPARE(enumValueA1.name(), u"ValueA1"); QCOMPARE(enumValueA1.value().value(), 1); QCOMPARE(enumValueA1.stringValue(), QString()); auto enumB = classes[0]->findEnum(QLatin1String("EnumB")); QVERIFY(enumB.has_value()); - QCOMPARE(enumB->typeEntry()->qualifiedCppName(), QLatin1String("A::EnumB")); + QCOMPARE(enumB->typeEntry()->qualifiedCppName(), u"A::EnumB"); AbstractMetaEnumValue enumValueB0 = enumB->values().constFirst(); - QCOMPARE(enumValueB0.name(), QLatin1String("ValueB0")); + QCOMPARE(enumValueB0.name(), u"ValueB0"); QCOMPARE(enumValueB0.value().value(), 1); - QCOMPARE(enumValueB0.stringValue(), QLatin1String("A::ValueA1")); + QCOMPARE(enumValueB0.stringValue(), u"A::ValueA1"); AbstractMetaEnumValue enumValueB1 = enumB->values().constLast(); - QCOMPARE(enumValueB1.name(), QLatin1String("ValueB1")); + QCOMPARE(enumValueB1.name(), u"ValueB1"); QCOMPARE(enumValueB1.value().value(), 0); - QCOMPARE(enumValueB1.stringValue(), QLatin1String("ValueA0")); + QCOMPARE(enumValueB1.stringValue(), u"ValueA0"); } void TestEnum::testEnumValueFromExpression() @@ -310,56 +310,56 @@ void TestEnum::testEnumValueFromExpression() auto enumA = classA->findEnum(QLatin1String("EnumA")); QVERIFY(enumA.has_value()); QVERIFY(!enumA->isSigned()); - QCOMPARE(enumA->typeEntry()->qualifiedCppName(), QLatin1String("A::EnumA")); + QCOMPARE(enumA->typeEntry()->qualifiedCppName(), u"A::EnumA"); AbstractMetaEnumValue valueA0 = enumA->values().at(0); - QCOMPARE(valueA0.name(), QLatin1String("ValueA0")); - QCOMPARE(valueA0.stringValue(), QLatin1String("3u")); + QCOMPARE(valueA0.name(), u"ValueA0"); + QCOMPARE(valueA0.stringValue(), u"3u"); QCOMPARE(valueA0.value().unsignedValue(), 3u); AbstractMetaEnumValue valueA1 = enumA->values().at(1); - QCOMPARE(valueA1.name(), QLatin1String("ValueA1")); - QCOMPARE(valueA1.stringValue(), QLatin1String("~3u")); + QCOMPARE(valueA1.name(), u"ValueA1"); + QCOMPARE(valueA1.stringValue(), u"~3u"); QCOMPARE(valueA1.value().unsignedValue(), ~3u); AbstractMetaEnumValue valueA2 = enumA->values().at(2); - QCOMPARE(valueA2.name(), QLatin1String("ValueA2")); - QCOMPARE(valueA2.stringValue(), QLatin1String("0xffffffff")); + QCOMPARE(valueA2.name(), u"ValueA2"); + QCOMPARE(valueA2.stringValue(), u"0xffffffff"); QCOMPARE(valueA2.value().unsignedValue(), 0xffffffffu); AbstractMetaEnumValue valueA3 = enumA->values().at(3); - QCOMPARE(valueA3.name(), QLatin1String("ValueA3")); - QCOMPARE(valueA3.stringValue(), QLatin1String("0xf0")); + QCOMPARE(valueA3.name(), u"ValueA3"); + QCOMPARE(valueA3.stringValue(), u"0xf0"); QCOMPARE(valueA3.value().unsignedValue(), 0xf0u); AbstractMetaEnumValue valueA4 = enumA->values().at(4); - QCOMPARE(valueA4.name(), QLatin1String("ValueA4")); - QCOMPARE(valueA4.stringValue(), QLatin1String("8 |ValueA3")); + QCOMPARE(valueA4.name(), u"ValueA4"); + QCOMPARE(valueA4.stringValue(), u"8 |ValueA3"); QCOMPARE(valueA4.value().unsignedValue(), 8|0xf0u); AbstractMetaEnumValue valueA5 = enumA->values().at(5); - QCOMPARE(valueA5.name(), QLatin1String("ValueA5")); - QCOMPARE(valueA5.stringValue(), QLatin1String("ValueA3|32")); + QCOMPARE(valueA5.name(), u"ValueA5"); + QCOMPARE(valueA5.stringValue(), u"ValueA3|32"); QCOMPARE(valueA5.value().unsignedValue(), 0xf0u|32); AbstractMetaEnumValue valueA6 = enumA->values().at(6); - QCOMPARE(valueA6.name(), QLatin1String("ValueA6")); - QCOMPARE(valueA6.stringValue(), QLatin1String("ValueA3 >> 1")); + QCOMPARE(valueA6.name(), u"ValueA6"); + QCOMPARE(valueA6.stringValue(), u"ValueA3 >> 1"); QCOMPARE(valueA6.value().unsignedValue(), 0xf0u >> 1); AbstractMetaEnumValue valueA7 = enumA->values().at(7); - QCOMPARE(valueA7.name(), QLatin1String("ValueA7")); - QCOMPARE(valueA7.stringValue(), QLatin1String("ValueA3 << 1")); + QCOMPARE(valueA7.name(), u"ValueA7"); + QCOMPARE(valueA7.stringValue(), u"ValueA3 << 1"); QCOMPARE(valueA7.value().unsignedValue(), 0xf0u << 1); const auto enumB = classA->findEnum(QLatin1String("EnumB")); QVERIFY(enumB.has_value()); QVERIFY(enumB->isSigned()); - QCOMPARE(enumB->typeEntry()->qualifiedCppName(), QLatin1String("A::EnumB")); + QCOMPARE(enumB->typeEntry()->qualifiedCppName(), u"A::EnumB"); QCOMPARE(enumB->values().size(), 1); const AbstractMetaEnumValue valueB0 = enumB->values().at(0); - QCOMPARE(valueB0.name(), QLatin1String("ValueB0")); - QCOMPARE(valueB0.stringValue(), QLatin1String("~3")); + QCOMPARE(valueB0.name(), u"ValueB0"); + QCOMPARE(valueB0.stringValue(), u"~3"); QCOMPARE(valueB0.value().value(), ~3); } @@ -389,21 +389,21 @@ void TestEnum::testPrivateEnum() auto privateEnum = classA->findEnum(QLatin1String("PrivateEnum")); QVERIFY(privateEnum.has_value()); QVERIFY(privateEnum->isPrivate()); - QCOMPARE(privateEnum->typeEntry()->qualifiedCppName(), QLatin1String("A::PrivateEnum")); + QCOMPARE(privateEnum->typeEntry()->qualifiedCppName(), u"A::PrivateEnum"); auto publicEnum = classA->findEnum(QLatin1String("PublicEnum")); QVERIFY(publicEnum.has_value()); - QCOMPARE(publicEnum->typeEntry()->qualifiedCppName(), QLatin1String("A::PublicEnum")); + QCOMPARE(publicEnum->typeEntry()->qualifiedCppName(), u"A::PublicEnum"); AbstractMetaEnumValue pub0 = publicEnum->values().constFirst(); - QCOMPARE(pub0.name(), QLatin1String("Pub0")); + QCOMPARE(pub0.name(), u"Pub0"); QCOMPARE(pub0.value().value(), 0x0f); - QCOMPARE(pub0.stringValue(), QLatin1String("Priv0")); + QCOMPARE(pub0.stringValue(), u"Priv0"); AbstractMetaEnumValue pub1 = publicEnum->values().constLast(); - QCOMPARE(pub1.name(), QLatin1String("Pub1")); + QCOMPARE(pub1.name(), u"Pub1"); QCOMPARE(pub1.value().value(), 0xf0); - QCOMPARE(pub1.stringValue(), QLatin1String("A::Priv1")); + QCOMPARE(pub1.stringValue(), u"A::Priv1"); } void TestEnum::testTypedefEnum() @@ -425,15 +425,15 @@ void TestEnum::testTypedefEnum() QCOMPARE(globalEnums.size(), 1); AbstractMetaEnum enumA = globalEnums.constFirst(); - QCOMPARE(enumA.typeEntry()->qualifiedCppName(), QLatin1String("EnumA")); + QCOMPARE(enumA.typeEntry()->qualifiedCppName(), u"EnumA"); AbstractMetaEnumValue enumValueA0 = enumA.values().constFirst(); - QCOMPARE(enumValueA0.name(), QLatin1String("A0")); + QCOMPARE(enumValueA0.name(), u"A0"); QCOMPARE(enumValueA0.value().value(), 0); - QCOMPARE(enumValueA0.stringValue(), QLatin1String("")); + QCOMPARE(enumValueA0.stringValue(), u""); AbstractMetaEnumValue enumValueA1 = enumA.values().constLast(); - QCOMPARE(enumValueA1.name(), QLatin1String("A1")); + QCOMPARE(enumValueA1.name(), u"A1"); QCOMPARE(enumValueA1.value().value(), 1); QCOMPARE(enumValueA1.stringValue(), QString()); } diff --git a/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp b/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp index 9f0afe2d9..718e5a2cd 100644 --- a/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp @@ -52,7 +52,7 @@ void TestExtraInclude::testClassExtraInclude() QList<Include> includes = classA->typeEntry()->extraIncludes(); QCOMPARE(includes.size(), 1); - QCOMPARE(includes.constFirst().name(), QLatin1String("header.h")); + QCOMPARE(includes.constFirst().name(), u"header.h"); } void TestExtraInclude::testGlobalExtraIncludes() @@ -75,12 +75,12 @@ void TestExtraInclude::testGlobalExtraIncludes() TypeDatabase* td = TypeDatabase::instance(); const TypeSystemTypeEntry *module = td->defaultTypeSystemType(); QVERIFY(module); - QCOMPARE(module->name(), QLatin1String("Foo")); + QCOMPARE(module->name(), u"Foo"); QList<Include> includes = module->extraIncludes(); QCOMPARE(includes.size(), 2); - QCOMPARE(includes.constFirst().name(), QLatin1String("header1.h")); - QCOMPARE(includes.constLast().name(), QLatin1String("header2.h")); + QCOMPARE(includes.constFirst().name(), u"header1.h"); + QCOMPARE(includes.constLast().name(), u"header2.h"); } QTEST_APPLESS_MAIN(TestExtraInclude) diff --git a/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp b/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp index f58ea6f64..f6f2bbd1b 100644 --- a/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testfunctiontag.cpp @@ -88,11 +88,11 @@ void TestFunctionTag::testRenameGlobalFunction() QCOMPARE(metaFunc->modifications().size(), 1); QVERIFY(metaFunc->modifications().constFirst().isRenameModifier()); QCOMPARE(metaFunc->modifications().constFirst().renamedToName(), - QLatin1String("smooth")); + u"smooth"); - QCOMPARE(metaFunc->name(), QLatin1String("smooth")); - QCOMPARE(metaFunc->originalName(), QLatin1String("global_function_with_ugly_name")); - QCOMPARE(metaFunc->minimalSignature(), QLatin1String("global_function_with_ugly_name()")); + QCOMPARE(metaFunc->name(), u"smooth"); + QCOMPARE(metaFunc->originalName(), u"global_function_with_ugly_name"); + QCOMPARE(metaFunc->minimalSignature(), u"global_function_with_ugly_name()"); } QTEST_APPLESS_MAIN(TestFunctionTag) diff --git a/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp index 5c58b122f..2c213a703 100644 --- a/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp @@ -55,7 +55,7 @@ void TestInsertTemplate::testInsertTemplateOnClassInjectCode() QVERIFY(classA); QCOMPARE(classA->typeEntry()->codeSnips().size(), 1); QString code = classA->typeEntry()->codeSnips().constFirst().code(); - QVERIFY(code.contains(QLatin1String("code template content"))); + QVERIFY(code.contains(u"code template content")); } void TestInsertTemplate::testInsertTemplateOnModuleInjectCode() @@ -77,11 +77,11 @@ void TestInsertTemplate::testInsertTemplateOnModuleInjectCode() const TypeSystemTypeEntry *module = TypeDatabase::instance()->defaultTypeSystemType(); QVERIFY(module); - QCOMPARE(module->name(), QLatin1String("Foo")); + QCOMPARE(module->name(), u"Foo"); QVERIFY(module); QCOMPARE(module->codeSnips().size(), 1); QString code = module->codeSnips().constFirst().code().trimmed(); - QVERIFY(code.contains(QLatin1String("code template content"))); + QVERIFY(code.contains(u"code template content")); } QTEST_APPLESS_MAIN(TestInsertTemplate) diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp index a2708cabd..9e71816a4 100644 --- a/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp @@ -58,9 +58,9 @@ R"(<typesystem package="Foo"> QVERIFY(classA); DocModificationList docMods = classA->typeEntry()->docModifications(); QCOMPARE(docMods.size(), 2); - QCOMPARE(docMods[0].code().trimmed(), QLatin1String("<brief>Modified Brief</brief>")); + QCOMPARE(docMods[0].code().trimmed(), u"<brief>Modified Brief</brief>"); QCOMPARE(docMods[0].signature(), QString()); - QCOMPARE(docMods[1].code().trimmed(), QLatin1String("<para>Some changed contents here</para>")); + QCOMPARE(docMods[1].code().trimmed(), u"<para>Some changed contents here</para>"); QCOMPARE(docMods[1].signature(), QString()); // Create a temporary directory for the documentation file since libxml2 @@ -89,7 +89,7 @@ R"(<?xml version="1.0"?> )"; const QString expectedDocSimplified = QString::fromLatin1(expectedDoc).simplified(); // Check whether the first modification worked. - QVERIFY(actualBriefSimplified.contains(QLatin1String("Modified Brief"))); + QVERIFY(actualBriefSimplified.contains(u"Modified Brief")); #ifndef HAVE_LIBXSLT // QtXmlPatterns is unable to handle para[3] in style sheets, diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp index a96150453..be34a6ae6 100644 --- a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp @@ -70,7 +70,7 @@ void TestModifyFunction::testRenameArgument() const auto func = classA->findFunction(QLatin1String("method")); QVERIFY(!func.isNull()); - QCOMPARE(func->argumentName(1), QLatin1String("otherArg")); + QCOMPARE(func->argumentName(1), u"otherArg"); } void TestModifyFunction::testOwnershipTransfer() @@ -312,15 +312,15 @@ void TestModifyFunction::testGlobalFunctionModification() const QList<ArgumentModification> &argMods = mods.constFirst().argument_mods(); QCOMPARE(argMods.size(), 1); ArgumentModification argMod = argMods.constFirst(); - QCOMPARE(argMod.replacedDefaultExpression(), QLatin1String("A()")); + QCOMPARE(argMod.replacedDefaultExpression(), u"A()"); QVERIFY(!builder->globalFunctions().isEmpty()); const auto func = builder->globalFunctions().constFirst(); QCOMPARE(func->arguments().size(), 1); const AbstractMetaArgument &arg = func->arguments().constFirst(); - QCOMPARE(arg.type().cppSignature(), QLatin1String("A *")); - QCOMPARE(arg.originalDefaultValueExpression(), QLatin1String("0")); - QCOMPARE(arg.defaultValueExpression(), QLatin1String("A()")); + QCOMPARE(arg.type().cppSignature(), u"A *"); + QCOMPARE(arg.originalDefaultValueExpression(), u"0"); + QCOMPARE(arg.defaultValueExpression(), u"A()"); } // Tests modifications of exception handling and allow-thread diff --git a/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp b/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp index 1b99ac43d..229c6d44a 100644 --- a/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp @@ -63,7 +63,7 @@ void TestMultipleInheritance::testVirtualClass() const AbstractMetaClass *classD = AbstractMetaClass::findClass(classes, QLatin1String("D")); bool functionFound = false; for (const auto &f : classD->functions()) { - if (f->name() == QLatin1String("theBug")) { + if (f->name() == u"theBug") { functionFound = true; break; } diff --git a/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp index 2f3198589..343aeb950 100644 --- a/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp @@ -71,19 +71,19 @@ void TestNestedTypes::testNestedTypesModifications() QCOMPARE(ins->functions().size(), 1); QCOMPARE(ins->typeEntry()->codeSnips().size(), 1); CodeSnip snip = ins->typeEntry()->codeSnips().constFirst(); - QCOMPARE(snip.code().trimmed(), QLatin1String("custom_code1();")); + QCOMPARE(snip.code().trimmed(), u"custom_code1();"); const auto addedFunc = ins->functions().constFirst(); QVERIFY(addedFunc->isUserAdded()); QCOMPARE(addedFunc->access(), Access::Public); QCOMPARE(addedFunc->functionType(), AbstractMetaFunction::NormalFunction); QCOMPARE(addedFunc->type().minimalSignature(), - QLatin1String("OuterNamespace::InnerNamespace::SomeClass")); + u"OuterNamespace::InnerNamespace::SomeClass"); QCOMPARE(addedFunc->modifications().size(), 1); QVERIFY(addedFunc->modifications().constFirst().isCodeInjection()); snip = addedFunc->modifications().constFirst().snips().constFirst(); - QCOMPARE(snip.code().trimmed(), QLatin1String("custom_code2();")); + QCOMPARE(snip.code().trimmed(), u"custom_code2();"); const AbstractMetaClass *sc = AbstractMetaClass::findClass(classes, QLatin1String("OuterNamespace::InnerNamespace::SomeClass")); QVERIFY(ins); @@ -119,8 +119,8 @@ void TestNestedTypes::testDuplicationOfNestedTypes() const AbstractMetaClass *cls2 = AbstractMetaClass::findClass(classes, QLatin1String("Namespace::SomeClass")); QVERIFY(cls2); QCOMPARE(cls1, cls2); - QCOMPARE(cls1->name(), QLatin1String("SomeClass")); - QCOMPARE(cls1->qualifiedCppName(), QLatin1String("Namespace::SomeClass")); + QCOMPARE(cls1->name(), u"SomeClass"); + QCOMPARE(cls1->qualifiedCppName(), u"Namespace::SomeClass"); TypeEntry* t1 = TypeDatabase::instance()->findType(QLatin1String("Namespace::SomeClass")); QVERIFY(t1); diff --git a/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp index de2f30135..eff482b15 100644 --- a/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp @@ -54,19 +54,19 @@ void TestNumericalTypedef::testNumericalTypedef() auto funcReal = builder->globalFunctions().constLast(); QVERIFY(funcReal); - if (funcDouble->name() == QLatin1String("funcReal")) + if (funcDouble->name() == u"funcReal") std::swap(funcDouble, funcReal); - QCOMPARE(funcDouble->minimalSignature(), QLatin1String("funcDouble(double)")); - QCOMPARE(funcReal->minimalSignature(), QLatin1String("funcReal(real)")); + QCOMPARE(funcDouble->minimalSignature(), u"funcDouble(double)"); + QCOMPARE(funcReal->minimalSignature(), u"funcReal(real)"); const AbstractMetaType doubleType = funcDouble->arguments().constFirst().type(); - QCOMPARE(doubleType.cppSignature(), QLatin1String("double")); + QCOMPARE(doubleType.cppSignature(), u"double"); QVERIFY(doubleType.isPrimitive()); QVERIFY(doubleType.typeEntry()->isCppPrimitive()); const AbstractMetaType realType = funcReal->arguments().constFirst().type(); - QCOMPARE(realType.cppSignature(), QLatin1String("real")); + QCOMPARE(realType.cppSignature(), u"real"); QVERIFY(realType.isPrimitive()); QVERIFY(realType.typeEntry()->isCppPrimitive()); } @@ -92,19 +92,19 @@ void TestNumericalTypedef::testUnsignedNumericalTypedef() auto funcUnsignedShort = builder->globalFunctions().constFirst(); auto funcUShort = builder->globalFunctions().constLast(); - if (funcUnsignedShort->name() == QLatin1String("funcUShort")) + if (funcUnsignedShort->name() == u"funcUShort") std::swap(funcUnsignedShort, funcUShort); - QCOMPARE(funcUnsignedShort->minimalSignature(), QLatin1String("funcUnsignedShort(unsigned short)")); - QCOMPARE(funcUShort->minimalSignature(), QLatin1String("funcUShort(custom_ushort)")); + QCOMPARE(funcUnsignedShort->minimalSignature(), u"funcUnsignedShort(unsigned short)"); + QCOMPARE(funcUShort->minimalSignature(), u"funcUShort(custom_ushort)"); const AbstractMetaType unsignedShortType = funcUnsignedShort->arguments().constFirst().type(); - QCOMPARE(unsignedShortType.cppSignature(), QLatin1String("unsigned short")); + QCOMPARE(unsignedShortType.cppSignature(), u"unsigned short"); QVERIFY(unsignedShortType.isPrimitive()); QVERIFY(unsignedShortType.typeEntry()->isCppPrimitive()); const AbstractMetaType ushortType = funcUShort->arguments().constFirst().type(); - QCOMPARE(ushortType.cppSignature(), QLatin1String("custom_ushort")); + QCOMPARE(ushortType.cppSignature(), u"custom_ushort"); QVERIFY(ushortType.isPrimitive()); QVERIFY(ushortType.typeEntry()->isCppPrimitive()); } diff --git a/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp b/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp index e68553ee9..3d7a0c352 100644 --- a/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp @@ -53,7 +53,7 @@ void TestPrimitiveTypeTag::testPrimitiveTypeDefaultConstructor() PrimitiveTypeEntry* typeEntry = TypeDatabase::instance()->findPrimitiveType(QLatin1String("A")); QVERIFY(typeEntry); QVERIFY(typeEntry->hasDefaultConstructor()); - QCOMPARE(typeEntry->defaultConstructor(), QLatin1String("A()")); + QCOMPARE(typeEntry->defaultConstructor(), u"A()"); } QTEST_APPLESS_MAIN(TestPrimitiveTypeTag) diff --git a/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp index b929ebd66..45cffa8b5 100644 --- a/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp @@ -52,7 +52,7 @@ void TestReferenceToPointer::testReferenceToPointerArgument() QVERIFY(classB); const auto func = classB->findFunction(QLatin1String("dummy")); QVERIFY(!func.isNull()); - QCOMPARE(func->arguments().constFirst().type().minimalSignature(), QLatin1String("A*&")); + QCOMPARE(func->arguments().constFirst().type().minimalSignature(), u"A*&"); } QTEST_APPLESS_MAIN(TestReferenceToPointer) diff --git a/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp b/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp index 5fb2ff687..369c81935 100644 --- a/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp @@ -54,7 +54,7 @@ void TestRemoveField::testRemoveField() QVERIFY(classA); QCOMPARE(classA->fields().size(), 1); const AbstractMetaField &fieldA = classA->fields().constFirst(); - QCOMPARE(fieldA.name(), QLatin1String("fieldA")); + QCOMPARE(fieldA.name(), u"fieldA"); } QTEST_APPLESS_MAIN(TestRemoveField) diff --git a/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp index cb7105d1d..9e0968b1d 100644 --- a/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp @@ -55,7 +55,7 @@ void TestReverseOperators::testReverseSum() AbstractMetaFunctionCPtr reverseOp; AbstractMetaFunctionCPtr normalOp; for (const auto &func : classA->functions()) { - if (func->name() == QLatin1String("operator+")) { + if (func->name() == u"operator+") { if (func->isReverseOperator()) reverseOp = func; else @@ -101,7 +101,7 @@ void TestReverseOperators::testReverseSumWithAmbiguity() AbstractMetaFunctionCPtr reverseOp; AbstractMetaFunctionCPtr normalOp; for (const auto &func : classB->functions()) { - if (func->name() == QLatin1String("operator+")) { + if (func->name() == u"operator+") { if (func->isReverseOperator()) reverseOp = func; else @@ -111,11 +111,11 @@ void TestReverseOperators::testReverseSumWithAmbiguity() QVERIFY(!normalOp.isNull()); QVERIFY(!normalOp->isReverseOperator()); QCOMPARE(normalOp->arguments().size(), 1); - QCOMPARE(normalOp->minimalSignature(), QLatin1String("operator+(B,A)")); + QCOMPARE(normalOp->minimalSignature(), u"operator+(B,A)"); QVERIFY(!reverseOp.isNull()); QVERIFY(reverseOp->isReverseOperator()); QCOMPARE(reverseOp->arguments().size(), 1); - QCOMPARE(reverseOp->minimalSignature(), QLatin1String("operator+(A,B)")); + QCOMPARE(reverseOp->minimalSignature(), u"operator+(A,B)"); } diff --git a/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp index e920d4b89..3135cf491 100644 --- a/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp @@ -82,7 +82,7 @@ namespace Internet { QVERIFY(!func.isNull()); AbstractMetaType funcType = func->type(); QVERIFY(!funcType.isVoid()); - QCOMPARE(funcType.cppSignature(), QLatin1String("QList<Internet::Url >")); + QCOMPARE(funcType.cppSignature(), u"QList<Internet::Url >"); } void TestTemplates::testTemplateOnContainers() @@ -122,15 +122,15 @@ namespace Namespace { QVERIFY(!func.isNull()); AbstractMetaType argType = func->arguments().constFirst().type(); QCOMPARE(argType.instantiations().size(), 1); - QCOMPARE(argType.typeEntry()->qualifiedCppName(), QLatin1String("QList")); + QCOMPARE(argType.typeEntry()->qualifiedCppName(), u"QList"); const AbstractMetaType &instance1 = argType.instantiations().constFirst(); QCOMPARE(instance1.instantiations().size(), 1); - QCOMPARE(instance1.typeEntry()->qualifiedCppName(), QLatin1String("Namespace::A")); + QCOMPARE(instance1.typeEntry()->qualifiedCppName(), u"Namespace::A"); const AbstractMetaType &instance2 = instance1.instantiations().constFirst(); QCOMPARE(instance2.instantiations().size(), 0); - QCOMPARE(instance2.typeEntry()->qualifiedCppName(), QLatin1String("Namespace::E1")); + QCOMPARE(instance2.typeEntry()->qualifiedCppName(), u"Namespace::E1"); } void TestTemplates::testTemplateValueAsArgument() @@ -153,9 +153,9 @@ void func(List<int> arg) {} QCOMPARE(globalFuncs.size(), 1); const auto func = globalFuncs.constFirst(); - QCOMPARE(func->minimalSignature(), QLatin1String("func(List<int>)")); + QCOMPARE(func->minimalSignature(), u"func(List<int>)"); QCOMPARE(func->arguments().constFirst().type().cppSignature(), - QLatin1String("List<int >")); + u"List<int >"); } void TestTemplates::testTemplatePointerAsArgument() @@ -178,9 +178,9 @@ void func(List<int>* arg) {} QCOMPARE(globalFuncs.size(), 1); const auto func = globalFuncs.constFirst(); - QCOMPARE(func->minimalSignature(), QLatin1String("func(List<int>*)")); + QCOMPARE(func->minimalSignature(), u"func(List<int>*)"); QCOMPARE(func->arguments().constFirst().type().cppSignature(), - QLatin1String("List<int > *")); + u"List<int > *"); } void TestTemplates::testTemplateReferenceAsArgument() @@ -203,9 +203,9 @@ void func(List<int>& arg) {} QCOMPARE(globalFuncs.size(), 1); const auto func = globalFuncs.constFirst(); - QCOMPARE(func->minimalSignature(), QLatin1String("func(List<int>&)")); + QCOMPARE(func->minimalSignature(), u"func(List<int>&)"); QCOMPARE(func->arguments().constFirst().type().cppSignature(), - QLatin1String("List<int > &")); + u"List<int > &"); } void TestTemplates::testTemplateParameterFixup() @@ -236,13 +236,13 @@ struct List { const auto append = list->findFunction(QStringLiteral("append")); QVERIFY(!append.isNull()); QCOMPARE(append->arguments().size(), 1); - QCOMPARE(append->arguments().at(0).type().cppSignature(), QLatin1String("List<T >")); + QCOMPARE(append->arguments().at(0).type().cppSignature(), u"List<T >"); // Verify that the parameter of "void erase(Iterator)" is not modified const auto erase = list->findFunction(QStringLiteral("erase")); QVERIFY(!erase.isNull()); QCOMPARE(erase->arguments().size(), 1); QEXPECT_FAIL("", "Clang: Some other code changes the parameter type", Abort); - QCOMPARE(erase->arguments().at(0).type().cppSignature(), QLatin1String("List::Iterator")); + QCOMPARE(erase->arguments().at(0).type().cppSignature(), u"List::Iterator"); } void TestTemplates::testInheritanceFromContainterTemplate() @@ -403,7 +403,7 @@ typedef BaseTemplateClass<TypeOne> TypeOneClass; QVERIFY(!inst.isEnum()); QVERIFY(!inst.typeEntry()->isEnum()); QVERIFY(inst.typeEntry()->isEnumValue()); - QCOMPARE(inst.cppSignature(), QLatin1String("NSpace::TypeOne")); + QCOMPARE(inst.cppSignature(), u"NSpace::TypeOne"); } void TestTemplates::testContainerTypeIncompleteArgument() @@ -443,13 +443,13 @@ typedef Vector<int> IntVector; const auto method = vector->findFunction(QLatin1String("method")); QVERIFY(!method.isNull()); - QCOMPARE(method->signature(), QLatin1String("method(const Vector<int > & vector)")); + QCOMPARE(method->signature(), u"method(const Vector<int > & vector)"); const auto otherMethod = vector->findFunction(QLatin1String("otherMethod")); QVERIFY(!otherMethod.isNull()); - QCOMPARE(otherMethod->signature(), QLatin1String("otherMethod()")); + QCOMPARE(otherMethod->signature(), u"otherMethod()"); QVERIFY(!otherMethod->type().isVoid()); - QCOMPARE(otherMethod->type().cppSignature(), QLatin1String("Vector<int >")); + QCOMPARE(otherMethod->type().cppSignature(), u"Vector<int >"); } void TestTemplates::testNonTypeTemplates() @@ -477,8 +477,8 @@ Array<int, 2> foo(); auto functions = builder->globalFunctions(); QCOMPARE(functions.size(), 1); auto foo = functions.constFirst(); - QCOMPARE(foo->name(), QLatin1String("foo")); - QCOMPARE(foo->type().name(), QLatin1String("Array")); + QCOMPARE(foo->name(), u"foo"); + QCOMPARE(foo->type().name(), u"Array"); } // Perform checks on template inheritance; a typedef of a template class @@ -577,23 +577,23 @@ void TestTemplates::testTemplateTypeDefs() // Check whether the value() method now has an 'int' return const auto valueMethod = optionalInt->findFunction(QLatin1String("value")); QVERIFY(!valueMethod.isNull()); - QCOMPARE(valueMethod->type().cppSignature(), QLatin1String("int")); + QCOMPARE(valueMethod->type().cppSignature(), u"int"); // ditto for typesystem XML const auto xmlValueMethod = xmlOptionalInt->findFunction(QLatin1String("value")); QVERIFY(!xmlValueMethod.isNull()); - QCOMPARE(xmlValueMethod->type().cppSignature(), QLatin1String("int")); + QCOMPARE(xmlValueMethod->type().cppSignature(), u"int"); // Check whether the m_value field is of type 'int' const auto valueField = optionalInt->findField(u"m_value"); QVERIFY(valueField.has_value()); - QCOMPARE(valueField->type().cppSignature(), QLatin1String("int")); + QCOMPARE(valueField->type().cppSignature(), u"int"); // ditto for typesystem XML const auto xmlValueField = xmlOptionalInt->findField(u"m_value"); QVERIFY(xmlValueField.has_value()); - QCOMPARE(xmlValueField->type().cppSignature(), QLatin1String("int")); + QCOMPARE(xmlValueField->type().cppSignature(), u"int"); } void TestTemplates::testTemplateTypeAliases() @@ -636,13 +636,13 @@ public: auto fields = testClass->fields(); QCOMPARE(fields.size(), 1); auto fieldType = testClass->fields().at(0).type(); - QCOMPARE(fieldType.name(), QLatin1String("Container1")); + QCOMPARE(fieldType.name(), u"Container1"); QCOMPARE(fieldType.instantiations().size(), 1); auto derived = AbstractMetaClass::findClass(classes, QLatin1String("Derived")); QVERIFY(derived); auto base = derived->templateBaseClass(); - QCOMPARE(base->name(), QLatin1String("Container1")); + QCOMPARE(base->name(), u"Container1"); } QTEST_APPLESS_MAIN(TestTemplates) diff --git a/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp b/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp index 1850025d6..a41d64d88 100644 --- a/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp @@ -54,7 +54,7 @@ void TestValueTypeDefaultCtorTag::testValueTypeDefaultCtorTagArgument() const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); QVERIFY(classA); QVERIFY(classA->typeEntry()->hasDefaultConstructor()); - QCOMPARE(classA->typeEntry()->defaultConstructor(), QLatin1String("A(0, 0)")); + QCOMPARE(classA->typeEntry()->defaultConstructor(), u"A(0, 0)"); const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, QLatin1String("B")); QVERIFY(classB); diff --git a/sources/shiboken6/ApiExtractor/typedatabase.cpp b/sources/shiboken6/ApiExtractor/typedatabase.cpp index 434b8ba02..28beb0347 100644 --- a/sources/shiboken6/ApiExtractor/typedatabase.cpp +++ b/sources/shiboken6/ApiExtractor/typedatabase.cpp @@ -281,7 +281,7 @@ QString TypeDatabase::normalizedSignature(const QString &signature) // changes "unsigned int" to "uint" which is undone by the below code QString normalized = QLatin1String(QMetaObject::normalizedSignature(signature.toUtf8().constData())); - if (instance() && signature.contains(QLatin1String("unsigned"))) { + if (instance() && signature.contains(u"unsigned")) { const IntTypeNormalizationEntries &entries = intTypeNormalizationEntries(); for (const auto &entry : entries) normalized.replace(entry.regex, entry.replacement); diff --git a/sources/shiboken6/ApiExtractor/typesystem.cpp b/sources/shiboken6/ApiExtractor/typesystem.cpp index 9e2888ef2..58939cca5 100644 --- a/sources/shiboken6/ApiExtractor/typesystem.cpp +++ b/sources/shiboken6/ApiExtractor/typesystem.cpp @@ -165,7 +165,7 @@ void TypeEntry::setInclude(const Include &inc) // This is a workaround for preventing double inclusion of the QSharedPointer implementation // header, which does not use header guards. In the previous parser this was not a problem // because the Q_QDOC define was set, and the implementation header was never included. - if (inc.name().endsWith(QLatin1String("qsharedpointer_impl.h"))) { + if (inc.name().endsWith(u"qsharedpointer_impl.h")) { QString path = inc.name(); path.remove(QLatin1String("_impl")); m_d->m_include = Include(inc.type(), path); diff --git a/sources/shiboken6/ApiExtractor/typesystemparser.cpp b/sources/shiboken6/ApiExtractor/typesystemparser.cpp index d714b7b33..47d0932f4 100644 --- a/sources/shiboken6/ApiExtractor/typesystemparser.cpp +++ b/sources/shiboken6/ApiExtractor/typesystemparser.cpp @@ -145,7 +145,7 @@ static bool setRejectionRegularExpression(const QString &patternIn, QString pattern; if (patternIn.startsWith(u'^') && patternIn.endsWith(u'$')) pattern = patternIn; - else if (patternIn == QLatin1String("*")) + else if (patternIn == u"*") pattern = QStringLiteral("^.*$"); else pattern = u'^' + QRegularExpression::escape(patternIn) + u'$'; @@ -578,8 +578,8 @@ QString TypeSystemEntityResolver::readFile(const QString &entityName, QString *e } QString result = QString::fromUtf8(file.readAll()).trimmed(); // Remove license header comments on which QXmlStreamReader chokes - if (result.startsWith(QLatin1String("<!--"))) { - const int commentEnd = result.indexOf(QLatin1String("-->")); + if (result.startsWith(u"<!--")) { + const int commentEnd = result.indexOf(u"-->"); if (commentEnd != -1) { result.remove(0, commentEnd + 3); result = result.trimmed(); @@ -740,7 +740,7 @@ static bool addRejection(TypeDatabase *database, QXmlStreamAttributes *attribute } // Special case: When all fields except class are empty, completely exclude class - if (className == QLatin1String("*")) { + if (className == u"*") { *errorMessage = QLatin1String("bad reject entry, neither 'class', 'function-name'" " nor 'field' specified"); return false; @@ -1182,7 +1182,7 @@ static QString checkSignatureError(const QString& signature, const QString& tag) QString funcName = signature.left(signature.indexOf(u'(')).trimmed(); static const QRegularExpression whiteSpace(QStringLiteral("\\s")); Q_ASSERT(whiteSpace.isValid()); - if (!funcName.startsWith(QLatin1String("operator ")) && funcName.contains(whiteSpace)) { + if (!funcName.startsWith(u"operator ") && funcName.contains(whiteSpace)) { return QString::fromLatin1("Error in <%1> tag signature attribute '%2'.\n" "White spaces aren't allowed in function names, " "and return types should not be part of the signature.") @@ -1329,13 +1329,13 @@ SmartPointerTypeEntry * QString instantiations; for (int i = attributes->size() - 1; i >= 0; --i) { const auto name = attributes->at(i).qualifiedName(); - if (name == QLatin1String("type")) { + if (name == u"type") { smartPointerType = attributes->takeAt(i).value().toString(); - } else if (name == QLatin1String("getter")) { + } else if (name == u"getter") { getter = attributes->takeAt(i).value().toString(); - } else if (name == QLatin1String("ref-count-method")) { + } else if (name == u"ref-count-method") { refCountMethodName = attributes->takeAt(i).value().toString(); - } else if (name == QLatin1String("instantiations")) { + } else if (name == u"instantiations") { instantiations = attributes->takeAt(i).value().toString(); } else if (name == u"value-check-method") { valueCheckMethod = attributes->takeAt(i).value().toString(); @@ -1350,7 +1350,7 @@ SmartPointerTypeEntry * m_error = QLatin1String("No type specified for the smart pointer. Currently supported types: 'shared',"); return nullptr; } - if (smartPointerType != QLatin1String("shared")) { + if (smartPointerType != u"shared") { m_error = QLatin1String("Currently only the 'shared' type is supported."); return nullptr; } @@ -1401,7 +1401,7 @@ PrimitiveTypeEntry * const auto name = attributes->at(i).qualifiedName(); if (name == targetLangNameAttribute()) { type->setTargetLangName(attributes->takeAt(i).value().toString()); - } else if (name == QLatin1String("target-lang-api-name")) { + } else if (name == u"target-lang-api-name") { targetLangApiName = attributes->takeAt(i).value().toString(); } else if (name == preferredConversionAttribute()) { qCWarning(lcShiboken, "%s", @@ -1410,7 +1410,7 @@ PrimitiveTypeEntry * const bool v = convertBoolean(attributes->takeAt(i).value(), preferredTargetLangTypeAttribute(), true); type->setPreferredTargetLangType(v); - } else if (name == QLatin1String("default-constructor")) { + } else if (name == u"default-constructor") { type->setDefaultConstructor(attributes->takeAt(i).value().toString()); } } @@ -1496,10 +1496,10 @@ EnumTypeEntry * QString flagNames; for (int i = attributes->size() - 1; i >= 0; --i) { const auto name = attributes->at(i).qualifiedName(); - if (name == QLatin1String("upper-bound")) { + if (name == u"upper-bound") { qCWarning(lcShiboken, "%s", qPrintable(msgUnimplementedAttributeWarning(reader, name))); - } else if (name == QLatin1String("lower-bound")) { + } else if (name == u"lower-bound") { qCWarning(lcShiboken, "%s", qPrintable(msgUnimplementedAttributeWarning(reader, name))); } else if (name == forceIntegerAttribute()) { @@ -1535,7 +1535,7 @@ NamespaceTypeEntry * applyCommonAttributes(reader, result.get(), attributes); for (int i = attributes->size() - 1; i >= 0; --i) { const auto attributeName = attributes->at(i).qualifiedName(); - if (attributeName == QLatin1String("files")) { + if (attributeName == u"files") { const QString pattern = attributes->takeAt(i).value().toString(); QRegularExpression re(pattern); if (!re.isValid()) { @@ -1543,7 +1543,7 @@ NamespaceTypeEntry * return nullptr; } result->setFilePattern(re); - } else if (attributeName == QLatin1String("extends")) { + } else if (attributeName == u"extends") { const auto extendsPackageName = attributes->at(i).value(); auto allEntries = TypeDatabase::instance()->findNamespaceTypes(name); auto extendsIt = std::find_if(allEntries.cbegin(), allEntries.cend(), @@ -1710,9 +1710,9 @@ void TypeSystemParser::applyComplexTypeAttributes(const ConditionalStreamReader ctype->setGenericClass(v); } else if (name == targetLangNameAttribute()) { ctype->setTargetLangName(attributes->takeAt(i).value().toString()); - } else if (name == QLatin1String("polymorphic-base")) { + } else if (name == u"polymorphic-base") { ctype->setPolymorphicIdValue(attributes->takeAt(i).value().toString()); - } else if (name == QLatin1String("polymorphic-id-expression")) { + } else if (name == u"polymorphic-id-expression") { ctype->setPolymorphicIdValue(attributes->takeAt(i).value().toString()); } else if (name == copyableAttribute()) { const bool v = convertBoolean(attributes->takeAt(i).value(), copyableAttribute(), false); @@ -1735,10 +1735,10 @@ void TypeSystemParser::applyComplexTypeAttributes(const ConditionalStreamReader qCWarning(lcShiboken, "%s", qPrintable(msgInvalidAttributeValue(attribute))); } - } else if (name == QLatin1String("held-type")) { + } else if (name == u"held-type") { qCWarning(lcShiboken, "%s", qPrintable(msgUnimplementedAttributeWarning(reader, name))); - } else if (name == QLatin1String("hash-function")) { + } else if (name == u"hash-function") { ctype->setHashFunction(attributes->takeAt(i).value().toString()); } else if (name == forceAbstractAttribute()) { if (convertBoolean(attributes->takeAt(i).value(), forceAbstractAttribute(), false)) @@ -1752,7 +1752,7 @@ void TypeSystemParser::applyComplexTypeAttributes(const ConditionalStreamReader } else if (name == deleteInMainThreadAttribute()) { if (convertBoolean(attributes->takeAt(i).value(), deleteInMainThreadAttribute(), false)) ctype->setDeleteInMainThread(true); - } else if (name == QLatin1String("target-type")) { + } else if (name == u"target-type") { ctype->setTargetType(attributes->takeAt(i).value().toString()); } else if (name == snakeCaseAttribute()) { const auto attribute = attributes->takeAt(i); @@ -1862,7 +1862,7 @@ bool TypeSystemParser::parseInjectDocumentation(const ConditionalStreamReader &, TypeSystem::Language lang = TypeSystem::NativeCode; for (int i = attributes->size() - 1; i >= 0; --i) { const auto name = attributes->at(i).qualifiedName(); - if (name == QLatin1String("mode")) { + if (name == u"mode") { const auto attribute = attributes->takeAt(i); const auto modeOpt = docModificationFromAttribute(attribute.value()); if (!modeOpt.has_value()) { @@ -2067,7 +2067,7 @@ bool TypeSystemParser::parseCustomConversion(const ConditionalStreamReader &, return false; } lang = langOpt.value(); - } else if (name == QLatin1String("file")) { + } else if (name == u"file") { sourceFile = attributes->takeAt(i).value().toString(); } else if (name == snippetAttribute()) { snippetLabel = attributes->takeAt(i).value().toString(); @@ -2154,9 +2154,9 @@ bool TypeSystemParser::parseAddConversion(const ConditionalStreamReader &, for (int i = attributes->size() - 1; i >= 0; --i) { const auto name = attributes->at(i).qualifiedName(); - if (name == QLatin1String("type")) + if (name == u"type") sourceTypeName = attributes->takeAt(i).value().toString(); - else if (name == QLatin1String("check")) + else if (name == u"check") typeCheck = attributes->takeAt(i).value().toString(); } @@ -2179,11 +2179,11 @@ static bool parseIndex(const QString &index, int *result, QString *errorMessage) static bool parseArgumentIndex(const QString &index, int *result, QString *errorMessage) { - if (index == QLatin1String("return")) { + if (index == u"return") { *result = 0; return true; } - if (index == QLatin1String("this")) { + if (index == u"this") { *result = -1; return true; } @@ -2398,9 +2398,9 @@ bool TypeSystemParser::parseAddFunction(const ConditionalStreamReader &, int overloadNumber = TypeSystem::OverloadNumberUnset; for (int i = attributes->size() - 1; i >= 0; --i) { const auto name = attributes->at(i).qualifiedName(); - if (name == QLatin1String("signature")) { + if (name == u"signature") { originalSignature = attributes->takeAt(i).value().toString(); - } else if (name == QLatin1String("return-type")) { + } else if (name == u"return-type") { returnType = attributes->takeAt(i).value().toString(); } else if (name == staticAttribute()) { staticFunction = convertBoolean(attributes->takeAt(i).value(), @@ -2480,11 +2480,11 @@ bool TypeSystemParser::parseProperty(const ConditionalStreamReader &, StackEleme const auto name = attributes->at(i).qualifiedName(); if (name == nameAttribute()) { property.name = attributes->takeAt(i).value().toString(); - } else if (name == QLatin1String("get")) { + } else if (name == u"get") { property.read = attributes->takeAt(i).value().toString(); - } else if (name == QLatin1String("type")) { + } else if (name == u"type") { property.type = attributes->takeAt(i).value().toString(); - } else if (name == QLatin1String("set")) { + } else if (name == u"set") { property.write = attributes->takeAt(i).value().toString(); } else if (name == generateGetSetDefAttribute()) { property.generateGetSetDef = @@ -2525,7 +2525,7 @@ bool TypeSystemParser::parseModifyFunction(const ConditionalStreamReader &reader TypeSystem::SnakeCase snakeCase = TypeSystem::SnakeCase::Unspecified; for (int i = attributes->size() - 1; i >= 0; --i) { const auto name = attributes->at(i).qualifiedName(); - if (name == QLatin1String("signature")) { + if (name == u"signature") { originalSignature = attributes->takeAt(i).value().toString(); } else if (name == accessAttribute()) { access = attributes->takeAt(i).value().toString(); @@ -2683,7 +2683,7 @@ bool TypeSystemParser::parseReferenceCount(const ConditionalStreamReader &reader default: break; } - } else if (name == QLatin1String("variable-name")) { + } else if (name == u"variable-name") { rc.varName = attributes->takeAt(i).value().toString(); } } @@ -2727,7 +2727,7 @@ bool TypeSystemParser::readFileSnippet(QXmlStreamAttributes *attributes, CodeSni QString snippetLabel; for (int i = attributes->size() - 1; i >= 0; --i) { const auto name = attributes->at(i).qualifiedName(); - if (name == QLatin1String("file")) { + if (name == u"file") { fileName = attributes->takeAt(i).value().toString(); } else if (name == snippetAttribute()) { snippetLabel = attributes->takeAt(i).value().toString(); @@ -2902,7 +2902,7 @@ bool TypeSystemParser::parseReplace(const ConditionalStreamReader &, QString to; for (int i = attributes->size() - 1; i >= 0; --i) { const auto name = attributes->at(i).qualifiedName(); - if (name == QLatin1String("from")) + if (name == u"from") from = attributes->takeAt(i).value().toString(); else if (name == toAttribute()) to = attributes->takeAt(i).value().toString(); @@ -3022,7 +3022,7 @@ bool TypeSystemParser::startElement(const ConditionalStreamReader &reader, Stack } // Allow for primitive and/or std:: types only, else require proper nesting. if (element != StackElement::PrimitiveTypeEntry && name.contains(u':') - && !name.contains(QLatin1String("std::"))) { + && !name.contains(u"std::")) { m_error = msgIncorrectlyNestedName(name); return false; } diff --git a/sources/shiboken6/ApiExtractor/xmlutils_libxslt.cpp b/sources/shiboken6/ApiExtractor/xmlutils_libxslt.cpp index 92a897cac..ef4316951 100644 --- a/sources/shiboken6/ApiExtractor/xmlutils_libxslt.cpp +++ b/sources/shiboken6/ApiExtractor/xmlutils_libxslt.cpp @@ -187,7 +187,7 @@ QString libXslt_transform(const QString &xml, QString xsl, QString *errorMessage { ensureInitialized(); // Read XML data - if (!xsl.startsWith(QLatin1String("<?xml"))) { + if (!xsl.startsWith(u"<?xml")) { xsl.prepend(QLatin1String(xsltPrefix)); xsl.append(QLatin1String("</xsl:transform>")); } diff --git a/sources/shiboken6/generator/generator.cpp b/sources/shiboken6/generator/generator.cpp index 481fbe4be..dde7d8828 100644 --- a/sources/shiboken6/generator/generator.cpp +++ b/sources/shiboken6/generator/generator.cpp @@ -507,7 +507,7 @@ std::optional<DefaultValue> ctor.chop(1); return DefaultValue(DefaultValue::Pointer, ctor.trimmed()); } - if (ctor.startsWith(QLatin1String("const "))) + if (ctor.startsWith(u"const ")) ctor.remove(0, sizeof("const ") / sizeof(char) - 1); if (ctor.endsWith(u'&')) { ctor.chop(1); @@ -558,7 +558,7 @@ std::optional<DefaultValue> if (type->isCppPrimitive()) { const QString &name = type->qualifiedCppName(); - return name == QLatin1String("bool") + return name == u"bool" ? DefaultValue(DefaultValue::Boolean) : DefaultValue(DefaultValue::CppScalar, name); } diff --git a/sources/shiboken6/generator/main.cpp b/sources/shiboken6/generator/main.cpp index 0baec419a..1c9107d2d 100644 --- a/sources/shiboken6/generator/main.cpp +++ b/sources/shiboken6/generator/main.cpp @@ -221,7 +221,7 @@ static std::optional<CommandLineArguments> getProjectFileArguments() QString projectFileName; for (const QString &arg : qAsConst(arguments)) { - if (arg.startsWith(QLatin1String("--project-file"))) { + if (arg.startsWith(u"--project-file")) { int split = arg.indexOf(u'='); if (split > 0) projectFileName = arg.mid(split + 1).trimmed(); @@ -250,7 +250,7 @@ static std::optional<CommandLineArguments> getProjectFileArguments() static void getCommandLineArg(QString arg, int &argNum, CommandLineArguments &args) { - if (arg.startsWith(QLatin1String("--"))) { + if (arg.startsWith(u"--")) { arg.remove(0, 2); const int split = arg.indexOf(u'='); if (split < 0) { @@ -283,13 +283,13 @@ static void getCommandLineArg(QString arg, int &argNum, CommandLineArguments &ar args.addToOptionsPathList(includePathOption(), arg.mid(1)); else if (arg.startsWith(u'F')) args.addToOptionsPathList(frameworkIncludePathOption(), arg.mid(1)); - else if (arg.startsWith(QLatin1String("isystem"))) + else if (arg.startsWith(u"isystem")) args.addToOptionsPathList(systemIncludePathOption(), arg.mid(7)); else if (arg.startsWith(u'T')) args.addToOptionsPathList(typesystemPathOption(), arg.mid(1)); - else if (arg == QLatin1String("h")) + else if (arg == u"h") args.options.insert(helpOption(), QString()); - else if (arg.startsWith(QLatin1String("std="))) + else if (arg.startsWith(u"std=")) args.options.insert(languageLevelOption(), arg.mid(4)); else args.options.insert(arg, QString()); @@ -476,13 +476,13 @@ int shibokenMain(int argc, char *argv[]) } // Pre-defined generator sets. - if (generatorSet == QLatin1String("qtdoc")) { + if (generatorSet == u"qtdoc") { generators = docGenerators(); if (generators.isEmpty()) { errorPrint(QLatin1String("Doc strings extractions was not enabled in this shiboken build.")); return EXIT_FAILURE; } - } else if (generatorSet.isEmpty() || generatorSet == QLatin1String("shiboken")) { + } else if (generatorSet.isEmpty() || generatorSet == u"shiboken") { generators = shibokenGenerators(); } else { errorPrint(QLatin1String("Unknown generator set, try \"shiboken\" or \"qtdoc\".")); @@ -629,7 +629,7 @@ int shibokenMain(int argc, char *argv[]) const QString typeSystemFileName = args.positionalArguments.takeLast(); QString messagePrefix = QFileInfo(typeSystemFileName).baseName(); - if (messagePrefix.startsWith(QLatin1String("typesystem_"))) + if (messagePrefix.startsWith(u"typesystem_")) messagePrefix.remove(0, 11); ReportHandler::setPrefix(u'(' + messagePrefix + u')'); diff --git a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp index 119846750..98144b21f 100644 --- a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp +++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp @@ -448,19 +448,19 @@ QString QtDocGenerator::parseArgDocStyle(const AbstractMetaClass* /* cppClass */ if (thisIsoptional) { QString defValue = arg.defaultValueExpression(); - if (defValue == QLatin1String("QString()")) { + if (defValue == u"QString()") { defValue = QLatin1String("\"\""); - } else if (defValue == QLatin1String("QStringList()") - || defValue.startsWith(QLatin1String("QVector")) - || defValue.startsWith(QLatin1String("QList"))) { + } else if (defValue == u"QStringList()" + || defValue.startsWith(u"QVector") + || defValue.startsWith(u"QList")) { defValue = QLatin1String("list()"); - } else if (defValue == QLatin1String("QVariant()")) { + } else if (defValue == u"QVariant()") { defValue = none(); } else { defValue.replace(QLatin1String("::"), QLatin1String(".")); - if (defValue == QLatin1String("nullptr")) + if (defValue == u"nullptr") defValue = none(); - else if (defValue == QLatin1String("0") && arg.type().isObject()) + else if (defValue == u"0" && arg.type().isObject()) defValue = none(); } ret += u'=' + defValue; @@ -615,7 +615,7 @@ QString QtDocGenerator::translateToPythonType(const AbstractMetaType &type, return found.value(); QString strType; - if (type.isConstant() && name == QLatin1String("char") && type.indirections() == 1) { + if (type.isConstant() && name == u"char" && type.indirections() == 1) { strType = QLatin1String("str"); } else if (name.startsWith(unsignedShortT())) { strType = intT(); @@ -627,10 +627,10 @@ QString QtDocGenerator::translateToPythonType(const AbstractMetaType &type, strType.remove(u'>'); strType.remove(u'<'); strType.replace(QLatin1String("::"), QLatin1String(".")); - if (strType.contains(QLatin1String("QList")) || strType.contains(QLatin1String("QVector"))) { + if (strType.contains(u"QList") || strType.contains(u"QVector")) { strType.replace(QLatin1String("QList"), QLatin1String("list of ")); strType.replace(QLatin1String("QVector"), QLatin1String("list of ")); - } else if (strType.contains(QLatin1String("QHash")) || strType.contains(QLatin1String("QMap"))) { + } else if (strType.contains(u"QHash") || strType.contains(u"QMap")) { strType.remove(QLatin1String("QHash")); strType.remove(QLatin1String("QMap")); QStringList types = strType.split(u','); @@ -892,7 +892,7 @@ void QtDocGenerator::writeAdditionalDocumentation() const // Parse "[directory]" specification if (line.size() > 2 && line.startsWith(u'[') && line.endsWith(u']')) { const QString dir = line.mid(1, line.size() - 2); - if (dir.isEmpty() || dir == QLatin1String(".")) { + if (dir.isEmpty() || dir == u".") { targetDir = outDir.absolutePath(); } else { if (!outDir.exists(dir) && !outDir.mkdir(dir)) { @@ -992,15 +992,15 @@ bool QtDocGenerator::handleOption(const QString &key, const QString &value) { if (Generator::handleOption(key, value)) return true; - if (key == QLatin1String("library-source-dir")) { + if (key == u"library-source-dir") { m_parameters.libSourceDir = value; return true; } - if (key == QLatin1String("documentation-data-dir")) { + if (key == u"documentation-data-dir") { m_parameters.docDataDir = value; return true; } - if (key == QLatin1String("documentation-code-snippets-dir")) { + if (key == u"documentation-code-snippets-dir") { m_parameters.codeSnippetDirs = value.split(QLatin1Char(PATH_SEP)); return true; } @@ -1014,13 +1014,13 @@ bool QtDocGenerator::handleOption(const QString &key, const QString &value) return true; } - if (key == QLatin1String("documentation-extra-sections-dir")) { + if (key == u"documentation-extra-sections-dir") { m_extraSectionDir = value; return true; } - if (key == QLatin1String("doc-parser")) { + if (key == u"doc-parser") { qCDebug(lcShibokenDoc).noquote().nospace() << "doc-parser: " << value; - if (value == QLatin1String("doxygen")) + if (value == u"doxygen") m_docParser.reset(new DoxygenParser); return true; } diff --git a/sources/shiboken6/generator/qtdoc/qtxmltosphinx.cpp b/sources/shiboken6/generator/qtdoc/qtxmltosphinx.cpp index 9a30a2f82..71af92925 100644 --- a/sources/shiboken6/generator/qtdoc/qtxmltosphinx.cpp +++ b/sources/shiboken6/generator/qtdoc/qtxmltosphinx.cpp @@ -784,9 +784,9 @@ static inline QString fixLinkType(QStringView type) { // TODO: create a flag PROPERTY-AS-FUNCTION to ask if the properties // are recognized as such or not in the binding - if (type == QLatin1String("property")) + if (type == u"property") return functionLinkType(); - if (type == QLatin1String("typedef")) + if (type == u"typedef") return classLinkType(); return type.toString(); } @@ -795,7 +795,7 @@ static inline QString linkSourceAttribute(const QString &type) { if (type == functionLinkType() || type == classLinkType()) return QLatin1String("raw"); - return type == QLatin1String("enum") || type == QLatin1String("page") + return type == u"enum" || type == u"page" ? type : QLatin1String("href"); } @@ -818,7 +818,7 @@ void QtXmlToSphinx::handleSeeAlsoTag(QXmlStreamReader& reader) if (!textR.isEmpty()) { const QString text = textR.toString(); if (m_seeAlsoContext.isNull()) { - const QString type = text.endsWith(QLatin1String("()")) + const QString type = text.endsWith(u"()") ? functionLinkType() : classLinkType(); m_seeAlsoContext.reset(handleLinkStart(type, text)); } @@ -869,8 +869,8 @@ void QtXmlToSphinx::handleSnippetTag(QXmlStreamReader& reader) { QXmlStreamReader::TokenType token = reader.tokenType(); if (token == QXmlStreamReader::StartElement) { - const bool consecutiveSnippet = m_lastTagName == QLatin1String("snippet") - || m_lastTagName == QLatin1String("dots") || m_lastTagName == QLatin1String("codeline"); + const bool consecutiveSnippet = m_lastTagName == u"snippet" + || m_lastTagName == u"dots" || m_lastTagName == u"codeline"; if (consecutiveSnippet) { m_output.flush(); m_output.string()->chop(2); @@ -907,8 +907,8 @@ void QtXmlToSphinx::handleDotsTag(QXmlStreamReader& reader) { QXmlStreamReader::TokenType token = reader.tokenType(); if (token == QXmlStreamReader::StartElement) { - const bool consecutiveSnippet = m_lastTagName == QLatin1String("snippet") - || m_lastTagName == QLatin1String("dots") || m_lastTagName == QLatin1String("codeline"); + const bool consecutiveSnippet = m_lastTagName == u"snippet" + || m_lastTagName == u"dots" || m_lastTagName == u"codeline"; if (consecutiveSnippet) { m_output.flush(); m_output.string()->chop(2); @@ -1001,9 +1001,9 @@ enum ListType { BulletList, OrderedList, EnumeratedList }; static inline ListType webXmlListType(QStringView t) { - if (t == QLatin1String("enum")) + if (t == u"enum") return EnumeratedList; - if (t == QLatin1String("ordered")) + if (t == u"ordered") return OrderedList; return BulletList; } @@ -1102,9 +1102,9 @@ QtXmlToSphinxLink *QtXmlToSphinx::handleLinkStart(const QString &type, QString r } else if (type == classLinkType()) { result->type = QtXmlToSphinxLink::Class; result->linkRef = m_generator->expandClass(m_context, result->linkRef); - } else if (type == QLatin1String("enum")) { + } else if (type == u"enum") { result->type = QtXmlToSphinxLink::Attribute; - } else if (type == QLatin1String("page")) { + } else if (type == u"page") { // Module, external web page or reference if (result->linkRef == m_parameters.moduleName) result->type = QtXmlToSphinxLink::Module; @@ -1133,7 +1133,7 @@ static QString fixLinkText(const QtXmlToSphinxLink *linkContext, } // For the language reference documentation, strip the module name. // Clear the link text if that matches the function/class/enumeration name. - const int lastSep = linktext.lastIndexOf(QLatin1String("::")); + const int lastSep = linktext.lastIndexOf(u"::"); if (lastSep != -1) linktext.remove(0, lastSep + 2); else diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp index e0039be3b..b2f49fb8b 100644 --- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp +++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp @@ -346,9 +346,9 @@ static const char includeQDebug[] = static QString chopType(QString s) { - if (s.endsWith(QLatin1String("_Type"))) + if (s.endsWith(u"_Type")) s.chop(5); - else if (s.endsWith(QLatin1String("_TypeF()"))) + else if (s.endsWith(u"_TypeF()")) s.chop(8); return s; } @@ -356,7 +356,7 @@ static QString chopType(QString s) static bool isStdSetterName(QString setterName, QString propertyName) { return setterName.size() == propertyName.size() + 3 - && setterName.startsWith(QLatin1String("set")) + && setterName.startsWith(u"set") && setterName.endsWith(QStringView{propertyName}.right(propertyName.size() - 1)) && setterName.at(3) == propertyName.at(0).toUpper(); } @@ -608,7 +608,7 @@ void CppGenerator::generateClass(TextStream &s, const GeneratorContext &classCon writeSignatureInfo(signatureStream, overloadData); } // call operators - else if (rfunc->name() == QLatin1String("operator()")) { + else if (rfunc->name() == u"operator()") { writeMethodWrapper(s, overloadData, classContext); writeSignatureInfo(signatureStream, overloadData); } @@ -1132,7 +1132,7 @@ void CppGenerator::writeVirtualMethodNative(TextStream &s, // skip metaObject function, this will be written manually ahead if (usePySideExtensions() && func->ownerClass() && func->ownerClass()->isQObject() && ((func->name() == u"metaObject"_qs) - || (func->name() == QLatin1String("qt_metacall")))) + || (func->name() == u"qt_metacall"))) return; const TypeEntry *retType = func->type().typeEntry(); @@ -2214,7 +2214,7 @@ void CppGenerator::writeMethodWrapper(TextStream &s, const OverloadData &overloa revOpName.insert(2, u'r'); // For custom classes, operations like __radd__ and __rmul__ // will enter an infinite loop. - if (rfunc->isBinaryOperator() && revOpName.contains(QLatin1String("shift"))) { + if (rfunc->isBinaryOperator() && revOpName.contains(u"shift")) { s << "Shiboken::AutoDecRef attrName(Py_BuildValue(\"s\", \"" << revOpName << "\"));\n"; s << "if (!isReverse\n"; { @@ -3413,11 +3413,11 @@ void CppGenerator::writePythonToCppConversionFunctions(TextStream &s, QString typeCheck = toNative->sourceTypeCheck(); if (typeCheck.isEmpty()) { QString pyTypeName = toNative->sourceTypeName(); - if (pyTypeName == QLatin1String("Py_None") || pyTypeName == QLatin1String("PyNone")) + if (pyTypeName == u"Py_None" || pyTypeName == u"PyNone") typeCheck = QLatin1String("%in == Py_None"); - else if (pyTypeName == QLatin1String("SbkEnumType")) + else if (pyTypeName == u"SbkEnumType") typeCheck = QLatin1String("Shiboken::isShibokenEnum(%in)"); - else if (pyTypeName == QLatin1String("SbkObject")) + else if (pyTypeName == u"SbkObject") typeCheck = QLatin1String("Shiboken::Object::checkType(%in)"); } if (typeCheck.isEmpty()) { @@ -3790,7 +3790,7 @@ void CppGenerator::writeMethodCall(TextStream &s, const AbstractMetaFunctionCPtr std::swap(firstArg, secondArg); // Emulate operator+=/-= (__iadd__, __isub__) by using ++/-- - if (((op == QLatin1String("++")) || (op == QLatin1String("--"))) && !func->isReverseOperator()) { + if (((op == u"++") || (op == u"--")) && !func->isReverseOperator()) { s << "\nfor (int i = 0; i < " << secondArg << "; ++i, " << op << firstArg << ");\n"; mc << firstArg; @@ -4222,10 +4222,10 @@ void CppGenerator::writeEnumConverterInitialization(TextStream &s, const TypeEnt QString signature = enumType->qualifiedCppName(); // Replace "QFlags<Class::Option>" by "Class::Options" - if (flags && signature.startsWith(QLatin1String("QFlags<")) && signature.endsWith(u'>')) { + if (flags && signature.startsWith(u"QFlags<") && signature.endsWith(u'>')) { signature.chop(1); signature.remove(0, 7); - const int lastQualifierPos = signature.lastIndexOf(QLatin1String("::")); + const int lastQualifierPos = signature.lastIndexOf(u"::"); if (lastQualifierPos != -1) { signature.replace(lastQualifierPos + 2, signature.size() - lastQualifierPos - 2, flags->flagsName()); @@ -4237,7 +4237,7 @@ void CppGenerator::writeEnumConverterInitialization(TextStream &s, const TypeEnt while (true) { s << "Shiboken::Conversions::registerConverterName(converter, \"" << signature << "\");\n"; - const int qualifierPos = signature.indexOf(QLatin1String("::")); + const int qualifierPos = signature.indexOf(u"::"); if (qualifierPos != -1) signature.remove(0, qualifierPos + 2); else @@ -4472,7 +4472,7 @@ void CppGenerator::writeClassDefinition(TextStream &s, // privacy the same way. This worked before the heap types were used, // because inheritance is not really checked for static types. // Instead, we check this at runtime, see SbkObjectType_tp_new. - if (metaClass->fullName().startsWith(QLatin1String("PySide6.Qt"))) { + if (metaClass->fullName().startsWith(u"PySide6.Qt")) { // PYSIDE-595: No idea how to do non-inheritance correctly. // Since that is only relevant in shiboken, I used a shortcut for // PySide. @@ -4760,7 +4760,7 @@ void CppGenerator::writeTypeAsNumberDefinition(TextStream &s, const AbstractMeta for (auto it = nbFuncs().cbegin(), end = nbFuncs().cend(); it != end; ++it) { const QString &nbName = it.key(); - if (nbName == QLatin1String("__div__") || nbName == QLatin1String("__idiv__")) + if (nbName == u"__div__" || nbName == u"__idiv__") continue; // excludeFromPy3K const auto nbIt = nb.constFind(nbName); if (nbIt != nb.constEnd()) { @@ -5431,9 +5431,7 @@ void CppGenerator::writeEnumsInitialization(TextStream &s, AbstractMetaEnumList static QString mangleName(QString name) { - if ( name == QLatin1String("None") - || name == QLatin1String("False") - || name == QLatin1String("True")) + if (name == u"None" || name == u"False" || name == u"True") name += u'_'; return name; } @@ -6765,7 +6763,7 @@ bool CppGenerator::writeParentChildManagement(TextStream &s, const AbstractMetaF int childIndex = argIndex; if (ctorHeuristicEnabled && argIndex > 0 && argIndex <= numArgs) { const AbstractMetaArgument &arg = func->arguments().at(argIndex-1); - if (arg.name() == QLatin1String("parent") && arg.type().isObjectType()) { + if (arg.name() == u"parent" && arg.type().isObjectType()) { action = ArgumentOwner::Add; parentIndex = argIndex; childIndex = -1; diff --git a/sources/shiboken6/generator/shiboken/shibokengenerator.cpp b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp index af5396ebb..8137ec3df 100644 --- a/sources/shiboken6/generator/shiboken/shibokengenerator.cpp +++ b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp @@ -693,9 +693,9 @@ QString ShibokenGenerator::pythonOperatorFunctionName(const AbstractMetaFunction return unknownOperator(); } if (func->arguments().isEmpty()) { - if (op == QLatin1String("__sub__")) + if (op == u"__sub__") op = QLatin1String("__neg__"); - else if (op == QLatin1String("__add__")) + else if (op == u"__add__") op = QLatin1String("__pos__"); } else if (func->isStatic() && func->arguments().size() == 2) { // If a operator overload function has 2 arguments and @@ -768,8 +768,8 @@ bool ShibokenGenerator::isPyInt(const AbstractMetaType &type) bool ShibokenGenerator::isNullPtr(const QString &value) { - return value == QLatin1String("0") || value == QLatin1String("nullptr") - || value == QLatin1String("NULLPTR") || value == QLatin1String("{}"); + return value == u"0" || value == u"nullptr" + || value == u"NULLPTR" || value == u"{}"; } QString ShibokenGenerator::cpythonCheckFunction(AbstractMetaType metaType) @@ -969,7 +969,7 @@ QString ShibokenGenerator::cpythonToPythonConversionFunction(const AbstractMetaT QString result = QLatin1String("Shiboken::Conversions::") + conversion + QLatin1String("ToPython(") + cpythonTypeNameExt(type) + QLatin1String(", "); - if (conversion != QLatin1String("pointer")) + if (conversion != u"pointer") result += u'&'; return result; } @@ -990,7 +990,7 @@ QString ShibokenGenerator::cpythonToPythonConversionFunction(const TypeEntry *ty QString result = QLatin1String("Shiboken::Conversions::") + conversion + QLatin1String("ToPython(") + cpythonTypeNameExt(type) + QLatin1String(", "); - if (conversion != QLatin1String("pointer")) + if (conversion != u"pointer") result += u'&'; return result; } @@ -1022,11 +1022,11 @@ QString ShibokenGenerator::argumentString(const AbstractMetaFunctionCPtr &func, !argument.originalDefaultValueExpression().isEmpty()) { QString default_value = argument.originalDefaultValueExpression(); - if (default_value == QLatin1String("NULL")) + if (default_value == u"NULL") default_value = QLatin1String(NULL_PTR); //WORKAROUND: fix this please - if (default_value.startsWith(QLatin1String("new "))) + if (default_value.startsWith(u"new ")) default_value.remove(0, 4); arg += QLatin1String(" = ") + default_value; @@ -1480,7 +1480,7 @@ void ShibokenGenerator::writeCodeSnips(TextStream &s, const QString pattern = u"%CPPSELF.%FUNCTION_NAME("_qs + methodCallArgs + u')'; QString replacement = u"(Shiboken::Object::hasCppWrapper(reinterpret_cast<SbkObject *>("_qs + pySelf + u")) ? "_qs; - if (func->name() == QLatin1String("metaObject")) { + if (func->name() == u"metaObject") { QString wrapperClassName = wrapperName(func->ownerClass()); QString cppSelfVar = avoidProtectedHack() ? u"%CPPSELF"_qs @@ -1499,7 +1499,7 @@ void ShibokenGenerator::writeCodeSnips(TextStream &s, code.replace(QLatin1String("%CPPSELF."), replacement.arg(cppSelf)); code.replace(QLatin1String("%CPPSELF"), cppSelf); - if (code.indexOf(QLatin1String("%BEGIN_ALLOW_THREADS")) > -1) { + if (code.indexOf(u"%BEGIN_ALLOW_THREADS") > -1) { if (code.count(QLatin1String("%BEGIN_ALLOW_THREADS")) == code.count(QLatin1String("%END_ALLOW_THREADS"))) { code.replace(QLatin1String("%BEGIN_ALLOW_THREADS"), QLatin1String(BEGIN_ALLOW_THREADS)); code.replace(QLatin1String("%END_ALLOW_THREADS"), QLatin1String(END_ALLOW_THREADS)); @@ -1610,7 +1610,7 @@ static QString miniNormalizer(const QString &varType) QString normalized = varType.trimmed(); if (normalized.isEmpty()) return normalized; - if (normalized.startsWith(QLatin1String("::"))) + if (normalized.startsWith(u"::")) normalized.remove(0, 2); QString suffix; while (normalized.endsWith(u'*') || normalized.endsWith(u'&')) { @@ -1694,7 +1694,7 @@ void ShibokenGenerator::replaceConverterTypeSystemVariable(TypeSystemConverterVa QString varName = list.at(1).trimmed(); if (!varType.isEmpty()) { const QString conversionSignature = conversionType.cppSignature(); - if (varType != QLatin1String("auto") && varType != conversionSignature) + if (varType != u"auto" && varType != conversionSignature) throw Exception(msgConversionTypesDiffer(varType, conversionSignature)); c << getFullTypeName(conversionType) << ' ' << varName << minimalConstructorExpression(api(), conversionType) << ";\n"; @@ -1735,7 +1735,7 @@ void ShibokenGenerator::replaceConverterTypeSystemVariable(TypeSystemConverterVa << code << '\''; throw Exception(m); } - if (conversion.contains(QLatin1String("%in"))) { + if (conversion.contains(u"%in")) { conversion.prepend(u'('); conversion.replace(QLatin1String("%in"), arg); } else { @@ -2305,13 +2305,13 @@ void ShibokenGenerator::replaceTemplateVariables(QString &code, code.replace(QLatin1String("%RETURN_TYPE"), translateType(func->type(), cpp_class)); code.replace(QLatin1String("%FUNCTION_NAME"), func->originalName()); - if (code.contains(QLatin1String("%ARGUMENT_NAMES"))) { + if (code.contains(u"%ARGUMENT_NAMES")) { StringStream aux_stream; writeArgumentNames(aux_stream, func, Generator::SkipRemovedArguments); code.replace(QLatin1String("%ARGUMENT_NAMES"), aux_stream); } - if (code.contains(QLatin1String("%ARGUMENTS"))) { + if (code.contains(u"%ARGUMENTS")) { StringStream aux_stream; writeFunctionArguments(aux_stream, func, Options(SkipDefaultValues) | SkipRemovedArguments); code.replace(QLatin1String("%ARGUMENTS"), aux_stream); diff --git a/sources/shiboken6/tests/dumpcodemodel/main.cpp b/sources/shiboken6/tests/dumpcodemodel/main.cpp index bde52fc14..67e6e60e6 100644 --- a/sources/shiboken6/tests/dumpcodemodel/main.cpp +++ b/sources/shiboken6/tests/dumpcodemodel/main.cpp @@ -171,7 +171,7 @@ static void formatXmlNamespaceMembers(QXmlStreamWriter &writer, const NamespaceM for (const auto &func : nsp->functions()) { const QString signature = func->typeSystemSignature(); - if (!signature.contains(QLatin1String("operator"))) { // Skip free operators + if (!signature.contains(u"operator")) { // Skip free operators writer.writeStartElement(QStringLiteral("function")); writer.writeAttribute(QStringLiteral("signature"), signature); writer.writeEndElement(); |