|
@@ -1266,10 +1266,6 @@ void Object::get_signals_connected_to_this(List<Connection> *p_connections) cons
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-Error Object::connect_compat(const StringName &p_signal, Object *p_to_object, const StringName &p_to_method, const Vector<Variant> &p_binds, uint32_t p_flags) {
|
|
|
|
- return connect(p_signal, Callable(p_to_object, p_to_method), p_binds, p_flags);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
Error Object::connect(const StringName &p_signal, const Callable &p_callable, const Vector<Variant> &p_binds, uint32_t p_flags) {
|
|
Error Object::connect(const StringName &p_signal, const Callable &p_callable, const Vector<Variant> &p_binds, uint32_t p_flags) {
|
|
ERR_FAIL_COND_V(p_callable.is_null(), ERR_INVALID_PARAMETER);
|
|
ERR_FAIL_COND_V(p_callable.is_null(), ERR_INVALID_PARAMETER);
|
|
|
|
|
|
@@ -1331,10 +1327,6 @@ Error Object::connect(const StringName &p_signal, const Callable &p_callable, co
|
|
return OK;
|
|
return OK;
|
|
}
|
|
}
|
|
|
|
|
|
-bool Object::is_connected_compat(const StringName &p_signal, Object *p_to_object, const StringName &p_to_method) const {
|
|
|
|
- return is_connected(p_signal, Callable(p_to_object, p_to_method));
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
bool Object::is_connected(const StringName &p_signal, const Callable &p_callable) const {
|
|
bool Object::is_connected(const StringName &p_signal, const Callable &p_callable) const {
|
|
ERR_FAIL_COND_V(p_callable.is_null(), false);
|
|
ERR_FAIL_COND_V(p_callable.is_null(), false);
|
|
const SignalData *s = signal_map.getptr(p_signal);
|
|
const SignalData *s = signal_map.getptr(p_signal);
|
|
@@ -1358,10 +1350,6 @@ bool Object::is_connected(const StringName &p_signal, const Callable &p_callable
|
|
//return (E!=nullptr );
|
|
//return (E!=nullptr );
|
|
}
|
|
}
|
|
|
|
|
|
-void Object::disconnect_compat(const StringName &p_signal, Object *p_to_object, const StringName &p_to_method) {
|
|
|
|
- _disconnect(p_signal, Callable(p_to_object, p_to_method));
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
void Object::disconnect(const StringName &p_signal, const Callable &p_callable) {
|
|
void Object::disconnect(const StringName &p_signal, const Callable &p_callable) {
|
|
_disconnect(p_signal, p_callable);
|
|
_disconnect(p_signal, p_callable);
|
|
}
|
|
}
|