diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
commit | 393f1b414746a7f1977971dd7659dd2b47092b11 (patch) | |
tree | 81d0ca1ee70ab86a7d79c1991abe5c387b655fb2 /src/csvwriter.h | |
parent | c259f95bd0e58b247940a339bb9b4b401b4e9438 (diff) | |
parent | 7e25a863325dc3e9762397e700030969e093b087 (diff) | |
download | libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.gz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.bz2 libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.xz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.zip |
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.
Diffstat (limited to 'src/csvwriter.h')
-rw-r--r-- | src/csvwriter.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/csvwriter.h b/src/csvwriter.h index 289d25c..4291ed5 100644 --- a/src/csvwriter.h +++ b/src/csvwriter.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_WRITER_H | 8 | #ifndef BU_CSV_WRITER_H |
9 | #define BU_CSV_WRITER_H | 9 | #define BU_CSV_WRITER_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 CsvWriter | 20 | class CsvWriter |
21 | { | 21 | { |
22 | public: | 22 | public: |
23 | typedef Bu::Signal1<Bu::FString, const Bu::FString &> EncodeSignal; | 23 | typedef Bu::Signal1<Bu::String, const Bu::String &> EncodeSignal; |
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 &sOut; | 37 | Stream &sOut; |
38 | EncodeSignal sEncode; | 38 | EncodeSignal sEncode; |
39 | 39 | ||
40 | static Bu::FString encodeExcel( const Bu::FString &sIn ); | 40 | static Bu::String encodeExcel( const Bu::String &sIn ); |
41 | static Bu::FString encodeC( const Bu::FString &sIn ); | 41 | static Bu::String encodeC( const Bu::String &sIn ); |
42 | }; | 42 | }; |
43 | }; | 43 | }; |
44 | 44 | ||