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/str.h | |
| 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/str.h')
| -rw-r--r-- | common/str.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/str.h b/common/str.h index 8e07b6233d..5039130707 100644 --- a/common/str.h +++ b/common/str.h @@ -219,14 +219,14 @@ public: * except that it stores the result in (variably sized) String * instead of a fixed size buffer. */ - static Common::String format(const char *fmt, ...) GCC_PRINTF(1,2); + static String format(const char *fmt, ...) GCC_PRINTF(1,2); /** * Print formatted data into a String object. Similar to vsprintf, * except that it stores the result in (variably sized) String * instead of a fixed size buffer. */ - static Common::String vformat(const char *fmt, va_list args); + static String vformat(const char *fmt, va_list args); public: typedef char * iterator; @@ -293,7 +293,7 @@ extern char *trim(char *t); * @param sep character used to separate path components * @return The last component of the path. */ -Common::String lastPathComponent(const Common::String &path, const char sep); +String lastPathComponent(const String &path, const char sep); /** * Normalize a given path to a canonical form. In particular: @@ -307,7 +307,7 @@ Common::String lastPathComponent(const Common::String &path, const char sep); * @param sep the separator token (usually '/' on Unix-style systems, or '\\' on Windows based stuff) * @return the normalized path */ -Common::String normalizePath(const Common::String &path, const char sep); +String normalizePath(const String &path, const char sep); /** |