CVS: bzflag/src/common ConfigFileManager.cxx,1.1,1.2 ErrorHandler.cxx,1.7,1.8 FileManager.cxx,1.2,1.3 StateDatabase.cxx,1.2,1.3 XMLTree.cxx,1.1,1.2

[Dave B. <dbr...@us...>]

Update of /cvsroot/bzflag/bzflag/src/common
In directory usw-pr-cvs1:/tmp/cvs-serv19389/A/src/common

Modified Files:
	ConfigFileManager.cxx ErrorHandler.cxx FileManager.cxx 
	StateDatabase.cxx XMLTree.cxx 
Log Message:
Removal of the BzfString class->replace with std::string

Index: ConfigFileManager.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/common/ConfigFileManager.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConfigFileManager.cxx	11 Mar 2002 19:03:23 -0000	1.1
+++ ConfigFileManager.cxx	14 Mar 2002 08:02:06 -0000	1.2
@@ -44,14 +44,14 @@
 }
 
 void					ConfigFileManager::add(
-							const BzfString& tag,
+							const std::string& tag,
 							ConfigFileReader* adopted)
 {
 	remove(tag);
 	readers.insert(std::make_pair(tag, adopted));
 }
 
-void					ConfigFileManager::remove(const BzfString& tag)
+void					ConfigFileManager::remove(const std::string& tag)
 {
 	Readers::iterator index = readers.find(tag);
 	if (index != readers.end()) {
@@ -60,7 +60,7 @@
 	}
 }
 
-ConfigFileReader*		ConfigFileManager::get(const BzfString& tag) const
+ConfigFileReader*		ConfigFileManager::get(const std::string& tag) const
 {
 	Readers::const_iterator index = readers.find(tag);
 	if (index != readers.end())
@@ -80,7 +80,7 @@
 			ConfigFileReader* reader = get(scan->value);
 			if (reader == NULL)
 				throw XMLIOException(scan->position,
-							BzfString::format(
+							string_util::format(
 								"invalid tag `%s'",
 								scan->value.c_str()));
 
@@ -97,7 +97,7 @@
 	}
 }
 
-bool					ConfigFileManager::read(const BzfString& filename)
+bool					ConfigFileManager::read(const std::string& filename)
 {
 	// try to open the file
 	istream* stream = FILEMGR->createDataInStream(filename);

Index: ErrorHandler.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/common/ErrorHandler.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ErrorHandler.cxx	14 Mar 2002 04:31:30 -0000	1.7
+++ ErrorHandler.cxx	14 Mar 2002 08:02:06 -0000	1.8
@@ -11,11 +11,12 @@
  */
 
 #include "ErrorHandler.h"
-#include "BzfString.h"
 #include <stdio.h>
+#include <string>
 #if defined(_WIN32)
 #include <windows.h>
 #endif
+#include "common.h"
 
 static ErrorCallback		errorCallback = NULL;
 
@@ -31,7 +32,7 @@
 {
 	va_list args;
 	va_start(args, fmt);
-	BzfString buffer = BzfString::vformat(fmt, args);
+	std::string buffer = string_util::vformat(fmt, args);
 	va_end(args);
 
 	if (errorCallback) {

Index: FileManager.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/common/FileManager.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileManager.cxx	28 Feb 2002 08:55:38 -0000	1.2
+++ FileManager.cxx	14 Mar 2002 08:02:06 -0000	1.3
@@ -11,7 +11,7 @@
  */
 
 #include "FileManager.h"
-#include "BzfString.h"
+#include "string"
 #include "StateDatabase.h"
 #include <ctype.h>
 #include <fstream>
@@ -42,7 +42,7 @@
 }
 
 istream*				FileManager::createDataInStream(
-								const BzfString& filename,
+								const std::string& filename,
 								bool binary) const
 {
 	// choose open mode
@@ -93,7 +93,7 @@
 }
 
 ostream*				FileManager::createDataOutStream(
-								const BzfString& filename,
+								const std::string& filename,
 								bool binary,
 								bool truncate) const
 {
@@ -136,7 +136,7 @@
 	}
 }
 
-bool					FileManager::isAbsolute(const BzfString& path) const
+bool					FileManager::isAbsolute(const std::string& path) const
 {
 	if (path.empty())
 		return false;
@@ -158,9 +158,9 @@
 	return false;
 }
 
-BzfString				FileManager::catPath(
-								const BzfString& a,
-								const BzfString& b) const
+std::string				FileManager::catPath(
+								const std::string& a,
+								const std::string& b) const
 {
 	// handle trivial cases
 	if (a.empty())
@@ -169,14 +169,14 @@
 		return a;
 
 #if defined(_WIN32)
-	BzfString c = a;
+	std::string c = a;
 	c += "\\";
 	c += b;
 	return c;
 #elif defined(macintosh)
 #error FIXME -- what is the mac path separator?
 #else
-	BzfString c = a;
+	std::string c = a;
 	c += "/";
 	c += b;
 	return c;

Index: StateDatabase.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/common/StateDatabase.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StateDatabase.cxx	28 Feb 2002 08:55:38 -0000	1.2
+++ StateDatabase.cxx	14 Mar 2002 08:02:06 -0000	1.3
@@ -10,6 +10,10 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#if defined(WIN32)
+#pragma warning(4:4503)
+#endif
+
 #include "StateDatabase.h"
 #include "ErrorHandler.h"
 #include <assert.h>
@@ -46,8 +50,8 @@
 	s_instance = NULL;
 }
 
-void					StateDatabase::set(const BzfString& name,
-								const BzfString& value,
+void					StateDatabase::set(const std::string& name,
+								const std::string& value,
 								Permission access)
 {
 	Map::iterator index = lookup(name);
@@ -65,7 +69,7 @@
 	}
 }
 
-void					StateDatabase::unset(const BzfString& name,
+void					StateDatabase::unset(const std::string& name,
 								Permission access)
 {
 	Map::iterator index = lookup(name);
@@ -77,7 +81,7 @@
 	}
 }
 
-void					StateDatabase::touch(const BzfString& name,
+void					StateDatabase::touch(const std::string& name,
 								Permission access)
 {
 	Map::iterator index = lookup(name);
@@ -86,21 +90,21 @@
 }
 
 void					StateDatabase::setPersistent(
-								const BzfString& name, bool save)
+								const std::string& name, bool save)
 {
 	Map::iterator index = lookup(name);
 	index->second.save = save;
 }
 
 void					StateDatabase::setDefault(
-								const BzfString& name, const BzfString& value)
+								const std::string& name, const std::string& value)
 {
 	Map::iterator index = lookup(name);
 	index->second.defValue = value;
 }
 
 void					StateDatabase::setPermission(
-								const BzfString& name,
+								const std::string& name,
 								Permission permission)
 {
 	Map::iterator index = lookup(name);
@@ -108,7 +112,7 @@
 }
 
 void					StateDatabase::addCallback(
-								const BzfString& name,
+								const std::string& name,
 								Callback callback,
 								void* userData)
 {
@@ -117,7 +121,7 @@
 }
 
 void					StateDatabase::removeCallback(
-								const BzfString& name,
+								const std::string& name,
 								Callback callback,
 								void* userData)
 {
@@ -125,41 +129,41 @@
 	index->second.callbacks.remove(callback, userData);
 }
 
-bool					StateDatabase::isSet(const BzfString& name) const
+bool					StateDatabase::isSet(const std::string& name) const
 {
 	Map::const_iterator index = items.find(name);
 	return !(index == items.end() || !index->second.isSet);
 }
 
-BzfString				StateDatabase::get(const BzfString& name) const
+std::string				StateDatabase::get(const std::string& name) const
 {
 	Map::const_iterator index = items.find(name);
 	if (index == items.end() || !index->second.isSet)
-		return BzfString();
+		return std::string();
 	else
 		return index->second.value;
 }
 
-bool					StateDatabase::isTrue(const BzfString& name) const
+bool					StateDatabase::isTrue(const std::string& name) const
 {
 	Map::const_iterator index = items.find(name);
 	return !(index == items.end() || !index->second.isTrue);
 }
 
-bool					StateDatabase::isEmpty(const BzfString& name) const
+bool					StateDatabase::isEmpty(const std::string& name) const
 {
 	Map::const_iterator index = items.find(name);
 	return (index == items.end() || !index->second.isSet ||
 								index->second.value.empty());
 }
 
-bool					StateDatabase::isPersistent(const BzfString& name) const
+bool					StateDatabase::isPersistent(const std::string& name) const
 {
 	Map::const_iterator index = items.find(name);
 	return (index != items.end() && index->second.save);
 }
 
-BzfString				StateDatabase::getDefault(const BzfString& name) const
+std::string				StateDatabase::getDefault(const std::string& name) const
 {
 	Map::const_iterator index = items.find(name);
 	if (index != items.end())
@@ -169,7 +173,7 @@
 }
 
 StateDatabase::Permission
-						StateDatabase::getPermission(const BzfString& name) const
+						StateDatabase::getPermission(const std::string& name) const
 {
 	Map::const_iterator index = items.find(name);
 	if (index != items.end())
@@ -179,7 +183,7 @@
 }
 
 StateDatabase::Map::iterator
-						StateDatabase::lookup(const BzfString& name)
+						StateDatabase::lookup(const std::string& name)
 {
 	Map::iterator index = items.find(name);
 	if (index == items.end()) {
@@ -203,7 +207,7 @@
 								void* userData,
 								void* iterateData)
 {
-	callback(*reinterpret_cast<BzfString*>(iterateData), userData);
+	callback(*reinterpret_cast<std::string*>(iterateData), userData);
 	return true;
 }
 

Index: XMLTree.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/common/XMLTree.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLTree.cxx	11 Mar 2002 19:03:23 -0000	1.1
+++ XMLTree.cxx	14 Mar 2002 08:02:06 -0000	1.2
@@ -41,7 +41,7 @@
 	// do nothing
 }
 
-XMLStreamPosition::XMLStreamPosition(const BzfString& filename_,
+XMLStreamPosition::XMLStreamPosition(const std::string& filename_,
 								unsigned int line_, unsigned int column_) :
 								filename(filename_),
 								line(line_),
@@ -76,7 +76,7 @@
 }
 
 XMLIOException::XMLIOException(const XMLStreamPosition& p,
-								const BzfString& msg) :
+								const std::string& msg) :
 								runtime_error(msg.c_str()),
 								position(p)
 {
@@ -99,8 +99,8 @@
 }
 
 bool					XMLNode::getAttribute(
-							const BzfString& name,
-							BzfString& value) const
+							const std::string& name,
+							std::string& value) const
 {
 	Attributes::const_iterator index = attributes.find(name);
 	if (index == attributes.end())
@@ -110,7 +110,7 @@
 }
 
 XMLStreamPosition		XMLNode::getAttributePosition(
-							const BzfString& name) const
+							const std::string& name) const
 {
 	Attributes::const_iterator index = attributes.find(name);
 	if (index == attributes.end())
@@ -249,7 +249,7 @@
 }
 
 XMLTree::XMLTreeIOException::XMLTreeIOException(
-								const XMLStream& s, const BzfString& msg) :
+								const XMLStream& s, const std::string& msg) :
 								XMLIOException(s.position, msg)
 {
 	// do nothing
@@ -311,7 +311,7 @@
 				if (tagStack.size() <= 1) {
 					stream.setFail();
 					throw XMLTreeIOException(stream,
-							BzfString::format(
+							string_util::format(
 								"</%s> without matching <%s>",
 								node.value.c_str(),
 								node.value.c_str()));
@@ -319,7 +319,7 @@
 				if (node.value != tagStack.top()->value) {
 					stream.setFail();
 					throw XMLTreeIOException(stream,
-							BzfString::format(
+							string_util::format(
 								"unexpected tag </%s>, expected </%s>",
 								node.value.c_str(),
 								tagStack.top()->value.c_str()));
@@ -411,7 +411,7 @@
 				skipWhitespace(stream);
 
 				// read instruction up to ?>
-				BzfString data;
+				std::string data;
 				int match = 0;
 				while (stream && match != 2) {
 					c = stream.get();
@@ -546,7 +546,7 @@
 	eat(stream, "CDATA[", "malformed CDATA section");
 
 	// accumulate data up to but not including first `]]>'
-	BzfString data;
+	std::string data;
 	int match = 0;
 	while (match != 3) {
 		char c = stream.get();
@@ -564,7 +564,7 @@
 
 	// save data without the ]]> suffix
 	node->type  = XMLNode::PI;
-	node->value = data(0, data.size() - 3);
+	node->value = data.substr(0, data.size() - 3);
 	return Data;
 }
 
@@ -574,7 +574,7 @@
 
 	// read filename
 	skipWhitespace(stream);
-	BzfString filename = readValue(stream);
+	std::string filename = readValue(stream);
 
 	// eat tag close
 	skipWhitespace(stream);
@@ -584,7 +584,7 @@
 	istream* included = FILEMGR->createDataInStream(filename);
 	if (included == NULL)
 		throw XMLTreeIOException(stream,
-							BzfString::format(
+							string_util::format(
 								"cannot open INCLUDE file `%s'",
 								filename.c_str()));
 
@@ -592,20 +592,20 @@
 	stream.push(included, XMLStreamPosition(filename));
 }
 
-BzfString				XMLTree::readToken(XMLStream& stream,
+std::string				XMLTree::readToken(XMLStream& stream,
 							CharClass firstCharClass,
 							CharClass otherCharClass,
 							const char* delimCharClass,
 							const char* tokenType)
 {
 	char c;
-	BzfString token;
+	std::string token;
 
 	// first character is special
 	c = stream.get();
 	if (!firstCharClass(c))
 		throw XMLTreeIOException(stream,
-							BzfString::format("invalid %s", tokenType));
+							string_util::format("invalid %s", tokenType));
 	token += c;
 
 	// remaining characters
@@ -617,13 +617,13 @@
 			break;
 		else
 			throw XMLTreeIOException(stream,
-							BzfString::format("invalid %s", tokenType));
+							string_util::format("invalid %s", tokenType));
 	}
 
 	return token;
 }
 
-BzfString				XMLTree::readValue(XMLStream& stream)
+std::string				XMLTree::readValue(XMLStream& stream)
 {
 	// get quote
 	char delim = stream.get();
@@ -631,7 +631,7 @@
 		throw XMLTreeIOException(stream, "attribute value needs quotes");
 
 	// read until we find a matching quote or an invalid character
-	BzfString value;
+	std::string value;
 	while (stream) {
 		char c = stream.get();
 		if (c == delim) {
@@ -668,7 +668,7 @@
 
 		// read name up to =
 		XMLStreamPosition position(stream.position);
-		BzfString name = readToken(stream,
+		std::string name = readToken(stream,
 								isNameFirstChar, isNameChar,
 								"=", "attribute name");
 
@@ -678,7 +678,7 @@
 							"syntax error -- expected = in attribute");
 
 		// read value
-		BzfString value = readValue(stream);
+		std::string value = readValue(stream);
 
 		// save it
 		node->attributes[name] = std::make_pair(position, value);
@@ -695,14 +695,14 @@
 	}
 
 	// read up to a semicolon
-	BzfString name = readToken(stream,
+	std::string name = readToken(stream,
 							isNameFirstChar, isNameChar,
 							";", "reference");
 
 	// verify delimiter
 	if (stream.get() != ';')
 		throw XMLTreeIOException(stream,
-							BzfString::format(
+							string_util::format(
 								"reference `%s' missing delimiter",
 								name.c_str()));
 
@@ -720,7 +720,7 @@
 
 	// unknown reference
 	throw XMLTreeIOException(stream,
-							BzfString::format(
+							string_util::format(
 								"unknown reference &%s;", name.c_str()));
 }
 
@@ -728,7 +728,7 @@
 {
 	// slurp up characters
 	int base;
-	BzfString number;
+	std::string number;
 	char c = stream.peek();
 	if (c == 'x') {
 		stream.skip();
@@ -743,7 +743,7 @@
 	// verify delimiter
 	if (stream.get() != ';')
 		throw XMLTreeIOException(stream,
-							BzfString::format(
+							string_util::format(
 								"reference `%s' missing delimiter",
 								number.c_str()));
 
@@ -753,7 +753,7 @@
 	// check range
 	if (value > 255)
 		throw XMLTreeIOException(stream,
-							BzfString::format(
+							string_util::format(
 								"character reference `%s' out of range",
 								number.c_str()));
 
@@ -854,7 +854,7 @@
 }
 */
 
-BzfString				XMLTree::escape(const BzfString& string)
+std::string				XMLTree::escape(const std::string& string)
 {
 	static const char* hex = "0123456789abcdef";
 
@@ -877,7 +877,7 @@
 		return string;
 
 	// construct new string with escapes
-	BzfString output;
+	std::string output;
 	for (cstr = string.c_str(); *cstr; ++cstr) {
 		switch (*cstr) {
 			case '\n':