1 files changed, 21 insertions, 21 deletions

diff --git a/src/fstring.cpp b/src/string.cpp
index a3e0cb1..538ac52 100644
--- a/src/fstring.cpp
+++ b/src/string.cpp
@@ -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.
@@ -8,12 +8,12 @@
 #define BU_TRACE
 #include "bu/trace.h"
 
-#include "bu/fstring.h"
+#include "bu/string.h"
 #include "bu/hash.h"
 
-template class Bu::FBasicString<char>;
+template class Bu::BasicString<char>;
 
-template<> uint32_t Bu::__calcHashCode<Bu::FString>( const Bu::FString &k )
+template<> uint32_t Bu::__calcHashCode<Bu::String>( const Bu::String &k )
 {
         long j, sz = k.getSize();
         const char *s = k.getStr();
@@ -27,18 +27,18 @@ template<> uint32_t Bu::__calcHashCode<Bu::FString>( const Bu::FString &k )
         return nPos;
 }
 
-template<> bool Bu::__cmpHashKeys<Bu::FString>(
-                const Bu::FString &a, const Bu::FString &b )
+template<> bool Bu::__cmpHashKeys<Bu::String>(
+                const Bu::String &a, const Bu::String &b )
 {
         return a == b;
 }
 
-template<> void Bu::__tracer_format<Bu::FString>( const Bu::FString &v )
+template<> void Bu::__tracer_format<Bu::String>( const Bu::String &v )
 {
         printf("(%ld)\"%s\"", v.getSize(), v.getStr() );
 }
 
-bool &Bu::operator<<( bool &dst, const Bu::FString &sIn )
+bool &Bu::operator<<( bool &dst, const Bu::String &sIn )
 {
         if( sIn == "true" || sIn == "yes" || sIn == "t" )
                 dst = true;
@@ -48,79 +48,79 @@ bool &Bu::operator<<( bool &dst, const Bu::FString &sIn )
         return dst;
 }
 
-uint8_t &Bu::operator<<( uint8_t &dst, const Bu::FString &sIn )
+uint8_t &Bu::operator<<( uint8_t &dst, const Bu::String &sIn )
 {
         sscanf( sIn.getStr(), "%hhu", &dst );
         return dst;
 }
 
-int8_t &Bu::operator<<( int8_t &dst, const Bu::FString &sIn )
+int8_t &Bu::operator<<( int8_t &dst, const Bu::String &sIn )
 {
         sscanf( sIn.getStr(), "%hhd", &dst );
         return dst;
 }
 
-char &Bu::operator<<( char &dst, const Bu::FString &sIn )
+char &Bu::operator<<( char &dst, const Bu::String &sIn )
 {
         sscanf( sIn.getStr(), "%hhd", &dst );
         return dst;
 }
 
-uint16_t &Bu::operator<<( uint16_t &dst, const Bu::FString &sIn )
+uint16_t &Bu::operator<<( uint16_t &dst, const Bu::String &sIn )
 {
         sscanf( sIn.getStr(), "%hu", &dst );
         return dst;
 }
 
-int16_t &Bu::operator<<( int16_t &dst, const Bu::FString &sIn )
+int16_t &Bu::operator<<( int16_t &dst, const Bu::String &sIn )
 {
         sscanf( sIn.getStr(), "%hd", &dst );
         return dst;
 }
 
-uint32_t &Bu::operator<<( uint32_t &dst, const Bu::FString &sIn )
+uint32_t &Bu::operator<<( uint32_t &dst, const Bu::String &sIn )
 {
         sscanf( sIn.getStr(), "%u", &dst );
         return dst;
 }
 
-int32_t &Bu::operator<<( int32_t &dst, const Bu::FString &sIn )
+int32_t &Bu::operator<<( int32_t &dst, const Bu::String &sIn )
 {
         sscanf( sIn.getStr(), "%d", &dst );
         return dst;
 }
 
-uint64_t &Bu::operator<<( uint64_t &dst, const Bu::FString &sIn )
+uint64_t &Bu::operator<<( uint64_t &dst, const Bu::String &sIn )
 {
         sscanf( sIn.getStr(), "%llu", &dst );
         return dst;
 }
 
-int64_t &Bu::operator<<( int64_t &dst, const Bu::FString &sIn )
+int64_t &Bu::operator<<( int64_t &dst, const Bu::String &sIn )
 {
         sscanf( sIn.getStr(), "%lld", &dst );
         return dst;
 }
 
-float &Bu::operator<<( float &dst, const Bu::FString &sIn )
+float &Bu::operator<<( float &dst, const Bu::String &sIn )
 {
         sscanf( sIn.getStr(), "%f", &dst );
         return dst;
 }
 
-double &Bu::operator<<( double &dst, const Bu::FString &sIn )
+double &Bu::operator<<( double &dst, const Bu::String &sIn )
 {
         sscanf( sIn.getStr(), "%lf", &dst );
         return dst;
 }
 
-long double &Bu::operator<<( long double &dst, const Bu::FString &sIn )
+long double &Bu::operator<<( long double &dst, const Bu::String &sIn )
 {
         sscanf( sIn.getStr(), "%Lf", &dst );
         return dst;
 }
 
-Bu::FString &Bu::operator<<( Bu::FString &dst, const Bu::FString &sIn )
+Bu::String &Bu::operator<<( Bu::String &dst, const Bu::String &sIn )
 {
         dst = sIn;
         return dst;