diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-11 12:48:59 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-12 11:17:25 (GMT) |
| commit | 72eceedb1eee049ebb10ebf7f7b1b0037e1ebbf3 (patch) | |
| tree | 4965669c10975ab320bbc67acd45a86af5570fb5 /tests/auto | |
| parent | 83e3c4677a71d8f890f9506360b95b7f9ac9bd84 (diff) | |
| download | Qt-72eceedb1eee049ebb10ebf7f7b1b0037e1ebbf3.zip Qt-72eceedb1eee049ebb10ebf7f7b1b0037e1ebbf3.tar.gz Qt-72eceedb1eee049ebb10ebf7f7b1b0037e1ebbf3.tar.bz2 | |
remove superfluous \r filtering
we are opening the files/processes in text mode already
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/linguist/lupdate/tst_lupdate.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp index ff3ab68..38bc24e 100644 --- a/tests/auto/linguist/lupdate/tst_lupdate.cpp +++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp @@ -99,17 +99,13 @@ void tst_lupdate::doCompare(const QStringList &actual, const QString &expectedFn ei = 0; break; } else { - QString act = actual.at(i); - act.remove('\r'); - if (err ? !QRegExp(expected.at(i)).exactMatch(act) : - (act != expected.at(i))) { + if (err ? !QRegExp(expected.at(i)).exactMatch(actual.at(i)) : + (actual.at(i) != expected.at(i))) { bool cond = true; while (cond) { - act = actual.at(gi - 1); - act.remove('\r'); cond = (ei - 1) >= i && (gi - 1) >= i && - (err ? QRegExp(expected.at(ei - 1)).exactMatch(act) : - (act == expected.at(ei - 1))); + (err ? QRegExp(expected.at(ei - 1)).exactMatch(actual.at(gi - 1)) : + (actual.at(gi - 1) == expected.at(ei - 1))); if (cond) { ei--, gi--; } |