diff options
Diffstat (limited to 'src/csvreader.h')
-rw-r--r-- | src/csvreader.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/csvreader.h b/src/csvreader.h index 9ad65fd..2e9e7b0 100644 --- a/src/csvreader.h +++ b/src/csvreader.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -8,19 +8,19 @@ | |||
8 | #ifndef BU_CSV_READER_H | 8 | #ifndef BU_CSV_READER_H |
9 | #define BU_CSV_READER_H | 9 | #define BU_CSV_READER_H |
10 | 10 | ||
11 | #include "bu/fstring.h" | 11 | #include "bu/string.h" |
12 | #include "bu/array.h" | 12 | #include "bu/array.h" |
13 | #include "bu/signals.h" | 13 | #include "bu/signals.h" |
14 | 14 | ||
15 | namespace Bu | 15 | namespace Bu |
16 | { | 16 | { |
17 | class Stream; | 17 | class Stream; |
18 | typedef Bu::Array<Bu::FString> StrArray; | 18 | typedef Bu::Array<Bu::String> StrArray; |
19 | 19 | ||
20 | class CsvReader | 20 | class CsvReader |
21 | { | 21 | { |
22 | public: | 22 | public: |
23 | typedef Bu::Signal1<Bu::FString, Bu::FString::iterator &> DecodeSignal; | 23 | typedef Bu::Signal1<Bu::String, Bu::String::iterator &> DecodeSignal; |
24 | enum Style | 24 | enum Style |
25 | { | 25 | { |
26 | styleExcel, ///< Excel style quotes around things that need em | 26 | styleExcel, ///< Excel style quotes around things that need em |
@@ -37,8 +37,8 @@ namespace Bu | |||
37 | Stream &sIn; | 37 | Stream &sIn; |
38 | DecodeSignal sDecode; | 38 | DecodeSignal sDecode; |
39 | 39 | ||
40 | static Bu::FString decodeExcel( Bu::FString::iterator &i ); | 40 | static Bu::String decodeExcel( Bu::String::iterator &i ); |
41 | static Bu::FString decodeC( Bu::FString::iterator &i ); | 41 | static Bu::String decodeC( Bu::String::iterator &i ); |
42 | }; | 42 | }; |
43 | }; | 43 | }; |
44 | 44 | ||