Remove CoreStringNames and SceneStringNames as they're no longer useful

godotengine · Jul 27, 2021 · ea2f3f3 · ea2f3f3
1 parent fef27e9
commit ea2f3f3
Show file tree

Hide file tree

Showing 92 changed files with 373 additions and 1,109 deletions.
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp
@@ -31,7 +31,6 @@
 #include "project_settings.h"
 
 #include "core/core_bind.h" // For Compression enum.
-#include "core/core_string_names.h"
 #include "core/input/input_map.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
@@ -173,7 +172,7 @@ bool ProjectSettings::_set(const StringName &p_name, const Variant &p_value) {
 			}
 		}
 	} else {
-		if (p_name == CoreStringNames::get_singleton()->_custom_features) {
+		if (p_name == SNAME("_custom_features")) {
 			Vector<String> custom_feature_array = String(p_value).split(",");
 			for (int i = 0; i < custom_feature_array.size(); i++) {
 				custom_features.insert(custom_feature_array[i]);
@@ -706,7 +705,7 @@ Error ProjectSettings::_save_settings_binary(const String &p_file, const Map<Str
 	if (p_custom_features != String()) {
 		file->store_32(count + 1);
 		//store how many properties are saved, add one for custom featuers, which must always go first
-		String key = CoreStringNames::get_singleton()->_custom_features;
+		String key = SNAME("_custom_features");
 		file->store_pascal_string(key);
 
 		int len;

diff --git a/core/core_string_names.cpp b/core/core_string_names.cpp
diff --git a/core/core_string_names.h b/core/core_string_names.h
diff --git a/core/io/packed_data_container.cpp b/core/io/packed_data_container.cpp
@@ -30,7 +30,6 @@
 
 #include "packed_data_container.h"
 
-#include "core/core_string_names.h"
 #include "core/io/marshalls.h"
 
 Variant PackedDataContainer::getvar(const Variant &p_key, bool *r_valid) const {

diff --git a/core/io/resource.cpp b/core/io/resource.cpp
@@ -30,7 +30,6 @@
 
 #include "resource.h"
 
-#include "core/core_string_names.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_funcs.h"
@@ -41,7 +40,7 @@
 #include <stdio.h>
 
 void Resource::emit_changed() {
-	emit_signal(CoreStringNames::get_singleton()->changed);
+	emit_signal(SNAME("changed"));
 }
 
 void Resource::_resource_path_changed() {

diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp
@@ -32,7 +32,6 @@
 
 #include "core/math/geometry_3d.h"
 #include "core/object/script_language.h"
-#include "scene/scene_string_names.h"
 
 int AStar::get_available_point_id() const {
 	if (points.is_empty()) {
@@ -388,8 +387,8 @@ bool AStar::_solve(Point *begin_point, Point *end_point) {
 }
 
 real_t AStar::_estimate_cost(int p_from_id, int p_to_id) {
-	if (get_script_instance() && get_script_instance()->has_method(SceneStringNames::get_singleton()->_estimate_cost)) {
-		return get_script_instance()->call(SceneStringNames::get_singleton()->_estimate_cost, p_from_id, p_to_id);
+	if (get_script_instance() && get_script_instance()->has_method(SNAME("_estimate_cost"))) {
+		return get_script_instance()->call(SNAME("_estimate_cost"), p_from_id, p_to_id);
 	}
 
 	Point *from_point;
@@ -404,8 +403,8 @@ real_t AStar::_estimate_cost(int p_from_id, int p_to_id) {
 }
 
 real_t AStar::_compute_cost(int p_from_id, int p_to_id) {
-	if (get_script_instance() && get_script_instance()->has_method(SceneStringNames::get_singleton()->_compute_cost)) {
-		return get_script_instance()->call(SceneStringNames::get_singleton()->_compute_cost, p_from_id, p_to_id);
+	if (get_script_instance() && get_script_instance()->has_method(SNAME("_compute_cost"))) {
+		return get_script_instance()->call(SNAME("_compute_cost"), p_from_id, p_to_id);
 	}
 
 	Point *from_point;
@@ -660,8 +659,8 @@ Vector2 AStar2D::get_closest_position_in_segment(const Vector2 &p_point) const {
 }
 
 real_t AStar2D::_estimate_cost(int p_from_id, int p_to_id) {
-	if (get_script_instance() && get_script_instance()->has_method(SceneStringNames::get_singleton()->_estimate_cost)) {
-		return get_script_instance()->call(SceneStringNames::get_singleton()->_estimate_cost, p_from_id, p_to_id);
+	if (get_script_instance() && get_script_instance()->has_method(SNAME("_estimate_cost"))) {
+		return get_script_instance()->call(SNAME("_estimate_cost"), p_from_id, p_to_id);
 	}
 
 	AStar::Point *from_point;
@@ -676,8 +675,8 @@ real_t AStar2D::_estimate_cost(int p_from_id, int p_to_id) {
 }
 
 real_t AStar2D::_compute_cost(int p_from_id, int p_to_id) {
-	if (get_script_instance() && get_script_instance()->has_method(SceneStringNames::get_singleton()->_compute_cost)) {
-		return get_script_instance()->call(SceneStringNames::get_singleton()->_compute_cost, p_from_id, p_to_id);
+	if (get_script_instance() && get_script_instance()->has_method(SNAME("_compute_cost"))) {
+		return get_script_instance()->call(SNAME("_compute_cost"), p_from_id, p_to_id);
 	}
 
 	AStar::Point *from_point;

diff --git a/core/object/message_queue.cpp b/core/object/message_queue.cpp
@@ -31,7 +31,6 @@
 #include "message_queue.h"
 
 #include "core/config/project_settings.h"
-#include "core/core_string_names.h"
 #include "core/object/script_language.h"
 
 MessageQueue *MessageQueue::singleton = nullptr;
@@ -104,7 +103,7 @@ Error MessageQueue::push_notification(ObjectID p_id, int p_notification) {
 	Message *msg = memnew_placement(&buffer[buffer_end], Message);
 
 	msg->type = TYPE_NOTIFICATION;
-	msg->callable = Callable(p_id, CoreStringNames::get_singleton()->notification); //name is meaningless but callable needs it
+	msg->callable = Callable(p_id, SNAME("notification")); //name is meaningless but callable needs it
 	//msg->target;
 	msg->notification = p_notification;
 

diff --git a/core/object/object.cpp b/core/object/object.cpp
@@ -30,7 +30,6 @@
 
 #include "object.h"
 
-#include "core/core_string_names.h"
 #include "core/io/resource.h"
 #include "core/object/class_db.h"
 #include "core/object/message_queue.h"
@@ -413,14 +412,14 @@ void Object::set(const StringName &p_name, const Variant &p_value, bool *r_valid
 		}
 	}
 
-	if (p_name == CoreStringNames::get_singleton()->_script) {
+	if (p_name == SNAME("script")) {
 		set_script(p_value);
 		if (r_valid) {
 			*r_valid = true;
 		}
 		return;
 
-	} else if (p_name == CoreStringNames::get_singleton()->_meta) {
+	} else if (p_name == SNAME("__meta__")) {
 		//set_meta(p_name,p_value);
 		metadata = p_value.duplicate();
 		if (r_valid) {
@@ -495,14 +494,14 @@ Variant Object::get(const StringName &p_name, bool *r_valid) const {
 		}
 	}
 
-	if (p_name == CoreStringNames::get_singleton()->_script) {
+	if (p_name == SNAME("script")) {
 		ret = get_script();
 		if (r_valid) {
 			*r_valid = true;
 		}
 		return ret;
 
-	} else if (p_name == CoreStringNames::get_singleton()->_meta) {
+	} else if (p_name == SNAME("__meta__")) {
 		ret = metadata;
 		if (r_valid) {
 			*r_valid = true;
@@ -706,7 +705,7 @@ Variant Object::_call_deferred_bind(const Variant **p_args, int p_argcount, Call
 }
 
 bool Object::has_method(const StringName &p_method) const {
-	if (p_method == CoreStringNames::get_singleton()->_free) {
+	if (p_method == SNAME("free")) {
 		return true;
 	}
 
@@ -777,7 +776,7 @@ Variant Object::call(const StringName &p_name, VARIANT_ARG_DECLARE) {
 Variant Object::call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	r_error.error = Callable::CallError::CALL_OK;
 
-	if (p_method == CoreStringNames::get_singleton()->_free) {
+	if (p_method == SNAME("free")) {
 //free must be here, before anything, always ready
 #ifdef DEBUG_ENABLED
 		if (p_argcount != 0) {
@@ -897,7 +896,7 @@ void Object::set_script(const Variant &p_script) {
 	}
 
 	notify_property_list_changed(); //scripts may add variables, so refresh is desired
-	emit_signal(CoreStringNames::get_singleton()->script_changed);
+	emit_signal(SNAME("script_changed"));
 }
 
 void Object::set_script_instance(ScriptInstance *p_instance) {
@@ -1536,7 +1535,7 @@ void Object::clear_internal_resource_paths() {
 }
 
 void Object::notify_property_list_changed() {
-	emit_signal(CoreStringNames::get_singleton()->property_list_changed);
+	emit_signal(SNAME("property_list_changed"));
 }
 
 void Object::_bind_methods() {

diff --git a/core/object/script_language.cpp b/core/object/script_language.cpp
@@ -31,7 +31,6 @@
 #include "script_language.h"
 
 #include "core/config/project_settings.h"
-#include "core/core_string_names.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"