From 9bf7aa308e4a5cc46e27a8ca9421cc42815c2833 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 5 Sep 2008 20:07:34 +0000 Subject: Moved matchString from util.* to str.*; added new String::matchString method; fixed matchString doxygen comment (it confused pattern & string); added unit tests for matchString svn-id: r34364 --- common/util.cpp | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'common/util.cpp') diff --git a/common/util.cpp b/common/util.cpp index f23a0ee6d6..f68d253ec3 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -63,39 +63,6 @@ extern bool isSmartphone(void); namespace Common { -bool matchString(const char *str, const char *pat) { - const char *p = 0; - const char *q = 0; - - for (;;) { - switch (*pat) { - case '*': - p = ++pat; - q = str; - break; - - default: - if (*pat != *str) { - if (p) { - pat = p; - str = ++q; - if (!*str) - return !*pat; - break; - } - else - return false; - } - // fallthrough - case '?': - if (!*str) - return !*pat; - pat++; - str++; - } - } -} - StringTokenizer::StringTokenizer(const String &str, const String &delimiters) : _str(str), _delimiters(delimiters) { reset(); } -- cgit v1.2.3