The reorg is being put in trunk, I think it's ready. Now we just get to find

out how many applications won't work anymore :)

1 files changed, 28 insertions, 34 deletions

diff --git a/src/xmlwriter.cpp b/src/old/xmlwriter.cpp
index 56880b6..7dc6ca9 100644
--- a/src/xmlwriter.cpp
+++ b/src/old/xmlwriter.cpp
@@ -2,17 +2,10 @@
 #include <stdlib.h>
 #include "xmlwriter.h"
 
-XmlWriter::XmlWriter( const char *sIndent, XmlNode *pRoot ) :
-        XmlDocument( pRoot )
+XmlWriter::XmlWriter( const Bu::FString &sIndent, XmlNode *pRoot ) :
+        XmlDocument( pRoot ),
+        sIndent( sIndent )
 {
-        if( sIndent == NULL )
-        {
-                this->sIndent = "";
-        }
-        else
-        {
-                this->sIndent = sIndent;
-        }
 }
 
 XmlWriter::~XmlWriter()
@@ -24,7 +17,7 @@ void XmlWriter::write()
         write( getRoot(), sIndent.c_str() );
 }
 
-void XmlWriter::write( XmlNode *pRoot, const char *sIndent )
+void XmlWriter::write( XmlNode *pRoot, const Bu::FString &sIndent )
 {
         writeNode( pRoot, 0, sIndent );
 }
@@ -39,7 +32,7 @@ void XmlWriter::closeNode()
         }
 }
 
-void XmlWriter::writeIndent( int nIndent, const char *sIndent )
+void XmlWriter::writeIndent( int nIndent, const Bu::FString &sIndent )
 {
         if( sIndent == NULL ) return;
         for( int j = 0; j < nIndent; j++ )
@@ -48,26 +41,27 @@ void XmlWriter::writeIndent( int nIndent, const char *sIndent )
         }
 }
 
-std::string XmlWriter::escape( std::string sIn )
+Bu::FString XmlWriter::escape( const Bu::FString &sIn )
 {
-        std::string sOut;
+        Bu::FString sOut;
 
-        std::string::const_iterator i;
-        for( i = sIn.begin(); i != sIn.end(); i++ )
+        int nMax = sIn.getSize();
+        for( int j = 0; j < nMax; j++ )
         {
-                if( ((*i >= ' ' && *i <= '9') ||
-                        (*i >= 'a' && *i <= 'z') ||
-                        (*i >= 'A' && *i <= 'Z') ) &&
-                        (*i != '\"' && *i != '\'' && *i != '&')
+                char c = sIn[j];
+                if( ((c >= ' ' && c <= '9') ||
+                        (c >= 'a' && c <= 'z') ||
+                        (c >= 'A' && c <= 'Z') ) &&
+                        (c != '\"' && c != '\'' && c != '&')
                   )
                 {
-                        sOut += *i;
+                        sOut += c;
                 }
                 else
                 {
                         sOut += "&#";
                         char buf[4];
-                        sprintf( buf, "%u", (unsigned char)*i );
+                        sprintf( buf, "%u", (unsigned char)c );
                         sOut += buf;
                         sOut += ';';
                 }
@@ -76,19 +70,19 @@ std::string XmlWriter::escape( std::string sIn )
         return sOut;
 }
 
-void XmlWriter::writeNodeProps( XmlNode *pNode, int nIndent, const char *sIndent )
+void XmlWriter::writeNodeProps( XmlNode *pNode, int nIndent, const Bu::FString &sIndent )
 {
         for( int j = 0; j < pNode->getNumProperties(); j++ )
         {
                 writeString(" ");
-                writeString( pNode->getPropertyName( j ) );
+                //writeString( pNode->getPropertyName( j ) );
                 writeString("=\"");
-                writeString( escape( pNode->getProperty( j ) ).c_str() );
+                //writeString( escape( pNode->getProperty( j ) ).c_str() );
                 writeString("\"");
         }
 }
 
-void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent )
+void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const Bu::FString &sIndent )
 {
         if( pNode->hasChildren() )
         {
@@ -96,15 +90,15 @@ void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent )
                 writeString("<");
                 writeString( pNode->getName() );
                 writeNodeProps( pNode, nIndent, sIndent );
-                if( sIndent )
+                if( sIndent != "" )
                         writeString(">\n");
                 else
                         writeString(">");
-
+/*
                 if( pNode->getContent( 0 ) )
                 {
                         writeIndent( nIndent+1, sIndent );
-                        if( sIndent )
+                        if( sIndent != "" )
                         {
                                 writeString( pNode->getContent( 0 ) );
                                 writeString("\n");
@@ -129,9 +123,9 @@ void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent )
                                         writeString( pNode->getContent( j+1 ) );
                         }
                 }
-                
+*/              
                 writeIndent( nIndent, sIndent );
-                if( sIndent )
+                if( sIndent != "" )
                 {
                         writeString("</");
                         writeString( pNode->getName() );
@@ -143,7 +137,7 @@ void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent )
                         writeString( pNode->getName() );
                         writeString(">");
                 }
-        }
+        }/*
         else if( pNode->getContent() )
         {
                 writeIndent( nIndent, sIndent );
@@ -157,14 +151,14 @@ void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent )
                 writeString(">");
                 if( sIndent )
                         writeString("\n");
-        }
+        }*/
         else
         {
                 writeIndent( nIndent, sIndent );
                 writeString("<");
                 writeString( pNode->getName() );
                 writeNodeProps( pNode, nIndent, sIndent );
-                if( sIndent )
+                if( sIndent != "" )
                         writeString("/>\n");
                 else
                         writeString("/>");