From 826e0a73265931276b0dc5752fe8d8498ef6ad64 Mon Sep 17 00:00:00 2001
From: badlogic <badlogicgames@gmail.com>
Date: Tue, 12 Apr 2022 14:03:29 +0200
Subject: [PATCH] [godot] Clean-up SpineConstraintData.

---
 .../spine_godot/SpineConstraintData.cpp       | 22 ++++++++++++++-----
 spine-godot/spine_godot/SpineConstraintData.h | 15 ++++++++-----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/spine-godot/spine_godot/SpineConstraintData.cpp b/spine-godot/spine_godot/SpineConstraintData.cpp
index 16bbac435..ace5a3932 100644
--- a/spine-godot/spine_godot/SpineConstraintData.cpp
+++ b/spine-godot/spine_godot/SpineConstraintData.cpp
@@ -28,32 +28,44 @@
  *****************************************************************************/
 
 #include "SpineConstraintData.h"
+#include <spine/ConstraintData.h>
+#include "common.h"
 
 void SpineConstraintData::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("get_constraint_data_name"), &SpineConstraintData::get_constraint_data_name);
+	ClassDB::bind_method(D_METHOD("get_constraint_name"), &SpineConstraintData::get_constraint_name);
 	ClassDB::bind_method(D_METHOD("get_order"), &SpineConstraintData::get_order);
 	ClassDB::bind_method(D_METHOD("set_order", "v"), &SpineConstraintData::set_order);
 	ClassDB::bind_method(D_METHOD("is_skin_required"), &SpineConstraintData::is_skin_required);
 	ClassDB::bind_method(D_METHOD("set_skin_required", "v"), &SpineConstraintData::set_skin_required);
 }
 
-SpineConstraintData::SpineConstraintData() : constraint_data(NULL) {}
-SpineConstraintData::~SpineConstraintData() {}
+SpineConstraintData::SpineConstraintData() : constraint_data(nullptr) {
+}
 
-String SpineConstraintData::get_constraint_data_name() {
+SpineConstraintData::~SpineConstraintData() {
+}
+
+String SpineConstraintData::get_constraint_name() {
+	SPINE_CHECK(constraint_data, "")
 	return constraint_data->getName().buffer();
 }
 
 uint64_t SpineConstraintData::get_order() {
+	SPINE_CHECK(constraint_data, 0)
 	return constraint_data->getOrder();
 }
+
 void SpineConstraintData::set_order(uint64_t v) {
+	SPINE_CHECK(constraint_data,)
 	constraint_data->setOrder(v);
 }
 
 bool SpineConstraintData::is_skin_required() {
+	SPINE_CHECK(constraint_data, false)
 	return constraint_data->isSkinRequired();
 }
+
 void SpineConstraintData::set_skin_required(bool v) {
+	SPINE_CHECK(constraint_data,)
 	constraint_data->setSkinRequired(v);
-}
\ No newline at end of file
+}
diff --git a/spine-godot/spine_godot/SpineConstraintData.h b/spine-godot/spine_godot/SpineConstraintData.h
index 35b9dd52a..c35f24697 100644
--- a/spine-godot/spine_godot/SpineConstraintData.h
+++ b/spine-godot/spine_godot/SpineConstraintData.h
@@ -30,9 +30,11 @@
 #ifndef GODOT_SPINECONSTRAINTDATA_H
 #define GODOT_SPINECONSTRAINTDATA_H
 
-#include "core/variant_parser.h"
+#include "core/reference.h"
 
-#include <spine/spine.h>
+namespace spine {
+	class ConstraintData;
+}
 
 class SpineConstraintData : public Reference {
 	GDCLASS(SpineConstraintData, Reference);
@@ -47,19 +49,22 @@ public:
 	SpineConstraintData();
 	~SpineConstraintData();
 
-	inline void set_spine_object(spine::ConstraintData *c) {
+	void set_spine_object(spine::ConstraintData *c) {
 		constraint_data = c;
 	}
-	virtual inline spine::ConstraintData *get_spine_object() {
+	
+	spine::ConstraintData *get_spine_object() {
 		return constraint_data;
 	}
 
-	String get_constraint_data_name();
+	String get_constraint_name();
 
 	uint64_t get_order();
+	
 	void set_order(uint64_t v);
 
 	bool is_skin_required();
+	
 	void set_skin_required(bool v);
 };