diff options
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/base64.cpp | 2 | ||||
| -rw-r--r-- | src/utils/base64.h | 6 | ||||
| -rw-r--r-- | src/utils/dtor.h | 12 | ||||
| -rw-r--r-- | src/utils/gettext.h | 12 | ||||
| -rw-r--r-- | src/utils/minmax.h | 69 | ||||
| -rw-r--r-- | src/utils/mutex.h | 14 | ||||
| -rw-r--r-- | src/utils/sha256.h | 14 | ||||
| -rw-r--r-- | src/utils/stringutils.cpp (renamed from src/utils/trim.h) | 40 | ||||
| -rw-r--r-- | src/utils/stringutils.h | 68 | ||||
| -rw-r--r-- | src/utils/strprintf.cpp | 8 | ||||
| -rw-r--r-- | src/utils/strprintf.h | 12 | ||||
| -rw-r--r-- | src/utils/tostring.h | 35 | ||||
| -rw-r--r-- | src/utils/xml.cpp | 10 | ||||
| -rw-r--r-- | src/utils/xml.h | 12 |
14 files changed, 146 insertions, 168 deletions
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp index 8cea60f9..9d8ba836 100644 --- a/src/utils/base64.cpp +++ b/src/utils/base64.cpp @@ -27,8 +27,8 @@ +----------------------------------------------------------------------+ */ -#include <string.h> #include <stdlib.h> +#include <string.h> #include "base64.h" diff --git a/src/utils/base64.h b/src/utils/base64.h index c802207b..92c23016 100644 --- a/src/utils/base64.h +++ b/src/utils/base64.h @@ -27,10 +27,10 @@ +----------------------------------------------------------------------+ */ -#ifndef _TMW_BASE64_H -#define _TMW_BASE64_H +#ifndef BASE64_H +#define BASE64_H extern unsigned char *php3_base64_encode(const unsigned char *, int, int *); extern unsigned char *php3_base64_decode(const unsigned char *, int, int *); -#endif /* _TMW_BASE64_H */ +#endif /* BASE64_H */ diff --git a/src/utils/dtor.h b/src/utils/dtor.h index 9aa92c84..8dbc441f 100644 --- a/src/utils/dtor.h +++ b/src/utils/dtor.h @@ -1,26 +1,26 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * 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. * - * The Mana World is distributed in the hope that it will be useful, + * 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 The Mana World; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_UTILS_DTOR_H -#define _TMW_UTILS_DTOR_H +#ifndef UTILS_DTOR_H +#define UTILS_DTOR_H #include <algorithm> #include <functional> diff --git a/src/utils/gettext.h b/src/utils/gettext.h index 0cd9114b..5281d491 100644 --- a/src/utils/gettext.h +++ b/src/utils/gettext.h @@ -1,26 +1,26 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * 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. * - * The Mana World is distributed in the hope that it will be useful, + * 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 The Mana World; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_UTILS_GETTEXT_H -#define _TMW_UTILS_GETTEXT_H +#ifndef UTILS_GETTEXT_H +#define UTILS_GETTEXT_H #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/utils/minmax.h b/src/utils/minmax.h deleted file mode 100644 index 7e3d84f2..00000000 --- a/src/utils/minmax.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * The Mana World - * Copyright 2006 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World 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. - * - * The Mana World 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 The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <cstdlib> - -/** - * Returns a random numeric value that is larger than or equal min and smaller - * than max - */ - -template <typename T> struct MinMax -{ - void set(T min, T max) - { - minVal=min; maxVal=max; - } - - void set(T val) - { - set(val, val); - } - - bool operator+= (T arg) - { - minVal += arg; - maxVal += arg; - return true; - } - - bool operator-= (T arg) - { - minVal -= arg; - maxVal -= arg; - return true; - } - - bool operator*= (T arg) - { - minVal *= arg; - maxVal *= arg; - return true; - } - - T value() - { - return (T)(minVal + (maxVal - minVal) * (rand() / ((double) RAND_MAX + 1))); - } - - T minVal; - T maxVal; -}; diff --git a/src/utils/mutex.h b/src/utils/mutex.h index 62c6b4e1..5e5df8f8 100644 --- a/src/utils/mutex.h +++ b/src/utils/mutex.h @@ -1,26 +1,26 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * 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. * - * The Mana World is distributed in the hope that it will be useful, + * 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 The Mana World; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef TMW_MUTEX_H -#define TMW_MUTEX_H +#ifndef MUTEX_H +#define MUTEX_H #include <SDL_thread.h> @@ -94,4 +94,4 @@ inline MutexLocker::~MutexLocker() mMutex->unlock(); } -#endif // TMW_MUTEX_H +#endif // MUTEX_H diff --git a/src/utils/sha256.h b/src/utils/sha256.h index 66152caf..0aa5ba1f 100644 --- a/src/utils/sha256.h +++ b/src/utils/sha256.h @@ -1,26 +1,26 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * 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. * - * The Mana World is distributed in the hope that it will be useful, + * 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 The Mana World; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_UTILS_SHA256_H_ -#define _TMW_UTILS_SHA256_H_ +#ifndef UTILS_SHA256_H +#define UTILS_SHA256_H #include <string> @@ -32,4 +32,4 @@ */ std::string sha256(const std::string& string); -#endif // _TMW_UTILS_SHA256_H_ +#endif // UTILS_SHA256_H diff --git a/src/utils/trim.h b/src/utils/stringutils.cpp index a7c40ca2..04a54149 100644 --- a/src/utils/trim.h +++ b/src/utils/stringutils.cpp @@ -1,35 +1,29 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * 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. * - * The Mana World is distributed in the hope that it will be useful, + * 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 The Mana World; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_UTILS_TRIM_H_ -#define _TMW_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) @@ -46,6 +40,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..8b8b7bc2 --- /dev/null +++ b/src/utils/stringutils.h @@ -0,0 +1,68 @@ +/* + * The Mana World + * Copyright (C) 2007 The Mana World Development Team + * + * This file is part of 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 diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp index c5d7a595..bed4a7c4 100644 --- a/src/utils/strprintf.cpp +++ b/src/utils/strprintf.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * 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. * - * The Mana World is distributed in the hope that it will be useful, + * 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 The Mana World; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h index 382ab6e0..78e7a04c 100644 --- a/src/utils/strprintf.h +++ b/src/utils/strprintf.h @@ -1,26 +1,26 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * 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. * - * The Mana World is distributed in the hope that it will be useful, + * 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 The Mana World; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_UTILS_STRPRINTF_H -#define _TMW_UTILS_STRPRINTF_H +#ifndef UTILS_STRPRINTF_H +#define UTILS_STRPRINTF_H #include <string> diff --git a/src/utils/tostring.h b/src/utils/tostring.h deleted file mode 100644 index d2dd941a..00000000 --- a/src/utils/tostring.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World 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. - * - * The Mana World 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 The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TMW_UTILS_TOSTRING_H -#define _TMW_UTILS_TOSTRING_H - -#include <sstream> - -template<typename T> -std::string toString(const T &arg) -{ - std::stringstream ss; - ss << arg; - return ss.str(); -} - -#endif diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 05df9f1d..d5dd54be 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -1,26 +1,28 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * 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. * - * The Mana World is distributed in the hope that it will be useful, + * 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 The Mana World; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "xml.h" + #include "../log.h" + #include "../resources/resourcemanager.h" namespace XML diff --git a/src/utils/xml.h b/src/utils/xml.h index d0aba62e..76a63ff4 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -1,26 +1,26 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * 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. * - * The Mana World is distributed in the hope that it will be useful, + * 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 The Mana World; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_XML_H -#define _TMW_XML_H +#ifndef XML_H +#define XML_H #include <libxml/tree.h> |