SWORD25: Get rid of kernel/string.h

svn-id: r53758

3 files changed, 2 insertions, 119 deletions

diff --git a/engines/sword25/kernel/resmanager.cpp b/engines/sword25/kernel/resmanager.cpp
index c2ecb04a6f..9b1933568f 100644
--- a/engines/sword25/kernel/resmanager.cpp
+++ b/engines/sword25/kernel/resmanager.cpp
@@ -36,7 +36,6 @@
 
 #include "sword25/kernel/resource.h"
 #include "sword25/kernel/resservice.h"
-#include "sword25/kernel/string.h"
 #include "sword25/package/packagemanager.h"
 
 namespace Sword25 {
@@ -299,7 +298,7 @@ Common::List<Resource *>::iterator ResourceManager::deleteResource(Resource *pRe
  */
 Resource *ResourceManager::getResource(const Common::String &uniquefileName) const {
 	// Determine whether the resource is already loaded
-	const Common::List<Resource *>& hashBucket = _resourceHashTable[BS_String::getHash(uniquefileName) % HASH_TABLE_BUCKETS];
+	const Common::List<Resource *>& hashBucket = _resourceHashTable[Common::hashit(uniquefileName) % HASH_TABLE_BUCKETS];
 	{
 		Common::List<Resource *>::const_iterator iter = hashBucket.begin();
 		for (; iter != hashBucket.end(); ++iter) {
diff --git a/engines/sword25/kernel/resource.cpp b/engines/sword25/kernel/resource.cpp
index aa1f3bc1f6..f5d9829805 100644
--- a/engines/sword25/kernel/resource.cpp
+++ b/engines/sword25/kernel/resource.cpp
@@ -33,7 +33,6 @@
  */
 
 #include "sword25/kernel/resource.h"
-#include "sword25/kernel/string.h"
 #include "sword25/kernel/kernel.h"
 #include "sword25/package/packagemanager.h"
 
@@ -48,7 +47,7 @@ Resource::Resource(const Common::String &fileName, RESOURCE_TYPES type) :
 	BS_ASSERT(pPM);
 
 	_fileName = pPM->getAbsolutePath(fileName);
-	_fileNameHash = BS_String::getHash(fileName);
+	_fileNameHash = Common::hashit(fileName);
 }
 
 void Resource::release() {
diff --git a/engines/sword25/kernel/string.h b/engines/sword25/kernel/string.h
deleted file mode 100644
index 948c5f31e4..0000000000
--- a/engines/sword25/kernel/string.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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 (at your option) 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-/*
- * This code is based on Broken Sword 2.5 engine
- *
- * Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdoerfer
- *
- * Licensed under GNU GPL v2
- *
- */
-
-#ifndef SWORD25_STRING
-#define SWORD25_STRING
-
-#include "common/str.h"
-
-namespace BS_String {
-
-inline uint getHash(const Common::String &str) {
-	uint result = 0;
-
-	for (uint i = 0; i < str.size(); i++)
-		result = ((result << 5) - result) + str[i];
-
-	return result;
-}
-
-inline bool toInt(const Common::String &str, int &result) {
-	Common::String::const_iterator iter = str.begin();
-
-	// Skip whitespaces
-	while (*iter && (*iter == ' ' || *iter == '\t')) {
-		++iter;
-	}
-	if (iter == str.end())
-		return false;
-
-	// Read sign, if available
-	bool isNegative = false;
-	if (*iter == '-') {
-		isNegative = true;
-		++iter;
-	} else if (*iter == '+')
-		++iter;
-
-	// Skip whitespaces
-	while (*iter && (*iter == ' ' || *iter == '\t')) {
-		++iter;
-	}
-	if (iter == str.end())
-		return false;
-
-	// Convert string to integer
-	result = 0;
-	while (iter != str.end()) {
-		if (*iter < '0' || *iter > '9') {
-			while (*iter && (*iter == ' ' || *iter == '\t')) {
-				++iter;
-			}
-			if (iter != str.end())
-				return false;
-			break;
-		}
-		result = (result * 10) + (*iter - '0');
-		++iter;
-	}
-
-	if (isNegative)
-		result = -result;
-
-	return true;
-}
-
-inline bool toBool(const Common::String &str, bool &result) {
-	if (str == "true" || str == "TRUE") {
-		result = true;
-		return true;
-	} else if (str == "false" || str == "FALSE") {
-		result = false;
-		return true;
-	}
-
-	return false;
-}
-
-inline void toLower(Common::String &str) {
-	str.toLowercase();
-}
-
-} // End of namespace BS_String
-
-#endif