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, 28 insertions, 13 deletions

diff --git a/src/membuf.cpp b/src/membuf.cpp
index b822641..14d0d58 100644
--- a/src/membuf.cpp
+++ b/src/membuf.cpp
@@ -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.
@@ -14,7 +14,7 @@ Bu::MemBuf::MemBuf() :
 {
 }
 
-Bu::MemBuf::MemBuf( const Bu::FString &str ) :
+Bu::MemBuf::MemBuf( const Bu::String &str ) :
         sBuf( str ),
         nPos( 0 )
 {
@@ -28,9 +28,9 @@ void Bu::MemBuf::close()
 {
 }
 
-size_t Bu::MemBuf::read( void *pBuf, size_t nBytes )
+size Bu::MemBuf::read( void *pBuf, size nBytes )
 {
-        if( (size_t)sBuf.getSize()-(size_t)nPos < nBytes )
+        if( (size)sBuf.getSize()-(size)nPos < nBytes )
                 nBytes = sBuf.getSize()-nPos;
 
         memcpy( pBuf, sBuf.getStr()+nPos, nBytes );
@@ -39,7 +39,7 @@ size_t Bu::MemBuf::read( void *pBuf, size_t nBytes )
         return nBytes;
 }
         
-size_t Bu::MemBuf::write( const void *pBuf, size_t nBytes )
+size Bu::MemBuf::write( const void *pBuf, size nBytes )
 {
         if( nPos == sBuf.getSize() )
         {
@@ -52,7 +52,7 @@ size_t Bu::MemBuf::write( const void *pBuf, size_t nBytes )
         {
                 // Trickier, we must do this in two parts, overwrite, then append
                 // Frist, overwrite.
-                size_t iOver = sBuf.getSize() - nPos;
+                size iOver = sBuf.getSize() - nPos;
                 if( iOver > nBytes )
                         iOver = nBytes;
                 memcpy( sBuf.getStr()+nPos, pBuf, iOver );
@@ -66,26 +66,26 @@ size_t Bu::MemBuf::write( const void *pBuf, size_t nBytes )
         }
 }
 
-long Bu::MemBuf::tell()
+size Bu::MemBuf::tell()
 {
         return nPos;
 }
 
-void Bu::MemBuf::seek( long offset )
+void Bu::MemBuf::seek( size offset )
 {
         nPos += offset;
         if( nPos < 0 ) nPos = 0;
         else if( nPos > sBuf.getSize() ) nPos = sBuf.getSize();
 }
 
-void Bu::MemBuf::setPos( long pos )
+void Bu::MemBuf::setPos( size pos )
 {
         nPos = pos;
         if( nPos < 0 ) nPos = 0;
         else if( nPos > sBuf.getSize() ) nPos = sBuf.getSize();
 }
 
-void Bu::MemBuf::setPosEnd( long pos )
+void Bu::MemBuf::setPosEnd( size pos )
 {
         nPos = sBuf.getSize()-pos;
         if( nPos < 0 ) nPos = 0;
@@ -140,7 +140,7 @@ void Bu::MemBuf::setBlocking( bool )
 {
 }
 
-void Bu::MemBuf::setSize( long iSize )
+void Bu::MemBuf::setSize( size iSize )
 {
         if( iSize < 0 )
                 iSize = 0;
@@ -149,12 +149,27 @@ void Bu::MemBuf::setSize( long iSize )
                 nPos = iSize;
 }
 
-Bu::FString &Bu::MemBuf::getString()
+Bu::size Bu::MemBuf::getSize() const
+{
+        return sBuf.getSize();
+}
+
+Bu::size Bu::MemBuf::getBlockSize() const
+{
+        return sBuf.getSize();
+}
+
+Bu::String Bu::MemBuf::getLocation() const
+{
+        return "";
+}
+
+Bu::String &Bu::MemBuf::getString()
 {
         return sBuf;
 }
 
-void Bu::MemBuf::setString( const Bu::FString &sNewData )
+void Bu::MemBuf::setString( const Bu::String &sNewData )
 {
         sBuf = sNewData;
         nPos = 0;