Skip to content

Commit eaa80e6

Browse files
committed
Merge pull request #108076 from timothyqiu/resource-loader-unused
Remove unused methods in `ResourceLoader`
2 parents 638366b + c885098 commit eaa80e6

File tree

2 files changed

+0
-31
lines changed

2 files changed

+0
-31
lines changed

core/io/resource_loader.cpp

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,20 +1068,6 @@ void ResourceLoader::remove_resource_format_loader(Ref<ResourceFormatLoader> p_f
10681068
--loader_count;
10691069
}
10701070

1071-
int ResourceLoader::get_import_order(const String &p_path) {
1072-
String local_path = _path_remap(_validate_local_path(p_path));
1073-
1074-
for (int i = 0; i < loader_count; i++) {
1075-
if (!loader[i]->recognize_path(local_path)) {
1076-
continue;
1077-
}
1078-
1079-
return loader[i]->get_import_order(p_path);
1080-
}
1081-
1082-
return 0;
1083-
}
1084-
10851071
String ResourceLoader::get_import_group_file(const String &p_path) {
10861072
String local_path = _path_remap(_validate_local_path(p_path));
10871073

@@ -1201,21 +1187,6 @@ ResourceUID::ID ResourceLoader::get_resource_uid(const String &p_path) {
12011187
return ResourceUID::INVALID_ID;
12021188
}
12031189

1204-
bool ResourceLoader::has_custom_uid_support(const String &p_path) {
1205-
String local_path = _validate_local_path(p_path);
1206-
1207-
for (int i = 0; i < loader_count; i++) {
1208-
if (!loader[i]->recognize_path(local_path)) {
1209-
continue;
1210-
}
1211-
if (loader[i]->has_custom_uid_support()) {
1212-
return true;
1213-
}
1214-
}
1215-
1216-
return false;
1217-
}
1218-
12191190
bool ResourceLoader::should_create_uid_file(const String &p_path) {
12201191
const String local_path = _validate_local_path(p_path);
12211192
if (FileAccess::exists(local_path + ".uid")) {

core/io/resource_loader.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,14 +244,12 @@ class ResourceLoader {
244244
static String get_resource_type(const String &p_path);
245245
static String get_resource_script_class(const String &p_path);
246246
static ResourceUID::ID get_resource_uid(const String &p_path);
247-
static bool has_custom_uid_support(const String &p_path);
248247
static bool should_create_uid_file(const String &p_path);
249248
static void get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types = false);
250249
static Error rename_dependencies(const String &p_path, const HashMap<String, String> &p_map);
251250
static bool is_import_valid(const String &p_path);
252251
static String get_import_group_file(const String &p_path);
253252
static bool is_imported(const String &p_path);
254-
static int get_import_order(const String &p_path);
255253

256254
static void set_is_import_thread(bool p_import_thread);
257255

0 commit comments

Comments
 (0)