summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2018-04-12 14:18:04 +0200
committerspycrab <spycrab@users.noreply.github.com>2018-04-12 21:28:39 +0200
commit40bb9974f21878e64fb03d70e717cb996bf13a29 (patch)
tree1d8a9e7eea10820e5d645ad5028e506836b856de /Source/Core/InputCommon
parentd27e85e9d70dfb41a5b8880fd3375a0ac9574f5d (diff)
Reformat all the things!
Diffstat (limited to 'Source/Core/InputCommon')
-rw-r--r--Source/Core/InputCommon/ControlReference/ControlReference.cpp4
-rw-r--r--Source/Core/InputCommon/ControlReference/ExpressionParser.cpp1
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Device.h1
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/evdev/evdev.h1
-rw-r--r--Source/Core/InputCommon/GCAdapter.cpp10
-rw-r--r--Source/Core/InputCommon/InputConfig.h1
7 files changed, 14 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.cpp b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
index c7d652f15b..e0d9c8b678 100644
--- a/Source/Core/InputCommon/ControlReference/ControlReference.cpp
+++ b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
@@ -131,8 +131,8 @@ ciface::Core::Device::Control* InputReference::Detect(const unsigned int ms,
// get starting state of all inputs,
// so we can ignore those that were activated at time of Detect start
- std::vector<ciface::Core::Device::Input *>::const_iterator i = device->Inputs().begin(),
- e = device->Inputs().end();
+ std::vector<ciface::Core::Device::Input*>::const_iterator i = device->Inputs().begin(),
+ e = device->Inputs().end();
for (std::vector<bool>::iterator state = states.begin(); i != e; ++i)
*state++ = ((*i)->GetState() > (1 - INPUT_DETECT_THRESHOLD));
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
index 85eb86d598..e7ab53d488 100644
--- a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
@@ -405,6 +405,7 @@ class Parser
public:
explicit Parser(std::vector<Token> tokens_) : tokens(tokens_) { m_it = tokens.begin(); }
ParseResult Parse() { return Toplevel(); }
+
private:
std::vector<Token> tokens;
std::vector<Token>::iterator m_it;
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h
index dc3bdbe84f..2012941a83 100644
--- a/Source/Core/InputCommon/ControllerInterface/Device.h
+++ b/Source/Core/InputCommon/ControllerInterface/Device.h
@@ -98,6 +98,7 @@ protected:
}
std::string GetName() const override { return m_low.GetName() + *m_high.GetName().rbegin(); }
+
private:
Input& m_low;
Input& m_high;
diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
index 3cb79fee39..a986f120c1 100644
--- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
+++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
@@ -33,6 +33,7 @@ public:
void UpdateInput() override;
std::string GetName() const override { return m_name; }
std::string GetSource() const override { return "Pipe"; }
+
private:
class PipeInput : public Input
{
@@ -41,6 +42,7 @@ private:
std::string GetName() const override { return m_name; }
ControlState GetState() const override { return m_state; }
void SetState(ControlState state) { m_state = state; }
+
private:
const std::string m_name;
ControlState m_state;
diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h
index 513c5a67f2..c1a3da2ada 100644
--- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h
+++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h
@@ -74,6 +74,7 @@ public:
std::string GetName() const override { return m_name; }
std::string GetSource() const override { return "evdev"; }
bool IsInteresting() const { return m_initialized && m_interesting; }
+
private:
const std::string m_devfile;
int m_fd;
diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp
index 7a897affdc..743fedefdd 100644
--- a/Source/Core/InputCommon/GCAdapter.cpp
+++ b/Source/Core/InputCommon/GCAdapter.cpp
@@ -137,8 +137,9 @@ static void ScanThreadFunc()
if (s_libusb_hotplug_enabled)
{
if (libusb_hotplug_register_callback(
- s_libusb_context, (libusb_hotplug_event)(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
- LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT),
+ s_libusb_context,
+ (libusb_hotplug_event)(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
+ LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT),
LIBUSB_HOTPLUG_ENUMERATE, 0x057e, 0x0337, LIBUSB_HOTPLUG_MATCH_ANY, HotplugCallback,
nullptr, &s_hotplug_handle) != LIBUSB_SUCCESS)
s_libusb_hotplug_enabled = false;
@@ -267,8 +268,9 @@ static bool CheckDeviceAccess(libusb_device* device)
{
if (dRet)
{
- ERROR_LOG(SERIALINTERFACE, "Dolphin does not have access to this device: Bus %03d Device "
- "%03d: ID ????:???? (couldn't get id).",
+ ERROR_LOG(SERIALINTERFACE,
+ "Dolphin does not have access to this device: Bus %03d Device "
+ "%03d: ID ????:???? (couldn't get id).",
bus, port);
}
else
diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h
index fcbd8a59f9..a993a412b1 100644
--- a/Source/Core/InputCommon/InputConfig.h
+++ b/Source/Core/InputCommon/InputConfig.h
@@ -38,6 +38,7 @@ public:
std::string GetGUIName() const { return m_gui_name; }
std::string GetProfileName() const { return m_profile_name; }
+
private:
std::vector<std::unique_ptr<ControllerEmu::EmulatedController>> m_controllers;
const std::string m_ini_name;