diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index e3afa87f5f9d7a66b8873c52eb113a07a7f562f7..b5eeb9fa70cb55a28c12ad1cd3c0915a44198cab 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -631,10 +631,10 @@ void Check::endVisit(UiObjectInitializer *) m_propertyStack.pop(); m_typeStack.pop(); UiObjectDefinition *objectDenition = cast<UiObjectDefinition *>(parent()); - if (objectDenition && objectDenition->qualifiedTypeNameId->name == "Component") + if (objectDenition && objectDenition->qualifiedTypeNameId->name == QLatin1String("Component")) m_idStack.pop(); UiObjectBinding *objectBinding = cast<UiObjectBinding *>(parent()); - if (objectBinding && objectBinding->qualifiedTypeNameId->name == "Component") + if (objectBinding && objectBinding->qualifiedTypeNameId->name == QLatin1String("Component")) m_idStack.pop(); } diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp index 9f65c9afd3be88900ed5503dc99c87dd22617c57..813d5610456e43588a7bbee9ef0263ade2c21d12 100644 --- a/src/libs/qmljs/qmljscodeformatter.cpp +++ b/src/libs/qmljs/qmljscodeformatter.cpp @@ -927,17 +927,17 @@ CodeFormatter::TokenKind CodeFormatter::extendedTokenKind(const QmlJS::Token &to QStringRef text = m_currentLine.midRef(token.begin(), token.length); if (kind == Identifier) { - if (text == "as") + if (text == QLatin1String("as")) return As; - if (text == "import") + if (text == QLatin1String("import")) return Import; - if (text == "signal") + if (text == QLatin1String("signal")) return Signal; - if (text == "property") + if (text == QLatin1String("property")) return Property; - if (text == "on") + if (text == QLatin1String("on")) return On; - if (text == "list") + if (text == QLatin1String("list")) return List; } else if (kind == Keyword) { const char char1 = text.at(0).toLatin1(); @@ -998,11 +998,11 @@ CodeFormatter::TokenKind CodeFormatter::extendedTokenKind(const QmlJS::Token &to return Break; } } else if (kind == Delimiter) { - if (text == "?") + if (text == QLatin1String("?")) return Question; - else if (text == "++") + else if (text == QLatin1String("++")) return PlusPlus; - else if (text == "--") + else if (text == QLatin1String("--")) return MinusMinus; }