From 9dc68003030f15d6eec2246e9d9df4e0541ce28e Mon Sep 17 00:00:00 2001
From: Patrick Wuttke <mewin@mewin.de>
Date: Sat, 21 Aug 2021 21:01:58 +0200
Subject: [PATCH] Replaced remaining emit_signal() calls with .emit()

---
 scripts/libs/coroutine.gd     |  6 ++++--
 scripts/libs/settings.gd      |  2 +-
 scripts/properties/entity.gd  | 10 +++++-----
 scripts/types/data_adapter.gd |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/scripts/libs/coroutine.gd b/scripts/libs/coroutine.gd
index ccf2eeb..466b029 100644
--- a/scripts/libs/coroutine.gd
+++ b/scripts/libs/coroutine.gd
@@ -37,7 +37,7 @@ class __WaitAll:
 				break
 		
 		if remaining_signals.is_empty():
-			emit_signal("finished", results)
+			finished.emit(results)
 	
 	signal finished(results)
 
@@ -62,7 +62,7 @@ class __WaitAny:
 		
 		# object and signal should be remaining (and some nulls)
 		assert(params.size() >= 2)
-		emit_signal("finished", params[0], params[1], sig_params)
+		finished.emit(params[0], params[1], sig_params)
 		
 		for con in get_signal_connection_list("_on_signal"):
 			con["source"].disconnect(con["signal"], self, "_on_signal")
@@ -102,6 +102,7 @@ func _init():
 #!                            "object" and "signal" elements.
 #! \returns An object with a "finished" signal.
 static func wait_for_all(objects_and_signals : Array) -> Object:
+	# TODO: this should just take an array of Signals now
 	var obj := __WaitAll.new()
 	if objects_and_signals:
 		obj.remaining_signals = objects_and_signals
@@ -137,6 +138,7 @@ static func wait_for_all(objects_and_signals : Array) -> Object:
 #!                            "object" and "signal" elements.
 #! \returns An object with a "finished" signal.
 static func wait_for_any(objects_and_signals : Array):
+	# TODO: this should just take an array of Signals now
 	var obj := __WaitAny.new()
 	obj.__connect_signals(objects_and_signals)
 	return obj
diff --git a/scripts/libs/settings.gd b/scripts/libs/settings.gd
index 68c7c05..7a27ce1 100644
--- a/scripts/libs/settings.gd
+++ b/scripts/libs/settings.gd
@@ -139,7 +139,7 @@ static func __load_data(data : Dictionary):
 static func __set_value(name : String, value):
 	__get_state().values[name] = value
 	__on_setting_changed(name, value)
-	__get_state().emit_signal("setting_changed", name, value)
+	__get_state().setting_changed.emit(name, value)
 
 static func __on_setting_changed(name : String, value):
 	if __get_state().disable_default_settings:
diff --git a/scripts/properties/entity.gd b/scripts/properties/entity.gd
index 51e767b..61dc34b 100644
--- a/scripts/properties/entity.gd
+++ b/scripts/properties/entity.gd
@@ -63,8 +63,8 @@ class _ArrayWrapperProperty extends _WrapperProperty:
 		var obj : Object = self.object.get_ref()
 		if obj:
 			_value = obj.get(self.member)
-			emit_signal("value_changed")
-			emit_signal("value_removed", value)
+			value_changed.emit()
+			value_removed.emit(value)
 
 class _GetSetWrapperProperty extends _CommonWrapperProperty:
 	var getter := Callable()
@@ -159,7 +159,7 @@ func add_property(id : String, property : Object, index := -1) -> void:
 	index = min(index, _properties.size())
 	_properties.insert(index, property)
 	_property_ids.insert(index, id)
-	emit_signal("property_added", index)
+	property_added.emit(index)
 
 func remove_property(property : Object) -> bool:
 	var index := find_property(property)
@@ -168,7 +168,7 @@ func remove_property(property : Object) -> bool:
 	
 	_properties.remove(index)
 	_property_ids.remove(index)
-	emit_signal("property_removed", index, property)
+	property_removed.emit(index, property)
 	return true
 
 func remove_property_at(index : int) -> bool:
@@ -188,7 +188,7 @@ func find_property_by_id(id : String) -> int:
 func __set_title(title : String) -> void:
 	if title != _title:
 		_title = title
-		emit_signal("entity_title_changed")
+		entity_title_changed.emit()
 
 ################
 # static stuff #
diff --git a/scripts/types/data_adapter.gd b/scripts/types/data_adapter.gd
index b02afc2..056f2cb 100644
--- a/scripts/types/data_adapter.gd
+++ b/scripts/types/data_adapter.gd
@@ -11,7 +11,7 @@ var data : Variant:
 func _set_data(data_) -> void:
 	if data_ != data:
 		data = data_
-		emit_signal("data_changed")
+		data_changed.emit()
 
 ###########
 # signals #