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

diff --git a/src/csvreader.cpp b/src/csvreader.cpp
index f3133c2..4da7883 100644
--- a/src/csvreader.cpp
+++ b/src/csvreader.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.
@@ -41,12 +41,12 @@ Bu::StrArray Bu::CsvReader::readLine()
 {
         Bu::StrArray aVals;
 
-        Bu::FString sLine = sIn.readLine();
+        Bu::String sLine = sIn.readLine();
 
         if( !sLine.isSet() )
                 return Bu::StrArray();
 
-        Bu::FString::iterator i = sLine.begin();
+        Bu::String::iterator i = sLine.begin();
 
         aVals.append( sDecode( i ) );
 
@@ -73,9 +73,9 @@ Bu::StrArray Bu::CsvReader::readLine()
         return aVals;
 }
 
-Bu::FString Bu::CsvReader::decodeExcel( Bu::FString::iterator &i )
+Bu::String Bu::CsvReader::decodeExcel( Bu::String::iterator &i )
 {
-        Bu::FString sRet;
+        Bu::String sRet;
 
         for(; i && (*i == ' ' || *i == '\t'); i++ ) { }
         
@@ -123,7 +123,7 @@ Bu::FString Bu::CsvReader::decodeExcel( Bu::FString::iterator &i )
         return sRet;
 }
 
-Bu::FString Bu::CsvReader::decodeC( Bu::FString::iterator & )
+Bu::String Bu::CsvReader::decodeC( Bu::String::iterator & )
 {
         return "";
 }