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

Add function for getting DiffService

Browse Source 
Hides the implementation detail that this is fetched from the object
pool from most places.

Change-Id: I0ea06c877fade50f62b62011bbc0d2f89fa8e885
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Eike Ziller
2017-11-08 13:21:49 +01:00
parent e4085dd040
commit cc94548999
10 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -641,7 +641,7 @@ static bool saveModifiedFilesHelper(const QList<IDocument *> &documents,
(*failedToSave) = modifiedDocuments;
const QStringList filesToDiff = dia.filesToDiff();
if (!filesToDiff.isEmpty()) {
if (auto diffService = ExtensionSystem::PluginManager::getObject<DiffService>())
if (auto diffService = DiffService::instance())
diffService->diffModifiedFiles(filesToDiff);
}
return false;
@@ -1151,7 +1151,7 @@ void DocumentManager::checkForReload()
} else {
// Ask about content change
previousReloadAnswer = reloadPrompt(document->filePath(), document->isModified(),
ExtensionSystem::PluginManager::getObject<DiffService>(),
DiffService::instance(),
ICore::dialogParent());
switch (previousReloadAnswer) {
case ReloadAll:
@@ -1216,7 +1216,7 @@ void DocumentManager::checkForReload()
}
if (!filesToDiff.isEmpty()) {
if (auto diffService = ExtensionSystem::PluginManager::getObject<DiffService>())
if (auto diffService = DiffService::instance())
diffService->diffModifiedFiles(filesToDiff);
}