diff options
author | Andrea Corna | 2011-12-13 17:20:25 +0100 |
---|---|---|
committer | Johannes Schickel | 2011-12-13 17:55:57 +0100 |
commit | a6ec4f70da120a1ce406ed4dd9e149e081542f59 (patch) | |
tree | 36d09611f523974f570318e6e579b89b30e886a9 /engines/lastexpress | |
parent | 77959acd51982d9fedec94ac07241b1702681c6a (diff) | |
download | scummvm-rg350-a6ec4f70da120a1ce406ed4dd9e149e081542f59.tar.gz scummvm-rg350-a6ec4f70da120a1ce406ed4dd9e149e081542f59.tar.bz2 scummvm-rg350-a6ec4f70da120a1ce406ed4dd9e149e081542f59.zip |
COMMON: Make more members of Archive constant.
Diffstat (limited to 'engines/lastexpress')
-rw-r--r-- | engines/lastexpress/data/archive.cpp | 6 | ||||
-rw-r--r-- | engines/lastexpress/data/archive.h | 6 | ||||
-rw-r--r-- | engines/lastexpress/resource.cpp | 10 | ||||
-rw-r--r-- | engines/lastexpress/resource.h | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/engines/lastexpress/data/archive.cpp b/engines/lastexpress/data/archive.cpp index 3aa5584ca4..908d58254a 100644 --- a/engines/lastexpress/data/archive.cpp +++ b/engines/lastexpress/data/archive.cpp @@ -74,11 +74,11 @@ HPFArchive::HPFArchive(const Common::String &path) { delete archive; } -bool HPFArchive::hasFile(const Common::String &name) { +bool HPFArchive::hasFile(const Common::String &name) const { return (_files.find(name) != _files.end()); } -int HPFArchive::listMembers(Common::ArchiveMemberList &list) { +int HPFArchive::listMembers(Common::ArchiveMemberList &list) const { int numMembers = 0; for (FileMap::const_iterator i = _files.begin(); i != _files.end(); ++i) { @@ -89,7 +89,7 @@ int HPFArchive::listMembers(Common::ArchiveMemberList &list) { return numMembers; } -Common::ArchiveMemberPtr HPFArchive::getMember(const Common::String &name) { +const Common::ArchiveMemberPtr HPFArchive::getMember(const Common::String &name) const { if (!hasFile(name)) return Common::ArchiveMemberPtr(); diff --git a/engines/lastexpress/data/archive.h b/engines/lastexpress/data/archive.h index 8e0c46f183..011c830668 100644 --- a/engines/lastexpress/data/archive.h +++ b/engines/lastexpress/data/archive.h @@ -46,9 +46,9 @@ class HPFArchive : public Common::Archive { public: HPFArchive(const Common::String &path); - bool hasFile(const Common::String &name); - int listMembers(Common::ArchiveMemberList &list); - Common::ArchiveMemberPtr getMember(const Common::String &name); + bool hasFile(const Common::String &name) const; + int listMembers(Common::ArchiveMemberList &list) const; + const Common::ArchiveMemberPtr getMember(const Common::String &name) const; Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const; int count() { return _files.size(); } diff --git a/engines/lastexpress/resource.cpp b/engines/lastexpress/resource.cpp index 3910aaa010..ee4885e34e 100644 --- a/engines/lastexpress/resource.cpp +++ b/engines/lastexpress/resource.cpp @@ -148,8 +148,8 @@ Common::SeekableReadStream *ResourceManager::getFileStream(const Common::String ////////////////////////////////////////////////////////////////////////// // Archive functions ////////////////////////////////////////////////////////////////////////// -bool ResourceManager::hasFile(const Common::String &name) { - for (Common::Array<HPFArchive *>::iterator it = _archives.begin(); it != _archives.end(); ++it) { +bool ResourceManager::hasFile(const Common::String &name) const { + for (Common::Array<HPFArchive *>::const_iterator it = _archives.begin(); it != _archives.end(); ++it) { if ((*it)->hasFile(name)) return true; } @@ -157,10 +157,10 @@ bool ResourceManager::hasFile(const Common::String &name) { return false; } -int ResourceManager::listMembers(Common::ArchiveMemberList &list) { +int ResourceManager::listMembers(Common::ArchiveMemberList &list) const { int count = 0; - for (Common::Array<HPFArchive *>::iterator it = _archives.begin(); it != _archives.end(); ++it) { + for (Common::Array<HPFArchive *>::const_iterator it = _archives.begin(); it != _archives.end(); ++it) { Common::ArchiveMemberList members; count += (*it)->listMembers(members); @@ -171,7 +171,7 @@ int ResourceManager::listMembers(Common::ArchiveMemberList &list) { return count; } -Common::ArchiveMemberPtr ResourceManager::getMember(const Common::String &name) { +const Common::ArchiveMemberPtr ResourceManager::getMember(const Common::String &name) const { if (!hasFile(name)) return Common::ArchiveMemberPtr(); diff --git a/engines/lastexpress/resource.h b/engines/lastexpress/resource.h index 9e05a90399..f2f5d63bce 100644 --- a/engines/lastexpress/resource.h +++ b/engines/lastexpress/resource.h @@ -45,9 +45,9 @@ public: Common::SeekableReadStream *getFileStream(const Common::String &name); // Archive functions - bool hasFile(const Common::String &name); - int listMembers(Common::ArchiveMemberList &list); - Common::ArchiveMemberPtr getMember(const Common::String &name); + bool hasFile(const Common::String &name) const; + int listMembers(Common::ArchiveMemberList &list) const; + const Common::ArchiveMemberPtr getMember(const Common::String &name) const; Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const; // Resource loading |