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

ResourceNode: Update to new ResourceFile::load return value

Browse Source 
Change-Id: I8900225ecf4c69be7f9b6983edeb4cfdfebc0b77
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-06-10 18:07:10 +02:00
parent fef9d7ff94
commit ea2bb656cd
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,7 @@ static bool addFilesToResource(const Utils::FileName &resourceFile,
*notAdded = filePaths; *notAdded = filePaths;
ResourceFile file(resourceFile.toString()); ResourceFile file(resourceFile.toString());
if (!file.load()) if (file.load() != Core::IDocument::OpenResult::Success)
return false; return false;
int index = file.indexOfPrefix(prefix, lang); int index = file.indexOfPrefix(prefix, lang);
@@ -226,7 +226,7 @@ bool ResourceTopLevelNode::removeFiles(const QStringList &filePaths, QStringList
bool ResourceTopLevelNode::addPrefix(const QString &prefix, const QString &lang) bool ResourceTopLevelNode::addPrefix(const QString &prefix, const QString &lang)
{ {
ResourceFile file(path().toString()); ResourceFile file(path().toString());
if (!file.load()) if (file.load() != Core::IDocument::OpenResult::Success)
return false; return false;
int index = file.addPrefix(prefix, lang); int index = file.addPrefix(prefix, lang);
if (index == -1) if (index == -1)
@@ -241,7 +241,7 @@ bool ResourceTopLevelNode::addPrefix(const QString &prefix, const QString &lang)
bool ResourceTopLevelNode::removePrefix(const QString &prefix, const QString &lang) bool ResourceTopLevelNode::removePrefix(const QString &prefix, const QString &lang)
{ {
ResourceFile file(path().toString()); ResourceFile file(path().toString());
if (!file.load()) if (file.load() != Core::IDocument::OpenResult::Success)
return false; return false;
for (int i = 0; i < file.prefixCount(); ++i) { for (int i = 0; i < file.prefixCount(); ++i) {
if (file.prefix(i) == prefix if (file.prefix(i) == prefix
@@ -259,7 +259,7 @@ bool ResourceTopLevelNode::removePrefix(const QString &prefix, const QString &la
bool ResourceTopLevelNode::removeNonExistingFiles() bool ResourceTopLevelNode::removeNonExistingFiles()
{ {
ResourceFile file(path().toString()); ResourceFile file(path().toString());
if (!file.load()) if (file.load() != Core::IDocument::OpenResult::Success)
return false; return false;
QFileInfo fi; QFileInfo fi;
@@ -352,7 +352,7 @@ bool ResourceFolderNode::removeFiles(const QStringList &filePaths, QStringList *
if (notRemoved) if (notRemoved)
*notRemoved = filePaths; *notRemoved = filePaths;
ResourceFile file(m_topLevelNode->path().toString()); ResourceFile file(m_topLevelNode->path().toString());
if (!file.load()) if (file.load() != Core::IDocument::OpenResult::Success)
return false; return false;
int index = file.indexOfPrefix(m_prefix, m_lang); int index = file.indexOfPrefix(m_prefix, m_lang);
if (index == -1) if (index == -1)
@@ -376,7 +376,7 @@ bool ResourceFolderNode::removeFiles(const QStringList &filePaths, QStringList *
bool ResourceFolderNode::renameFile(const QString &filePath, const QString &newFilePath) bool ResourceFolderNode::renameFile(const QString &filePath, const QString &newFilePath)
{ {
ResourceFile file(m_topLevelNode->path().toString()); ResourceFile file(m_topLevelNode->path().toString());
if (!file.load()) if (file.load() != Core::IDocument::OpenResult::Success)
return false; return false;
int index = file.indexOfPrefix(m_prefix, m_lang); int index = file.indexOfPrefix(m_prefix, m_lang);
if (index == -1) if (index == -1)
@@ -398,7 +398,7 @@ bool ResourceFolderNode::renameFile(const QString &filePath, const QString &newF
bool ResourceFolderNode::renamePrefix(const QString &prefix, const QString &lang) bool ResourceFolderNode::renamePrefix(const QString &prefix, const QString &lang)
{ {
ResourceFile file(m_topLevelNode->path().toString()); ResourceFile file(m_topLevelNode->path().toString());
if (!file.load()) if (file.load() == Core::IDocument::OpenResult::Success)
return false; return false;
int index = file.indexOfPrefix(m_prefix, m_lang); int index = file.indexOfPrefix(m_prefix, m_lang);
if (index == -1) if (index == -1)