diff options
| -rw-r--r-- | src/shopitem.cpp | 2 | ||||
| -rw-r--r-- | src/utils/tostring.h | 49 |
2 files changed, 1 insertions, 50 deletions
diff --git a/src/shopitem.cpp b/src/shopitem.cpp index 70a68719..8fbb7400 100644 --- a/src/shopitem.cpp +++ b/src/shopitem.cpp @@ -22,7 +22,7 @@ #include "shopitem.h" -#include "utils/tostring.h" +#include "utils/stringutils.h" ShopItem::ShopItem(int id, int quantity, int price): Item(id, quantity), diff --git a/src/utils/tostring.h b/src/utils/tostring.h deleted file mode 100644 index 131d559d..00000000 --- a/src/utils/tostring.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Aethyra - * Copyright (C) 2004 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_TOSTRING_H -#define UTILS_TOSTRING_H - -#include <sstream> - -template<typename T> -std::string toString(const T &arg) -{ - std::stringstream ss; - ss << arg; - return ss.str(); -} - -inline 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; -} - -#endif |