aboutsummaryrefslogtreecommitdiff
path: root/common/str.h
diff options
context:
space:
mode:
authorVicent Marti2008-06-26 09:18:41 +0000
committerVicent Marti2008-06-26 09:18:41 +0000
commit3ae28530ef1807d3b99c462ab3f53acbe3153b12 (patch)
tree745a40f2aa4090b16d5331c0c4107bc000572a52 /common/str.h
parent73d5715a799f393e8b2611f2deff1b7f90f6130a (diff)
downloadscummvm-rg350-3ae28530ef1807d3b99c462ab3f53acbe3153b12.tar.gz
scummvm-rg350-3ae28530ef1807d3b99c462ab3f53acbe3153b12.tar.bz2
scummvm-rg350-3ae28530ef1807d3b99c462ab3f53acbe3153b12.zip
Actually reverted stupid changes in Common::String and Util.cpp regarding Regex and the platform function.
svn-id: r32797
Diffstat (limited to 'common/str.h')
-rw-r--r--common/str.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/common/str.h b/common/str.h
index 2ea151ba96..a92ec34fff 100644
--- a/common/str.h
+++ b/common/str.h
@@ -165,9 +165,6 @@ public:
uint hash() const;
- // Tanoku: Regular expression support for the String class
- bool regexMatch(const char *regex, bool skipSpaces = false);
-
public:
typedef char * iterator;
typedef const char * const_iterator;
@@ -192,20 +189,6 @@ protected:
void ensureCapacity(uint32 new_len, bool keep_old);
void incRefCount() const;
void decRefCount(int *oldRefCount);
-
- enum RegexMatchType {
- kRegexMatchAny,
- kRegexMatchDigit,
- kRegexMatchSpace,
- kRegexMatchAlphanum,
- kRegexMatchAlpha,
- kRegexMatchWord,
- kRegexMatchCharacter
- };
-
- bool regexMatchStar(RegexMatchType type, char regexChar, const char *regex, int regexPos, int strPos, bool skipSpaces);
- bool regexMatchCharacter(RegexMatchType type, char regexChar, char strChar);
- bool regexMatchPos(int strPos, const char *regex, int regexPos, bool skipSpaces);
};
// Append two strings to form a new (temp) string