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

Use FileChangeBlocker

Browse Source 
Use FileChangeBlocker over expecting/unexpecting file changes manually.

Change-Id: I8428841f966d81be477260416c75e91dee795425
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2016-07-18 10:04:42 +02:00
parent 2ec82a2a93
commit 84f1466b01
5 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/resourceeditor/resourcenode.cpp
View File

@@ -85,9 +85,8 @@ static bool addFilesToResource(const Utils::FileName &resourceFile,
}
}
Core::DocumentManager::expectFileChange(resourceFile.toString());
Core::FileChangeBlocker changeGuard(resourceFile.toString());
file.save();
Core::DocumentManager::unexpectFileChange(resourceFile.toString());
return true;
}
@@ -282,9 +281,8 @@ bool ResourceTopLevelNode::addPrefix(const QString &prefix, const QString &lang)
int index = file.addPrefix(prefix, lang);
if (index == -1)
return false;
Core::DocumentManager::expectFileChange(filePath().toString());
Core::FileChangeBlocker changeGuard(filePath().toString());
file.save();
Core::DocumentManager::unexpectFileChange(filePath().toString());
return true;
}
@@ -298,9 +296,8 @@ bool ResourceTopLevelNode::removePrefix(const QString &prefix, const QString &la
if (file.prefix(i) == prefix
&& file.lang(i) == lang) {
file.removePrefix(i);
Core::DocumentManager::expectFileChange(filePath().toString());
Core::FileChangeBlocker changeGuard(filePath().toString());
file.save();
Core::DocumentManager::unexpectFileChange(filePath().toString());
return true;
}
}
@@ -324,9 +321,8 @@ bool ResourceTopLevelNode::removeNonExistingFiles()
}
}
Core::DocumentManager::expectFileChange(filePath().toString());
Core::FileChangeBlocker changeGuard(filePath().toString());
file.save();
Core::DocumentManager::unexpectFileChange(filePath().toString());
return true;
}
@@ -421,9 +417,8 @@ bool ResourceFolderNode::removeFiles(const QStringList &filePaths, QStringList *
file.removeFile(index, j);
--j;
}
Core::DocumentManager::expectFileChange(m_topLevelNode->filePath().toString());
Core::FileChangeBlocker changeGuard(m_topLevelNode->filePath().toString());
file.save();
Core::DocumentManager::unexpectFileChange(m_topLevelNode->filePath().toString());
return true;
}
@@ -461,9 +456,8 @@ bool ResourceFolderNode::renameFile(const QString &filePath, const QString &newF
for (int j = 0; j < file.fileCount(index); ++j) {
if (file.file(index, j) == filePath) {
file.replaceFile(index, j, newFilePath);
Core::DocumentManager::expectFileChange(m_topLevelNode->filePath().toString());
Core::FileChangeBlocker changeGuard(m_topLevelNode->filePath().toString());
file.save();
Core::DocumentManager::unexpectFileChange(m_topLevelNode->filePath().toString());
return true;
}
}
@@ -483,9 +477,8 @@ bool ResourceFolderNode::renamePrefix(const QString &prefix, const QString &lang
if (!file.replacePrefixAndLang(index, prefix, lang))
return false;
Core::DocumentManager::expectFileChange(m_topLevelNode->filePath().toString());
Core::FileChangeBlocker changeGuard(m_topLevelNode->filePath().toString());
file.save();
Core::DocumentManager::unexpectFileChange(m_topLevelNode->filePath().toString());
return true;
}
@@ -675,9 +668,8 @@ bool SimpleResourceFolderNode::removeFiles(const QStringList &filePaths, QString
file.removeFile(index, j);
--j;
}
Core::DocumentManager::expectFileChange(m_topLevelNode->filePath().toString());
Core::FileChangeBlocker changeGuard(m_topLevelNode->filePath().toString());
file.save();
Core::DocumentManager::unexpectFileChange(m_topLevelNode->filePath().toString());
return true;
}
@@ -694,9 +686,8 @@ bool SimpleResourceFolderNode::renameFile(const QString &filePath, const QString
for (int j = 0; j < file.fileCount(index); ++j) {
if (file.file(index, j) == filePath) {
file.replaceFile(index, j, newFilePath);
Core::DocumentManager::expectFileChange(m_topLevelNode->filePath().toString());
Core::FileChangeBlocker changeGuard(m_topLevelNode->filePath().toString());
file.save();
Core::DocumentManager::unexpectFileChange(m_topLevelNode->filePath().toString());
return true;
}
}