Base: fix warnings from code analysers:
* replace some C-style casts with static_cast * remove unneeded destructors * define default copy-constructor and assignment operator
This commit is contained in:
@@ -113,7 +113,7 @@ const char* Base::XMLReader::localName() const
|
||||
|
||||
unsigned int Base::XMLReader::getAttributeCount() const
|
||||
{
|
||||
return (unsigned int)AttrMap.size();
|
||||
return static_cast<unsigned int>(AttrMap.size());
|
||||
}
|
||||
|
||||
long Base::XMLReader::getAttributeAsInteger(const char* AttrName) const
|
||||
@@ -136,7 +136,7 @@ unsigned long Base::XMLReader::getAttributeAsUnsigned(const char* AttrName) cons
|
||||
AttrMapType::const_iterator pos = AttrMap.find(AttrName);
|
||||
|
||||
if (pos != AttrMap.end()) {
|
||||
return strtoul(pos->second.c_str(),0,10);
|
||||
return strtoul(pos->second.c_str(),nullptr,10);
|
||||
}
|
||||
else {
|
||||
// wrong name, use hasAttribute if not sure!
|
||||
@@ -518,12 +518,12 @@ void Base::XMLReader::resetErrors()
|
||||
|
||||
bool Base::XMLReader::testStatus(ReaderStatus pos) const
|
||||
{
|
||||
return StatusBits.test((size_t)pos);
|
||||
return StatusBits.test(static_cast<size_t>(pos));
|
||||
}
|
||||
|
||||
void Base::XMLReader::setStatus(ReaderStatus pos, bool on)
|
||||
{
|
||||
StatusBits.set((size_t)pos, on);
|
||||
StatusBits.set(static_cast<size_t>(pos), on);
|
||||
}
|
||||
|
||||
void Base::XMLReader::setPartialRestore(bool on)
|
||||
@@ -559,10 +559,6 @@ Base::Reader::Reader(std::istream& str, const std::string& name, int version)
|
||||
{
|
||||
}
|
||||
|
||||
Base::Reader::~Reader()
|
||||
{
|
||||
}
|
||||
|
||||
std::string Base::Reader::getFileName() const
|
||||
{
|
||||
return this->_name;
|
||||
|
||||
Reference in New Issue
Block a user