1 files changed, 13 insertions, 18 deletions

diff --git a/src/variant.cpp b/src/variant.cpp
index fd0511f..f7c87ad 100644
--- a/src/variant.cpp
+++ b/src/variant.cpp
@@ -7,6 +7,8 @@
 
 #include "bu/variant.h"
 
+#include "bu/membuf.h"
+
 namespace Bu
 {
         Formatter &operator<<( Formatter &f, const String &s );
@@ -49,16 +51,17 @@ Bu::Variant::~Variant()
         }
 }
 
-bool Bu::Variant::isSet() const
+Bu::String Bu::Variant::toString() const
 {
-        return pCore != NULL;
+        Bu::MemBuf mb;
+        Bu::Formatter f( mb );
+        f << *this;
+        return mb.getString();
 }
 
-Bu::String Bu::Variant::toString() const
+bool Bu::Variant::isSet() const
 {
-        if( !pCore )
-                return "***NO DATA***";
-        return pCore->toString();
+        return pCore != NULL;
 }
 
 const std::type_info &Bu::Variant::getType() const
@@ -87,18 +90,10 @@ Bu::Variant &Bu::Variant::operator=( const Bu::Variant &rhs )
 
 Bu::Formatter &Bu::operator<<( Bu::Formatter &f, const Bu::Variant &v )
 {
-        return f << v.toString();
-}
-
-template<> Bu::String Bu::VariantType<int>::toString() const
-{
-        Bu::String s;
-        s.format("%d", data );
-        return s;
-}
+        if( !v.pCore )
+                return f << "(null)";
 
-template<> Bu::String Bu::VariantType<bool>::toString() const
-{
-        return data?"true":"false";
+        v.pCore->format( f );
+        return f;
 }