diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-14 09:16:41 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-14 09:17:15 -0300 |
| commit | da4170540cbe3dcec4855ddbb59edf1abd7cf9b4 (patch) | |
| tree | 873e57d1fdbf5cfe414c9610068e78ce0d4258db /platform/android | |
| parent | 7b9f2d9929d0e8516d42379962533df823c7c550 (diff) | |
Fixed dir access return value, changed it to Error like all other funcs
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/dir_access_android.cpp | 6 | ||||
| -rw-r--r-- | platform/android/dir_access_android.h | 2 | ||||
| -rw-r--r-- | platform/android/dir_access_jandroid.cpp | 6 | ||||
| -rw-r--r-- | platform/android/dir_access_jandroid.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/platform/android/dir_access_android.cpp b/platform/android/dir_access_android.cpp index f1a488cec2..42ac34a589 100644 --- a/platform/android/dir_access_android.cpp +++ b/platform/android/dir_access_android.cpp @@ -37,16 +37,16 @@ DirAccess *DirAccessAndroid::create_fs() { return memnew(DirAccessAndroid); } -bool DirAccessAndroid::list_dir_begin() { +Error DirAccessAndroid::list_dir_begin() { list_dir_end(); AAssetDir* aad = AAssetManager_openDir(FileAccessAndroid::asset_manager,current_dir.utf8().get_data()); if (!aad) - return true; //nothing + return ERR_CANT_OPEN; //nothing - return false; + return OK; } String DirAccessAndroid::get_next(){ diff --git a/platform/android/dir_access_android.h b/platform/android/dir_access_android.h index 15c29a9a02..72611ceb59 100644 --- a/platform/android/dir_access_android.h +++ b/platform/android/dir_access_android.h @@ -49,7 +49,7 @@ class DirAccessAndroid : public DirAccess { public: - virtual bool list_dir_begin(); ///< This starts dir listing + virtual Error list_dir_begin(); ///< This starts dir listing virtual String get_next(); virtual bool current_is_dir() const; virtual bool current_is_hidden() const; diff --git a/platform/android/dir_access_jandroid.cpp b/platform/android/dir_access_jandroid.cpp index bbd041f6c7..b6d4f757f9 100644 --- a/platform/android/dir_access_jandroid.cpp +++ b/platform/android/dir_access_jandroid.cpp @@ -47,7 +47,7 @@ DirAccess *DirAccessJAndroid::create_fs() { return memnew(DirAccessJAndroid); } -bool DirAccessJAndroid::list_dir_begin() { +Error DirAccessJAndroid::list_dir_begin() { list_dir_end(); JNIEnv *env = ThreadAndroid::get_env(); @@ -55,11 +55,11 @@ bool DirAccessJAndroid::list_dir_begin() { jstring js = env->NewStringUTF(current_dir.utf8().get_data()); int res = env->CallIntMethod(io,_dir_open,js); if (res<=0) - return true; + return ERR_CANT_OPEN; id=res; - return false; + return OK; } String DirAccessJAndroid::get_next(){ diff --git a/platform/android/dir_access_jandroid.h b/platform/android/dir_access_jandroid.h index bfd7912aaf..5db32b945c 100644 --- a/platform/android/dir_access_jandroid.h +++ b/platform/android/dir_access_jandroid.h @@ -58,7 +58,7 @@ class DirAccessJAndroid : public DirAccess { public: - virtual bool list_dir_begin(); ///< This starts dir listing + virtual Error list_dir_begin(); ///< This starts dir listing virtual String get_next(); virtual bool current_is_dir() const; virtual bool current_is_hidden() const; |