diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-18 20:14:23 +0100 |
---|---|---|
committer | Ira Rice <irarice@gmail.com> | 2009-02-18 13:19:11 -0700 |
commit | c3f7f72f37adad5103587069ff549798fc9d652d (patch) | |
tree | df268b0bfd478cb3f4d740b1bce9a882bc70c538 /src/utils | |
parent | b8f0e1755ae8c6acf9bc681a83f18ef6ff0a1172 (diff) | |
download | mana-client-c3f7f72f37adad5103587069ff549798fc9d652d.tar.gz mana-client-c3f7f72f37adad5103587069ff549798fc9d652d.tar.bz2 mana-client-c3f7f72f37adad5103587069ff549798fc9d652d.tar.xz mana-client-c3f7f72f37adad5103587069ff549798fc9d652d.zip |
Introduced a toLower method and grouped string utils
The string utility methods are now grouped together in the stringutils.h
header. Also, a toLower method was added for convenience.
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/stringutils.cpp (renamed from src/utils/trim.h) | 32 | ||||
-rw-r--r-- | src/utils/stringutils.h | 69 |
2 files changed, 91 insertions, 10 deletions
diff --git a/src/utils/trim.h b/src/utils/stringutils.cpp index 0602842f..d414d665 100644 --- a/src/utils/trim.h +++ b/src/utils/stringutils.cpp @@ -20,17 +20,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef UTILS_TRIM_H -#define UTILS_TRIM_H +#include "stringutils.h" -#include <string> +#include <algorithm> -/** - * Trims spaces off the end and the beginning of the given string. - * - * @param str the string to trim spaces off - */ -inline void trim(std::string &str) +std::string &trim(std::string &str) { std::string::size_type pos = str.find_last_not_of(' '); if (pos != std::string::npos) @@ -47,6 +41,24 @@ inline void trim(std::string &str) // There is nothing else but whitespace in the string str.clear(); } + return str; +} + +std::string &toLower(std::string &str) +{ + std::transform(str.begin(), str.end(), str.begin(), tolower); + return str; } -#endif +const char *ipToString(int address) +{ + static char asciiIP[16]; + + sprintf(asciiIP, "%i.%i.%i.%i", + (unsigned char)(address), + (unsigned char)(address >> 8), + (unsigned char)(address >> 16), + (unsigned char)(address >> 24)); + + return asciiIP; +} diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h new file mode 100644 index 00000000..7d8df748 --- /dev/null +++ b/src/utils/stringutils.h @@ -0,0 +1,69 @@ +/* + * Aethyra + * Copyright (C) 2007 The Mana World Development Team + * + * This file is part of Aethyra based on original code + * from The Mana World. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef UTILS_STRINGUTILS_H +#define UTILS_STRINGUTILS_H + +#include <string> +#include <sstream> + +/** + * Trims spaces off the end and the beginning of the given string. + * + * @param str the string to trim spaces off + * @return a reference to the trimmed string + */ +std::string &trim(std::string &str); + +/** + * Converts the given string to lower case. + * + * @param str the string to convert to lower case + * @return a reference to the given string converted to lower case + */ +std::string &toLower(std::string &str); + +/** + * Converts the given value to a string using std::stringstream. + * + * @param arg the value to convert to a string + * @return the string representation of arg + */ +template<typename T> std::string toString(const T &arg) +{ + std::stringstream ss; + ss << arg; + return ss.str(); +} + +/** + * Converts the given IP address to a string. + * + * The returned string is statically allocated, and shouldn't be freed. It is + * changed upon the next use of this method. + * + * @param address the address to convert to a string + * @return the string representation of the address + */ +const char *ipToString(int address); + +#endif // UTILS_STRINGUTILS_H |