diff options
| author | Alyssa Milburn | 2011-12-13 18:37:33 +0100 |
|---|---|---|
| committer | Alyssa Milburn | 2011-12-13 18:37:33 +0100 |
| commit | 6c790ea6a7b34ed24dd207c78e5dec7512adc191 (patch) | |
| tree | bad28132590975381941c04594c0e5e059fe3757 | |
| parent | d085f4f4e26f018347292bf9d3c0a5037bbe0e65 (diff) | |
| download | scummvm-rg350-6c790ea6a7b34ed24dd207c78e5dec7512adc191.tar.gz scummvm-rg350-6c790ea6a7b34ed24dd207c78e5dec7512adc191.tar.bz2 scummvm-rg350-6c790ea6a7b34ed24dd207c78e5dec7512adc191.zip | |
ANDROID: Fix compilation by adapting to latest Archive changes (thanks LordHoto).
| -rw-r--r-- | backends/platform/android/asset-archive.cpp | 6 | ||||
| -rw-r--r-- | backends/platform/android/asset-archive.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/backends/platform/android/asset-archive.cpp b/backends/platform/android/asset-archive.cpp index fe52a3d8d4..ed143994e4 100644 --- a/backends/platform/android/asset-archive.cpp +++ b/backends/platform/android/asset-archive.cpp @@ -389,7 +389,7 @@ AndroidAssetArchive::~AndroidAssetArchive() { env->DeleteGlobalRef(_am); } -bool AndroidAssetArchive::hasFile(const Common::String &name) { +bool AndroidAssetArchive::hasFile(const Common::String &name) const { JNIEnv *env = JNI::getEnv(); jstring path = env->NewStringUTF(name.c_str()); jobject result = env->CallObjectMethod(_am, MID_open, path, ACCESS_UNKNOWN); @@ -409,7 +409,7 @@ bool AndroidAssetArchive::hasFile(const Common::String &name) { return true; } -int AndroidAssetArchive::listMembers(Common::ArchiveMemberList &member_list) { +int AndroidAssetArchive::listMembers(Common::ArchiveMemberList &member_list) const { JNIEnv *env = JNI::getEnv(); Common::List<Common::String> dirlist; dirlist.push_back(""); @@ -466,7 +466,7 @@ int AndroidAssetArchive::listMembers(Common::ArchiveMemberList &member_list) { return count; } -Common::ArchiveMemberPtr AndroidAssetArchive::getMember(const Common::String &name) { +const Common::ArchiveMemberPtr AndroidAssetArchive::getMember(const Common::String &name) const { return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, this)); } diff --git a/backends/platform/android/asset-archive.h b/backends/platform/android/asset-archive.h index 9216412e0a..c5e43555e0 100644 --- a/backends/platform/android/asset-archive.h +++ b/backends/platform/android/asset-archive.h @@ -37,9 +37,9 @@ public: AndroidAssetArchive(jobject am); virtual ~AndroidAssetArchive(); - virtual bool hasFile(const Common::String &name); - virtual int listMembers(Common::ArchiveMemberList &list); - virtual Common::ArchiveMemberPtr getMember(const Common::String &name); + virtual bool hasFile(const Common::String &name) const; + virtual int listMembers(Common::ArchiveMemberList &list) const; + virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const; virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const; private: |