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

Import Project: import suppressions from gui project

This commit is contained in:
Daniel Marjamäki 2019-04-07 13:15:25 +02:00
parent 111db91387
commit 6d7ec98dd6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/importproject.cpp
View File

@ -985,6 +985,7 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings *setti
(void)ProjectVersionAttrib; (void)ProjectVersionAttrib;
std::list<std::string> paths; std::list<std::string> paths;
std::list<std::string> suppressions;
Settings temp; Settings temp;
for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) { for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
@ -1009,11 +1010,9 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings *setti
guiProject.excludedPaths = readXmlStringList(node, IgnorePathName, IgnorePathNameAttrib); guiProject.excludedPaths = readXmlStringList(node, IgnorePathName, IgnorePathNameAttrib);
else if (strcmp(node->Name(), LibrariesElementName) == 0) else if (strcmp(node->Name(), LibrariesElementName) == 0)
guiProject.libraries = readXmlStringList(node, LibraryElementName, nullptr); guiProject.libraries = readXmlStringList(node, LibraryElementName, nullptr);
else if (strcmp(node->Name(), SuppressionsElementName) == 0) { else if (strcmp(node->Name(), SuppressionsElementName) == 0)
for (const std::string &s : readXmlStringList(node, SuppressionElementName, nullptr)) { suppressions = readXmlStringList(node, SuppressionElementName, nullptr);
temp.nomsg.addSuppressionLine(s); else if (strcmp(node->Name(), PlatformElementName) == 0)
}
} else if (strcmp(node->Name(), PlatformElementName) == 0)
guiProject.platform = node->GetText(); guiProject.platform = node->GetText();
else if (strcmp(node->Name(), AnalyzeAllVsConfigsElementName) == 0) else if (strcmp(node->Name(), AnalyzeAllVsConfigsElementName) == 0)
; // FIXME: Write some warning ; // FIXME: Write some warning
@ -1033,5 +1032,7 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings *setti
settings->userUndefs = temp.userUndefs; settings->userUndefs = temp.userUndefs;
for (const std::string &path : paths) for (const std::string &path : paths)
guiProject.pathNames.push_back(path); guiProject.pathNames.push_back(path);
for (const std::string &supp : suppressions)
settings->nomsg.addSuppressionLine(supp);
return true; return true;
} }