aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2016-03-01 19:17:35 +0100
committerJohannes Schickel2016-03-01 19:18:23 +0100
commitb8fb9e6a51606aa674c4897dddad6c0922e5137d (patch)
tree66cccd306b3946bf07c7b6a3d2a046b45e260408
parentfd5799aa194f2a81cc79075c7a42586d0d5b2693 (diff)
downloadscummvm-rg350-b8fb9e6a51606aa674c4897dddad6c0922e5137d.tar.gz
scummvm-rg350-b8fb9e6a51606aa674c4897dddad6c0922e5137d.tar.bz2
scummvm-rg350-b8fb9e6a51606aa674c4897dddad6c0922e5137d.zip
COMMON: Cleanup: Use StringArray instead of custom type.
-rw-r--r--common/macresman.cpp2
-rw-r--r--common/macresman.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/common/macresman.cpp b/common/macresman.cpp
index e28bd963df..adca1ea10b 100644
--- a/common/macresman.cpp
+++ b/common/macresman.cpp
@@ -262,7 +262,7 @@ bool MacResManager::exists(const String &fileName) {
return false;
}
-void MacResManager::listFiles(Array<String> &files, const String &pattern) {
+void MacResManager::listFiles(StringArray &files, const String &pattern) {
// Base names discovered so far.
typedef HashMap<String, bool, IgnoreCase_Hash, IgnoreCase_EqualTo> BaseNameSet;
BaseNameSet baseNames;
diff --git a/common/macresman.h b/common/macresman.h
index 5cc2542433..05b2a875f4 100644
--- a/common/macresman.h
+++ b/common/macresman.h
@@ -33,6 +33,7 @@
#include "common/array.h"
#include "common/fs.h"
#include "common/str.h"
+#include "common/str-array.h"
#ifndef COMMON_MACRESMAN_H
#define COMMON_MACRESMAN_H
@@ -89,7 +90,7 @@ public:
* @param pattern Pattern to match against. Taking String::matchPattern's
* format.
*/
- static void listFiles(Array<String> &files, const String &pattern);
+ static void listFiles(StringArray &files, const String &pattern);
/**
* Close the Mac data/resource fork pair.