Browse Source

Moved a couple of static functions.

tags/2021-05-28
jules 12 years ago
parent
commit
ef486ad07d
2 changed files with 21 additions and 18 deletions
  1. +18
    -18
      modules/juce_core/files/juce_DirectoryIterator.cpp
  2. +3
    -0
      modules/juce_core/files/juce_DirectoryIterator.h

+ 18
- 18
modules/juce_core/files/juce_DirectoryIterator.cpp View File

@@ -26,24 +26,6 @@
==============================================================================
*/
static StringArray parseWildcards (const String& pattern)
{
StringArray s;
s.addTokens (pattern, ";,", "\"'");
s.trim();
s.removeEmptyStrings();
return s;
}
static bool fileMatches (const StringArray& wildCards, const String& filename)
{
for (int i = 0; i < wildCards.size(); ++i)
if (filename.matchesWildcard (wildCards[i], ! File::areFileNamesCaseSensitive()))
return true;
return false;
}
DirectoryIterator::DirectoryIterator (const File& directory, bool recursive,
const String& pattern, const int type)
: wildCards (parseWildcards (pattern)),
@@ -65,6 +47,24 @@ DirectoryIterator::~DirectoryIterator()
{
}
StringArray DirectoryIterator::parseWildcards (const String& pattern)
{
StringArray s;
s.addTokens (pattern, ";,", "\"'");
s.trim();
s.removeEmptyStrings();
return s;
}
bool DirectoryIterator::fileMatches (const StringArray& wildCards, const String& filename)
{
for (int i = 0; i < wildCards.size(); ++i)
if (filename.matchesWildcard (wildCards[i], ! File::areFileNamesCaseSensitive()))
return true;
return false;
}
bool DirectoryIterator::next()
{
return next (nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);


+ 3
- 0
modules/juce_core/files/juce_DirectoryIterator.h View File

@@ -153,6 +153,9 @@ private:
ScopedPointer <DirectoryIterator> subIterator;
File currentFile;
static StringArray parseWildcards (const String& pattern);
static bool fileMatches (const StringArray& wildCards, const String& filename);
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DirectoryIterator)
};


Loading…
Cancel
Save