Wow! Merged the branch, streams are updated, and there's no more FString, run

the fixstrings.sh script in the support directory to (hopefully) automatically
update your projects.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/formatter.h b/src/formatter.h
index 7e0c54b..49507de 100644
--- a/src/formatter.h
+++ b/src/formatter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2010 Xagasoft, All rights reserved.
+ * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
  *
  * This file is part of the libbu++ library and is released under the
  * terms of the license contained in the file LICENSE.
@@ -103,13 +103,13 @@ namespace Bu
                         unsigned short bTokenize : 1;
                 } Fmt;
 
-                void write( const Bu::FString &sStr );
+                void write( const Bu::String &sStr );
                 void write( const void *sStr, int iLen );
-                void writeAligned( const Bu::FString &sStr );
+                void writeAligned( const Bu::String &sStr );
                 void writeAligned( const char *sStr, int iLen );
 
                 void read( void *sStr, int iLen );
-                Bu::FString readToken();
+                Bu::String readToken();
 
                 void incIndent();
                 void decIndent();
@@ -199,7 +199,7 @@ namespace Bu
                 template<typename type>
                 void ffmt( type f )
                 {
-                        Bu::FString fTmp;
+                        Bu::String fTmp;
                         fTmp.format("%f", f );
 //                      writeAligned("**make floats work**");
                         writeAligned( fTmp );
@@ -207,7 +207,7 @@ namespace Bu
                 }
                 
                 template<typename type>
-                void iparse( type &i, const Bu::FString &sBuf )
+                void iparse( type &i, const Bu::String &sBuf )
                 {
                         if( !sBuf.isSet() )
                                 return;
@@ -233,7 +233,7 @@ namespace Bu
                 }
                 
                 template<typename type>
-                void uparse( type &i, const Bu::FString &sBuf )
+                void uparse( type &i, const Bu::String &sBuf )
                 {
                         if( !sBuf.isSet() )
                                 return;
@@ -257,7 +257,7 @@ namespace Bu
                 }
                 
                 template<typename type>
-                void fparse( type &f, const Bu::FString &sBuf )
+                void fparse( type &f, const Bu::String &sBuf )
                 {
                         sscanf( sBuf.getStr(), "%f", &f );
                         usedFormat();
@@ -288,7 +288,7 @@ namespace Bu
         Formatter &operator<<( Formatter &f, Formatter::Special s );
         Formatter &operator<<( Formatter &f, const char *sStr );
         Formatter &operator<<( Formatter &f, char *sStr );
-        Formatter &operator<<( Formatter &f, const Bu::FString &sStr );
+        Formatter &operator<<( Formatter &f, const Bu::String &sStr );
         Formatter &operator<<( Formatter &f, signed char c );
         Formatter &operator<<( Formatter &f, char c );
         Formatter &operator<<( Formatter &f, unsigned char c );
@@ -305,7 +305,7 @@ namespace Bu
         Formatter &operator<<( Formatter &f, long double flt );
         Formatter &operator<<( Formatter &f, bool b );
 
-        Formatter &operator>>( Formatter &f, Bu::FString &sStr );
+        Formatter &operator>>( Formatter &f, Bu::String &sStr );
         Formatter &operator>>( Formatter &f, signed char &c );
         Formatter &operator>>( Formatter &f, char &c );
         Formatter &operator>>( Formatter &f, unsigned char &c );