From bfcce472e1f932b0695cabb9fa624ee96261bb16 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Fri, 30 Jan 2015 13:53:35 +0100
Subject: DiffEditor: Remove unnecessary instance() method from
 DiffEditorManager

The interface is static and the only slot that one can connect to is
private.

Change-Id: Iebd3747fecd24e0250d02e663de405e3f9217acb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
---
 src/plugins/diffeditor/diffeditormanager.cpp | 19 +++++++------------
 src/plugins/diffeditor/diffeditormanager.h   |  2 --
 2 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/diffeditor/diffeditormanager.cpp b/src/plugins/diffeditor/diffeditormanager.cpp
index dc4ee7b0d09..b7ab3289ef1 100644
--- a/src/plugins/diffeditor/diffeditormanager.cpp
+++ b/src/plugins/diffeditor/diffeditormanager.cpp
@@ -57,11 +57,6 @@ DiffEditorManager::~DiffEditorManager()
     m_instance = 0;
 }
 
-DiffEditorManager *DiffEditorManager::instance()
-{
-    return m_instance;
-}
-
 void DiffEditorManager::slotEditorsClosed(const QList<Core::IEditor *> &editors)
 {
     QMap<Core::IDocument *, int> editorsForDocument;
@@ -89,7 +84,7 @@ void DiffEditorManager::slotEditorsClosed(const QList<Core::IEditor *> &editors)
 
 DiffEditorDocument *DiffEditorManager::find(const QString &documentId)
 {
-    return instance()->idToDocument.value(documentId);
+    return m_instance->idToDocument.value(documentId);
 }
 
 DiffEditorDocument *DiffEditorManager::findOrCreate(const QString &documentId, const QString &displayName)
@@ -109,19 +104,19 @@ DiffEditorDocument *DiffEditorManager::findOrCreate(const QString &documentId, c
 
     document->setDisplayName(displayName);
 
-    instance()->idToDocument.insert(documentId, document);
-    instance()->documentToId.insert(document, documentId);
+    m_instance->idToDocument.insert(documentId, document);
+    m_instance->documentToId.insert(document, documentId);
 
     return document;
 }
 
 void DiffEditorManager::removeDocument(DiffEditorDocument *document)
 {
-    if (!instance()->documentToId.contains(document))
+    if (!m_instance->documentToId.contains(document))
         return;
-    const QString documentId = instance()->documentToId.value(document);
-    instance()->documentToId.remove(document);
-    instance()->idToDocument.remove(documentId);
+    const QString documentId = m_instance->documentToId.value(document);
+    m_instance->documentToId.remove(document);
+    m_instance->idToDocument.remove(documentId);
 }
 
 
diff --git a/src/plugins/diffeditor/diffeditormanager.h b/src/plugins/diffeditor/diffeditormanager.h
index 9a4be095818..b9537958677 100644
--- a/src/plugins/diffeditor/diffeditormanager.h
+++ b/src/plugins/diffeditor/diffeditormanager.h
@@ -49,8 +49,6 @@ public:
     explicit DiffEditorManager(QObject *parent);
     virtual ~DiffEditorManager();
 
-    static DiffEditorManager *instance();
-
     static DiffEditorDocument *find(const QString &documentId);
     static DiffEditorDocument *findOrCreate(const QString &documentId, const QString &displayName);
     static void removeDocument(DiffEditorDocument *document);
-- 
cgit v1.2.3