Move search into separate class.

src/CMakeLists.txt

@@ -35,6 +35,7 @@ set(keepassx_SOURCES
     core/Entry.cpp
     core/EntryAttachments.cpp
     core/EntryAttributes.cpp
+    core/EntrySearcher.cpp
     core/FilePath.cpp
     core/Global.h
     core/Group.cpp

src/core/EntrySearcher.cpp

@@ -0,0 +1,47 @@
+/*
+ *  Copyright (C) 2014 Florian Geyer <blueice@fobos.de>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "EntrySearcher.h"
+
+#include "core/Group.h"
+
+QList<Entry*> EntrySearcher::search(const QString &searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity)
+{
+    if (!group->resolveSearchingEnabled()) {
+        return QList<Entry*>();
+    }
+
+    return searchEntries(searchTerm, group, caseSensitivity);
+}
+
+QList<Entry*> EntrySearcher::searchEntries(const QString &searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity)
+{
+    QList<Entry*> searchResult;
+
+    Q_FOREACH (Entry* entry, group->entries()) {
+        if (entry->match(searchTerm, caseSensitivity)) {
+            searchResult.append(entry);
+        }
+    }
+    Q_FOREACH (Group* childGroup, group->children()) {
+        if (childGroup->searchingEnabled() != Group::Disable) {
+            searchResult.append(searchEntries(searchTerm, childGroup, caseSensitivity));
+        }
+    }
+
+    return searchResult;
+}

src/core/EntrySearcher.h

@@ -0,0 +1,35 @@
+/*
+ *  Copyright (C) 2014 Florian Geyer <debfx@fobos.de>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSX_ENTRYSEARCHER_H
+#define KEEPASSX_ENTRYSEARCHER_H
+
+#include <QString>
+
+
+class Group;
+class Entry;
+
+class EntrySearcher
+{
+public:
+    QList<Entry*> search(const QString& searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity);
+private:
+    QList<Entry*> searchEntries(const QString &searchTerm, const Group *group, Qt::CaseSensitivity caseSensitivity);
+};
+
+#endif // KEEPASSX_ENTRYSEARCHER_H

src/core/Group.cpp

@@ -612,33 +612,6 @@ void Group::recCreateDelObjects()
     }
 }
 
-QList<Entry*> Group::search(const QString& searchTerm, Qt::CaseSensitivity caseSensitivity,
-                            bool resolveInherit)
-{
-    QList<Entry*> searchResult;
-    bool search;
-    if (resolveInherit) {
-        search = resolveSearchingEnabled();
-    }
-    else if (searchingEnabled() == Disable) {
-        search = false;
-    }
-    else {
-        search = true;
-    }
-    if (search) {
-        Q_FOREACH (Entry* entry, m_entries) {
-            if (entry->match(searchTerm, caseSensitivity)) {
-                searchResult.append(entry);
-            }
-        }
-        Q_FOREACH (Group* group, m_children) {
-            searchResult.append(group->search(searchTerm, caseSensitivity, false));
-        }
-    }
-    return searchResult;
-}
-
 bool Group::resolveSearchingEnabled() const
 {
     switch (m_data.searchingEnabled) {

src/core/Group.h

@@ -113,9 +113,6 @@ public:
     void copyDataFrom(const Group* other);
     Database* exportToDb();
 
-    QList<Entry*> search(const QString& searchTerm, Qt::CaseSensitivity caseSensitivity,
-                         bool resolveInherit = true);
-
 Q_SIGNALS:
     void dataChanged(Group* group);
 

src/gui/DatabaseWidget.cpp

@@ -28,6 +28,7 @@
 
 #include "autotype/AutoType.h"
 #include "core/Config.h"
+#include "core/EntrySearcher.h"
 #include "core/FilePath.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
@@ -754,8 +755,8 @@ void DatabaseWidget::search()
     else {
         sensitivity = Qt::CaseInsensitive;
     }
-    QList<Entry*> searchResult = searchGroup->search(m_searchUi->searchEdit->text(), sensitivity);
 
+    QList<Entry*> searchResult = EntrySearcher().search(m_searchUi->searchEdit->text(), searchGroup, sensitivity);
 
     m_entryView->setEntryList(searchResult);
 }