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.

1 files changed, 18 insertions, 14 deletions

diff --git a/src/membuf.h b/src/membuf.h
index 9e406c1..d98a29c 100644
--- a/src/membuf.h
+++ b/src/membuf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2010 Xagasoft, All rights reserved.
+ * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
  *
  * This file is part of the libbu++ library and is released under the
  * terms of the license contained in the file LICENSE.
@@ -10,8 +10,9 @@
 
 #include <stdint.h>
 
+#include "bu/config.h"
 #include "bu/stream.h"
-#include "bu/fstring.h"
+#include "bu/string.h"
 
 namespace Bu
 {
@@ -23,18 +24,18 @@ namespace Bu
         {
         public:
                 MemBuf();
-                MemBuf( const Bu::FString &str );
+                MemBuf( const Bu::String &str );
                 virtual ~MemBuf();
 
                 virtual void close();
-                virtual size_t read( void *pBuf, size_t nBytes );
+                virtual size read( void *pBuf, size iBytes );
 
-                virtual size_t write( const void *pBuf, size_t nBytes );
+                virtual size write( const void *pBuf, size iBytes );
                 using Stream::write;
-                virtual long tell();
-                virtual void seek( long offset );
-                virtual void setPos( long pos );
-                virtual void setPosEnd( long pos );
+                virtual size tell();
+                virtual void seek( size offset );
+                virtual void setPos( size pos );
+                virtual void setPosEnd( size pos );
                 virtual bool isEos();
                 virtual bool isOpen();
                 virtual void flush();
@@ -45,14 +46,17 @@ namespace Bu
                 virtual bool isSeekable();
                 virtual bool isBlocking();
                 virtual void setBlocking( bool bBlocking=true );
-                virtual void setSize( long iSize );
+                virtual void setSize( size iSize );
+                virtual size getSize() const;
+                virtual size getBlockSize() const;
+                virtual Bu::String getLocation() const;
 
-                Bu::FString &getString();
-                void setString( const Bu::FString &sNewData );
+                Bu::String &getString();
+                void setString( const Bu::String &sNewData );
 
         private:
-                Bu::FString sBuf;
-                long nPos;
+                Bu::String sBuf;
+                size nPos;
         };
 }