3 files changed, 1 insertions, 64 deletions
diff --git a/engines/wintermute/utils/path_util.cpp b/engines/wintermute/utils/path_util.cpp
index 065e0aada9..dcf35be776 100644
--- a/engines/wintermute/utils/path_util.cpp
+++ b/engines/wintermute/utils/path_util.cpp
@@ -28,7 +28,6 @@
 
 #include "common/file.h"
 #include "engines/wintermute/utils/path_util.h"
-#include "engines/wintermute/utils/string_util.h"
 
 namespace WinterMute {
 
@@ -57,7 +56,7 @@ AnsiString PathUtil::combine(const AnsiString &path1, const AnsiString &path2) {
 	AnsiString newPath1 = unifySeparators(path1);
 	AnsiString newPath2 = unifySeparators(path2);
 
-	if (!StringUtil::endsWith(newPath1, "/", true) && !StringUtil::startsWith(newPath2, "/", true)) {
+	if (!newPath1.hasSuffix("/") && !newPath2.hasPrefix("/")) {
 		newPath1 += "/";
 	}
 
diff --git a/engines/wintermute/utils/string_util.cpp b/engines/wintermute/utils/string_util.cpp
index 3e71a939d2..b51d094784 100644
--- a/engines/wintermute/utils/string_util.cpp
+++ b/engines/wintermute/utils/string_util.cpp
@@ -204,62 +204,6 @@ AnsiString StringUtil::wideToAnsi(const WideString &wstr) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool StringUtil::startsWith(const AnsiString &str, const AnsiString &pattern, bool ignoreCase) {
-	/*  size_t strLength = str.size();
-	    size_t patternLength = pattern.size();
-
-	    if (strLength < patternLength || patternLength == 0)
-	        return false;
-
-	    AnsiString startPart = str.substr(0, patternLength);
-
-	    if (ignoreCase) return CompareNoCase(startPart, pattern);
-	    else return (startPart == pattern);*/
-	if (!ignoreCase) {
-		return str.hasPrefix(pattern);
-	} else {
-		size_t strLength = str.size();
-		size_t patternLength = pattern.size();
-
-		if (strLength < patternLength || patternLength == 0) {
-			return false;
-		}
-
-		AnsiString startPart(str.c_str(), patternLength);
-		uint32 likeness = startPart.compareToIgnoreCase(pattern.c_str());
-		return (likeness == 0);
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool StringUtil::endsWith(const AnsiString &str, const AnsiString &pattern, bool ignoreCase) {
-	/*  size_t strLength = str.size(); // TODO: Remove
-	    size_t patternLength = pattern.size();
-
-	    if (strLength < patternLength || patternLength == 0)
-	        return false;
-
-	    AnsiString endPart = str.substr(strLength - patternLength, patternLength);
-
-	    if (ignoreCase) return CompareNoCase(endPart, pattern);
-	    else return (endPart == pattern);*/
-	if (!ignoreCase) {
-		return str.hasSuffix(pattern);
-	} else {
-		size_t strLength = str.size();
-		size_t patternLength = pattern.size();
-
-		if (strLength < patternLength || patternLength == 0) {
-			return false;
-		}
-
-		Common::String endPart(str.c_str() + (strLength - patternLength), patternLength);
-		uint32 likeness = str.compareToIgnoreCase(pattern.c_str());
-		return (likeness != 0);
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////
 bool StringUtil::isUtf8BOM(const byte *buffer, uint32 bufferSize) {
 	if (bufferSize > 3 && buffer[0] == 0xEF && buffer[1] == 0xBB && buffer[2] == 0xBF) {
 		return true;
@@ -270,9 +214,6 @@ bool StringUtil::isUtf8BOM(const byte *buffer, uint32 bufferSize) {
 
 //////////////////////////////////////////////////////////////////////////
 int StringUtil::indexOf(const WideString &str, const WideString &toFind, size_t startFrom) {
-	/*size_t pos = str.find(toFind, startFrom);
-	if (pos == str.npos) return -1;
-	else return pos;*/
 	const char *index = strstr(str.c_str(), toFind.c_str());
 	if (index == NULL) {
 		return -1;
diff --git a/engines/wintermute/utils/string_util.h b/engines/wintermute/utils/string_util.h
index 6a10b63ac4..582007917d 100644
--- a/engines/wintermute/utils/string_util.h
+++ b/engines/wintermute/utils/string_util.h
@@ -42,9 +42,6 @@ public:
 	static WideString ansiToWide(const AnsiString &str);
 	static AnsiString wideToAnsi(const WideString &str);
 
-	static bool startsWith(const AnsiString &str, const AnsiString &pattern, bool ignoreCase = false);
-	static bool endsWith(const AnsiString &str, const AnsiString &pattern, bool ignoreCase = false);
-
 	static bool isUtf8BOM(const byte *buffer, uint32 bufferSize);
 	static int indexOf(const WideString &str, const WideString &toFind, size_t startFrom);