8 files changed, 22 insertions, 22 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 64b84d90dc..89efc17182 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -42,7 +42,7 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
-#include <coreplugin/filemanager.h>
+#include <coreplugin/documentmanager.h>
 #include <extensionsystem/pluginmanager.h>
 #include <qtsupport/qmldumptool.h>
 #include <qtsupport/baseqtversion.h>
@@ -72,7 +72,7 @@ QmlProject::QmlProject(Internal::Manager *manager, const QString &fileName)
     m_file = new Internal::QmlProjectFile(this, fileName);
     m_rootNode = new Internal::QmlProjectNode(this, m_file);
 
-    Core::FileManager::addFile(m_file, true);
+    Core::DocumentManager::addDocument(m_file, true);
 
     m_manager->registerProject(this);
 }
@@ -81,7 +81,7 @@ QmlProject::~QmlProject()
 {
     m_manager->unregisterProject(this);
 
-    Core::FileManager::removeFile(m_file);
+    Core::DocumentManager::removeDocument(m_file);
 
     delete m_projectItem.data();
     delete m_rootNode;
@@ -89,7 +89,7 @@ QmlProject::~QmlProject()
 
 QDir QmlProject::projectDir() const
 {
-    return QFileInfo(file()->fileName()).dir();
+    return QFileInfo(document()->fileName()).dir();
 }
 
 QString QmlProject::filesFileName() const
@@ -262,7 +262,7 @@ QString QmlProject::id() const
     return QLatin1String("QmlProjectManager.QmlProject");
 }
 
-Core::IFile *QmlProject::file() const
+Core::IDocument *QmlProject::document() const
 {
     return m_file;
 }
diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index 0787ec97f7..1d70f3025f 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -70,7 +70,7 @@ public:
 
     QString displayName() const;
     QString id() const;
-    Core::IFile *file() const;
+    Core::IDocument *document() const;
     ProjectExplorer::IProjectManager *projectManager() const;
     Internal::QmlProjectTarget *activeTarget() const;
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp
index af3ca30f86..706e39c4cb 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp
@@ -39,7 +39,7 @@ namespace QmlProjectManager {
 namespace Internal {
 
 QmlProjectFile::QmlProjectFile(QmlProject *parent, QString fileName)
-    : Core::IFile(parent),
+    : Core::IDocument(parent),
       m_project(parent),
       m_fileName(fileName)
 {
@@ -93,7 +93,7 @@ bool QmlProjectFile::isSaveAsAllowed() const
     return false;
 }
 
-Core::IFile::ReloadBehavior QmlProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
+Core::IDocument::ReloadBehavior QmlProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
 {
     Q_UNUSED(state)
     Q_UNUSED(type)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.h b/src/plugins/qmlprojectmanager/qmlprojectfile.h
index deb117d9f0..13fdb0acde 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectfile.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectfile.h
@@ -33,7 +33,7 @@
 #ifndef QMLPROJECTFILE_H
 #define QMLPROJECTFILE_H
 
-#include <coreplugin/ifile.h>
+#include <coreplugin/idocument.h>
 
 namespace QmlProjectManager {
 
@@ -41,7 +41,7 @@ class QmlProject;
 
 namespace Internal {
 
-class QmlProjectFile : public Core::IFile
+class QmlProjectFile : public Core::IDocument
 {
     Q_OBJECT
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp b/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
index 910e99049e..ba40e9c4ba 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
@@ -35,7 +35,7 @@
 #include "qmlproject.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/ifile.h>
+#include <coreplugin/idocument.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
@@ -58,7 +58,7 @@ ProjectExplorer::Project *Manager::openProject(const QString &fileName, QString
     ProjectExplorer::ProjectExplorerPlugin *projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance();
 
     foreach (ProjectExplorer::Project *pi, projectExplorer->session()->projects()) {
-        if (fileName == pi->file()->fileName()) {
+        if (fileName == pi->document()->fileName()) {
             if (errorString)
                 *errorString = tr("Failed opening project '%1': Project already open") .arg(QDir::toNativeSeparators(fileName));
             return 0;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
index f40a20f069..33ef5b669a 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
@@ -34,7 +34,7 @@
 #include "qmlprojectmanager.h"
 #include "qmlproject.h"
 
-#include <coreplugin/ifile.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/fileiconprovider.h>
 #include <projectexplorer/projectexplorer.h>
 
@@ -46,7 +46,7 @@
 namespace QmlProjectManager {
 namespace Internal {
 
-QmlProjectNode::QmlProjectNode(QmlProject *project, Core::IFile *projectFile)
+QmlProjectNode::QmlProjectNode(QmlProject *project, Core::IDocument *projectFile)
     : ProjectExplorer::ProjectNode(QFileInfo(projectFile->fileName()).absoluteFilePath()),
       m_project(project),
       m_projectFile(projectFile)
@@ -64,7 +64,7 @@ QmlProjectNode::QmlProjectNode(QmlProject *project, Core::IFile *projectFile)
 QmlProjectNode::~QmlProjectNode()
 { }
 
-Core::IFile *QmlProjectNode::projectFile() const
+Core::IDocument *QmlProjectNode::projectFile() const
 { return m_projectFile; }
 
 QString QmlProjectNode::projectFilePath() const
diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.h b/src/plugins/qmlprojectmanager/qmlprojectnodes.h
index fdcb6e127c..d9b7502f7f 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectnodes.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.h
@@ -39,7 +39,7 @@
 #include <QHash>
 
 namespace Core {
-class IFile;
+class IDocument;
 }
 
 namespace QmlProjectManager {
@@ -51,10 +51,10 @@ namespace Internal {
 class QmlProjectNode : public ProjectExplorer::ProjectNode
 {
 public:
-    QmlProjectNode(QmlProject *project, Core::IFile *projectFile);
+    QmlProjectNode(QmlProject *project, Core::IDocument *projectFile);
     virtual ~QmlProjectNode();
 
-    Core::IFile *projectFile() const;
+    Core::IDocument *projectFile() const;
     QString projectFilePath() const;
 
     virtual bool hasBuildTargets() const;
@@ -91,7 +91,7 @@ private:
 
 private:
     QmlProject *m_project;
-    Core::IFile *m_projectFile;
+    Core::IDocument *m_projectFile;
     QHash<QString, FolderNode *> m_folderByName;
 };
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 0d1b1f33d9..d2f2384ff4 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -165,7 +165,7 @@ QString QmlProjectRunConfiguration::viewerArguments() const
 
 QString QmlProjectRunConfiguration::workingDirectory() const
 {
-    QFileInfo projectFile(qmlTarget()->qmlProject()->file()->fileName());
+    QFileInfo projectFile(qmlTarget()->qmlProject()->document()->fileName());
     return canonicalCapsPath(projectFile.absolutePath());
 }
 
@@ -321,7 +321,7 @@ bool QmlProjectRunConfiguration::fromMap(const QVariantMap &map)
 void QmlProjectRunConfiguration::changeCurrentFile(Core::IEditor *editor)
 {
     if (editor) {
-        m_currentFileFilename = editor->file()->fileName();
+        m_currentFileFilename = editor->document()->fileName();
     }
     updateEnabled();
 }
@@ -333,7 +333,7 @@ void QmlProjectRunConfiguration::updateEnabled()
         Core::IEditor *editor = Core::EditorManager::instance()->currentEditor();
         Core::MimeDatabase *db = ICore::mimeDatabase();
         if (editor) {
-            m_currentFileFilename = editor->file()->fileName();
+            m_currentFileFilename = editor->document()->fileName();
             if (db->findByFile(mainScript()).type() == QLatin1String("application/x-qml"))
                 qmlFileFound = true;
         }