diff options
| author | Rémi Verschelde | 2017-11-17 15:25:22 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-11-17 20:55:09 +0100 |
| commit | 73049d115e190b8c356f0689a9079c3c73cc5765 (patch) | |
| tree | 921a1935f6d841988071b930fbfea498bf872a3e /platform/iphone | |
| parent | ebbe2bd57235fcbd2edb82c05bb9d7d768b3e7ca (diff) | |
| download | godot-73049d115e190b8c356f0689a9079c3c73cc5765.tar.gz godot-73049d115e190b8c356f0689a9079c3c73cc5765.tar.zst godot-73049d115e190b8c356f0689a9079c3c73cc5765.zip | |
Rename OS::get_data_dir to OS::get_user_data_dir
Will be needed to avoid confusion with system data path (XDG_DATA_HOME)
and editor data dir in upcoming refactoring.
Diffstat (limited to 'platform/iphone')
| -rw-r--r-- | platform/iphone/os_iphone.cpp | 6 | ||||
| -rw-r--r-- | platform/iphone/os_iphone.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp index d0865a35b..124b92fed 100644 --- a/platform/iphone/os_iphone.cpp +++ b/platform/iphone/os_iphone.cpp @@ -470,7 +470,7 @@ void OSIPhone::set_cursor_shape(CursorShape p_shape){ }; -String OSIPhone::get_data_dir() const { +String OSIPhone::get_user_data_dir() const { return data_dir; }; @@ -509,7 +509,7 @@ Error OSIPhone::native_video_play(String p_path, float p_volume, String p_audio_ FileAccess *f = FileAccess::open(p_path, FileAccess::READ); bool exists = f && f->is_open(); - String tempFile = get_data_dir(); + String tempFile = get_user_data_dir(); if (!exists) return FAILED; @@ -521,7 +521,7 @@ Error OSIPhone::native_video_play(String p_path, float p_volume, String p_audio_ p_path = p_path.replace("res:/", ProjectSettings::get_singleton()->get_resource_path()); } } else if (p_path.begins_with("user://")) - p_path = p_path.replace("user:/", get_data_dir()); + p_path = p_path.replace("user:/", get_user_data_dir()); memdelete(f); diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h index 6627fddf0..433228b59 100644 --- a/platform/iphone/os_iphone.h +++ b/platform/iphone/os_iphone.h @@ -178,7 +178,7 @@ public: Error shell_open(String p_uri); - String get_data_dir() const; + String get_user_data_dir() const; void set_locale(String p_locale); String get_locale() const; |
