1 files changed, 4 insertions, 27 deletions
diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index 01b25b1681..e1f97cf178 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -252,7 +252,7 @@ QIcon FolderNode::icon() const
 {
     // Instantiating the Icon provider is expensive.
     if (m_icon.isNull())
-        m_icon = Core::FileIconProvider::instance()->icon(QFileIconProvider::Folder);
+        m_icon = Core::FileIconProvider::icon(QFileIconProvider::Folder);
     return m_icon;
 }
 
@@ -353,11 +353,12 @@ ProjectNode::ProjectNode(const QString &projectFilePath)
     setDisplayName(QFileInfo(projectFilePath).fileName());
 }
 
-QString ProjectNode::vcsTopic() const {
+QString ProjectNode::vcsTopic() const
+{
     const QString dir = QFileInfo(path()).absolutePath();
 
     if (Core::IVersionControl *const vc =
-            Core::ICore::vcsManager()->findVersionControlForDirectory(dir))
+            Core::VcsManager::findVersionControlForDirectory(dir))
         return vc->vcsTopic(dir);
 
     return QString();
@@ -850,27 +851,3 @@ NodesWatcher::NodesWatcher(QObject *parent)
         : QObject(parent)
 {
 }
-
-// TODO Maybe put this in core, so that all can benefit
-FileType typeForFileName(const Core::MimeDatabase *db, const QFileInfo &file)
-{
-    const Core::MimeType mt = db->findByFile(file);
-    if (!mt)
-        return UnknownFileType;
-
-    const QString typeName = mt.type();
-    if (typeName == QLatin1String(Constants::CPP_SOURCE_MIMETYPE)
-        || typeName == QLatin1String(Constants::C_SOURCE_MIMETYPE))
-        return SourceType;
-    if (typeName == QLatin1String(Constants::CPP_HEADER_MIMETYPE)
-        || typeName == QLatin1String(Constants::C_HEADER_MIMETYPE))
-        return HeaderType;
-    if (typeName == QLatin1String(Constants::RESOURCE_MIMETYPE))
-        return ResourceType;
-    if (typeName == QLatin1String(Constants::FORM_MIMETYPE))
-        return FormType;
-    if (mt.subClassesOf().contains(QLatin1String(Constants::QML_MIMETYPE))
-            || typeName == QLatin1String(Constants::QML_MIMETYPE))
-        return QMLType;
-    return UnknownFileType;
-}