diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-14 00:51:09 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-14 00:51:09 -0300 |
| commit | d9d77291bca8dd1e87aa4d9e40de96d99e5ef1f6 (patch) | |
| tree | f5c92321612fdd5f8967c349898d3475b52bf930 /scene | |
| parent | f3b6177ece8a06e52870ed422cbcc67276606e5a (diff) | |
rename String.extension() -> String.get_extension() / String.basename() -> String.get_basename()
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/io/resource_format_image.cpp | 4 | ||||
| -rw-r--r-- | scene/io/resource_format_wav.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/dynamic_font.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/scene_format_text.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/theme.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/scene/io/resource_format_image.cpp b/scene/io/resource_format_image.cpp index cc3d9baa74..2d098d01f5 100644 --- a/scene/io/resource_format_image.cpp +++ b/scene/io/resource_format_image.cpp @@ -36,7 +36,7 @@ RES ResourceFormatLoaderImage::load(const String &p_path, const String& p_origin if (r_error) *r_error=ERR_CANT_OPEN; - if (p_path.extension()=="cube") { + if (p_path.get_extension()=="cube") { // open as cubemap txture CubeMap* ptr = memnew(CubeMap); @@ -235,7 +235,7 @@ void ResourceFormatLoaderImage::get_recognized_extensions(List<String> *p_extens String ResourceFormatLoaderImage::get_resource_type(const String &p_path) const { - String ext=p_path.extension().to_lower(); + String ext=p_path.get_extension().to_lower(); if (ext=="cube") return "CubeMap"; diff --git a/scene/io/resource_format_wav.cpp b/scene/io/resource_format_wav.cpp index f75836d2df..0a19e6f72b 100644 --- a/scene/io/resource_format_wav.cpp +++ b/scene/io/resource_format_wav.cpp @@ -267,7 +267,7 @@ bool ResourceFormatLoaderWAV::handles_type(const String& p_type) const { String ResourceFormatLoaderWAV::get_resource_type(const String &p_path) const { - if (p_path.extension().to_lower()=="wav") + if (p_path.get_extension().to_lower()=="wav") return "Sample"; return ""; } diff --git a/scene/resources/dynamic_font.cpp b/scene/resources/dynamic_font.cpp index 3aadbdbe19..bb1552e2d6 100644 --- a/scene/resources/dynamic_font.cpp +++ b/scene/resources/dynamic_font.cpp @@ -961,7 +961,7 @@ bool ResourceFormatLoaderDynamicFont::handles_type(const String& p_type) const { String ResourceFormatLoaderDynamicFont::get_resource_type(const String &p_path) const { - String el = p_path.extension().to_lower(); + String el = p_path.get_extension().to_lower(); if (el=="ttf" || el=="otf") return "DynamicFontData"; return ""; diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp index fa56f63465..448e18ce39 100644 --- a/scene/resources/scene_format_text.cpp +++ b/scene/resources/scene_format_text.cpp @@ -984,7 +984,7 @@ String ResourceFormatLoaderText::get_resource_type(const String &p_path) const{ - String ext=p_path.extension().to_lower(); + String ext=p_path.get_extension().to_lower(); if (ext=="tscn") return "PackedScene"; else if (ext!="tres") diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index 2e3afbf057..0ddc907aa0 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -1147,7 +1147,7 @@ bool ResourceFormatLoaderTheme::handles_type(const String& p_type) const { String ResourceFormatLoaderTheme::get_resource_type(const String &p_path) const { - if (p_path.extension().to_lower()=="theme") + if (p_path.get_extension().to_lower()=="theme") return "Theme"; return ""; } |