From dc587b47af5fec8268ccd33935f6abe442ae8904 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 1 Jun 2011 18:20:58 +0200
Subject: remove Translator::contains()

it's redundant with find() now, as the latter is cheap now
---
 tools/linguist/lupdate/merge.cpp     | 2 +-
 tools/linguist/shared/translator.cpp | 8 --------
 tools/linguist/shared/translator.h   | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/tools/linguist/lupdate/merge.cpp b/tools/linguist/lupdate/merge.cpp
index 1c992c3..8b6624d 100644
--- a/tools/linguist/lupdate/merge.cpp
+++ b/tools/linguist/lupdate/merge.cpp
@@ -454,7 +454,7 @@ Translator merge(const Translator &tor, const Translator &virginTor,
     */
     foreach (const TranslatorMessage &mv, virginTor.messages()) {
         if (mv.sourceText().isEmpty() && mv.id().isEmpty()) {
-            if (tor.contains(mv.context()))
+            if (tor.find(mv.context()) >= 0)
                 continue;
         } else {
             if (tor.find(mv) >= 0)
diff --git a/tools/linguist/shared/translator.cpp b/tools/linguist/shared/translator.cpp
index 91a5a26..0c2678d 100644
--- a/tools/linguist/shared/translator.cpp
+++ b/tools/linguist/shared/translator.cpp
@@ -361,14 +361,6 @@ int Translator::find(const QString &context,
     return -1;
 }
 
-bool Translator::contains(const QString &context) const
-{
-    foreach (const TranslatorMessage &msg, m_messages)
-        if (msg.context() == context && msg.sourceText().isEmpty() && msg.id().isEmpty())
-            return true;
-    return false;
-}
-
 int Translator::find(const QString &context) const
 {
     for (TMM::ConstIterator it = m_messages.constBegin(); it != m_messages.constEnd(); ++it)
diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h
index 41f0396..bb147b8 100644
--- a/tools/linguist/shared/translator.h
+++ b/tools/linguist/shared/translator.h
@@ -130,7 +130,6 @@ public:
     int find(const QString &context,
         const QString &comment, const TranslatorMessage::References &refs) const;
 
-    bool contains(const QString &context) const;
     int find(const QString &context) const;
 
     void replaceSorted(const TranslatorMessage &msg);
-- 
cgit v0.12