diff --git a/plugins/quickopen/duchainitemquickopen.cpp b/plugins/quickopen/duchainitemquickopen.cpp
index 13acab1a3b..de3095041e 100644
--- a/plugins/quickopen/duchainitemquickopen.cpp
+++ b/plugins/quickopen/duchainitemquickopen.cpp
@@ -1,250 +1,247 @@
 /* This file is part of the KDE libraries
    Copyright (C) 2007 David Nolden <david.nolden.kdevelop@art-master.de>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "projectitemquickopen.h"
 
 #include <QIcon>
 #include <QTextBrowser>
 
 #include <KLocalizedString>
 
 #include <interfaces/iprojectcontroller.h>
 #include <interfaces/idocumentcontroller.h>
 #include <interfaces/icore.h>
 
 #include <language/interfaces/iquickopen.h>
 
 #include <language/duchain/duchain.h>
 #include <language/duchain/duchainlock.h>
 #include <language/duchain/declaration.h>
 #include <serialization/indexedstring.h>
 #include <language/duchain/types/functiontype.h>
 #include <language/duchain/functiondefinition.h>
 
 using namespace KDevelop;
 
 DUChainItemData::DUChainItemData( const DUChainItem& file, bool openDefinition )
 : m_item(file)
 , m_openDefinition(openDefinition)
 {
 }
 
 QString DUChainItemData::text() const
 {
   DUChainReadLocker lock;;
   Declaration* decl = m_item.m_item.data();
   if(!decl)
     return i18n("Not available any more: %1", m_item.m_text);
 
   if(FunctionDefinition* def = dynamic_cast<FunctionDefinition*>(decl)) {
     if(def->declaration()) {
       decl = def->declaration();
     }
   }
 
   QString text = decl->qualifiedIdentifier().toString();
 
   if(!decl->abstractType()) {
     //With simplified representation, still mark functions as such by adding parens
     if(dynamic_cast<AbstractFunctionDeclaration*>(decl)) {
       text += QLatin1String("(...)");
     }
   }else if(TypePtr<FunctionType> function = decl->type<FunctionType>()) {
     text += function->partToString( FunctionType::SignatureArguments );
   }
 
   return text;
 }
 
 QList<QVariant> DUChainItemData::highlighting() const
 {
   DUChainReadLocker lock;;
 
   Declaration* decl = m_item.m_item.data();
   if(!decl) {
     return QList<QVariant>();
   }
 
   if(FunctionDefinition* def = dynamic_cast<FunctionDefinition*>(decl)) {
     if(def->declaration()) {
       decl = def->declaration();
     }
   }
 
   QTextCharFormat boldFormat;
   boldFormat.setFontWeight(QFont::Bold);
   QTextCharFormat normalFormat;
 
   int prefixLength = 0;
 
   QString signature;
   TypePtr<FunctionType> function = decl->type<FunctionType>();
   if(function) {
     signature = function->partToString( FunctionType::SignatureArguments );
   }
 
   //Only highlight the last part of the qualified identifier, so the scope doesn't distract too much
   QualifiedIdentifier id = decl->qualifiedIdentifier();
   QString fullId = id.toString();
   QString lastId;
   if(!id.isEmpty()) {
     lastId = id.last().toString();
   }
 
   prefixLength += fullId.length() - lastId.length();
 
   QList<QVariant> ret;
   ret << 0;
   ret << prefixLength;
   ret << QVariant(normalFormat);
   ret << prefixLength;
   ret << lastId.length();
   ret << QVariant(boldFormat);
   if(!signature.isEmpty()) {
     ret << prefixLength + lastId.length();
     ret << signature.length();
     ret << QVariant(normalFormat);
   }
 
   return ret;
 
 }
 
 QString DUChainItemData::htmlDescription() const
 {
   if(m_item.m_noHtmlDestription) {
     return QString();
   }
 
   DUChainReadLocker lock;;
   Declaration* decl = m_item.m_item.data();
   if(!decl) {
     return i18n("Not available any more");
   }
 
   TypePtr<FunctionType> function = decl->type<FunctionType>();
 
   QString text;
 
   if( function && function->returnType() ) {
     text = i18nc("%1: function signature", "Return: %1",
                   function->partToString(FunctionType::SignatureReturn)) + QLatin1String(" ");
   }
 
   text += i18nc("%1: file path", "File: %1", ICore::self()->projectController()->prettyFileName(decl->url().toUrl()));
 
   QString ret = "<small><small>" + text + "</small></small>";
 
   return ret;
 }
 
 bool DUChainItemData::execute( QString& /*filterText*/ )
 {
   DUChainReadLocker lock;;
   Declaration* decl = m_item.m_item.data();
   if(!decl) {
     return false;
   }
 
   if(m_openDefinition && FunctionDefinition::definition(decl)) {
     decl = FunctionDefinition::definition(decl);
   }
 
   QUrl url = decl->url().toUrl();
   KTextEditor::Cursor cursor = decl->rangeInCurrentRevision().start();
 
   DUContext* internal = decl->internalContext();
 
   if(internal && (internal->type() == DUContext::Other || internal->type() == DUContext::Class)) {
     //Move into the body
     if(internal->range().end.line > internal->range().start.line) {
       cursor = KTextEditor::Cursor(internal->range().start.line+1, 0); //Move into the body
     }
   }
 
   lock.unlock();
   ICore::self()->documentController()->openDocument( url, cursor );
   return true;
 }
 
 bool DUChainItemData::isExpandable() const
 {
   return true;
 }
 
 QWidget* DUChainItemData::expandingWidget() const
 {
   DUChainReadLocker lock;;
 
   Declaration* decl = dynamic_cast<KDevelop::Declaration*>(m_item.m_item.data());
   if( !decl || !decl->context() ) {
     return 0;
   }
 
   return decl->context()->createNavigationWidget( decl, decl->topContext(),
-            m_item.m_project.isEmpty()
-                ? QString()
-                : ("<small><small>" + i18n("Project %1", m_item.m_project) + "<br></small></small>"), QString(),
-         KDevelop::AbstractNavigationWidget::EmbeddableWidget);
+            QString(), QString(), AbstractNavigationWidget::EmbeddableWidget);
 }
 
 QIcon DUChainItemData::icon() const
 {
   return QIcon();
 }
 
 DUChainItemDataProvider::DUChainItemDataProvider( IQuickOpen* quickopen, bool openDefinitions )
 : m_quickopen(quickopen)
 , m_openDefinitions(openDefinitions)
 {
   reset();
 }
 
 void DUChainItemDataProvider::setFilterText( const QString& text )
 {
   Base::setFilter( text );
 }
 
 uint DUChainItemDataProvider::itemCount() const
 {
   return Base::filteredItems().count();
 }
 
 uint DUChainItemDataProvider::unfilteredItemCount() const
 {
   return Base::items().count();
 }
 
 QuickOpenDataPointer DUChainItemDataProvider::data( uint row ) const
 {
   return KDevelop::QuickOpenDataPointer( createData( Base::filteredItems()[row] ) );
 }
 
 DUChainItemData* DUChainItemDataProvider::createData( const DUChainItem& item ) const
 {
   return new DUChainItemData( item, m_openDefinitions );
 }
 
 QString DUChainItemDataProvider::itemText( const DUChainItem& data ) const
 {
   return data.m_text;
 }
 
 void DUChainItemDataProvider::reset()
 {
 }
diff --git a/plugins/quickopen/duchainitemquickopen.h b/plugins/quickopen/duchainitemquickopen.h
index fe96265f87..cba333e836 100644
--- a/plugins/quickopen/duchainitemquickopen.h
+++ b/plugins/quickopen/duchainitemquickopen.h
@@ -1,103 +1,102 @@
 /* This file is part of the KDE libraries
    Copyright (C) 2007 David Nolden <david.nolden.kdevelop@art-master.de>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #ifndef DUCHAIN_ITEM_QUICKOPEN
 #define DUCHAIN_ITEM_QUICKOPEN
 
 #include <language/interfaces/quickopendataprovider.h>
 #include <language/interfaces/quickopenfilter.h>
 #include <language/duchain/duchainpointer.h>
 #include <language/duchain/declaration.h>
 
 
 namespace KDevelop {
   class IQuickOpen;
 }
 
 struct DUChainItem
 {
   DUChainItem()
   : m_noHtmlDestription(false)
   {
   }
   KDevelop::IndexedDeclaration m_item;
   QString m_text;
-  QString m_project;
   bool m_noHtmlDestription;
 };
 
 Q_DECLARE_TYPEINFO(DUChainItem, Q_MOVABLE_TYPE);
 
 class DUChainItemData : public KDevelop::QuickOpenDataBase
 {
   public:
     explicit DUChainItemData( const DUChainItem& item, bool openDefinition = false );
 
     QString text() const override;
     QString htmlDescription() const override;
     QList<QVariant> highlighting() const override;
 
     bool execute( QString& filterText ) override;
 
     bool isExpandable() const override;
     QWidget* expandingWidget() const override;
 
     QIcon icon() const override;
 
 private:
     DUChainItem m_item;
     bool m_openDefinition;
 };
 
 /**
  * A QuickOpenDataProvider that presents a list of declarations.
  * The declarations need to be set using setItems(..) in a re-implemented reset() function.
  * */
 
 class DUChainItemDataProvider : public KDevelop::QuickOpenDataProviderBase,
                                 public KDevelop::Filter<DUChainItem>
 {
     Q_OBJECT
 public:
     typedef KDevelop::Filter<DUChainItem> Base;
 
     /// When openDefinitions is true, the definitions will be opened if available on execute().
     explicit DUChainItemDataProvider( KDevelop::IQuickOpen* quickopen, bool openDefinitions = false );
     void setFilterText( const QString& text ) override;
     uint itemCount() const override;
     uint unfilteredItemCount() const override;
     KDevelop::QuickOpenDataPointer data( uint row ) const override;
 
     void reset() override;
 
 protected:
     //Override to create own DUChainItemData derived classes
     DUChainItemData* createData( const DUChainItem& item ) const;
 
     //Reimplemented from Base<..>
     QString itemText( const DUChainItem& data ) const override;
 
     KDevelop::IQuickOpen* m_quickopen;
 
 private:
     bool m_openDefinitions;
 };
 
 
 #endif
 
diff --git a/plugins/quickopen/projectitemquickopen.cpp b/plugins/quickopen/projectitemquickopen.cpp
index 1a5a17b586..76f96d26dc 100644
--- a/plugins/quickopen/projectitemquickopen.cpp
+++ b/plugins/quickopen/projectitemquickopen.cpp
@@ -1,363 +1,361 @@
 /* This file is part of the KDE libraries
    Copyright (C) 2007 David Nolden <david.nolden.kdevelop@art-master.de>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "projectitemquickopen.h"
 #include "debug.h"
 
 #include <language/duchain/topducontext.h>
 #include <language/duchain/duchain.h>
 #include <language/duchain/duchainlock.h>
 #include <language/duchain/declaration.h>
 #include <language/duchain/abstractfunctiondeclaration.h>
 #include <language/duchain/types/structuretype.h>
 #include <language/duchain/duchainutils.h>
 #include <language/duchain/codemodel.h>
 #include <language/interfaces/iquickopen.h>
 #include <language/interfaces/abbreviations.h>
 
 #include <interfaces/iproject.h>
 #include <interfaces/icore.h>
 
 #include <project/projectmodel.h>
 
 #include <KLocalizedString>
 
 using namespace KDevelop;
 
 struct SubstringCache
 {
     SubstringCache( const QString& string = QString() )
     : substring(string)
     {
     }
 
     inline int containedIn( const Identifier& id ) const
     {
         int index = id.index();
         QHash<int, int>::const_iterator it = cache.constFind(index);
         if(it != cache.constEnd()) {
             return *it;
         }
 
         const QString idStr = id.identifier().str();
 
         int result = idStr.lastIndexOf(substring, -1, Qt::CaseInsensitive);
         if (result < 0 && !idStr.isEmpty() && !substring.isEmpty()) {
             // no match; try abbreviations
             result = matchesAbbreviation(idStr.midRef(0), substring) ? 0 : -1;
         }
 
         //here we shift the values if the matched string is bigger than the substring,
         //so closer matches will appear first
         if (result >= 0) {
             result = result + (idStr.size() - substring.size());
         }
 
         cache[index] = result;
 
         return result;
     }
 
     QString substring;
     mutable QHash<int, int> cache;
 };
 
 struct ClosestMatchToText
 {
     ClosestMatchToText( const QHash<int , int>& _cache )
     : cache(_cache)
     {
     }
 
     /** @brief Calculates the distance to two pre-filtered match items
      *
      *  @param a The CodeModelView witch represents the first item to be tested
      *  @param b The CodeModelView witch represents the second item to be tested
      *
      *  @b
      */
     inline bool operator()( const CodeModelViewItem& a, const CodeModelViewItem& b ) const
     {
         const int height_a = cache.value(a.m_id.index(), -1);
         const int height_b = cache.value(b.m_id.index(), -1);
 
         Q_ASSERT(height_a != -1);
         Q_ASSERT(height_b != -1);
 
         if (height_a == height_b) {
             // stable sorting for equal items based on index
             // TODO: fast string-based sorting in such cases?
             return a.m_id.index() < b.m_id.index();
         }
 
         return height_a < height_b;
     }
 
 private:
     const QHash<int , int>& cache;
 };
 
 ProjectItemDataProvider::ProjectItemDataProvider( KDevelop::IQuickOpen* quickopen )
 : m_quickopen(quickopen)
 {
 }
 
 void ProjectItemDataProvider::setFilterText( const QString& text )
 {
     m_addedItems.clear();
 
     QStringList search(text.split(QStringLiteral("::"), QString::SkipEmptyParts));
     for(int a = 0; a < search.count(); ++a) {
         if(search[a].endsWith(':')) { //Don't get confused while the :: is being typed
             search[a] = search[a].left(search[a].length()-1);
         }
     }
     if(!search.isEmpty() && search.back().endsWith('(')) {
         search.back().chop(1);
     }
 
     if(text.isEmpty() || search.isEmpty()) {
         m_filteredItems = m_currentItems;
         return;
     }
 
     KDevVarLengthArray<SubstringCache, 5> cache;
     foreach(const QString& searchPart, search) {
         cache.append(SubstringCache(searchPart));
     }
 
     if(!text.startsWith(m_currentFilter)) {
         m_filteredItems = m_currentItems;
     }
 
     m_currentFilter = text;
 
     QVector<CodeModelViewItem> oldFiltered = m_filteredItems;
     QHash<int , int> heights;
 
     m_filteredItems.clear();
 
     foreach(const CodeModelViewItem& item, oldFiltered) {
         const QualifiedIdentifier& currentId = item.m_id;
 
         int last_pos = currentId.count() - 1;
         int current_height = 0;
         int distance = 0;
 
         //iter over each search item from last to first
         //this makes easier to calculate the distance based on where we hit the result or nothing
         //Iterating from the last item to the first is more efficient, as we want to match the
         //class/function name, which is the last item on the search fields and on the identifier.
         for(int b = search.count() - 1; b >= 0; --b) {
             //iter over each id for the current identifier, from last to first
             for(; last_pos >= 0; --last_pos, distance++) {
                 // the more distant we are from the class definition, the less priority it will have
                 current_height += distance * 10000;
                 int result;
                 //if the current search item is contained on the current identifier
                 if((result = cache[b].containedIn( currentId.at(last_pos) )) >= 0) {
                     //when we find a hit, whe add the distance to the searched word.
                     //so the closest item will be displayed first
                     current_height += result;
 
                     if(b == 0) {
                         heights[currentId.index()] = current_height;
                         m_filteredItems << item;
                     }
                     break;
                 }
             }
         }
     }
 
     //then, for the last part, we use the already built cache to sort the items according with their distance
     std::sort(m_filteredItems.begin(), m_filteredItems.end(), ClosestMatchToText(heights));
 }
 
 QList<KDevelop::QuickOpenDataPointer> ProjectItemDataProvider::data( uint start, uint end ) const
 {
     QList<KDevelop::QuickOpenDataPointer> ret;
     for(uint a = start; a < end; ++a) {
         ret << data(a);
     }
     return ret;
 }
 
 KDevelop::QuickOpenDataPointer ProjectItemDataProvider::data( uint pos ) const
 {
     //Check whether this position falls into an appended item-list, else apply the offset
     uint filteredItemOffset = 0;
     for(AddedItems::const_iterator it = m_addedItems.constBegin(); it != m_addedItems.constEnd(); ++it) {
         int offsetInAppended = pos - (it.key()+1);
         if(offsetInAppended >= 0 && offsetInAppended < it.value().count()) {
             return it.value()[offsetInAppended];
         }
         if(it.key() >= pos) {
             break;
         }
         filteredItemOffset += it.value().count();
     }
 
     uint a = pos - filteredItemOffset;
     if(a > (uint)m_filteredItems.size()) {
         return KDevelop::QuickOpenDataPointer();
     }
 
     QList<KDevelop::QuickOpenDataPointer> ret;
     KDevelop::DUChainReadLocker lock( DUChain::lock() );
     TopDUContext* ctx = DUChainUtils::standardContextForUrl(m_filteredItems[a].m_file.toUrl());
     if(ctx) {
         QList<Declaration*> decls = ctx->findDeclarations(m_filteredItems[a].m_id, CursorInRevision::invalid(), AbstractType::Ptr(), 0, DUContext::DirectQualifiedLookup);
 
         //Filter out forward-declarations or duplicate imported declarations
         foreach(Declaration* decl, decls) {
             bool filter = false;
             if (decls.size() > 1 && decl->isForwardDeclaration()) {
                 filter = true;
             } else if (decl->url() != m_filteredItems[a].m_file && m_files.contains(decl->url())) {
                 filter = true;
             }
             if (filter) {
                 decls.removeOne(decl);
             }
         }
 
         foreach(Declaration* decl, decls) {
             DUChainItem item;
             item.m_item = decl;
             item.m_text = decl->qualifiedIdentifier().toString();
-            //item.m_project =  .. @todo fill
             ret << QuickOpenDataPointer(new DUChainItemData(item));
         }
         if(decls.isEmpty()) {
             DUChainItem item;
             item.m_text = m_filteredItems[a].m_id.toString();
-            //item.m_project =  .. @todo fill
             ret << QuickOpenDataPointer(new DUChainItemData(item));
         }
     } else {
         qCDebug(PLUGIN_QUICKOPEN) << "Could not find standard-context";
     }
 
     if(!ret.isEmpty()) {
         QList<KDevelop::QuickOpenDataPointer> append = ret.mid(1);
         if(!append.isEmpty()) {
             AddedItems addMap;
             for(AddedItems::iterator it = m_addedItems.begin(); it != m_addedItems.end();) {
                 if(it.key() == pos) { //There already is appended data stored, nothing to do
                     return ret.first();
                 } else if(it.key() > pos) {
                     addMap[it.key() + append.count()] = it.value();
                     it = m_addedItems.erase(it);
                 } else {
                     ++it;
                 }
             }
 
             m_addedItems.insert(pos, append);
 
             for(AddedItems::const_iterator it = addMap.constBegin(); it != addMap.constEnd(); ++it) {
                 m_addedItems.insert(it.key(), it.value());
             }
         }
         return ret.first();
     } else {
         return KDevelop::QuickOpenDataPointer();
     }
 }
 
 void ProjectItemDataProvider::reset()
 {
     m_files = m_quickopen->fileSet();
     m_currentItems.clear();
     m_addedItems.clear();
 
     KDevelop::DUChainReadLocker lock( DUChain::lock() );
     foreach( const IndexedString& u, m_files ) {
         uint count;
         const KDevelop::CodeModelItem* items;
         CodeModel::self().items( u, count, items );
 
         for(uint a = 0; a < count; ++a) {
             if(!items[a].id.isValid() || items[a].kind & CodeModelItem::ForwardDeclaration) {
                 continue;
             }
             if(((m_itemTypes & Classes) && (items[a].kind & CodeModelItem::Class)) ||
                     ((m_itemTypes & Functions) && (items[a].kind & CodeModelItem::Function)))
             {
                 QualifiedIdentifier id = items[a].id.identifier();
 
                 if (id.isEmpty() || id.at(0).identifier().isEmpty()) {
                     // id.isEmpty() not always hit when .toString() is actually empty...
                     // anyhow, this makes sure that we don't show duchain items without
                     // any name that could be searched for. This happens e.g. in the c++
                     // plugin for anonymous structs or sometimes for declarations in macro
                     // expressions
                     continue;
                 }
                 m_currentItems << CodeModelViewItem(u, id);
             }
         }
     }
 
     m_filteredItems = m_currentItems;
     m_currentFilter.clear();
 }
 
 uint addedItems(const AddedItems& items)
 {
     uint add = 0;
     for(AddedItems::const_iterator it = items.constBegin(); it != items.constEnd(); ++it) {
         add += it.value().count();
     }
     return add;
 }
 
 uint ProjectItemDataProvider::itemCount() const
 {
     return m_filteredItems.count() + addedItems(m_addedItems);
 }
 
 uint ProjectItemDataProvider::unfilteredItemCount() const
 {
     return m_currentItems.count() + addedItems(m_addedItems);
 }
 
 QStringList ProjectItemDataProvider::supportedItemTypes()
 {
     QStringList ret;
     ret << i18n("Classes");
     ret << i18n("Functions");
     return ret;
 }
 
 void ProjectItemDataProvider::enableData( const QStringList& items, const QStringList& scopes )
 {
     //FIXME: property support different scopes
     if(scopes.contains(i18n("Project"))) {
         m_itemTypes = NoItems;
         if(items.contains(i18n("Classes"))) {
             m_itemTypes = (ItemTypes)(m_itemTypes | Classes);
         }
         if( items.contains(i18n("Functions"))) {
             m_itemTypes = (ItemTypes)(m_itemTypes | Functions);
         }
     } else {
         m_itemTypes = NoItems;
     }
 }