From ac5bab64b41396c0ddca28e225d6c3f1243da1d4 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 20 Apr 2022 14:22:43 +0200 Subject: [PATCH] [godot] Remove empty destructors. --- spine-godot/spine_godot/SpineAnimation.cpp | 3 --- spine-godot/spine_godot/SpineAnimation.h | 3 +-- spine-godot/spine_godot/SpineBone.cpp | 2 -- spine-godot/spine_godot/SpineBone.h | 1 - spine-godot/spine_godot/SpineBoneData.cpp | 3 --- spine-godot/spine_godot/SpineBoneData.h | 1 - spine-godot/spine_godot/SpineConstraintData.cpp | 3 --- spine-godot/spine_godot/SpineConstraintData.h | 9 ++++----- spine-godot/spine_godot/SpineEditorPlugin.h | 3 +-- spine-godot/spine_godot/SpineEvent.cpp | 3 --- spine-godot/spine_godot/SpineEvent.h | 13 ++++++------- spine-godot/spine_godot/SpineEventData.cpp | 3 --- spine-godot/spine_godot/SpineEventData.h | 11 +++++------ spine-godot/spine_godot/SpineIkConstraint.cpp | 3 --- spine-godot/spine_godot/SpineIkConstraint.h | 17 ++++++++--------- .../spine_godot/SpineIkConstraintData.cpp | 3 --- spine-godot/spine_godot/SpineIkConstraintData.h | 3 --- spine-godot/spine_godot/SpinePathConstraint.cpp | 3 ++- spine-godot/spine_godot/SpinePathConstraint.h | 1 - .../spine_godot/SpineSkeletonDataResource.cpp | 3 --- .../spine_godot/SpineSkeletonDataResource.h | 1 - .../spine_godot/SpineTransformConstraintData.h | 1 - 22 files changed, 27 insertions(+), 66 deletions(-) diff --git a/spine-godot/spine_godot/SpineAnimation.cpp b/spine-godot/spine_godot/SpineAnimation.cpp index 458e17431..ac862593d 100644 --- a/spine-godot/spine_godot/SpineAnimation.cpp +++ b/spine-godot/spine_godot/SpineAnimation.cpp @@ -47,9 +47,6 @@ void SpineAnimation::_bind_methods() { SpineAnimation::SpineAnimation() : animation(nullptr) { } -SpineAnimation::~SpineAnimation() { -} - String SpineAnimation::get_name() { SPINE_CHECK(animation, "") return animation->getName().buffer(); diff --git a/spine-godot/spine_godot/SpineAnimation.h b/spine-godot/spine_godot/SpineAnimation.h index 80c101ee3..b5917a432 100644 --- a/spine-godot/spine_godot/SpineAnimation.h +++ b/spine-godot/spine_godot/SpineAnimation.h @@ -49,10 +49,9 @@ protected: public: SpineAnimation(); - ~SpineAnimation(); void set_spine_object(spine::Animation *animation) { this->animation = animation; } - + spine::Animation *get_spine_object() { return animation; } void apply(Ref skeleton, float last_time, float time, bool loop, Array events, float alpha, SpineConstant::MixBlend blend, SpineConstant::MixDirection direction); diff --git a/spine-godot/spine_godot/SpineBone.cpp b/spine-godot/spine_godot/SpineBone.cpp index 2b82d70ec..d1916f6ea 100644 --- a/spine-godot/spine_godot/SpineBone.cpp +++ b/spine-godot/spine_godot/SpineBone.cpp @@ -101,8 +101,6 @@ void SpineBone::_bind_methods() { SpineBone::SpineBone() : bone(nullptr), sprite(nullptr) {} -SpineBone::~SpineBone() {} - void SpineBone::set_spine_sprite(SpineSprite* _sprite) { this->sprite = _sprite; } diff --git a/spine-godot/spine_godot/SpineBone.h b/spine-godot/spine_godot/SpineBone.h index b44c2a2d4..9de96b7f7 100644 --- a/spine-godot/spine_godot/SpineBone.h +++ b/spine-godot/spine_godot/SpineBone.h @@ -49,7 +49,6 @@ private: public: SpineBone(); - ~SpineBone(); void set_spine_object(spine::Bone *_bone) { bone = _bone; } diff --git a/spine-godot/spine_godot/SpineBoneData.cpp b/spine-godot/spine_godot/SpineBoneData.cpp index 33336b5c2..ca5bf7fb5 100644 --- a/spine-godot/spine_godot/SpineBoneData.cpp +++ b/spine-godot/spine_godot/SpineBoneData.cpp @@ -61,9 +61,6 @@ void SpineBoneData::_bind_methods() { SpineBoneData::SpineBoneData() : bone_data(nullptr) { } -SpineBoneData::~SpineBoneData() { -} - int SpineBoneData::get_index() { SPINE_CHECK(bone_data, 0) return bone_data->getIndex(); diff --git a/spine-godot/spine_godot/SpineBoneData.h b/spine-godot/spine_godot/SpineBoneData.h index d6417eca1..7c8a7ed96 100644 --- a/spine-godot/spine_godot/SpineBoneData.h +++ b/spine-godot/spine_godot/SpineBoneData.h @@ -45,7 +45,6 @@ private: public: SpineBoneData(); - ~SpineBoneData(); void set_spine_object(spine::BoneData *_bone_data) { bone_data = _bone_data; } diff --git a/spine-godot/spine_godot/SpineConstraintData.cpp b/spine-godot/spine_godot/SpineConstraintData.cpp index 7e953b835..d5b67574f 100644 --- a/spine-godot/spine_godot/SpineConstraintData.cpp +++ b/spine-godot/spine_godot/SpineConstraintData.cpp @@ -42,9 +42,6 @@ void SpineConstraintData::_bind_methods() { SpineConstraintData::SpineConstraintData() : constraint_data(nullptr) { } -SpineConstraintData::~SpineConstraintData() { -} - String SpineConstraintData::get_constraint_name() { SPINE_CHECK(constraint_data, "") return constraint_data->getName().buffer(); diff --git a/spine-godot/spine_godot/SpineConstraintData.h b/spine-godot/spine_godot/SpineConstraintData.h index fb4edc414..86b2fbb01 100644 --- a/spine-godot/spine_godot/SpineConstraintData.h +++ b/spine-godot/spine_godot/SpineConstraintData.h @@ -41,17 +41,16 @@ class SpineConstraintData : public Reference { protected: static void _bind_methods(); - + spine::ConstraintData *constraint_data; public: SpineConstraintData(); - ~SpineConstraintData(); void set_spine_object(spine::ConstraintData *_constraint_data) { constraint_data = _constraint_data; } - + spine::ConstraintData *get_spine_object() { return constraint_data; } @@ -59,11 +58,11 @@ public: String get_constraint_name(); uint64_t get_order(); - + void set_order(uint64_t v); bool is_skin_required(); - + void set_skin_required(bool v); }; diff --git a/spine-godot/spine_godot/SpineEditorPlugin.h b/spine-godot/spine_godot/SpineEditorPlugin.h index ed8e1fce9..1e0384f44 100644 --- a/spine-godot/spine_godot/SpineEditorPlugin.h +++ b/spine-godot/spine_godot/SpineEditorPlugin.h @@ -115,8 +115,7 @@ class SpineEditorPlugin : public EditorPlugin { GDCLASS(SpineEditorPlugin, EditorPlugin) public: - SpineEditorPlugin(EditorNode *node); - ~SpineEditorPlugin(); + explicit SpineEditorPlugin(EditorNode *node); String get_name() const override { return "SpineEditorPlugin"; } diff --git a/spine-godot/spine_godot/SpineEvent.cpp b/spine-godot/spine_godot/SpineEvent.cpp index f432a2bca..51d6901c1 100644 --- a/spine-godot/spine_godot/SpineEvent.cpp +++ b/spine-godot/spine_godot/SpineEvent.cpp @@ -48,9 +48,6 @@ void SpineEvent::_bind_methods() { SpineEvent::SpineEvent() : event(nullptr) { } -SpineEvent::~SpineEvent() { -} - Ref SpineEvent::get_data() { SPINE_CHECK(event, nullptr) Ref event_data(memnew(SpineEventData)); diff --git a/spine-godot/spine_godot/SpineEvent.h b/spine-godot/spine_godot/SpineEvent.h index e976b20de..ec830a9a2 100644 --- a/spine-godot/spine_godot/SpineEvent.h +++ b/spine-godot/spine_godot/SpineEvent.h @@ -45,34 +45,33 @@ private: public: SpineEvent(); - ~SpineEvent(); void set_spine_object(spine::Event *_event) { event = _event; } spine::Event *get_spine_object() const { return event; } - + Ref get_data(); float get_time(); int get_int_value(); - + void set_int_value(int v); float get_float_value(); - + void set_float_value(float v); String get_string_value(); - + void set_string_value(const String &v); float get_volume(); - + void set_volume(float v); float get_balance(); - + void set_balance(float v); }; diff --git a/spine-godot/spine_godot/SpineEventData.cpp b/spine-godot/spine_godot/SpineEventData.cpp index 281928be1..5d30a123b 100644 --- a/spine-godot/spine_godot/SpineEventData.cpp +++ b/spine-godot/spine_godot/SpineEventData.cpp @@ -47,9 +47,6 @@ void SpineEventData::_bind_methods() { SpineEventData::SpineEventData() : event_data(nullptr) { } -SpineEventData::~SpineEventData() { -} - String SpineEventData::get_event_name() { SPINE_CHECK(event_data, "") return event_data->getName().buffer(); diff --git a/spine-godot/spine_godot/SpineEventData.h b/spine-godot/spine_godot/SpineEventData.h index 32cb2b0ac..e364ecd22 100644 --- a/spine-godot/spine_godot/SpineEventData.h +++ b/spine-godot/spine_godot/SpineEventData.h @@ -44,7 +44,6 @@ private: public: SpineEventData(); - ~SpineEventData(); void set_spine_object(spine::EventData *_event_data) { event_data = _event_data; } @@ -53,23 +52,23 @@ public: String get_event_name(); int get_int_value(); - + void set_int_value(int v); float get_float_value(); - + void set_float_value(float v); String get_string_value(); - + void set_string_value(const String &v); float get_volume(); - + void set_volume(float v); float get_balance(); - + void set_balance(float v); }; diff --git a/spine-godot/spine_godot/SpineIkConstraint.cpp b/spine-godot/spine_godot/SpineIkConstraint.cpp index d25ed3fb4..3c7ae6fef 100644 --- a/spine-godot/spine_godot/SpineIkConstraint.cpp +++ b/spine-godot/spine_godot/SpineIkConstraint.cpp @@ -55,9 +55,6 @@ void SpineIkConstraint::_bind_methods() { SpineIkConstraint::SpineIkConstraint() : ik_constraint(nullptr) { } -SpineIkConstraint::~SpineIkConstraint() { -} - void SpineIkConstraint::update() { SPINE_CHECK(ik_constraint,) ik_constraint->update(); diff --git a/spine-godot/spine_godot/SpineIkConstraint.h b/spine-godot/spine_godot/SpineIkConstraint.h index fe2d945e0..f9f2a6589 100644 --- a/spine-godot/spine_godot/SpineIkConstraint.h +++ b/spine-godot/spine_godot/SpineIkConstraint.h @@ -46,12 +46,11 @@ private: public: SpineIkConstraint(); - ~SpineIkConstraint(); void set_spine_object(spine::IkConstraint *_ik_constraint) { ik_constraint = _ik_constraint; } spine::IkConstraint *get_spine_object() { return ik_constraint; } - + void update(); int get_order(); @@ -61,31 +60,31 @@ public: Array get_bones(); Ref get_target(); - + void set_target(Ref v); int get_bend_direction(); - + void set_bend_direction(int v); bool get_compress(); - + void set_compress(bool v); bool get_stretch(); - + void set_stretch(bool v); float get_mix(); - + void set_mix(float v); float get_softness(); - + void set_softness(float v); bool is_active(); - + void set_active(bool v); }; diff --git a/spine-godot/spine_godot/SpineIkConstraintData.cpp b/spine-godot/spine_godot/SpineIkConstraintData.cpp index 7ea25a40c..57ec83b84 100644 --- a/spine-godot/spine_godot/SpineIkConstraintData.cpp +++ b/spine-godot/spine_godot/SpineIkConstraintData.cpp @@ -48,9 +48,6 @@ void SpineIkConstraintData::_bind_methods() { ClassDB::bind_method(D_METHOD("set_softness", "v"), &SpineIkConstraintData::set_softness); } -SpineIkConstraintData::SpineIkConstraintData() {} -SpineIkConstraintData::~SpineIkConstraintData() {} - Array SpineIkConstraintData::get_bones() { Array result; SPINE_CHECK(constraint_data, result) diff --git a/spine-godot/spine_godot/SpineIkConstraintData.h b/spine-godot/spine_godot/SpineIkConstraintData.h index 4f5a84eea..4520d586e 100644 --- a/spine-godot/spine_godot/SpineIkConstraintData.h +++ b/spine-godot/spine_godot/SpineIkConstraintData.h @@ -43,9 +43,6 @@ protected: static void _bind_methods(); public: - SpineIkConstraintData(); - ~SpineIkConstraintData(); - Array get_bones(); Ref get_target(); diff --git a/spine-godot/spine_godot/SpinePathConstraint.cpp b/spine-godot/spine_godot/SpinePathConstraint.cpp index 3cdef2d5d..eaa750894 100644 --- a/spine-godot/spine_godot/SpinePathConstraint.cpp +++ b/spine-godot/spine_godot/SpinePathConstraint.cpp @@ -52,7 +52,8 @@ void SpinePathConstraint::_bind_methods() { ClassDB::bind_method(D_METHOD("set_active", "v"), &SpinePathConstraint::set_active); } -SpinePathConstraint::SpinePathConstraint() : path_constraint(nullptr) {} +SpinePathConstraint::SpinePathConstraint() : path_constraint(nullptr) { +} void SpinePathConstraint::update() { SPINE_CHECK(path_constraint,) diff --git a/spine-godot/spine_godot/SpinePathConstraint.h b/spine-godot/spine_godot/SpinePathConstraint.h index 122be6493..7e650fcf3 100644 --- a/spine-godot/spine_godot/SpinePathConstraint.h +++ b/spine-godot/spine_godot/SpinePathConstraint.h @@ -45,7 +45,6 @@ private: public: SpinePathConstraint(); - ~SpinePathConstraint() = default; void set_spine_object(spine::PathConstraint *_path_constraint) { path_constraint = _path_constraint; } spine::PathConstraint *get_spine_object() { return path_constraint; } diff --git a/spine-godot/spine_godot/SpineSkeletonDataResource.cpp b/spine-godot/spine_godot/SpineSkeletonDataResource.cpp index 86499297a..1226ce329 100644 --- a/spine-godot/spine_godot/SpineSkeletonDataResource.cpp +++ b/spine-godot/spine_godot/SpineSkeletonDataResource.cpp @@ -47,9 +47,6 @@ void SpineAnimationMix::_bind_methods() { SpineAnimationMix::SpineAnimationMix(): from(""), to(""), mix(0) { } -SpineAnimationMix::~SpineAnimationMix() { -} - void SpineAnimationMix::set_from(const StringName &from) { this->from = from; } diff --git a/spine-godot/spine_godot/SpineSkeletonDataResource.h b/spine-godot/spine_godot/SpineSkeletonDataResource.h index 01bee4fae..d30e6a0f5 100644 --- a/spine-godot/spine_godot/SpineSkeletonDataResource.h +++ b/spine-godot/spine_godot/SpineSkeletonDataResource.h @@ -23,7 +23,6 @@ protected: float mix; public: SpineAnimationMix(); - ~SpineAnimationMix(); void set_from(const StringName &from); diff --git a/spine-godot/spine_godot/SpineTransformConstraintData.h b/spine-godot/spine_godot/SpineTransformConstraintData.h index c1199f0c2..642f7a959 100644 --- a/spine-godot/spine_godot/SpineTransformConstraintData.h +++ b/spine-godot/spine_godot/SpineTransformConstraintData.h @@ -43,7 +43,6 @@ protected: static void _bind_methods(); public: - Array get_bones(); Ref get_target();