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/variant.cpp | |
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 '')
-rw-r--r-- | src/variant.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/variant.cpp b/src/variant.cpp index a239e0f..a23a422 100644 --- a/src/variant.cpp +++ b/src/variant.cpp | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | namespace Bu | 10 | namespace Bu |
11 | { | 11 | { |
12 | Formatter &operator<<( Formatter &f, const FString &s ); | 12 | Formatter &operator<<( Formatter &f, const String &s ); |
13 | }; | 13 | }; |
14 | 14 | ||
15 | Bu::VariantTypeRoot::VariantTypeRoot() | 15 | Bu::VariantTypeRoot::VariantTypeRoot() |
@@ -37,7 +37,7 @@ Bu::Variant::Variant( const Variant &v ) : | |||
37 | Bu::Variant::Variant( const char *t ) : | 37 | Bu::Variant::Variant( const char *t ) : |
38 | pCore( NULL ) | 38 | pCore( NULL ) |
39 | { | 39 | { |
40 | set( Bu::FString( t ) ); | 40 | set( Bu::String( t ) ); |
41 | } | 41 | } |
42 | 42 | ||
43 | Bu::Variant::~Variant() | 43 | Bu::Variant::~Variant() |
@@ -54,7 +54,7 @@ bool Bu::Variant::isSet() const | |||
54 | return pCore != NULL; | 54 | return pCore != NULL; |
55 | } | 55 | } |
56 | 56 | ||
57 | Bu::FString Bu::Variant::toString() const | 57 | Bu::String Bu::Variant::toString() const |
58 | { | 58 | { |
59 | if( !pCore ) | 59 | if( !pCore ) |
60 | return "***NO DATA***"; | 60 | return "***NO DATA***"; |
@@ -90,14 +90,14 @@ Bu::Formatter &Bu::operator<<( Bu::Formatter &f, const Bu::Variant &v ) | |||
90 | return f << v.toString(); | 90 | return f << v.toString(); |
91 | } | 91 | } |
92 | 92 | ||
93 | template<> Bu::FString Bu::VariantType<int>::toString() const | 93 | template<> Bu::String Bu::VariantType<int>::toString() const |
94 | { | 94 | { |
95 | Bu::FString s; | 95 | Bu::String s; |
96 | s.format("%d", data ); | 96 | s.format("%d", data ); |
97 | return s; | 97 | return s; |
98 | } | 98 | } |
99 | 99 | ||
100 | template<> Bu::FString Bu::VariantType<bool>::toString() const | 100 | template<> Bu::String Bu::VariantType<bool>::toString() const |
101 | { | 101 | { |
102 | return data?"true":"false"; | 102 | return data?"true":"false"; |
103 | } | 103 | } |