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, 15 insertions, 11 deletions

diff --git a/src/httpget.h b/src/httpget.h
index 783f880..a58e8ac 100644
--- a/src/httpget.h
+++ b/src/httpget.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.
@@ -9,7 +9,7 @@
 #define BU_HTTP_GET_H
 
 #include "bu/stream.h"
-#include "bu/fstring.h"
+#include "bu/string.h"
 #include "bu/url.h"
 #include "bu/tcpsocket.h"
 #include "bu/hash.h"
@@ -19,21 +19,21 @@ namespace Bu
         class HttpGet : public Bu::Stream
         {
         public:
-                HttpGet( const Bu::Url &uSrc, const Bu::FString &sMethod="GET" );
+                HttpGet( const Bu::Url &uSrc, const Bu::String &sMethod="GET" );
                 virtual ~HttpGet();
 
                 void get();
 
                 // From Bu::Stream
                 virtual void close();
-                virtual size_t read( void *pBuf, size_t nBytes );
-                virtual size_t write( const void *pBuf, size_t nBytes );
+                virtual Bu::size read( void *pBuf, Bu::size nBytes );
+                virtual Bu::size write( const void *pBuf, Bu::size nBytes );
                 using Stream::write;
 
-                virtual long tell();
-                virtual void seek( long offset );
-                virtual void setPos( long pos );
-                virtual void setPosEnd( long pos );
+                virtual Bu::size tell();
+                virtual void seek( Bu::size offset );
+                virtual void setPos( Bu::size pos );
+                virtual void setPosEnd( Bu::size pos );
                 virtual bool isEos();
                 virtual bool isOpen();
 
@@ -49,11 +49,15 @@ namespace Bu
                 virtual bool isBlocking();
                 virtual void setBlocking( bool bBlocking=true );
 
+                virtual size getSize() const;
+                virtual size getBlockSize() const;
+                virtual Bu::String getLocation() const;
+
         private:
                 Bu::Url uSrc;
-                Bu::FString sMethod;
+                Bu::String sMethod;
                 Bu::TcpSocket sSrv;
-                typedef Bu::Hash<Bu::FString,Bu::FString> MimeHash;
+                typedef Bu::Hash<Bu::String,Bu::String> MimeHash;
                 MimeHash hMimeIn;
                 MimeHash hMimeOut;
         };