Replaced remaining emit_signal() calls with .emit()

This commit is contained in:
2021-08-21 21:01:58 +02:00
parent 74d4a37de2
commit 9dc6800303
4 changed files with 11 additions and 9 deletions

View File

@@ -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

View File

@@ -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: