summaryrefslogtreecommitdiff
path: root/core/io
diff options
context:
space:
mode:
Diffstat (limited to 'core/io')
-rw-r--r--core/io/file_access_network.cpp2
-rw-r--r--core/io/http_client.cpp2
-rw-r--r--core/io/image.cpp8
-rw-r--r--core/io/image_loader.cpp2
-rw-r--r--core/io/marshalls.cpp4
-rw-r--r--core/io/resource.cpp4
-rw-r--r--core/io/resource_format_binary.cpp2
-rw-r--r--core/io/resource_loader.cpp2
-rw-r--r--core/io/resource_saver.cpp2
-rw-r--r--core/io/stream_peer.cpp2
10 files changed, 15 insertions, 15 deletions
diff --git a/core/io/file_access_network.cpp b/core/io/file_access_network.cpp
index 63a8f9c5b6..9ee3876c2f 100644
--- a/core/io/file_access_network.cpp
+++ b/core/io/file_access_network.cpp
@@ -210,7 +210,7 @@ FileAccessNetworkClient *FileAccessNetworkClient::singleton = nullptr;
FileAccessNetworkClient::FileAccessNetworkClient() {
singleton = this;
- client.instance();
+ client.instantiate();
}
FileAccessNetworkClient::~FileAccessNetworkClient() {
diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp
index 449ebaa6ee..78f04e57d3 100644
--- a/core/io/http_client.cpp
+++ b/core/io/http_client.cpp
@@ -730,7 +730,7 @@ int HTTPClient::get_read_chunk_size() const {
}
HTTPClient::HTTPClient() {
- tcp_connection.instance();
+ tcp_connection.instantiate();
}
HTTPClient::~HTTPClient() {}
diff --git a/core/io/image.cpp b/core/io/image.cpp
index 9cd0ea7b5d..25d9eab3fe 100644
--- a/core/io/image.cpp
+++ b/core/io/image.cpp
@@ -1945,7 +1945,7 @@ Error Image::generate_mipmap_roughness(RoughnessChannel p_roughness_channel, con
memcpy(wr.ptr(), ptr, size);
wr = uint8_t*();
Ref<Image> im;
- im.instance();
+ im.instantiate();
im->create(w, h, false, format, imgdata);
im->save_png("res://mipmap_" + itos(i) + ".png");
}
@@ -3280,7 +3280,7 @@ Ref<Image> Image::rgbe_to_srgb() {
ERR_FAIL_COND_V(format != FORMAT_RGBE9995, Ref<Image>());
Ref<Image> new_image;
- new_image.instance();
+ new_image.instantiate();
new_image->create(width, height, false, Image::FORMAT_RGB8);
for (int row = 0; row < height; row++) {
@@ -3310,7 +3310,7 @@ Ref<Image> Image::get_image_from_mipmap(int p_mipamp) const {
}
Ref<Image> image;
- image.instance();
+ image.instantiate();
image->width = w;
image->height = h;
image->format = format;
@@ -3627,7 +3627,7 @@ Image::Image(const uint8_t *p_mem_png_jpg, int p_len) {
Ref<Resource> Image::duplicate(bool p_subresources) const {
Ref<Image> copy;
- copy.instance();
+ copy.instantiate();
copy->_copy_internals_from(*this);
return copy;
}
diff --git a/core/io/image_loader.cpp b/core/io/image_loader.cpp
index 7de038e6fe..b45e9d26b1 100644
--- a/core/io/image_loader.cpp
+++ b/core/io/image_loader.cpp
@@ -163,7 +163,7 @@ RES ResourceFormatLoaderImage::load(const String &p_path, const String &p_origin
}
Ref<Image> image;
- image.instance();
+ image.instantiate();
Error err = ImageLoader::loader[idx]->load_image(image, f, false, 1.0);
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp
index c447e11ee7..f342db2dad 100644
--- a/core/io/marshalls.cpp
+++ b/core/io/marshalls.cpp
@@ -547,7 +547,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
r_variant = (Object *)nullptr;
} else {
Ref<EncodedObjectAsID> obj_as_id;
- obj_as_id.instance();
+ obj_as_id.instantiate();
obj_as_id->set_object_id(val);
r_variant = obj_as_id;
@@ -565,7 +565,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
if (str == String()) {
r_variant = (Object *)nullptr;
} else {
- Object *obj = ClassDB::instance(str);
+ Object *obj = ClassDB::instantiate(str);
ERR_FAIL_COND_V(!obj, ERR_UNAVAILABLE);
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
diff --git a/core/io/resource.cpp b/core/io/resource.cpp
index b970e85c99..efa622d976 100644
--- a/core/io/resource.cpp
+++ b/core/io/resource.cpp
@@ -164,7 +164,7 @@ Ref<Resource> Resource::duplicate_for_local_scene(Node *p_for_scene, Map<Ref<Res
List<PropertyInfo> plist;
get_property_list(&plist);
- Ref<Resource> r = Object::cast_to<Resource>(ClassDB::instance(get_class()));
+ Ref<Resource> r = Object::cast_to<Resource>(ClassDB::instantiate(get_class()));
ERR_FAIL_COND_V(r.is_null(), Ref<Resource>());
r->local_scene = p_for_scene;
@@ -224,7 +224,7 @@ Ref<Resource> Resource::duplicate(bool p_subresources) const {
List<PropertyInfo> plist;
get_property_list(&plist);
- Ref<Resource> r = (Resource *)ClassDB::instance(get_class());
+ Ref<Resource> r = (Resource *)ClassDB::instantiate(get_class());
ERR_FAIL_COND_V(r.is_null(), Ref<Resource>());
for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) {
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index f83ba30514..0e9815245f 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -704,7 +704,7 @@ Error ResourceLoaderBinary::load() {
if (res.is_null()) {
//did not replace
- Object *obj = ClassDB::instance(t);
+ Object *obj = ClassDB::instantiate(t);
if (!obj) {
error = ERR_FILE_CORRUPT;
ERR_FAIL_V_MSG(ERR_FILE_CORRUPT, local_path + ":Resource of unrecognized type in file: " + t + ".");
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index 1700766cbf..c5dfe1f2b0 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -1045,7 +1045,7 @@ bool ResourceLoader::add_custom_resource_format_loader(String script_path) {
bool valid_type = ClassDB::is_parent_class(ibt, "ResourceFormatLoader");
ERR_FAIL_COND_V_MSG(!valid_type, false, "Script does not inherit a CustomResourceLoader: " + script_path + ".");
- Object *obj = ClassDB::instance(ibt);
+ Object *obj = ClassDB::instantiate(ibt);
ERR_FAIL_COND_V_MSG(obj == nullptr, false, "Cannot instance script as custom resource loader, expected 'ResourceFormatLoader' inheritance, got: " + String(ibt) + ".");
diff --git a/core/io/resource_saver.cpp b/core/io/resource_saver.cpp
index 389a4fdbbd..80cb85fba3 100644
--- a/core/io/resource_saver.cpp
+++ b/core/io/resource_saver.cpp
@@ -210,7 +210,7 @@ bool ResourceSaver::add_custom_resource_format_saver(String script_path) {
bool valid_type = ClassDB::is_parent_class(ibt, "ResourceFormatSaver");
ERR_FAIL_COND_V_MSG(!valid_type, false, "Script does not inherit a CustomResourceSaver: " + script_path + ".");
- Object *obj = ClassDB::instance(ibt);
+ Object *obj = ClassDB::instantiate(ibt);
ERR_FAIL_COND_V_MSG(obj == nullptr, false, "Cannot instance script as custom resource saver, expected 'ResourceFormatSaver' inheritance, got: " + String(ibt) + ".");
diff --git a/core/io/stream_peer.cpp b/core/io/stream_peer.cpp
index ee5e9eca0c..27f8d4e88f 100644
--- a/core/io/stream_peer.cpp
+++ b/core/io/stream_peer.cpp
@@ -512,7 +512,7 @@ void StreamPeerBuffer::clear() {
Ref<StreamPeerBuffer> StreamPeerBuffer::duplicate() const {
Ref<StreamPeerBuffer> spb;
- spb.instance();
+ spb.instantiate();
spb->data = data;
return spb;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 09:35:11 +0000