Additions to blob/utfstring for json.

1 files changed, 19 insertions, 10 deletions

diff --git a/src/unstable/utfstring.h b/src/unstable/utfstring.h
index 5a72948..3c64a75 100644
--- a/src/unstable/utfstring.h
+++ b/src/unstable/utfstring.h
@@ -72,6 +72,7 @@ namespace Bu
 
         UtfString();
         UtfString( const Bu::String &sInput, Encoding eEnc=Utf8 );
+        UtfString( const Bu::Blob &sInput, Encoding eEnc=Utf8 );
         UtfString( const char *sInput, Encoding eEnc=Utf8 );
         virtual ~UtfString();
 
@@ -182,6 +183,14 @@ namespace Bu
          * string literals in code.
          */
         void set( const Bu::String &sInput, Encoding eEnc=Utf8 );
+        
+        /**
+         * Set the value of the entire string based on the given input and
+         * encoding.  The default encoding is Utf8, which is compatible with
+         * 7-bit ascii, so it's a great choice for setting UtfStrings from
+         * string literals in code.
+         */
+        void set( const Bu::Blob &bInput, Encoding eEnc=Utf8 );
 
         /**
          * This encodes the UtfString in the given encoding and outputs it to
@@ -204,10 +213,10 @@ namespace Bu
 
         /**
          * This encodes the UtfString in the given encoding and returns it as
-         * a binary Bu::String.  Like write, this also includes the proper BOM
+         * a binary Bu::Blob.  Like write, this also includes the proper BOM
          * at the begining.
          */
-        Bu::String get( Encoding eEnc=Utf8 ) const;
+        Bu::Blob get( Encoding eEnc=Utf8 ) const;
 
         void debug() const;
 
@@ -228,7 +237,7 @@ namespace Bu
         UtfChar nextChar( int &iIndex ) const;
 
         bool operator==( const Bu::UtfString &rhs ) const;
-        bool operator==( const Bu::String &rhs ) const;
+        bool operator==( const Bu::Blob &rhs ) const;
         bool operator==( const char *rhs ) const;
         UtfString &operator+=( const Bu::UtfString &rhs );
         UtfString &operator+=( const UtfChar &rhs );
@@ -241,13 +250,13 @@ namespace Bu
     private:
         void append16( uint16_t i ) { aData.append( i ); }
 
-        void setUtf8( const Bu::String &sInput );
-        void setUtf16( const Bu::String &sInput );
-        void setUtf16be( const Bu::String &sInput );
-        void setUtf16le( const Bu::String &sInput );
-        void setUtf32( const Bu::String &sInput );
-        void setUtf32be( const Bu::String &sInput );
-        void setUtf32le( const Bu::String &sInput );
+        void setUtf8( const Bu::Blob &sInput );
+        void setUtf16( const Bu::Blob &sInput );
+        void setUtf16be( const Bu::Blob &sInput );
+        void setUtf16le( const Bu::Blob &sInput );
+        void setUtf32( const Bu::Blob &sInput );
+        void setUtf32be( const Bu::Blob &sInput );
+        void setUtf32le( const Bu::Blob &sInput );
         
         void writeUtf8( Bu::Stream &sOut ) const;
         void writeUtf16be( Bu::Stream &sOut ) const;