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

Fix usage of EditorManager::editorsForFileName

Browse Source 
And move to using the corresponding method in document model.

Change-Id: I80b12ceab8a91c5393b9c0422d660a8896ae09d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Eike Ziller
2013-07-18 12:26:23 +02:00
parent bc88c0b89e
commit 8c2e3fd2cb
11 changed files with 47 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -1052,25 +1052,19 @@ bool Qt4PriFileNode::priFileWritable(const QString &path)
bool Qt4PriFileNode::saveModifiedEditors()
{
QList<Core::IDocument*> modifiedDocuments;
Core::IDocument *document
= Core::EditorManager::documentModel()->documentForFilePath(m_projectFilePath);
if (!document || !document->isModified())
return true;
foreach (Core::IEditor *editor, Core::ICore::editorManager()->editorsForFileName(m_projectFilePath)) {
if (Core::IDocument *editorDocument = editor->document()) {
if (editorDocument->isModified())
modifiedDocuments << editorDocument;
}
}
if (!modifiedDocuments.isEmpty()) {
bool cancelled;
Core::DocumentManager::saveModifiedDocuments(modifiedDocuments, &cancelled,
tr("There are unsaved changes for project file %1.").arg(m_projectFilePath));
if (cancelled)
return false;
// force instant reload of ourselves
QtSupport::ProFileCacheManager::instance()->discardFile(m_projectFilePath);
m_project->qt4ProjectManager()->notifyChanged(m_projectFilePath);
}
bool cancelled;
Core::DocumentManager::saveModifiedDocuments(QList<Core::IDocument *>() << document, &cancelled,
tr("There are unsaved changes for project file %1.").arg(m_projectFilePath));
if (cancelled)
return false;
// force instant reload of ourselves
QtSupport::ProFileCacheManager::instance()->discardFile(m_projectFilePath);
m_project->qt4ProjectManager()->notifyChanged(m_projectFilePath);
return true;
}
@@ -1182,12 +1176,11 @@ void Qt4PriFileNode::changeFiles(const QString &mimeType,
// We manually tell each editor to reload it's file.
// (The .pro files are notified by the file system watcher.)
QStringList errorStrings;
foreach (Core::IEditor *editor, Core::ICore::editorManager()->editorsForFileName(m_projectFilePath)) {
if (Core::IDocument *editorDocument= editor->document()) {
QString errorString;
if (!editorDocument->reload(&errorString, Core::IDocument::FlagReload, Core::IDocument::TypeContents))
errorStrings << errorString;
}
Core::IDocument *document = Core::EditorManager::documentModel()->documentForFilePath(m_projectFilePath);
if (document) {
QString errorString;
if (!document->reload(&errorString, Core::IDocument::FlagReload, Core::IDocument::TypeContents))
errorStrings << errorString;
}
if (!errorStrings.isEmpty())
QMessageBox::warning(Core::ICore::mainWindow(), tr("File Error"),