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

astyle formatting

This commit is contained in:
Daniel Marjamäki 2020-07-16 16:36:11 +02:00
parent 118e9eb3e2
commit 9edbec8594
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/importproject.cpp
View File

@ -1076,7 +1076,9 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings *setti
for (const tinyxml2::XMLElement *child = node->FirstChildElement(); child; child = child->NextSiblingElement()) { for (const tinyxml2::XMLElement *child = node->FirstChildElement(); child; child = child->NextSiblingElement()) {
if (strcmp(child->Name(), CppcheckXml::SuppressionsElementName) != 0) if (strcmp(child->Name(), CppcheckXml::SuppressionsElementName) != 0)
continue; continue;
auto read = [](const char *s, const char *def) { return s ? s : def; }; auto read = [](const char *s, const char *def) {
return s ? s : def;
};
Suppressions::Suppression s; Suppressions::Suppression s;
s.errorId = read(child->GetText(), ""); s.errorId = read(child->GetText(), "");
s.fileName = read(child->Attribute("fileName"), ""); s.fileName = read(child->Attribute("fileName"), "");
@ -1085,8 +1087,7 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings *setti
std::istringstream(read(child->Attribute("cppcheck-id"), "0")) >> s.cppcheckId; std::istringstream(read(child->Attribute("cppcheck-id"), "0")) >> s.cppcheckId;
suppressions.push_back(s); suppressions.push_back(s);
} }
} } else if (strcmp(node->Name(), CppcheckXml::VSConfigurationElementName) == 0)
else if (strcmp(node->Name(), CppcheckXml::VSConfigurationElementName) == 0)
guiProject.checkVsConfigs = readXmlStringList(node, "", CppcheckXml::VSConfigurationName, nullptr); guiProject.checkVsConfigs = readXmlStringList(node, "", CppcheckXml::VSConfigurationName, nullptr);
else if (strcmp(node->Name(), CppcheckXml::PlatformElementName) == 0) else if (strcmp(node->Name(), CppcheckXml::PlatformElementName) == 0)
guiProject.platform = node->GetText(); guiProject.platform = node->GetText();