Merge pull request #2753 from Tilka/fix_warnings

Fix some warnings

4 files changed, 5 insertions, 6 deletions

diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp
index 903131a5d3..ac6c24bdfb 100644
--- a/Source/Core/Common/StringUtil.cpp
+++ b/Source/Core/Common/StringUtil.cpp
@@ -113,7 +113,7 @@ std::string StringFromFormat(const char* format, ...)
 	va_start(args, format);
 	std::string res = StringFromFormatV(format, args);
 	va_end(args);
-	return std::move(res);
+	return res;
 }
 
 std::string StringFromFormatV(const char* format, va_list args)
@@ -139,7 +139,7 @@ std::string StringFromFormatV(const char* format, va_list args)
 	std::string temp = buf;
 	free(buf);
 #endif
-	return std::move(temp);
+	return temp;
 }
 
 // For Debugging. Read out an u8 array.
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
index aace360b0f..8078887772 100644
--- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -250,10 +250,9 @@ void Wiimote::Reset()
 
 Wiimote::Wiimote( const unsigned int index )
 	: m_index(index)
-	, m_last_connect_request_counter(0)
 	, ir_sin(0)
 	, ir_cos(1)
-// , m_sound_stream( nullptr )
+	, m_last_connect_request_counter(0)
 {
 	// ---- set up all the controls ----
 
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 9c455d1020..57ac68fd90 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -1472,7 +1472,7 @@ void CFrame::ParseHotkeys()
 		VertexShaderManager::ResetView();
 
 	// Savestates
-	for (int i = 0; i < State::NUM_STATES; i++)
+	for (unsigned int i = 0; i < State::NUM_STATES; i++)
 	{
 		if (IsHotkey(HK_LOAD_STATE_SLOT_1 + i))
 			State::Load(1 + i);
diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
index e7a0ae2525..9e62a02378 100644
--- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
@@ -28,7 +28,7 @@ static std::string GetName(const std::string& devnode)
 	std::string res = libevdev_get_name(dev);
 	libevdev_free(dev);
 	close(fd);
-	return std::move(res);
+	return res;
 }
 
 void Init(std::vector<Core::Device*> &controllerDevices)