From 019904e533eb090ed14a6d8faf59f24eac6bb6c0 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Mon, 11 Jan 2010 10:24:24 +0100
Subject: [PATCH] Use QLatin1Strings when possible
Reviewed-by: thorbjorn
---
.../qt4projectmanager/qt-s60/abldparser.cpp | 18 +++++++++---------
.../qt4projectmanager/qt-s60/winscwparser.cpp | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
index b2e6000f458..bddaeafc4f3 100644
--- a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
@@ -54,7 +54,7 @@ void AbldParser::stdOutput(const QString &line)
QString lne = line.trimmed();
// possible ABLD.bat errors:
- if (lne.startsWith("Is Perl, version ")) {
+ if (lne.startsWith(QLatin1String("Is Perl, version "))) {
emit addTask(TaskWindow::Task(TaskWindow::Error,
lne /* description */,
QString() /* filename */,
@@ -62,7 +62,7 @@ void AbldParser::stdOutput(const QString &line)
TASK_CATEGORY_BUILDSYSTEM));
return;
}
- if (lne.startsWith("FATAL ERROR:")) {
+ if (lne.startsWith(QLatin1String("FATAL ERROR:"))) {
emit addTask(TaskWindow::Task(TaskWindow::Error,
lne /* description */,
QString() /* filename */,
@@ -114,9 +114,9 @@ void AbldParser::stdError(const QString &line)
QString lne = line.trimmed();
// possible abld.pl errors:
- if (lne.startsWith("ABLD ERROR:") ||
- lne.startsWith("This project does not support ") ||
- lne.startsWith("Platform ")) {
+ if (lne.startsWith(QLatin1String("ABLD ERROR:")) ||
+ lne.startsWith(QLatin1String("This project does not support ")) ||
+ lne.startsWith(QLatin1String("Platform "))) {
emit addTask(TaskWindow::Task(TaskWindow::Error,
lne /* description */,
QString() /* filename */,
@@ -125,7 +125,7 @@ void AbldParser::stdError(const QString &line)
return;
}
- if (lne.startsWith("Died at ")) {
+ if (lne.startsWith(QLatin1String("Died at "))) {
emit addTask(TaskWindow::Task(TaskWindow::Error,
lne /* description */,
QString() /* filename */,
@@ -135,7 +135,7 @@ void AbldParser::stdError(const QString &line)
return;
}
- if (lne.startsWith("MMPFILE \"")) {
+ if (lne.startsWith(QLatin1String("MMPFILE \""))) {
m_currentFile = lne.mid(9, lne.size() - 10);
m_waitingForStdErrContinuation = false;
return;
@@ -144,7 +144,7 @@ void AbldParser::stdError(const QString &line)
m_waitingForStdErrContinuation = false;
return;
}
- if (lne.startsWith("WARNING: ")) {
+ if (lne.startsWith(QLatin1String("WARNING: "))) {
QString description = lne.mid(9);
emit addTask(TaskWindow::Task(TaskWindow::Warning, description,
m_currentFile,
@@ -153,7 +153,7 @@ void AbldParser::stdError(const QString &line)
m_waitingForStdErrContinuation = true;
return;
}
- if (lne.startsWith("ERROR: ")) {
+ if (lne.startsWith(QLatin1String("ERROR: "))) {
QString description = lne.mid(7);
emit addTask(TaskWindow::Task(TaskWindow::Error, description,
m_currentFile,
diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp
index ba01ac7b934..34ed4c19474 100644
--- a/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp
@@ -56,7 +56,7 @@ void WinscwParser::stdOutput(const QString &line)
m_compilerProblem.cap(1) /* filename */,
m_compilerProblem.cap(2).toInt() /* linenumber */,
TASK_CATEGORY_COMPILE);
- if (task.description.startsWith("warning: ")) {
+ if (task.description.startsWith(QLatin1String("warning: "))) {
task.type = TaskWindow::Warning;
task.description = task.description.mid(9);
}
--
GitLab