mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-26 06:18:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Controller Interface: Remove "using namespace" in header file.

Browse source
This commit is contained in:
Rohit Nirmal 2014-09-04 19:41:42 -05:00
parent a9a6270982
commit b0060e5184
5 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View file

@ -81,10 +81,10 @@ void ControllerInterface::Shutdown()
if (!m_is_init)
return;
for (Device* d : m_devices)
for (ciface::Core::Device* d : m_devices)
{
// Set outputs to ZERO before destroying device
for (Device::Output* o : d->Outputs())
for (ciface::Core::Device::Output* o : d->Outputs())
o->SetState(0);
// Update output
@ -145,7 +145,7 @@ bool ControllerInterface::UpdateInput(const bool force)
size_t ok_count = 0;
for (Device* d : m_devices)
for (ciface::Core::Device* d : m_devices)
{
if (d->UpdateInput())
++ok_count;
@ -173,7 +173,7 @@ bool ControllerInterface::UpdateOutput(const bool force)
size_t ok_count = 0;
for (Device* d : m_devices)
for (ciface::Core::Device* d : m_devices)
{
if (d->UpdateOutput())
++ok_count;
@ -217,7 +217,7 @@ ControlState ControllerInterface::OutputReference::State(const ControlState stat
// need to call this to re-parse a control reference's expression after changing it
//
void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* ref
, const DeviceQualifier& default_device) const
, const ciface::Core::DeviceQualifier& default_device) const
{
delete ref->parsed_expression;
ref->parsed_expression = nullptr;
@ -236,7 +236,7 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
// upon input, return pointer to detected Control
// else return nullptr
//
Device::Control* ControllerInterface::InputReference::Detect(const unsigned int ms, Device* const device)
ciface::Core::Device::Control* ControllerInterface::InputReference::Detect(const unsigned int ms, ciface::Core::Device* const device)
{
unsigned int time = 0;
std::vector<bool> states(device->Inputs().size());
@ -246,7 +246,7 @@ Device::Control* ControllerInterface::InputReference::Detect(const unsigned int
// get starting state of all inputs,
// so we can ignore those that were activated at time of Detect start
std::vector<Device::Input*>::const_iterator
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)
@ -286,7 +286,7 @@ Device::Control* ControllerInterface::InputReference::Detect(const unsigned int
//
// set all binded outputs to <range> power for x milliseconds return false
//
Device::Control* ControllerInterface::OutputReference::Detect(const unsigned int ms, Device* const device)
ciface::Core::Device::Control* ControllerInterface::OutputReference::Detect(const unsigned int ms, ciface::Core::Device* const device)
{
// ignore device