DocumentModel: Make interface static

Move item model implementation to private, adjust user code.

Change-Id: Ifbe94e7c7b9b1e8be1b4c531958dbd7a9413af13
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

2 files changed, 4 insertions, 5 deletions

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 7e48fbaf63..68250f9032 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -157,8 +157,7 @@ GitDiffSwitcher::GitDiffSwitcher(Core::IDocument *parentDocument, GitClient *git
       m_gitClient(gitClient),
       m_signalMapper(new QSignalMapper(this))
 {
-    Core::DocumentModel *documentModel = Core::EditorManager::documentModel();
-    QList<Core::IEditor *> editors = documentModel->editorsForDocument(m_document);
+    QList<Core::IEditor *> editors = Core::DocumentModel::editorsForDocument(m_document);
     for (int i = 0; i < editors.count(); i++)
         attachAction(editors.at(i));
 
@@ -938,9 +937,9 @@ private:
 
 Core::IEditor *locateEditor(const char *property, const QString &entry)
 {
-    foreach (Core::IDocument *document, Core::EditorManager::documentModel()->openedDocuments())
+    foreach (Core::IDocument *document, Core::DocumentModel::openedDocuments())
         if (document->property(property).toString() == entry)
-            return Core::EditorManager::documentModel()->editorsForDocument(document).first();
+            return Core::DocumentModel::editorsForDocument(document).first();
     return 0;
 }
 
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 494e38a898..f8ad1435bb 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -1275,7 +1275,7 @@ void GitPlugin::updateSubmodules()
 // If the file is modified in an editor, make sure it is saved.
 static bool ensureFileSaved(const QString &fileName)
 {
-    Core::IDocument *document = Core::EditorManager::documentModel()->documentForFilePath(fileName);
+    Core::IDocument *document = Core::DocumentModel::documentForFilePath(fileName);
     return Core::DocumentManager::saveModifiedDocument(document);
 }