From 2db4fb4bea8c3cc50ae44ccd76d68fde0fad7024 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@digia.com>
Date: Wed, 28 Nov 2012 15:07:58 +0100
Subject: [PATCH] Fix: build failure for qmljscheck an qmljscodeformatter
Change-Id: Iba9686506d971f92e525361e93d648dc940fe2d2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
src/libs/qmljs/qmljscheck.cpp | 4 ++--
src/libs/qmljs/qmljscodeformatter.cpp | 18 +++++++++---------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index e3afa87f5f9..b5eeb9fa70c 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 9f65c9afd3b..813d5610456 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;
}
--
GitLab