GUIButton: Use default member initializers

minetest · Aug 14, 2023 · 2903f69 · 2903f69
1 parent 7f9de5d
commit 2903f69
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 35 deletions.
diff --git a/src/gui/guiButton.cpp b/src/gui/guiButton.cpp
@@ -27,15 +27,10 @@ using namespace gui;
 
 //! constructor
 GUIButton::GUIButton(IGUIEnvironment* environment, IGUIElement* parent,
-			s32 id, core::rect<s32> rectangle, ISimpleTextureSource *tsrc,
-			bool noclip)
-: IGUIButton(environment, parent, id, rectangle),
-	SpriteBank(0), OverrideFont(0),
-	OverrideColorEnabled(false), OverrideColor(video::SColor(101,255,255,255)),
-	ClickTime(0), HoverTime(0), FocusTime(0),
-	ClickShiftState(false), ClickControlState(false),
-	IsPushButton(false), Pressed(false),
-	UseAlphaChannel(false), DrawBorder(true), ScaleImage(false), TSrc(tsrc)
+		s32 id, core::rect<s32> rectangle, ISimpleTextureSource *tsrc,
+		bool noclip) :
+	IGUIButton(environment, parent, id, rectangle),
+	TSrc(tsrc)
 {
 	setNotClipped(noclip);
 

diff --git a/src/gui/guiButton.h b/src/gui/guiButton.h
@@ -185,11 +185,9 @@ class GUIButton : public gui::IGUIButton
 
 	struct ButtonImage
 	{
-		ButtonImage() : Texture(0), SourceRect(core::rect<s32>(0,0,0,0))
-		{
-		}
+		ButtonImage() = default;
 
-		ButtonImage(const ButtonImage& other) : Texture(0), SourceRect(core::rect<s32>(0,0,0,0))
+		ButtonImage(const ButtonImage& other)
 		{
 			*this = other;
 		}
@@ -220,8 +218,8 @@ class GUIButton : public gui::IGUIButton
 		}
 
 
-		video::ITexture* Texture;
-		core::rect<s32> SourceRect;
+		video::ITexture* Texture = nullptr;
+		core::rect<s32> SourceRect = core::rect<s32>(0,0,0,0);
 	};
 
 	gui::EGUI_BUTTON_IMAGE_STATE getImageState(bool pressed, const ButtonImage* images) const;
@@ -230,43 +228,41 @@ class GUIButton : public gui::IGUIButton
 
 	struct ButtonSprite
 	{
-		ButtonSprite() : Index(-1), Loop(false), Scale(false)
-		{
-		}
-
-		bool operator==(const ButtonSprite& other) const
+		bool operator==(const ButtonSprite &other) const
 		{
 			return Index == other.Index && Color == other.Color && Loop == other.Loop && Scale == other.Scale;
 		}
 
-		s32 Index;
+		s32 Index = -1;
 		video::SColor Color;
-		bool Loop;
-		bool Scale;
+		bool Loop = false;
+		bool Scale = false;
 	};
 
 	ButtonSprite ButtonSprites[gui::EGBS_COUNT];
-	gui::IGUISpriteBank* SpriteBank;
+	gui::IGUISpriteBank* SpriteBank = nullptr;
 
 	ButtonImage ButtonImages[gui::EGBIS_COUNT];
 
 	std::array<StyleSpec, StyleSpec::NUM_STATES> Styles;
 
-	gui::IGUIFont* OverrideFont;
+	gui::IGUIFont* OverrideFont = nullptr;
 
-	bool OverrideColorEnabled;
-	video::SColor OverrideColor;
+	bool OverrideColorEnabled = false;
+	video::SColor OverrideColor = video::SColor(101,255,255,255);
 
-	u32 ClickTime, HoverTime, FocusTime;
+	u32 ClickTime = 0;
+	u32 HoverTime = 0;
+	u32 FocusTime = 0;
 
-	bool ClickShiftState;
-	bool ClickControlState;
+	bool ClickShiftState = false;
+	bool ClickControlState = false;
 
-	bool IsPushButton;
-	bool Pressed;
-	bool UseAlphaChannel;
-	bool DrawBorder;
-	bool ScaleImage;
+	bool IsPushButton = false;
+	bool Pressed = false;
+	bool UseAlphaChannel = false;
+	bool DrawBorder = true;
+	bool ScaleImage = false;
 
 	video::SColor Colors[4];
 	// PATCH