diff options
author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /common/config-file.cpp | |
parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'common/config-file.cpp')
-rw-r--r-- | common/config-file.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/config-file.cpp b/common/config-file.cpp index ea3feff8ae..1ebd9b5701 100644 --- a/common/config-file.cpp +++ b/common/config-file.cpp @@ -36,7 +36,7 @@ namespace Common { * underscores. In particular, white space and "#", "=", "[", "]" * are not valid! */ -bool ConfigFile::isValidName(const Common::String &name) { +bool ConfigFile::isValidName(const String &name) { const char *p = name.c_str(); while (*p && (isalnum(static_cast<unsigned char>(*p)) || *p == '-' || *p == '_' || *p == '.')) p++; |