Merge pull request #2161 from Tilka/fix_warnings

Fix some warnings

Source/Core/Common/TraversalClient.cpp

@@ -215,10 +215,8 @@ void TraversalClient::OnFailure(FailureReason reason)
 	switch (reason)
 	{
 	case TraversalClient::BadHost:
-	{
 		PanicAlertT("Couldn't look up central server %s", m_Server.c_str());
 		break;
-	}
 	case TraversalClient::VersionTooOld:
 		PanicAlertT("Dolphin too old for traversal server");
 		break;
@@ -353,4 +351,4 @@ void ReleaseTraversalClient()
 
 	g_TraversalClient.release();
 	g_MainNetHost.release();
-}
+}

Source/Core/Common/TraversalClient.h

@@ -34,7 +34,6 @@ public:
 		ServerForgotAboutUs,
 		SocketSendError,
 		ResendTimeout,
-		ConnectFailedError = 0x400,
 	};
 	TraversalClient(ENetHost* netHost, const std::string& server, const u16 port);
 	~TraversalClient();

Source/Core/Core/NetPlayClient.cpp

@@ -744,20 +744,19 @@ void NetPlayClient::OnConnectFailed(u8 reason)
 {
 	m_connecting = false;
 	m_state = Failure;
-	int swtch = TraversalClient::ConnectFailedError + reason;
+	switch (reason)
-	switch (swtch)
 	{
-	case TraversalClient::ConnectFailedError + TraversalConnectFailedClientDidntRespond:
+	case TraversalConnectFailedClientDidntRespond:
 		PanicAlertT("Traversal server timed out connecting to the host");
 		break;
-	case TraversalClient::ConnectFailedError + TraversalConnectFailedClientFailure:
+	case TraversalConnectFailedClientFailure:
 		PanicAlertT("Server rejected traversal attempt");
 		break;
-	case TraversalClient::ConnectFailedError + TraversalConnectFailedNoSuchClient:
+	case TraversalConnectFailedNoSuchClient:
 		PanicAlertT("Invalid host");
 		break;
 	default:
-		PanicAlertT("Unknown error %x", swtch);
+		PanicAlertT("Unknown error %x", reason);
 		break;
 	}
 }

Source/Core/DolphinWX/ARCodeAddEdit.cpp

@@ -30,8 +30,8 @@
 
 CARCodeAddEdit::CARCodeAddEdit(int _selection, const std::vector<ActionReplay::ARCode>& _arCodes, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
 	: wxDialog(parent, id, title, position, size, style)
-	, selection(_selection)
 	, arCodes(_arCodes)
+	, selection(_selection)
 {
 	Bind(wxEVT_BUTTON, &CARCodeAddEdit::SaveCheatData, this, wxID_OK);
 

Source/Core/VideoBackends/D3D/D3DBlob.cpp

@@ -54,4 +54,4 @@ u8* D3DBlob::Data()
 	return data;
 }
 
-}  // namespace DX11
+}  // namespace DX11

Source/Core/VideoBackends/D3D/D3DBlob.h

@@ -37,4 +37,4 @@ private:
 	ID3D10Blob* blob;
 };
 
-}  // namespace
+}  // namespace

Source/Core/VideoBackends/D3D/D3DShader.h

@@ -54,4 +54,4 @@ namespace D3D
 	}
 }
 
-}  // namespace DX11
+}  // namespace DX11

Source/Core/VideoBackends/D3D/D3DState.h

@@ -296,4 +296,4 @@ extern StateManager* stateman;
 
 }  // namespace
 
-}  // namespace DX11
+}  // namespace DX11

Source/Core/VideoBackends/D3D/D3DTexture.cpp

@@ -110,4 +110,4 @@ D3DTexture2D::~D3DTexture2D()
 	SAFE_RELEASE(tex);
 }
 
-}  // namespace DX11
+}  // namespace DX11

Source/Core/VideoBackends/D3D/D3DTexture.h

@@ -44,4 +44,4 @@ private:
 	UINT ref;
 };
 
-}  // namespace DX11
+}  // namespace DX11

Source/Core/VideoBackends/D3D/D3DUtil.h

@@ -69,4 +69,4 @@ namespace D3D
 	void drawColorQuad(u32 Color, float x1, float y1, float x2, float y2);
 }
 
-}
+}

Source/DSPSpy/ConsoleHelper.h

@@ -4,10 +4,10 @@
 
 #pragma once
 
+#include <iostream>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
-#include <iostream>
 
 #define CON_BLACK 		0
 #define CON_RED			1

Source/DSPSpy/Stubs.cpp

@@ -18,8 +18,8 @@
 // Stubs to make DSPCore compile as part of DSPSpy.
 
 /*
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <string>
 

Source/DSPSpy/main_spy.cpp

@@ -9,17 +9,17 @@
 // Use Dolphin's dsptool to generate a new dsp_code.h.
 // Originally written by duddie and modified by FIRES. Then further modified by ector.
 
+#include <debug.h>
+#include <fat.h>
+#include <fcntl.h>
 #include <gccore.h>
 #include <malloc.h>
+#include <network.h>
+#include <ogcsys.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <network.h>
-#include <ogcsys.h>
 #include <time.h>
-#include <fat.h>
-#include <fcntl.h>
-#include <debug.h>
 
 #include <unistd.h>
 #include <ogc/color.h>

Source/PCH/pch.cpp

@@ -1 +1 @@
-#include "pch.h"
+#include "pch.h"

Source/PCH/pch.h

@@ -27,14 +27,14 @@
 #endif
 #include <iomanip>
 #include <iostream>
-#include <limits.h>
 #include <limits>
+#include <limits.h>
 #include <list>
 #include <locale.h>
 #include <map>
 #include <math.h>
-#include <memory.h>
 #include <memory>
+#include <memory.h>
 #include <mutex>
 #include <numeric>
 #ifndef _WIN32

Source/UnitTests/Common/EventTest.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <gtest/gtest.h>
 #include <thread>
+#include <gtest/gtest.h>
 
 #include "Common/Event.h"
 

Source/UnitTests/Common/FifoQueueTest.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <gtest/gtest.h>
 #include <thread>
+#include <gtest/gtest.h>
 
 #include "Common/FifoQueue.h"
 

Source/UnitTests/Common/FlagTest.cpp

@@ -3,8 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <array>
-#include <gtest/gtest.h>
 #include <thread>
+#include <gtest/gtest.h>
 
 #include "Common/Flag.h"
 

Source/UnitTests/Common/MathUtilTest.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <gtest/gtest.h>
 #include <limits>
 #include <random>
+#include <gtest/gtest.h>
 
 #include "Common/MathUtil.h"
 

Source/UnitTests/Common/x64EmitterTest.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <cstring>
 #include <cctype>
+#include <cstring>
 #include <disasm.h>  // From Bochs, fallback included in Externals.
 #include <map>
 #include <memory>

Source/UnitTests/Core/PageFaultTest.cpp

@@ -6,7 +6,7 @@
 #include "Core/PowerPC/JitCommon/JitBase.h"
 
 // include order is important
-#include <gtest/gtest.h>
+#include <gtest/gtest.h> // NOLINT
 
 #if _M_X86_64 || _M_ARM_32
 enum