Skip to content

Commit f4df9e1

Browse files
author
Felix Faber
committed
Fixing whitespace and formatting issues
1 parent 49ed63c commit f4df9e1

2 files changed

Lines changed: 9 additions & 13 deletions

File tree

lib/importproject.cpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -719,9 +719,8 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
719719
}
720720
}
721721
}
722-
}
723-
else {
724-
for (const tinyxml2::XMLElement* e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
722+
} else {
723+
for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
725724
if (std::strcmp(e->Name(), "ClCompile") == 0) {
726725
const char* include = e->Attribute("Include");
727726
if (include && Path::acceptFile(include)) {
@@ -731,19 +730,16 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
731730
}
732731
}
733732
}
734-
}
735-
else if (std::strcmp(node->Name(), "ItemDefinitionGroup") == 0) {
733+
} else if (std::strcmp(node->Name(), "ItemDefinitionGroup") == 0) {
736734
itemDefinitionGroupList.emplace_back(node, additionalIncludeDirectories);
737-
}
738-
else if (std::strcmp(node->Name(), "PropertyGroup") == 0) {
735+
} else if (std::strcmp(node->Name(), "PropertyGroup") == 0) {
739736
importPropertyGroup(node, variables, includePath, &useOfMfc);
740-
}
741-
else if (std::strcmp(node->Name(), "ImportGroup") == 0) {
742-
const char* labelAttribute = node->Attribute("Label");
737+
} else if (std::strcmp(node->Name(), "ImportGroup") == 0) {
738+
const char *labelAttribute = node->Attribute("Label");
743739
if (labelAttribute && std::strcmp(labelAttribute, "PropertySheets") == 0) {
744-
for (const tinyxml2::XMLElement* e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
740+
for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
745741
if (std::strcmp(e->Name(), "Import") == 0) {
746-
const char* projectAttribute = e->Attribute("Project");
742+
const char *projectAttribute = e->Attribute("Project");
747743
if (projectAttribute)
748744
loadVisualStudioProperties(projectAttribute, variables, includePath, additionalIncludeDirectories, itemDefinitionGroupList);
749745
}

lib/importproject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class CPPCHECKLIB WARN_UNUSED ImportProject {
109109
};
110110

111111
bool importSln(std::istream &istr, const std::string &path, const std::vector<std::string> &fileFilters);
112-
static SharedItemsProject importVcxitems(const std::string& filename, const std::vector<std::string>& fileFilters, std::vector<SharedItemsProject> &cache);
112+
static SharedItemsProject importVcxitems(const std::string &filename, const std::vector<std::string> &fileFilters, std::vector<SharedItemsProject> &cache);
113113
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);
114114
bool importBcb6Prj(const std::string &projectFilename);
115115

0 commit comments

Comments
 (0)