From f5aca1a1b402bd7ebc944dc6e6fe65828d863365 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 20 Jan 2011 02:14:08 +0000 Subject: Bu::FString is now String, and there's a shell script to fix any other programs that were using fstring, I hope. --- src/tafreader.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/tafreader.cpp') diff --git a/src/tafreader.cpp b/src/tafreader.cpp index ca06daf..f409170 100644 --- a/src/tafreader.cpp +++ b/src/tafreader.cpp @@ -6,7 +6,7 @@ */ #include "bu/taf.h" -#include "bu/fstring.h" +#include "bu/string.h" #include "bu/stream.h" #include @@ -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(); -- cgit v1.2.3