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, 8 insertions, 8 deletions

diff --git a/src/tafreader.cpp b/src/tafreader.cpp
index ca06daf..6708c8c 100644
--- a/src/tafreader.cpp
+++ b/src/tafreader.cpp
@@ -1,12 +1,12 @@
 /*
- * 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.
  */
 
 #include "bu/taf.h"
-#include "bu/fstring.h"
+#include "bu/string.h"
 #include "bu/stream.h"
 
 #include <stdlib.h>
@@ -34,7 +34,7 @@ Bu::TafGroup *Bu::TafReader::readGroup()
                 throw TafException("%d:%d: Expected '{' got '%c'.", iLine, iCol, c );
         next();
         ws();
-        FString sName = readStr();
+        String sName = readStr();
         TafGroup *pGroup = new TafGroup( sName );
         try
         {
@@ -88,7 +88,7 @@ void Bu::TafReader::groupContent( Bu::TafGroup *pGroup )
 
 Bu::TafProperty *Bu::TafReader::readProperty()
 {
-        FString sName = readStr();
+        String sName = readStr();
         ws();
         if( c != '=' )
         {
@@ -96,14 +96,14 @@ Bu::TafProperty *Bu::TafReader::readProperty()
                 return new Bu::TafProperty( "", sName );
         }
         next();
-        FString sValue = readStr();
+        String sValue = readStr();
         return new Bu::TafProperty( sName, sValue );
         //printf("  %s = %s\n", sName.getStr(), sValue.getStr() );
 }
 
 Bu::TafComment *Bu::TafReader::readComment( bool bEOL )
 {
-        FString sCmnt;
+        String sCmnt;
         next();
         if( bEOL )
         {
@@ -140,10 +140,10 @@ Bu::TafComment *Bu::TafReader::readComment( bool bEOL )
         return new TafComment( sCmnt, bEOL );
 }
 
-Bu::FString Bu::TafReader::readStr()
+Bu::String Bu::TafReader::readStr()
 {
         ws();
-        FString s;
+        String s;
         if( c == '"' )
         {
                 next();