From 4304648a05a4cf0d380c11de1f2fad396a0c97e8 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 1 Mar 2015 03:34:06 +0100 Subject: [PATCH 1/4] Fix -Wreorder warning --- Source/Core/DolphinWX/ARCodeAddEdit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/ARCodeAddEdit.cpp index 07240e63f7..1ce3d93edd 100644 --- a/Source/Core/DolphinWX/ARCodeAddEdit.cpp +++ b/Source/Core/DolphinWX/ARCodeAddEdit.cpp @@ -30,8 +30,8 @@ CARCodeAddEdit::CARCodeAddEdit(int _selection, const std::vector& _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); From b0bde31ac08d41c279944d13ffd95fefa39a3ca8 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 1 Mar 2015 14:52:09 +0100 Subject: [PATCH 2/4] Fix include order of files outside of Source/Core --- Source/DSPSpy/ConsoleHelper.h | 4 ++-- Source/DSPSpy/Stubs.cpp | 2 +- Source/DSPSpy/main_spy.cpp | 10 +++++----- Source/PCH/pch.h | 4 ++-- Source/UnitTests/Common/EventTest.cpp | 2 +- Source/UnitTests/Common/FifoQueueTest.cpp | 2 +- Source/UnitTests/Common/FlagTest.cpp | 2 +- Source/UnitTests/Common/MathUtilTest.cpp | 2 +- Source/UnitTests/Common/x64EmitterTest.cpp | 2 +- Source/UnitTests/Core/PageFaultTest.cpp | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Source/DSPSpy/ConsoleHelper.h b/Source/DSPSpy/ConsoleHelper.h index e616db6a16..1f4285fc70 100644 --- a/Source/DSPSpy/ConsoleHelper.h +++ b/Source/DSPSpy/ConsoleHelper.h @@ -4,10 +4,10 @@ #pragma once +#include +#include #include #include -#include -#include #define CON_BLACK 0 #define CON_RED 1 diff --git a/Source/DSPSpy/Stubs.cpp b/Source/DSPSpy/Stubs.cpp index 2f738f8c51..335586a066 100644 --- a/Source/DSPSpy/Stubs.cpp +++ b/Source/DSPSpy/Stubs.cpp @@ -18,8 +18,8 @@ // Stubs to make DSPCore compile as part of DSPSpy. /* -#include #include +#include #include diff --git a/Source/DSPSpy/main_spy.cpp b/Source/DSPSpy/main_spy.cpp index 26e18dc0a5..665e7bb1b8 100644 --- a/Source/DSPSpy/main_spy.cpp +++ b/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 +#include +#include #include #include +#include +#include #include #include #include -#include -#include #include -#include -#include -#include #include #include diff --git a/Source/PCH/pch.h b/Source/PCH/pch.h index 5402a27a44..04331e664e 100644 --- a/Source/PCH/pch.h +++ b/Source/PCH/pch.h @@ -27,14 +27,14 @@ #endif #include #include -#include #include +#include #include #include #include #include -#include #include +#include #include #include #ifndef _WIN32 diff --git a/Source/UnitTests/Common/EventTest.cpp b/Source/UnitTests/Common/EventTest.cpp index 41949a893d..6194dcb9dd 100644 --- a/Source/UnitTests/Common/EventTest.cpp +++ b/Source/UnitTests/Common/EventTest.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include #include "Common/Event.h" diff --git a/Source/UnitTests/Common/FifoQueueTest.cpp b/Source/UnitTests/Common/FifoQueueTest.cpp index 6530e15ddd..042cf57983 100644 --- a/Source/UnitTests/Common/FifoQueueTest.cpp +++ b/Source/UnitTests/Common/FifoQueueTest.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include #include "Common/FifoQueue.h" diff --git a/Source/UnitTests/Common/FlagTest.cpp b/Source/UnitTests/Common/FlagTest.cpp index 2c087fd739..a4e3865252 100644 --- a/Source/UnitTests/Common/FlagTest.cpp +++ b/Source/UnitTests/Common/FlagTest.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. #include -#include #include +#include #include "Common/Flag.h" diff --git a/Source/UnitTests/Common/MathUtilTest.cpp b/Source/UnitTests/Common/MathUtilTest.cpp index 9549039304..0f27ed1ea1 100644 --- a/Source/UnitTests/Common/MathUtilTest.cpp +++ b/Source/UnitTests/Common/MathUtilTest.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include #include +#include #include "Common/MathUtil.h" diff --git a/Source/UnitTests/Common/x64EmitterTest.cpp b/Source/UnitTests/Common/x64EmitterTest.cpp index 977b19a9bc..614847e955 100644 --- a/Source/UnitTests/Common/x64EmitterTest.cpp +++ b/Source/UnitTests/Common/x64EmitterTest.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include #include // From Bochs, fallback included in Externals. #include #include diff --git a/Source/UnitTests/Core/PageFaultTest.cpp b/Source/UnitTests/Core/PageFaultTest.cpp index 62a3e4bffa..8db624809c 100644 --- a/Source/UnitTests/Core/PageFaultTest.cpp +++ b/Source/UnitTests/Core/PageFaultTest.cpp @@ -6,7 +6,7 @@ #include "Core/PowerPC/JitCommon/JitBase.h" // include order is important -#include +#include // NOLINT #if _M_X86_64 || _M_ARM_32 enum From 88264f5712634f2dac3143945b3acbfbcb5576ad Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 1 Mar 2015 16:17:32 +0100 Subject: [PATCH 3/4] Fix -Wswitch warning --- Source/Core/Common/TraversalClient.cpp | 4 +--- Source/Core/Common/TraversalClient.h | 1 - Source/Core/Core/NetPlayClient.cpp | 11 +++++------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp index 574f002e4e..72d18244f3 100644 --- a/Source/Core/Common/TraversalClient.cpp +++ b/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(); -} \ No newline at end of file +} diff --git a/Source/Core/Common/TraversalClient.h b/Source/Core/Common/TraversalClient.h index 7dbc92286e..7418aa8d25 100644 --- a/Source/Core/Common/TraversalClient.h +++ b/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(); diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 3c38fac05c..6fcbd6c70f 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/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 (swtch) + switch (reason) { - 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; } } From f75187db3e50ef0f1c7d295d8bbe007ea643f06a Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 1 Mar 2015 17:17:09 +0100 Subject: [PATCH 4/4] Add missing newlines at EOF --- Source/Core/VideoBackends/D3D/D3DBlob.cpp | 2 +- Source/Core/VideoBackends/D3D/D3DBlob.h | 2 +- Source/Core/VideoBackends/D3D/D3DShader.h | 2 +- Source/Core/VideoBackends/D3D/D3DState.h | 2 +- Source/Core/VideoBackends/D3D/D3DTexture.cpp | 2 +- Source/Core/VideoBackends/D3D/D3DTexture.h | 2 +- Source/Core/VideoBackends/D3D/D3DUtil.h | 2 +- Source/PCH/pch.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/Core/VideoBackends/D3D/D3DBlob.cpp b/Source/Core/VideoBackends/D3D/D3DBlob.cpp index 8ace345fcb..a4ed6c4683 100644 --- a/Source/Core/VideoBackends/D3D/D3DBlob.cpp +++ b/Source/Core/VideoBackends/D3D/D3DBlob.cpp @@ -54,4 +54,4 @@ u8* D3DBlob::Data() return data; } -} // namespace DX11 \ No newline at end of file +} // namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/D3DBlob.h b/Source/Core/VideoBackends/D3D/D3DBlob.h index 09d34525ae..5f228147d2 100644 --- a/Source/Core/VideoBackends/D3D/D3DBlob.h +++ b/Source/Core/VideoBackends/D3D/D3DBlob.h @@ -37,4 +37,4 @@ private: ID3D10Blob* blob; }; -} // namespace \ No newline at end of file +} // namespace diff --git a/Source/Core/VideoBackends/D3D/D3DShader.h b/Source/Core/VideoBackends/D3D/D3DShader.h index 59c7175878..aeb3ca1823 100644 --- a/Source/Core/VideoBackends/D3D/D3DShader.h +++ b/Source/Core/VideoBackends/D3D/D3DShader.h @@ -54,4 +54,4 @@ namespace D3D } } -} // namespace DX11 \ No newline at end of file +} // namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/D3DState.h b/Source/Core/VideoBackends/D3D/D3DState.h index a2bb4e61c9..4435e1df78 100644 --- a/Source/Core/VideoBackends/D3D/D3DState.h +++ b/Source/Core/VideoBackends/D3D/D3DState.h @@ -296,4 +296,4 @@ extern StateManager* stateman; } // namespace -} // namespace DX11 \ No newline at end of file +} // namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/D3DTexture.cpp b/Source/Core/VideoBackends/D3D/D3DTexture.cpp index 8c23a4bd2c..c730f2ea7d 100644 --- a/Source/Core/VideoBackends/D3D/D3DTexture.cpp +++ b/Source/Core/VideoBackends/D3D/D3DTexture.cpp @@ -110,4 +110,4 @@ D3DTexture2D::~D3DTexture2D() SAFE_RELEASE(tex); } -} // namespace DX11 \ No newline at end of file +} // namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/D3DTexture.h b/Source/Core/VideoBackends/D3D/D3DTexture.h index 6be15b6102..54d250811e 100644 --- a/Source/Core/VideoBackends/D3D/D3DTexture.h +++ b/Source/Core/VideoBackends/D3D/D3DTexture.h @@ -44,4 +44,4 @@ private: UINT ref; }; -} // namespace DX11 \ No newline at end of file +} // namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/D3DUtil.h b/Source/Core/VideoBackends/D3D/D3DUtil.h index be5a52430c..33710eb383 100644 --- a/Source/Core/VideoBackends/D3D/D3DUtil.h +++ b/Source/Core/VideoBackends/D3D/D3DUtil.h @@ -69,4 +69,4 @@ namespace D3D void drawColorQuad(u32 Color, float x1, float y1, float x2, float y2); } -} \ No newline at end of file +} diff --git a/Source/PCH/pch.cpp b/Source/PCH/pch.cpp index 17305716aa..1d9f38c57d 100644 --- a/Source/PCH/pch.cpp +++ b/Source/PCH/pch.cpp @@ -1 +1 @@ -#include "pch.h" \ No newline at end of file +#include "pch.h"