From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 19 Aug 2013 15:41:27 +0000 (+0200)
Subject: de-duplicate code paths
X-Git-Tag: accepted/tizen/20131212.181521~83^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e83e456eaaa482c444a08ad1d314fde9f00239e0;p=platform%2Fupstream%2Fqttools.git

de-duplicate code paths

Change-Id: I368b0adb7cc96f40465d176a01196697eb09db4c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---

diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp
index 79abaa4..a1762ed 100644
--- a/src/linguist/linguist/mainwindow.cpp
+++ b/src/linguist/linguist/mainwindow.cpp
@@ -993,29 +993,26 @@ void MainWindow::findAgain()
         for (int i = 0; i < m_dataModel->modelCount(); ++i) {
             if (MessageItem *m = m_dataModel->messageItem(dataIndex, i)) {
                 bool found = true;
-                // Note: we do not look into plurals on grounds of them not
-                // containing anything much different from the singular.
-                if (hadMessage) {
-                    if (!searchItem(DataModel::Translations, m->translation()))
-                        found = false;
-                } else {
-                    do {
+                do {
+                    if (!hadMessage) {
                         if (searchItem(DataModel::SourceText, m->text()))
                             break;
                         if (searchItem(DataModel::SourceText, m->pluralText()))
                             break;
-                        if (searchItem(DataModel::Translations, m->translation()))
-                            break;
                         if (searchItem(DataModel::Comments, m->comment()))
                             break;
                         if (searchItem(DataModel::Comments, m->extraComment()))
                             break;
                         if (searchItem(DataModel::Comments, m->translatorComment()))
                             break;
-                        found = false;
-                        // did not find the search string in this message
-                    } while (0);
-                }
+                    }
+                    // Note: we do not look into plurals on grounds of them not
+                    // containing anything much different from the singular.
+                    if (searchItem(DataModel::Translations, m->translation()))
+                        break;
+                    found = false;
+                    // did not find the search string in this message
+                } while (0);
                 if (found) {
                     setCurrentMessage(realIndex, i);