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>

14 files changed, 48 insertions, 48 deletions

diff --git a/src/plugins/qt4projectmanager/profilecompletionassist.cpp b/src/plugins/qt4projectmanager/profilecompletionassist.cpp
index a6a1d8c99f..c1a6c3add6 100644
--- a/src/plugins/qt4projectmanager/profilecompletionassist.cpp
+++ b/src/plugins/qt4projectmanager/profilecompletionassist.cpp
@@ -205,7 +205,7 @@ int ProFileCompletionAssistProcessor::findStartOfName(int pos) const
 
 bool ProFileCompletionAssistProcessor::isInComment() const
 {
-    QTextCursor tc(m_interface->document());
+    QTextCursor tc(m_interface->textDocument());
     tc.setPosition(m_interface->position());
     tc.movePosition(QTextCursor::StartOfLine, QTextCursor::KeepAnchor);
     const QString &lineBeginning = tc.selectedText();
diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp
index 239b20dd24..25dfee554b 100644
--- a/src/plugins/qt4projectmanager/profileeditor.cpp
+++ b/src/plugins/qt4projectmanager/profileeditor.cpp
@@ -172,7 +172,7 @@ ProFileEditorWidget::Link ProFileEditorWidget::findLinkAt(const QTextCursor &cur
         }
     }
 
-    QDir dir(QFileInfo(file()->fileName()).absolutePath());
+    QDir dir(QFileInfo(editorDocument()->fileName()).absolutePath());
     QString fileName = dir.filePath(buffer);
     QFileInfo fi(fileName);
     if (fi.exists()) {
diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
index 0366de390f..20dea31896 100644
--- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp
+++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
@@ -78,10 +78,10 @@ QString ProFileEditorFactory::displayName() const
     return tr(Qt4ProjectManager::Constants::PROFILE_EDITOR_DISPLAY_NAME);
 }
 
-Core::IFile *ProFileEditorFactory::open(const QString &fileName)
+Core::IDocument *ProFileEditorFactory::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 *ProFileEditorFactory::createEditor(QWidget *parent)
diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.h b/src/plugins/qt4projectmanager/profileeditorfactory.h
index e89d759dd2..5c9d3ff604 100644
--- a/src/plugins/qt4projectmanager/profileeditorfactory.h
+++ b/src/plugins/qt4projectmanager/profileeditorfactory.h
@@ -59,7 +59,7 @@ public:
     QStringList mimeTypes() const;
     Core::Id id() const;
     QString displayName() const;
-    Core::IFile *open(const QString &fileName);
+    Core::IDocument *open(const QString &fileName);
     Core::IEditor *createEditor(QWidget *parent);
 
     Qt4Manager *qt4ProjectManager() const { return m_manager; }
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 0a99e24105..30bf73e05d 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -131,9 +131,9 @@ QString QMakeStep::allArguments(bool shorted)
     if (bc->subNodeBuild())
         arguments << QDir::toNativeSeparators(bc->subNodeBuild()->path());
     else if (shorted)
-        arguments << QDir::toNativeSeparators(QFileInfo(project()->file()->fileName()).fileName());
+        arguments << QDir::toNativeSeparators(QFileInfo(project()->document()->fileName()).fileName());
     else
-        arguments << QDir::toNativeSeparators(project()->file()->fileName());
+        arguments << QDir::toNativeSeparators(project()->document()->fileName());
 
     arguments << QLatin1String("-r");
     bool userProvidedMkspec = false;
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index ac1cf7f906..ffe6f0e37d 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -44,7 +44,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/variablemanager.h>
-#include <coreplugin/ifile.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/helpmanager.h>
 #include <projectexplorer/buildstep.h>
 #include <projectexplorer/environmentwidget.h>
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 92a72eb474..b522ec2050 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -235,7 +235,7 @@ QString Qt4BuildConfiguration::defaultShadowBuildDirectory() const
 {
     Qt4BaseTargetFactory *factory = Qt4BaseTargetFactory::qt4BaseTargetFactoryForId(qt4Target()->id());
     // todo displayName isn't ideal
-    return factory->shadowBuildDirectory(qt4Target()->qt4Project()->file()->fileName(), qt4Target()->id(), displayName());
+    return factory->shadowBuildDirectory(qt4Target()->qt4Project()->document()->fileName(), qt4Target()->id(), displayName());
 }
 
 /// returns the unexpanded build directory
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 93b1a5596e..766519ee10 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -45,7 +45,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/fileiconprovider.h>
-#include <coreplugin/filemanager.h>
+#include <coreplugin/documentmanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/vcsmanager.h>
@@ -166,7 +166,7 @@ using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
 
 Qt4PriFile::Qt4PriFile(Qt4ProjectManager::Qt4PriFileNode *qt4PriFile)
-    : IFile(qt4PriFile), m_priFile(qt4PriFile)
+    : IDocument(qt4PriFile), m_priFile(qt4PriFile)
 {
 
 }
@@ -216,7 +216,7 @@ bool Qt4PriFile::isSaveAsAllowed() const
     return false;
 }
 
-Core::IFile::ReloadBehavior Qt4PriFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
+Core::IDocument::ReloadBehavior Qt4PriFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
 {
     Q_UNUSED(state)
     Q_UNUSED(type)
@@ -250,7 +250,7 @@ Qt4PriFileNode::Qt4PriFileNode(Qt4Project *project, Qt4ProFileNode* qt4ProFileNo
 {
     Q_ASSERT(project);
     m_qt4PriFile = new Qt4PriFile(this);
-    Core::FileManager::addFile(m_qt4PriFile);
+    Core::DocumentManager::addDocument(m_qt4PriFile);
 
     setDisplayName(QFileInfo(filePath).completeBaseName());
 
@@ -1004,14 +1004,14 @@ bool Qt4PriFileNode::priFileWritable(const QString &path)
 {
     const QString dir = QFileInfo(path).dir().path();
     Core::IVersionControl *versionControl = Core::ICore::vcsManager()->findVersionControlForDirectory(dir);
-    switch (Core::FileManager::promptReadOnlyFile(path, versionControl, Core::ICore::mainWindow(), false)) {
-    case Core::FileManager::RO_OpenVCS:
+    switch (Core::DocumentManager::promptReadOnlyFile(path, versionControl, Core::ICore::mainWindow(), false)) {
+    case Core::DocumentManager::RO_OpenVCS:
         if (!versionControl->vcsOpen(path)) {
             QMessageBox::warning(Core::ICore::mainWindow(), tr("Cannot Open File"), tr("Cannot open the file for editing with VCS."));
             return false;
         }
         break;
-    case Core::FileManager::RO_MakeWriteable: {
+    case Core::DocumentManager::RO_MakeWriteable: {
         const bool permsOk = QFile::setPermissions(path, QFile::permissions(path) | QFile::WriteUser);
         if (!permsOk) {
             QMessageBox::warning(Core::ICore::mainWindow(), tr("Cannot Set Permissions"),  tr("Cannot set permissions to writable."));
@@ -1019,8 +1019,8 @@ bool Qt4PriFileNode::priFileWritable(const QString &path)
         }
         break;
     }
-    case Core::FileManager::RO_SaveAs:
-    case Core::FileManager::RO_Cancel:
+    case Core::DocumentManager::RO_SaveAs:
+    case Core::DocumentManager::RO_Cancel:
         return false;
     }
     return true;
@@ -1028,18 +1028,18 @@ bool Qt4PriFileNode::priFileWritable(const QString &path)
 
 bool Qt4PriFileNode::saveModifiedEditors()
 {
-    QList<Core::IFile*> modifiedFileHandles;
+    QList<Core::IDocument*> modifiedDocuments;
 
     foreach (Core::IEditor *editor, Core::ICore::editorManager()->editorsForFileName(m_projectFilePath)) {
-        if (Core::IFile *editorFile = editor->file()) {
-            if (editorFile->isModified())
-                modifiedFileHandles << editorFile;
+        if (Core::IDocument *editorDocument = editor->document()) {
+            if (editorDocument->isModified())
+                modifiedDocuments << editorDocument;
         }
     }
 
-    if (!modifiedFileHandles.isEmpty()) {
+    if (!modifiedDocuments.isEmpty()) {
         bool cancelled;
-        Core::FileManager::saveModifiedFiles(modifiedFileHandles, &cancelled,
+        Core::DocumentManager::saveModifiedDocuments(modifiedDocuments, &cancelled,
                                          tr("There are unsaved changes for project file %1.").arg(m_projectFilePath));
         if (cancelled)
             return false;
@@ -1146,9 +1146,9 @@ void Qt4PriFileNode::changeFiles(const FileType fileType,
     }
 
     // save file
-    Core::FileManager::expectFileChange(m_projectFilePath);
+    Core::DocumentManager::expectFileChange(m_projectFilePath);
     save(lines);
-    Core::FileManager::unexpectFileChange(m_projectFilePath);
+    Core::DocumentManager::unexpectFileChange(m_projectFilePath);
 
     // This is a hack.
     // We are saving twice in a very short timeframe, once the editor and once the ProFile.
@@ -1157,9 +1157,9 @@ void Qt4PriFileNode::changeFiles(const FileType fileType,
     // (The .pro files are notified by the file system watcher.)
     QStringList errorStrings;
     foreach (Core::IEditor *editor, Core::ICore::editorManager()->editorsForFileName(m_projectFilePath)) {
-        if (Core::IFile *editorFile = editor->file()) {
+        if (Core::IDocument *editorDocument= editor->document()) {
             QString errorString;
-            if (!editorFile->reload(&errorString, Core::IFile::FlagReload, Core::IFile::TypeContents))
+            if (!editorDocument->reload(&errorString, Core::IDocument::FlagReload, Core::IDocument::TypeContents))
                 errorStrings << errorString;
         }
     }
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index d2474f035a..dfaec5e67b 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -36,7 +36,7 @@
 #include "qt4projectmanager_global.h"
 
 #include <utils/fileutils.h>
-#include <coreplugin/ifile.h>
+#include <coreplugin/idocument.h>
 #include <projectexplorer/projectnodes.h>
 
 #include <QHash>
@@ -219,7 +219,7 @@ private:
 };
 
 namespace Internal {
-class Qt4PriFile : public Core::IFile
+class Qt4PriFile : public Core::IDocument
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 0f57d95097..fffc3171ea 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -43,7 +43,7 @@
 #include "findqt4profiles.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/ifile.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/coreconstants.h>
@@ -81,7 +81,7 @@ enum { debug = 0 };
 namespace Qt4ProjectManager {
 namespace Internal {
 
-class Qt4ProjectFile : public Core::IFile
+class Qt4ProjectFile : public Core::IDocument
 {
     Q_OBJECT
 
@@ -237,7 +237,7 @@ void ProjectFilesVisitor::visitFolderNode(FolderNode *folderNode)
 // ----------- Qt4ProjectFile
 namespace Internal {
 Qt4ProjectFile::Qt4ProjectFile(Qt4Project *project, const QString &filePath, QObject *parent)
-    : Core::IFile(parent),
+    : Core::IDocument(parent),
       m_mimeType(QLatin1String(Qt4ProjectManager::Constants::PROFILE_MIMETYPE)),
       m_project(project),
       m_filePath(filePath)
@@ -287,7 +287,7 @@ bool Qt4ProjectFile::isSaveAsAllowed() const
     return false;
 }
 
-Core::IFile::ReloadBehavior Qt4ProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
+Core::IDocument::ReloadBehavior Qt4ProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
 {
     Q_UNUSED(state)
     Q_UNUSED(type)
@@ -853,7 +853,7 @@ Qt4Manager *Qt4Project::qt4ProjectManager() const
 
 QString Qt4Project::displayName() const
 {
-    return QFileInfo(file()->fileName()).completeBaseName();
+    return QFileInfo(document()->fileName()).completeBaseName();
 }
 
 QString Qt4Project::id() const
@@ -861,7 +861,7 @@ QString Qt4Project::id() const
     return QLatin1String(Constants::QT4PROJECT_ID);
 }
 
-Core::IFile *Qt4Project::file() const
+Core::IDocument *Qt4Project::document() const
 {
     return m_fileInfo;
 }
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index 3b90ec039e..4b57c4f1e5 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -89,13 +89,13 @@ public:
 
     QString displayName() const;
     QString id() const;
-    Core::IFile *file() const;
+    Core::IDocument *document() const;
     ProjectExplorer::IProjectManager *projectManager() const;
     Qt4Manager *qt4ProjectManager() const;
 
     Qt4BaseTarget *activeTarget() const;
 
-    QList<Core::IFile *> dependencies();     //NBS remove
+    QList<Core::IDocument *> dependencies();     //NBS remove
     QList<ProjectExplorer::Project *>dependsOn();
 
     ProjectExplorer::ProjectNode *rootProjectNode() const;
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 614f109150..990d134d33 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -43,7 +43,7 @@
 #include "ui_qt4projectconfigwidget.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/ifile.h>
+#include <coreplugin/idocument.h>
 
 #include <projectexplorer/toolchainmanager.h>
 #include <projectexplorer/toolchain.h>
@@ -362,7 +362,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
         if (!qmakePath.isEmpty()) {
             // Is it from the same build?
             QtSupport::QtVersionManager::MakefileCompatible mc =
-                    QtSupport::QtVersionManager::makefileIsFor(makefile, m_buildConfiguration->target()->project()->file()->fileName());
+                    QtSupport::QtVersionManager::makefileIsFor(makefile, m_buildConfiguration->target()->project()->document()->fileName());
             if (mc == QtSupport::QtVersionManager::DifferentProject) {
                 incompatibleBuild = true;
             } else if (mc == QtSupport::QtVersionManager::SameProject) {
@@ -395,11 +395,11 @@ void Qt4ProjectConfigWidget::updateImportLabel()
         buildDirectory = m_buildConfiguration->buildDirectory();
     QList<ProjectExplorer::Task> issues;
     if (QtSupport::BaseQtVersion *version = m_buildConfiguration->qtVersion()) {
-        issues = version->reportIssues(m_buildConfiguration->target()->project()->file()->fileName(),
+        issues = version->reportIssues(m_buildConfiguration->target()->project()->document()->fileName(),
                                        buildDirectory);
         foreach (Qt4BaseTargetFactory *factory,
                  Qt4BaseTargetFactory::qt4BaseTargetFactoriesForIds(version->supportedTargetIds().toList()))
-            issues.append(factory->reportIssues(m_buildConfiguration->target()->project()->file()->fileName()));
+            issues.append(factory->reportIssues(m_buildConfiguration->target()->project()->document()->fileName()));
 
         qSort(issues);
     }
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
index 7671a3baf1..033c9188e9 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
@@ -162,7 +162,7 @@ void Qt4Manager::editorChanged(Core::IEditor *editor)
         if (m_dirty) {
             const QString contents = formWindowEditorContents(m_lastEditor);
             foreach(Qt4Project *project, m_projects)
-                project->rootQt4ProjectNode()->updateCodeModelSupportFromEditor(m_lastEditor->file()->fileName(), contents);
+                project->rootQt4ProjectNode()->updateCodeModelSupportFromEditor(m_lastEditor->document()->fileName(), contents);
             m_dirty = false;
         }
     }
@@ -184,7 +184,7 @@ void Qt4Manager::editorAboutToClose(Core::IEditor *editor)
             if (m_dirty) {
                 const QString contents = formWindowEditorContents(m_lastEditor);
                 foreach(Qt4Project *project, m_projects)
-                    project->rootQt4ProjectNode()->updateCodeModelSupportFromEditor(m_lastEditor->file()->fileName(), contents);
+                    project->rootQt4ProjectNode()->updateCodeModelSupportFromEditor(m_lastEditor->document()->fileName(), contents);
                 m_dirty = false;
             }
         }
@@ -263,7 +263,7 @@ ProjectExplorer::Project *Qt4Manager::openProject(const QString &fileName, QStri
     }
 
     foreach (ProjectExplorer::Project *pi, projectExplorer()->session()->projects()) {
-        if (canonicalFilePath == pi->file()->fileName()) {
+        if (canonicalFilePath == pi->document()->fileName()) {
             if (errorString)
                 *errorString = tr("Failed opening project '%1': Project already open").arg(QDir::toNativeSeparators(canonicalFilePath));
             return 0;
@@ -309,7 +309,7 @@ void Qt4Manager::addLibrary()
     Core::EditorManager *em = Core::EditorManager::instance();
     ProFileEditorWidget *editor = qobject_cast<ProFileEditorWidget*>(em->currentEditor()->widget());
     if (editor)
-        addLibrary(editor->file()->fileName(), editor);
+        addLibrary(editor->editorDocument()->fileName(), editor);
 }
 
 void Qt4Manager::addLibraryContextMenu()
diff --git a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp
index 9cb6f5f541..67ce94b194 100644
--- a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp
+++ b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp
@@ -37,7 +37,7 @@
 #include "qt4project.h"
 #include "qt4projectmanager.h"
 
-#include <coreplugin/ifile.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/coreconstants.h>
@@ -107,7 +107,7 @@ TargetSetupPageWrapper::TargetSetupPageWrapper(ProjectExplorer::Project *project
     m_targetSetupPage = new TargetSetupPage(this);
     m_targetSetupPage->setUseScrollArea(false);
     m_targetSetupPage->setImportSearch(true);
-    m_targetSetupPage->setProFilePath(project->file()->fileName());
+    m_targetSetupPage->setProFilePath(project->document()->fileName());
     m_targetSetupPage->initializePage();
     m_targetSetupPage->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     updateNoteText();