diff options
| author | Rohit Nirmal <rohitnirmal9@gmail.com> | 2014-09-04 19:41:42 -0500 |
|---|---|---|
| committer | Rohit Nirmal <rohitnirmal9@gmail.com> | 2014-09-04 23:02:25 -0500 |
| commit | b0060e51843d085af6c7426d216cdd1bbc41dbbb (patch) | |
| tree | b5e1fd9afab6d2f0ec059ee4a67c2bc6c2975974 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | a9a62709825c7b9dac7d7cf2f1a3fb9ee6678aa5 (diff) | |
Controller Interface: Remove "using namespace" in header file.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 6d9d3b82a2..09fcf12ed8 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -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 |