From 055793e12c380418dd41b35dce8803a460acf7c2 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 24 Mar 2022 11:27:55 +0100 Subject: [PATCH] Base: [skip ci] remove several superfluous static_cast --- src/Base/Parameter.cpp | 78 ++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 45 deletions(-) diff --git a/src/Base/Parameter.cpp b/src/Base/Parameter.cpp index b1d5814bb0..7db2965627 100644 --- a/src/Base/Parameter.cpp +++ b/src/Base/Parameter.cpp @@ -347,7 +347,6 @@ Base::Reference ParameterGrp::GetGroup(const char* Name) Base::Reference ParameterGrp::_GetGroup(const char* Name) { Base::Reference rParamGrp; - DOMElement *pcTemp; // already created? if ((rParamGrp=_GroupMap[Name]).isValid()) { @@ -356,7 +355,7 @@ Base::Reference ParameterGrp::_GetGroup(const char* Name) } // search if Group node already there - pcTemp = FindOrCreateElement(_pGroupNode,"FCParamGroup",Name); + DOMElement *pcTemp = FindOrCreateElement(_pGroupNode,"FCParamGroup",Name); // create and register handle rParamGrp = Base::Reference (new ParameterGrp(pcTemp,Name)); @@ -369,16 +368,15 @@ std::vector > ParameterGrp::GetGroups(void) { Base::Reference rParamGrp; std::vector > vrParamGrp; - DOMElement *pcTemp; //= _pGroupNode->getFirstChild(); std::string Name; - pcTemp = FindElement(_pGroupNode,"FCParamGroup"); + DOMElement *pcTemp = FindElement(_pGroupNode,"FCParamGroup"); while (pcTemp) { - Name = StrX(static_cast(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); + Name = StrX(pcTemp->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); // already created? if (!(rParamGrp=_GroupMap[Name]).isValid()) { - rParamGrp = Base::Reference (new ParameterGrp(static_cast(pcTemp),Name.c_str())); + rParamGrp = Base::Reference (new ParameterGrp(pcTemp,Name.c_str())); _GroupMap[Name] = rParamGrp; } vrParamGrp.push_back( rParamGrp ); @@ -438,15 +436,14 @@ void ParameterGrp::SetBool(const char* Name, bool bValue) std::vector ParameterGrp::GetBools(const char * sFilter) const { std::vector vrValues; - DOMElement *pcTemp;// = _pGroupNode->getFirstChild(); std::string Name; - pcTemp = FindElement(_pGroupNode,"FCBool"); + DOMElement *pcTemp = FindElement(_pGroupNode,"FCBool"); while ( pcTemp) { - Name = StrX(static_cast(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); + Name = StrX(pcTemp->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); // check on filter condition if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) { - if (strcmp(StrX(static_cast(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str(),"1")) + if (strcmp(StrX(pcTemp->getAttribute(XStr("Value").unicodeForm())).c_str(),"1")) vrValues.push_back(false); else vrValues.push_back(true); @@ -460,15 +457,14 @@ std::vector ParameterGrp::GetBools(const char * sFilter) const std::vector > ParameterGrp::GetBoolMap(const char * sFilter) const { std::vector > vrValues; - DOMElement *pcTemp;// = _pGroupNode->getFirstChild(); std::string Name; - pcTemp = FindElement(_pGroupNode,"FCBool"); + DOMElement *pcTemp = FindElement(_pGroupNode,"FCBool"); while ( pcTemp) { - Name = StrX(static_cast(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); + Name = StrX(pcTemp->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); // check on filter condition if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) { - if (strcmp(StrX(static_cast(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str(),"1")) + if (strcmp(StrX(pcTemp->getAttribute(XStr("Value").unicodeForm())).c_str(),"1")) vrValues.emplace_back(Name, false); else vrValues.emplace_back(Name, true); @@ -506,15 +502,14 @@ void ParameterGrp::SetInt(const char* Name, long lValue) std::vector ParameterGrp::GetInts(const char * sFilter) const { std::vector vrValues; - DOMNode *pcTemp;// = _pGroupNode->getFirstChild(); std::string Name; - pcTemp = FindElement(_pGroupNode,"FCInt") ; + DOMElement *pcTemp = FindElement(_pGroupNode,"FCInt") ; while ( pcTemp ) { - Name = StrX(static_cast(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); + Name = StrX(pcTemp->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); // check on filter condition if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) { - vrValues.push_back(atol(StrX(static_cast(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str()) ); + vrValues.push_back(atol(StrX(pcTemp->getAttribute(XStr("Value").unicodeForm())).c_str()) ); } pcTemp = FindNextElement(pcTemp,"FCInt") ; } @@ -525,16 +520,15 @@ std::vector ParameterGrp::GetInts(const char * sFilter) const std::vector > ParameterGrp::GetIntMap(const char * sFilter) const { std::vector > vrValues; - DOMNode *pcTemp;// = _pGroupNode->getFirstChild(); std::string Name; - pcTemp = FindElement(_pGroupNode,"FCInt") ; + DOMElement *pcTemp = FindElement(_pGroupNode,"FCInt") ; while ( pcTemp ) { - Name = StrX(static_cast(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); + Name = StrX(pcTemp->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); // check on filter condition if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) { vrValues.emplace_back(Name, - ( atol (StrX(static_cast(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str()))); + ( atol (StrX(pcTemp->getAttribute(XStr("Value").unicodeForm())).c_str()))); } pcTemp = FindNextElement(pcTemp,"FCInt") ; } @@ -569,15 +563,14 @@ void ParameterGrp::SetUnsigned(const char* Name, unsigned long lValue) std::vector ParameterGrp::GetUnsigneds(const char * sFilter) const { std::vector vrValues; - DOMNode *pcTemp;// = _pGroupNode->getFirstChild(); std::string Name; - pcTemp = FindElement(_pGroupNode,"FCUInt"); + DOMElement *pcTemp = FindElement(_pGroupNode,"FCUInt"); while ( pcTemp ) { - Name = StrX(static_cast(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); + Name = StrX(pcTemp->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); // check on filter condition if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) { - vrValues.push_back( strtoul (StrX(static_cast(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str(),nullptr,10) ); + vrValues.push_back( strtoul (StrX(pcTemp->getAttribute(XStr("Value").unicodeForm())).c_str(),nullptr,10) ); } pcTemp = FindNextElement(pcTemp,"FCUInt") ; } @@ -588,16 +581,15 @@ std::vector ParameterGrp::GetUnsigneds(const char * sFilter) cons std::vector > ParameterGrp::GetUnsignedMap(const char * sFilter) const { std::vector > vrValues; - DOMNode *pcTemp;// = _pGroupNode->getFirstChild(); std::string Name; - pcTemp = FindElement(_pGroupNode,"FCUInt"); + DOMElement *pcTemp = FindElement(_pGroupNode,"FCUInt"); while ( pcTemp ) { - Name = StrX(static_cast(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); + Name = StrX(pcTemp->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); // check on filter condition if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) { vrValues.emplace_back(Name, - ( strtoul (StrX(static_cast(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str(),nullptr,10) )); + ( strtoul (StrX(pcTemp->getAttribute(XStr("Value").unicodeForm())).c_str(),nullptr,10) )); } pcTemp = FindNextElement(pcTemp,"FCUInt"); } @@ -632,15 +624,14 @@ void ParameterGrp::SetFloat(const char* Name, double dValue) std::vector ParameterGrp::GetFloats(const char * sFilter) const { std::vector vrValues; - DOMElement *pcTemp ;//= _pGroupNode->getFirstChild(); std::string Name; - pcTemp = FindElement(_pGroupNode,"FCFloat") ; + DOMElement *pcTemp = FindElement(_pGroupNode,"FCFloat") ; while ( pcTemp ) { - Name = StrX(static_cast(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); + Name = StrX(pcTemp->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); // check on filter condition if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) { - vrValues.push_back( atof (StrX(static_cast(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str()) ); + vrValues.push_back( atof (StrX(pcTemp->getAttribute(XStr("Value").unicodeForm())).c_str()) ); } pcTemp = FindNextElement(pcTemp,"FCFloat"); } @@ -651,16 +642,15 @@ std::vector ParameterGrp::GetFloats(const char * sFilter) const std::vector > ParameterGrp::GetFloatMap(const char * sFilter) const { std::vector > vrValues; - DOMElement *pcTemp ;//= _pGroupNode->getFirstChild(); std::string Name; - pcTemp = FindElement(_pGroupNode,"FCFloat") ; + DOMElement *pcTemp = FindElement(_pGroupNode,"FCFloat") ; while ( pcTemp ) { - Name = StrX(static_cast(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); + Name = StrX(pcTemp->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); // check on filter condition if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) { vrValues.emplace_back(Name, - ( atof (StrX(static_cast(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str()))); + ( atof (StrX(pcTemp->getAttribute(XStr("Value").unicodeForm())).c_str()))); } pcTemp = FindNextElement(pcTemp,"FCFloat"); } @@ -724,12 +714,11 @@ std::string ParameterGrp::GetASCII(const char* Name, const char * pPreset) const std::vector ParameterGrp::GetASCIIs(const char * sFilter) const { std::vector vrValues; - DOMElement *pcTemp;// = _pGroupNode->getFirstChild(); std::string Name; - pcTemp = FindElement(_pGroupNode,"FCText"); + DOMElement *pcTemp = FindElement(_pGroupNode,"FCText"); while ( pcTemp ) { - Name = StrXUTF8(static_cast(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); + Name = StrXUTF8(pcTemp->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); // check on filter condition if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) { // retrieve the text element @@ -748,12 +737,11 @@ std::vector ParameterGrp::GetASCIIs(const char * sFilter) const std::vector > ParameterGrp::GetASCIIMap(const char * sFilter) const { std::vector > vrValues; - DOMElement *pcTemp;// = _pGroupNode->getFirstChild(); std::string Name; - pcTemp = FindElement(_pGroupNode,"FCText"); + DOMElement *pcTemp = FindElement(_pGroupNode,"FCText"); while ( pcTemp) { - Name = StrXUTF8(static_cast(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); + Name = StrXUTF8(pcTemp->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); // check on filter condition if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) { // retrieve the text element @@ -1516,7 +1504,7 @@ void ParameterManager::CreateDocument() // creating the node for the root group DOMElement* rootElem = _pDocument->getDocumentElement(); _pGroupNode = _pDocument->createElement(XStr("FCParamGroup").unicodeForm()); - static_cast(_pGroupNode)->setAttribute(XStr("Name").unicodeForm(), XStr("Root").unicodeForm()); + _pGroupNode->setAttribute(XStr("Name").unicodeForm(), XStr("Root").unicodeForm()); rootElem->appendChild(_pGroupNode); }