diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 02:14:08 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 02:14:08 +0000 |
commit | f5aca1a1b402bd7ebc944dc6e6fe65828d863365 (patch) | |
tree | 4a0fdd8e166d5c4b03543279d332b9a858ef62df /src/formatter.h | |
parent | 10c557562e1d67c55314c212371ea9cb7f802863 (diff) | |
download | libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.gz libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.bz2 libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.xz libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.zip |
Bu::FString is now String, and there's a shell script to fix any other programs
that were using fstring, I hope.
Diffstat (limited to 'src/formatter.h')
-rw-r--r-- | src/formatter.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/formatter.h b/src/formatter.h index 7e0c54b..fb51c81 100644 --- a/src/formatter.h +++ b/src/formatter.h | |||
@@ -103,13 +103,13 @@ namespace Bu | |||
103 | unsigned short bTokenize : 1; | 103 | unsigned short bTokenize : 1; |
104 | } Fmt; | 104 | } Fmt; |
105 | 105 | ||
106 | void write( const Bu::FString &sStr ); | 106 | void write( const Bu::String &sStr ); |
107 | void write( const void *sStr, int iLen ); | 107 | void write( const void *sStr, int iLen ); |
108 | void writeAligned( const Bu::FString &sStr ); | 108 | void writeAligned( const Bu::String &sStr ); |
109 | void writeAligned( const char *sStr, int iLen ); | 109 | void writeAligned( const char *sStr, int iLen ); |
110 | 110 | ||
111 | void read( void *sStr, int iLen ); | 111 | void read( void *sStr, int iLen ); |
112 | Bu::FString readToken(); | 112 | Bu::String readToken(); |
113 | 113 | ||
114 | void incIndent(); | 114 | void incIndent(); |
115 | void decIndent(); | 115 | void decIndent(); |
@@ -199,7 +199,7 @@ namespace Bu | |||
199 | template<typename type> | 199 | template<typename type> |
200 | void ffmt( type f ) | 200 | void ffmt( type f ) |
201 | { | 201 | { |
202 | Bu::FString fTmp; | 202 | Bu::String fTmp; |
203 | fTmp.format("%f", f ); | 203 | fTmp.format("%f", f ); |
204 | // writeAligned("**make floats work**"); | 204 | // writeAligned("**make floats work**"); |
205 | writeAligned( fTmp ); | 205 | writeAligned( fTmp ); |
@@ -207,7 +207,7 @@ namespace Bu | |||
207 | } | 207 | } |
208 | 208 | ||
209 | template<typename type> | 209 | template<typename type> |
210 | void iparse( type &i, const Bu::FString &sBuf ) | 210 | void iparse( type &i, const Bu::String &sBuf ) |
211 | { | 211 | { |
212 | if( !sBuf.isSet() ) | 212 | if( !sBuf.isSet() ) |
213 | return; | 213 | return; |
@@ -233,7 +233,7 @@ namespace Bu | |||
233 | } | 233 | } |
234 | 234 | ||
235 | template<typename type> | 235 | template<typename type> |
236 | void uparse( type &i, const Bu::FString &sBuf ) | 236 | void uparse( type &i, const Bu::String &sBuf ) |
237 | { | 237 | { |
238 | if( !sBuf.isSet() ) | 238 | if( !sBuf.isSet() ) |
239 | return; | 239 | return; |
@@ -257,7 +257,7 @@ namespace Bu | |||
257 | } | 257 | } |
258 | 258 | ||
259 | template<typename type> | 259 | template<typename type> |
260 | void fparse( type &f, const Bu::FString &sBuf ) | 260 | void fparse( type &f, const Bu::String &sBuf ) |
261 | { | 261 | { |
262 | sscanf( sBuf.getStr(), "%f", &f ); | 262 | sscanf( sBuf.getStr(), "%f", &f ); |
263 | usedFormat(); | 263 | usedFormat(); |
@@ -288,7 +288,7 @@ namespace Bu | |||
288 | Formatter &operator<<( Formatter &f, Formatter::Special s ); | 288 | Formatter &operator<<( Formatter &f, Formatter::Special s ); |
289 | Formatter &operator<<( Formatter &f, const char *sStr ); | 289 | Formatter &operator<<( Formatter &f, const char *sStr ); |
290 | Formatter &operator<<( Formatter &f, char *sStr ); | 290 | Formatter &operator<<( Formatter &f, char *sStr ); |
291 | Formatter &operator<<( Formatter &f, const Bu::FString &sStr ); | 291 | Formatter &operator<<( Formatter &f, const Bu::String &sStr ); |
292 | Formatter &operator<<( Formatter &f, signed char c ); | 292 | Formatter &operator<<( Formatter &f, signed char c ); |
293 | Formatter &operator<<( Formatter &f, char c ); | 293 | Formatter &operator<<( Formatter &f, char c ); |
294 | Formatter &operator<<( Formatter &f, unsigned char c ); | 294 | Formatter &operator<<( Formatter &f, unsigned char c ); |
@@ -305,7 +305,7 @@ namespace Bu | |||
305 | Formatter &operator<<( Formatter &f, long double flt ); | 305 | Formatter &operator<<( Formatter &f, long double flt ); |
306 | Formatter &operator<<( Formatter &f, bool b ); | 306 | Formatter &operator<<( Formatter &f, bool b ); |
307 | 307 | ||
308 | Formatter &operator>>( Formatter &f, Bu::FString &sStr ); | 308 | Formatter &operator>>( Formatter &f, Bu::String &sStr ); |
309 | Formatter &operator>>( Formatter &f, signed char &c ); | 309 | Formatter &operator>>( Formatter &f, signed char &c ); |
310 | Formatter &operator>>( Formatter &f, char &c ); | 310 | Formatter &operator>>( Formatter &f, char &c ); |
311 | Formatter &operator>>( Formatter &f, unsigned char &c ); | 311 | Formatter &operator>>( Formatter &f, unsigned char &c ); |