walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Refactoring: Use range for loops

This commit is contained in:
Daniel Marjamäki 2018-07-15 15:08:35 +02:00
parent cc5f00c252
commit 39857220ce
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/library.cpp
View File

@ -213,9 +213,8 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
const char *name = node->Attribute("name"); const char *name = node->Attribute("name");
if (name == nullptr) if (name == nullptr)
return Error(MISSING_ATTRIBUTE, "name"); return Error(MISSING_ATTRIBUTE, "name");
const std::vector<std::string> names(getnames(name)); for (const std::string &s : getnames(name)) {
for (unsigned int i = 0U; i < names.size(); ++i) { const Error &err = loadFunction(node, s, unknown_elements);
const Error &err = loadFunction(node, names[i], unknown_elements);
if (err.errorcode != ErrorCode::OK) if (err.errorcode != ErrorCode::OK)
return err; return err;
} }
@ -453,9 +452,8 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
const char * const sign = node->Attribute("sign"); const char * const sign = node->Attribute("sign");
if (sign) if (sign)
podType.sign = *sign; podType.sign = *sign;
const std::vector<std::string> names(getnames(name)); for (const std::string &s : getnames(name))
for (unsigned int i = 0U; i < names.size(); ++i) mPodTypes[s] = podType;
mPodTypes[names[i]] = podType;
} }
else if (nodename == "platformtype") { else if (nodename == "platformtype") {
@ -499,15 +497,14 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
} }
mPlatformTypes[type_name] = type; mPlatformTypes[type_name] = type;
} else { } else {
std::set<std::string>::const_iterator it; for (const std::string &p : platform) {
for (it = platform.begin(); it != platform.end(); ++it) { const PlatformType * const type_ptr = platform_type(type_name, p);
const PlatformType * const type_ptr = platform_type(type_name, *it);
if (type_ptr) { if (type_ptr) {
if (*type_ptr == type) if (*type_ptr == type)
return Error(DUPLICATE_PLATFORM_TYPE, type_name); return Error(DUPLICATE_PLATFORM_TYPE, type_name);
return Error(PLATFORM_TYPE_REDEFINED, type_name); return Error(PLATFORM_TYPE_REDEFINED, type_name);
} }
mPlatforms[*it].mPlatformTypes[type_name] = type; mPlatforms[p].mPlatformTypes[type_name] = type;
} }
} }
} }