From: Sean M. <br...@us...> - 2004-10-03 17:30:19
|
Update of /cvsroot/bzflag/bzflag/src/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15484/src/game Modified Files: CommandsStandard.cxx PlayerInfo.cxx VotingArbiter.cxx Log Message: s/string_util/TextUtils/g making the utility namespace match his file name (oh lookie, 2-chars shorter even) Index: CommandsStandard.cxx =================================================================== RCS file: /cvsroot/bzflag/bzflag/src/game/CommandsStandard.cxx,v retrieving revision 1.5 retrieving revision 1.6 diff -w -u -r1.5 -r1.6 --- CommandsStandard.cxx 14 Aug 2004 01:02:37 -0000 1.5 +++ CommandsStandard.cxx 3 Oct 2004 17:28:46 -0000 1.6 @@ -270,7 +270,7 @@ if (sscanf(args[1].c_str(), "%f", &amount) != 1) amount = 1.0; value *= amount; - BZDB.set(args[0], string_util::format("%f", value), StateDatabase::User); + BZDB.set(args[0], TextUtils::format("%f", value), StateDatabase::User); return std::string(); } Index: PlayerInfo.cxx =================================================================== RCS file: /cvsroot/bzflag/bzflag/src/game/PlayerInfo.cxx,v retrieving revision 1.22 retrieving revision 1.23 diff -w -u -r1.22 -r1.23 --- PlayerInfo.cxx 3 Oct 2004 16:53:33 -0000 1.22 +++ PlayerInfo.cxx 3 Oct 2004 17:28:46 -0000 1.23 @@ -313,10 +313,10 @@ std::string PlayerInfo::getIdleStat() { std::string reply; if ((state > PlayerInLimbo) && (team != ObserverTeam)) { - reply = string_util::format("%-16s : %4ds", callSign, + reply = TextUtils::format("%-16s : %4ds", callSign, int(now - lastupdate)); if (paused) { - reply += string_util::format(" paused %4ds", int(now - pausedSince)); + reply += TextUtils::format(" paused %4ds", int(now - pausedSince)); } } return reply; Index: VotingArbiter.cxx =================================================================== RCS file: /cvsroot/bzflag/bzflag/src/game/VotingArbiter.cxx,v retrieving revision 1.12 retrieving revision 1.13 diff -w -u -r1.12 -r1.13 --- VotingArbiter.cxx 3 Oct 2004 17:02:13 -0000 1.12 +++ VotingArbiter.cxx 3 Oct 2004 17:28:46 -0000 1.13 @@ -38,7 +38,7 @@ bool VotingArbiter::isPollerWaiting(const std::string &name) const { for (unsigned int i = 0; i < _pollers.size(); i++) { - if (string_util::compare_nocase(_pollers[i].name, name) == 0) { + if (TextUtils::compare_nocase(_pollers[i].name, name) == 0) { return true; } } @@ -151,7 +151,7 @@ bool VotingArbiter::grantSuffrage(const std::string &player) { for (unsigned int i = 0; i < _suffraged.size(); i++) { - if (string_util::compare_nocase(_suffraged[i], player) == 0) { + if (TextUtils::compare_nocase(_suffraged[i], player) == 0) { return true; } } @@ -169,7 +169,7 @@ // was this player granted the right to vote? bool foundPlayer = false; for (unsigned int i = 0; i < _suffraged.size(); i++) { - if (string_util::compare_nocase(_suffraged[i], player) == 0) { + if (TextUtils::compare_nocase(_suffraged[i], player) == 0) { foundPlayer = true; break; } @@ -179,7 +179,7 @@ } // has this player already voted? - if (_votingBooth->hasVoted(string_util::tolower(player))) { + if (_votingBooth->hasVoted(TextUtils::tolower(player))) { return false; } @@ -202,7 +202,7 @@ return false; } - return (_votingBooth->vote(string_util::tolower(player), "yes")); + return (_votingBooth->vote(TextUtils::tolower(player), "yes")); } bool VotingArbiter::voteNo(const std::string &player) @@ -216,7 +216,7 @@ return false; } - return (_votingBooth->vote(string_util::tolower(player), "no")); + return (_votingBooth->vote(TextUtils::tolower(player), "no")); } unsigned long int VotingArbiter::getYesCount(void) const @@ -320,7 +320,7 @@ if (_votingBooth == NULL) { return false; } - return _votingBooth->retractVote(string_util::tolower(player)); + return _votingBooth->retractVote(TextUtils::tolower(player)); } |