aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2008-09-05 20:08:29 +0000
committerMax Horn2008-09-05 20:08:29 +0000
commit2c20e138a220c706fd5d2e6c23616239566da18f (patch)
treef15e8f7ab4f1ff7f8d5c95a08bcb76047ee9f398
parent9bf7aa308e4a5cc46e27a8ca9421cc42815c2833 (diff)
downloadscummvm-rg350-2c20e138a220c706fd5d2e6c23616239566da18f.tar.gz
scummvm-rg350-2c20e138a220c706fd5d2e6c23616239566da18f.tar.bz2
scummvm-rg350-2c20e138a220c706fd5d2e6c23616239566da18f.zip
Make use of String::matchString
svn-id: r34365
-rw-r--r--common/archive.cpp2
-rw-r--r--common/fs.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/archive.cpp b/common/archive.cpp
index 8ec80938bc..cac6680e76 100644
--- a/common/archive.cpp
+++ b/common/archive.cpp
@@ -43,7 +43,7 @@ int Archive::matchPattern(StringList &list, const String &pattern) {
StringList::iterator it = allNames.begin();
for ( ; it != allNames.end(); it++) {
- if (matchString(it->c_str(), lowercasePattern.c_str())) {
+ if (it->matchString(lowercasePattern)) {
list.push_back(*it);
matches++;
}
diff --git a/common/fs.cpp b/common/fs.cpp
index 956bb8b184..246ec1cfaa 100644
--- a/common/fs.cpp
+++ b/common/fs.cpp
@@ -154,7 +154,7 @@ bool FilesystemNode::lookupFile(FSList &results, const Common::String &p, bool h
} else {
Common::String filename = entry->getName();
filename.toUppercase();
- if (Common::matchString(filename.c_str(), pattern.c_str())) {
+ if (filename.matchString(pattern)) {
results.push_back(*entry);
if (!exhaustive)