4 files changed, 28 insertions, 28 deletions
diff --git a/src/plugins/resourceeditor/resourceeditorfactory.cpp b/src/plugins/resourceeditor/resourceeditorfactory.cpp
index 85c64688d4..30f25de2e4 100644
--- a/src/plugins/resourceeditor/resourceeditorfactory.cpp
+++ b/src/plugins/resourceeditor/resourceeditorfactory.cpp
@@ -64,14 +64,14 @@ QString ResourceEditorFactory::displayName() const
     return tr(C_RESOURCEEDITOR_DISPLAY_NAME);
 }
 
-Core::IFile *ResourceEditorFactory::open(const QString &fileName)
+Core::IDocument *ResourceEditorFactory::open(const QString &fileName)
 {
     Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, id());
     if (!iface) {
         qWarning() << "ResourceEditorFactory::open: openEditor failed for " << fileName;
         return 0;
     }
-    return iface->file();
+    return iface->document();
 }
 
 Core::IEditor *ResourceEditorFactory::createEditor(QWidget *parent)
diff --git a/src/plugins/resourceeditor/resourceeditorfactory.h b/src/plugins/resourceeditor/resourceeditorfactory.h
index 376232c1bd..54dc1b5cfd 100644
--- a/src/plugins/resourceeditor/resourceeditorfactory.h
+++ b/src/plugins/resourceeditor/resourceeditorfactory.h
@@ -55,7 +55,7 @@ public:
     // IEditorFactory
     Core::Id id() const;
     QString displayName() const;
-    Core::IFile *open(const QString &fileName);
+    Core::IDocument *open(const QString &fileName);
     Core::IEditor *createEditor(QWidget *parent);
 
 private:
diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp
index 85d415cd7f..cdd3af193d 100644
--- a/src/plugins/resourceeditor/resourceeditorw.cpp
+++ b/src/plugins/resourceeditor/resourceeditorw.cpp
@@ -38,7 +38,7 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/filemanager.h>
+#include <coreplugin/documentmanager.h>
 #include <utils/reloadpromptutils.h>
 #include <utils/fileutils.h>
 
@@ -57,8 +57,8 @@ enum { debugResourceEditorW = 0 };
 
 
 
-ResourceEditorFile::ResourceEditorFile(ResourceEditorW *parent) :
-    IFile(parent),
+ResourceEditorDocument::ResourceEditorDocument(ResourceEditorW *parent) :
+    IDocument(parent),
     m_mimeType(QLatin1String(ResourceEditor::Constants::C_RESOURCE_MIMETYPE)),
     m_parent(parent)
 {
@@ -66,7 +66,7 @@ ResourceEditorFile::ResourceEditorFile(ResourceEditorW *parent) :
         qDebug() <<  "ResourceEditorFile::ResourceEditorFile()";
 }
 
-QString ResourceEditorFile::mimeType() const
+QString ResourceEditorDocument::mimeType() const
 {
     return m_mimeType;
 }
@@ -76,7 +76,7 @@ ResourceEditorW::ResourceEditorW(const Core::Context &context,
                                ResourceEditorPlugin *plugin,
                                QWidget *parent)
       : m_resourceEditor(new SharedTools::QrcEditor(parent)),
-        m_resourceFile(new ResourceEditorFile(this)),
+        m_resourceDocument(new ResourceEditorDocument(this)),
         m_plugin(plugin),
         m_shouldAutoSave(false),
         m_diskIo(false),
@@ -92,7 +92,7 @@ ResourceEditorW::ResourceEditorW(const Core::Context &context,
     // (That is because this editor instance is deleted in executeOpenWithMenuAction
     // in that case.)
     connect(m_openWithMenu, SIGNAL(triggered(QAction*)),
-            Core::FileManager::instance(), SLOT(slotExecuteOpenWithMenuAction(QAction*)),
+            Core::DocumentManager::instance(), SLOT(slotExecuteOpenWithMenuAction(QAction*)),
             Qt::QueuedConnection);
 
     connect(m_resourceEditor, SIGNAL(dirtyChanged(bool)), this, SLOT(dirtyChanged(bool)));
@@ -102,7 +102,7 @@ ResourceEditorW::ResourceEditorW(const Core::Context &context,
             this, SLOT(showContextMenu(QPoint,QString)));
     connect(m_resourceEditor->commandHistory(), SIGNAL(indexChanged(int)),
             this, SLOT(setShouldAutoSave()));
-    connect(m_resourceFile, SIGNAL(changed()), this, SIGNAL(changed()));
+    connect(m_resourceDocument, SIGNAL(changed()), this, SIGNAL(changed()));
     if (debugResourceEditorW)
         qDebug() <<  "ResourceEditorW::ResourceEditorW()";
 }
@@ -158,7 +158,7 @@ bool ResourceEditorW::open(QString *errorString, const QString &fileName, const
     return true;
 }
 
-bool ResourceEditorFile::save(QString *errorString, const QString &name, bool autoSave)
+bool ResourceEditorDocument::save(QString *errorString, const QString &name, bool autoSave)
 {
     if (debugResourceEditorW)
         qDebug(">ResourceEditorW::save: %s", qPrintable(name));
@@ -192,7 +192,7 @@ bool ResourceEditorFile::save(QString *errorString, const QString &name, bool au
     return true;
 }
 
-void ResourceEditorFile::rename(const QString &newName)
+void ResourceEditorDocument::rename(const QString &newName)
 {
     m_parent->m_resourceEditor->setFileName(newName);
     emit changed();
@@ -203,27 +203,27 @@ Core::Id ResourceEditorW::id() const
     return Core::Id(ResourceEditor::Constants::RESOURCEEDITOR_ID);
 }
 
-QString ResourceEditorFile::fileName() const
+QString ResourceEditorDocument::fileName() const
 {
     return m_parent->m_resourceEditor->fileName();
 }
 
-bool ResourceEditorFile::shouldAutoSave() const
+bool ResourceEditorDocument::shouldAutoSave() const
 {
     return m_parent->m_shouldAutoSave;
 }
 
-bool ResourceEditorFile::isModified() const
+bool ResourceEditorDocument::isModified() const
 {
     return m_parent->m_resourceEditor->isDirty();
 }
 
-bool ResourceEditorFile::isSaveAsAllowed() const
+bool ResourceEditorDocument::isSaveAsAllowed() const
 {
     return true;
 }
 
-bool ResourceEditorFile::reload(QString *errorString, ReloadFlag flag, ChangeType type)
+bool ResourceEditorDocument::reload(QString *errorString, ReloadFlag flag, ChangeType type)
 {
     if (flag == FlagIgnore)
         return true;
@@ -239,7 +239,7 @@ bool ResourceEditorFile::reload(QString *errorString, ReloadFlag flag, ChangeTyp
     return true;
 }
 
-QString ResourceEditorFile::defaultPath() const
+QString ResourceEditorDocument::defaultPath() const
 {
     return QString();
 }
@@ -249,7 +249,7 @@ void ResourceEditorW::setSuggestedFileName(const QString &fileName)
     m_suggestedName = fileName;
 }
 
-QString ResourceEditorFile::suggestedFileName() const
+QString ResourceEditorDocument::suggestedFileName() const
 {
     return m_parent->m_suggestedName;
 }
@@ -271,7 +271,7 @@ void ResourceEditorW::onUndoStackChanged(bool canUndo, bool canRedo)
 
 void ResourceEditorW::showContextMenu(const QPoint &globalPoint, const QString &fileName)
 {
-    Core::FileManager::populateOpenWithMenu(m_openWithMenu, fileName);
+    Core::DocumentManager::populateOpenWithMenu(m_openWithMenu, fileName);
     if (!m_openWithMenu->actions().isEmpty())
         m_contextMenu->popup(globalPoint);
 }
diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h
index 55ce8a3e6c..d74a97711d 100644
--- a/src/plugins/resourceeditor/resourceeditorw.h
+++ b/src/plugins/resourceeditor/resourceeditorw.h
@@ -33,7 +33,7 @@
 #ifndef RESOURCEDITORW_H
 #define RESOURCEDITORW_H
 
-#include <coreplugin/ifile.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/editormanager/ieditor.h>
 
 #include <QPointer>
@@ -52,15 +52,15 @@ namespace Internal {
 class ResourceEditorPlugin;
 class ResourceEditorW;
 
-class ResourceEditorFile
-  : public virtual Core::IFile
+class ResourceEditorDocument
+  : public virtual Core::IDocument
 {
     Q_OBJECT
 
 public:
-    ResourceEditorFile(ResourceEditorW *parent = 0);
+    ResourceEditorDocument(ResourceEditorW *parent = 0);
 
-    //IFile
+    //IDocument
     bool save(QString *errorString, const QString &fileName, bool autoSave);
     QString fileName() const;
     bool shouldAutoSave() const;
@@ -92,7 +92,7 @@ public:
     bool open(QString *errorString, const QString &fileName, const QString &realFileName);
     bool duplicateSupported() const { return false; }
     Core::IEditor *duplicate(QWidget *) { return 0; }
-    Core::IFile *file() { return m_resourceFile; }
+    Core::IDocument *document() { return m_resourceDocument; }
     Core::Id id() const;
     QString displayName() const { return m_displayName; }
     void setDisplayName(const QString &title) { m_displayName = title; emit changed(); }
@@ -115,7 +115,7 @@ private:
     QString m_displayName;
     QString m_suggestedName;
     QPointer<SharedTools::QrcEditor> m_resourceEditor;
-    ResourceEditorFile *m_resourceFile;
+    ResourceEditorDocument *m_resourceDocument;
     ResourceEditorPlugin *m_plugin;
     bool m_shouldAutoSave;
     bool m_diskIo;
@@ -126,7 +126,7 @@ public:
     void onUndo();
     void onRedo();
 
-    friend class ResourceEditorFile;
+    friend class ResourceEditorDocument;
 };
 
 } // namespace Internal