diff options
Diffstat (limited to 'src/variant.h')
-rw-r--r-- | src/variant.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/variant.h b/src/variant.h index f659ad2..2b88efe 100644 --- a/src/variant.h +++ b/src/variant.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,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 |