diff options
| author | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2010-06-21 18:25:49 +0000 |
|---|---|---|
| committer | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2010-06-21 18:25:49 +0000 |
| commit | 1b5b57bff38868eaa181ebeeb52df9ca0dff6e3f (patch) | |
| tree | 8644a36916eef99479b044b82ea9f962e6470e44 /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | |
| parent | d0f00cedffc1666a55dbf55f436d3d20ac1d0d57 (diff) | |
Windows/Linux/whatever build fix.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5762 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h index a474a9f071..68db45fa4a 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h @@ -42,6 +42,9 @@ class ControllerInterface { public: + // Forward declarations + class DeviceQualifier; + // // Device // @@ -61,6 +64,7 @@ public: public: virtual std::string GetName() const = 0; virtual ~Control() {} + virtual bool operator==(const std::string& name) const; }; // @@ -100,6 +104,8 @@ public: virtual void ClearInputState(); + virtual bool operator==(const DeviceQualifier& devq) const; + const std::vector<Input*>& Inputs() const { return m_inputs; } const std::vector<Output*>& Outputs() const { return m_outputs; } @@ -213,7 +219,7 @@ public: bool UpdateInput(); bool UpdateOutput(); - const std::vector<Device*>& Devices() const { return m_devices; } + const std::vector<Device*>& Devices() const { return m_devices; } private: bool m_is_init; @@ -221,8 +227,7 @@ private: void* m_hwnd; }; -// used for std::find n stuff -bool operator==(const ControllerInterface::Device* const dev, const ControllerInterface::DeviceQualifier& devq); -bool operator==(const ControllerInterface::Device::Control* const c, const std::string& name); +std::vector<ControllerInterface::Device*>::const_iterator FindDevice( + const std::vector<ControllerInterface::Device*>& devices, const ControllerInterface::DeviceQualifier& devq); #endif |