From 0ba75c195efffcb098ac74440ffb0fa9c85d0d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 27 Feb 2019 08:57:37 +0100 Subject: Fix GCC 5 build after #26331 and cleanup style Also cleanup after 01a3dd3. --- core/io/resource_importer.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'core/io/resource_importer.cpp') diff --git a/core/io/resource_importer.cpp b/core/io/resource_importer.cpp index ef834921b6..427ce2c2cd 100644 --- a/core/io/resource_importer.cpp +++ b/core/io/resource_importer.cpp @@ -32,7 +32,8 @@ #include "core/os/os.h" #include "core/variant_parser.h" -bool ResourceFormatImporter::SortImporterByName::operator() ( const Ref& p_a,const Ref& p_b) const { + +bool ResourceFormatImporter::SortImporterByName::operator()(const Ref &p_a, const Ref &p_b) const { return p_a->get_importer_name() < p_b->get_importer_name(); } @@ -321,7 +322,6 @@ Variant ResourceFormatImporter::get_resource_metadata(const String &p_path) cons return pat.metadata; } - void ResourceFormatImporter::get_dependencies(const String &p_path, List *p_dependencies, bool p_add_types) { PathAndType pat; @@ -394,7 +394,7 @@ bool ResourceFormatImporter::are_import_settings_valid(const String &p_path) con return false; } - for(int i=0;iget_importer_name() == pat.importer) { if (!importers[i]->are_import_settings_valid(p_path)) { //importer thinks this is not valid return false; @@ -405,10 +405,10 @@ bool ResourceFormatImporter::are_import_settings_valid(const String &p_path) con return true; } - String ResourceFormatImporter::get_import_settings_hash() const { +String ResourceFormatImporter::get_import_settings_hash() const { String hash; - for(int i=0;iget_importer_name()+":"+importers[i]->get_import_settings_string(); + for (int i = 0; i < importers.size(); i++) { + hash += ":" + importers[i]->get_importer_name() + ":" + importers[i]->get_import_settings_string(); } return hash.md5_text(); } -- cgit v1.2.3