mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-24 01:54:22 +00:00
Code Activity

Added a couple of useful constructors to some stream classes. Replaced some old static functions with anonymous namespaces.

Browse source
This commit is contained in:
Julian Storer 2010-10-26 16:46:19 +01:00
parent 1577be257c
commit 377b9ff2c4
65 changed files with 1844 additions and 1632 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/text/juce_String.cpp
View file

@ -1029,46 +1029,49 @@ bool String::containsWholeWordIgnoreCase (const String& wordToLookFor) const thr
}
//==============================================================================
static int indexOfMatch (const juce_wchar* const wildcard,
const juce_wchar* const test,
const bool ignoreCase) throw()
namespace WildCardHelpers
{
int start = 0;
while (test [start] != 0)
int indexOfMatch (const juce_wchar* const wildcard,
const juce_wchar* const test,
const bool ignoreCase) throw()
{
int i = 0;
int start = 0;
for (;;)
while (test [start] != 0)
{
const juce_wchar wc = wildcard [i];
const juce_wchar c = test [i + start];
int i = 0;
if (wc == c
|| (ignoreCase && CharacterFunctions::toLowerCase (wc) == CharacterFunctions::toLowerCase (c))
|| (wc == '?' && c != 0))
for (;;)
{
if (wc == 0)
return start;
const juce_wchar wc = wildcard [i];
const juce_wchar c = test [i + start];
++i;
}
else
{
if (wc == '*' && (wildcard [i + 1] == 0
|| indexOfMatch (wildcard + i + 1, test + start + i, ignoreCase) >= 0))
if (wc == c
|| (ignoreCase && CharacterFunctions::toLowerCase (wc) == CharacterFunctions::toLowerCase (c))
|| (wc == '?' && c != 0))
{
return start;
}
if (wc == 0)
return start;
break;
++i;
}
else
{
if (wc == '*' && (wildcard [i + 1] == 0
|| indexOfMatch (wildcard + i + 1, test + start + i, ignoreCase) >= 0))
{
return start;
}
break;
}
}
++start;
}
++start;
return -1;
}
return -1;
}
bool String::matchesWildcard (const String& wildcard, const bool ignoreCase) const throw()
@ -1092,7 +1095,7 @@ bool String::matchesWildcard (const String& wildcard, const bool ignoreCase) con
else
{
return wc == '*' && (wildcard [i + 1] == 0
|| indexOfMatch (wildcard.text + i + 1, text + i, ignoreCase) >= 0);
|| WildCardHelpers::indexOfMatch (wildcard.text + i + 1, text + i, ignoreCase) >= 0);
}
}
}