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 | |
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')
-rw-r--r-- | engines/agos/installshield_cab.cpp | 12 | ||||
-rw-r--r-- | engines/kyra/resource_intern.cpp | 18 | ||||
-rw-r--r-- | engines/kyra/resource_intern.h | 18 | ||||
-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 | ||||
-rw-r--r-- | engines/mohawk/installer_archive.cpp | 6 | ||||
-rw-r--r-- | engines/mohawk/installer_archive.h | 6 | ||||
-rw-r--r-- | engines/parallaction/disk_ns.cpp | 14 |
10 files changed, 51 insertions, 51 deletions
diff --git a/engines/agos/installshield_cab.cpp b/engines/agos/installshield_cab.cpp index ac4e40d1d1..d4e636f7b3 100644 --- a/engines/agos/installshield_cab.cpp +++ b/engines/agos/installshield_cab.cpp @@ -60,9 +60,9 @@ public: ~InstallShieldCabinet(); // Common::Archive API implementation - 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; private: @@ -161,18 +161,18 @@ InstallShieldCabinet::InstallShieldCabinet(const Common::String &filename) : _in delete[] fileTableOffsets; } -bool InstallShieldCabinet::hasFile(const Common::String &name) { +bool InstallShieldCabinet::hasFile(const Common::String &name) const { return _map.contains(name); } -int InstallShieldCabinet::listMembers(Common::ArchiveMemberList &list) { +int InstallShieldCabinet::listMembers(Common::ArchiveMemberList &list) const { for (FileMap::const_iterator it = _map.begin(); it != _map.end(); it++) list.push_back(getMember(it->_key)); return _map.size(); } -Common::ArchiveMemberPtr InstallShieldCabinet::getMember(const Common::String &name) { +const Common::ArchiveMemberPtr InstallShieldCabinet::getMember(const Common::String &name) const { return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, this)); } diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp index 482bd1a5d6..f9aae2c550 100644 --- a/engines/kyra/resource_intern.cpp +++ b/engines/kyra/resource_intern.cpp @@ -37,11 +37,11 @@ PlainArchive::PlainArchive(Common::ArchiveMemberPtr file) : _file(file), _files() { } -bool PlainArchive::hasFile(const Common::String &name) { +bool PlainArchive::hasFile(const Common::String &name) const { return (_files.find(name) != _files.end()); } -int PlainArchive::listMembers(Common::ArchiveMemberList &list) { +int PlainArchive::listMembers(Common::ArchiveMemberList &list) const { int count = 0; for (FileMap::const_iterator i = _files.begin(); i != _files.end(); ++i) { @@ -52,7 +52,7 @@ int PlainArchive::listMembers(Common::ArchiveMemberList &list) { return count; } -Common::ArchiveMemberPtr PlainArchive::getMember(const Common::String &name) { +const Common::ArchiveMemberPtr PlainArchive::getMember(const Common::String &name) const { if (!hasFile(name)) return Common::ArchiveMemberPtr(); @@ -92,11 +92,11 @@ TlkArchive::~TlkArchive() { delete[] _fileEntries; } -bool TlkArchive::hasFile(const Common::String &name) { +bool TlkArchive::hasFile(const Common::String &name) const { return (findFile(name) != 0); } -int TlkArchive::listMembers(Common::ArchiveMemberList &list) { +int TlkArchive::listMembers(Common::ArchiveMemberList &list) const { uint count = 0; for (; count < _entryCount; ++count) { @@ -107,7 +107,7 @@ int TlkArchive::listMembers(Common::ArchiveMemberList &list) { return count; } -Common::ArchiveMemberPtr TlkArchive::getMember(const Common::String &name) { +const Common::ArchiveMemberPtr TlkArchive::getMember(const Common::String &name) const { if (!hasFile(name)) return Common::ArchiveMemberPtr(); @@ -186,11 +186,11 @@ CachedArchive::~CachedArchive() { _files.clear(); } -bool CachedArchive::hasFile(const Common::String &name) { +bool CachedArchive::hasFile(const Common::String &name) const { return (_files.find(name) != _files.end()); } -int CachedArchive::listMembers(Common::ArchiveMemberList &list) { +int CachedArchive::listMembers(Common::ArchiveMemberList &list) const { int count = 0; for (FileMap::const_iterator i = _files.begin(); i != _files.end(); ++i) { @@ -201,7 +201,7 @@ int CachedArchive::listMembers(Common::ArchiveMemberList &list) { return count; } -Common::ArchiveMemberPtr CachedArchive::getMember(const Common::String &name) { +const Common::ArchiveMemberPtr CachedArchive::getMember(const Common::String &name) const { if (!hasFile(name)) return Common::ArchiveMemberPtr(); diff --git a/engines/kyra/resource_intern.h b/engines/kyra/resource_intern.h index 03c9d871e8..9d9574d823 100644 --- a/engines/kyra/resource_intern.h +++ b/engines/kyra/resource_intern.h @@ -49,9 +49,9 @@ public: Entry getFileEntry(const Common::String &name) const; // Common::Archive API implementation - 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; private: typedef Common::HashMap<Common::String, Entry, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> FileMap; @@ -65,9 +65,9 @@ public: TlkArchive(Common::ArchiveMemberPtr file, uint16 entryCount, const uint32 *fileEntries); ~TlkArchive(); - 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; private: Common::ArchiveMemberPtr _file; @@ -92,9 +92,9 @@ public: CachedArchive(const FileInputList &files); ~CachedArchive(); - 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; private: struct Entry { 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 diff --git a/engines/mohawk/installer_archive.cpp b/engines/mohawk/installer_archive.cpp index 83796158a6..636b7ae476 100644 --- a/engines/mohawk/installer_archive.cpp +++ b/engines/mohawk/installer_archive.cpp @@ -107,18 +107,18 @@ void InstallerArchive::close() { _map.clear(); } -bool InstallerArchive::hasFile(const Common::String &name) { +bool InstallerArchive::hasFile(const Common::String &name) const { return _map.contains(name); } -int InstallerArchive::listMembers(Common::ArchiveMemberList &list) { +int InstallerArchive::listMembers(Common::ArchiveMemberList &list) const { for (FileMap::const_iterator it = _map.begin(); it != _map.end(); it++) list.push_back(getMember(it->_key)); return _map.size(); } -Common::ArchiveMemberPtr InstallerArchive::getMember(const Common::String &name) { +const Common::ArchiveMemberPtr InstallerArchive::getMember(const Common::String &name) const { return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, this)); } diff --git a/engines/mohawk/installer_archive.h b/engines/mohawk/installer_archive.h index 27877d69f9..89d2d85f8d 100644 --- a/engines/mohawk/installer_archive.h +++ b/engines/mohawk/installer_archive.h @@ -43,9 +43,9 @@ public: bool isOpen() const { return _stream != 0; } // Common::Archive API implementation - 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; private: diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp index 05ea60f510..e145743f09 100644 --- a/engines/parallaction/disk_ns.cpp +++ b/engines/parallaction/disk_ns.cpp @@ -73,9 +73,9 @@ public: ~NSArchive(); Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const; - 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; }; @@ -137,23 +137,23 @@ Common::SeekableReadStream *NSArchive::createReadStreamForMember(const Common::S return new Common::SeekableSubReadStream(_stream, offset, endOffset, DisposeAfterUse::NO); } -bool NSArchive::hasFile(const Common::String &name) { +bool NSArchive::hasFile(const Common::String &name) const { if (name.empty()) return false; return lookup(name.c_str()) != _numFiles; } -int NSArchive::listMembers(Common::ArchiveMemberList &list) { +int NSArchive::listMembers(Common::ArchiveMemberList &list) const { for (uint32 i = 0; i < _numFiles; i++) { list.push_back(Common::SharedPtr<Common::GenericArchiveMember>(new Common::GenericArchiveMember(_archiveDir[i], this))); } return _numFiles; } -Common::ArchiveMemberPtr NSArchive::getMember(const Common::String &name) { +const Common::ArchiveMemberPtr NSArchive::getMember(const Common::String &name) const { uint32 index = lookup(name.c_str()); - char *item = 0; + const char *item = 0; if (index < _numFiles) { item = _archiveDir[index]; } |