Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

InputCommon: Move ControllerEmu to its own directory #4789

Merged
merged 2 commits into from Feb 8, 2017

Conversation

lioncash
Copy link
Member

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 (especially when changes are made to ControllerEmu).

This moves the source files to their own directory so inner classes can be separated as needed to their own source files, and be namespaced under the ControllerEmu namespace.

This change just gets the main boilerplate stuff out of the way first (settings up the VS filters, etc). Follow ups to this will move inner classes to their own source files.

@ligfx
Copy link
Contributor

ligfx commented Jan 31, 2017

I started doing a bit of this in #4502: Extract ControlReference from ControllerInterface

EDIT: jk, that's something different

@Orphis
Copy link
Member

Orphis commented Jan 31, 2017

https://github.com/dolphin-emu/dolphin/blob/master/Contributing.md#general
You should probably make it 2 spaces then!
I started converting some files while I'm changing them too, so you could either drop this change or just make it like so?

Copy link
Member

@Orphis Orphis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation is correct now. There are more things I would change in the CMake file, but that will be for another PR!

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.
@Parlane Parlane merged commit 7b3b8f2 into dolphin-emu:master Feb 8, 2017
@lioncash lioncash deleted the input branch February 8, 2017 05:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
5 participants