From 7546ce8ab7c0c0a65e9493f98f7eae4664fb577d Mon Sep 17 00:00:00 2001 From: berniev Date: Mon, 5 Dec 2022 03:38:22 +1000 Subject: [PATCH] Simplify switch statement (modded) --- src/Base/Parameter.cpp | 52 +++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 34 deletions(-) diff --git a/src/Base/Parameter.cpp b/src/Base/Parameter.cpp index 75a23dc648..5435ddee9c 100644 --- a/src/Base/Parameter.cpp +++ b/src/Base/Parameter.cpp @@ -1929,41 +1929,25 @@ DOMPrintFilter::FilterAction DOMPrintFilter::acceptNode(const DOMNode* node) con } switch (node->getNodeType()) { - case DOMNode::ELEMENT_NODE: { - return DOMNodeFilter::FILTER_ACCEPT; - - break; + case DOMNode::TEXT_NODE: { + // Filter out text element if it is under a group node. Note text xml + // element is plain text in between tags, and we do not store any text + // there. + auto parent = node->getParentNode(); + if (parent + && XMLString::compareString(parent->getNodeName(), + XStr("FCParamGroup").unicodeForm()) == 0) + return DOMNodeFilter::FILTER_REJECT; + return DOMNodeFilter::FILTER_ACCEPT; + } + case DOMNode::DOCUMENT_TYPE_NODE: + case DOMNode::DOCUMENT_NODE: { + return DOMNodeFilter::FILTER_REJECT;// no effect + } + default: { + return DOMNodeFilter::FILTER_ACCEPT; + } } - case DOMNode::COMMENT_NODE: { - return DOMNodeFilter::FILTER_ACCEPT; - break; - } - case DOMNode::TEXT_NODE: { - // Filter out text element if it is under a group node. Note text xml - // element is plain text in between tags, and we do not store any text - // there. - auto parent = node->getParentNode(); - if (parent && XMLString::compareString( - parent->getNodeName(), XStr("FCParamGroup").unicodeForm()) == 0) - return DOMNodeFilter::FILTER_REJECT; - return DOMNodeFilter::FILTER_ACCEPT; - break; - } - case DOMNode::DOCUMENT_TYPE_NODE: { - return DOMNodeFilter::FILTER_REJECT; // no effect - break; - } - case DOMNode::DOCUMENT_NODE: { - return DOMNodeFilter::FILTER_REJECT; // no effect - break; - } - default : { - return DOMNodeFilter::FILTER_ACCEPT; - break; - } - } - - return DOMNodeFilter::FILTER_ACCEPT; } //**************************************************************************