Merge branch '1.3' of git@scm.dev.nokia.troll.no:creator/mainline into 1.3

Conflicts:
	src/plugins/cpptools/cppfindreferences.cpp
	src/plugins/cpptools/cpptoolsplugin.cpp
	src/plugins/texteditor/basefilefind.cpp

12 files changed, 141 insertions, 58 deletions

diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 988bba9966..cd0c8f705e 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -1011,7 +1011,7 @@ bool CppCodeCompletion::completeMember(const QList<TypeOfExpression::Result> &re
             ResolveExpression resolveExpression(context);
             ResolveClass resolveClass;
 
-            const QList<Symbol *> candidates = resolveClass(result, context);
+            const QList<Symbol *> candidates = resolveClass(namedTy->name(), result, context);
             foreach (Symbol *classObject, candidates) {
                 const QList<TypeOfExpression::Result> overloads =
                         resolveExpression.resolveArrowOperator(result, namedTy,
@@ -1026,9 +1026,10 @@ bool CppCodeCompletion::completeMember(const QList<TypeOfExpression::Result> &re
                     ty = funTy->returnType().simplified();
 
                     if (PointerType *ptrTy = ty->asPointerType()) {
-                        if (NamedType *namedTy = ptrTy->elementType()->asNamedType()) {
+                        FullySpecifiedType elementTy = ptrTy->elementType().simplified();
+                        if (NamedType *namedTy = elementTy->asNamedType()) {
                             const QList<Symbol *> classes =
-                                    resolveClass(namedTy, result, context);
+                                    resolveClass(namedTy->name(), result, context);
 
                             foreach (Symbol *c, classes) {
                                 if (! classObjectCandidates.contains(c))
@@ -1039,17 +1040,18 @@ bool CppCodeCompletion::completeMember(const QList<TypeOfExpression::Result> &re
                 }
             }
         } else if (PointerType *ptrTy = ty->asPointerType()) {
-            if (NamedType *namedTy = ptrTy->elementType()->asNamedType()) {
+            FullySpecifiedType elementTy = ptrTy->elementType().simplified();
+            if (NamedType *namedTy = elementTy->asNamedType()) {
                 ResolveClass resolveClass;
 
-                const QList<Symbol *> classes = resolveClass(namedTy, result,
+                const QList<Symbol *> classes = resolveClass(namedTy->name(), result,
                                                              context);
 
                 foreach (Symbol *c, classes) {
                     if (! classObjectCandidates.contains(c))
                         classObjectCandidates.append(c);
                 }
-            } else if (Class *classTy = ptrTy->elementType()->asClassType()) {
+            } else if (Class *classTy = elementTy->asClassType()) {
                 // typedef struct { int x } *Ptr;
                 // Ptr p;
                 // p->
@@ -1099,7 +1101,7 @@ bool CppCodeCompletion::completeMember(const QList<TypeOfExpression::Result> &re
 
         if (namedTy) {
             ResolveClass resolveClass;
-            const QList<Symbol *> symbols = resolveClass(namedTy, result,
+            const QList<Symbol *> symbols = resolveClass(namedTy->name(), result,
                                                          context);
             foreach (Symbol *symbol, symbols) {
                 if (classObjectCandidates.contains(symbol))
@@ -1330,7 +1332,7 @@ bool CppCodeCompletion::completeQtMethod(const QList<TypeOfExpression::Result> &
         FullySpecifiedType ty = p.first.simplified();
 
         if (PointerType *ptrTy = ty->asPointerType())
-            ty = ptrTy->elementType();
+            ty = ptrTy->elementType().simplified();
         else
             continue; // not a pointer or a reference to a pointer.
 
@@ -1339,7 +1341,7 @@ bool CppCodeCompletion::completeQtMethod(const QList<TypeOfExpression::Result> &
             continue;
 
         const QList<Symbol *> classObjects =
-                resolveClass(namedTy, p, context);
+                resolveClass(namedTy->name(), p, context);
 
         if (classObjects.isEmpty())
             continue;
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index c69711fa12..a8320a87cc 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -208,7 +208,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) :
     if (const Core::MimeType headerMt = mdb->findByType(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE)))
         foreach (const QString &suffix, headerMt.suffixes())
             m_ui->headerSuffixComboBox->addItem(suffix);
-    m_ui->licenseTemplatePathChooser->setExpectedKind(Core::Utils::PathChooser::File);
+    m_ui->licenseTemplatePathChooser->setExpectedKind(Utils::PathChooser::File);
     m_ui->licenseTemplatePathChooser->addButton(tr("Edit..."), this, SLOT(slotEdit()));
 }
 
diff --git a/src/plugins/cpptools/cppfilesettingspage.ui b/src/plugins/cpptools/cppfilesettingspage.ui
index ea074c2ff8..e981bd7ef9 100644
--- a/src/plugins/cpptools/cppfilesettingspage.ui
+++ b/src/plugins/cpptools/cppfilesettingspage.ui
@@ -61,7 +61,7 @@
        </widget>
       </item>
       <item row="3" column="1">
-       <widget class="Core::Utils::PathChooser" name="licenseTemplatePathChooser" native="true"/>
+       <widget class="Utils::PathChooser" name="licenseTemplatePathChooser" native="true"/>
       </item>
      </layout>
     </widget>
@@ -83,7 +83,7 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>Core::Utils::PathChooser</class>
+   <class>Utils::PathChooser</class>
    <extends>QWidget</extends>
    <header location="global">utils/pathchooser.h</header>
    <container>1</container>
diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index b9a22812cc..f9c27ccdd9 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -69,7 +69,7 @@ struct Process: protected ASTVisitor
 {
 public:
     Process(Document::Ptr doc, const Snapshot &snapshot,
-            QFutureInterface<Core::Utils::FileSearchResult> *future)
+            QFutureInterface<Utils::FileSearchResult> *future)
             : ASTVisitor(doc->control()),
               _future(future),
               _doc(doc),
@@ -115,6 +115,14 @@ protected:
 
     }
 
+    void reportResult(unsigned tokenIndex, const QList<Symbol *> &candidates)
+    {
+        const bool isStrongResult = checkCandidates(candidates);
+
+        if (isStrongResult)
+            reportResult(tokenIndex);
+    }
+
     void reportResult(unsigned tokenIndex)
     {
         const Token &tk = tokenAt(tokenIndex);
@@ -129,8 +137,8 @@ protected:
         const int len = tk.f.length;
 
         if (_future)
-            _future->reportResult(Core::Utils::FileSearchResult(QDir::toNativeSeparators(_doc->fileName()),
-                                                                line, lineText, col, len));
+            _future->reportResult(Utils::FileSearchResult(QDir::toNativeSeparators(_doc->fileName()),
+                                                          line, lineText, col, len));
 
         _references.append(tokenIndex);
     }
@@ -197,8 +205,7 @@ protected:
             if (identifier(simple->identifier_token) == _id) {
                 LookupContext context = currentContext(ast);
                 const QList<Symbol *> candidates = context.resolve(simple->name);
-                if (checkCandidates(candidates))
-                    reportResult(simple->identifier_token);
+                reportResult(simple->identifier_token, candidates);
             }
         }
         accept(ast->expression);
@@ -262,8 +269,7 @@ protected:
             candidates.append(lastVisibleSymbol);
         }
 
-        if (checkCandidates(candidates))
-            reportResult(endToken);
+        reportResult(endToken, candidates);
     }
 
     virtual bool visit(QualifiedNameAST *ast)
@@ -331,8 +337,7 @@ protected:
         if (id == _id) {
             LookupContext context = currentContext(ast);
             const QList<Symbol *> candidates = context.resolve(ast->name);
-            if (checkCandidates(candidates))
-                reportResult(ast->identifier_token);
+            reportResult(ast->identifier_token, candidates);
         }
 
         return false;
@@ -344,8 +349,7 @@ protected:
         if (id == _id) {
             LookupContext context = currentContext(ast);
             const QList<Symbol *> candidates = context.resolve(ast->name);
-            if (checkCandidates(candidates))
-                reportResult(ast->identifier_token);
+            reportResult(ast->identifier_token, candidates);
         }
 
         return false;
@@ -353,19 +357,50 @@ protected:
 
     virtual bool visit(TemplateIdAST *ast)
     {
-        Identifier *id = identifier(ast->identifier_token);
-        if (id == _id) {
+        if (_id == identifier(ast->identifier_token)) {
             LookupContext context = currentContext(ast);
             const QList<Symbol *> candidates = context.resolve(ast->name);
-            if (checkCandidates(candidates))
-                reportResult(ast->identifier_token);
+            reportResult(ast->identifier_token, candidates);
+        }
+
+        for (TemplateArgumentListAST *template_arguments = ast->template_arguments;
+             template_arguments; template_arguments = template_arguments->next) {
+            accept(template_arguments->template_argument);
         }
 
         return false;
     }
 
+    virtual bool visit(ParameterDeclarationAST *ast)
+    {
+        for (SpecifierAST *spec = ast->type_specifier; spec; spec = spec->next)
+            accept(spec);
+
+        if (DeclaratorAST *declarator = ast->declarator) {
+            for (SpecifierAST *attr = declarator->attributes; attr; attr = attr->next)
+                accept(attr);
+
+            for (PtrOperatorAST *ptr_op = declarator->ptr_operators; ptr_op; ptr_op = ptr_op->next)
+                accept(ptr_op);
+
+            // ### TODO: well, not exactly. We need to look at qualified-name-ids and nested-declarators.
+            // accept(declarator->core_declarator);
+
+            for (PostfixDeclaratorAST *fx_op = declarator->postfix_declarators; fx_op; fx_op = fx_op->next)
+                accept(fx_op);
+
+            for (SpecifierAST *spec = declarator->post_attributes; spec; spec = spec->next)
+                accept(spec);
+
+            accept(declarator->initializer);
+        }
+
+        accept(ast->expression);
+        return false;
+    }
+
 private:
-    QFutureInterface<Core::Utils::FileSearchResult> *_future;
+    QFutureInterface<Utils::FileSearchResult> *_future;
     Identifier *_id; // ### remove me
     Symbol *_declSymbol;
     Document::Ptr _doc;
@@ -415,7 +450,7 @@ QList<int> CppFindReferences::references(Symbol *symbol,
     return references;
 }
 
-static void find_helper(QFutureInterface<Core::Utils::FileSearchResult> &future,
+static void find_helper(QFutureInterface<Utils::FileSearchResult> &future,
                         const QMap<QString, QString> wl,
                         Snapshot snapshot,
                         Symbol *symbol)
@@ -435,6 +470,12 @@ static void find_helper(QFutureInterface<Core::Utils::FileSearchResult> &future,
     future.setProgressRange(0, files.size());
 
     for (int i = 0; i < files.size(); ++i) {
+        if (future.isPaused())
+            future.waitForResume();
+
+        if (future.isCanceled())
+            break;
+
         const QString &fileName = files.at(i);
         future.setProgressValueAndText(i, QFileInfo(fileName).fileName());
 
@@ -491,13 +532,24 @@ static void find_helper(QFutureInterface<Core::Utils::FileSearchResult> &future,
     future.setProgressValue(files.size());
 }
 
-void CppFindReferences::findAll(Symbol *symbol)
+void CppFindReferences::findUsages(Symbol *symbol)
+{
+    _resultWindow->clearContents();
+    findAll_helper(symbol);
+}
+
+void CppFindReferences::renameUsages(Symbol *symbol)
 {
     Find::SearchResult *search = _resultWindow->startNewSearch();
     connect(search, SIGNAL(activated(Find::SearchResultItem)),
             this, SLOT(openEditor(Find::SearchResultItem)));
 
     _resultWindow->setShowReplaceUI(true);
+    findAll_helper(symbol);
+}
+
+void CppFindReferences::findAll_helper(Symbol *symbol)
+{
     _resultWindow->popup(true);
 
     const Snapshot snapshot = _modelManager->snapshot();
@@ -505,7 +557,7 @@ void CppFindReferences::findAll(Symbol *symbol)
 
     Core::ProgressManager *progressManager = Core::ICore::instance()->progressManager();
 
-    QFuture<Core::Utils::FileSearchResult> result = QtConcurrent::run(&find_helper, wl, snapshot, symbol);
+    QFuture<Utils::FileSearchResult> result = QtConcurrent::run(&find_helper, wl, snapshot, symbol);
     m_watcher.setFuture(result);
 
     Core::FutureProgress *progress = progressManager->addTask(result, tr("Searching..."),
@@ -517,7 +569,7 @@ void CppFindReferences::findAll(Symbol *symbol)
 
 void CppFindReferences::displayResult(int index)
 {
-    Core::Utils::FileSearchResult result = m_watcher.future().resultAt(index);
+    Utils::FileSearchResult result = m_watcher.future().resultAt(index);
     _resultWindow->addResult(result.fileName,
                              result.lineNumber,
                              result.matchingLine,
diff --git a/src/plugins/cpptools/cppfindreferences.h b/src/plugins/cpptools/cppfindreferences.h
index 78bbf33838..429a945e2c 100644
--- a/src/plugins/cpptools/cppfindreferences.h
+++ b/src/plugins/cpptools/cppfindreferences.h
@@ -63,7 +63,8 @@ Q_SIGNALS:
     void changed();
 
 public:
-    void findAll(CPlusPlus::Symbol *symbol);
+    void findUsages(CPlusPlus::Symbol *symbol);
+    void renameUsages(CPlusPlus::Symbol *symbol);
 
 private Q_SLOTS:
     void displayResult(int);
@@ -71,9 +72,12 @@ private Q_SLOTS:
     void openEditor(const Find::SearchResultItem &item);
 
 private:
+    void findAll_helper(CPlusPlus::Symbol *symbol);
+
+private:
     QPointer<CppModelManager> _modelManager;
     Find::SearchResultWindow *_resultWindow;
-    QFutureWatcher<Core::Utils::FileSearchResult> m_watcher;
+    QFutureWatcher<Utils::FileSearchResult> m_watcher;
 };
 
 } // end of namespace Internal
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 8aa6bdf767..56e7b1d48f 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -56,6 +56,8 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
+#include <extensionsystem/pluginmanager.h>
+
 #include <utils/qtcassert.h>
 
 #include <TranslationUnit.h>
@@ -588,6 +590,13 @@ Document::Ptr CppPreprocessor::switchDocument(Document::Ptr doc)
 }
 
 
+CppTools::CppModelManagerInterface *CppTools::CppModelManagerInterface::instance()
+{
+    ExtensionSystem::PluginManager *pluginManager = ExtensionSystem::PluginManager::instance();
+    return pluginManager->getObject<CppTools::CppModelManagerInterface>();
+
+}
+
 
 /*!
     \class CppTools::CppModelManager
@@ -746,10 +755,16 @@ QList<int> CppModelManager::references(CPlusPlus::Symbol *symbol,
     return m_findReferences->references(LookupContext::canonicalSymbol(symbol), doc, snapshot);
 }
 
-void CppModelManager::findReferences(CPlusPlus::Symbol *symbol)
+void CppModelManager::findUsages(CPlusPlus::Symbol *symbol)
+{
+    if (symbol->identifier())
+        m_findReferences->findUsages(symbol);
+}
+
+void CppModelManager::renameUsages(CPlusPlus::Symbol *symbol)
 {
     if (symbol->identifier())
-        m_findReferences->findAll(symbol);
+        m_findReferences->renameUsages(symbol);
 }
 
 QMap<QString, QString> CppModelManager::buildWorkingCopyList()
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index 0f6911f97f..9aa3a800b2 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -106,7 +106,8 @@ public:
                                   CPlusPlus::Document::Ptr doc,
                                   const CPlusPlus::Snapshot &snapshot);
 
-    virtual void findReferences(CPlusPlus::Symbol *symbol);
+    virtual void findUsages(CPlusPlus::Symbol *symbol);
+    virtual void renameUsages(CPlusPlus::Symbol *symbol);
 
     void setHeaderSuffixes(const QStringList &suffixes)
     { m_headerSuffixes = suffixes; }
diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h
index 0a2ba32e38..58b04d4bf5 100644
--- a/src/plugins/cpptools/cppmodelmanagerinterface.h
+++ b/src/plugins/cpptools/cppmodelmanagerinterface.h
@@ -81,6 +81,8 @@ public:
     CppModelManagerInterface(QObject *parent = 0) : QObject(parent) {}
     virtual ~CppModelManagerInterface() {}
 
+    static CppModelManagerInterface *instance();
+
     virtual void GC() = 0;
     virtual void updateSourceFiles(const QStringList &sourceFiles) = 0;
 
@@ -99,7 +101,8 @@ public:
                                   CPlusPlus::Document::Ptr doc,
                                   const CPlusPlus::Snapshot &snapshot) = 0;
 
-    virtual void findReferences(CPlusPlus::Symbol *symbol) = 0;
+    virtual void renameUsages(CPlusPlus::Symbol *symbol) = 0;
+    virtual void findUsages(CPlusPlus::Symbol *symbol) = 0;
 };
 
 class CPPTOOLS_EXPORT AbstractEditorSupport
diff --git a/src/plugins/cpptools/cppsemanticsearch.cpp b/src/plugins/cpptools/cppsemanticsearch.cpp
index 554290e478..bc8510625b 100644
--- a/src/plugins/cpptools/cppsemanticsearch.cpp
+++ b/src/plugins/cpptools/cppsemanticsearch.cpp
@@ -51,7 +51,7 @@ class SearchClass: public SemanticSearch
     QTextDocument::FindFlags _findFlags;
 
 public:
-    SearchClass(QFutureInterface<Core::Utils::FileSearchResult> &future,
+    SearchClass(QFutureInterface<Utils::FileSearchResult> &future,
                 Document::Ptr doc, Snapshot snapshot)
         : SemanticSearch(future, doc, snapshot)
     { }
@@ -118,7 +118,7 @@ class SearchFunctionCall: public SemanticSearch
     QTextDocument::FindFlags _findFlags;
 
 public:
-    SearchFunctionCall(QFutureInterface<Core::Utils::FileSearchResult> &future,
+    SearchFunctionCall(QFutureInterface<Utils::FileSearchResult> &future,
                        Document::Ptr doc, Snapshot snapshot)
         : SemanticSearch(future, doc, snapshot)
     { }
@@ -184,7 +184,7 @@ protected:
 
 } // end of anonymous namespace
 
-SemanticSearch::SemanticSearch(QFutureInterface<Core::Utils::FileSearchResult> &future,
+SemanticSearch::SemanticSearch(QFutureInterface<Utils::FileSearchResult> &future,
                                Document::Ptr doc,
                                Snapshot snapshot)
     : ASTVisitor(doc->control()),
@@ -236,11 +236,11 @@ void SemanticSearch::reportResult(unsigned tokenIndex, int offset, int len)
     if (col)
         --col;  // adjust the column position.
 
-    _future.reportResult(Core::Utils::FileSearchResult(QDir::toNativeSeparators(_doc->fileName()),
+    _future.reportResult(Utils::FileSearchResult(QDir::toNativeSeparators(_doc->fileName()),
                                                        line, lineText, col + offset, len));
 }
 
-SemanticSearch *SearchClassDeclarationsFactory::create(QFutureInterface<Core::Utils::FileSearchResult> &future,
+SemanticSearch *SearchClassDeclarationsFactory::create(QFutureInterface<Utils::FileSearchResult> &future,
                                                        Document::Ptr doc,
                                                        Snapshot snapshot)
 {
@@ -250,7 +250,7 @@ SemanticSearch *SearchClassDeclarationsFactory::create(QFutureInterface<Core::Ut
     return search;
 }
 
-SemanticSearch *SearchFunctionCallFactory::create(QFutureInterface<Core::Utils::FileSearchResult> &future,
+SemanticSearch *SearchFunctionCallFactory::create(QFutureInterface<Utils::FileSearchResult> &future,
                                                   Document::Ptr doc,
                                                   Snapshot snapshot)
 {
@@ -260,7 +260,7 @@ SemanticSearch *SearchFunctionCallFactory::create(QFutureInterface<Core::Utils::
     return search;
 }
 
-static void semanticSearch_helper(QFutureInterface<Core::Utils::FileSearchResult> &future,
+static void semanticSearch_helper(QFutureInterface<Utils::FileSearchResult> &future,
                                   QPointer<CppModelManager> modelManager,
                                   QMap<QString, QString> wl,
                                   SemanticSearchFactory::Ptr factory)
@@ -272,6 +272,12 @@ static void semanticSearch_helper(QFutureInterface<Core::Utils::FileSearchResult
 
     int progress = 0;
     foreach (Document::Ptr doc, snapshot) {
+        if (future.isPaused())
+            future.waitForResume();
+
+        if (future.isCanceled())
+            break;
+
         const QString fileName = doc->fileName();
 
         QByteArray source;
@@ -300,7 +306,7 @@ static void semanticSearch_helper(QFutureInterface<Core::Utils::FileSearchResult
     }
 }
 
-QFuture<Core::Utils::FileSearchResult> CppTools::Internal::semanticSearch(QPointer<CppModelManager> modelManager,
+QFuture<Utils::FileSearchResult> CppTools::Internal::semanticSearch(QPointer<CppModelManager> modelManager,
                                                                           SemanticSearchFactory::Ptr factory)
 {
     return QtConcurrent::run(&semanticSearch_helper, modelManager,
diff --git a/src/plugins/cpptools/cppsemanticsearch.h b/src/plugins/cpptools/cppsemanticsearch.h
index c619110832..b0ff968b4d 100644
--- a/src/plugins/cpptools/cppsemanticsearch.h
+++ b/src/plugins/cpptools/cppsemanticsearch.h
@@ -48,14 +48,14 @@ class SemanticSearchFactory;
 
 class SemanticSearch: protected CPlusPlus::ASTVisitor
 {
-    QFutureInterface<Core::Utils::FileSearchResult> &_future;
+    QFutureInterface<Utils::FileSearchResult> &_future;
     CPlusPlus::Document::Ptr _doc;
     CPlusPlus::Snapshot _snapshot;
     CPlusPlus::Document::Ptr _thisDocument;
     QByteArray _source;
 
 public:
-    SemanticSearch(QFutureInterface<Core::Utils::FileSearchResult> &future,
+    SemanticSearch(QFutureInterface<Utils::FileSearchResult> &future,
                    CPlusPlus::Document::Ptr doc,
                    CPlusPlus::Snapshot snapshot);
 
@@ -81,7 +81,7 @@ public:
     SemanticSearchFactory() {}
     virtual ~SemanticSearchFactory() {}
 
-    virtual SemanticSearch *create(QFutureInterface<Core::Utils::FileSearchResult> &future,
+    virtual SemanticSearch *create(QFutureInterface<Utils::FileSearchResult> &future,
                                    CPlusPlus::Document::Ptr doc,
                                    CPlusPlus::Snapshot snapshot) = 0;
 };
@@ -96,7 +96,7 @@ public:
         : _text(text), _findFlags(findFlags)
     { }
 
-    virtual SemanticSearch *create(QFutureInterface<Core::Utils::FileSearchResult> &future,
+    virtual SemanticSearch *create(QFutureInterface<Utils::FileSearchResult> &future,
                                    CPlusPlus::Document::Ptr doc,
                                    CPlusPlus::Snapshot snapshot);
 };
@@ -111,12 +111,12 @@ public:
         : _text(text), _findFlags(findFlags)
     { }
 
-    virtual SemanticSearch *create(QFutureInterface<Core::Utils::FileSearchResult> &future,
+    virtual SemanticSearch *create(QFutureInterface<Utils::FileSearchResult> &future,
                                    CPlusPlus::Document::Ptr doc,
                                    CPlusPlus::Snapshot snapshot);
 };
 
-QFuture<Core::Utils::FileSearchResult> semanticSearch(QPointer<CppModelManager> modelManager,
+QFuture<Utils::FileSearchResult> semanticSearch(QPointer<CppModelManager> modelManager,
                                                       SemanticSearchFactory::Ptr factory);
 
 
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index b4952f334f..c3f09a98f1 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -96,7 +96,7 @@ void FindClassDeclarations::findAll(const QString &text, QTextDocument::FindFlag
 
     SemanticSearchFactory::Ptr factory(new SearchClassDeclarationsFactory(text, findFlags));
 
-    QFuture<Core::Utils::FileSearchResult> result = semanticSearch(_modelManager, factory);
+    QFuture<Utils::FileSearchResult> result = semanticSearch(_modelManager, factory);
 
     m_watcher.setFuture(result);
 
@@ -109,7 +109,7 @@ void FindClassDeclarations::findAll(const QString &text, QTextDocument::FindFlag
 
 void FindClassDeclarations::displayResult(int index)
 {
-    Core::Utils::FileSearchResult result = m_watcher.future().resultAt(index);
+    Utils::FileSearchResult result = m_watcher.future().resultAt(index);
     _resultWindow->addResult(result.fileName,
                              result.lineNumber,
                              result.matchingLine,
@@ -149,7 +149,7 @@ void FindFunctionCalls::findAll(const QString &text, QTextDocument::FindFlags fi
 
     SemanticSearchFactory::Ptr factory(new SearchFunctionCallFactory(text, findFlags));
 
-    QFuture<Core::Utils::FileSearchResult> result = semanticSearch(_modelManager, factory);
+    QFuture<Utils::FileSearchResult> result = semanticSearch(_modelManager, factory);
 
     m_watcher.setFuture(result);
 
@@ -162,7 +162,7 @@ void FindFunctionCalls::findAll(const QString &text, QTextDocument::FindFlags fi
 
 void FindFunctionCalls::displayResult(int index)
 {
-    Core::Utils::FileSearchResult result = m_watcher.future().resultAt(index);
+    Utils::FileSearchResult result = m_watcher.future().resultAt(index);
     _resultWindow->addResult(result.fileName,
                              result.lineNumber,
                              result.matchingLine,
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index 7084e3d2fa..a78bf260c0 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -85,7 +85,7 @@ protected Q_SLOTS:
 private:
     QPointer<CppModelManager> _modelManager;
     Find::SearchResultWindow *_resultWindow;
-    QFutureWatcher<Core::Utils::FileSearchResult> m_watcher;
+    QFutureWatcher<Utils::FileSearchResult> m_watcher;
 };
 
 class FindFunctionCalls: public Find::IFindFilter // ### share code with FindClassDeclarations
@@ -110,7 +110,7 @@ protected Q_SLOTS:
 private:
     QPointer<CppModelManager> _modelManager;
     Find::SearchResultWindow *_resultWindow;
-    QFutureWatcher<Core::Utils::FileSearchResult> m_watcher;
+    QFutureWatcher<Utils::FileSearchResult> m_watcher;
 };
 
 class CppToolsPlugin : public ExtensionSystem::IPlugin