Core: Merge Find and Locator into Core plugin

Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/clangcodemodel/clangsymbolsearcher.cpp b/src/plugins/clangcodemodel/clangsymbolsearcher.cpp
index 5032439b88..d603a745f2 100644
--- a/src/plugins/clangcodemodel/clangsymbolsearcher.cpp
+++ b/src/plugins/clangcodemodel/clangsymbolsearcher.cpp
@@ -68,7 +68,7 @@ void ClangSymbolSearcher::search(const QLinkedList<Symbol> &allSymbols)
                                  ? Qt::CaseSensitive : Qt::CaseInsensitive));
 
     const int chunkSize = 10;
-    QVector<Find::SearchResultItem> resultItems;
+    QVector<Core::SearchResultItem> resultItems;
     resultItems.reserve(100);
 
     m_future->setProgressRange(0, allSymbols.size() % chunkSize);
@@ -138,7 +138,7 @@ void ClangSymbolSearcher::search(const QLinkedList<Symbol> &allSymbols)
         info.line = s.m_location.line();
         info.column = s.m_location.column() - 1;
 
-        Find::SearchResultItem item;
+        Core::SearchResultItem item;
         item.path << s.m_qualification;
         item.text = s.m_name;
         item.icon = info.icon;
diff --git a/src/plugins/clangcodemodel/clangsymbolsearcher.h b/src/plugins/clangcodemodel/clangsymbolsearcher.h
index d316133bb9..ff59e211c4 100644
--- a/src/plugins/clangcodemodel/clangsymbolsearcher.h
+++ b/src/plugins/clangcodemodel/clangsymbolsearcher.h
@@ -47,7 +47,7 @@ class ClangSymbolSearcher: public CppTools::SymbolSearcher
     Q_OBJECT
 
     typedef CppTools::SymbolSearcher::Parameters Parameters;
-    typedef Find::SearchResultItem SearchResultItem;
+    typedef Core::SearchResultItem SearchResultItem;
 
 public:
     ClangSymbolSearcher(ClangIndexer *indexer, const Parameters &parameters, QSet<QString> fileNames, QObject *parent = 0);