thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Make more members of Archive constant.

Browse source
This commit is contained in:
Andrea Corna 2011-12-13 17:20:25 +01:00 • committed by Johannes Schickel
parent 77959acd51
commit a6ec4f70da
16 changed files with 96 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

22
common/archive.cpp
View file

@ -27,7 +27,7 @@
namespace Common {
GenericArchiveMember::GenericArchiveMember(String name, Archive *parent)
GenericArchiveMember::GenericArchiveMember(const String &name, const Archive *parent)
: _parent(parent), _name(name) {
}
@ -40,14 +40,14 @@ SeekableReadStream *GenericArchiveMember::createReadStream() const {
}
int Archive::listMatchingMembers(ArchiveMemberList &list, const String &pattern) {
int Archive::listMatchingMembers(ArchiveMemberList &list, const String &pattern) const {
// Get all "names" (TODO: "files" ?)
ArchiveMemberList allNames;
listMembers(allNames);
int matches = 0;
ArchiveMemberList::iterator it = allNames.begin();
ArchiveMemberList::const_iterator it = allNames.begin();
for ( ; it != allNames.end(); ++it) {
// TODO: We match case-insenstivie for now, our API does not define whether that's ok or not though...
// For our use case case-insensitive is probably what we want to have though.
@ -206,11 +206,11 @@ void SearchSet::setPriority(const String &name, int priority) {
insert(node);
}
bool SearchSet::hasFile(const String &name) {
bool SearchSet::hasFile(const String &name) const {
if (name.empty())
return false;
ArchiveNodeList::iterator it = _list.begin();
ArchiveNodeList::const_iterator it = _list.begin();
for ( ; it != _list.end(); ++it) {
if (it->_arc->hasFile(name))
return true;
@ -219,31 +219,31 @@ bool SearchSet::hasFile(const String &name) {
return false;
}
int SearchSet::listMatchingMembers(ArchiveMemberList &list, const String &pattern) {
int SearchSet::listMatchingMembers(ArchiveMemberList &list, const String &pattern) const {
int matches = 0;
ArchiveNodeList::iterator it = _list.begin();
ArchiveNodeList::const_iterator it = _list.begin();
for ( ; it != _list.end(); ++it)
matches += it->_arc->listMatchingMembers(list, pattern);
return matches;
}
int SearchSet::listMembers(ArchiveMemberList &list) {
int SearchSet::listMembers(ArchiveMemberList &list) const {
int matches = 0;
ArchiveNodeList::iterator it = _list.begin();
ArchiveNodeList::const_iterator it = _list.begin();
for ( ; it != _list.end(); ++it)
matches += it->_arc->listMembers(list);
return matches;
}
ArchiveMemberPtr SearchSet::getMember(const String &name) {
const ArchiveMemberPtr SearchSet::getMember(const String &name) const {
if (name.empty())
return ArchiveMemberPtr();
ArchiveNodeList::iterator it = _list.begin();
ArchiveNodeList::const_iterator it = _list.begin();
for ( ; it != _list.end(); ++it) {
if (it->_arc->hasFile(name))
return it->_arc->getMember(name);