summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-05-25 15:19:10 +0200
committerGitHub <noreply@github.com>2021-05-25 15:19:10 +0200
commitf164c00a94793234879dc1824bd657db6df939ec (patch)
tree2e6c19a493c20e356b01a2a79f10e63c6e75ff56 /editor
parent313e1f62bb4ed85041bcd9290ec76660878fcd6b (diff)
parentda5d7db6100955922e08ee99a02f827214ed8281 (diff)
Merge pull request #49061 from madmiraal/rename-len-length
Rename File::get_len() get_length()
Diffstat (limited to 'editor')
-rw-r--r--editor/fileserver/editor_file_server.cpp2
-rw-r--r--editor/import/resource_importer_image.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/fileserver/editor_file_server.cpp b/editor/fileserver/editor_file_server.cpp
index b04e518b0b..654915e3e5 100644
--- a/editor/fileserver/editor_file_server.cpp
+++ b/editor/fileserver/editor_file_server.cpp
@@ -200,7 +200,7 @@ void EditorFileServer::_subthread_start(void *s) {
cd->connection->put_data(buf4, 4);
encode_uint32(OK, buf4);
cd->connection->put_data(buf4, 4);
- encode_uint64(fa->get_len(), buf4);
+ encode_uint64(fa->get_length(), buf4);
cd->connection->put_data(buf4, 8);
cd->files[id] = fa;
diff --git a/editor/import/resource_importer_image.cpp b/editor/import/resource_importer_image.cpp
index fa6ce5fc89..c5b2a8dc3a 100644
--- a/editor/import/resource_importer_image.cpp
+++ b/editor/import/resource_importer_image.cpp
@@ -75,7 +75,7 @@ Error ResourceImporterImage::import(const String &p_source_file, const String &p
ERR_FAIL_COND_V_MSG(!f, ERR_CANT_OPEN, "Cannot open file from path '" + p_source_file + "'.");
- uint64_t len = f->get_len();
+ uint64_t len = f->get_length();
Vector<uint8_t> data;
data.resize(len);