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

DiffEditor: Make DiffEditorDocument internal

Browse Source 
Only expose Core::IDocument and keep DiffEditorDocument internal
to the DiffEditor plugin.

Change-Id: If39b82e2f20d40a65284503b4d4fd8dad919ad3a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-01-30 14:33:39 +01:00
parent e7fb05e038
commit 956abd2803
9 changed files with 74 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/subversion/subversionclient.cpp
View File

@@ -41,7 +41,6 @@
#include <utils/qtcassert.h>
#include <utils/synchronousprocess.h>
#include <diffeditor/diffeditorcontroller.h>
#include <diffeditor/diffeditordocument.h>
#include <diffeditor/diffeditormanager.h>
#include <diffeditor/diffeditorreloader.h>
#include <diffeditor/diffutils.h>
@@ -321,14 +320,15 @@ SubversionDiffEditorReloader *SubversionClient::findOrCreateDiffEditor(const QSt
{
DiffEditor::DiffEditorController *controller = 0;
SubversionDiffEditorReloader *reloader = 0;
DiffEditor::DiffEditorDocument *diffEditorDocument = DiffEditor::DiffEditorManager::find(documentId);
if (diffEditorDocument) {
controller = diffEditorDocument->controller();
Core::IDocument *document = DiffEditor::DiffEditorManager::find(documentId);
if (document) {
controller = DiffEditor::DiffEditorManager::controller(document);
reloader = static_cast<SubversionDiffEditorReloader *>(controller->reloader());
} else {
diffEditorDocument = DiffEditor::DiffEditorManager::findOrCreate(documentId, title);
QTC_ASSERT(diffEditorDocument, return 0);
controller = diffEditorDocument->controller();
document = DiffEditor::DiffEditorManager::findOrCreate(documentId, title);
QTC_ASSERT(document, return 0);
controller = DiffEditor::DiffEditorManager::controller(document);
QTC_ASSERT(controller, return 0);
reloader = new SubversionDiffEditorReloader(this);
controller->setReloader(reloader);
@@ -337,7 +337,7 @@ SubversionDiffEditorReloader *SubversionClient::findOrCreateDiffEditor(const QSt
QTC_ASSERT(reloader, return 0);
reloader->setWorkingDirectory(workingDirectory);
VcsBasePlugin::setSource(diffEditorDocument, source);
VcsBasePlugin::setSource(document, source);
return reloader;
}