summaryrefslogtreecommitdiffstats
path: root/Source/CPack/WiX/cmWIXPatch.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/CPack/WiX/cmWIXPatch.cxx')
-rw-r--r--Source/CPack/WiX/cmWIXPatch.cxx88
1 files changed, 41 insertions, 47 deletions
diff --git a/Source/CPack/WiX/cmWIXPatch.cxx b/Source/CPack/WiX/cmWIXPatch.cxx
index 07375da..c9d010e 100644
--- a/Source/CPack/WiX/cmWIXPatch.cxx
+++ b/Source/CPack/WiX/cmWIXPatch.cxx
@@ -14,31 +14,29 @@
#include <CPack/cmCPackGenerator.h>
-cmWIXPatch::cmWIXPatch(cmCPackLog* logger):
- Logger(logger)
+cmWIXPatch::cmWIXPatch(cmCPackLog* logger)
+ : Logger(logger)
{
-
}
bool cmWIXPatch::LoadFragments(std::string const& patchFilePath)
{
cmWIXPatchParser parser(Fragments, Logger);
- if(!parser.ParseFile(patchFilePath.c_str()))
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR,
- "Failed parsing XML patch file: '" <<
- patchFilePath << "'" << std::endl);
+ if (!parser.ParseFile(patchFilePath.c_str())) {
+ cmCPackLogger(cmCPackLog::LOG_ERROR, "Failed parsing XML patch file: '"
+ << patchFilePath << "'" << std::endl);
return false;
- }
+ }
return true;
}
-void cmWIXPatch::ApplyFragment(
- std::string const& id, cmWIXSourceWriter& writer)
+void cmWIXPatch::ApplyFragment(std::string const& id,
+ cmWIXSourceWriter& writer)
{
cmWIXPatchParser::fragment_map_t::iterator i = Fragments.find(id);
- if(i == Fragments.end()) return;
+ if (i == Fragments.end())
+ return;
const cmWIXPatchElement& fragment = i->second;
@@ -47,36 +45,35 @@ void cmWIXPatch::ApplyFragment(
Fragments.erase(i);
}
-void cmWIXPatch::ApplyElementChildren(
- const cmWIXPatchElement& element, cmWIXSourceWriter& writer)
+void cmWIXPatch::ApplyElementChildren(const cmWIXPatchElement& element,
+ cmWIXSourceWriter& writer)
{
- for(cmWIXPatchElement::child_list_t::const_iterator
- j = element.children.begin(); j != element.children.end(); ++j)
- {
- cmWIXPatchNode *node = *j;
-
- switch(node->type())
- {
- case cmWIXPatchNode::ELEMENT:
- ApplyElement(dynamic_cast<const cmWIXPatchElement&>(*node), writer);
- break;
- case cmWIXPatchNode::TEXT:
- writer.AddTextNode(dynamic_cast<const cmWIXPatchText&>(*node).text);
- break;
+ for (cmWIXPatchElement::child_list_t::const_iterator j =
+ element.children.begin();
+ j != element.children.end(); ++j) {
+ cmWIXPatchNode* node = *j;
+
+ switch (node->type()) {
+ case cmWIXPatchNode::ELEMENT:
+ ApplyElement(dynamic_cast<const cmWIXPatchElement&>(*node), writer);
+ break;
+ case cmWIXPatchNode::TEXT:
+ writer.AddTextNode(dynamic_cast<const cmWIXPatchText&>(*node).text);
+ break;
}
}
}
-void cmWIXPatch::ApplyElement(
- const cmWIXPatchElement& element, cmWIXSourceWriter& writer)
+void cmWIXPatch::ApplyElement(const cmWIXPatchElement& element,
+ cmWIXSourceWriter& writer)
{
writer.BeginElement(element.name);
- for(cmWIXPatchElement::attributes_t::const_iterator
- i = element.attributes.begin(); i != element.attributes.end(); ++i)
- {
+ for (cmWIXPatchElement::attributes_t::const_iterator i =
+ element.attributes.begin();
+ i != element.attributes.end(); ++i) {
writer.AddAttribute(i->first, i->second);
- }
+ }
this->ApplyElementChildren(element, writer);
@@ -86,26 +83,23 @@ void cmWIXPatch::ApplyElement(
bool cmWIXPatch::CheckForUnappliedFragments()
{
std::string fragmentList;
- for(cmWIXPatchParser::fragment_map_t::const_iterator
- i = Fragments.begin(); i != Fragments.end(); ++i)
- {
- if(!fragmentList.empty())
- {
+ for (cmWIXPatchParser::fragment_map_t::const_iterator i = Fragments.begin();
+ i != Fragments.end(); ++i) {
+ if (!fragmentList.empty()) {
fragmentList += ", ";
- }
+ }
fragmentList += "'";
fragmentList += i->first;
fragmentList += "'";
- }
+ }
- if(!fragmentList.empty())
- {
- cmCPackLogger(cmCPackLog::LOG_ERROR,
- "Some XML patch fragments did not have matching IDs: " <<
- fragmentList << std::endl);
- return false;
- }
+ if (!fragmentList.empty()) {
+ cmCPackLogger(cmCPackLog::LOG_ERROR,
+ "Some XML patch fragments did not have matching IDs: "
+ << fragmentList << std::endl);
+ return false;
+ }
return true;
}