Gradually moving to better archive structure.

It's dragging other new API changes along with it, including use of Blob
and Text.

1 files changed, 8 insertions, 7 deletions

diff --git a/src/unstable/uuid.h b/src/unstable/uuid.h
index d61a928..902942e 100644
--- a/src/unstable/uuid.h
+++ b/src/unstable/uuid.h
@@ -9,10 +9,11 @@
 #define BU_UUID_H
 
 #include "bu/util.h"
-#include "bu/string.h"
+#include "bu/blob.h"
 
 namespace Bu
 {
+    class Archive;
     class Uuid
     {
     friend Bu::Archive &operator>>( Bu::Archive &ar, Uuid &u );
@@ -20,12 +21,12 @@ namespace Bu
     public:
         Uuid();
         Uuid( const Uuid &src );
-        Uuid( const Bu::String &sSrc );
+        Uuid( const Bu::Blob &sSrc );
         virtual ~Uuid();
 
-        Bu::String toRawString() const;
-        Bu::String toString() const;
-        Bu::String toUrn() const;
+        Bu::Blob toRawBlob() const;
+        Bu::Blob toBlob() const;
+        Bu::Blob toUrn() const;
 
         enum Type
         {
@@ -43,11 +44,11 @@ namespace Bu
         DEPRECATED static Uuid gen() { return generate(); }
 
         void clear();
-        void set( const Bu::String &sSrc );
+        void set( const Bu::Blob &sSrc );
 
         bool operator==( const Uuid &rhs ) const;
         bool operator!=( const Uuid &rhs ) const;
-        Uuid &operator=( const Bu::String &rhs ) { set( rhs ); return *this; }
+        Uuid &operator=( const Bu::Blob &rhs ) { set( rhs ); return *this; }
         Uuid &operator=( const Uuid &rhs );
 
     private: