noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

EditorSettings: Rename settings_path to settings_dir

Browse Source 
Also to prepare for upcoming refactoring for XDG support.
This commit is contained in:
Rémi Verschelde
2017-11-17 15:50:18 +01:00
parent 73049d115e
commit ad199c3964
19 changed files with 78 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/uwp/export/export.cpp
View File

@@ -456,8 +456,8 @@ void AppxPackager::init(FileAccess *p_fa) {
package = p_fa;
central_dir_offset = 0;
end_of_central_dir_offset = 0;
tmp_blockmap_file_path = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmpblockmap.xml";
tmp_content_types_file_path = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmpcontenttypes.xml";
tmp_blockmap_file_path = EditorSettings::get_singleton()->get_settings_dir() + "/tmp/tmpblockmap.xml";
tmp_content_types_file_path = EditorSettings::get_singleton()->get_settings_dir() + "/tmp/tmpcontenttypes.xml";
}
void AppxPackager::add_file(String p_file_name, const uint8_t *p_buffer, size_t p_len, int p_file_no, int p_total_files, bool p_compress) {
@@ -886,7 +886,7 @@ class EditorExportUWP : public EditorExportPlatform {
if (!image) return data;
String tmp_path = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp/uwp_tmp_logo.png");
String tmp_path = EditorSettings::get_singleton()->get_settings_dir().plus_file("tmp/uwp_tmp_logo.png");
Error err = image->get_data()->save_png(tmp_path);