ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ControllerEmu: Move into its own directory 

ControllerEmu is a massive class with a lot of nested public classes.

The only reason these are nested is because the outer class acts as a
namespace. There's no reason to keep these classes nested just for that.

Keeping these classes nested makes it impossible to forward declare them, which leads to quite a few includes in other headers, making compilation take
longer.

This moves the source files to their own directory so classes can be
separated as necessary to their own source files, and be namespaced under the
ControllerEmu namespace.
This commit is contained in:
Lioncash 2017-01-29 22:32:04 -05:00
parent c9696ccdd5
commit 3a66f2c008
19 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Analytics.cpp
View File

@ -21,7 +21,7 @@
#include "Core/HW/GCPad.h"
#include "Core/Movie.h"
#include "Core/NetPlayProto.h"
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/GCAdapter.h"
#include "InputCommon/InputConfig.h"
#include "VideoCommon/VideoBackendBase.h"

2
Source/Core/Core/HW/GCKeyboard.h
View File

@ -5,7 +5,7 @@
#pragma once
#include "Common/CommonTypes.h"
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
class InputConfig;
enum class KeyboardGroup;

2
Source/Core/Core/HW/GCKeyboardEmu.cpp
View File

@ -4,7 +4,7 @@
#include "Core/HW/GCKeyboardEmu.h"
#include "Common/Common.h"
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/KeyboardStatus.h"
static const u16 keys0_bitmasks[] = {KEYMASK_HOME, KEYMASK_END, KEYMASK_PGUP, KEYMASK_PGDN,

2
Source/Core/Core/HW/GCKeyboardEmu.h
View File

@ -6,7 +6,7 @@
#include <string>
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
struct KeyboardStatus;

2
Source/Core/Core/HW/GCPad.h
View File

@ -5,7 +5,7 @@
#pragma once
#include "Common/CommonTypes.h"
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/Device.h"
class InputConfig;

2
Source/Core/Core/HW/GCPadEmu.h
View File

@ -6,7 +6,7 @@
#include <string>
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
class ControlGroup;

2
Source/Core/Core/HW/Wiimote.h
View File

@ -6,7 +6,7 @@
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
class InputConfig;
class PointerWrap;

2
Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h
View File

@ -7,7 +7,7 @@
#include <array>
#include <string>
#include "Common/CommonTypes.h"
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
namespace WiimoteEmu
{

2
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
View File

@ -9,7 +9,7 @@
#include "Core/HW/WiimoteEmu/Encryption.h"
#include "Core/HW/WiimoteEmu/WiimoteHid.h"
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
// Registry sizes
#define WIIMOTE_EEPROM_SIZE (16 * 1024)

2
Source/Core/Core/HotkeyManager.h
View File

@ -7,7 +7,7 @@
#include <array>
#include <string>
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/InputConfig.h"
enum Hotkey

2
Source/Core/DolphinWX/Input/InputConfigDiag.cpp
View File

@ -52,7 +52,7 @@
#include "DolphinWX/Input/NunchukInputConfigDiag.h"
#include "DolphinWX/Input/TurntableInputConfigDiag.h"
#include "DolphinWX/WxUtils.h"
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/ExpressionParser.h"

2
Source/Core/DolphinWX/Input/InputConfigDiag.h
View File

@ -23,7 +23,7 @@
#include <wx/spinctrl.h>
#include <wx/timer.h>
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/ControllerInterface/Device.h"

2
Source/Core/DolphinWX/Input/InputConfigDiagBitmaps.cpp
View File

@ -22,7 +22,7 @@
#include "DolphinWX/Input/InputConfigDiag.h"
#include "DolphinWX/WxUtils.h"
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/ControllerInterface/Device.h"

4
Source/Core/InputCommon/CMakeLists.txt
View File

@ -1,5 +1,5 @@
set(SRCS ControllerEmu.cpp
InputConfig.cpp
set(SRCS InputConfig.cpp
ControllerEmu/ControllerEmu.cpp
ControllerInterface/ControllerInterface.cpp
ControllerInterface/Device.cpp
ControllerInterface/ExpressionParser.cpp)

2
Source/Core/InputCommon/ControllerEmu.cpp → Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include <memory>
#include "Common/Common.h"
#include "VideoCommon/OnScreenDisplay.h"

0
Source/Core/InputCommon/ControllerEmu.h → Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
View File

4
Source/Core/InputCommon/InputCommon.vcxproj
View File

@ -35,7 +35,7 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemGroup>
<ClCompile Include="ControllerEmu.cpp" />
<ClCompile Include="ControllerEmu\ControllerEmu.cpp" />
<ClCompile Include="ControllerInterface\ControllerInterface.cpp" />
<ClCompile Include="ControllerInterface\Device.cpp" />
<ClCompile Include="ControllerInterface\DInput\DInput.cpp" />
@ -55,7 +55,7 @@
<ClCompile Include="InputConfig.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="ControllerEmu.h" />
<ClInclude Include="ControllerEmu\ControllerEmu.h" />
<ClInclude Include="ControllerInterface\ControllerInterface.h" />
<ClInclude Include="ControllerInterface\Device.h" />
<ClInclude Include="ControllerInterface\DInput\DInput.h" />

13
Source/Core/InputCommon/InputCommon.vcxproj.filters
View File

@ -13,11 +13,16 @@
<Filter Include="ControllerInterface\ForceFeedback">
<UniqueIdentifier>{e10ce316-283c-4be0-848d-578dec2b6404}</UniqueIdentifier>
</Filter>
<Filter Include="ControllerEmu">
<UniqueIdentifier>{4c839215-4085-4e34-a960-7960986ad015}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ControllerEmu.cpp" />
<ClCompile Include="GCAdapter.cpp" />
<ClCompile Include="InputConfig.cpp" />
<ClCompile Include="ControllerEmu\ControllerEmu.cpp">
<Filter>ControllerEmu</Filter>
</ClCompile>
<ClCompile Include="ControllerInterface\DInput\DInput.cpp">
<Filter>ControllerInterface\DInput</Filter>
</ClCompile>
@ -47,10 +52,12 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ControllerEmu.h" />
<ClCompile Include="GCAdapter.h" />
<ClInclude Include="GCAdapter.h" />
<ClInclude Include="GCPadStatus.h" />
<ClInclude Include="InputConfig.h" />
<ClInclude Include="ControllerEmu\ControllerEmu.h">
<Filter>ControllerEmu</Filter>
</ClInclude>
<ClInclude Include="ControllerInterface\DInput\DInput.h">
<Filter>ControllerInterface\DInput</Filter>
</ClInclude>

2
Source/Core/InputCommon/InputConfig.cpp
View File

@ -9,7 +9,7 @@
#include "Common/MsgHandler.h"
#include "Core/ConfigManager.h"
#include "Core/HW/Wiimote.h"
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/InputConfig.h"