1 files changed, 7 insertions, 94 deletions

diff --git a/src/formatter.h b/src/formatter.h
index 49507de..f87a9be 100644
--- a/src/formatter.h
+++ b/src/formatter.h
@@ -8,101 +8,19 @@
 #ifndef BU_FORMATTER_H
 #define BU_FORMATTER_H
 
-#include "stream.h"
+#include "bu/string.h"
+#include "bu/fmt.h"
 
 namespace Bu
 {
+        class Stream;
+
         class Formatter
         {
         public:
                 Formatter( Stream &rStream );
                 virtual ~Formatter();
 
-                typedef struct Fmt
-                {
-                        enum Alignment
-                        {
-                                Left    = 0,
-                                Center  = 1,
-                                Right   = 2
-                        };
-                        Fmt() :
-                                uMinWidth( 0 ),
-                                cFillChar(' '),
-                                uRadix( 10 ),
-                                uAlign( Right ),
-                                bPlus( false ),
-                                bCaps( true ),
-                                bTokenize( true )
-                        {
-                        }
-
-                        Fmt( unsigned int uMinWidth, unsigned int uRadix=10,
-                                        Alignment a=Right, bool bPlus=false, bool bCaps=true,
-                                        char cFill=' ') :
-                                uMinWidth( uMinWidth ),
-                                cFillChar(cFill),
-                                uRadix( uRadix ),
-                                uAlign( a ),
-                                bPlus( bPlus ),
-                                bCaps( bCaps ),
-                                bTokenize( true )
-                        {
-                        }
-                        Fmt( unsigned int uMinWidth, Alignment a,
-                                        unsigned int uRadix=10, bool bPlus=false, bool bCaps=true,
-                                        char cFill=' ') :
-                                uMinWidth( uMinWidth ),
-                                cFillChar(cFill),
-                                uRadix( uRadix ),
-                                uAlign( a ),
-                                bPlus( bPlus ),
-                                bCaps( bCaps ),
-                                bTokenize( true )
-                        {
-                        }
-
-                        static Fmt hex( unsigned int uWidth=0, bool bCaps=true )
-                        {
-                                return Fmt( uWidth, 16, Right, false, bCaps, '0' );
-                        }
-                        
-                        static Fmt oct( unsigned int uWidth=0 )
-                        {
-                                return Fmt( uWidth, 8, Right, false, false, '0' );
-                        }
-
-                        static Fmt bin( unsigned int uWidth=0 )
-                        {
-                                return Fmt( uWidth, 1, Right, false, false, '0' );
-                        }
-
-                        static Fmt ptr( bool bCaps=true )
-                        {
-                                return Fmt( sizeof(ptrdiff_t)*2, 16, Right, false, bCaps, '0' );
-                        }
-
-                        Fmt &width( unsigned int uWidth );
-                        Fmt &fill( char cFill='0' );
-                        Fmt &radix( unsigned int uRadix );
-                        Fmt &align( Alignment eAlign );
-                        Fmt &plus( bool bPlus=true );
-                        Fmt &caps( bool bCaps=true );
-                        Fmt &tokenize( bool bTokenize=true );
-
-                        Fmt &left();
-                        Fmt &right();
-                        Fmt &center();
-
-                        unsigned char uMinWidth;
-                        char cFillChar;
-                        unsigned short uRadix : 6;
-                        unsigned short uAlign : 2;
-                        unsigned short bPlus : 1;
-                        unsigned short bCaps : 1;
-                        unsigned short bTokenize : 1;
-                } Fmt;
-
                 void write( const Bu::String &sStr );
                 void write( const void *sStr, int iLen );
                 void writeAligned( const Bu::String &sStr );
@@ -200,7 +118,7 @@ namespace Bu
                 void ffmt( type f )
                 {
                         Bu::String fTmp;
-                        fTmp.format("%f", f );
+//                      fTmp.format("%f", f );
 //                      writeAligned("**make floats work**");
                         writeAligned( fTmp );
                         usedFormat();
@@ -269,10 +187,7 @@ namespace Bu
                         flush
                 };
 
-                void doFlush()
-                {
-                        rStream.flush();
-                }
+                void doFlush();
 
         private:
                 Stream &rStream;
@@ -282,9 +197,7 @@ namespace Bu
                 char cIndent;
         };
 
-        typedef Formatter::Fmt Fmt;
-
-        Formatter &operator<<( Formatter &f, const Formatter::Fmt &fmt );
+        Formatter &operator<<( Formatter &f, const Fmt &fmt );
         Formatter &operator<<( Formatter &f, Formatter::Special s );
         Formatter &operator<<( Formatter &f, const char *sStr );
         Formatter &operator<<( Formatter &f, char *sStr );