[Scummvm-cvs-logs] scummvm master -> 6c790ea6a7b34ed24dd207c78e5dec7512adc191

fuzzie fuzzie at fuzzie.org
Tue Dec 13 18:43:42 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6c790ea6a7 ANDROID: Fix compilation by adapting to latest Archive changes (thanks LordHoto).


Commit: 6c790ea6a7b34ed24dd207c78e5dec7512adc191
    https://github.com/scummvm/scummvm/commit/6c790ea6a7b34ed24dd207c78e5dec7512adc191
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-12-13T09:37:33-08:00

Commit Message:
ANDROID: Fix compilation by adapting to latest Archive changes (thanks LordHoto).

Changed paths:
    backends/platform/android/asset-archive.cpp
    backends/platform/android/asset-archive.h



diff --git a/backends/platform/android/asset-archive.cpp b/backends/platform/android/asset-archive.cpp
index fe52a3d..ed14399 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 9216412..c5e4355 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:






More information about the Scummvm-git-logs mailing list