Merge remote-tracking branch 'dolphin-emu/master' into gameinis

2 files changed, 16 insertions, 16 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
index 0e2c0bcad3..1ee374d483 100644
--- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
@@ -122,7 +122,7 @@ void DeInit()
 }
 
 Device::Device(const XINPUT_CAPABILITIES& caps, u8 index)
-	: m_index(index), m_subtype(caps.SubType)
+	: m_subtype(caps.SubType), m_index(index)
 {
 	ZeroMemory(&m_state_out, sizeof(m_state_out));
 
diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
index 5dcfb0cee5..59a3f6ff79 100644
--- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
+++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
@@ -32,9 +32,9 @@ private:
 	class Button : public Core::Device::Input
 	{
 	public:
-		std::string GetName() const;
-		Button(u8 index, const WORD& buttons) : m_index(index), m_buttons(buttons) {}
-		ControlState GetState() const;
+		Button(u8 index, const WORD& buttons) : m_buttons(buttons), m_index(index) {}
+		std::string GetName() const override;
+		ControlState GetState() const override;
 	private:
 		const WORD& m_buttons;
 		u8 m_index;
@@ -43,9 +43,9 @@ private:
 	class Axis : public Core::Device::Input
 	{
 	public:
-		std::string GetName() const;
-		Axis(u8 index, const SHORT& axis, SHORT range) : m_index(index), m_axis(axis), m_range(range) {}
-		ControlState GetState() const;
+		Axis(u8 index, const SHORT& axis, SHORT range) : m_axis(axis), m_range(range), m_index(index) {}
+		std::string GetName() const override;
+		ControlState GetState() const override;
 	private:
 		const SHORT& m_axis;
 		const SHORT m_range;
@@ -55,9 +55,9 @@ private:
 	class Trigger : public Core::Device::Input
 	{
 	public:
-		std::string GetName() const;
-		Trigger(u8 index, const BYTE& trigger, BYTE range) : m_index(index), m_trigger(trigger), m_range(range) {}
-		ControlState GetState() const;
+		Trigger(u8 index, const BYTE& trigger, BYTE range) : m_trigger(trigger), m_range(range), m_index(index) {}
+		std::string GetName() const override;
+		ControlState GetState() const override;
 	private:
 		const BYTE& m_trigger;
 		const BYTE m_range;
@@ -67,9 +67,9 @@ private:
 	class Motor : public Core::Device::Output
 	{
 	public:
-		std::string GetName() const;
-		Motor(u8 index, Device* parent, WORD &motor, WORD range) : m_index(index), m_parent(parent), m_motor(motor), m_range(range) {}
-		void SetState(ControlState state);
+		Motor(u8 index, Device* parent, WORD &motor, WORD range) : m_motor(motor), m_range(range), m_index(index), m_parent(parent) {}
+		std::string GetName() const override;
+		void SetState(ControlState state) override;
 	private:
 		WORD& m_motor;
 		const WORD m_range;
@@ -82,9 +82,9 @@ public:
 
 	Device(const XINPUT_CAPABILITIES& capabilities, u8 index);
 
-	std::string GetName() const;
-	int GetId() const;
-	std::string GetSource() const;
+	std::string GetName() const override;
+	int GetId() const override;
+	std::string GetSource() const override;
 
 	void UpdateMotors();