[Scummvm-cvs-logs] SF.net SVN: scummvm:[34365] scummvm/trunk/common

[fingolfin at users.sourceforge.net]

Revision: 34365
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34365&view=rev
Author:   fingolfin
Date:     2008-09-05 20:08:29 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
Make use of String::matchString

Modified Paths:
--------------
    scummvm/trunk/common/archive.cpp
    scummvm/trunk/common/fs.cpp

Modified: scummvm/trunk/common/archive.cpp
===================================================================
--- scummvm/trunk/common/archive.cpp	2008-09-05 20:07:34 UTC (rev 34364)
+++ scummvm/trunk/common/archive.cpp	2008-09-05 20:08:29 UTC (rev 34365)
@@ -43,7 +43,7 @@
 
 	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++;
 		}

Modified: scummvm/trunk/common/fs.cpp
===================================================================
--- scummvm/trunk/common/fs.cpp	2008-09-05 20:07:34 UTC (rev 34364)
+++ scummvm/trunk/common/fs.cpp	2008-09-05 20:08:29 UTC (rev 34365)
@@ -154,7 +154,7 @@
 		} 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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.