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, 34 insertions, 34 deletions

diff --git a/src/url.h b/src/url.h
index ea761ef..d751578 100644
--- a/src/url.h
+++ b/src/url.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.
@@ -8,7 +8,7 @@
 #ifndef BU_URL_H
 #define BU_URL_H
 
-#include "bu/fstring.h"
+#include "bu/string.h"
 #include "bu/atom.h"
 
 namespace Bu
@@ -20,61 +20,61 @@ namespace Bu
                 {
                         Param() { }
                         Param( const Param &r ) : sName( r.sName ), sValue( r.sValue ) { }
-                        Param( const Bu::FString &n, const Bu::FString &v ) :
+                        Param( const Bu::String &n, const Bu::String &v ) :
                                 sName( n ), sValue( v ) { }
-                        Bu::FString sName;
-                        Bu::FString sValue;
+                        Bu::String sName;
+                        Bu::String sValue;
                 } Param;
                 typedef Bu::List<Param> ParamList;
 
         public:
                 Url();
-                Url( const Bu::FString &sUrl );
+                Url( const Bu::String &sUrl );
                 virtual ~Url();
 
-                void parseUrl( const Bu::FString &sUrl );
-                void parseParams( const Bu::FString &sQuery );
-                void parseParams( Bu::FString::const_iterator &i );
-                void parsePath( const Bu::FString &sPath );
-                void parsePath( Bu::FString::const_iterator &i );
+                void parseUrl( const Bu::String &sUrl );
+                void parseParams( const Bu::String &sQuery );
+                void parseParams( Bu::String::const_iterator &i );
+                void parsePath( const Bu::String &sPath );
+                void parsePath( Bu::String::const_iterator &i );
                 void clear();
 
-                Bu::FString getUrl() const;
-                Bu::FString getFullPath() const;
+                Bu::String getUrl() const;
+                Bu::String getFullPath() const;
 
-                const Bu::FString &getProtocol() const { return sProtocol; }
-                const Bu::FString &getUser() const { return sUser; }
-                const Bu::FString &getPass() const { return sPass; }
-                const Bu::FString &getHost() const { return sHost; }
-                const Bu::FString &getPath() const { return sPath; }
+                const Bu::String &getProtocol() const { return sProtocol; }
+                const Bu::String &getUser() const { return sUser; }
+                const Bu::String &getPass() const { return sPass; }
+                const Bu::String &getHost() const { return sHost; }
+                const Bu::String &getPath() const { return sPath; }
                 int getPort() const { return iPort; }
                 ParamList::const_iterator getParamBegin() const
                         { return lParam.begin(); }
 
-                void setProtocol( const Bu::FString &sNewHost, bool bAutoSetPort=true );
-                void setUser( const Bu::FString &s ) { sUser = s; }
-                void setPass( const Bu::FString &s ) { sPass = s; }
-                void setHost( const Bu::FString &s ) { sHost = s; }
-                void setPath( const Bu::FString &s ) { sPath = s; }
+                void setProtocol( const Bu::String &sNewHost, bool bAutoSetPort=true );
+                void setUser( const Bu::String &s ) { sUser = s; }
+                void setPass( const Bu::String &s ) { sPass = s; }
+                void setHost( const Bu::String &s ) { sHost = s; }
+                void setPath( const Bu::String &s ) { sPath = s; }
                 void setPort( int i ) { iPort = i; }
-                void addParam( const Bu::FString &n, const Bu::FString &v );
+                void addParam( const Bu::String &n, const Bu::String &v );
 
                 bool hasPort() const { return iPort.has(); }
 
-                static Bu::FString decode( const Bu::FString &sStr );
-                static Bu::FString encode( const Bu::FString &sStr );
+                static Bu::String decode( const Bu::String &sStr );
+                static Bu::String encode( const Bu::String &sStr );
 
         private: // Parsing code
-                void parseProtocol( Bu::FString::const_iterator &i );
-                void parseUserPass( Bu::FString::const_iterator &i );
-                void parseHost( Bu::FString::const_iterator &i );
+                void parseProtocol( Bu::String::const_iterator &i );
+                void parseUserPass( Bu::String::const_iterator &i );
+                void parseHost( Bu::String::const_iterator &i );
 
         private:
-                Bu::FString sProtocol;
-                Bu::FString sUser;
-                Bu::FString sPass;
-                Bu::FString sHost;
-                Bu::FString sPath;
+                Bu::String sProtocol;
+                Bu::String sUser;
+                Bu::String sPass;
+                Bu::String sHost;
+                Bu::String sPath;
                 Bu::Atom<int> iPort;
                 ParamList lParam;