WINTERMUTE: Remove unused functions from StringUtil::

8 files changed, 6 insertions, 71 deletions

diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index ddc5e15d92..b6cd59328d 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -34,7 +34,6 @@
 #include "engines/wintermute/base/base_save_thumb_helper.h"

 #include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/math/vector2.h"

-#include "engines/wintermute/utils/string_util.h"

 #include "engines/wintermute/base/gfx/base_image.h"

 #include "engines/wintermute/base/sound/base_sound.h"

 #include "engines/wintermute/wintermute.h"

diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp
index bc42f81dd4..6c66b808b7 100644
--- a/engines/wintermute/base/base_sprite.cpp
+++ b/engines/wintermute/base/base_sprite.cpp
@@ -27,7 +27,6 @@
  */

 

 #include "engines/wintermute/base/base_sprite.h"

-#include "engines/wintermute/utils/string_util.h"

 #include "engines/wintermute/utils/path_util.h"

 #include "engines/wintermute/base/base_parser.h"

 #include "engines/wintermute/base/base_dynamic_buffer.h"

@@ -140,8 +139,11 @@ bool BaseSprite::loadFile(const Common::String &filename, int lifeTime, TSpriteC
 

 	bool ret;

 

+	AnsiString filePrefix = filename;

 	AnsiString ext = PathUtil::getExtension(filename);

-	if (StringUtil::startsWith(filename, "savegame:", true) || StringUtil::compareNoCase(ext, "bmp") || StringUtil::compareNoCase(ext, "tga") || StringUtil::compareNoCase(ext, "png") || StringUtil::compareNoCase(ext, "jpg")) {

+	ext.toLowercase();

+	filePrefix.toLowercase();

+	if (filePrefix.hasPrefix("savegame:") || (ext == "bmp") || (ext == "tga") || (ext == "png") || (ext == "jpg")) {

 		BaseFrame *frame = new BaseFrame(_gameRef);

 		BaseSubFrame *subframe = new BaseSubFrame(_gameRef);

 		subframe->setSurface(filename, true, 0, 0, 0, lifeTime, true);

diff --git a/engines/wintermute/base/base_string_table.cpp b/engines/wintermute/base/base_string_table.cpp
index 8fa69e5288..2e8774020d 100644
--- a/engines/wintermute/base/base_string_table.cpp
+++ b/engines/wintermute/base/base_string_table.cpp
@@ -30,7 +30,6 @@
 #include "engines/wintermute/base/base_file_manager.h"

 #include "engines/wintermute/base/base_game.h"

 #include "engines/wintermute/base/base_string_table.h"

-#include "engines/wintermute/utils/string_util.h"

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/base/gfx/base_image.cpp b/engines/wintermute/base/gfx/base_image.cpp
index 2167503dc8..9203b62734 100644
--- a/engines/wintermute/base/gfx/base_image.cpp
+++ b/engines/wintermute/base/gfx/base_image.cpp
@@ -29,7 +29,6 @@
 #include "engines/wintermute/base/gfx/base_image.h"

 #include "engines/wintermute/base/base_file_manager.h"

 #include "engines/wintermute/graphics/transparent_surface.h"

-#include "engines/wintermute/utils/string_util.h"

 #include "graphics/decoders/png.h"

 #include "graphics/decoders/jpeg.h"

 #include "graphics/decoders/bmp.h"

@@ -63,7 +62,7 @@ BaseImage::~BaseImage() {
 bool BaseImage::loadFile(const Common::String &filename) {

 	_filename = filename;

 	_filename.toLowercase();

-	if (StringUtil::startsWith(filename, "savegame:", true)) {

+	if (filename.hasPrefix("savegame:")) {

 		_decoder = new Graphics::BitmapDecoder();

 	} else if (_filename.hasSuffix(".png")) {

 		_decoder = new Graphics::PNGDecoder();

diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp
index e5d965a4b1..a1f246c4bc 100644
--- a/engines/wintermute/base/scriptables/script_engine.cpp
+++ b/engines/wintermute/base/scriptables/script_engine.cpp
@@ -27,7 +27,6 @@
  */

 

 #include "engines/wintermute/base/scriptables/script_engine.h"

-#include "engines/wintermute/utils/string_util.h"

 #include "engines/wintermute/base/scriptables/script_value.h"

 #include "engines/wintermute/base/scriptables/script.h"

 #include "engines/wintermute/base/scriptables/script_stack.h"

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);