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/variant.cpp | |
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/variant.cpp')
-rw-r--r-- | src/variant.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/variant.cpp b/src/variant.cpp index a239e0f..fd0511f 100644 --- a/src/variant.cpp +++ b/src/variant.cpp | |||
@@ -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. |
@@ -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 | } |