Use default member initializers

Author: Crayon2000

source/audio.cpp

@@ -21,8 +21,7 @@ static constexpr Sound RollOverSound(VOICE_MONO16, std::span{button_rollover_raw
 /**
  * Constructor for the Audio class.
  */
-Audio::Audio() :
-    Paused(false)
+Audio::Audio()
 {
     AESND_Init();
     AESND_Pause(false);

source/audio.h

@@ -26,9 +26,9 @@ class Audio
     void PlaySoundScreenChange(u16 Volume);
     void PlaySoundButton(u16 Volume);
 private:
-    bool Paused;
-    Voice *ScreenVoice;
-    Voice *ButtonVoice;
+    bool Paused{false};
+    Voice *ScreenVoice{nullptr};
+    Voice *ButtonVoice{nullptr};
 };
 //---------------------------------------------------------------------------
 #endif

source/button.cpp

@@ -13,15 +13,6 @@
  * @param[in] NewType Button type.
  */
 Button::Button(buttonType NewType) : Object(),
-    Focused(false),
-    Selected(false),
-    Caption(""),
-    Font(nullptr),
-    TextWidth(100), // random value
-    TextHeight(14),
-    TextTop(0),
-    TextLeft(0),
-    TextColor(0x000000FF),
     Type(NewType)
 {
     switch(Type)

source/button.h

@@ -28,7 +28,8 @@ enum class buttonType : u8 {
 class Button : public Object
 {
 public:
-    Button(buttonType = buttonType::StdMenu);
+    Button() = default;
+    Button(buttonType NewType);
     Button(Button const&) = delete;
     ~Button() = default;
     Button& operator=(Button const&) = delete;
@@ -40,16 +41,16 @@ class Button : public Object
     void SetTextColor(u32 NewColor);
     void SetTextHeight(unsigned int NewHeight);
 private:
-    bool Focused;
-    bool Selected;
-    std::string Caption;
-    GRRLIB_ttfFont *Font;
-    unsigned int TextWidth;
-    unsigned int TextHeight;
-    unsigned int TextTop;
-    unsigned int TextLeft;
-    u32 TextColor;
-    buttonType Type;
+    bool Focused{false};
+    bool Selected{false};
+    std::string Caption{};
+    GRRLIB_ttfFont *Font{nullptr};
+    unsigned int TextWidth{100}; // random default value
+    unsigned int TextHeight{14};
+    unsigned int TextTop{0};
+    unsigned int TextLeft{0};
+    u32 TextColor{0x000000FF};
+    buttonType Type{buttonType::StdMenu};
     std::unique_ptr<Texture> ButtonImgOn;
     std::unique_ptr<Texture> ButtonImgOff;
     std::unique_ptr<Texture> ButtonSelected;

source/object.cpp

@@ -1,19 +1,5 @@
 #include "object.h"
 
-/**
- * Constructor for the Object class.
- */
-Object::Object() :
-    Left(0),
-    Top(0),
-    Width(0),
-    Height(0),
-    Angle(0.0),
-    Visible(true),
-    Color(0xFFFFFFFF)
-{
-}
-
 /**
  * Get the left position of the object.
  * @see SetLeft()

source/object.h

@@ -16,7 +16,10 @@
 class Object
 {
 public:
-    Object();
+    /**
+     * Constructor for the Object class.
+     */
+    Object() = default;
     Object(Object const&) = delete;
     virtual ~Object() = default;
     Object& operator=(Object const&) = delete;
@@ -42,13 +45,13 @@ class Object
 protected:
     virtual void Paint() = 0; /**< Draw an image on screen. */
 
-    float Left;         /**< Specifies the x-coordinate of the upper-left corner of the object. */
-    float Top;          /**< Specifies the y-coordinate of the upper-left corner of the object. */
-    unsigned int Width; /**< The width of the object. */
-    unsigned int Height;/**< The height of the object. */
-    float Angle;        /**< The angle in degree of the object. */
-    bool Visible;       /**< Control the visibility of the object. If Visible is true, the object appears. If Visible is false, the object is not visible. */
-    u32 Color;          /**< Color of the object (RGBA). */
+    float Left{0.0f};       /**< Specifies the x-coordinate of the upper-left corner of the object. */
+    float Top{0.0f};        /**< Specifies the y-coordinate of the upper-left corner of the object. */
+    unsigned int Width{0};  /**< The width of the object. */
+    unsigned int Height{0}; /**< The height of the object. */
+    float Angle{0.0f};      /**< The angle in degree of the object. */
+    bool Visible{true};     /**< Control the visibility of the object. If Visible is true, the object appears. If Visible is false, the object is not visible. */
+    u32 Color{0xFFFFFFFF};  /**< Color of the object (RGBA). */
     //char *Name;
     //void *Parent;
 };

source/player.cpp

@@ -1,14 +1,5 @@
 #include "player.h"
 
-/**
- * Constructor for the Player class.
- */
-Player::Player() :
-    Score(0),
-    Type(playerType::Human)
-{
-}
-
 /**
  * Set the player name.
  * @param[in] AName Give a name to the player.

source/player.h

@@ -25,7 +25,10 @@ enum class playerType : u8 {
 class Player
 {
 public:
-    Player();
+    /**
+     * Constructor for the Player class.
+     */ 
+    Player() = default;
     Player(Player const&) = delete;
     ~Player() = default;
     Player& operator=(Player const&) = delete;
@@ -39,10 +42,10 @@ class Player
     void SetType(playerType AType);
     [[nodiscard]] playerType GetType();
 private:
-    u16 Score;
-    std::string Name;
-    u8 Sign;
-    playerType Type;
+    u16 Score{0};
+    std::string Name{};
+    u8 Sign{0};
+    playerType Type{playerType::Human};
 };
 //---------------------------------------------------------------------------
 #endif