From 31cb04fbdda17b1321504faa0f1e2b2c510be7e5 Mon Sep 17 00:00:00 2001
From: Tomasz Chabora <kobewi4e@gmail.com>
Date: Fri, 11 Dec 2020 15:54:03 +0100
Subject: Move initialization of some classes to headers

---
 scene/gui/control.cpp | 35 -----------------------------------
 scene/gui/control.h   | 49 ++++++++++++++++++++++++-------------------------
 scene/gui/panel.cpp   |  3 ---
 scene/gui/panel.h     |  1 -
 4 files changed, 24 insertions(+), 64 deletions(-)

(limited to 'scene/gui')

diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index b471bb9d4e..ec24116216 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -3043,38 +3043,3 @@ void Control::_bind_methods() {
 
 	BIND_VMETHOD(MethodInfo(Variant::BOOL, "has_point", PropertyInfo(Variant::VECTOR2, "point")));
 }
-
-Control::Control() {
-	data.parent = nullptr;
-
-	data.mouse_filter = MOUSE_FILTER_STOP;
-
-	data.RI = nullptr;
-	data.theme_owner = nullptr;
-	data.theme_owner_window = nullptr;
-	data.default_cursor = CURSOR_ARROW;
-	data.layout_dir = LAYOUT_DIRECTION_INHERITED;
-	data.h_size_flags = SIZE_FILL;
-	data.v_size_flags = SIZE_FILL;
-	data.expand = 1;
-	data.rotation = 0;
-	data.parent_canvas_item = nullptr;
-	data.scale = Vector2(1, 1);
-
-	data.block_minimum_size_adjust = false;
-	data.disable_visibility_clip = false;
-	data.h_grow = GROW_DIRECTION_END;
-	data.v_grow = GROW_DIRECTION_END;
-	data.minimum_size_valid = false;
-	data.updating_last_minimum_size = false;
-
-	data.clip_contents = false;
-	for (int i = 0; i < 4; i++) {
-		data.anchor[i] = ANCHOR_BEGIN;
-		data.margin[i] = 0;
-	}
-	data.focus_mode = FOCUS_NONE;
-}
-
-Control::~Control() {
-}
diff --git a/scene/gui/control.h b/scene/gui/control.h
index 8496729f05..0d90bc5964 100644
--- a/scene/gui/control.h
+++ b/scene/gui/control.h
@@ -166,46 +166,46 @@ private:
 		Point2 pos_cache;
 		Size2 size_cache;
 		Size2 minimum_size_cache;
-		bool minimum_size_valid;
+		bool minimum_size_valid = false;
 
 		Size2 last_minimum_size;
-		bool updating_last_minimum_size;
+		bool updating_last_minimum_size = false;
 
-		float margin[4];
-		float anchor[4];
-		FocusMode focus_mode;
-		GrowDirection h_grow;
-		GrowDirection v_grow;
+		float margin[4] = { 0.0, 0.0, 0.0, 0.0 };
+		float anchor[4] = { ANCHOR_BEGIN, ANCHOR_BEGIN, ANCHOR_BEGIN, ANCHOR_BEGIN };
+		FocusMode focus_mode = FOCUS_NONE;
+		GrowDirection h_grow = GROW_DIRECTION_END;
+		GrowDirection v_grow = GROW_DIRECTION_END;
 
-		LayoutDirection layout_dir;
+		LayoutDirection layout_dir = LAYOUT_DIRECTION_INHERITED;
 
-		float rotation;
-		Vector2 scale;
+		float rotation = 0;
+		Vector2 scale = Vector2(1, 1);
 		Vector2 pivot_offset;
 
-		int h_size_flags;
-		int v_size_flags;
-		float expand;
+		int h_size_flags = SIZE_FILL;
+		int v_size_flags = SIZE_FILL;
+		float expand = 1;
 		Point2 custom_minimum_size;
 
-		MouseFilter mouse_filter;
+		MouseFilter mouse_filter = MOUSE_FILTER_STOP;
 
-		bool clip_contents;
+		bool clip_contents = false;
 
-		bool block_minimum_size_adjust;
-		bool disable_visibility_clip;
+		bool block_minimum_size_adjust = false;
+		bool disable_visibility_clip = false;
 
-		Control *parent;
+		Control *parent = nullptr;
 		ObjectID drag_owner;
 		Ref<Theme> theme;
-		Control *theme_owner;
-		Window *theme_owner_window;
+		Control *theme_owner = nullptr;
+		Window *theme_owner_window = nullptr;
 		String tooltip;
-		CursorShape default_cursor;
+		CursorShape default_cursor = CURSOR_ARROW;
 
-		List<Control *>::Element *RI;
+		List<Control *>::Element *RI = nullptr;
 
-		CanvasItem *parent_canvas_item;
+		CanvasItem *parent_canvas_item = nullptr;
 
 		NodePath focus_neighbour[4];
 		NodePath focus_next;
@@ -518,8 +518,7 @@ public:
 	virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override;
 	virtual String get_configuration_warning() const override;
 
-	Control();
-	~Control();
+	Control() {}
 };
 
 VARIANT_ENUM_CAST(Control::FocusMode);
diff --git a/scene/gui/panel.cpp b/scene/gui/panel.cpp
index acbb6d7ab5..28cc056d6e 100644
--- a/scene/gui/panel.cpp
+++ b/scene/gui/panel.cpp
@@ -63,6 +63,3 @@ Panel::Panel() {
 	// Has visible stylebox, so stop by default.
 	set_mouse_filter(MOUSE_FILTER_STOP);
 }
-
-Panel::~Panel() {
-}
diff --git a/scene/gui/panel.h b/scene/gui/panel.h
index a68c3d3f0c..e2c1ddc91d 100644
--- a/scene/gui/panel.h
+++ b/scene/gui/panel.h
@@ -54,7 +54,6 @@ public:
 	Mode get_mode() const;
 
 	Panel();
-	~Panel();
 };
 
 VARIANT_ENUM_CAST(Panel::Mode)
-- 
cgit v1.2.3