diff -r afcd8e6d025b -r 6aeb7a756187 browsercore/appfw/Api/Managers/bookmarkscontroller.cpp --- a/browsercore/appfw/Api/Managers/bookmarkscontroller.cpp Fri Sep 17 12:11:40 2010 -0400 +++ b/browsercore/appfw/Api/Managers/bookmarkscontroller.cpp Thu Sep 23 15:32:11 2010 -0400 @@ -14,6 +14,7 @@ #include "BookmarksManager.h" #include "BookmarkFav.h" #include "BookmarkResults.h" +#include "HistoryManager.h" BookmarksController::BookmarksController(QWidget *parent) : QObject(parent) @@ -112,4 +113,29 @@ emit launchBookmarkEditDailog(title, url, bookmarkID); } +QObjectList BookmarksController::suggestSimilar(QString suggest) +{ + QMap bookmarksMap = m_bm->findBookmarks(suggest); + QMap historyMap = WRT::HistoryManager::getSingleton()->findHistory(suggest); + // Now combine the result + QObjectList suggestions; + + QMapIterator bhi(historyMap); + while (bhi.hasNext()) { + bhi.next(); + suggestions.append(new Suggestion(bhi.key(), bhi.value())); + } + + QMapIterator bmi(bookmarksMap); + while (bmi.hasNext()) { + bmi.next(); + if (historyMap.contains(bmi.key())) + continue; + suggestions.append(new Suggestion(bmi.key(), bmi.value())); + } + + return suggestions; + +} + // TODO add tag stuff when we get a ui for it