From e28eec0c6bee31dfea46f6d4076d108c2369b793 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 5 Nov 2009 22:39:24 +0100
Subject: don't construct a new message for look-up purposes only

---
 tools/linguist/lupdate/merge.cpp     | 8 +++++---
 tools/linguist/shared/translator.cpp | 8 --------
 tools/linguist/shared/translator.h   | 2 --
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/tools/linguist/lupdate/merge.cpp b/tools/linguist/lupdate/merge.cpp
index b5f77cd..cffbfa3 100644
--- a/tools/linguist/lupdate/merge.cpp
+++ b/tools/linguist/lupdate/merge.cpp
@@ -351,8 +351,9 @@ Translator merge(const Translator &tor, const Translator &virginTor,
             if (!mv.isNull())
                 m.setComment(mv.comment());
         } else {
-            TranslatorMessage mv = virginTor.find(m.context(), m.sourceText(), m.comment());
-            if (mv.isNull()) {
+            TranslatorMessage mv;
+            int mvi = virginTor.messages().indexOf(m);
+            if (mvi < 0) {
                 if (!(options & HeuristicSimilarText)) {
                     newType = TranslatorMessage::Obsolete;
                     if (m.type() != TranslatorMessage::Obsolete)
@@ -402,6 +403,7 @@ Translator merge(const Translator &tor, const Translator &virginTor,
                     }
                 }
             } else {
+                mv = virginTor.message(mvi);
                 switch (m.type()) {
                 case TranslatorMessage::Finished:
                 default:
@@ -446,7 +448,7 @@ Translator merge(const Translator &tor, const Translator &virginTor,
             if (tor.contains(mv.context()))
                 continue;
         } else {
-            if (tor.contains(mv.context(), mv.sourceText(), mv.comment()))
+            if (tor.messages().contains(mv))
                 continue;
             if (options & HeuristicSimilarText) {
                 TranslatorMessage m = tor.find(mv.context(), mv.comment(), mv.allReferences());
diff --git a/tools/linguist/shared/translator.cpp b/tools/linguist/shared/translator.cpp
index cd670cc..3b7ee9a 100644
--- a/tools/linguist/shared/translator.cpp
+++ b/tools/linguist/shared/translator.cpp
@@ -319,14 +319,6 @@ bool Translator::contains(const QString &context,
 }
 
 TranslatorMessage Translator::find(const QString &context,
-    const QString &sourceText, const QString &comment) const
-{
-    TranslatorMessage needle(context, sourceText, comment, QString(), QString(), 0);
-    int index = m_messages.indexOf(needle);
-    return index == -1 ? TranslatorMessage() : m_messages.at(index);
-}
-
-TranslatorMessage Translator::find(const QString &context,
     const QString &comment, const TranslatorMessage::References &refs) const
 {
     if (!refs.isEmpty()) {
diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h
index ef81d2a..6db6f3a 100644
--- a/tools/linguist/shared/translator.h
+++ b/tools/linguist/shared/translator.h
@@ -115,8 +115,6 @@ public:
 
     bool contains(const QString &context, const QString &sourceText,
         const QString &comment) const;
-    TranslatorMessage find(const QString &context,
-        const QString &sourceText, const QString &comment) const;
 
     TranslatorMessage find(const QString &context,
         const QString &comment, const TranslatorMessage::References &refs) const;
-- 
cgit v0.12