1 files changed, 29 insertions, 29 deletions

diff --git a/src/dictionary.cpp b/src/dictionary.cpp
index 4430e73..aaba7b8 100644
--- a/src/dictionary.cpp
+++ b/src/dictionary.cpp
@@ -11,7 +11,7 @@
 template<>
 uint32_t Bu::__calcHashCode<Gats::String>( const Gats::String &s )
 {
-        return __calcHashCode( dynamic_cast<const Bu::FString &>(s) );
+        return __calcHashCode( dynamic_cast<const Bu::String &>(s) );
 }
 
 Gats::Dictionary::Dictionary()
@@ -56,119 +56,119 @@ void Gats::Dictionary::read( Bu::Stream &rIn, char cType )
         }
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, char i )
+void Gats::Dictionary::insert( const Bu::String &sKey, char i )
 {
         ((Bu::Hash<Gats::String, Gats::Object *> *)this)->insert(
                 sKey, new Gats::Integer( i )
                 );
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, unsigned char i )
+void Gats::Dictionary::insert( const Bu::String &sKey, unsigned char i )
 {
         ((Bu::Hash<Gats::String, Gats::Object *> *)this)->insert(
                 sKey, new Gats::Integer( i )
                 );
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, signed char i )
+void Gats::Dictionary::insert( const Bu::String &sKey, signed char i )
 {
         ((Bu::Hash<Gats::String, Gats::Object *> *)this)->insert(
                 sKey, new Gats::Integer( i )
                 );
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, unsigned short i )
+void Gats::Dictionary::insert( const Bu::String &sKey, unsigned short i )
 {
         ((Bu::Hash<Gats::String, Gats::Object *> *)this)->insert(
                 sKey, new Gats::Integer( i )
                 );
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, signed short i )
+void Gats::Dictionary::insert( const Bu::String &sKey, signed short i )
 {
         ((Bu::Hash<Gats::String, Gats::Object *> *)this)->insert(
                 sKey, new Gats::Integer( i )
                 );
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, unsigned int i )
+void Gats::Dictionary::insert( const Bu::String &sKey, unsigned int i )
 {
         ((Bu::Hash<Gats::String, Gats::Object *> *)this)->insert(
                 sKey, new Gats::Integer( i )
                 );
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, signed int i )
+void Gats::Dictionary::insert( const Bu::String &sKey, signed int i )
 {
         ((Bu::Hash<Gats::String, Gats::Object *> *)this)->insert(
                 sKey, new Gats::Integer( i )
                 );
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, unsigned long i )
+void Gats::Dictionary::insert( const Bu::String &sKey, unsigned long i )
 {
         ((Bu::Hash<Gats::String, Gats::Object *> *)this)->insert(
                 sKey, new Gats::Integer( i )
                 );
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, signed long i )
+void Gats::Dictionary::insert( const Bu::String &sKey, signed long i )
 {
         ((Bu::Hash<Gats::String, Gats::Object *> *)this)->insert(
                 sKey, new Gats::Integer( i )
                 );
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, unsigned long long i )
+void Gats::Dictionary::insert( const Bu::String &sKey, unsigned long long i )
 {
         ((Bu::Hash<Gats::String, Gats::Object *> *)this)->insert(
                 sKey, new Gats::Integer( i )
                 );
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, signed long long i )
+void Gats::Dictionary::insert( const Bu::String &sKey, signed long long i )
 {
         ((Bu::Hash<Gats::String, Gats::Object *> *)this)->insert(
                 sKey, new Gats::Integer( i )
                 );
 }
 /*
-void Gats::Dictionary::insert( const Bu::FString &sKey, bool b )
+void Gats::Dictionary::insert( const Bu::String &sKey, bool b )
 {
         Bu::Hash<Gats::String, Gats::Object *>::insert(
                 sKey, new Gats::Boolean( b )
                 );
 }*/
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, float d )
+void Gats::Dictionary::insert( const Bu::String &sKey, float d )
 {
         Bu::Hash<Gats::String, Gats::Object *>::insert(
                 sKey, new Gats::Float( d )
                 );
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, double d )
+void Gats::Dictionary::insert( const Bu::String &sKey, double d )
 {
         Bu::Hash<Gats::String, Gats::Object *>::insert(
                 sKey, new Gats::Float( d )
                 );
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, const char *s )
+void Gats::Dictionary::insert( const Bu::String &sKey, const char *s )
 {
         Bu::Hash<Gats::String, Gats::Object *>::insert(
                 sKey, new Gats::String( s )
                 );
 }
 
-void Gats::Dictionary::insert( const Bu::FString &sKey, const Bu::FString &s )
+void Gats::Dictionary::insert( const Bu::String &sKey, const Bu::String &s )
 {
         Bu::Hash<Gats::String, Gats::Object *>::insert(
                 sKey, new Gats::String( s )
                 );
 }
 
-bool Gats::Dictionary::getBool( const Bu::FString &sKey )
+bool Gats::Dictionary::getBool( const Bu::String &sKey )
 {
         Gats::Boolean *pOb = dynamic_cast<Gats::Boolean *>( get( sKey ) );
         if( !pOb )
@@ -178,7 +178,7 @@ bool Gats::Dictionary::getBool( const Bu::FString &sKey )
         return pOb->getValue();
 }
 
-int64_t Gats::Dictionary::getInt( const Bu::FString &sKey )
+int64_t Gats::Dictionary::getInt( const Bu::String &sKey )
 {
         Gats::Integer *pOb = dynamic_cast<Gats::Integer *>( get( sKey ) );
         if( !pOb )
@@ -188,7 +188,7 @@ int64_t Gats::Dictionary::getInt( const Bu::FString &sKey )
         return pOb->getValue();
 }
 
-double Gats::Dictionary::getFloat( const Bu::FString &sKey )
+double Gats::Dictionary::getFloat( const Bu::String &sKey )
 {
         Gats::Float *pOb = dynamic_cast<Gats::Float *>( get( sKey ) );
         if( !pOb )
@@ -198,7 +198,7 @@ double Gats::Dictionary::getFloat( const Bu::FString &sKey )
         return pOb->getValue();
 }
 
-Bu::FString Gats::Dictionary::getStr( const Bu::FString &sKey )
+Bu::String Gats::Dictionary::getStr( const Bu::String &sKey )
 {
         Gats::String *pOb = dynamic_cast<Gats::String *>( get( sKey ) );
         if( !pOb )
@@ -208,7 +208,7 @@ Bu::FString Gats::Dictionary::getStr( const Bu::FString &sKey )
         return *pOb;
 }
 
-Gats::List *Gats::Dictionary::getList( const Bu::FString &sKey )
+Gats::List *Gats::Dictionary::getList( const Bu::String &sKey )
 {
         Gats::List *pOb = dynamic_cast<Gats::List *>( get( sKey ) );
         if( !pOb )
@@ -218,7 +218,7 @@ Gats::List *Gats::Dictionary::getList( const Bu::FString &sKey )
         return pOb;
 }
 
-Gats::Dictionary *Gats::Dictionary::getDict( const Bu::FString &sKey )
+Gats::Dictionary *Gats::Dictionary::getDict( const Bu::String &sKey )
 {
         Gats::Dictionary *pOb = dynamic_cast<Gats::Dictionary *>( get( sKey ) );
         if( !pOb )
@@ -228,7 +228,7 @@ Gats::Dictionary *Gats::Dictionary::getDict( const Bu::FString &sKey )
         return pOb;
 }
 
-bool Gats::Dictionary::getBool( const Bu::FString &sKey ) const
+bool Gats::Dictionary::getBool( const Bu::String &sKey ) const
 {
         Gats::Boolean *pOb = dynamic_cast<Gats::Boolean *>( get( sKey ) );
         if( !pOb )
@@ -238,7 +238,7 @@ bool Gats::Dictionary::getBool( const Bu::FString &sKey ) const
         return pOb->getValue();
 }
 
-int64_t Gats::Dictionary::getInt( const Bu::FString &sKey ) const
+int64_t Gats::Dictionary::getInt( const Bu::String &sKey ) const
 {
         Gats::Integer *pOb = dynamic_cast<Gats::Integer *>( get( sKey ) );
         if( !pOb )
@@ -248,7 +248,7 @@ int64_t Gats::Dictionary::getInt( const Bu::FString &sKey ) const
         return pOb->getValue();
 }
 
-double Gats::Dictionary::getFloat( const Bu::FString &sKey ) const
+double Gats::Dictionary::getFloat( const Bu::String &sKey ) const
 {
         Gats::Float *pOb = dynamic_cast<Gats::Float *>( get( sKey ) );
         if( !pOb )
@@ -258,7 +258,7 @@ double Gats::Dictionary::getFloat( const Bu::FString &sKey ) const
         return pOb->getValue();
 }
 
-Bu::FString Gats::Dictionary::getStr( const Bu::FString &sKey ) const
+Bu::String Gats::Dictionary::getStr( const Bu::String &sKey ) const
 {
         Gats::String *pOb = dynamic_cast<Gats::String *>( get( sKey ) );
         if( !pOb )
@@ -268,7 +268,7 @@ Bu::FString Gats::Dictionary::getStr( const Bu::FString &sKey ) const
         return *pOb;
 }
 
-Gats::List *Gats::Dictionary::getList( const Bu::FString &sKey ) const
+Gats::List *Gats::Dictionary::getList( const Bu::String &sKey ) const
 {
         Gats::List *pOb = dynamic_cast<Gats::List *>( get( sKey ) );
         if( !pOb )
@@ -278,7 +278,7 @@ Gats::List *Gats::Dictionary::getList( const Bu::FString &sKey ) const
         return pOb;
 }
 
-Gats::Dictionary *Gats::Dictionary::getDict( const Bu::FString &sKey ) const
+Gats::Dictionary *Gats::Dictionary::getDict( const Bu::String &sKey ) const
 {
         Gats::Dictionary *pOb = dynamic_cast<Gats::Dictionary *>( get( sKey ) );
         if( !pOb )