Skip to content

Commit

Permalink
Fixing whitespace and formatting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Felix Faber committed Apr 19, 2024
1 parent 49ed63c commit f4df9e1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
20 changes: 8 additions & 12 deletions lib/importproject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -719,9 +719,8 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
}
}
}
}
else {
for (const tinyxml2::XMLElement* e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
} else {
for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
if (std::strcmp(e->Name(), "ClCompile") == 0) {
const char* include = e->Attribute("Include");
if (include && Path::acceptFile(include)) {
Expand All @@ -731,19 +730,16 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
}
}
}
}
else if (std::strcmp(node->Name(), "ItemDefinitionGroup") == 0) {
} else if (std::strcmp(node->Name(), "ItemDefinitionGroup") == 0) {
itemDefinitionGroupList.emplace_back(node, additionalIncludeDirectories);
}
else if (std::strcmp(node->Name(), "PropertyGroup") == 0) {
} else if (std::strcmp(node->Name(), "PropertyGroup") == 0) {
importPropertyGroup(node, variables, includePath, &useOfMfc);
}
else if (std::strcmp(node->Name(), "ImportGroup") == 0) {
const char* labelAttribute = node->Attribute("Label");
} else if (std::strcmp(node->Name(), "ImportGroup") == 0) {
const char *labelAttribute = node->Attribute("Label");
if (labelAttribute && std::strcmp(labelAttribute, "PropertySheets") == 0) {
for (const tinyxml2::XMLElement* e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
if (std::strcmp(e->Name(), "Import") == 0) {
const char* projectAttribute = e->Attribute("Project");
const char *projectAttribute = e->Attribute("Project");
if (projectAttribute)
loadVisualStudioProperties(projectAttribute, variables, includePath, additionalIncludeDirectories, itemDefinitionGroupList);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/importproject.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class CPPCHECKLIB WARN_UNUSED ImportProject {
};

bool importSln(std::istream &istr, const std::string &path, const std::vector<std::string> &fileFilters);
static SharedItemsProject importVcxitems(const std::string& filename, const std::vector<std::string>& fileFilters, std::vector<SharedItemsProject> &cache);
static SharedItemsProject importVcxitems(const std::string &filename, const std::vector<std::string> &fileFilters, std::vector<SharedItemsProject> &cache);
bool importVcxproj(const std::string &filename, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories, const std::vector<std::string> &fileFilters, std::vector<SharedItemsProject> &cache);
bool importBcb6Prj(const std::string &projectFilename);

Expand Down

0 comments on commit f4df9e1

Please sign in to comment.