kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Base: modernize C++11

Browse Source 
* remove redundant void-arg
* use nullptr
* replace deprecated headers
This commit is contained in:
wmayer
2022-01-25 20:21:30 +01:00
parent 6c29c65013
commit cad0d01883
72 changed files with 628 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/Base/Parameter.cpp
View File

@@ -25,7 +25,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <assert.h>
# include <cassert>
# include <memory>
# include <xercesc/util/PlatformUtils.hpp>
# include <xercesc/util/XercesVersion.hpp>
@@ -53,7 +53,7 @@
# include <io.h>
# endif
# include <sstream>
# include <stdio.h>
# include <cstdio>
#endif
@@ -354,7 +354,7 @@ Base::Reference<ParameterGrp> ParameterGrp::GetGroup(const char* Name)
cTemp.assign(cName,0,pos);
// removing the first part from the original
cName.erase(0,pos+1);
//sbsequent call
//subsequent call
return _GetGroup(cTemp.c_str())->GetGroup(cName.c_str());
}
}
@@ -405,7 +405,7 @@ std::vector<Base::Reference<ParameterGrp> > ParameterGrp::GetGroups(void)
}
/// test if this group is empty
bool ParameterGrp::IsEmpty(void) const
bool ParameterGrp::IsEmpty() const
{
if ( _pGroupNode->getFirstChild() )
return false;
@@ -419,7 +419,7 @@ bool ParameterGrp::HasGroup(const char* Name) const
if ( _GroupMap.find(Name) != _GroupMap.end() )
return true;
if ( FindElement(_pGroupNode,"FCParamGroup",Name) != 0 )
if ( FindElement(_pGroupNode,"FCParamGroup",Name) != nullptr )
return true;
return false;
@@ -460,7 +460,7 @@ std::vector<bool> ParameterGrp::GetBools(const char * sFilter) const
while ( pcTemp) {
Name = StrX(static_cast<DOMElement*>(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str();
// check on filter condition
if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) {
if (strcmp(StrX(static_cast<DOMElement*>(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str(),"1"))
vrValues.push_back(false);
else
@@ -482,7 +482,7 @@ std::vector<std::pair<std::string,bool> > ParameterGrp::GetBoolMap(const char *
while ( pcTemp) {
Name = StrX(static_cast<DOMElement*>(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str();
// check on filter condition
if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) {
if (strcmp(StrX(static_cast<DOMElement*>(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str(),"1"))
vrValues.emplace_back(Name, false);
else
@@ -528,7 +528,7 @@ std::vector<long> ParameterGrp::GetInts(const char * sFilter) const
while ( pcTemp ) {
Name = StrX(static_cast<DOMElement*>(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str();
// check on filter condition
if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) {
vrValues.push_back(atol(StrX(static_cast<DOMElement*>(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str()) );
}
pcTemp = FindNextElement(pcTemp,"FCInt") ;
@@ -547,7 +547,7 @@ std::vector<std::pair<std::string,long> > ParameterGrp::GetIntMap(const char * s
while ( pcTemp ) {
Name = StrX(static_cast<DOMElement*>(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str();
// check on filter condition
if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) {
vrValues.emplace_back(Name,
( atol (StrX(static_cast<DOMElement*>(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str())));
}
@@ -564,7 +564,7 @@ unsigned long ParameterGrp::GetUnsigned(const char* Name, unsigned long lPreset)
// if not return preset
if (!pcElem) return lPreset;
// if yes check the value and return
return strtoul (StrX(pcElem->getAttribute(XStr("Value").unicodeForm())).c_str(),0,10);
return strtoul (StrX(pcElem->getAttribute(XStr("Value").unicodeForm())).c_str(),nullptr,10);
}
void ParameterGrp::SetUnsigned(const char* Name, unsigned long lValue)
@@ -591,8 +591,8 @@ std::vector<unsigned long> ParameterGrp::GetUnsigneds(const char * sFilter) cons
while ( pcTemp ) {
Name = StrX(static_cast<DOMElement*>(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str();
// check on filter condition
if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
vrValues.push_back( strtoul (StrX(static_cast<DOMElement*>(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str(),0,10) );
if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) {
vrValues.push_back( strtoul (StrX(static_cast<DOMElement*>(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str(),nullptr,10) );
}
pcTemp = FindNextElement(pcTemp,"FCUInt") ;
}
@@ -612,7 +612,7 @@ std::vector<std::pair<std::string,unsigned long> > ParameterGrp::GetUnsignedMap(
// check on filter condition
if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
vrValues.emplace_back(Name,
( strtoul (StrX(static_cast<DOMElement*>(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str(),0,10) ));
( strtoul (StrX(static_cast<DOMElement*>(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str(),nullptr,10) ));
}
pcTemp = FindNextElement(pcTemp,"FCUInt");
}
@@ -654,7 +654,7 @@ std::vector<double> ParameterGrp::GetFloats(const char * sFilter) const
while ( pcTemp ) {
Name = StrX(static_cast<DOMElement*>(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str();
// check on filter condition
if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) {
vrValues.push_back( atof (StrX(static_cast<DOMElement*>(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str()) );
}
pcTemp = FindNextElement(pcTemp,"FCFloat");
@@ -673,7 +673,7 @@ std::vector<std::pair<std::string,double> > ParameterGrp::GetFloatMap(const char
while ( pcTemp ) {
Name = StrX(static_cast<DOMElement*>(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str();
// check on filter condition
if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) {
vrValues.emplace_back(Name,
( atof (StrX(static_cast<DOMElement*>(pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str())));
}
@@ -723,7 +723,7 @@ std::string ParameterGrp::GetASCII(const char* Name, const char * pPreset) const
DOMElement *pcElem = FindElement(_pGroupNode,"FCText",Name);
// if not return preset
if (!pcElem) {
if (pPreset==0)
if (pPreset==nullptr)
return std::string("");
else
return std::string(pPreset);
@@ -746,7 +746,7 @@ std::vector<std::string> ParameterGrp::GetASCIIs(const char * sFilter) const
while ( pcTemp ) {
Name = StrXUTF8(static_cast<DOMElement*>(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str();
// check on filter condition
if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) {
// retrieve the text element
DOMNode *pcElem2 = pcTemp->getFirstChild();
if (pcElem2)
@@ -770,7 +770,7 @@ std::vector<std::pair<std::string,std::string> > ParameterGrp::GetASCIIMap(const
while ( pcTemp) {
Name = StrXUTF8(static_cast<DOMElement*>(pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str();
// check on filter condition
if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
if (sFilter == nullptr || Name.find(sFilter)!= std::string::npos) {
// retrieve the text element
DOMNode *pcElem2 = pcTemp->getFirstChild();
if (pcElem2)
@@ -992,7 +992,7 @@ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *ParameterGrp::FindElement(XERCES_CPP_
Base::Console().Warning("FindElement: %s cannot have the element %s of type %s\n", StrX(Start->getNodeName()).c_str(), Name, Type);
return nullptr;
}
for (DOMNode *clChild = Start->getFirstChild(); clChild != 0; clChild = clChild->getNextSibling()) {
for (DOMNode *clChild = Start->getFirstChild(); clChild != nullptr; clChild = clChild->getNextSibling()) {
if (clChild->getNodeType() == DOMNode::ELEMENT_NODE) {
// the right node Type
if (!strcmp(Type,StrX(clChild->getNodeName()).c_str())) {
@@ -1008,7 +1008,7 @@ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *ParameterGrp::FindElement(XERCES_CPP_
}
}
}
return NULL;
return nullptr;
}
XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *ParameterGrp::FindNextElement(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *Prev, const char* Type) const
@@ -1017,7 +1017,7 @@ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *ParameterGrp::FindNextElement(XERCES_
if (!clChild)
return nullptr;
while ((clChild = clChild->getNextSibling())!=0) {
while ((clChild = clChild->getNextSibling()) != nullptr) {
if (clChild->getNodeType() == DOMNode::ELEMENT_NODE) {
// the right node Type
if (!strcmp(Type,StrX(clChild->getNodeName()).c_str())) {
@@ -1025,7 +1025,7 @@ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *ParameterGrp::FindNextElement(XERCES_
}
}
}
return NULL;
return nullptr;
}
XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *ParameterGrp::FindOrCreateElement(XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *Start, const char* Type, const char* Name) const
@@ -1119,7 +1119,7 @@ static XercesDOMParser::ValSchemes gValScheme = XercesDOMParser::Val_Au
/** Default construction
*/
ParameterManager::ParameterManager()
: ParameterGrp(), _pDocument(0), paramSerializer(0)
: ParameterGrp(), _pDocument(nullptr), paramSerializer(nullptr)
{
// initialize the XML system
Init();
@@ -1170,8 +1170,8 @@ ParameterManager::ParameterManager()
gSchemaFullChecking = false;
gDoCreate = true;
gOutputEncoding = 0;
gMyEOLSequence = 0;
gOutputEncoding = nullptr;
gMyEOLSequence = nullptr;
gSplitCdataSections = true;
gDiscardDefaultContent = true;
@@ -1188,7 +1188,7 @@ ParameterManager::~ParameterManager()
delete paramSerializer;
}
void ParameterManager::Init(void)
void ParameterManager::Init()
{
static bool Init = false;
if (!Init) {
@@ -1212,7 +1212,7 @@ void ParameterManager::Init(void)
}
}
void ParameterManager::Terminate(void)
void ParameterManager::Terminate()
{
XMLTools::terminate();
XMLPlatformUtils::Terminate();
@@ -1230,7 +1230,7 @@ void ParameterManager::SetSerializer(ParameterSerializer* ps)
bool ParameterManager::HasSerializer() const
{
return (paramSerializer != 0);
return (paramSerializer != nullptr);
}
int ParameterManager::LoadDocument()
@@ -1518,15 +1518,15 @@ void ParameterManager::SaveDocument(XMLFormatTarget* pFormatTarget) const
#endif
}
void ParameterManager::CreateDocument(void)
void ParameterManager::CreateDocument()
{
// creating a document from screatch
DOMImplementation* impl = DOMImplementationRegistry::getDOMImplementation(XStr("Core").unicodeForm());
delete _pDocument;
_pDocument = impl->createDocument(
0, // root element namespace URI.
nullptr, // root element namespace URI.
XStr("FCParameters").unicodeForm(), // root element name
0); // document type object (DTD).
nullptr); // document type object (DTD).
// creating the node for the root group
DOMElement* rootElem = _pDocument->getDocumentElement();