|
@@ -1319,7 +1319,7 @@ Error Object::connect(const StringName& p_signal, Object *p_to_object, const Str
|
|
|
if (!s) {
|
|
|
bool signal_is_valid = ObjectTypeDB::has_signal(get_type_name(),p_signal);
|
|
|
if (!signal_is_valid) {
|
|
|
- ERR_EXPLAIN("Attempt to connect to unexisting signal: "+p_signal);
|
|
|
+ ERR_EXPLAIN("Attempt to connect to nonexistent signal: "+p_signal);
|
|
|
ERR_FAIL_COND_V(!signal_is_valid,ERR_INVALID_PARAMETER);
|
|
|
}
|
|
|
signal_map[p_signal]=Signal();
|
|
@@ -1356,7 +1356,7 @@ bool Object::is_connected(const StringName& p_signal, Object *p_to_object, const
|
|
|
bool signal_is_valid = ObjectTypeDB::has_signal(get_type_name(),p_signal);
|
|
|
if (signal_is_valid)
|
|
|
return false;
|
|
|
- ERR_EXPLAIN("Unexisting signal: "+p_signal);
|
|
|
+ ERR_EXPLAIN("Nonexistent signal: "+p_signal);
|
|
|
ERR_FAIL_COND_V(!s,false);
|
|
|
}
|
|
|
|
|
@@ -1373,7 +1373,7 @@ void Object::disconnect(const StringName& p_signal, Object *p_to_object, const S
|
|
|
ERR_FAIL_NULL(p_to_object);
|
|
|
Signal *s = signal_map.getptr(p_signal);
|
|
|
if (!s) {
|
|
|
- ERR_EXPLAIN("Unexisting signal: "+p_signal);
|
|
|
+ ERR_EXPLAIN("Nonexistent signal: "+p_signal);
|
|
|
ERR_FAIL_COND(!s);
|
|
|
}
|
|
|
if (s->lock>0) {
|
|
@@ -1384,7 +1384,7 @@ void Object::disconnect(const StringName& p_signal, Object *p_to_object, const S
|
|
|
Signal::Target target(p_to_object->get_instance_ID(),p_to_method);
|
|
|
|
|
|
if (!s->slot_map.has(target)) {
|
|
|
- ERR_EXPLAIN("Disconnecting unexisting signal '"+p_signal+"', slot: "+itos(target._id)+":"+target.method);
|
|
|
+ ERR_EXPLAIN("Disconnecting nonexistent signal '"+p_signal+"', slot: "+itos(target._id)+":"+target.method);
|
|
|
ERR_FAIL();
|
|
|
}
|
|
|
int prev = p_to_object->connections.size();
|