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

Core: filepathify IDocument

Browse Source 
Change-Id: I364a80d070c5f90433309c281c4906ee101a1a1a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2021-05-18 13:55:23 +02:00
parent 7020d54a0a
commit 665c090039
35 changed files with 253 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -744,17 +744,19 @@ static bool saveModifiedFilesHelper(const QList<IDocument *> &documents,
return notSaved.isEmpty();
}
bool DocumentManager::saveDocument(IDocument *document, const QString &fileName, bool *isReadOnly)
bool DocumentManager::saveDocument(IDocument *document,
const Utils::FilePath &filePath,
bool *isReadOnly)
{
bool ret = true;
QString effName = fileName.isEmpty() ? document->filePath().toString() : fileName;
expectFileChange(effName); // This only matters to other IDocuments which refer to this file
const Utils::FilePath &savePath = filePath.isEmpty() ? document->filePath() : filePath;
expectFileChange(savePath.toString()); // This only matters to other IDocuments which refer to this file
bool addWatcher = removeDocument(document); // So that our own IDocument gets no notification at all
QString errorString;
if (!document->save(&errorString, fileName, false)) {
if (!document->save(&errorString, filePath, false)) {
if (isReadOnly) {
QFile ofi(effName);
QFile ofi(savePath.toString());
// Check whether the existing file is writable
if (!ofi.open(QIODevice::ReadWrite) && ofi.open(QIODevice::ReadOnly)) {
*isReadOnly = true;
@@ -769,7 +771,7 @@ bool DocumentManager::saveDocument(IDocument *document, const QString &fileName,
}
addDocument(document, addWatcher);
unexpectFileChange(effName);
unexpectFileChange(savePath.toString());
m_instance->updateSaveAll();
return ret;
}
@@ -1314,7 +1316,7 @@ void DocumentManager::checkForReload()
// handle deleted files
EditorManager::closeDocuments(documentsToClose, false);
for (auto it = documentsToSave.cbegin(), end = documentsToSave.cend(); it != end; ++it) {
saveDocument(it.key(), it.value());
saveDocument(it.key(), Utils::FilePath::fromString(it.value()));
it.key()->checkPermissions();
}