Made symbol searching plug-able through indexing support.

The indexing support for the built-in code model is moved to its own
file. Symbol searching will now call for a searcher through that support
interface, which will create a fully configured and ready-to-go searcher
that can be started in the/a future.

Change-Id: Idc3ee1c7c789a69fa05ee1d42415313dcea94cf8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/cpptools/searchsymbols.cpp b/src/plugins/cpptools/searchsymbols.cpp
index d710c968f7d..75976b42a60 100644
--- a/src/plugins/cpptools/searchsymbols.cpp
+++ b/src/plugins/cpptools/searchsymbols.cpp
@@ -39,13 +39,13 @@ using namespace CPlusPlus;
 using namespace CppTools;
 
 SearchSymbols::SymbolTypes SearchSymbols::AllTypes =
-        SearchSymbols::Classes
-        | SearchSymbols::Functions
-        | SearchSymbols::Enums
-        | SearchSymbols::Declarations;
+        SymbolSearcher::Classes
+        | SymbolSearcher::Functions
+        | SymbolSearcher::Enums
+        | SymbolSearcher::Declarations;
 
 SearchSymbols::SearchSymbols():
-    symbolsToSearchFor(Classes | Functions | Enums),
+    symbolsToSearchFor(SymbolSearcher::Classes | SymbolSearcher::Functions | SymbolSearcher::Enums),
     separateScope(false)
 {
 }
@@ -84,7 +84,7 @@ QString SearchSymbols::switchScope(const QString &scope)
 
 bool SearchSymbols::visit(Enum *symbol)
 {
-    if (!(symbolsToSearchFor & Enums))
+    if (!(symbolsToSearchFor & SymbolSearcher::Enums))
         return false;
 
     QString name = symbolName(symbol);
@@ -102,7 +102,7 @@ bool SearchSymbols::visit(Enum *symbol)
 
 bool SearchSymbols::visit(Function *symbol)
 {
-    if (!(symbolsToSearchFor & Functions))
+    if (!(symbolsToSearchFor & SymbolSearcher::Functions))
         return false;
 
     QString extraScope;
@@ -139,7 +139,7 @@ bool SearchSymbols::visit(Namespace *symbol)
 
 bool SearchSymbols::visit(Declaration *symbol)
 {
-    if (!(symbolsToSearchFor & Declarations))
+    if (!(symbolsToSearchFor & SymbolSearcher::Declarations))
         return false;
 
     QString name = symbolName(symbol);
@@ -157,7 +157,7 @@ bool SearchSymbols::visit(Class *symbol)
     QString name = symbolName(symbol);
     QString scopedName = scopedSymbolName(name);
     QString previousScope = switchScope(scopedName);
-    if (symbolsToSearchFor & Classes) {
+    if (symbolsToSearchFor & SymbolSearcher::Classes) {
         appendItem(separateScope ? name : scopedName,
                    separateScope ? previousScope : QString(),
                    ModelItemInfo::Class, symbol);