aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/utils
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/utils')
-rw-r--r--engines/wintermute/utils/PathUtil.cpp2
-rw-r--r--engines/wintermute/utils/StringUtil.cpp40
-rw-r--r--engines/wintermute/utils/StringUtil.h4
3 files changed, 2 insertions, 44 deletions
diff --git a/engines/wintermute/utils/PathUtil.cpp b/engines/wintermute/utils/PathUtil.cpp
index 5c12a71c33..b148c80300 100644
--- a/engines/wintermute/utils/PathUtil.cpp
+++ b/engines/wintermute/utils/PathUtil.cpp
@@ -47,7 +47,7 @@ AnsiString PathUtil::unifySeparators(const AnsiString &path) {
//////////////////////////////////////////////////////////////////////////
AnsiString PathUtil::normalizeFileName(const AnsiString &path) {
AnsiString newPath = unifySeparators(path);
- StringUtil::toLowerCase(newPath);
+ newPath.toLowercase();
return newPath;
}
diff --git a/engines/wintermute/utils/StringUtil.cpp b/engines/wintermute/utils/StringUtil.cpp
index 53ad4c8add..c5ad025939 100644
--- a/engines/wintermute/utils/StringUtil.cpp
+++ b/engines/wintermute/utils/StringUtil.cpp
@@ -34,34 +34,8 @@
namespace WinterMute {
//////////////////////////////////////////////////////////////////////////
-void StringUtil::toLowerCase(AnsiString &str) {
- str.toLowercase();
-}
-
-//////////////////////////////////////////////////////////////////////////
-/*void StringUtil::toLowerCase(WideString &str) {
- std::transform(str.begin(), str.end(), str.begin(), ::towlower);
-}*/
-
-//////////////////////////////////////////////////////////////////////////
-void StringUtil::toUpperCase(AnsiString &str) {
- str.toUppercase();
-}
-
-//////////////////////////////////////////////////////////////////////////
-/*void StringUtil::toUpperCase(WideString &str) {
- std::transform(str.begin(), str.end(), str.begin(), ::towupper);
-}*/
-
-//////////////////////////////////////////////////////////////////////////
bool StringUtil::compareNoCase(const AnsiString &str1, const AnsiString &str2) {
- AnsiString str1lc = str1;
- AnsiString str2lc = str2;
-
- toLowerCase(str1lc);
- toLowerCase(str2lc);
-
- return (str1lc == str2lc);
+ return (str1.compareToIgnoreCase(str2) == 0);
}
//////////////////////////////////////////////////////////////////////////
@@ -369,33 +343,21 @@ int StringUtil::lastIndexOf(const WideString &str, const WideString &toFind, siz
//////////////////////////////////////////////////////////////////////////
AnsiString StringUtil::toString(size_t val) {
- /* std::ostringstream str;
- str << val;
- return str.str();*/
return Common::String::format("%u", (uint32)val);
}
//////////////////////////////////////////////////////////////////////////
AnsiString StringUtil::toString(int val) {
- /* std::ostringstream str;
- str << val;
- return str.str();*/
return Common::String::format("%d", val);
}
//////////////////////////////////////////////////////////////////////////
AnsiString StringUtil::toString(float val) {
- /* std::ostringstream str;
- str << val;
- return str.str();*/
return Common::String::format("%f", val);
}
//////////////////////////////////////////////////////////////////////////
AnsiString StringUtil::toString(double val) {
- /* std::ostringstream str;
- str << val;
- return str.str();*/
return Common::String::format("%f", val);
}
diff --git a/engines/wintermute/utils/StringUtil.h b/engines/wintermute/utils/StringUtil.h
index e06551b09a..794007276b 100644
--- a/engines/wintermute/utils/StringUtil.h
+++ b/engines/wintermute/utils/StringUtil.h
@@ -35,10 +35,6 @@ namespace WinterMute {
class StringUtil {
public:
- static void toLowerCase(AnsiString &str);
- //static void toLowerCase(WideString &str);
- static void toUpperCase(AnsiString &str);
- //static void toUpperCase(WideString &str);
static bool compareNoCase(const AnsiString &str1, const AnsiString &str2);
//static bool compareNoCase(const WideString &str1, const WideString &str2);
static WideString utf8ToWide(const Utf8String &Utf8Str);