Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9c92efd

Browse files
committed
FixFileAccess::create_temp() not usingFileAccess::ModeFlags
1 parent8aa4a52 commit9c92efd

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

‎core/io/file_access.compat.inc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ Ref<FileAccess> FileAccess::_open_encrypted_bind_compat_98918(const String &p_pa
3434
returnopen_encrypted(p_path, p_mode_flags, p_key, Vector<uint8_t>());
3535
}
3636

37+
Ref<FileAccess>FileAccess::_create_temp_compat_114053(int p_mode_flags,const String &p_prefix,const String &p_extension,bool p_keep) {
38+
return_create_temp((ModeFlags)p_mode_flags, p_prefix, p_extension, p_keep);
39+
}
40+
3741
voidFileAccess::store_8_bind_compat_78289(uint8_t p_dest) {
3842
store_8(p_dest);
3943
}
@@ -100,6 +104,7 @@ String FileAccess::get_as_text_bind_compat_110867(bool p_skip_cr) const {
100104

101105
voidFileAccess::_bind_compatibility_methods() {
102106
ClassDB::bind_compatibility_static_method("FileAccess",D_METHOD("open_encrypted","path","mode_flags","key"), &FileAccess::_open_encrypted_bind_compat_98918);
107+
ClassDB::bind_compatibility_static_method("FileAccess",D_METHOD("create_temp","mode_flags","prefix","extension","keep"), &FileAccess::_create_temp_compat_114053,DEFVAL(""),DEFVAL(""),DEFVAL(false));
103108

104109
ClassDB::bind_compatibility_method(D_METHOD("store_8","value"), &FileAccess::store_8_bind_compat_78289);
105110
ClassDB::bind_compatibility_method(D_METHOD("store_16","value"), &FileAccess::store_16_bind_compat_78289);

‎core/io/file_access.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Ref<FileAccess> FileAccess::create_for_path(const String &p_path) {
7979
return ret;
8080
}
8181

82-
Ref<FileAccess>FileAccess::create_temp(int p_mode_flags,const String &p_prefix,const String &p_extension,bool p_keep, Error *r_error) {
82+
Ref<FileAccess>FileAccess::create_temp(ModeFlags p_mode_flags,const String &p_prefix,const String &p_extension,bool p_keep, Error *r_error) {
8383
const String ERROR_COMMON_PREFIX ="Error while creating temporary file";
8484

8585
if (!p_prefix.is_empty() && !p_prefix.is_valid_filename()) {
@@ -136,7 +136,7 @@ Ref<FileAccess> FileAccess::create_temp(int p_mode_flags, const String &p_prefix
136136
return ret;
137137
}
138138

139-
Ref<FileAccess>FileAccess::_create_temp(int p_mode_flags,const String &p_prefix,const String &p_extension,bool p_keep) {
139+
Ref<FileAccess>FileAccess::_create_temp(ModeFlags p_mode_flags,const String &p_prefix,const String &p_extension,bool p_keep) {
140140
returncreate_temp(p_mode_flags, p_prefix, p_extension, p_keep, &last_file_open_error);
141141
}
142142

‎core/io/file_access.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ class FileAccess : public RefCounted {
122122

123123
#ifndef DISABLE_DEPRECATED
124124
static Ref<FileAccess>_open_encrypted_bind_compat_98918(const String &p_path, ModeFlags p_mode_flags,const Vector<uint8_t> &p_key);
125+
static Ref<FileAccess>_create_temp_compat_114053(int p_mode_flags,const String &p_prefix ="",const String &p_extension ="",bool p_keep =false);
125126

126127
voidstore_8_bind_compat_78289(uint8_t p_dest);
127128
voidstore_16_bind_compat_78289(uint16_t p_dest);
@@ -160,7 +161,7 @@ class FileAccess : public RefCounted {
160161
String _temp_path;
161162
void_delete_temp();
162163

163-
static Ref<FileAccess>_create_temp(int p_mode_flags,const String &p_prefix ="",const String &p_extension ="",bool p_keep =false);
164+
static Ref<FileAccess>_create_temp(ModeFlags p_mode_flags,const String &p_prefix ="",const String &p_extension ="",bool p_keep =false);
164165

165166
public:
166167
staticvoidset_file_close_fail_notify_callback(FileCloseFailNotify p_cbk) { close_fail_notify = p_cbk; }
@@ -241,7 +242,7 @@ class FileAccess : public RefCounted {
241242
static Ref<FileAccess>create(AccessType p_access);/// Create a file access (for the current platform) this is the only portable way of accessing files.
242243
static Ref<FileAccess>create_for_path(const String &p_path);
243244
static Ref<FileAccess>open(const String &p_path,int p_mode_flags, Error *r_error =nullptr);/// Create a file access (for the current platform) this is the only portable way of accessing files.
244-
static Ref<FileAccess>create_temp(int p_mode_flags,const String &p_prefix ="",const String &p_extension ="",bool p_keep =false, Error *r_error =nullptr);
245+
static Ref<FileAccess>create_temp(ModeFlags p_mode_flags,const String &p_prefix ="",const String &p_extension ="",bool p_keep =false, Error *r_error =nullptr);
245246

246247
static Ref<FileAccess>open_encrypted(const String &p_path, ModeFlags p_mode_flags,const Vector<uint8_t> &p_key,const Vector<uint8_t> &p_iv = Vector<uint8_t>());
247248
static Ref<FileAccess>open_encrypted_pass(const String &p_path, ModeFlags p_mode_flags,const String &p_pass);

‎doc/classes/FileAccess.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</method>
5454
<methodname="create_temp"qualifiers="static">
5555
<returntype="FileAccess" />
56-
<paramindex="0"name="mode_flags"type="int" />
56+
<paramindex="0"name="mode_flags"type="int"enum="FileAccess.ModeFlags"/>
5757
<paramindex="1"name="prefix"type="String"default="&quot;&quot;" />
5858
<paramindex="2"name="extension"type="String"default="&quot;&quot;" />
5959
<paramindex="3"name="keep"type="bool"default="false" />
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
GH-114053
2+
---------
3+
Validate extension JSON: Error: Field 'classes/FileAccess/methods/create_temp/arguments': meta was removed.
4+
Validate extension JSON: Error: Field 'classes/FileAccess/methods/create_temp/arguments/0': type changed value in new API, from "int" to "enum::FileAccess.ModeFlags".

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp