Rename IFile->IDocument and FileManager->DocumentManager

And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

8 files changed, 18 insertions, 18 deletions

diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index e4e0b712d5..a7f60d35be 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -544,7 +544,7 @@ void CPPEditorWidget::createToolBar(CPPEditor *editor)
     connect(m_outlineCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(updateOutlineToolTip()));
     connect(document(), SIGNAL(contentsChange(int,int,int)), this, SLOT(onContentsChanged(int,int,int)));
 
-    connect(file(), SIGNAL(changed()), this, SLOT(updateFileName()));
+    connect(editorDocument(), SIGNAL(changed()), this, SLOT(updateFileName()));
 
     // set up function declaration - definition link
     connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(updateFunctionDeclDefLink()));
@@ -675,7 +675,7 @@ void CPPEditorWidget::abortRename()
 
 void CPPEditorWidget::onDocumentUpdated(Document::Ptr doc)
 {
-    if (doc->fileName() != file()->fileName())
+    if (doc->fileName() != editorDocument()->fileName())
         return;
 
     if (doc->editorRevision() != editorRevision())
@@ -685,7 +685,7 @@ void CPPEditorWidget::onDocumentUpdated(Document::Ptr doc)
             (Core::EditorManager::instance()->currentEditor() == editor()
              && (!m_lastSemanticInfo.doc
                  || !m_lastSemanticInfo.doc->translationUnit()->ast()
-                 || m_lastSemanticInfo.doc->fileName() != file()->fileName()))) {
+                 || m_lastSemanticInfo.doc->fileName() != editorDocument()->fileName()))) {
         m_initialized = true;
         semanticRehighlight(/* force = */ true);
     }
@@ -901,7 +901,7 @@ bool CPPEditorWidget::sortedOutline() const
 void CPPEditorWidget::updateOutlineNow()
 {
     const Snapshot snapshot = m_modelManager->snapshot();
-    Document::Ptr document = snapshot.document(file()->fileName());
+    Document::Ptr document = snapshot.document(editorDocument()->fileName());
 
     if (!document)
         return;
@@ -1047,7 +1047,7 @@ void CPPEditorWidget::switchDeclarationDefinition()
 
     const Snapshot snapshot = m_modelManager->snapshot();
 
-    if (Document::Ptr thisDocument = snapshot.document(file()->fileName())) {
+    if (Document::Ptr thisDocument = snapshot.document(editorDocument()->fileName())) {
         int line = 0, positionInBlock = 0;
         convertPosition(position(), &line, &positionInBlock);
 
@@ -1281,7 +1281,7 @@ CPPEditorWidget::Link CPPEditorWidget::findLinkAt(const QTextCursor &cursor,
     }
 
     // Now we prefer the doc from the snapshot with macros expanded.
-    Document::Ptr doc = snapshot.document(file()->fileName());
+    Document::Ptr doc = snapshot.document(editorDocument()->fileName());
     if (!doc) {
         doc = m_lastSemanticInfo.doc;
         if (!doc)
@@ -1411,7 +1411,7 @@ CPPEditorWidget::Link CPPEditorWidget::findLinkAt(const QTextCursor &cursor,
         foreach (const LookupItem &r, resolvedSymbols) {
             if (Symbol *d = r.declaration()) {
                 if (d->isDeclaration() || d->isFunction()) {
-                    if (file()->fileName() == QString::fromUtf8(d->fileName(), d->fileNameLength())) {
+                    if (editorDocument()->fileName() == QString::fromUtf8(d->fileName(), d->fileNameLength())) {
                         if (unsigned(lineNumber) == d->line() && unsigned(positionInBlock) >= d->column()) { // ### TODO: check the end
                             result = r; // take the symbol under cursor.
                             break;
@@ -1820,7 +1820,7 @@ void CPPEditorWidget::updateSemanticInfo(const SemanticInfo &semanticInfo)
 
     // We can use the semanticInfo's snapshot (and avoid locking), but not its
     // document, since it doesn't contain expanded macros.
-    LookupContext context(semanticInfo.snapshot.document(file()->fileName()),
+    LookupContext context(semanticInfo.snapshot.document(editorDocument()->fileName()),
                           semanticInfo.snapshot);
 
     SemanticInfo::LocalUseIterator it(semanticInfo.localUses);
@@ -1984,7 +1984,7 @@ SemanticHighlighter::Source CPPEditorWidget::currentSource(bool force)
     convertPosition(position(), &line, &column);
 
     const Snapshot snapshot = m_modelManager->snapshot();
-    const QString fileName = file()->fileName();
+    const QString fileName = editorDocument()->fileName();
 
     QString code;
     if (force || m_lastSemanticInfo.revision != editorRevision())
diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp
index 980768e593..faa723a215 100644
--- a/src/plugins/cppeditor/cppelementevaluator.cpp
+++ b/src/plugins/cppeditor/cppelementevaluator.cpp
@@ -32,7 +32,7 @@
 
 #include "cppelementevaluator.h"
 
-#include <coreplugin/ifile.h>
+#include <coreplugin/idocument.h>
 #include <cpptools/cpptoolsreuse.h>
 
 #include <FullySpecifiedType.h>
@@ -100,7 +100,7 @@ void CppElementEvaluator::execute()
         return;
 
     const Snapshot &snapshot = m_modelManager->snapshot();
-    Document::Ptr doc = snapshot.document(m_editor->file()->fileName());
+    Document::Ptr doc = snapshot.document(m_editor->editorDocument()->fileName());
     if (!doc)
         return;
 
diff --git a/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp b/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp
index 7a5e34ec54..6651e4a46b 100644
--- a/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp
+++ b/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp
@@ -40,7 +40,7 @@
 #include <cpptools/insertionpointlocator.h>
 #include <cpptools/cpprefactoringchanges.h>
 #include <cppeditor/cppquickfix.h>
-#include <coreplugin/ifile.h>
+#include <coreplugin/idocument.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/cppeditor/cppoutline.cpp b/src/plugins/cppeditor/cppoutline.cpp
index 727f0c5fa5..217bd580cf 100644
--- a/src/plugins/cppeditor/cppoutline.cpp
+++ b/src/plugins/cppeditor/cppoutline.cpp
@@ -35,7 +35,7 @@
 #include <TranslationUnit.h>
 #include <Symbol.h>
 
-#include <coreplugin/ifile.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <cplusplus/OverviewModel.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp
index 072cce9806..ca3476bd40 100644
--- a/src/plugins/cppeditor/cppplugin.cpp
+++ b/src/plugins/cppeditor/cppplugin.cpp
@@ -108,10 +108,10 @@ QString CppEditorFactory::displayName() const
     return tr(CppEditor::Constants::CPPEDITOR_DISPLAY_NAME);
 }
 
-Core::IFile *CppEditorFactory::open(const QString &fileName)
+Core::IDocument *CppEditorFactory::open(const QString &fileName)
 {
     Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, id());
-    return iface ? iface->file() : 0;
+    return iface ? iface->document() : 0;
 }
 
 Core::IEditor *CppEditorFactory::createEditor(QWidget *parent)
diff --git a/src/plugins/cppeditor/cppplugin.h b/src/plugins/cppeditor/cppplugin.h
index f082fdcdc2..acc251e5cb 100644
--- a/src/plugins/cppeditor/cppplugin.h
+++ b/src/plugins/cppeditor/cppplugin.h
@@ -121,7 +121,7 @@ public:
     Core::IEditor *createEditor(QWidget *parent);
     Core::Id id() const;
     QString displayName() const;
-    Core::IFile *open(const QString &fileName);
+    Core::IDocument *open(const QString &fileName);
 
 private:
     CppPlugin *m_owner;
diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp
index 247d4ab3c9..96eb58048a 100644
--- a/src/plugins/cppeditor/cppquickfix.cpp
+++ b/src/plugins/cppeditor/cppquickfix.cpp
@@ -82,7 +82,7 @@ const CppQuickFixAssistInterface *CppQuickFixOperation::assistInterface() const
 
 QString CppQuickFixOperation::fileName() const
 {
-    return m_interface->file()->fileName();
+    return m_interface->document()->fileName();
 }
 
 CppQuickFixFactory::CppQuickFixFactory()
diff --git a/src/plugins/cppeditor/cppquickfixassistant.cpp b/src/plugins/cppeditor/cppquickfixassistant.cpp
index 23ed9bfa0c..41e52db9f6 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.cpp
+++ b/src/plugins/cppeditor/cppquickfixassistant.cpp
@@ -101,7 +101,7 @@ const IAssistProvider *CppQuickFixAssistProcessor::provider() const
 // --------------------------
 CppQuickFixAssistInterface::CppQuickFixAssistInterface(CPPEditorWidget *editor,
                                                        TextEditor::AssistReason reason)
-    : DefaultAssistInterface(editor->document(), editor->position(), editor->file(), reason)
+    : DefaultAssistInterface(editor->document(), editor->position(), editor->editorDocument(), reason)
     , m_editor(editor)
     , m_semanticInfo(editor->semanticInfo())
     , m_snapshot(CPlusPlus::CppModelManagerInterface::instance()->snapshot())