fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More style.

Browse Source
This commit is contained in:
Ben Vanik
2015-08-07 21:29:03 -07:00
parent 14beb27ebc
commit a92566dfc5
131 changed files with 1141 additions and 1056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/hid/input_driver.h
View File

@@ -33,9 +33,9 @@ class InputDriver {
X_INPUT_KEYSTROKE* out_keystroke) = 0;
protected:
InputDriver(InputSystem* input_system);
explicit InputDriver(InputSystem* input_system);
InputSystem* input_system_;
InputSystem* input_system_ = nullptr;
};
} // namespace hid

8
src/xenia/hid/input_system.h
View File

@@ -29,7 +29,7 @@ class InputDriver;
class InputSystem {
public:
InputSystem(Emulator* emulator);
explicit InputSystem(Emulator* emulator);
~InputSystem();
static std::unique_ptr<InputSystem> Create(Emulator* emulator);
@@ -50,9 +50,9 @@ class InputSystem {
X_INPUT_KEYSTROKE* out_keystroke);
private:
Emulator* emulator_;
Memory* memory_;
cpu::Processor* processor_;
Emulator* emulator_ = nullptr;
Memory* memory_ = nullptr;
cpu::Processor* processor_ = nullptr;
std::vector<std::unique_ptr<InputDriver>> drivers_;
};

2
src/xenia/hid/nop/nop_input_driver.h
View File

@@ -18,7 +18,7 @@ namespace nop {
class NopInputDriver : public InputDriver {
public:
NopInputDriver(InputSystem* input_system);
explicit NopInputDriver(InputSystem* input_system);
~NopInputDriver() override;
X_STATUS Setup() override;

8
src/xenia/hid/winkey/winkey_input_driver.h
View File

@@ -7,8 +7,8 @@
******************************************************************************
*/
#ifndef XENIA_HID_WINKEY_WINKEY_DRIVER_H_
#define XENIA_HID_WINKEY_WINKEY_DRIVER_H_
#ifndef XENIA_HID_WINKEY_WINKEY_INPUT_DRIVER_H_
#define XENIA_HID_WINKEY_WINKEY_INPUT_DRIVER_H_
#include "xenia/hid/input_driver.h"
@@ -18,7 +18,7 @@ namespace winkey {
class WinKeyInputDriver : public InputDriver {
public:
WinKeyInputDriver(InputSystem* input_system);
explicit WinKeyInputDriver(InputSystem* input_system);
~WinKeyInputDriver() override;
X_STATUS Setup() override;
@@ -38,4 +38,4 @@ class WinKeyInputDriver : public InputDriver {
} // namespace hid
} // namespace xe
#endif // XENIA_HID_WINKEY_WINKEY_DRIVER_H_
#endif // XENIA_HID_WINKEY_WINKEY_INPUT_DRIVER_H_

2
src/xenia/hid/xinput/xinput_input_driver.cc
View File

@@ -11,7 +11,7 @@
// Must be included before xinput.h to avoid windows.h conflicts:
#include "xenia/base/platform_win.h"
#include <xinput.h>
#include <xinput.h> // NOLINT(build/include_order)
#include "xenia/hid/hid_flags.h"

8
src/xenia/hid/xinput/xinput_input_driver.h
View File

@@ -7,8 +7,8 @@
******************************************************************************
*/
#ifndef XENIA_HID_XINPUT_XINPUT_DRIVER_H_
#define XENIA_HID_XINPUT_XINPUT_DRIVER_H_
#ifndef XENIA_HID_XINPUT_XINPUT_INPUT_DRIVER_H_
#define XENIA_HID_XINPUT_XINPUT_INPUT_DRIVER_H_
#include "xenia/hid/input_driver.h"
@@ -18,7 +18,7 @@ namespace xinput {
class XInputInputDriver : public InputDriver {
public:
XInputInputDriver(InputSystem* input_system);
explicit XInputInputDriver(InputSystem* input_system);
~XInputInputDriver() override;
X_STATUS Setup() override;
@@ -37,4 +37,4 @@ class XInputInputDriver : public InputDriver {
} // namespace hid
} // namespace xe
#endif // XENIA_HID_XINPUT_XINPUT_DRIVER_H_
#endif // XENIA_HID_XINPUT_XINPUT_INPUT_DRIVER_H_