WINTERMUTE: Remove unused functions from StringUtil::

5 files changed, 5 insertions, 7 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"