Imported Upstream version 2.39.1

[platform/upstream/libxml++.git] / libxml++ / parsers / textreader.cc

diff --git a/libxml++/parsers/textreader.cc b/libxml++/parsers/textreader.cc
index c041cd4..5eb0414 100644 (file)
--- a/libxml++/parsers/textreader.cc
+++ b/libxml++/parsers/textreader.cc
@@ -293,7 +293,7 @@ void TextReader::set_parser_property(
 
 Node* TextReader::get_current_node()
 {
-  xmlNodePtr node = xmlTextReaderCurrentNode(impl_);
+  auto node = xmlTextReaderCurrentNode(impl_);
   if(node)
   {
     Node::create_wrapper(node);
@@ -313,7 +313,7 @@ const Node* TextReader::get_current_node() const
 TODO: add a private constructor to Document.
 Document* TextReader::CurrentDocument()
 {
-  xmlDocPtr doc = xmlTextReaderCurrentDoc(impl_);
+  auto doc = xmlTextReaderCurrentDoc(impl_);
   if(doc)
     return new Document(doc);
 }
@@ -321,7 +321,7 @@ Document* TextReader::CurrentDocument()
 
 Node* TextReader::expand()
 {
-  xmlNodePtr node = xmlTextReaderExpand(impl_);
+  auto node = xmlTextReaderExpand(impl_);
   if(node)
   {
     Node::create_wrapper(node);
@@ -346,8 +346,8 @@ bool TextReader::is_valid() const
 
 void TextReader::setup_exceptions()
 {
-  xmlTextReaderErrorFunc func = 0;
-  void* arg = 0; 
+  xmlTextReaderErrorFunc func = nullptr;
+  void* arg = nullptr; 
 
   // We respect any other error handlers already setup:
   xmlTextReaderGetErrorHandler(impl_, &func, &arg);
@@ -360,7 +360,7 @@ void TextReader::setup_exceptions()
 
 void TextReader::on_libxml_error(void* arg, const char* msg, int severity, void* /* locator */)
 {
-  TextReader* ths = (TextReader*)arg;
+  auto ths = (TextReader*)arg;
   ths->severity_ = severity;
   ths->error_ = msg ? msg : "unknown parse error";
 }
@@ -370,7 +370,7 @@ void TextReader::check_for_exceptions() const
   if( severity_ == 0 )
     return;
     
-  TextReader* ths = const_cast<TextReader*>(this);
+  auto ths = const_cast<TextReader*>(this);
 
   int severity = severity_;
   ths->severity_ = 0;