diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-12 15:42:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-12 15:42:40 +0100 |
commit | 1014cf0db8f6e66088a07359ceea06d6f07e3a98 (patch) | |
tree | 0e6933eb9b5b6ce8e5526e3353404391813fa8fe /ACE | |
parent | 6ac224067c083571fd1b00940e066e9ad3e2d582 (diff) | |
parent | 80cd12c72d6ac3c0a5f24ec7020ed5416ac0cbf4 (diff) | |
download | ATCD-1014cf0db8f6e66088a07359ceea06d6f07e3a98.tar.gz |
Merge pull request #1405 from jwillemsen/jwi-xmlcleanup
Use override, make use of default, removed not used static
Diffstat (limited to 'ACE')
-rw-r--r-- | ACE/ace/XML_Utils/XML_Error_Handler.cpp | 11 | ||||
-rw-r--r-- | ACE/ace/XML_Utils/XML_Error_Handler.h | 18 | ||||
-rw-r--r-- | ACE/ace/XML_Utils/XML_Helper.h | 16 | ||||
-rw-r--r-- | ACE/ace/XML_Utils/XML_Helper.tpp | 26 | ||||
-rw-r--r-- | ACE/ace/XML_Utils/XML_Schema_Resolver.cpp | 4 | ||||
-rw-r--r-- | ACE/ace/XML_Utils/XML_Schema_Resolver.h | 4 | ||||
-rw-r--r-- | ACE/ace/XML_Utils/XML_Typedefs.h | 6 | ||||
-rw-r--r-- | ACE/ace/XML_Utils/XSCRT/XML.hpp | 6 |
8 files changed, 28 insertions, 63 deletions
diff --git a/ACE/ace/XML_Utils/XML_Error_Handler.cpp b/ACE/ace/XML_Utils/XML_Error_Handler.cpp index 234baa14486..0f08b9b0d9e 100644 --- a/ACE/ace/XML_Utils/XML_Error_Handler.cpp +++ b/ACE/ace/XML_Utils/XML_Error_Handler.cpp @@ -12,15 +12,6 @@ using xercesc::SAXParseException; namespace XML { - XML_Error_Handler::XML_Error_Handler (void) - : errors_ (false) - { - } - - XML_Error_Handler::~XML_Error_Handler() - { - } - void XML_Error_Handler::warning(const SAXParseException& toCatch) { if (ACE::debug ()) @@ -68,7 +59,7 @@ namespace XML } bool - XML_Error_Handler::getErrors (void) const + XML_Error_Handler::getErrors () const { return this->errors_; } diff --git a/ACE/ace/XML_Utils/XML_Error_Handler.h b/ACE/ace/XML_Utils/XML_Error_Handler.h index 57d0835f998..b1ddc81d4e1 100644 --- a/ACE/ace/XML_Utils/XML_Error_Handler.h +++ b/ACE/ace/XML_Utils/XML_Error_Handler.h @@ -34,21 +34,21 @@ namespace XML : public xercesc::ErrorHandler { public: - XML_Error_Handler (void); - ~XML_Error_Handler (void); - - void warning(const SAXParseException& toCatch); - void error(const SAXParseException& toCatch); - void fatalError(const SAXParseException& toCatch); - void resetErrors(); - bool getErrors (void) const; + XML_Error_Handler () = default; + ~XML_Error_Handler () = default; + + void warning(const SAXParseException& toCatch) override; + void error(const SAXParseException& toCatch) override; + void fatalError(const SAXParseException& toCatch) override; + void resetErrors() override; + bool getErrors () const; private : XML_Error_Handler (const XML_Error_Handler&) = delete; XML_Error_Handler& operator= (const XML_Error_Handler&) = delete; XML_Error_Handler (XML_Error_Handler&&) = delete; XML_Error_Handler& operator= (XML_Error_Handler&&) = delete; - bool errors_; + bool errors_ { false }; }; } diff --git a/ACE/ace/XML_Utils/XML_Helper.h b/ACE/ace/XML_Utils/XML_Helper.h index 9deeda5e94d..39ee3627baa 100644 --- a/ACE/ace/XML_Utils/XML_Helper.h +++ b/ACE/ace/XML_Utils/XML_Helper.h @@ -45,9 +45,9 @@ namespace XML { public: // XML_Helper (void); - XML_Helper (Resolver *resolver = 0, Error_Handler *eh = 0); + XML_Helper (Resolver *resolver = nullptr, Error_Handler *eh = nullptr); - ~XML_Helper (void); + ~XML_Helper (); /// Create a DOM tree XERCES_CPP_NAMESPACE::DOMDocument * @@ -67,18 +67,18 @@ namespace XML bool write_DOM (XERCES_CPP_NAMESPACE::DOMDocument *doc, const ACE_TCHAR *file) const; - bool is_initialized (void) const; + bool is_initialized () const; /// Terminate the parser - void terminate_parser (void); + void terminate_parser (); - Resolver &get_resolver (void); + Resolver &get_resolver (); - Error_Handler &get_error_handler (void); + Error_Handler &get_error_handler (); protected: - /// Intialize the parser - void init_parser (void); + /// Initialize the parser + void init_parser (); private: bool initialized_; diff --git a/ACE/ace/XML_Utils/XML_Helper.tpp b/ACE/ace/XML_Utils/XML_Helper.tpp index bd74e5a923c..78d28b9cfd3 100644 --- a/ACE/ace/XML_Utils/XML_Helper.tpp +++ b/ACE/ace/XML_Utils/XML_Helper.tpp @@ -9,10 +9,7 @@ #include "xercesc/framework/LocalFileFormatTarget.hpp" #include "xercesc/dom/DOM.hpp" #include "XercesString.h" - -#if XERCES_VERSION_MAJOR == 3 #include "xercesc/dom/DOMLSSerializer.hpp" -#endif namespace XML { @@ -29,7 +26,7 @@ namespace XML using xercesc::XercesDOMParser; /* template <typename Resolver, typename Error> - XML_Helper<Resolver, Error>::XML_Helper (void) + XML_Helper<Resolver, Error>::XML_Helper () : initialized_ (false) { this->init_parser (); @@ -48,21 +45,21 @@ namespace XML } template <typename Resolver, typename Error> - XML_Helper<Resolver, Error>::~XML_Helper (void) + XML_Helper<Resolver, Error>::~XML_Helper () { this->terminate_parser (); } template <typename Resolver, typename Error> bool - XML_Helper<Resolver, Error>::is_initialized (void) const + XML_Helper<Resolver, Error>::is_initialized () const { - return this->initialized_ == true; + return this->initialized_; } template <typename Resolver, typename Error> void - XML_Helper<Resolver, Error>::init_parser (void) + XML_Helper<Resolver, Error>::init_parser () { if (this->initialized_) return; @@ -292,7 +289,6 @@ namespace XML try { bool retn; -#if XERCES_VERSION_MAJOR == 3 XERCES_CPP_NAMESPACE::DOMLSSerializer *serializer (impl_->createLSSerializer ()); XERCES_CPP_NAMESPACE::DOMConfiguration *ser_config (serializer->getDomConfig ()); XERCES_CPP_NAMESPACE::DOMLSOutput *output (impl_->createLSOutput ()); @@ -309,18 +305,6 @@ namespace XML output->release (); serializer->release (); return retn; -#else - std::auto_ptr <XERCES_CPP_NAMESPACE::DOMWriter> writer (impl_->createDOMWriter()); - - if (writer->canSetFeature (XMLUni::fgDOMWRTFormatPrettyPrint, - true)) - writer->setFeature (XMLUni::fgDOMWRTFormatPrettyPrint, true); - - std::auto_ptr <xercesc::XMLFormatTarget> ft (new xercesc::LocalFileFormatTarget(ACE_TEXT_ALWAYS_CHAR (file))); - retn = writer->writeNode(ft.get (), *doc); - - return retn; -#endif } catch (const xercesc::XMLException &e) { diff --git a/ACE/ace/XML_Utils/XML_Schema_Resolver.cpp b/ACE/ace/XML_Utils/XML_Schema_Resolver.cpp index d2fe6f9e40c..28e916a047d 100644 --- a/ACE/ace/XML_Utils/XML_Schema_Resolver.cpp +++ b/ACE/ace/XML_Utils/XML_Schema_Resolver.cpp @@ -26,10 +26,6 @@ namespace XML return path.release (); } - Environment_Resolver::Environment_Resolver (void) - { - } - Environment_Resolver::Environment_Resolver (const ACE_TCHAR *variable, const ACE_TCHAR *relpath) { diff --git a/ACE/ace/XML_Utils/XML_Schema_Resolver.h b/ACE/ace/XML_Utils/XML_Schema_Resolver.h index 9ad59f422a3..9b72a09a002 100644 --- a/ACE/ace/XML_Utils/XML_Schema_Resolver.h +++ b/ACE/ace/XML_Utils/XML_Schema_Resolver.h @@ -39,7 +39,7 @@ namespace XML : public virtual EntityResolver { public: - XML_Schema_Resolver (void); + XML_Schema_Resolver (); XML_Schema_Resolver (Resolver &resolver); @@ -86,7 +86,7 @@ namespace XML */ struct XML_Utils_Export Environment_Resolver { - Environment_Resolver (void); + Environment_Resolver () = default; Environment_Resolver (const ACE_TCHAR *variable, const ACE_TCHAR *path); diff --git a/ACE/ace/XML_Utils/XML_Typedefs.h b/ACE/ace/XML_Utils/XML_Typedefs.h index 7892f5bc44c..f235bfa62ae 100644 --- a/ACE/ace/XML_Utils/XML_Typedefs.h +++ b/ACE/ace/XML_Utils/XML_Typedefs.h @@ -18,11 +18,9 @@ namespace XML { public: typedef ::XML::Environment_Resolver PATH_RESOLVER; - typedef ::XML::XML_Schema_Resolver< ::XML::Environment_Resolver > XML_RESOLVER; + typedef ::XML::XML_Schema_Resolver< ::XML::Environment_Resolver> XML_RESOLVER; typedef ::XML::XML_Error_Handler ERROR_HANDLER; - typedef ::XML::XML_Helper< XML_RESOLVER, ERROR_HANDLER > HELPER; - - static ERROR_HANDLER _xml_error_handler; + typedef ::XML::XML_Helper<XML_RESOLVER, ERROR_HANDLER> HELPER; public: static HELPER XML_HELPER; diff --git a/ACE/ace/XML_Utils/XSCRT/XML.hpp b/ACE/ace/XML_Utils/XSCRT/XML.hpp index ce4b51284b3..6f2079e2852 100644 --- a/ACE/ace/XML_Utils/XSCRT/XML.hpp +++ b/ACE/ace/XML_Utils/XSCRT/XML.hpp @@ -460,15 +460,11 @@ namespace XSCRT { string xns (ns); -#if defined(XERCES_VERSION_MAJOR) && XERCES_VERSION_MAJOR > 2 XMLCh const* p (e.dom_element ()->lookupPrefix (xns.c_str ())); -#else - XMLCh const* p (e.dom_element ()->lookupNamespacePrefix (xns.c_str (), false)); -#endif if (p == 0) { - bool r (e.dom_element ()->isDefaultNamespace (xns.c_str ())); + bool const r (e.dom_element ()->isDefaultNamespace (xns.c_str ())); if (r) { |