Switched to brace initialization, benefits are that it won't implicitly narrow a literal value to fit the type without a warning or error.

calebtt · calebtt · commit b5b139892837 · 2022-01-29T07:21:53.000-06:00
diff --git a/XMapLib/CPPRunnerGeneric.h b/XMapLib/CPPRunnerGeneric.h
@@ -32,8 +32,8 @@ namespace sds
 		const LambdaType m_lambda;
 		InternalData m_local_state{}; // default constructed type InternalData
 		std::atomic<bool> m_is_stop_requested{ false };
-		std::unique_ptr<std::thread> m_local_thread;
-		std::mutex m_state_mutex;
+		std::unique_ptr<std::thread> m_local_thread{};
+		std::mutex m_state_mutex{};
 	public:
 		/// <summary>Starts running a new thread for the lambda.</summary>
 		///	<returns>true on success, false on failure.</returns>
diff --git a/XMapLib/DelayManager.h b/XMapLib/DelayManager.h
@@ -7,9 +7,9 @@ namespace sds::Utilities
 	class DelayManager
 	{
 		using TimeType = std::chrono::time_point<std::chrono::high_resolution_clock>;
-		TimeType m_start_time = std::chrono::high_resolution_clock::now();
-		size_t m_duration = 1;
-		bool m_has_fired = false;
+		TimeType m_start_time{ std::chrono::high_resolution_clock::now() };
+		size_t m_duration{ 1 };
+		bool m_has_fired{ false };
 	public:
 		//us is microseconds
 		DelayManager() = delete;
diff --git a/XMapLib/KeyboardInputPoller.h b/XMapLib/KeyboardInputPoller.h
@@ -13,9 +13,9 @@ namespace sds
 		using InternalType = std::vector<XINPUT_KEYSTROKE>;
 		using LambdaRunnerType = sds::CPPRunnerGeneric<InternalType>;
 		using lock = LambdaRunnerType::ScopedLockType;
-		const int EMPTY_COUNT = 5000;
-		KeyboardPlayerInfo m_local_player;
-		std::unique_ptr<LambdaRunnerType> m_workThread;
+		const int EMPTY_COUNT{ 5000 };
+		KeyboardPlayerInfo m_local_player{};
+		std::unique_ptr<LambdaRunnerType> m_workThread{};
 		void InitWorkThread() noexcept
 		{
 			m_workThread =
diff --git a/XMapLib/KeyboardKeyMap.h b/XMapLib/KeyboardKeyMap.h
@@ -21,10 +21,10 @@ namespace sds
 			KEYUP = XINPUT_KEYSTROKE_KEYUP
 		};
 		//Struct members
-		int SendingElementVK = 0; // VK of controller button
-		int MappedToVK = 0; // VK of mapped-to input (key or mouse button)
-		bool UsesRepeat = true; // Uses the key-repeat behavior when held down
-		ActionType LastAction = ActionType::NONE;
+		int SendingElementVK{ 0 }; // VK of controller button
+		int MappedToVK{ 0 }; // VK of mapped-to input (key or mouse button)
+		bool UsesRepeat{ true }; // Uses the key-repeat behavior when held down
+		ActionType LastAction{ ActionType::NONE };
 		Utilities::DelayManager LastSentTime{ KeyboardSettings::MICROSECONDS_DELAY_KEYREPEAT };
 		//Ctor
 		KeyboardKeyMap(const int controllerElementVK, const int keyboardMouseElementVK, const bool useRepeat)
diff --git a/XMapLib/KeyboardMapper.h b/XMapLib/KeyboardMapper.h
@@ -14,10 +14,10 @@ namespace sds
 		using InternalType = int;
 		using LambdaRunnerType = sds::CPPRunnerGeneric<InternalType>;
 		using lock = LambdaRunnerType::ScopedLockType;
-		sds::KeyboardPlayerInfo m_localPlayerInfo;
-		sds::KeyboardInputPoller m_poller;
-		sds::KeyboardTranslator m_translator;
-		std::unique_ptr<LambdaRunnerType> m_workThread;
+		sds::KeyboardPlayerInfo m_localPlayerInfo{};
+		sds::KeyboardInputPoller m_poller{};
+		sds::KeyboardTranslator m_translator{};
+		std::unique_ptr<LambdaRunnerType> m_workThread{};
 		void InitWorkThread() noexcept
 		{
 			m_workThread =
diff --git a/XMapLib/KeyboardSettings.h b/XMapLib/KeyboardSettings.h
@@ -7,11 +7,11 @@ namespace sds
 	struct KeyboardSettings
 	{
 		//Input Poller maximum number of XINPUT_KEYSTROKE structs to queue before dropping input.
-		constexpr static const int MAX_STATE_COUNT = 128;
+		constexpr static const int MAX_STATE_COUNT{ 128 };
 		//Input Poller thread delay, in milliseconds.
-		constexpr static const int THREAD_DELAY_POLLER = 10;
+		constexpr static const int THREAD_DELAY_POLLER{ 10 };
 		//Microseconds Delay Keyrepeat is the time delay a button has in between activations.
-		constexpr static const int MICROSECONDS_DELAY_KEYREPEAT = 100000;
+		constexpr static const int MICROSECONDS_DELAY_KEYREPEAT{ 100000 };
 		//It is necessary to be able to distinguish these mapping values in KeyboardTranslator.
 		constexpr static std::array<int,8> THUMBSTICK_L_VK_LIST
 		{
diff --git a/XMapLib/KeyboardTranslator.h b/XMapLib/KeyboardTranslator.h
@@ -15,15 +15,15 @@ namespace sds
 	/// </summary>
 	class KeyboardTranslator
 	{
-		const std::string ERR_BAD_VK = "Either WordData.MappedToVK OR WordData.SendElementVK is <= 0";
-		const std::string ERR_DUP_KEYUP = "Sent a duplicate keyup event to handle thumbstick direction changing behavior.";
 		using ClockType = std::chrono::high_resolution_clock;
 		using PointInTime = std::chrono::time_point<ClockType>;
 		using InpType = sds::KeyboardKeyMap::ActionType;
+		const std::string ERR_BAD_VK{ "Either WordData.MappedToVK OR WordData.SendElementVK is <= 0" };
+		const std::string ERR_DUP_KEYUP{ "Sent a duplicate keyup event to handle thumbstick direction changing behavior." };
 	private:
-		Utilities::SendKeyInput m_key_send;
-		std::vector<KeyboardKeyMap> m_map_token_info;
-		KeyboardPlayerInfo m_local_player;
+		Utilities::SendKeyInput m_key_send{};
+		std::vector<KeyboardKeyMap> m_map_token_info{};
+		KeyboardPlayerInfo m_local_player{};
 	public:
 		explicit KeyboardTranslator(const KeyboardPlayerInfo &p) : m_local_player(p)
 		{
diff --git a/XMapLib/MouseInputPoller.h b/XMapLib/MouseInputPoller.h
@@ -13,8 +13,8 @@ namespace sds
 		using InternalType = XINPUT_STATE;
 		using LambdaRunnerType = sds::CPPRunnerGeneric<InternalType>;
 		using lock = LambdaRunnerType::ScopedLockType;
-		MousePlayerInfo m_local_player;
-		std::unique_ptr<LambdaRunnerType> m_workThread;
+		MousePlayerInfo m_local_player{};
+		std::unique_ptr<LambdaRunnerType> m_workThread{};
 		void InitWorkThread() noexcept
 		{
 			m_workThread =
diff --git a/XMapLib/MouseMapper.h b/XMapLib/MouseMapper.h
@@ -21,9 +21,9 @@ namespace sds
 		std::atomic<SHORT> m_thread_x{ 0 };
 		std::atomic<SHORT> m_thread_y{0};
 		std::atomic<int> m_mouse_sensitivity{ MouseSettings::SENSITIVITY_DEFAULT };
-		sds::MousePlayerInfo m_local_player;
-		sds::MouseInputPoller m_poller;
-		std::unique_ptr<LambdaRunnerType> m_workThread;
+		sds::MousePlayerInfo m_local_player{};
+		sds::MouseInputPoller m_poller{};
+		std::unique_ptr<LambdaRunnerType> m_workThread{};
 		void InitWorkThread() noexcept
 		{
 			m_workThread =
diff --git a/XMapLib/MouseMoveThread.h b/XMapLib/MouseMoveThread.h
@@ -17,7 +17,7 @@ namespace sds
 		std::atomic<bool> m_is_y_moving{ false };
 		std::atomic<bool> m_is_x_positive{ false };
 		std::atomic<bool> m_is_y_positive{ false };
-		std::unique_ptr<LambdaRunnerType> m_workThread;
+		std::unique_ptr<LambdaRunnerType> m_workThread{};
 		void InitWorkThread() noexcept
 		{
 			m_workThread =
diff --git a/XMapLib/MouseSettings.h b/XMapLib/MouseSettings.h
@@ -8,37 +8,37 @@ namespace sds
 	{
 		//Pixels Magnitude is the number of pixels each iteration of the loop
 		//sends in ThumbstickAxisThread
-		constexpr static const int PIXELS_MAGNITUDE = 1;
+		constexpr static const int PIXELS_MAGNITUDE{ 1 };
 		//Pixels Nomove is the number of pixels each iteration of the loop
 		//sends in ThumbstickAxisThread for the opposite axis the thread is concerned with.
-		constexpr static const int PIXELS_NOMOVE = 0;
+		constexpr static const int PIXELS_NOMOVE{ 0 };
 		//Input Poller thread delay, in milliseconds.
-		constexpr static const int THREAD_DELAY_POLLER = 10;
+		constexpr static const int THREAD_DELAY_POLLER{ 10 };
 		//SMax is the value of the Microsoft type "SHORT"'s maximum possible value.
-		constexpr static const short SMax = std::numeric_limits<SHORT>::max();
+		constexpr static const short SMax{ std::numeric_limits<SHORT>::max() };
 		//SMin is the value of the Microsoft type "SHORT"'s minimum possible value.
-		constexpr static const short SMin = std::numeric_limits<SHORT>::min();
+		constexpr static const short SMin{ std::numeric_limits<SHORT>::min() };
 		//Sensitivity Min is the minimum mouse sensitivity value allowed, used in several places.
-		constexpr static const int SENSITIVITY_MIN = 1;
+		constexpr static const int SENSITIVITY_MIN{ 1 };
 		//Sensitivity Max is the maximum mouse sensitivity value allowed, used in several places.
-		constexpr static const int SENSITIVITY_MAX = 100;
+		constexpr static const int SENSITIVITY_MAX{ 100 };
 		//Sensitivity Default is the default sensitivity value if none is given.
-		constexpr static const int SENSITIVITY_DEFAULT = 35;
+		constexpr static const int SENSITIVITY_DEFAULT{ 35 };
 		//Microseconds Min is the minimum delay for the thumbstick axis thread loop at the highest thumbstick value.
-		constexpr static const int MICROSECONDS_MIN = 500;
+		constexpr static const int MICROSECONDS_MIN{ 500 };
 		//Microseconds Max is the maximum delay for the thumbstick axis thread loop at the lowest thumbstick value.
-		constexpr static const int MICROSECONDS_MAX = 18000;
+		constexpr static const int MICROSECONDS_MAX{ 18000 };
 		//Microseconds Min Max is the minimum delay's maximum value for the thumbstick axis thread loop at the lowest sensitivity value.
-		constexpr static const int MICROSECONDS_MIN_MAX = MICROSECONDS_MIN * 3;
+		constexpr static const int MICROSECONDS_MIN_MAX{ MICROSECONDS_MIN * 3 };
 		//Deadzone Min is the minimum allowable value for a thumbstick deadzone.
-		constexpr static const int DEADZONE_MIN = 1;
+		constexpr static const int DEADZONE_MIN{ 1 };
 		//Deadzone Max is the maximum allowable value for a thumbstick deadzone.
-		constexpr static const int DEADZONE_MAX = std::numeric_limits<SHORT>::max() - 1;
+		constexpr static const int DEADZONE_MAX{ std::numeric_limits<SHORT>::max() - 1 };
 		//Deadzone Default is the default deadzone value for a thumbstick.
-		constexpr static const int DEADZONE_DEFAULT = XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE;
+		constexpr static const int DEADZONE_DEFAULT{ XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE };
 		//Alt Deadzone Default is the multiplier to use when a deadzone is already activated,
 		//the deadzone value for the other axis is lessened via this value.
-		constexpr static const float ALT_DEADZONE_MULT_DEFAULT = 0.75f;
+		constexpr static const float ALT_DEADZONE_MULT_DEFAULT{ 0.75f };
 		//Static assertions about the const members
 		static_assert(SENSITIVITY_MAX < MICROSECONDS_MAX);
 		static_assert(SENSITIVITY_MIN >= 1);
diff --git a/XMapLib/SendKeyInput.h b/XMapLib/SendKeyInput.h
@@ -17,8 +17,8 @@ namespace sds::Utilities
 		using ScanCodeType = unsigned short;
 		using VirtualKeyType = unsigned int;
 		using PrintableType = char;
-		bool m_auto_disable_numlock = true; // toggle this to make the default behavior not toggle off numlock on your keyboard
-		std::map<int,int> m_scancode_store;
+		bool m_auto_disable_numlock{ true }; // toggle this to make the default behavior not toggle off numlock on your keyboard
+		std::map<int, int> m_scancode_store{};
 	public:
 		/// <summary>
 		/// Default Constructor
diff --git a/XMapLib/SensitivityMap.h b/XMapLib/SensitivityMap.h
@@ -7,8 +7,8 @@ namespace sds
 	struct SensitivityMap
 	{
 	private:
-		const std::string m_except_minimum = "Exception in SensitivityMap::SensitivityToMinimum(): ";
-		const std::string m_except_build_map = "Exception in SensitivityMap::BuildSensitivityMap(): ";
+		const std::string m_except_minimum{ "Exception in SensitivityMap::SensitivityToMinimum(): " };
+		const std::string m_except_build_map{ "Exception in SensitivityMap::BuildSensitivityMap(): " };
 	public:
 		/// <summary>Builds a sensitivity map that maps values from sens_min to sens_max to values between us_delay_min and us_delay_max</summary>
 		/// <param name="user_sens">user sensitivity value</param>
diff --git a/XMapLib/ThumbstickToDelay.h b/XMapLib/ThumbstickToDelay.h
@@ -10,14 +10,14 @@ namespace sds
 	/// This class must be re-instantiated to use new deadzone values.</summary>
 	class ThumbstickToDelay
 	{
-		const std::string BAD_DELAY_MSG = "Bad timer delay value, exception.";
+		const std::string BAD_DELAY_MSG{ "Bad timer delay value, exception." };
 		inline static std::atomic<bool> m_is_deadzone_activated{ false }; //shared between instances
-		float m_alt_deadzone_multiplier = MouseSettings::ALT_DEADZONE_MULT_DEFAULT;
-		int m_axis_sensitivity = MouseSettings::SENSITIVITY_DEFAULT;
-		int m_x_axis_deadzone = MouseSettings::DEADZONE_DEFAULT;
-		int m_y_axis_deadzone = MouseSettings::DEADZONE_DEFAULT;
-		SensitivityMap m_sensitivity_mapper;
-		std::map<int, int> m_shared_sensitivity_map;
+		float m_alt_deadzone_multiplier{ MouseSettings::ALT_DEADZONE_MULT_DEFAULT };
+		int m_axis_sensitivity{ MouseSettings::SENSITIVITY_DEFAULT };
+		int m_x_axis_deadzone{ MouseSettings::DEADZONE_DEFAULT };
+		int m_y_axis_deadzone{ MouseSettings::DEADZONE_DEFAULT };
+		SensitivityMap m_sensitivity_mapper{};
+		std::map<int, int> m_shared_sensitivity_map{};
 		const bool m_is_x_axis;
 		//Used to make some assertions about the settings values this class depends upon.
 		static void AssertSettings()
diff --git a/XMapLib/XMapLib.cpp b/XMapLib/XMapLib.cpp
@@ -11,7 +11,7 @@ void AddTestKeyMappings(sds::KeyboardMapper& mapper, std::osyncstream &ss);
 
 class GetterExit
 {
-	std::unique_ptr<std::thread> workerThread;
+	std::unique_ptr<std::thread> workerThread{};
 	std::atomic<bool> m_exitState{ false };
 	const sds::KeyboardMapper& m_mp;
 public:

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace sds`
`17`	`17`	`std::atomic<bool> m_is_y_moving{ false };`
`18`	`18`	`std::atomic<bool> m_is_x_positive{ false };`
`19`	`19`	`std::atomic<bool> m_is_y_positive{ false };`
`20`		`- std::unique_ptr<LambdaRunnerType> m_workThread;`
	`20`	`+ std::unique_ptr<LambdaRunnerType> m_workThread{};`
`21`	`21`	`void InitWorkThread() noexcept`
`22`	`22`	`{`
`23`	`23`	`m_workThread =`