summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lupdate/merge.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-06 21:04:57 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-06 21:58:01 (GMT)
commit44cc160733a70f5dc613faed2051005de7e48f04 (patch)
tree214a5d22918c752af5aff3ddf2dde07e6ced2060 /tools/linguist/lupdate/merge.cpp
parentd4f08b8f15607ac2859c079e94bf8d02a9b8380c (diff)
downloadQt-44cc160733a70f5dc613faed2051005de7e48f04.zip
Qt-44cc160733a70f5dc613faed2051005de7e48f04.tar.gz
Qt-44cc160733a70f5dc613faed2051005de7e48f04.tar.bz2
kill TranslatorMessage::operator==() and qHash(TranslatorMessage)
preparation work ...
Diffstat (limited to 'tools/linguist/lupdate/merge.cpp')
-rw-r--r--tools/linguist/lupdate/merge.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/linguist/lupdate/merge.cpp b/tools/linguist/lupdate/merge.cpp
index 6b8d4bb..13ba4ae 100644
--- a/tools/linguist/lupdate/merge.cpp
+++ b/tools/linguist/lupdate/merge.cpp
@@ -348,7 +348,7 @@ Translator merge(const Translator &tor, const Translator &virginTor,
m.setComment(mv.comment());
} else {
TranslatorMessage mv;
- int mvi = virginTor.messages().indexOf(m);
+ int mvi = virginTor.find(m);
if (mvi < 0) {
if (!(options & HeuristicSimilarText)) {
makeObsolete:
@@ -437,7 +437,7 @@ Translator merge(const Translator &tor, const Translator &virginTor,
if (tor.contains(mv.context()))
continue;
} else {
- if (tor.messages().contains(mv))
+ if (tor.find(mv) >= 0)
continue;
if (options & HeuristicSimilarText) {
TranslatorMessage m = tor.find(mv.context(), mv.comment(), mv.allReferences());