CppTools: Get rid of SearchSymbols::setSeparateScope()

This will make it easier to use a single SearchSymbols instance and a
single run serving all locator filters.

Change-Id: Idb6a3693ad356227d46d0b28fb4c3a5db62b4ac4
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

src/plugins/cpptools/builtinindexingsupport.cpp

@@ -100,7 +100,6 @@ public:
 
         SearchSymbols search;
         search.setSymbolsToSearchFor(m_parameters.types);
-        search.setSeparateScope(true);
         CPlusPlus::Snapshot::const_iterator it = m_snapshot.begin();
 
         QString findString = (m_parameters.flags & Find::FindRegularExpression
@@ -120,11 +119,14 @@ public:
                 foreach (const ModelItemInfo &info, modelInfos) {
                     int index = matcher.indexIn(info.symbolName);
                     if (index != -1) {
-                        QStringList path = info.fullyQualifiedName.mid(0,
-                            info.fullyQualifiedName.size() - 1);
+                        QString text = info.typeNameRepresentation();
+                        if (text.isEmpty())
+                            text = info.symbolName;
+
                         Find::SearchResultItem item;
-                        item.path = path;
-                        item.text = info.symbolName;
+                        item.path = info.symbolScope.split(QLatin1String("::"),
+                                                           QString::SkipEmptyParts);
+                        item.text = text;
                         item.textMarkPos = -1;
                         item.textMarkLength = 0;
                         item.icon = info.icon;