diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-20 14:49:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-20 14:49:34 +0200 |
| commit | 9643b2b6def9964a24d273e7611ebf5aeefcd4b5 (patch) | |
| tree | 77ca51194636384272895a7a0446397f7b65cbb7 /core | |
| parent | 6110bdee138febf3b04b47bc15b834bda7b99d52 (diff) | |
| parent | b00d7bfc3fe02af23581eebf2b4bb0522c462b3c (diff) | |
Merge pull request #29027 from akien-mga/clang-format-8.0
Travis: Update clang-format to version 8.0
Diffstat (limited to 'core')
| -rw-r--r-- | core/io/resource_importer.cpp | 3 | ||||
| -rw-r--r-- | core/io/resource_importer.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/io/resource_importer.cpp b/core/io/resource_importer.cpp index 038a34ed51..4a58d37ca5 100644 --- a/core/io/resource_importer.cpp +++ b/core/io/resource_importer.cpp @@ -301,8 +301,7 @@ String ResourceFormatImporter::get_import_group_file(const String &p_path) const bool valid = true; PathAndType pat; _get_path_and_type(p_path, pat, &valid); - return valid?pat.group_file:String(); - + return valid ? pat.group_file : String(); } bool ResourceFormatImporter::is_import_valid(const String &p_path) const { diff --git a/core/io/resource_importer.h b/core/io/resource_importer.h index bdbdde6df6..2e01989564 100644 --- a/core/io/resource_importer.h +++ b/core/io/resource_importer.h @@ -126,7 +126,7 @@ public: virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = NULL, Variant *r_metadata = NULL) = 0; - virtual Error import_group_file(const String& p_group_file,const Map<String,Map<StringName, Variant> >&p_source_file_options, const Map<String,String>& p_base_paths) { return ERR_UNAVAILABLE; } + virtual Error import_group_file(const String &p_group_file, const Map<String, Map<StringName, Variant> > &p_source_file_options, const Map<String, String> &p_base_paths) { return ERR_UNAVAILABLE; } virtual bool are_import_settings_valid(const String &p_path) const { return true; } virtual String get_import_settings_string() const { return String(); } }; |