[libxml++] Whitespace corrections.



commit 33f4ee23371d001ee410f2e1e04943df2d391447
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu May 7 17:57:05 2009 +0200

    Whitespace corrections.
---
 ChangeLog                      |    4 +++
 libxml++/parsers/textreader.cc |   48 ++++++++++++++++++---------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 10a175f..595a820 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-07  Murray Cumming  <murrayc murrayc com>
+
+	* libxml++/parsers/textreader.cc: Whitespace corrections.
+
 2009-03-25  Hubert Figuiere  <hub figuiere net>
 
 	* libxml++/parsers/saxparser.h: Fix some warnings triggered
diff --git a/libxml++/parsers/textreader.cc b/libxml++/parsers/textreader.cc
index a69bc63..a6dbe8a 100644
--- a/libxml++/parsers/textreader.cc
+++ b/libxml++/parsers/textreader.cc
@@ -8,19 +8,21 @@
 namespace xmlpp
 {
   
-  struct TextReader::PropertyReader
-  {
-    TextReader & owner_;
-    PropertyReader(TextReader & owner)
-    : owner_(owner)
-    {}
-
-    int Int(int value);
-    bool Bool(int value);
-    char Char(int value);
-    Glib::ustring String(xmlChar * value, bool free = false);
-    Glib::ustring String(xmlChar const * value);
-  };
+class TextReader::PropertyReader
+{
+public:
+  PropertyReader(TextReader& owner)
+  : owner_(owner)
+  {}
+
+  int Int(int value);
+  bool Bool(int value);
+  char Char(int value);
+  Glib::ustring String(xmlChar* value, bool free = false);
+  Glib::ustring String(xmlChar const* value);
+
+  TextReader & owner_;
+};
 
 TextReader::TextReader(
   struct _xmlTextReader* cobj)
@@ -381,8 +383,7 @@ void TextReader::check_for_exceptions() const
     throw validity_error(error_);
 }
 
-int TextReader::PropertyReader::Int(
-    int value)
+int TextReader::PropertyReader::Int(int value)
 {
   if(value == -1)
     owner_.check_for_exceptions();
@@ -390,8 +391,7 @@ int TextReader::PropertyReader::Int(
   return value;
 }
 
-bool TextReader::PropertyReader::Bool(
-    int value)
+bool TextReader::PropertyReader::Bool(int value)
 {
   if(value == -1)
     owner_.check_for_exceptions();
@@ -399,23 +399,20 @@ bool TextReader::PropertyReader::Bool(
   return value;
 }
 
-char TextReader::PropertyReader::Char(
-    int value)
+char TextReader::PropertyReader::Char(int value)
 {
   owner_.check_for_exceptions();
   return value;
 }
 
-Glib::ustring TextReader::PropertyReader::String(
-    xmlChar * value,
-    bool free)
+Glib::ustring TextReader::PropertyReader::String(xmlChar* value, bool free)
 {
   owner_.check_for_exceptions();
   
   if(value == (xmlChar *)0)
     return Glib::ustring();
     
-  Glib::ustring result = (char *)value;
+  const Glib::ustring result = (char *)value;
 
   if(free)
     xmlFree(value);
@@ -423,15 +420,14 @@ Glib::ustring TextReader::PropertyReader::String(
   return result;
 }
 
-Glib::ustring TextReader::PropertyReader::String(
-    xmlChar const * value)
+Glib::ustring TextReader::PropertyReader::String(xmlChar const* value)
 {
   owner_.check_for_exceptions();
 
   if(value == (xmlChar *)0)
     return Glib::ustring();
 
-  return (const char *)value;
+  return (const char*)value;
 }
 
 } // namespace xmlpp



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]