diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:34:29 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:39:44 +0200 |
| commit | 01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6 (patch) | |
| tree | 544b07f3aa41abe7907bcd2040cdad11ebc324bb /common/archive.cpp | |
| parent | 9cf2c83e5e5a35816ab153bf8443dac691829ea8 (diff) | |
| parent | a41d72a44a660c72fdadbc3a8ef580e5e03cb890 (diff) | |
| download | scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.gz scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.bz2 scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.zip | |
Merge branch 'master'
Diffstat (limited to 'common/archive.cpp')
| -rw-r--r-- | common/archive.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/common/archive.cpp b/common/archive.cpp index 0ef3893a8c..954de8bcaa 100644 --- a/common/archive.cpp +++ b/common/archive.cpp @@ -147,7 +147,7 @@ void SearchSet::addSubDirectoriesMatching(const FSNode &directory, String origPa for (FSList::const_iterator i = subDirs.begin(); i != subDirs.end(); ++i) { String name = i->getName(); - if (Common::matchString(name.c_str(), pattern.c_str(), ignoreCase)) { + if (matchString(name.c_str(), pattern.c_str(), ignoreCase)) { matchIter = multipleMatches.find(name); if (matchIter == multipleMatches.end()) { multipleMatches[name] = true; @@ -285,7 +285,6 @@ void SearchManager::clear() { addDirectory(".", ".", -2); } -} // namespace Common - -DECLARE_SINGLETON(Common::SearchManager); +DECLARE_SINGLETON(SearchManager); +} // namespace Common |