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.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 '')
| -rw-r--r-- | src/variant.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/variant.h b/src/variant.h index f659ad2..80f1bb9 100644 --- a/src/variant.h +++ b/src/variant.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #ifndef BU_VARIANT_H | 8 | #ifndef BU_VARIANT_H |
| 9 | #define BU_VARIANT_H | 9 | #define BU_VARIANT_H |
| 10 | 10 | ||
| 11 | #include <bu/fstring.h> | 11 | #include <bu/string.h> |
| 12 | #include <typeinfo> | 12 | #include <typeinfo> |
| 13 | #include <bu/membuf.h> | 13 | #include <bu/membuf.h> |
| 14 | #include <bu/formatter.h> | 14 | #include <bu/formatter.h> |
| @@ -26,7 +26,7 @@ namespace Bu | |||
| 26 | VariantTypeRoot(); | 26 | VariantTypeRoot(); |
| 27 | virtual ~VariantTypeRoot(); | 27 | virtual ~VariantTypeRoot(); |
| 28 | 28 | ||
| 29 | virtual Bu::FString toString() const=0; | 29 | virtual Bu::String toString() const=0; |
| 30 | virtual const std::type_info &getType() const=0; | 30 | virtual const std::type_info &getType() const=0; |
| 31 | virtual VariantTypeRoot *clone() const=0; | 31 | virtual VariantTypeRoot *clone() const=0; |
| 32 | }; | 32 | }; |
| @@ -65,7 +65,7 @@ namespace Bu | |||
| 65 | return data; | 65 | return data; |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | virtual Bu::FString toString() const | 68 | virtual Bu::String toString() const |
| 69 | { | 69 | { |
| 70 | MemBuf mb; | 70 | MemBuf mb; |
| 71 | Formatter f( mb ); | 71 | Formatter f( mb ); |
| @@ -124,7 +124,7 @@ namespace Bu | |||
| 124 | virtual ~Variant(); | 124 | virtual ~Variant(); |
| 125 | 125 | ||
| 126 | bool isSet() const; | 126 | bool isSet() const; |
| 127 | Bu::FString toString() const; | 127 | Bu::String toString() const; |
| 128 | const std::type_info &getType() const; | 128 | const std::type_info &getType() const; |
| 129 | 129 | ||
| 130 | Variant &operator=( const Variant &rhs ); | 130 | Variant &operator=( const Variant &rhs ); |
| @@ -228,8 +228,8 @@ namespace Bu | |||
| 228 | 228 | ||
| 229 | Bu::Formatter &operator<<( Bu::Formatter &f, const Variant &v ); | 229 | Bu::Formatter &operator<<( Bu::Formatter &f, const Variant &v ); |
| 230 | 230 | ||
| 231 | template<> Bu::FString VariantType<int>::toString() const; | 231 | template<> Bu::String VariantType<int>::toString() const; |
| 232 | template<> Bu::FString VariantType<bool>::toString() const; | 232 | template<> Bu::String VariantType<bool>::toString() const; |
| 233 | }; | 233 | }; |
| 234 | 234 | ||
| 235 | #endif | 235 | #endif |
