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>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp
index faec76d150..0e7542a2d7 100644
--- a/src/plugins/cpptools/builtinindexingsupport.cpp
+++ b/src/plugins/cpptools/builtinindexingsupport.cpp
@@ -92,7 +92,7 @@ public:
     ~BuiltinSymbolSearcher()
     {}
 
-    void runSearch(QFutureInterface<Find::SearchResultItem> &future)
+    void runSearch(QFutureInterface<Core::SearchResultItem> &future)
     {
         future.setProgressRange(0, m_snapshot.size());
         future.setProgressValue(0);
@@ -102,11 +102,11 @@ public:
         search.setSymbolsToSearchFor(m_parameters.types);
         CPlusPlus::Snapshot::const_iterator it = m_snapshot.begin();
 
-        QString findString = (m_parameters.flags & Find::FindRegularExpression
+        QString findString = (m_parameters.flags & Core::FindRegularExpression
                               ? m_parameters.text : QRegExp::escape(m_parameters.text));
-        if (m_parameters.flags & Find::FindWholeWords)
+        if (m_parameters.flags & Core::FindWholeWords)
             findString = QString::fromLatin1("\\b%1\\b").arg(findString);
-        QRegExp matcher(findString, (m_parameters.flags & Find::FindCaseSensitively
+        QRegExp matcher(findString, (m_parameters.flags & Core::FindCaseSensitively
                                      ? Qt::CaseSensitive : Qt::CaseInsensitive));
         while (it != m_snapshot.end()) {
             if (future.isPaused())
@@ -114,7 +114,7 @@ public:
             if (future.isCanceled())
                 break;
             if (m_fileNames.isEmpty() || m_fileNames.contains(it.value()->fileName())) {
-                QVector<Find::SearchResultItem> resultItems;
+                QVector<Core::SearchResultItem> resultItems;
                 QList<ModelItemInfo> modelInfos = search(it.value());
                 foreach (const ModelItemInfo &info, modelInfos) {
                     int index = matcher.indexIn(info.symbolName);
@@ -130,7 +130,7 @@ public:
                                                                        info.symbolType);
                         }
 
-                        Find::SearchResultItem item;
+                        Core::SearchResultItem item;
                         item.path = scope.split(QLatin1String("::"), QString::SkipEmptyParts);
                         item.text = text;
                         item.textMarkPos = -1;