summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-02-18 13:24:55 -0700
committerIra Rice <irarice@gmail.com>2009-02-18 13:24:55 -0700
commitb2540f391dddc296bcafe26cd8d1e98df38c5171 (patch)
tree0100bf1c8c9804a68c47d44791dc0c7dfe50e14c
parentc3f7f72f37adad5103587069ff549798fc9d652d (diff)
downloadmana-b2540f391dddc296bcafe26cd8d1e98df38c5171.tar.gz
mana-b2540f391dddc296bcafe26cd8d1e98df38c5171.tar.bz2
mana-b2540f391dddc296bcafe26cd8d1e98df38c5171.tar.xz
mana-b2540f391dddc296bcafe26cd8d1e98df38c5171.zip
Deleted a file which didn't manage to get deleted in the last commit.
Signed-off-by: Ira Rice <irarice@gmail.com>
-rw-r--r--src/shopitem.cpp2
-rw-r--r--src/utils/tostring.h49
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