feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DiffEditor: Remove unnecessary instance() method from DiffEditorManager

Browse Source 
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>
This commit is contained in:
Tobias Hunger
2015-01-30 13:53:35 +01:00
parent 0a402aecd0
commit bfcce472e1
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/diffeditor/diffeditormanager.cpp
View File

@@ -57,11 +57,6 @@ DiffEditorManager::~DiffEditorManager()
m_instance = 0; m_instance = 0;
} }
DiffEditorManager *DiffEditorManager::instance()
{
return m_instance;
}
void DiffEditorManager::slotEditorsClosed(const QList<Core::IEditor *> &editors) void DiffEditorManager::slotEditorsClosed(const QList<Core::IEditor *> &editors)
{ {
QMap<Core::IDocument *, int> editorsForDocument; QMap<Core::IDocument *, int> editorsForDocument;
@@ -89,7 +84,7 @@ void DiffEditorManager::slotEditorsClosed(const QList<Core::IEditor *> &editors)
DiffEditorDocument *DiffEditorManager::find(const QString &documentId) 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) DiffEditorDocument *DiffEditorManager::findOrCreate(const QString &documentId, const QString &displayName)
@@ -109,19 +104,19 @@ DiffEditorDocument *DiffEditorManager::findOrCreate(const QString &documentId, c
document->setDisplayName(displayName); document->setDisplayName(displayName);
instance()->idToDocument.insert(documentId, document); m_instance->idToDocument.insert(documentId, document);
instance()->documentToId.insert(document, documentId); m_instance->documentToId.insert(document, documentId);
return document; return document;
} }
void DiffEditorManager::removeDocument(DiffEditorDocument *document) void DiffEditorManager::removeDocument(DiffEditorDocument *document)
{ {
if (!instance()->documentToId.contains(document)) if (!m_instance->documentToId.contains(document))
return; return;
const QString documentId = instance()->documentToId.value(document); const QString documentId = m_instance->documentToId.value(document);
instance()->documentToId.remove(document); m_instance->documentToId.remove(document);
instance()->idToDocument.remove(documentId); m_instance->idToDocument.remove(documentId);
} }

2
src/plugins/diffeditor/diffeditormanager.h
View File

@@ -49,8 +49,6 @@ public:
explicit DiffEditorManager(QObject *parent); explicit DiffEditorManager(QObject *parent);
virtual ~DiffEditorManager(); virtual ~DiffEditorManager();
static DiffEditorManager *instance();
static DiffEditorDocument *find(const QString &documentId); static DiffEditorDocument *find(const QString &documentId);
static DiffEditorDocument *findOrCreate(const QString &documentId, const QString &displayName); static DiffEditorDocument *findOrCreate(const QString &documentId, const QString &displayName);
static void removeDocument(DiffEditorDocument *document); static void removeDocument(DiffEditorDocument *document);