feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Version control: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: I85c007045efdb207f397b42fbce7a554ac9c9819
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-31 10:57:10 +01:00
committed by Tobias Hunger
parent cdae5f2102
commit e2ace515e2
28 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/git/commitdata.cpp
View File

@@ -116,7 +116,7 @@ static bool checkLine(const QString &stateInfo, const QString &file, QList<Commi
QTC_ASSERT(stateInfo.count() == 2, return false);
QTC_ASSERT(files, return false);
if (stateInfo == "??") {
if (stateInfo == QLatin1String("??")) {
files->append(qMakePair(CommitData::UntrackedFile, file));
return true;
}
@@ -157,12 +157,12 @@ bool CommitData::parseFilesFromStatus(const QString &output)
if (line.isEmpty())
continue;
if (line.startsWith("## ")) {
if (line.startsWith(QLatin1String("## "))) {
// Branch indication:
panelInfo.branch = line.mid(3);
continue;
}
QTC_ASSERT(line.at(2) == ' ', continue);
QTC_ASSERT(line.at(2) == QLatin1Char(' '), continue);
if (!checkLine(line.mid(0, 2), line.mid(3), &files))
return false;
}